From fadf2795757ac6df1c792546725ea177c93d9d7a Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期三, 18 三月 2020 14:03:10 +0800
Subject: [PATCH] Merge branch 'master' of http://highdatas.com:9000/r/~kimi/srs
---
src/components/square.vue | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/components/square.vue b/src/components/square.vue
index 74f3efa..c652f01 100644
--- a/src/components/square.vue
+++ b/src/components/square.vue
@@ -30,7 +30,7 @@
<div v-for="one in dataList" :key="one.id" class="list-item">
<el-row >
<el-col :span="18"><div class="grid-content z_grid-content1 grid-content_text" @click="showItem(one)">{{one.title}}</div></el-col>
- <el-col :span="3"><div class="grid-content z_grid-content1 grid-content_exam" @click="showLinkItem(one)">{{formatter(one.examine)}}</div></el-col>
+ <el-col :span="3"><div class="grid-content z_grid-content1 grid-content_exam" @click="showLinkItem(one)">{{formatter(one)}}</div></el-col>
<el-col :span="3"><div class="grid-content z_grid-content1 grid-content_time">{{one.time}}</div></el-col>
</el-row>
@@ -261,17 +261,17 @@
this.selectOne = one;
},
showLinkItem(one) {
- this.dialogProdetail = true;
this.rowData = {
id: one.linkId,
}
+ this.dialogProdetail = true;
},
createNew() {
this.form = {};
this.dialogFormVisible = true;
},
- formatter(exam){
- if(exam){
+ formatter(one){
+ if(one.examine && one.linkId){
return "宸插叧鑱旈」鐩�";
}
},
@@ -312,7 +312,7 @@
let pageno = this.pagenum;
let url = "/api/topic/page/" + this.pageno;
let params = {};
- if(query){
+ if(query && query != {}){
params.title = query.title;
params.desp = query.desp;
}
--
Gitblit v1.8.0