From 08bf6da5e3164a1b3ee5c79bb5d666e6385b4653 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期一, 23 五月 2022 18:33:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/views/hiddenDangerManagement/index.vue | 120 +++++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 102 insertions(+), 18 deletions(-)
diff --git a/src/views/hiddenDangerManagement/index.vue b/src/views/hiddenDangerManagement/index.vue
index 7f2d1ca..addaa9a 100644
--- a/src/views/hiddenDangerManagement/index.vue
+++ b/src/views/hiddenDangerManagement/index.vue
@@ -183,34 +183,67 @@
</el-row>
<el-table :data="tableData" ref="dataTable" style="width: 100%">
<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="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 +254,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 +280,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,10 +469,16 @@
path: "/fillRectificationAdd"
})
},
+ handleClick(row){
+ this.$router.push({
+ path: "/fillRectificationAdd",
+ query:row
+ })
+ },
fillRectification() {
var checkData = this.$refs.dataTable.selection;
if (checkData.length < 1) {
- this.$message({type: 'warn', message: "请选择勾选需要填写的数据！", duration: 3000})
+ this.$message({type: 'warning', message: "请选择勾选需要填写的数据！", duration: 3000})
return;
}
this.$router.push({
@@ -450,7 +489,7 @@
fillInspector() {
var checkData = this.$refs.dataTable.selection;
if (checkData.length < 1) {
- this.$message({type: 'warn', message: "请选择勾选需要填写的数据！", duration: 3000})
+ this.$message({type: 'warning', message: "请选择勾选需要填写的数据！", duration: 3000})
return;
}
this.$router.push({
@@ -532,7 +571,7 @@
revoke() {
var checkData = this.$refs.dataTable.selection;
if (checkData.length < 1) {
- this.$message({type: 'warn', message: "请勾选需要撤销的数据！", duration: 3000})
+ this.$message({type: 'warning', message: "请勾选需要撤销的数据！", duration: 3000})
return;
}
var revokeIds = "";
@@ -560,7 +599,7 @@
deleteBath() {
var checkData = this.$refs.dataTable.selection;
if (checkData.length < 1) {
- this.$message({type: 'warn', message: "请勾选需要删除的数据！", duration: 3000})
+ this.$message({type: 'warning', message: "请勾选需要删除的数据！", duration: 3000})
return;
}
var deleteIds = "";
@@ -582,6 +621,48 @@
this.$message({type: 'error', message: res.data.msg, duration: 3000})
}
})
+ })
+ },
+ //方法区
+ 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})
+ }
+ })
+ })
+ },
+ showDetails(row){
+ this.$router.push({
+ path: "/dangerDetails",
+ query:{"id":row.id}
})
}
}
@@ -615,7 +696,10 @@
border: none;
border-radius: 0px;
}
-
+.blue-font-color:hover{
+ cursor: pointer;
+ color: blue;
+}
.title-center /deep/ .el-radio-button__orig-radio:checked + .el-radio-button__inner {
background-color: #034ea2;
background-color: #034ea2;
--
Gitblit v1.9.2