From 3fc32115e26f3c0fc5dbc39f07785c6de1a2882e Mon Sep 17 00:00:00 2001
From: kongyeqing <2697454777@qq.com>
Date: Wed, 28 Jun 2023 10:22:23 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E6=B7=BB=E5=8A=A0table=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../device/deviceAnal.component.html           |  8 ++++++--
 .../assessment/device/deviceAnal.component.vue | 10 +++++++++-
 .../assessment/work/workAnal.component.html    |  8 ++++++--
 .../assessment/work/workAnal.component.vue     | 10 +++++++++-
 .../risk/identify/identify.component.html      |  8 ++++++--
 src/views/risk/identify/identify.component.vue | 10 +++++++++-
 .../risk/measures/measures.component.html      |  8 ++++++--
 src/views/risk/measures/measures.component.vue | 12 ++++++++++--
 .../measuresReport.component.html              |  8 ++++++--
 .../measuresReport.component.vue               | 18 +++++++++++++-----
 10 files changed, 80 insertions(+), 20 deletions(-)

diff --git a/src/views/risk/assessment/device/deviceAnal.component.html b/src/views/risk/assessment/device/deviceAnal.component.html
index 0ecc072..197d942 100644
--- a/src/views/risk/assessment/device/deviceAnal.component.html
+++ b/src/views/risk/assessment/device/deviceAnal.component.html
@@ -22,11 +22,15 @@
                         </template>
                     </el-table-column>
                     <template v-for="item in tableColumn">
-                        <el-table-column v-if="item.render" :label="item.name" :width="item.width" :key="item.key">
+                        <el-table-column v-if="item.render" :label="item.name" :width="item.width" :key="item.key"
+                            :filters="item.filters" :filter-method="item.filterMethod"
+                            :show-overflow-tooltip="item.showTip">
                             <div slot-scope="scope" v-html="item.render(scope.row)" @click="showPros($event,scope.row)">
                             </div>
                         </el-table-column>
-                        <el-table-column v-else :prop="item.key" :label="item.name" :width="item.width" :key="item.key">
+                        <el-table-column v-else :prop="item.key" :label="item.name" :width="item.width" :key="item.key"
+                            :filters="item.filters" :filter-method="item.filterMethod"
+                            :show-overflow-tooltip="item.showTip">
                         </el-table-column>
                     </template>
                     <el-table-column label="操作" width="150">
