From c819024e241b9f7c54cc3786373ad0d2998f2190 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期五, 05 五月 2023 08:55:46 +0800
Subject: [PATCH] 修改

---
 src/views/delayHiddenDangerRectification/index.vue |   56 +++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/src/views/delayHiddenDangerRectification/index.vue b/src/views/delayHiddenDangerRectification/index.vue
index 3e5491b..49c5648 100644
--- a/src/views/delayHiddenDangerRectification/index.vue
+++ b/src/views/delayHiddenDangerRectification/index.vue
@@ -45,7 +45,7 @@
                         v-for="item in YHBMList"
                         :key="item.branch_id"
                         :label="item.branch_name"
-                        :value="item.branch_id">
+                        :value="item.branch_name">
                     </el-option>
                 </el-select>
             </el-form-item>
@@ -157,9 +157,13 @@
                 <el-button class="btns" type="primary" size="small" @click="sendBath()">批量发送</el-button>
             </el-col>
         </el-row>
-        <el-table ref="dataTable" :data="tableData" style="width: 100%" @selection-change="handleSelectionChange">
+        <el-table ref="dataTable" :data="tableData" style="width: 100%" @selection-change="handleSelectionChange" v-loading="loading">
             <el-table-column type="selection" width="55" align="center"></el-table-column>
-            <el-table-column prop="number" label="编号" align="center" width="120"></el-table-column>
+            <el-table-column prop="number" label="编号" align="center" width="120">
+                <template slot-scope="scope">
+                    <div class="blue-font-color" @click="showDetails(scope.row)">{{ scope.row.number }}</div>
+                </template>
+            </el-table-column>
             <el-table-column prop="check_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 prop="checktype" label="检查类别" align="center"></el-table-column>
@@ -171,12 +175,32 @@
                     </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_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="级别" 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">
+                    <template slot-scope="scope">
+                        <el-popover trigger="hover" placement="top">
+                            <p>{{ scope.row.measure }}</p>
+                            <div slot="reference" class="name-wrapper">{{
+                                    scope.row.measure != null && scope.row.measure.length > 10 ? scope.row.measure.substring(0, 8) + "...." : scope.row.measure
+                                }}
+                            </div>
+                        </el-popover>
+                    </template>
+                </el-table-column>
                 <el-table-column prop="ht_branch" 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="限改时间" :formatter="formatColumnDate" width="120" align="center"></el-table-column>
@@ -199,7 +223,7 @@
             <el-table-column prop="DTRisk_level" label="风险等级" align="center"></el-table-column>
             <el-table-column prop="warningLevel" label="初始警情" align="center"></el-table-column>
             <el-table-column prop="curWarningLevel" label="当前警情" align="center"></el-table-column>
-            <el-table-column prop="date" label="流程操作" align="center">
+            <el-table-column prop="date" label="流程操作" align="center" fixed="right">
                 <template slot-scope="scope">
                     <el-button @click="handleClick(scope.row)" type="text" size="small">点击发送</el-button>
                 </template>
@@ -241,6 +265,7 @@
             YHBMList: [],
             YHJBList: [],
             tableData: [],
+            loading:false,
             listQuery: {
                 page: 1,
                 limit: 10,
@@ -325,7 +350,9 @@
         getPageList() {
             this.listQuery.page = 1
             this.checkTime()
+            this.loading = true
             getPageList(this.listQuery).then(res => {
+                this.loading = false
                 if (res.data.ok == 1) {
                     this.tableData = res.data.data.items
                     this.recordTotal = res.data.data.total
@@ -407,7 +434,7 @@
         sendBath() {
             var selectData = this.$refs.dataTable.selection;
             if (selectData.length < 1) {
-                this.$message({type: 'warn', message: "请选择需要发送的数据!", duration: 3000})
+                this.$message({type: 'warning', message: "请选择需要发送的数据!", duration: 3000})
                 return;
             }
             var selectIds = "";
@@ -440,12 +467,14 @@
             })
         },
         exportData() {
-            var requestData = this.listQuery;
+            this.listLoading = true
+            var requestData = JSON.parse(JSON.stringify(this.listQuery));
             requestData.export_type = 4;
             //删除分页参数
             this.$delete(requestData, 'page')
             this.$delete(requestData, 'limit')
             danger_export_do(requestData).then(res => {
+                this.listLoading = false
                 var blob = new Blob([res.data])
                 var downloadElement = document.createElement('a')
                 var href = window.URL.createObjectURL(blob) //创建下载的链接
@@ -468,7 +497,12 @@
             let dt = new Date(data)
             return dt.getFullYear() + '-' + (dt.getMonth() + 1) + '-' + dt.getDate()
         },
-
+        showDetails(row){
+            this.$router.push({
+                path: "/dangerDetails",
+                query:{"id":row.id}
+            })
+        },
         //方法区
         formatColumnDate(row, column) {
             // 获取单元格数据
@@ -501,4 +535,8 @@
     background-color: #034ea2;
     border: 1px solid #034ea2;
 }
+.blue-font-color:hover{
+    cursor: pointer;
+    color: blue;
+}
 </style>

--
Gitblit v1.9.2