From 66d88a25e67618668a55e9a411d99068beed3a3f Mon Sep 17 00:00:00 2001
From: luobisheng <727299681@qq.com>
Date: 星期一, 28 十一月 2022 18:11:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/operate/viewEvent/index.vue | 34 ++++++++--------------------------
1 files changed, 8 insertions(+), 26 deletions(-)
diff --git a/src/views/operate/viewEvent/index.vue b/src/views/operate/viewEvent/index.vue
index a6c158b..03e5da3 100644
--- a/src/views/operate/viewEvent/index.vue
+++ b/src/views/operate/viewEvent/index.vue
@@ -70,34 +70,12 @@
<span>{{ scope.row.eventSource === 2 ? '浜哄伐涓婃姤' : '瑙嗛涓婁紶' }}</span>
</template>
</el-table-column>
- <el-table-column :prop="myproblem === 1 ? 'category' : 'category'"
- :label="myproblem === 1 ? '澶х被鍚嶇О' : '杩濆缓绫诲埆'" :min-width="myproblem === 1 ? '10' : '20'">
- </el-table-column>
- <el-table-column :prop="myproblem === 1 ? 'categories' : 'site'"
- :label="myproblem === 1 ? '灏忕被鍚嶇О' : '杩濆缓鍦扮偣'" min-width="10">
- </el-table-column>
- <el-table-column :prop="myproblem === 1 ? 'actionCause' : 'communityId'"
- :label="myproblem === 1 ? '妗堢敱' : '鎵�灞炵ぞ鍖�'" min-width="10">
- </el-table-column>
- <el-table-column :prop="myproblem === 1 ? 'site' : ''"
- :label="myproblem === 1 ? '鎶ヨ鐐逛綅' : '杩濇硶寤虹瓚闀裤�佸銆侀珮'" :min-width="myproblem === 1 ? '10' : '20'">
- <template slot-scope="scope">
- <div v-if="myproblem === 2"><span>{{ scope.row.buildingLength + '绫�' + '銆�' +
- scope.row.buildingWidth + '绫�' + '銆�' + scope.row.buildingHigh + '绫�'
- }}</span></div>
- <div v-else>{{ scope.row.site }}</div>
- </template>
- </el-table-column>
- <el-table-column :prop="myproblem === 1 ? 'street' : 'buildingArea'"
- :label="myproblem === 1 ? '鎵�灞炲尯鍩�' : '杩濇硶寤虹瓚闈㈢Н'" min-width="10">
+ <el-table-column prop="communityText" label="绀惧尯" min-width="8">
</el-table-column>
<el-table-column prop="alarmTime" label="鎶ヨ鏃堕棿" min-width="15" v-if="myproblem === 1">
<template slot-scope="scope">
<span>{{ filterTime(scope.row.alarmTime) }}</span>
</template>
- </el-table-column>
- <el-table-column :prop="myproblem === 1 ? 'continueTime' : 'materials'"
- :label="myproblem === 1 ? '鎸佺画鏃堕棿' : '杩濇硶寤虹瓚鏉愭枡'" min-width="15">
</el-table-column>
</el-table>
<!-- 瀹℃牳椤甸潰 -->
@@ -122,7 +100,8 @@
<div class="tools">
<div class="funs">
<div class="funsItem funs-sp">
- <el-checkbox v-model="all" @change="selectAll()">鍏ㄩ��</el-checkbox>
+ <el-checkbox v-model="all" @change="selectAll()"
+ :disabled="tableData.length === 0">鍏ㄩ��</el-checkbox>
</div>
<div class="funsItem funs-sp">
<el-checkbox v-model="unsame" @change="disSame(tableData)">鍙嶉��</el-checkbox>
@@ -293,9 +272,12 @@
getList() {
casequery.baseCaseQuery({ current: this.currentPage, pageSize: this.pageSize, ...this.searchData })
.then((res) => {
- this.tableData = res;
+ this.tableData = res.records;
+ this.totalNum=res.total;
})
- .catch(err => this.$message({ type: 'error', message: err }))
+ .catch(err => {
+ this.tableData = [];
+ })
},
// 璁剧疆琛ㄦ牸鏂戦┈绾�
tableRowClassName({ row, rowIndex }) {
--
Gitblit v1.8.0