diff --git a/src/views/risk/assessment/device/deviceAnal.component.vue b/src/views/risk/assessment/device/deviceAnal.component.vue
index 33adb77..87f985f 100644
--- a/src/views/risk/assessment/device/deviceAnal.component.vue
+++ b/src/views/risk/assessment/device/deviceAnal.component.vue
@@ -432,8 +432,16 @@ export default class DeviceAnalManagerComponent extends BaseRecordComponent<any>
         this.tableColumn.push({ name: '责任部门', key: "chargeDeptName" });
         this.tableColumn.push({ name: '责任人', key: "chargeUserName" });
         this.tableColumn.push({
-            name: '风险等级', key: "riskLevel", render: (data) => {
+            name: '风险等级', key: "riskLevel", width: "150px", render: (data) => {
                 return "<span class='color_" + data.riskLevel + "'>" + (data.riskLevel ? (this.$store.getters.prevention_risk_level_map[data.riskLevel]) : '') + "</span>"
+            },
+            filters: this.$store.state.prevention_risk_level.map(item => {
+                return {
+                    text: item.name,
+                    value: item.value,
+                }
+            }), filterMethod: (data, row) => {
+                return row.riskLevel === data;
             }
         });
         this.tableColumn.push({
diff --git a/src/views/risk/assessment/work/workAnal.component.html b/src/views/risk/assessment/work/workAnal.component.html
index 850c548..ba8125c 100644
--- a/src/views/risk/assessment/work/workAnal.component.html
+++ b/src/views/risk/assessment/work/workAnal.component.html
@@ -21,11 +21,15 @@
                         </template>
                     </el-table-column>
                     <template v-for="item in tableColumn">
-                        <el-table-column v-if="item.render" :label="item.name" :width="item.width" :key="item.key">
+                        <el-table-column v-if="item.render" :label="item.name" :width="item.width" :key="item.key"
+                            :show-overflow-tooltip="item.showTip" :filters="item.filters"
+                            :filter-method="item.filterMethod">
                             <div slot-scope="scope" v-html="item.render(scope.row)" @click="showPros($event,scope.row)">
                             </div>
                         </el-table-column>
-                        <el-table-column v-else :prop="item.key" :label="item.name" :width="item.width" :key="item.key">
+                        <el-table-column v-else :prop="item.key" :label="item.name" :width="item.width" :key="item.key"
+                            :show-overflow-tooltip="item.showTip" :filters="item.filters"
+                            :filter-method="item.filterMethod">
                         </el-table-column>
                     </template>
                     <el-table-column label="操作" width="150">
diff --git a/src/views/risk/assessment/work/workAnal.component.vue b/src/views/risk/assessment/work/workAnal.component.vue
index ce3fd49..5542cb7 100644
--- a/src/views/risk/assessment/work/workAnal.component.vue
+++ b/src/views/risk/assessment/work/workAnal.component.vue
@@ -424,8 +424,16 @@ export default class WorkAnalManagerComponent extends BaseRecordComponent<any> {
         this.tableColumn.push({ name: '责任部门', key: "chargeDeptName" });
         this.tableColumn.push({ name: '责任人', key: "chargeUserName" });
         this.tableColumn.push({
-            name: '风险等级', key: "riskLevel", render: (data) => {
+            name: '风险等级', key: "riskLevel", width: "150px", render: (data) => {
                 return "<span class='color_" + data.riskLevel + "'>" + (data.riskLevel ? (this.$store.getters.prevention_risk_level_map[data.riskLevel]) : '') + "</span>"
+            },
+            filters: this.$store.state.prevention_risk_level.map(item => {
+                return {
+                    text: item.name,
+                    value: item.value,
+                }
+            }), filterMethod: (data, row) => {
+                return row.riskLevel === data;
             }
         });
         this.tableColumn.push({
diff --git a/src/views/risk/identify/identify.component.html b/src/views/risk/identify/identify.component.html
index 8151220..315711a 100644
--- a/src/views/risk/identify/identify.component.html
+++ b/src/views/risk/identify/identify.component.html
@@ -22,10 +22,14 @@
                         </template>
                     </el-table-column>
                     <template v-for="item in tableColumn">
-                        <el-table-column v-if="item.render" :label="item.name" :width="item.width" :key="item.key">
+                        <el-table-column v-if="item.render" :label="item.name" :width="item.width" :key="item.key"
+                            :filters="item.filters" :filter-method="item.filterMethod"
+                            :show-overflow-tooltip="item.showTip">
                             <div slot-scope="scope" v-html="item.render(scope.row)"></div>
                         </el-table-column>
-                        <el-table-column v-else :prop="item.key" :label="item.name" :width="item.width" :key="item.key">
+                        <el-table-column v-else :prop="item.key" :label="item.name" :width="item.width" :key="item.key"
+                            :filters="item.filters" :filter-method="item.filterMethod"
+                            :show-overflow-tooltip="item.showTip">
                         </el-table-column>
                     </template>
                     <el-table-column label="操作" width="100">
diff --git a/src/views/risk/identify/identify.component.vue b/src/views/risk/identify/identify.component.vue
index e357d0e..42ae723 100644
--- a/src/views/risk/identify/identify.component.vue
+++ b/src/views/risk/identify/identify.component.vue
@@ -334,8 +334,16 @@ export default class IdentifyManagerComponent extends BaseRecordComponent<any> {
             }
         });
         this.tableColumn.push({
-            name: '风险等级', key: "riskLevel", render: (data) => {
+            name: '风险等级', key: "riskLevel",width:"150px", render: (data) => {
                 return "<span class='color_" + data.riskLevel + "'>" + (data.riskLevel ? (this.$store.getters.prevention_risk_level_map[data.riskLevel]) : '') + "</span>"
+            },
+            filters: this.$store.state.prevention_risk_level.map(item => {
+                return {
+                    text: item.name,
+                    value: item.value,
+                }
+            }), filterMethod: (data, row) => {
+                return row.riskLevel === data;
             }
         });
         this.tableColumn.push({
diff --git a/src/views/risk/measures/measures.component.html b/src/views/risk/measures/measures.component.html
index 388710b..3557085 100644
--- a/src/views/risk/measures/measures.component.html
+++ b/src/views/risk/measures/measures.component.html
@@ -22,11 +22,15 @@
                         </template>
                     </el-table-column>
                     <template v-for="item in tableColumn">
-                        <el-table-column v-if="item.render" :label="item.name" :width="item.width" :key="item.key">
+                        <el-table-column v-if="item.render" :label="item.name" :width="item.width" :key="item.key"
+                            :filters="item.filters" :filter-method="item.filterMethod"
+                            :show-overflow-tooltip="item.showTip">
                             <div slot-scope="scope" v-html="item.render(scope.row)" @click="showPros($event,scope.row)">
                             </div>
                         </el-table-column>
-                        <el-table-column v-else :prop="item.key" :label="item.name" :width="item.width" :key="item.key">
+                        <el-table-column v-else :prop="item.key" :label="item.name" :width="item.width" :key="item.key"
+                            :filters="item.filters" :filter-method="item.filterMethod"
+                            :show-overflow-tooltip="item.showTip">
                         </el-table-column>
                     </template>
                     <el-table-column label="操作" width="100">
diff --git a/src/views/risk/measures/measures.component.vue b/src/views/risk/measures/measures.component.vue
index 3f473f8..f460ed5 100644
--- a/src/views/risk/measures/measures.component.vue
+++ b/src/views/risk/measures/measures.component.vue
@@ -112,8 +112,16 @@ export default class MeasuresManagerComponent extends BaseRecordComponent<any> {
             }
         });
         this.tableColumn.push({
-            name: '风险等级', key: "riskLevel", width: "100px", render: (data) => {
+            name: '风险等级', key: "riskLevel", width: "150px", render: (data) => {
                 return "<span class='color_" + data.riskLevel + "'>" + (data.riskLevel ? (this.$store.getters.prevention_risk_level_map[data.riskLevel]) : '') + "</span>"
+            },
+            filters: this.$store.state.prevention_risk_level.map(item => {
+                return {
+                    text: item.name,
+                    value: item.value,
+                }
+            }), filterMethod: (data, row) => {
+                return row.riskLevel === data;
             }
         });
         this.tableColumn.push({
@@ -121,7 +129,7 @@ export default class MeasuresManagerComponent extends BaseRecordComponent<any> {
                 return "<span class='link'>" + (data.details ? data.details.length : 0) + "</span>"
             }
         });
-        this.tableColumn.push({ name: '涉及岗位', key: "postName" });
+        this.tableColumn.push({ name: '涉及岗位', key: "postName", width: "200px" });
 
 
         //管控措施详情
diff --git a/src/views/risk/measuresReport/measuresReport.component.html b/src/views/risk/measuresReport/measuresReport.component.html
index cde2c28..df93ed0 100644
--- a/src/views/risk/measuresReport/measuresReport.component.html
+++ b/src/views/risk/measuresReport/measuresReport.component.html
@@ -17,10 +17,14 @@
                     <el-table-column type="selection" label="全选" width="60">
                     </el-table-column>
                     <template v-for="item in tableColumn">
-                        <el-table-column v-if="item.render" :label="item.name" :width="item.width" :key="item.key">
+                        <el-table-column v-if="item.render" :label="item.name" :width="item.width" :key="item.key"
+                            :filters="item.filters" :filter-method="item.filterMethod"
+                            :show-overflow-tooltip="item.showTip">
                             <div slot-scope="scope" v-html="item.render(scope.row)"></div>
                         </el-table-column>
-                        <el-table-column v-else :prop="item.key" :label="item.name" :width="item.width" :key="item.key">
+                        <el-table-column v-else :prop="item.key" :label="item.name" :width="item.width" :key="item.key"
+                            :filters="item.filters" :filter-method="item.filterMethod"
+                            :show-overflow-tooltip="item.showTip">
                         </el-table-column>
                     </template>
                     <el-table-column label="操作" width="160">
diff --git a/src/views/risk/measuresReport/measuresReport.component.vue b/src/views/risk/measuresReport/measuresReport.component.vue
index ab9b35f..09a97a2 100644
--- a/src/views/risk/measuresReport/measuresReport.component.vue
+++ b/src/views/risk/measuresReport/measuresReport.component.vue
@@ -145,8 +145,16 @@ export default class MeasuresReportManagerComponent extends BaseRecordComponent<
             }
         });
         this.tableColumn.push({
-            name: '风险等级', key: "itemRiskLevel", render: (data) => {
+            name: '风险等级', key: "itemRiskLevel",width:"150px", render: (data) => {
                 return "<span class='color_" + data.itemRiskLevel + "'>" + (data.itemRiskLevel ? (this.$store.getters.prevention_risk_level_map[data.itemRiskLevel]) : '') + "</span>"
+            },
+            filters: this.$store.state.prevention_risk_level.map(item => {
+                return {
+                    text: item.name,
+                    value: item.value,
+                }
+            }), filterMethod: (data, row) => {
+                return row.riskLevel === data;
             }
         });
         this.tableColumn.push({
@@ -157,7 +165,7 @@ export default class MeasuresReportManagerComponent extends BaseRecordComponent<
             }
         });
         this.tableColumn.push({
-            name: '管控措施分类', key: "measureSecondType",
+            name: '管控措施分类',width:"200px", key: "measureSecondType",
             render: (data) => {
                 if (data.measureFirstType) {
                     const secondTypeItem = this.measuresSelectData[data.measureFirstType]
@@ -165,11 +173,11 @@ export default class MeasuresReportManagerComponent extends BaseRecordComponent<
                 }
             }
         });
-        this.tableColumn.push({ name: '管控措施分类', key: "measureThirdType" });
+        this.tableColumn.push({ name: '管控措施分类',width:"200px", key: "measureThirdType" });
         this.tableColumn.push({ name: '管控措施', key: "measureDescription" });
 
         this.tableColumn.push({
-            name: '是否包保责任人任务', key: "insuranceDutyFlag", render: (data) => {
+            name: '是否包保责任人任务',width:"200px", key: "insuranceDutyFlag", render: (data) => {
                 if (data.taskItem) {
                     return '是'
                 } else {
@@ -201,7 +209,7 @@ export default class MeasuresReportManagerComponent extends BaseRecordComponent<
             }
         });
         this.tableColumn.push({ name: '隐患排查任务', key: "taskName", width: "150px" });
-        this.tableColumn.push({ name: '隐患责任人', key: "taskChargeUserName" });
+        this.tableColumn.push({ name: '隐患责任人', key: "taskChargeUserName" ,width:"200px"});
         this.tableColumn.push({ name: '岗位', key: "taskExecutePostName" });
         this.tableColumn.push({ name: '排查周期', key: "taskReviewCycleValue" });
         this.tableColumn.push({