From 67df85b16e6a6fde0a026672a8a2924429b610cb Mon Sep 17 00:00:00 2001
From: cqf <2252655793@qq.com>
Date: 星期四, 12 五月 2022 18:00:34 +0800
Subject: [PATCH] 优化

---
 src/views/hiddenDangerManagement/index.vue |   95 +++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 83 insertions(+), 12 deletions(-)

diff --git a/src/views/hiddenDangerManagement/index.vue b/src/views/hiddenDangerManagement/index.vue
index 7f2d1ca..3146c82 100644
--- a/src/views/hiddenDangerManagement/index.vue
+++ b/src/views/hiddenDangerManagement/index.vue
@@ -187,30 +187,59 @@
             <el-table-column prop="ht_branch" label="隐患单位" align="center" width="120"></el-table-column>
             <el-table-column prop="check_man" label="检查人" align="center" width="120"></el-table-column>
             <el-table-column label="隐患项目" align="center">
-                <el-table-column prop="check_date" label="检查时间" width="120" align="center"></el-table-column>
+                <el-table-column prop="check_date" label="检查时间" width="120" align="center">
+                    <template slot-scope="scope">
+                        <label>{{ formatDate(scope.row.check_date) }}</label><br/>
+                        <label>{{ scope.row.check_class }}</label>
+                    </template>
+                </el-table-column>
                 <el-table-column prop="address" label="地点" align="center"></el-table-column>
-                <el-table-column prop="ht_content" label="内容" align="center"></el-table-column>
-                <el-table-column prop="ht_typesub" label="类别" align="center"></el-table-column>
-                <el-table-column prop="ht_level" label="级别" align="center"></el-table-column>
+                <el-table-column prop="ht_content" label="内容" width="150" align="center">
+                    <template slot-scope="scope">
+                        <el-popover trigger="hover" placement="top">
+                            <p>{{ scope.row.ht_content }}</p>
+                            <div slot="reference" class="name-wrapper">{{
+                                    scope.row.ht_content != null && scope.row.ht_content.length > 10 ? scope.row.ht_content.substring(0, 8) + "...." : scope.row.ht_content
+                                }}
+                            </div>
+                        </el-popover>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="ht_typesub" label="类别"  align="center"></el-table-column>
+                <el-table-column prop="ht_level" label="级别" width="100" align="center"></el-table-column>
             </el-table-column>
             <el-table-column label="整改计划" align="center">
-                <el-table-column prop="measure" label="整改措施" align="center"></el-table-column>
+                <el-table-column prop="measure" label="整改措施" width="150" align="center"></el-table-column>
                 <!-- <el-table-column label="隐患部门" align="center"> </el-table-column> -->
                 <el-table-column prop="duty_officer" label="责任人" align="center"></el-table-column>
-                <el-table-column prop="alter_time" label="限改时间" width="120" align="center"></el-table-column>
+                <el-table-column prop="alter_time" label="限改时间" :formatter="formatColumnDate" width="120"
+                                 align="center">
+                    <template slot-scope="scope">
+                            <div v-if="new Date(scope.row.alter_time).getTime()>new Date().getTime()" slot="reference" class="name-wrapper">{{
+                                    formatDate(scope.row.alter_time)
+                                }}
+                            </div>
+                        <div style="background-color: orange;height: 50px;line-height: 50px" v-if="new Date(scope.row.alter_time).getTime()<new Date().getTime()" slot="reference" class="name-wrapper">{{
+                                formatDate(scope.row.alter_time)
+                            }}
+                        </div>
+                    </template>
+                </el-table-column>
                 <!-- <el-table-column label="级别" align="center"> </el-table-column> -->
             </el-table-column>
             <el-table-column label="整改情况" align="center">
-                <el-table-column prop="ACCOMPLISHTIME" label="完成时间" width="120" align="center"></el-table-column>
+                <el-table-column prop="ACCOMPLISHTIME" label="完成时间" :formatter="formatColumnDate" width="120"
+                                 align="center"></el-table-column>
                 <!-- <el-table-column label="复查结果" align="center"> </el-table-column> -->
                 <el-table-column prop="CALLBACKPERSON" label="复查人" align="center"></el-table-column>
-                <el-table-column prop="CALLBACKTIME" label="复查时间" width="120" align="center"></el-table-column>
+                <el-table-column prop="CALLBACKTIME" label="复查时间" :formatter="formatColumnDate" width="120"
+                                 align="center"></el-table-column>
             </el-table-column>
             <!-- <el-table-column label="隐患处理状态" align="center"> </el-table-column> -->
-            <el-table-column prop="DTRisk_bankId" label="是否关联" align="center">
+            <el-table-column prop="DTRisk_bankId" label="是否关联" align="center" >
                 <template slot-scope="scope">
                     <span
-                        v-if="scope.row.DTRisk_bankId==0 || scope.row.DTRisk_bankId=='' || scope.row.DTRisk_bankId==null">未关联</span>
+                        v-if="scope.row.DTRisk_bankId==0 || scope.row.DTRisk_bankId=='' || scope.row.DTRisk_bankId==null" style="color: red">未关联</span>
                     <span v-else>已关联</span>
                 </template>
             </el-table-column>
@@ -221,7 +250,7 @@
             <el-table-column label="基本操作" align="center">
                 <template slot-scope="scope">
                     <el-button @click="handleClick(scope.row)" type="text" size="small">编辑</el-button>
-                    <el-button type="text" size="small">删除</el-button>
+                    <el-button type="text" @click="handleDelete(scope.row)" size="small">删除</el-button>
                 </template>
             </el-table-column>
         </el-table>
@@ -247,7 +276,7 @@
     self_import_do,
     self_del_do,
     self_revoke,
-    self_template
+    self_template,
 } from "@/api/sgyhpczl/hiddenDangerManagement";
 import {initJCBM, initYHLX, initBC, initJCLB, initYHBM, initYHJB, initReformStatus} from "@/api/sgyhpczl/initSelect";
 
@@ -436,6 +465,12 @@
                 path: "/fillRectificationAdd"
             })
         },
+        handleClick(row){
+            this.$router.push({
+                path: "/fillRectificationAdd",
+                query:row
+            })
+        },
         fillRectification() {
             var checkData = this.$refs.dataTable.selection;
             if (checkData.length < 1) {
@@ -583,6 +618,42 @@
                     }
                 })
             })
+        },
+        //方法区
+        formatDate(data) {
+            // 获取单元格数据
+            if (data == null) {
+                return null
+            }
+            let dt = new Date(data)
+            return dt.getFullYear() + '-' + (dt.getMonth() + 1) + '-' + dt.getDate()
+        },
+
+        //方法区
+        formatColumnDate(row, column) {
+            // 获取单元格数据
+            let data = row[column.property]
+            if (data == null) {
+                return null
+            }
+            let dt = new Date(data)
+            return dt.getFullYear() + '-' + (dt.getMonth() + 1) + '-' + dt.getDate() + ' '
+        },
+        handleDelete(row){
+            this.$confirm('确认要删除吗', '提示', {
+                confirmButtonText: '确认',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then((res) => {
+                self_del_do(row.id).then(res => {
+                    if (res.data.ok) {
+                        this.$message({type: 'success', message: res.data.msg, duration: 3000})
+                        this.getPageList()//调用表格方法,刷新页面
+                    } else {
+                        this.$message({type: 'error', message: res.data.msg, duration: 3000})
+                    }
+                })
+            })
         }
     }
 };

--
Gitblit v1.9.2