From 4f23d16c5f9788e44b83280bf6d3c2e1d2280a07 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期二, 19 七月 2022 16:06:25 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/ztqt
---
src/views/safetyHazardAccount/index.vue | 172 ++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 138 insertions(+), 34 deletions(-)
diff --git a/src/views/safetyHazardAccount/index.vue b/src/views/safetyHazardAccount/index.vue
index a01159f..c40cfa9 100644
--- a/src/views/safetyHazardAccount/index.vue
+++ b/src/views/safetyHazardAccount/index.vue
@@ -43,9 +43,9 @@
<el-select v-model="listQuery.form.ht_branch" placeholder="请选择">
<el-option
v-for="item in YHBMList"
- :key="item.branch_id"
+ :key="item.branch_name"
:label="item.branch_name"
- :value="item.branch_id">
+ :value="item.branch_name">
</el-option>
</el-select>
</el-form-item>
@@ -96,12 +96,12 @@
</el-select>
</el-form-item>
<el-form-item label="风险等级">
- <el-select v-model="listQuery.form.DTRisk_bankId" placeholder="请选择">
+ <el-select v-model="listQuery.form.DTRisk_level" placeholder="请选择">
<el-option
- v-for="item in reList"
- :key="item.value"
- :label="item.label"
- :value="item.value">
+ v-for="item in levelList"
+ :key="item.name"
+ :label="item.name"
+ :value="item.name">
</el-option>
</el-select>
</el-form-item>
@@ -116,7 +116,7 @@
</el-select>
</el-form-item>
<el-form-item label="深入现场情况">
- <el-select v-model="listQuery.form.createBy" placeholder="请选择">
+ <el-select v-model="listQuery.form.class_situation" placeholder="请选择">
<el-option
v-for="item in llrList"
:key="item.id"
@@ -126,22 +126,22 @@
</el-select>
</el-form-item>
<el-form-item label="是否关联">
- <el-select v-model="listQuery.form.createBy" placeholder="请选择">
+ <el-select v-model="listQuery.form.DTRisk_bankId" placeholder="请选择">
<el-option
- v-for="item in llrList"
- :key="item.id"
- :label="item.realName"
- :value="item.id">
+ v-for="item in reList"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="复查单位">
- <el-select v-model="listQuery.form.createBy" placeholder="请选择">
+ <el-select v-model="listQuery.form.callback_branch" placeholder="请选择">
<el-option
- v-for="item in llrList"
- :key="item.id"
- :label="item.realName"
- :value="item.id">
+ v-for="item in YHBMList"
+ :key="item.branch_id"
+ :label="item.branch_name"
+ :value="item.branch_name">
</el-option>
</el-select>
</el-form-item>
@@ -171,7 +171,7 @@
<el-button type="primary" class="btns" size="small" icon="el-icon-search" @click="getPageList()">查询
</el-button>
<el-button type="primary" class="btns" size="small" @click="reset()">重置</el-button>
- <el-button type="primary" class="btns" size="small" icon="el-icon-upload2">导出excel</el-button>
+ <el-button type="primary" class="btns" size="small" icon="el-icon-upload2" @click="exportData">导出excel</el-button>
</el-form-item>
</el-form>
<el-row class="title-center">
@@ -189,35 +189,74 @@
<el-col :span="12" style="text-align:right;" v-if="YHType=='0'">
<el-button type="primary" class="btns" size="small" @click="supervision('1')">督查督办</el-button>
<el-button type="primary" class="btns" size="small" @click="supervision('2')">举一反三</el-button>
-<!-- <el-button type="primary" class="btns" size="small" @click="base()">双基考核</el-button>-->
+ <!-- <el-button type="primary" class="btns" size="small" @click="base()">双基考核</el-button>-->
<el-button type="primary" class="btns" size="small" @click='deleteBatch'>删除</el-button>
</el-col>
</el-row>
- <el-table :data="tableData" ref="pageTable" style="width: 100%" @selection-change="changeBox">
+ <el-table :data="tableData" ref="pageTable" style="width: 100%" @selection-change="changeBox" 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>
<el-table-column label="隐患项目" align="center">
- <el-table-column prop="check_date" label="检查时间" width="120" align="center"></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="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">
+ <template slot-scope="scope">
+ <el-popover trigger="hover" placement="top">
+ <p>{{ scope.row.address }}</p>
+ <div slot="reference" class="name-wrapper">{{
+ scope.row.address != null && scope.row.address.length > 10 ? scope.row.address.substring(0, 8) + "...." : scope.row.address
+ }}
+ </div>
+ </el-popover>
+ </template>
+ </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="限改时间" width="120" align="center"></el-table-column>
+ <el-table-column prop="alter_time" label="限改时间" width="120" :formatter="formatColumnDate" 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="ACCOMPLISHTIME" label="完成时间" width="110px" align="center"></el-table-column>
+ <el-table-column prop="ACCOMPLISHTIME" label="完成时间" width="110px" :formatter="formatColumnDate" align="center"></el-table-column>
<el-table-column prop="CALLBACKRESULT" 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="复查时间" width="120" :formatter="formatColumnDate" align="center"></el-table-column>
</el-table-column>
<el-table-column label="隐患处理状态" align="center">
<template slot-scope="scope">
@@ -229,7 +268,7 @@
</el-table-column>
<el-table-column prop="DTRisk_bankId" label="是否关联" align="center">
<template slot-scope="scope">
- <span
+ <span style ="color: red"
v-if="scope.row.DTRisk_bankId==0 || scope.row.DTRisk_bankId=='' || scope.row.DTRisk_bankId==null">未关联</span>
<span v-else>已关联</span>
</template>
@@ -265,14 +304,15 @@
<!--批量复查弹窗-->
<el-dialog
- title="提示"
+ :title="titleStr"
:visible.sync="dialogVisible"
:close-on-click-modal="false"
width="40%"
>
<el-form>
<el-row>
- <el-checkbox style="width: 80px;height: 30px" :key="item.branch_id" v-for="item in YHBMList" v-model="checked"
+ <el-checkbox style="width: 80px;height: 30px" :key="item.branch_id" v-for="item in YHBMList"
+ v-model="checked"
:label="item.branch_id">{{
item.branch_name
}}
@@ -297,12 +337,15 @@
<script>
import {getPageList, inspect_do, draw_inferences_do} from "@/api/sgyhpczl/safetyHazardAccount";
import {delDanger} from "@/api/sgyhpczl/hiddenDangerRegistration";
+import {danger_export_do} from "@/api/sgyhpczl/hiddenDangerRectification";
+
import {initJCBM, initYHLX, initBC, initJCLB, initYHBM, initYHJB, initLlr} from "@/api/sgyhpczl/initSelect";
export default {
data() {
return {
+ titleStr:"",
dialogVisible: false,
checked: [],
YHType: '0',
@@ -321,6 +364,8 @@
YHJBList: [],
tableData: [],
requestData: {},
+ levelList:[{id:1,name:'低风险'},{id:2,name:'一般风险'},{id:3,name:'较大风险'},{id:4,name:'重大风险'}],
+ loading:false,
listQuery: {
page: 1,
limit: 10,
@@ -452,7 +497,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
@@ -522,7 +569,7 @@
},
updateClick(row) {
this.$router.push({
- path: "/hiddenDangerAdd?id=" + row.id +"&route=safetyHazardAccount"
+ path: "/hiddenDangerAdd?id=" + row.id + "&route=safetyHazardAccount"
})
},
jump() {
@@ -535,6 +582,25 @@
this.$router.push({
path: "/hiddenDangerList?id=" + row.id,
})
+ },
+ //方法区
+ 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() + ' '
},
deleteClick(row) {
this.$confirm('确认删除吗', '提示', {
@@ -562,6 +628,11 @@
})
},
supervision(type) {
+ if(type == '1'){
+ this.titleStr = "督查督办";
+ }else{
+ this.titleStr = "举一反三";
+ }
var selectDataList = this.$refs.pageTable.selection;
this.buttonType = type;
if (selectDataList.length != 1) {
@@ -626,7 +697,35 @@
}
})
}
- }
+ },
+ showDetails(row){
+ this.$router.push({
+ path: "/dangerDetails",
+ query:{"id":row.id,"route":"/safetyHazardAccount"}
+ })
+ },
+ exportData() {
+ this.listLoading = true
+ var requestData = JSON.parse(JSON.stringify(this.listQuery));
+ requestData.export_type = 6;
+ //删除分页参数
+ 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) //创建下载的链接
+ downloadElement.href = href
+ downloadElement.download = '安全隐患台账.xlsx' //下载后文件名
+ document.body.appendChild(downloadElement)
+ downloadElement.click() //点击下载
+ document.body.removeChild(downloadElement) //下载完成移除元素
+ window.URL.revokeObjectURL(href) //释放掉blob对象
+ }).catch(err => {
+ console.log(err)
+ })
+ },
}
};
</script>
@@ -663,5 +762,10 @@
background-color: #034ea2;
background-color: #034ea2;
}
+
+.blue-font-color:hover{
+ cursor: pointer;
+ color: blue;
+}
</style>
--
Gitblit v1.9.2