From 0f5e1534e83fa99cac09f9a3430539d115ed0b59 Mon Sep 17 00:00:00 2001
From: panzy <225@qq.com>
Date: 星期四, 19 五月 2022 20:25:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/shf' into shf
---
src/permission.js | 2
src/views/summaryPotentialSafetyHzards/index.vue | 242 ++
src/views/oneFromanotherN/index.vue | 598 +++++
src/views/safetyHazardAccount/index.vue | 509 +++--
src/views/oneFromanother/index.vue | 217 ++
src/api/sgyhpczl/oneFromanother.js | 66
src/api/sgyhpczl/safetyHazardAccount.js | 30
src/views/oneFromanotherN/existN.vue | 265 --
src/views/safetyHazardAccount/DualbaseLost.vue | 554 ++++++
src/views/summaryPotentialSafetyHzards/summaryList.vue | 354 +++
src/router/index.js | 45
src/api/sgyhpczl/Issuedbysuperiors.js | 88
src/views/Issuedbysuperiors/index.vue | 59
src/views/safetyHazardAccount/accountSend.vue | 540 +++-
src/views/troubleshooting/index.vue | 508 +++++
src/views/chartAnalysis/index.vue | 170 +
src/views/careabout/index.vue | 467 +++++
src/api/sgyhpczl/hiddenDangerRegistration.js | 4
src/api/sgyhpczl/oneFromanotherN.js | 119 +
src/views/hiddenDangerRegistration/hiddenDangerAdd.vue | 25
src/views/safetyHazardAccount/Dualbase.vue | 14
src/views/summaryPotentialSafetyHzards/summaryForm.vue | 386 ++++
src/views/oneFromanother/exist.vue | 244 +
23 files changed, 4,682 insertions(+), 824 deletions(-)
diff --git a/src/api/sgyhpczl/Issuedbysuperiors.js b/src/api/sgyhpczl/Issuedbysuperiors.js
new file mode 100644
index 0000000..71c140b
--- /dev/null
+++ b/src/api/sgyhpczl/Issuedbysuperiors.js
@@ -0,0 +1,88 @@
+import request from '@/utils/request';
+import {getTokenAndVerify} from "@/api/sgyhpczl/auth";
+
+export function getPageList(data) {
+ var arr=[]
+ /*编号*/
+ if(data.form.number!=null && data.form.number!=''){
+ arr.push({field:"number",value:data.form.number,type:'TXT'})
+ }
+ /*编号*/
+ if(data.form.step!=null && data.form.step!=''){
+ arr.push({field:"step",value:data.form.step,type:'TXT'})
+ }
+ /*检查单位*/
+ if(data.form.check_main_branch!=null && data.form.check_main_branch!=''){
+ arr.push({field:"check_main_branch",value:data.form.check_main_branch,type:'OPT'})
+ }
+ /*检查部门*/
+ if(data.form.check_branch!=null && data.form.check_branch!=''){
+ arr.push({field:"check_branch",value:data.form.check_branch,type:'OPT'})
+ }
+ /*检查人*/
+ if(data.form.check_man!=null && data.form.check_man!=''){
+ arr.push({field:"check_man",value:data.form.check_man,type:'TXT'})
+ }
+ /*隐患单位*/
+ if(data.form.ht_community!=null && data.form.ht_community!=''){
+ arr.push({field:"ht_community",value:data.form.ht_community,type:'TXT'})
+ }
+ /*隐患部门*/
+ if(data.form.ht_branch!=null && data.form.ht_branch!=''){
+ arr.push({field:"ht_branch",value:data.form.ht_branch,type:'OPT'})
+ }
+ /*隐患类别*/
+ if(data.form.ht_typesub!=null && data.form.ht_typesub!=''){
+ arr.push({field:"ht_typesub",value:data.form.ht_typesub,type:'OPT'})
+ }
+ /*隐患级别*/
+ if(data.form.ht_level!=null && data.form.ht_level!=''){
+ arr.push({field:"ht_level",value:data.form.ht_level,type:'OPT'})
+ }
+ /*检查类型*/
+ if(data.form.checktype!=null && data.form.checktype!=''){
+ arr.push({field:"checktype",value:data.form.checktype,type:'OPT'})
+ }
+ /*隐患地点*/
+ if(data.form.address!=null && data.form.address!=''){
+ arr.push({field:"address",value:data.form.address,type:'TXT'})
+ }
+ /*隐患内容*/
+ if(data.form.ht_content!=null && data.form.ht_content!=''){
+ arr.push({field:"ht_content",value:data.form.ht_content,type:'TXT'})
+ }
+ /*班次*/
+ if(data.form.check_class!=null && data.form.check_class!=''){
+ arr.push({field:"check_class",value:data.form.check_class,type:'OPT'})
+ }
+ /*是否关联*/
+ if(data.form.DTRisk_bankId!=null && data.form.DTRisk_bankId!=''){
+ arr.push({field:"DTRisk_bankId",value:data.form.DTRisk_bankId,type:'OPT'})
+ }
+ /*录入人*/
+ if(data.form.createBy!=null && data.form.createBy!=''){
+ arr.push({field:"Created_by",value:data.form.createBy,type:'OPT'})
+ }
+ /*检查时间*/
+ if(data.form.check_dateStart!=null && data.form.check_dateStart!='' && data.form.check_dateEnd!=null && data.form.check_dateEnd!=''){
+ arr.push({field:"check_date",value:data.form.check_dateStart+"至"+data.form.check_dateEnd,type:'DAT'})
+
+ }
+ /*限改时间*/
+ if(data.form.alter_timeStart!=null && data.form.alter_timeStart!='' && data.form.alter_timeEnd!=null && data.form.alter_timeEnd!=''){
+ arr.push({field:"alter_time",value:data.form.alter_timeStart+"至"+data.form.alter_timeEnd,type:'DAT'})
+
+ }
+ data.query_condition=arr
+ return request({
+ headers:{
+ 'token': getTokenAndVerify().token,
+ 'verify':getTokenAndVerify().verify
+ },
+ url: "/taboi/danger/company_list",
+ contentType: "application/json",
+ method: 'POST',
+ data
+ });
+}
+
diff --git a/src/api/sgyhpczl/hiddenDangerRegistration.js b/src/api/sgyhpczl/hiddenDangerRegistration.js
index b92ddc5..56705da 100644
--- a/src/api/sgyhpczl/hiddenDangerRegistration.js
+++ b/src/api/sgyhpczl/hiddenDangerRegistration.js
@@ -3,6 +3,10 @@
export function getPageList(data) {
var arr=[]
+ /*举一反三ID*/
+ if(data.form.jyfsId!=null && data.form.jyfsId!=''){
+ arr.push({field:"jyfsId",value:data.form.jyfsId,type:'OPT'})
+ }
/*编号*/
if(data.form.number!=null && data.form.number!=''){
arr.push({field:"number",value:data.form.number,type:'TXT'})
diff --git a/src/api/sgyhpczl/oneFromanother.js b/src/api/sgyhpczl/oneFromanother.js
index a780077..7b6b447 100644
--- a/src/api/sgyhpczl/oneFromanother.js
+++ b/src/api/sgyhpczl/oneFromanother.js
@@ -5,12 +5,12 @@
export function getPageList(data) {
var arr=[]
/*下发单位*/
- if(data.form.ht_typesub!=null && data.form.ht_typesub!=''){
- arr.push({field:"ht_typesub",value:data.form.ht_typesub,type:'OPT'})
+ if(data.form.push_branch!=null && data.form.push_branch!=''){
+ arr.push({field:"push_branch",value:data.form.push_branch,type:'OPT'})
}
/*隐患单位*/
- if(data.form.ht_branch!=null && data.form.ht_branch!=''){
- arr.push({field:"ht_branch",value:data.form.ht_branch,type:'TXT'})
+ if(data.form.ht_community!=null && data.form.ht_community!=''){
+ arr.push({field:"ht_community",value:data.form.ht_community,type:'TXT'})
}
/*隐患类别*/
if(data.form.ht_typesub!=null && data.form.ht_typesub!=''){
@@ -25,8 +25,8 @@
arr.push({field:"address",value:data.form.address,type:'TXT'})
}
/*检查类别*/
- if(data.form.ht_typesub!=null && data.form.ht_typesub!=''){
- arr.push({field:"ht_typesub",value:data.form.ht_typesub,type:'OPT'})
+ if(data.form.checktype!=null && data.form.checktype!=''){
+ arr.push({field:"checktype",value:data.form.checktype,type:'OPT'})
}
/*隐患内容*/
if(data.form.ht_content!=null && data.form.ht_content!=''){
@@ -48,7 +48,57 @@
data
});
}
-
-
+//不存在保存
+export function noExistSave(data) {
+ return request({
+ headers:{
+ 'token': getTokenAndVerify().token,
+ 'verify':getTokenAndVerify().verify
+ },
+ url: "/taboi/analogy/no_exist_save",
+ contentType: "application/json",
+ method: 'POST',
+ data
+ });
+}
+//不存在结果详情
+export function selfCheckNotInfo(params) {
+ return request({
+ headers: {
+ 'token': getTokenAndVerify().token,
+ 'verify': getTokenAndVerify().verify
+ },
+ url: '/taboi/danger/self_check_not_info',
+ // '?id=24871&type=0',
+ contentType: "multipart/form-data",
+ method: 'GET',
+ params:params?params:{}
+ });
+}
+//撤销
+export function revoke(id) {
+ return request({
+ headers:{
+ 'token': getTokenAndVerify().token,
+ 'verify':getTokenAndVerify().verify
+ },
+ contentType: "multipart/form-data",
+ url: "/taboi/analogy/revoke_do?id="+id,
+ method: 'GET',
+ });
+}
+//导出
+export function analogy_export_do(data) {
+ return request({
+ headers: {
+ 'token': getTokenAndVerify().token,
+ 'verify': getTokenAndVerify().verify
+ },
+ url: '/taboi/excel/analogy_export_do',
+ method: 'POST',
+ responseType: 'arraybuffer',
+ data
+ });
+}
diff --git a/src/api/sgyhpczl/oneFromanotherN.js b/src/api/sgyhpczl/oneFromanotherN.js
new file mode 100644
index 0000000..bd71dd3
--- /dev/null
+++ b/src/api/sgyhpczl/oneFromanotherN.js
@@ -0,0 +1,119 @@
+import request from '@/utils/request';
+import {getTokenAndVerify} from "@/api/sgyhpczl/auth";
+
+
+export function getPageList(data) {
+ var arr=[]
+ /*隐患单位*/
+ if(data.form.check_main_branch!=null && data.form.check_main_branch!=''){
+ arr.push({field:"check_main_branch",value:data.form.check_main_branch,type:'TXT'})
+ }
+ /*检查类别*/
+ if(data.form.checktype!=null && data.form.checktype!=''){
+ arr.push({field:"checktype",value:data.form.checktype,type:'OPT'})
+ }
+ /*被检单位*/
+ if(data.form.ht_community!=null && data.form.ht_community!=''){
+ arr.push({field:"ht_community",value:data.form.ht_community,type:'TXT'})
+ }
+ /*隐患级别*/
+ if(data.form.ht_level!=null && data.form.ht_level!=''){
+ arr.push({field:"ht_level",value:data.form.ht_level,type:'OPT'})
+ }
+ /*隐患类别*/
+ if(data.form.ht_typesub!=null && data.form.ht_typesub!=''){
+ arr.push({field:"ht_typesub",value:data.form.ht_typesub,type:'OPT'})
+ }
+ /*隐患地点*/
+ if(data.form.address!=null && data.form.address!=''){
+ arr.push({field:"address",value:data.form.address,type:'TXT'})
+ }
+ /*隐患内容*/
+ if(data.form.ht_content!=null && data.form.ht_content!=''){
+ arr.push({field:"ht_content",value:data.form.ht_content,type:'TXT'})
+ }
+ /*发送单位*/
+ if(data.form.workGroupName!=null && data.form.workGroupName!=''){
+ arr.push({field:"workGroupName",value:data.form.workGroupName,type:'TXT'})
+ }
+ /*检查时间*/
+ if(data.form.check_dateStart!=null && data.form.check_dateStart!='' && data.form.check_dateEnd!=null && data.form.check_dateEnd!=''){
+ arr.push({field:"check_date",value:data.form.check_dateStart+"至"+data.form.check_dateEnd,type:'DAT'})
+ }
+ data.query_condition=arr
+ return request({
+ headers:{
+ 'token': getTokenAndVerify().token,
+ 'verify':getTokenAndVerify().verify
+ },
+ url: "/taboi/analogy/danger_inner_list",
+ contentType: "application/json",
+ method: 'POST',
+ data
+ });
+}
+//新增
+export function save(data) {
+ return request({
+ headers:{
+ 'token': getTokenAndVerify().token,
+ 'verify':getTokenAndVerify().verify
+ },
+ url: "/taboi/analogy/save_do",
+ contentType: "application/json",
+ method: 'POST',
+ data
+ });
+}
+//编辑
+export function edit(data) {
+ return request({
+ headers:{
+ 'token': getTokenAndVerify().token,
+ 'verify':getTokenAndVerify().verify
+ },
+ url: "/taboi/analogy/edit_do",
+ contentType: "application/json",
+ method: 'POST',
+ data
+ });
+}
+
+//删除
+export function del(data) {
+ return request({
+ headers:{
+ 'token': getTokenAndVerify().token,
+ 'verify':getTokenAndVerify().verify
+ },
+ url: "/taboi/analogy/del_do?id=" + data,
+ contentType: "multipart/form-data",
+ method: 'POST'
+ });
+}
+//发送
+export function send(data) {
+ return request({
+ headers:{
+ 'token': getTokenAndVerify().token,
+ 'verify':getTokenAndVerify().verify
+ },
+ url: "/taboi/analogy/inner_send_do",
+ contentType: "application/x-www-form-urlencoded",
+ method: 'POST',
+ data
+ });
+}
+//回收
+export function revoke(data) {
+ return request({
+ headers:{
+ 'token': getTokenAndVerify().token,
+ 'verify':getTokenAndVerify().verify
+ },
+ url: "/taboi/analogy/inner_revoke_do",
+ contentType: "application/x-www-form-urlencoded",
+ method: 'POST',
+ data
+ });
+}
diff --git a/src/api/sgyhpczl/safetyHazardAccount.js b/src/api/sgyhpczl/safetyHazardAccount.js
index 2d120b3..f73fcbc 100644
--- a/src/api/sgyhpczl/safetyHazardAccount.js
+++ b/src/api/sgyhpczl/safetyHazardAccount.js
@@ -83,15 +83,31 @@
}
-export function danger_export_do(data) {
+//督察督办
+export function inspect_do(data) {
return request({
- headers: {
+ headers:{
'token': getTokenAndVerify().token,
- 'verify': getTokenAndVerify().verify
+ 'verify':getTokenAndVerify().verify
},
- url: '/taboi/excel/danger_export_do',
- method: 'post',
- responseType: 'arraybuffer',
- data
+ url: "/taboi/danger/inspect_do",
+ contentType: "application/json",
+ method: 'POST',
+ data,
+ });
+}
+
+
+//举一反三
+export function draw_inferences_do(data) {
+ return request({
+ headers:{
+ 'token': getTokenAndVerify().token,
+ 'verify':getTokenAndVerify().verify
+ },
+ url: "/taboi/danger/draw_inferences_do",
+ contentType: "application/json",
+ method: 'POST',
+ data,
});
}
diff --git a/src/permission.js b/src/permission.js
index 409e367..2fd8899 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -16,7 +16,7 @@
if (!permissionRoles) return true
return roles.some(role => permissionRoles.indexOf(role) >= 0)
}
-const whiteList = ['/login', '/auth-redirect','/agreement','/register','/productionEquipment','/instrumentData','/oneFromanother','/hiddenDangerTroubleshootingList','/preview','/inspectionNotExist','/send','/Issuedbysuperiors','/oneFromanotherN','/summaryPotentialSafetyHzards','/safetyHazardAccount','/superiorsSend','/accountSend','/existN','/exist','/hazardSource','/safetyedit','/Dualbase','/supervision','/inferOtherThings']// no redirect whitelist
+const whiteList = ['/login', '/auth-redirect','/agreement','/register','/productionEquipment','/instrumentData','/oneFromanother','/hiddenDangerTroubleshootingList','/preview','/inspectionNotExist','/send','/Issuedbysuperiors','/oneFromanotherN','/summaryPotentialSafetyHzards','/safetyHazardAccount','/superiorsSend','/accountSend','/existN','/exist','/hazardSource','/safetyedit','/Dualbase','/supervision','/inferOtherThings','/DualbaseLost','/summaryList','/summaryForm','/chartAnalysis','/careabout','/troubleshooting']// no redirect whitelist
router.beforeEach((to, from, next) => {
NProgress.start() // start progress bar
diff --git a/src/router/index.js b/src/router/index.js
index 1befa24..eb457d4 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -443,6 +443,13 @@
// meta: { title: '安全隐患台账-编辑', icon: '' }
hidden: true
},
+ {
+ path: '/DualbaseLost',
+ // name: '安全隐患台账-双基考核',
+ component: () => import('@/views/safetyHazardAccount/DualbaseLost'),
+ // meta: { title: '安全隐患台账-编辑', icon: '' }
+ hidden: true
+ },
{
path: '/supervision',
// name: '安全隐患台账-督查督办',
@@ -457,6 +464,44 @@
// meta: { title: '安全隐患台账-举一反三', icon: '' }
hidden: true
},
+ {
+ path: '/summaryList',
+ // name: '安全隐患台账-举一反三',
+ component: () => import('@/views/summaryPotentialSafetyHzards/summaryList'),
+ // meta: { title: '安全隐患台账-举一反三', icon: '' }
+ hidden: true
+ },
+ {
+ path: '/summaryForm',
+ // name: '安全隐患汇总-发送隐患单',
+ component: () => import('@/views/summaryPotentialSafetyHzards/summaryForm'),
+ // meta: { title: '安全隐患汇总-发送隐患单', icon: '' }
+ hidden: true
+ },
+ {
+ id: 12,
+ parentId: 0,
+ path: '/chartAnalysis',
+ name: '隐患图表分析',
+ component: () => import('@/views/chartAnalysis'),
+ meta: { title: '隐患图表分析', icon: '' }
+ },
+ {
+ id: 13,
+ parentId: 0,
+ path: '/careabout',
+ name: '您关注的隐患',
+ component: () => import('@/views/careabout'),
+ meta: { title: '您关注的隐患', icon: '' }
+ },
+ {
+ id: 14,
+ parentId: 0,
+ path: '/troubleshooting',
+ name: '隐患排查会议',
+ component: () => import('@/views/troubleshooting'),
+ meta: { title: '隐患排查会议', icon: '' }
+ },
]
}
]
diff --git a/src/views/Issuedbysuperiors/index.vue b/src/views/Issuedbysuperiors/index.vue
index 7a184ab..0622140 100644
--- a/src/views/Issuedbysuperiors/index.vue
+++ b/src/views/Issuedbysuperiors/index.vue
@@ -136,16 +136,16 @@
<el-form-item style="text-align:center;padding:0 50px">
<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">
<el-col :span="10">
- <el-radio-group v-model="radio1">
- <el-radio-button label="待发送">待发送</el-radio-button>
- <el-radio-button label="整改中">整改中</el-radio-button>
- <el-radio-button label="待复查">待复查</el-radio-button>
- <el-radio-button label="整改完成">整改完成</el-radio-button>
+ <el-radio-group v-model="YHType">
+ <el-radio-button label="1">待发送</el-radio-button>
+ <el-radio-button label="2">整改中</el-radio-button>
+ <el-radio-button label="3">待复查</el-radio-button>
+ <el-radio-button label="end">整改完成</el-radio-button>
</el-radio-group>
</el-col>
</el-row>
@@ -192,7 +192,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="流程操作" v-if="radio1=='待发送'" align="center" fixed="right">
+ <el-table-column prop="date" label="流程操作" v-if="YHType=='1'" align="center" fixed="right">
<template slot-scope="scope">
<el-button @click="handleClick(scope.row)" type="text" size="small">点击发送</el-button>
</template>
@@ -220,12 +220,13 @@
</div>
</template>
<script>
-import {getPageList,delDanger} from "@/api/sgyhpczl/hiddenDangerRegistration";
-import {initJCBM ,initYHLX, initBC ,initJCLB ,initYHBM ,initYHJB,initLlr} from "@/api/sgyhpczl/initSelect";
+import {getPageList} from "@/api/sgyhpczl/Issuedbysuperiors";
+import {danger_export_do} from "@/api/sgyhpczl/hiddenDangerRectification";
+import {initJCBM ,initYHLX, initBC ,initJCLB ,initYHBM ,initYHJB,initLlr,initReformStatus} from "@/api/sgyhpczl/initSelect";
export default {
data() {
return {
- radio1:'待发送',
+ YHType:'1',
selectedList:[],
reList:[{label:"未关联",value:0}],
llrList:[],
@@ -239,6 +240,7 @@
JCLBList:[],
YHBMList:[],
YHJBList:[],
+ YHZTList:[],
tableData: [],
listQuery:{
page:1,
@@ -260,6 +262,12 @@
this.initJCLB()
this.initLlr()
this.initYHBM()
+ this.initYHZT()
+ },
+ watch:{
+ "YHType":function (newVal,oldVal){
+ this.getPageList()
+ }
},
methods:{
deleteBatch(){
@@ -356,6 +364,7 @@
},
getPageList(){
this.listQuery.page=1
+ this.listQuery.form.step = this.YHType;
this.checkTime()
getPageList(this.listQuery).then(res=>{
if (res.data.ok==1) {
@@ -402,6 +411,16 @@
initYHJB().then(res=>{
if (res.data.ok==1){
this.YHJBList=res.data.data
+ } else{
+ this.$message({type:'error', message:res.data.msg, duration:3000})
+ }
+ })
+ },
+ initYHZT(){
+ initReformStatus().then(res=>{
+ if (res.data.ok==1){
+ this.YHZTList=res.data.data
+ console.log(this.YHZTList)
} else{
this.$message({type:'error', message:res.data.msg, duration:3000})
}
@@ -461,6 +480,26 @@
.catch(error =>{
});
},
+ exportData() {
+ var requestData = this.listQuery;
+ requestData.export_type = 5;
+ //删除分页参数
+ this.$delete(requestData, 'page')
+ this.$delete(requestData, 'limit')
+ danger_export_do(requestData).then(res => {
+ 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>
diff --git a/src/views/careabout/index.vue b/src/views/careabout/index.vue
new file mode 100644
index 0000000..2cdb1e8
--- /dev/null
+++ b/src/views/careabout/index.vue
@@ -0,0 +1,467 @@
+<template>
+ <div class="app-container">
+ <el-form ref="form" :inline="true" class="inquire" :model="form" label-width="100px">
+ <el-form-item label="编号">
+ <el-input v-model="listQuery.form.number" style="width:202px" placeholder="请输入内容"></el-input>
+ </el-form-item>
+ <el-form-item label="检查单位">
+ <el-select v-model="listQuery.form.check_main_branch" placeholder="请选择" @change="changeJCDW">
+ <el-option
+ v-for="item in JCDWList"
+ :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.check_branch" placeholder="请选择">
+ <el-option
+ v-for="item in JCBMList"
+ :key="item.value"
+ :label="item.value"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="检查人">
+ <el-input v-model="listQuery.form.check_man" style="width:202px" placeholder="请输入内容"></el-input>
+ </el-form-item>
+ <el-form-item label="隐患单位">
+ <el-input v-model="listQuery.form.ht_community" style="width:202px" :disabled="true"></el-input>
+ <!--<el-select v-model="listQuery.form.ht_community" placeholder="请选择" @change="changeYHDW">
+ <el-option
+ v-for="item in JCDWList"
+ :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.ht_branch" placeholder="请选择">
+ <el-option
+ v-for="item in YHBMList"
+ :key="item.branch_id"
+ :label="item.branch_name"
+ :value="item.branch_id">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="隐患类别">
+ <el-select v-model="listQuery.form.ht_typesub" placeholder="请选择">
+ <el-option
+ v-for="item in YHLXList"
+ :key="item.value"
+ :label="item.value"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="隐患级别">
+ <el-select v-model="listQuery.form.ht_level" placeholder="请选择">
+ <el-option
+ v-for="item in YHJBList"
+ :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.checktype" placeholder="请选择">
+ <el-option
+ v-for="item in JCLBList"
+ :key="item.value"
+ :label="item.value"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="隐患地点">
+ <el-input v-model="listQuery.form.address" style="width:202px" placeholder="请输入内容"></el-input>
+ </el-form-item>
+ <el-form-item label="隐患内容">
+ <el-input v-model="listQuery.form.ht_content" style="width:202px" placeholder="请输入内容"></el-input>
+ </el-form-item>
+ <el-form-item label="班次">
+ <el-select v-model="listQuery.form.check_class" placeholder="请选择">
+ <el-option
+ v-for="item in BCList"
+ :key="item.value"
+ :label="item.value"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="深入现场情况">
+ <el-select v-model="listQuery.form.DTRisk_bankId" placeholder="请选择">
+ <el-option
+ 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-option
+ v-for="item in llrList"
+ :key="item.id"
+ :label="item.realName"
+ :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item> -->
+ <el-form-item label="检查时间">
+ <el-col :span="11">
+ <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.check_dateStart" style="width: 100%;" value-format="yyyy-MM-dd"></el-date-picker>
+ </el-col>
+ <el-col style="text-align:center" :span="2">-</el-col>
+ <el-col :span="11">
+ <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.check_dateEnd" style="width: 100%;" value-format="yyyy-MM-dd"></el-date-picker>
+ </el-col>
+ </el-form-item>
+ <el-form-item label="限改时间">
+ <el-col :span="11">
+ <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.alter_timeStart" value-format="yyyy-MM-dd" style="width: 100%;"></el-date-picker>
+ </el-col>
+ <el-col style="text-align:center" :span="2">-</el-col>
+ <el-col :span="11">
+ <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.alter_timeEnd" value-format="yyyy-MM-dd" style="width: 100%;"></el-date-picker>
+ </el-col>
+ </el-form-item>
+ <el-form-item style="text-align:center;padding:0 50px">
+ <el-button type="primary" class="btns" size="small" icon="el-icon-search" @click="getPageList()">查询</el-button>
+ <el-button type="primary" class="btns" size="small" icon="
+el-icon-refresh-right" @click="reset()">重置</el-button>
+ <el-button type="primary" class="btns" size="small" icon="el-icon-upload2">导出excel</el-button>
+ </el-form-item>
+ </el-form>
+ <el-row class="title-center">
+ <el-col :span="10">
+ <el-radio-group v-model="listQuery.type" @change="typeChange">
+ <el-radio-button label="0">督查督办</el-radio-button>
+ <el-radio-button label="1">特别关注</el-radio-button>
+ <el-radio-button label="2">全部</el-radio-button>
+ </el-radio-group>
+ </el-col>
+ <div v-if="table1">
+ <el-col :span="14" style="text-align:right;">
+ <el-button class="btns" type="primary" size="small" >特别关注</el-button>
+ <el-button class="btns" type="primary" size="small" @click="sendBath()">管理关注</el-button>
+ </el-col>
+ </div>
+ </el-row>
+ <el-table :data="tableData" style="width: 100%" @selection-change="changeBox">
+ <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="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="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="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="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="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>
+ <el-table-column label="隐患处理状态" align="center">
+ <template slot-scope="scope">
+ <span v-if="scope.row.step =='1'">初始状态</span>
+ <span v-if="scope.row.step =='2'">整改中</span>
+ <span v-if="scope.row.step =='3'">复查中</span>
+ <span v-if="scope.row.step =='end'">处理结束</span>
+ </template>
+ </el-table-column>
+ <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>
+ <span v-else>已关联</span>
+ </template>
+ </el-table-column>
+ <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" fixed="right">
+ <template slot-scope="scope">
+ <el-button @click="handleClick(scope.row)" type="text" size="small">点击发送</el-button>
+ </template>
+ </el-table-column>
+ <el-table-column prop="date" label="基本操作" align="center" fixed="right">
+ <template slot-scope="scope">
+ <el-button @click="updateClick(scope.row)" type="text" size="small">编辑</el-button>
+ <el-button @click="deleteClick(scope.row)" type="text" size="small">删除</el-button>
+ </template>
+ </el-table-column> -->
+ </el-table>
+ <div style="text-align: right">
+ <el-pagination
+ v-show="recordTotal > 0"
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange"
+ :current-page="currentPage"
+ :page-sizes="[10, 20, 30, 50]"
+ :page-size="pageSize"
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="recordTotal"
+ >
+ </el-pagination>
+ </div>
+
+ </div>
+</template>
+<script>
+ import { getPageList, analogy_export_do} from "@/api/sgyhpczl/oneFromanotherN"
+ import {initJCBM, initYHLX, initJCLB, initYHJB} from "@/api/sgyhpczl/initSelect";
+
+ export default{
+ data(){
+ return{
+ listQuery:{
+ page:1,
+ limit:10,
+ type: 0,
+ form:{},
+ },
+ radio1:'待发送',
+ table1:true,
+ table2:false,
+
+
+
+ currentPage: 1,
+ pageSize: 10,
+ recordTotal: 0,
+ XFDWList:[],
+ YHLBList:[],
+ YHJBList:[],
+ JCLBList:[],
+ tableData:[],
+ selectedList:[],
+ listLoading: false,
+ selfInspectVisible: false,
+ selfInspectForm:{
+ id: '',
+ markUserName:'',
+ markDate:'',
+ remark:'',
+ },
+ selfInspectFormRules:{
+ markUserName: [{ required: true, message: '自查人不能为空', trigger: 'blur' }],
+ markDate: [{ required: true, message: '自查时间不能为空', trigger: 'blur' }]
+ },
+
+ }
+ },
+ mounted() {
+ this.getPageList();
+ this.initJCLB();
+ this.initXFDW();
+ this.initYHJB();
+ this.initYHLB();
+ },
+ methods:{
+ sendBath(){
+ this.$router.push({
+ path:'/existN'
+ })
+ },
+ handleClick(data,val){
+ if(val=='存在'){
+ this.$router.push({
+ path:'/exist'
+ })
+ }
+ },
+ handoff(index){
+ if(index==1){
+ this.table1=false
+ this.table2=true
+ this.listQuery.type = 2
+ console.log(this.listQuery.type)
+ this.getPageList()
+ }else{
+ this.table1=true
+ this.table2=false
+ }
+ },
+ initXFDW(){
+ initJCBM(1).then(res=>{
+ if (res.data.ok==1){
+ this.XFDWList=res.data.data
+ } else{
+ this.$message({type:'error', message:res.data.msg, duration:3000})
+ }
+ })
+ },
+ initYHLB(){
+ initYHLX().then(res=>{
+ if (res.data.ok==1){
+ this.YHLBList=res.data.data
+ } else{
+ this.$message({type:'error', message:res.data.msg, duration:3000})
+ }
+ })
+ },
+ initYHJB(){
+ initYHJB().then(res=>{
+ if (res.data.ok==1){
+ this.YHJBList=res.data.data
+ } else{
+ this.$message({type:'error', message:res.data.msg, duration:3000})
+ }
+ })
+ },
+ initJCLB(){
+ initJCLB().then(res=>{
+ if (res.data.ok==1){
+ this.JCLBList=res.data.data
+ } else{
+ this.$message({type:'error', message:res.data.msg, duration:3000})
+ }
+ })
+ },
+ checkTime(){
+ if(this.listQuery.form.check_dateStart!=null && this.listQuery.form.check_dateStart!=''){
+ if(this.listQuery.form.check_dateEnd!=null && this.listQuery.form.check_dateEnd!=''){
+ }else {
+ this.$message({type:'error', message:"请选择检查结束时间", duration:3000})
+ return
+ }
+
+ }
+ if(this.listQuery.form.check_dateEnd!=null && this.listQuery.form.check_dateEnd!=''){
+ if(this.listQuery.form.check_dateStart!=null && this.listQuery.form.check_dateStart!=''){
+ }else {
+ this.$message({type:'error', message:"请选择检查开始时间", duration:3000})
+ return
+ }
+ }
+ },
+ //搜索
+ getPageList(){
+ this.listQuery.page=1
+ this.checkTime()
+ getPageList(this.listQuery).then(res=>{
+ if (res.data.ok==1) {
+ this.tableData = res.data.data.items
+ this.recordTotal=res.data.data.total
+ }else{
+ this.$message({type:'error', message:res.data.msg, duration:3000})
+ }
+ })
+ },
+ //重置
+ reset(){
+ this.listQuery.form={};
+ this.getPageList()
+ },
+ handleSizeChange(val){
+ this.listQuery.limit = val
+ this.getPageListForPagination();
+ },
+ handleCurrentChange(val){
+ this.listQuery.page = val
+ this.getPageListForPagination();
+ },
+ getPageListForPagination(){
+ this.checkTime()
+ getPageList(this.listQuery).then(res=>{
+ if (res.data.ok==1) {
+ this.tableData = res.data.data.items
+ this.recordTotal=res.data.data.total
+ }else{
+ this.$message({type:'error', message:res.data.msg, duration:3000})
+ }
+ })
+ },
+ typeChange(val){
+ this.listQuery.type = val;
+ this.getPageList()
+ },
+ handleSelectionChange(val){
+ this.selectedList = []
+ val.forEach((item) => {
+ this.selectedList.push(item)
+ })
+ },
+ exportData() {
+ var requestData = this.listQuery;
+ //删除分页参数
+ this.$delete(requestData, 'page')
+ this.$delete(requestData, 'limit')
+ analogy_export_do(requestData).then(res => {
+ 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)
+ })
+ },
+ //日期格式转换
+ 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() + ' '
+ },
+ }
+ }
+</script>
+<style scoped>
+.inquire {
+ display: flex;
+ justify-content: left;
+ flex-wrap: wrap;
+}
+.inquire .el-form-item {
+ padding: 0 40px;
+}
+.title-center {
+ padding: 20px 0;
+}
+
+.btns {
+ background-color: #034ea2;
+ border: 1px solid #034ea2;
+}
+
+.title-center /deep/ .el-radio-button:first-child .el-radio-button__inner {
+ border: none;
+}
+
+.title-center /deep/ .el-radio-button__inner {
+ border: none;
+ border-radius: 0px;
+}
+
+.title-center /deep/ .el-radio-button__orig-radio:checked + .el-radio-button__inner {
+ background-color: #034ea2;
+ background-color: #034ea2;
+}
+</style>
diff --git a/src/views/chartAnalysis/index.vue b/src/views/chartAnalysis/index.vue
new file mode 100644
index 0000000..bf6f6da
--- /dev/null
+++ b/src/views/chartAnalysis/index.vue
@@ -0,0 +1,170 @@
+<template>
+ <div>
+ <div class="whole_top">
+ <el-form ref="form" :inline="true" :model="form" label-width="100px">
+ <div class="top">
+ <el-form-item>
+ <el-checkbox-group v-model="checkList">
+ <el-checkbox label="复选框 A"></el-checkbox>
+ <el-checkbox label="复选框 B"></el-checkbox>
+ <el-checkbox label="复选框 C"></el-checkbox>
+ </el-checkbox-group>
+ </el-form-item>
+ <el-form-item>
+ <el-checkbox-group v-model="checkList">
+ <el-checkbox label="复选框 A"></el-checkbox>
+ <el-checkbox label="复选框 B"></el-checkbox>
+ <el-checkbox label="复选框 C"></el-checkbox>
+ </el-checkbox-group>
+ </el-form-item>
+ </div>
+ <div class="center" style="text-align: center;padding-top: 10px;">
+ <el-form-item label="检查时间：">
+ <el-date-picker
+ v-model="form.time"
+ type="daterange"
+ range-separator="至"
+ start-placeholder="开始日期"
+ end-placeholder="结束日期">
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item>
+ <el-button class="btn" size="small" type="primary" @click="close()"
+ >汇总</el-button>
+ <el-button class="btn" size="small" type="primary" @click="close()"
+ >导出Excel</el-button>
+ </el-form-item>
+ </div>
+ </el-form>
+<!-- <el-table-->
+<!-- :data="tableData"-->
+<!-- style="width: 100%">-->
+<!-- <el-table-column align="center" label="众泰煤焦化-安全隐患台帐">-->
+<!-- <el-table-column-->
+<!-- prop="name"-->
+<!-- label="隐患部门\隐患专业"-->
+<!-- align="center">-->
+<!-- </el-table-column>-->
+<!-- <el-table-column-->
+<!-- prop="province"-->
+<!-- label="采掘"-->
+<!-- align="center">-->
+<!-- </el-table-column>-->
+<!-- <el-table-column-->
+<!-- prop="city"-->
+<!-- label="生产"-->
+<!-- width="120"-->
+<!-- align="center">-->
+<!-- </el-table-column>-->
+<!-- <el-table-column-->
+<!-- prop="address"-->
+<!-- label="合计"-->
+<!-- width="300"-->
+<!-- align="center">-->
+<!-- </el-table-column>-->
+<!-- </el-table-column>-->
+<!-- </el-table>-->
+ <div style="color: #c5021a;margin-top: 20px;">
+ <div>温馨提示：</div>
+ <div>点选可查询隐患详情。</div>
+ </div>
+ </div>
+ </div>
+</template>
+
+<script>
+export default {
+ name: "index",
+ data() {
+ return {
+ form: {
+ time: '',
+ region: '',
+ date1: '',
+ date2: '',
+ delivery: false,
+ type: [],
+ resource: '',
+ desc: ''
+ },
+ checkList: ['复选框 A'],
+ tableData: [{
+ name: '财务部',
+ province: '1',
+ city: '4',
+ address: '1'
+ }, {
+ name: '党委副书记',
+ province: '0',
+ city: '2',
+ address: '0'
+ }, {
+ name: '众泰煤焦化',
+ province: '2',
+ city: '3',
+ address: '1'
+ }, {
+ name: '王小虎',
+ province: '3',
+ city: '9',
+ address: '2'
+ }]
+ }
+ }
+}
+</script>
+
+<style scoped>
+.top{
+ padding: 10px 5px;
+ background: #e4edf4;
+}
+/*下拉框图标隐藏*/
+.whole_top .select /deep/ .el-input__suffix-inner .is-reverse{
+ display: none;
+}
+.whole_top .select /deep/ .el-input__suffix-inner .el-icon-arrow-up{
+ display: none;
+}
+/*设下拉框颜色*/
+.select /deep/.el-input__inner {
+ border: 1px solid #c5dbec;
+ font-weight: bold;
+ background: #dfeffc;
+ /*.el-icon-circle-close*/
+}
+.whole_top .select /deep/.el-select .el-input__inner:focus {
+ color: #e6860b;
+}
+.select /deep/ .is-focus .el-select__tags-text{
+ color: #000000;
+}
+/*下拉框选值之后的样式*/
+.select /deep/ .el-tag.el-tag--info {
+ background-color: transparent;;
+ border-color: transparent;
+ font-weight: bold;
+ color: #e6860b;
+}
+/*placeholder颜色修改*/
+.whole_top ::-webkit-input-placeholder {
+ color: #000000;
+}
+.whole_top :-moz-placeholder {
+ color: #000000;
+}
+.whole_top ::-moz-placeholder{
+ color: #000000;
+}
+.whole_top :-ms-input-placeholder {
+ color: #000000;
+}
+/*日期*/
+/deep/ .el-date-editor .el-range-separator{
+ width: auto;
+}
+.btn{
+ background-color: #034ea2;
+ border: 1px solid #034ea2;
+}
+</style>
diff --git a/src/views/hiddenDangerRegistration/hiddenDangerAdd.vue b/src/views/hiddenDangerRegistration/hiddenDangerAdd.vue
index bb4ff05..8835df8 100644
--- a/src/views/hiddenDangerRegistration/hiddenDangerAdd.vue
+++ b/src/views/hiddenDangerRegistration/hiddenDangerAdd.vue
@@ -385,6 +385,7 @@
this.initWXY()
this.initDangerRebound()
this.id = this.$route.query.id;
+ this.route = this.$route.query.route;
if( this.id!=null && this.id!=''){
this.initInfo();
this.addShow=false
@@ -571,9 +572,15 @@
returnIndex(){
- this.$router.push({
- path:"/hiddenDangerRegistration"
- })
+ if(this.route!=null){
+ this.$router.push({
+ path:"/"+this.route
+ })
+ }else{
+ this.$router.push({
+ path:"/hiddenDangerRegistration"
+ })
+ }
},
submitForm(formName) {
this.$refs[formName].validate((valid) => {
@@ -613,9 +620,15 @@
editDanger(param).then(res=>{
if (res.data.ok==1){
this.$message({type:'success', message:"编辑成功", duration:3000})
- this.$router.push({
- path:"/hiddenDangerRegistration"
- })
+ if(this.route!=null){
+ this.$router.push({
+ path:"/"+this.route
+ })
+ }else{
+ this.$router.push({
+ path:"/hiddenDangerRegistration"
+ })
+ }
}else {
this.$message({type:'error', message:res.data.msg, duration:3000})
}
diff --git a/src/views/oneFromanother/exist.vue b/src/views/oneFromanother/exist.vue
index ab40f32..b1a35e1 100644
--- a/src/views/oneFromanother/exist.vue
+++ b/src/views/oneFromanother/exist.vue
@@ -1,6 +1,6 @@
<template>
- <div class="app-container">
- <div style="">
+ <div class="app-container" >
+ <div v-if="type=='0'" style="">
<Titlename title="录入隐患单页面"></Titlename>
<div class="whole-form">
<el-form
@@ -96,7 +96,7 @@
<el-table-column type="index" width="55" align="center" label="序号"></el-table-column>
<el-table-column prop="ht_branch" align="center" label="隐患部门"></el-table-column>
<el-table-column prop="address" align="center" label="地点"></el-table-column>
- <el-table-column prop="ht_content" align="center" label="隐患内容"></el-table-column>
+ <el-table-column prop="ht_content" show-overflow-tooltip align="center" label="隐患内容"></el-table-column>
<el-table-column prop="measure" align="center" label="整改措施"></el-table-column>
<el-table-column prop="ht_typesub" align="center" label="隐患类别"></el-table-column>
<el-table-column prop="dangerousSource" align="center" label="关联危险源"></el-table-column>
@@ -112,11 +112,10 @@
<el-button
size="mini"
@click="editDanger(scope.row, scope.$index)"
- >添加
+ >编辑
</el-button>
<el-button
size="mini"
- v-if="addShow"
@click="deleteDanger(scope.row, scope.$index)"
>删除
</el-button>
@@ -139,7 +138,54 @@
</el-form>
</div>
</div>
+ <div v-else>
+ <el-table :data="detailTableData" 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="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="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="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="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="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>
+ <el-table-column label="隐患处理状态" align="center">
+ <template slot-scope="scope">
+ <span v-if="scope.row.step =='1'">初始状态</span>
+ <span v-if="scope.row.step =='2'">整改中</span>
+ <span v-if="scope.row.step =='3'">复查中</span>
+ <span v-if="scope.row.step =='end'">处理结束</span>
+ </template>
+ </el-table-column>
+ <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>
+ <span v-else>已关联</span>
+ </template>
+ </el-table-column>
+ <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>
+ <el-button style="margin-top: 20px" @click="returnIndex">关闭</el-button>
+ </div>
<el-dialog
:title="title"
:visible.sync="dialogVisible"
@@ -295,23 +341,35 @@
</el-row>
</el-form>
</el-dialog>
-
</div>
+
+
</template>
<script>
-import Titlename from "../../components/Titlename/index.vue";
+ import Titlename from "../../components/Titlename/index.vue";
-import {initJCBM ,initYHLX, initBC ,initJCLB ,initYHBM ,initYHJB,initLlr,initReformStatus,initYwks,initWxy} from "@/api/sgyhpczl/initSelect";
-import {saveDanger,initDangerRebound,getDangerInfo,editDanger} from '@/api/sgyhpczl/hiddenDangerRegistration'
-import {deepClone} from '@/utils'
+ import {
+ initBC,
+ initJCBM,
+ initJCLB,
+ initLlr,
+ initReformStatus,
+ initWxy,
+ initYHBM,
+ initYHJB,
+ initYHLX,
+ initYwks
+ } from "@/api/sgyhpczl/initSelect";
+ import {getPageList,initDangerRebound} from '@/api/sgyhpczl/hiddenDangerRegistration'
+ import {deepClone} from '@/utils'
-export default {
+ export default {
components: { Titlename },
name: "hiddenDangerList",
data() {
return {
- addShow:true,
+ type: '0',
id:'',
rowIndex:-1,
dangerList:[],
@@ -341,8 +399,8 @@
statusList:[],
YWKSList:[],
reboundList:[],
- ruleForm: {},
- rules: {
+ ruleForm: {},
+ rules: {
check_date: [{ required: true, message: '不能为空', trigger: 'blur' },],
check_class: [{ required: true, message: '不能为空', trigger: 'blur' },],
check_main_branch: [{ required: true, message: '不能为空', trigger: 'blur' },],
@@ -350,9 +408,20 @@
check_man: [{ required: true, message: '不能为空', trigger: 'blur' },],
checktype: [{ required: true, message: '不能为空', trigger: 'blur' },],
},
- tableData: [],
+ tableData: [],
+ paramsData: {},//上个页面参数
+ listQuery:{
+ page:1,
+ limit:10,
+ form:{},
+ },
+ currentPage: 1,
+ pageSize: 10,
+ recordTotal: 0,
+ detailTableData:[],//隐患详情列表
};
},
+
mounted(){
this.initBC()
this.initJCLB()
@@ -364,23 +433,34 @@
this.initYWKS()
this.initWXY()
this.initDangerRebound()
- this.id = this.$route.query.id;
- if( this.id!=null && this.id!=''){
- this.initInfo();
- this.addShow=false
+ this.type = this.$route.query.type;
+ if (this.type === '0'){
+ this.initInfo(this.$route.query.data);
+ }else {
+ this.listQuery.form.jyfsId = this.$route.query.data.id
+ this.getPageList();
}
},
methods: {
- async initInfo(){
- var res=await getDangerInfo(this.id)
- if (res.data.ok==1){
- this.ruleForm=res.data.data
- this.changeJCDW(res.data.data.check_main_branch)
- var obj=deepClone(res.data.data)
- this.tableData.push(obj)
-
- }
+ initInfo(data){
+ this.paramsData = this.$route.query.data;
+ this.ruleForm.jyfsId = data.id;
+ this.tableData[0] = {
+ address: data.address,
+ ht_content: data.ht_content,
+ ht_level: data.ht_level,
+ };
},
+
+ // async initInfo(){
+ // var res=await getDangerInfo(this.id)
+ // if (res.data.ok==1){
+ // this.ruleForm=res.data.data
+ // this.changeJCDW(res.data.data.check_main_branch)
+ // var obj=deepClone(res.data.data)
+ // this.tableData.push(obj)
+ // }
+ // },
initDangerRebound(){
initDangerRebound().then(res=>{
if (res.data.ok==1){
@@ -408,9 +488,18 @@
}
});
},
+ getPageList(){
+ this.listQuery.page=1
+ getPageList(this.listQuery).then(res=>{
+ if (res.data.ok==1) {
+ this.detailTableData = res.data.data.items
+ this.recordTotal=res.data.data.total
+ }else{
+ this.$message({type:'error', message:res.data.msg, duration:3000})
+ }
+ })
+ },
deleteDanger(row, index) {
-
-
this.$confirm('确认删除吗', '提示', {
confirmButtonText: '确认',
cancelButtonText: '取消',
@@ -552,55 +641,66 @@
returnIndex(){
this.$router.push({
- path:"/hiddenDangerRegistration"
+ path:"/oneFromanother"
})
+ },
+ judge(obj){
+ console.log(obj)
+ if (obj != null || ('ht_branch' in obj) || ('address' in obj) || ('ht_typesub' in obj) || ('dangerousSource' in obj)
+ || ('alter_time' in obj) || ('duty_officer' in obj) || ('alter_status' in obj) || ('Review' in obj) || ('DTRisk_bankId' in obj)){
+ return true;
+ }else {
+ return false;
+ }
},
submitForm(formName) {
this.$refs[formName].validate((valid) => {
+
if (valid) {
- if(this.tableData==null || this.tableData.length==0){
- this.$message({type:'error', message:"请添加隐患", duration:2000})
- }
this.ruleForm.items=this.tableData
- if(this.addShow){
- saveDanger(this.ruleForm).then(res=>{
- if (res.data.ok==1){
- this.$message({type:'success', message:"新增成功", duration:3000})
- this.$router.push({
- path:"/hiddenDangerRegistration"
- })
- }else {
- this.$message({type:'error', message:res.data.msg, duration:3000})
- }
- })
- }else {
- var param=deepClone(this.ruleForm)
- var obj=deepClone(this.tableData[0])
- param.ht_branch=obj.ht_branch
- param.address=obj.address
- param.ht_content=obj.ht_content
- param.measure=obj.measure
- param.ht_typesub=obj.ht_typesub
- param.DTRisk_bankId=obj.DTRisk_bankId
- param.DTRisk_level=obj.mriskLevel
- param.dangerousSource=obj.mriskPoint
- param.ht_level=obj.ht_level
- param.alter_time=obj.alter_time
- param.duty_officer=obj.duty_officer
- param.alter_status=obj.alter_status
- param.Review=obj.Review
- param.repeatId=obj.repeatId
- editDanger(param).then(res=>{
- if (res.data.ok==1){
- this.$message({type:'success', message:"编辑成功", duration:3000})
- this.$router.push({
- path:"/hiddenDangerRegistration"
- })
- }else {
- this.$message({type:'error', message:res.data.msg, duration:3000})
- }
- })
+ if(this.judge(this.tableData[0])){
+ this.$message({type:'error', message:"请完整录入隐患", duration:2000})
}
+ // if(this.addShow){
+ console.log(this.ruleForm)
+ saveDanger(this.ruleForm).then(res=>{
+ if (res.data.ok==1){
+ this.$message({type:'success', message:"保存成功", duration:3000})
+ this.$router.push({
+ path:"/oneFromanother"
+ })
+ }else {
+ this.$message({type:'error', message:res.data.msg, duration:3000})
+ }
+ })
+ // }else {
+ // var param=deepClone(this.ruleForm)
+ // var obj=deepClone(this.tableData[0])
+ // param.ht_branch=obj.ht_branch
+ // param.address=obj.address
+ // param.ht_content=obj.ht_content
+ // param.measure=obj.measure
+ // param.ht_typesub=obj.ht_typesub
+ // param.DTRisk_bankId=obj.DTRisk_bankId
+ // param.DTRisk_level=obj.mriskLevel
+ // param.dangerousSource=obj.mriskPoint
+ // param.ht_level=obj.ht_level
+ // param.alter_time=obj.alter_time
+ // param.duty_officer=obj.duty_officer
+ // param.alter_status=obj.alter_status
+ // param.Review=obj.Review
+ // param.repeatId=obj.repeatId
+ // editDanger(param).then(res=>{
+ // if (res.data.ok==1){
+ // this.$message({type:'success', message:"编辑成功", duration:3000})
+ // this.$router.push({
+ // path:"/hiddenDangerRegistration"
+ // })
+ // }else {
+ // this.$message({type:'error', message:res.data.msg, duration:3000})
+ // }
+ // })
+ // }
diff --git a/src/views/oneFromanother/index.vue b/src/views/oneFromanother/index.vue
index ec3b1fc..fed5586 100644
--- a/src/views/oneFromanother/index.vue
+++ b/src/views/oneFromanother/index.vue
@@ -2,7 +2,7 @@
<div class="app-container">
<el-form ref="form" :inline="true" class="inquire" :model="listQuery" label-width="80px">
<el-form-item label="下发单位">
- <el-select v-model="listQuery.form.ht_typesub" placeholder="请选择">
+ <el-select v-model="listQuery.form.push_branch" placeholder="请选择">
<el-option
v-for="item in XFDWList"
:key="item.value"
@@ -12,7 +12,7 @@
</el-select>
</el-form-item>
<el-form-item label="隐患单位">
- <el-input v-model="listQuery.form.ht_branch" style="width:202px"></el-input>
+ <el-input v-model="listQuery.form.ht_community" style="width:202px"></el-input>
</el-form-item>
<el-form-item label="隐患类别">
<el-select v-model="listQuery.form.ht_typesub" placeholder="请选择">
@@ -38,7 +38,7 @@
<el-input v-model="listQuery.form.address" style="width:202px" placeholder="请输入内容"></el-input>
</el-form-item>
<el-form-item label="检查类别">
- <el-select v-model="listQuery.form.ht_typesub" placeholder="请选择">
+ <el-select v-model="listQuery.form.checktype" placeholder="请选择">
<el-option
v-for="item in JCLBList"
:key="item.value"
@@ -71,16 +71,16 @@
</el-form>
<el-row class="title-center">
<el-col :span="10">
- <el-radio-group v-model="radio1">
- <el-radio-button label="待自查">待自查</el-radio-button>
- <el-radio-button label="已自查">已自查</el-radio-button>
- </el-radio-group>
+ <el-radio-group v-model="listQuery.type" @change="radioChange">
+ <el-radio-button label="0">待自查</el-radio-button>
+ <el-radio-button label="1">已自查</el-radio-button>
+ </el-radio-group>
</el-col>
- <el-col :span="14" v-if="radio1=='待自查'" style="text-align:right;">
- <el-button class="btns" type="primary" size="small" @click="sendBath()">管理专业</el-button>
- </el-col>
- <el-col :span="14" v-if="radio1=='已自查'" style="text-align:right;">
- <el-button class="btns" type="primary" size="small" @click="sendBath()">撤销</el-button>
+<!-- <el-col :span="14" v-if="type=='待自查'" style="text-align:right;">-->
+<!-- <el-button class="btns" type="primary" size="small" @click="sendBath()">管理专业</el-button>-->
+<!-- </el-col>-->
+ <el-col :span="14" v-if="listQuery.type=='1'" style="text-align:right;">
+ <el-button class="btns" type="primary" size="small" @click="revoke()">撤销</el-button>
</el-col>
</el-row>
<el-table
@@ -89,7 +89,7 @@
style="width: 100%"
@selection-change="changeBox">
<el-table-column type="selection" width="55" align="center"></el-table-column>
- <el-table-column prop="check_date" label="检查时间" width="120" align="center">
+ <el-table-column prop="check_date" label="检查时间" width="120" :formatter="formatColumnDate" align="center">
<!-- <template slot-scope="scope">
<label>{{ formatDate(scope.row.check_date)}}</label><br/>
<label>{{ scope.row.check_class}}</label>
@@ -101,13 +101,13 @@
<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="address" label="隐患地点" align="center"></el-table-column>
- <el-table-column prop="ht_content" label="内容" width="200" align="center"></el-table-column>
+ <el-table-column prop="ht_content" show-overflow-tooltip label="内容" width="200" align="center"></el-table-column>
<el-table-column prop="push_branch" label="下发单位" align="center"></el-table-column>
<el-table-column prop="date" label="流程操作" align="center">
<template slot-scope="scope">
- <el-button @click="handleClick(scope.row)" type="text" size="small">不存在</el-button>
- <el-button @click="handleClick(scope.row)" type="text" v-if="radio1=='已自查'" size="small">追查结果</el-button>
- <el-button @click="handleClick(scope.row,'存在')" type="text" v-if="radio1=='待自查'" size="small">存在</el-button>
+ <el-button @click="handleClick(scope.row,'不存在')" v-if="scope.row.jyfsFlag=='1'" type="text" size="small">不存在</el-button>
+ <el-button @click="handleClick(scope.row)" type="text" v-if="listQuery.type=='0' || scope.row.jyfsFlag=='0'" size="small">存在</el-button>
+ <el-button @click="handleClick(scope.row)" type="text" v-if="listQuery.type=='1'" size="small">追查结果</el-button>
</template>
</el-table-column>
</el-table>
@@ -124,14 +124,36 @@
>
</el-pagination>
</div>
+ <el-dialog :title="selfTitle" :visible.sync="selfInspectVisible" :modal-append-to-body="false" :close-on-click-modal="false" width="600px">
+ <el-form ref="selfInspectForm" :rules="selfInspectFormRules" :model="selfInspectForm" label-position="right" label-width="80px">
+ <el-form-item label="自查人" prop="markUserName">
+ <el-input v-model="selfInspectForm.markUserName" class="analyseUnit_input"></el-input>
+ </el-form-item>
+ <el-form-item label="自查时间" prop="markDate">
+ <el-col :span="11">
+ <el-date-picker type="date" placeholder="选择日期" v-model="selfInspectForm.markDate"
+ style="width: 100%;" value-format="yyyy-MM-dd">
+ </el-date-picker>
+ </el-col>
+ </el-form-item>
+ <el-form-item label="备注" prop="remark">
+ <el-input v-model="selfInspectForm.remark" type="textarea" rows="5" class="analyseUnit_input"></el-input>
+ </el-form-item>
+ </el-form>
+ <div align="center">
+ <el-button type="primary" v-if="listQuery.type == '0'" @click="submitSelfInspect()">确认</el-button>
+ <el-button @click="selfInspectVisible = false">关闭</el-button>
+ </div>
+ </el-dialog>
</div>
</template>
<script>
- import { getPageList } from "@/api/sgyhpczl/oneFromanother"
+ import { getPageList, noExistSave,selfCheckNotInfo, revoke, analogy_export_do} from "@/api/sgyhpczl/oneFromanother"
import {initJCBM, initYHLX, initJCLB, initYHJB} from "@/api/sgyhpczl/initSelect";
export default{
+ name: 'index',
data(){
return{
listQuery:{
@@ -148,10 +170,20 @@
YHJBList:[],
JCLBList:[],
tableData:[],
- exportData:[],
selectedList:[],
- radio1:'待自查',
listLoading: false,
+ selfInspectVisible: false,
+ selfInspectForm:{
+ id: '',
+ markUserName:'',
+ markDate:'',
+ remark:'',
+ },
+ selfTitle: '',
+ selfInspectFormRules:{
+ markUserName: [{ required: true, message: '自查人不能为空', trigger: 'blur' }],
+ markDate: [{ required: true, message: '自查时间不能为空', trigger: 'blur' }]
+ },
}
},
mounted() {
@@ -162,17 +194,64 @@
this.initYHLB();
},
methods:{
- sendBath(){
- this.$router.push({
- path:'/manage'
+ revoke(){
+ if (this.selectedList.length > 1 || this.selectedList.length === 0) {
+ this.$message({type:'warning', message:'请选择一条记录', duration:3000})
+ return
+ }
+ this.$confirm('确认撤销吗','提示', {
+ confirmButtonText: '确认',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(()=>{
+ revoke(this.selectedList[0].id).then((res)=>{
+ if (res.data.ok==1) {
+ this.getPageList();
+ this.$notify({
+ title: "成功",
+ message: "撤销成功",
+ type: "success",
+ duration: 2000,
+ });
+ }else{
+ this.$message({type:'error', message:res.data.msg, duration:3000})
+ }
+ })
})
},
handleClick(data,val){
- if(val=='存在'){
- this.$router.push({
- path:'/exist'
+ if(val=='不存在'){
+ this.$nextTick(() =>{
+ this.$refs["selfInspectForm"].clearValidate()
})
+ this.selfInspectForm={}
+ this.selfInspectVisible = true
+ if (this.listQuery.type == '1'){
+ let params = {
+ id: data.id,
+ type: 0,
+ }
+ selfCheckNotInfo(params).then(res=>{
+ if (res.data.ok==1){
+ this.selfInspectForm=res.data.data[0]
+ } else{
+ this.$message({type:'error', message:res.data.msg, duration:3000})
+ }
+ })
+ }
+ return
}
+ let puType = '0';
+ if (this.listQuery.type=='1' && data.jyfsFlag=='0'){
+ puType = '1';
+ }
+ this.$router.push({
+ path:'/exist',
+ query: {
+ data: data,
+ type: puType
+ }
+ })
},
initXFDW(){
initJCBM(1).then(res=>{
@@ -210,10 +289,28 @@
}
})
},
+ checkTime(){
+ if(this.listQuery.form.check_dateStart!=null && this.listQuery.form.check_dateStart!=''){
+ if(this.listQuery.form.check_dateEnd!=null && this.listQuery.form.check_dateEnd!=''){
+ }else {
+ this.$message({type:'error', message:"请选择检查结束时间", duration:3000})
+ return
+ }
+
+ }
+ if(this.listQuery.form.check_dateEnd!=null && this.listQuery.form.check_dateEnd!=''){
+ if(this.listQuery.form.check_dateStart!=null && this.listQuery.form.check_dateStart!=''){
+ }else {
+ this.$message({type:'error', message:"请选择检查开始时间", duration:3000})
+ return
+ }
+ }
+ },
+
//搜索
getPageList(){
this.listQuery.page=1
- // this.checkTime()
+ this.checkTime()
getPageList(this.listQuery).then(res=>{
if (res.data.ok==1) {
this.tableData = res.data.data.items
@@ -224,6 +321,17 @@
})
},
reset(){
+ this.listQuery.form={};
+ this.getPageList()
+ },
+ //自查切换
+ radioChange(val){
+ this.listQuery.type = val;
+ if (val == '0'){
+ this.selfTitle = '填写自查结果'
+ }else {
+ this.selfTitle = '查看自查结果'
+ }
this.getPageList()
},
changeBox(val){
@@ -240,7 +348,60 @@
this.listQuery.page = val
this.getPageListForPagination();
},
-
+ getPageListForPagination(){
+ this.checkTime()
+ getPageList(this.listQuery).then(res=>{
+ if (res.data.ok==1) {
+ this.tableData = res.data.data.items
+ this.recordTotal=res.data.data.total
+ }else{
+ this.$message({type:'error', message:res.data.msg, duration:3000})
+ }
+ })
+ },
+ submitSelfInspect(){
+ this.$refs["selfInspectForm"].validate((valid) =>{
+ if (valid){
+ noExistSave(this.selfInspectForm).then((res)=>{
+ if (res.data.ok==1) {
+ this.$message({type:'success', message:"保存成功", duration:3000});
+ this.selfInspectVisible = false
+ }else{
+ this.$message({type:'error', message:res.data.msg, duration:3000})
+ }
+ })
+ }
+ })
+ },
+ exportData() {
+ var requestData = this.listQuery;
+ //删除分页参数
+ this.$delete(requestData, 'page')
+ this.$delete(requestData, 'limit')
+ analogy_export_do(requestData).then(res => {
+ 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)
+ })
+ },
+ //日期格式转换
+ 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() + ' '
+ },
}
}
</script>
diff --git a/src/views/oneFromanotherN/existN.vue b/src/views/oneFromanotherN/existN.vue
index 73cfd78..61c15fc 100644
--- a/src/views/oneFromanotherN/existN.vue
+++ b/src/views/oneFromanotherN/existN.vue
@@ -1,7 +1,7 @@
<template>
<div class="app-container">
<div style="">
- <Titlename title="录入隐患单页面"></Titlename>
+ <Titlename title="录入举一反三页面"></Titlename>
<div class="whole-form">
<el-form
:model="ruleForm"
@@ -9,8 +9,7 @@
ref="ruleForm"
label-width="150px"
class="demo-ruleForm"
- style="margin: 0 14% 0 16%"
- >
+ style="margin: 0 14% 0 16%">
<el-row>
<el-col :span="9">
<el-form-item label="检查时间" prop="check_date">
@@ -19,8 +18,7 @@
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期"
- style="width: 100%"
- >
+ style="width: 100%">
</el-date-picker>
</el-form-item>
</el-col>
@@ -40,87 +38,53 @@
<el-row>
<el-col :span="9" >
<el-form-item label="检查单位" prop="check_main_branch">
- <el-select v-model="ruleForm.check_main_branch" placeholder="请选择" @change="changeJCDW" style="width: 100%">
- <el-option
- v-for="item in JCDWList"
- :key="item.label"
- :label="item.label"
- :value="item.label"
- >
- </el-option>
- </el-select>
+ <el-input v-model="ruleForm.check_main_branch" style="width:100%"></el-input>
+<!-- <el-select v-model="ruleForm.check_main_branch" placeholder="请选择" @change="changeJCDW" style="width: 100%">-->
+<!-- <el-option-->
+<!-- v-for="item in JCDWList"-->
+<!-- :key="item.label"-->
+<!-- :label="item.label"-->
+<!-- :value="item.label"-->
+<!-- >-->
+<!-- </el-option>-->
+<!-- </el-select>-->
</el-form-item>
</el-col>
</el-row>
- <!-- <el-row>
- <el-col :span="9">
- <el-form-item label="检查人员" prop="check_man">
- <el-input v-model="ruleForm.check_man"></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="9" :offset="4">
- <el-form-item label="陪检人员" prop="acc_man">
- <el-input v-model="ruleForm.acc_man"></el-input>
- </el-form-item>
- </el-col>
- </el-row> -->
- <!-- <el-row>
- <el-col :span="22">
- <el-form-item label="行走路线">
- <el-input v-model="ruleForm.route" rows="3" type="textarea" class="multiline"></el-input>
- </el-form-item>
- </el-col>
- </el-row> -->
-
- <!-- <el-row style="margin-bottom: 20px" v-if="addShow">
+ <el-row style="margin-bottom: 20px">
<el-col :span="9">
- <el-button type="primary" class="btns" @click="addDanger">新增隐患</el-button>
+ <el-button type="primary" class="btns" @click="addDanger()">新增</el-button>
</el-col>
- </el-row> -->
+ </el-row>
<el-table :data="tableData" style="width: 100%">
<el-table-column type="index" width="55" align="center" label="序号"></el-table-column>
- <!-- <el-table-column prop="ht_branch" align="center" label="隐患部门"></el-table-column> -->
<el-table-column prop="address" align="center" label="隐患地点"></el-table-column>
<el-table-column prop="ht_content" align="center" label="隐患内容"></el-table-column>
- <!-- <el-table-column prop="measure" align="center" label="整改措施"></el-table-column> -->
<el-table-column prop="ht_typesub" align="center" label="隐患类别"></el-table-column>
- <!-- <el-table-column prop="dangerousSource" align="center" label="关联危险源"></el-table-column>
- <el-table-column prop="DTRisk_level" align="center" label="风险等级"></el-table-column> -->
<el-table-column prop="ht_level" align="center" label="隐患级别"></el-table-column>
- <!-- <el-table-column prop="alter_time" align="center" label="限改时间"></el-table-column>
- <el-table-column prop="duty_officer" align="center" label="责任人"></el-table-column>
- <el-table-column prop="alter_status" align="center" label="整改情况"></el-table-column>
- <el-table-column prop="Review" align="center" label="业务科室"></el-table-column> -->
<el-table-column prop="time" label="操作" align="center" width="140">
<template slot-scope="scope">
<div style="display: flex;align-items: center;flex-direction: row;">
- <el-button
- size="mini"
- @click="editDanger(scope.row, scope.$index)"
- >添加
+ <el-button size="mini" @click="editDanger(scope.row, scope.$index)">
+ 编辑
</el-button>
- <el-button
- size="mini"
- v-if="addShow"
- @click="deleteDanger(scope.row, scope.$index)"
- >删除
+ <el-button size="mini" @click="deleteDanger(scope.row, scope.$index)">
+ 删除
</el-button>
</div>
</template>
</el-table-column>
</el-table>
-
-
<el-row style="margin-top: 20px">
<el-col :span="22">
<el-form-item style="text-align: center">
- <el-button type="primary" class="btns" @click="submitForm('ruleForm')"
- >保存</el-button
- >
- <el-button @click="returnIndex">关闭</el-button>
+ <el-button type="primary" class="btns" @click="submitForm('ruleForm')">
+ 保存
+ </el-button>
+ <el-button @click="closeShow">关闭</el-button>
</el-form-item>
</el-col>
</el-row>
@@ -140,15 +104,14 @@
<el-input v-model="dangerForm.address" rows="3" type="textarea" class="multiline"></el-input>
</el-form-item>
</el-col>
- <el-col :span="9" offset="4">
+ <el-col :span="9" :offset="4">
<el-form-item label="隐患内容" prop="ht_content">
<el-input v-model="dangerForm.ht_content" rows="3" type="textarea" class="multiline"></el-input>
</el-form-item>
</el-col>
</el-row>
-
<el-row>
-
+
<el-col :span="9">
<el-form-item label="隐患类别" prop="ht_typesub">
<el-select v-model="dangerForm.ht_typesub" placeholder="请选择">
@@ -177,9 +140,9 @@
<el-row>
<el-col :span="22">
<el-form-item style="text-align: center">
- <el-button type="primary" class="btns" @click="submitDanger('form')"
- >保存</el-button
- >
+ <el-button type="primary" class="btns" @click="submitDanger('form')">
+ 保存
+ </el-button>
<el-button @click="dialogVisible=false">关闭</el-button>
</el-form-item>
</el-col>
@@ -193,8 +156,10 @@
<script>
import Titlename from "../../components/Titlename/index.vue";
-import {initJCBM ,initYHLX, initBC ,initJCLB ,initYHBM ,initYHJB,initLlr,initReformStatus,initYwks,initWxy} from "@/api/sgyhpczl/initSelect";
+import {initJCBM ,initYHLX,initJCLB,initYHJB,initReformStatus} from "@/api/sgyhpczl/initSelect";
import {saveDanger,initDangerRebound,getDangerInfo,editDanger} from '@/api/sgyhpczl/hiddenDangerRegistration'
+import { save } from '@/api/sgyhpczl/oneFromanotherN'
+
import {deepClone} from '@/utils'
export default {
@@ -202,85 +167,36 @@
name: "hiddenDangerList",
data() {
return {
- addShow:true,
id:'',
rowIndex:-1,
dangerList:[],
dangerForm:{},
dangerRules:{
- ht_branch: [{ required: true, message: '不能为空', trigger: 'blur' },],
address: [{ required: true, message: '不能为空', trigger: 'blur' },],
ht_content: [{ required: true, message: '不能为空', trigger: 'blur' },],
ht_typesub: [{ required: true, message: '不能为空', trigger: 'blur' },],
- DTRisk_bankId: [{ required: true, message: '不能为空', trigger: 'blur' },],
ht_level: [{ required: true, message: '不能为空', trigger: 'blur' },],
- alter_time: [{ required: true, message: '不能为空', trigger: 'blur' },],
- alter_status: [{ required: true, message: '不能为空', trigger: 'blur' },],
- Review: [{ required: true, message: '不能为空', trigger: 'blur' },],
- duty_officer:[{ required: true, message: '不能为空', trigger: 'blur' },]
},
title:'新增',
dialogVisible:false,
- BCList:[],
JCLBList:[],
- JCDWList:[{label:"众泰煤焦化",value:0},{label:"上级单位",value:1}],
- YHBMList:[],
YHLXList:[],
YHJBList:[],
- JCBMList:[],
- llrList:[],
- statusList:[],
- YWKSList:[],
- reboundList:[],
- ruleForm: {},
- rules: {
+ ruleForm: {},
+ rules: {
check_date: [{ required: true, message: '不能为空', trigger: 'blur' },],
- check_class: [{ required: true, message: '不能为空', trigger: 'blur' },],
- check_main_branch: [{ required: true, message: '不能为空', trigger: 'blur' },],
- check_branch: [{ required: true, message: '不能为空', trigger: 'blur' },],
- check_man: [{ required: true, message: '不能为空', trigger: 'blur' },],
+ check_main_branch: [{ required: true, message: '不能为空', trigger: 'change' },],
checktype: [{ required: true, message: '不能为空', trigger: 'blur' },],
- },
- tableData: [],
+ },
+ tableData: [],
};
},
mounted(){
- this.initBC()
this.initJCLB()
this.initYHJB()
this.initYHLX()
- //this.initLlr()
- this.initReformStatus()
- this.initYHBM()
- this.initYWKS()
- this.initWXY()
- this.initDangerRebound()
- this.id = this.$route.query.id;
- if( this.id!=null && this.id!=''){
- this.initInfo();
- this.addShow=false
- }
},
methods: {
- async initInfo(){
- var res=await getDangerInfo(this.id)
- if (res.data.ok==1){
- this.ruleForm=res.data.data
- this.changeJCDW(res.data.data.check_main_branch)
- var obj=deepClone(res.data.data)
- this.tableData.push(obj)
-
- }
- },
- initDangerRebound(){
- initDangerRebound().then(res=>{
- if (res.data.ok==1){
- this.reboundList=res.data.data
- } else{
- this.$message({type:'error', message:res.data.msg, duration:3000})
- }
- })
- },
submitDanger(formName){
this.$refs[formName].validate((valid) => {
if (valid) {
@@ -300,8 +216,6 @@
});
},
deleteDanger(row, index) {
-
-
this.$confirm('确认删除吗', '提示', {
confirmButtonText: '确认',
cancelButtonText: '取消',
@@ -345,46 +259,6 @@
}
}
},
- initWXY(){
- var param={
- page: 1,
- limit: 1000
- }
- initWxy(param).then(res=>{
- if (res.data.ok==1){
- this.dangerList=res.data.data.items
- } else{
- this.$message({type:'error', message:res.data.msg, duration:3000})
- }
- })
- },
- initYWKS(){
- initYwks().then(res=>{
- if (res.data.ok==1){
- this.YWKSList=res.data.data
- } else{
- this.$message({type:'error', message:res.data.msg, duration:3000})
- }
- })
- },
- initYHBM(){
- initYHBM().then(res=>{
- if (res.data.ok==1){
- this.YHBMList=res.data.data
- } else{
- this.$message({type:'error', message:res.data.msg, duration:3000})
- }
- })
- },
- initLlr(){
- initLlr().then(res=>{
- if (res.data.ok==1){
- this.llrList=res.data.data
- } else{
- this.$message({type:'error', message:res.data.msg, duration:3000})
- }
- })
- },
initReformStatus(){
initReformStatus().then(res=>{
if (res.data.ok==1){
@@ -421,15 +295,6 @@
}
})
},
- initBC(){
- initBC().then(res=>{
- if (res.data.ok==1){
- this.BCList=res.data.data
- } else{
- this.$message({type:'error', message:res.data.msg, duration:3000})
- }
- })
- },
initJCLB(){
initJCLB().then(res=>{
if (res.data.ok==1){
@@ -440,10 +305,9 @@
})
},
-
- returnIndex(){
+ closeShow(){
this.$router.push({
- path:"/hiddenDangerRegistration"
+ path:"/oneFromanotherN"
})
},
submitForm(formName) {
@@ -453,47 +317,16 @@
this.$message({type:'error', message:"请添加隐患", duration:2000})
}
this.ruleForm.items=this.tableData
- if(this.addShow){
- saveDanger(this.ruleForm).then(res=>{
- if (res.data.ok==1){
- this.$message({type:'success', message:"新增成功", duration:3000})
- this.$router.push({
- path:"/hiddenDangerRegistration"
- })
- }else {
- this.$message({type:'error', message:res.data.msg, duration:3000})
- }
- })
- }else {
- var param=deepClone(this.ruleForm)
- var obj=deepClone(this.tableData[0])
- param.ht_branch=obj.ht_branch
- param.address=obj.address
- param.ht_content=obj.ht_content
- param.measure=obj.measure
- param.ht_typesub=obj.ht_typesub
- param.DTRisk_bankId=obj.DTRisk_bankId
- param.DTRisk_level=obj.mriskLevel
- param.dangerousSource=obj.mriskPoint
- param.ht_level=obj.ht_level
- param.alter_time=obj.alter_time
- param.duty_officer=obj.duty_officer
- param.alter_status=obj.alter_status
- param.Review=obj.Review
- param.repeatId=obj.repeatId
- editDanger(param).then(res=>{
- if (res.data.ok==1){
- this.$message({type:'success', message:"编辑成功", duration:3000})
- this.$router.push({
- path:"/hiddenDangerRegistration"
- })
- }else {
- this.$message({type:'error', message:res.data.msg, duration:3000})
- }
- })
- }
-
-
+ save(this.ruleForm).then(res=>{
+ if (res.data.ok==1){
+ this.$message({type:'success', message:"新增成功", duration:3000})
+ this.$router.push({
+ path:"/oneFromanotherN"
+ })
+ }else {
+ this.$message({type:'error', message:res.data.msg, duration:3000})
+ }
+ })
} else {
console.log("error submit!!");
diff --git a/src/views/oneFromanotherN/index.vue b/src/views/oneFromanotherN/index.vue
index 71cb8e6..ed13ff7 100644
--- a/src/views/oneFromanotherN/index.vue
+++ b/src/views/oneFromanotherN/index.vue
@@ -1,28 +1,29 @@
<template>
<div class="app-container">
- <el-form ref="form" :inline="true" class="inquire" :model="listQuery" label-width="80px">
- <el-form-item label="下发单位">
- <el-select v-model="listQuery.form.ht_typesub" placeholder="请选择">
- <el-option
- v-for="item in YHLXList"
- :key="item.value"
- :label="item.value"
- :value="item.value">
- </el-option>
- </el-select>
- </el-form-item>
+ <el-form ref="form" :inline="true" class="inquire" :model="listQuery.form" label-width="80px">
<el-form-item label="隐患单位">
- <el-input v-model="listQuery.form.ht_branch" style="width:202px"></el-input>
+ <el-input v-model="listQuery.form.check_main_branch" style="width:202px"></el-input>
+<!-- <el-select v-model="listQuery.form.check_main_branch" placeholder="请选择">-->
+<!-- <el-option-->
+<!-- v-for="item in XFDWList"-->
+<!-- :key="item.value"-->
+<!-- :label="item.value"-->
+<!-- :value="item.value">-->
+<!-- </el-option>-->
+<!-- </el-select>-->
</el-form-item>
- <el-form-item label="隐患类别">
- <el-select v-model="listQuery.form.ht_typesub" placeholder="请选择">
+ <el-form-item label="检查类别">
+ <el-select v-model="listQuery.form.checktype" placeholder="请选择">
<el-option
- v-for="item in YHLXList"
+ v-for="item in JCLBList"
:key="item.value"
:label="item.value"
:value="item.value">
</el-option>
</el-select>
+ </el-form-item>
+ <el-form-item label="被检单位">
+ <el-input v-model="listQuery.form.ht_community" style="width:202px"></el-input>
</el-form-item>
<el-form-item label="隐患级别">
<el-select v-model="listQuery.form.ht_level" placeholder="请选择">
@@ -34,21 +35,24 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="隐患地点">
- <el-input v-model="listQuery.form.address" style="width:202px" placeholder="请输入内容"></el-input>
- </el-form-item>
- <el-form-item label="检查类别">
+ <el-form-item label="隐患类别">
<el-select v-model="listQuery.form.ht_typesub" placeholder="请选择">
<el-option
- v-for="item in YHLXList"
+ v-for="item in YHLBList"
:key="item.value"
:label="item.value"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
+ <el-form-item label="隐患地点">
+ <el-input v-model="listQuery.form.address" style="width:202px" placeholder="请输入内容"></el-input>
+ </el-form-item>
<el-form-item label="隐患内容">
<el-input v-model="listQuery.form.ht_content" style="width:202px" placeholder="请输入内容"></el-input>
+ </el-form-item>
+ <el-form-item label="发送单位" v-if="listQuery.type=='1'">
+ <el-input v-model="listQuery.form.workGroupName" style="width:202px" placeholder="请输入内容"></el-input>
</el-form-item>
<el-form-item label="检查时间">
<el-col :span="11">
@@ -65,89 +69,99 @@
<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" @click="exportData">导出excel
- </el-button>
</el-form-item>
</el-form>
<el-row class="title-center">
<el-col :span="10">
- <el-radio-group v-model="radio1">
- <el-radio-button label="待发送">待发送</el-radio-button>
- <el-radio-button label="已发送">已发送</el-radio-button>
- </el-radio-group>
+ <el-radio-group v-if="table1" v-model="listQuery.type" @change="typeChange">
+ <el-radio-button label="0">待发送</el-radio-button>
+ <el-radio-button label="1">已发送</el-radio-button>
+ </el-radio-group>
+ <el-radio-group v-if="table2" >
+ <el-radio-button label="0">待自查</el-radio-button>
+ <el-radio-button label="1">已自查</el-radio-button>
+ </el-radio-group>
<el-button class="btns" type="primary" size="small" v-if="table1" @click="handoff(1)">进入自查（3）</el-button>
<el-button class="btns" type="primary" size="small" v-if="table2" @click="handoff(2)">返回填写</el-button>
</el-col>
<div v-if="table1">
- <el-col :span="14" style="text-align:right;" v-if="radio1=='待发送'">
- <el-button class="btns" type="primary" size="small" icon="el-icon-upload2" >发送</el-button>
- <el-button class="btns" type="primary" size="small" icon="el-icon-plus" @click="sendBath()">添加</el-button>
- <el-button size="small" >批量删除</el-button>
+ <el-col :span="14" style="text-align:right;" v-if="listQuery.type==0">
+ <el-button class="btns" type="primary" size="small" icon="el-icon-upload2" @click="openSend()">发送</el-button>
+ <el-button class="btns" type="primary" size="small" icon="el-icon-plus" @click="addDanger()">添加</el-button>
+ <el-button size="small" @click="deleteBatch()" >批量删除</el-button>
</el-col>
- <el-col :span="14" style="text-align:right;" v-if="radio1=='已发送'">
- <el-button class="btns" type="primary" size="small" >收回</el-button>
+ <el-col :span="14" style="text-align:right;" v-if="listQuery.type==1">
+ <el-button class="btns" type="primary" size="small" @click="tackBack()">收回</el-button>
</el-col>
</div>
</el-row>
<div v-if="table1">
- <el-table ref="dataTable" v-if="radio1=='待发送'" :data="tableData" style="width: 100%" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="55" 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 ref="dataTable"
+ v-if="listQuery.type==0"
+ :data="tableData"
+ style="width: 100%"
+ @selection-change="handleSelectionChange">
+ <el-table-column type="selection" width="55" align="center"></el-table-column>
+ <el-table-column prop="check_date" label="检查时间" :formatter="formatColumnDate" 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="check_branch" label="检查单位" align="center"></el-table-column>
+ <el-table-column prop="check_main_branch" label="检查单位" align="center"></el-table-column>
<el-table-column prop="checktype" label="检查类别" align="center"></el-table-column>
<!-- <el-table-column prop="measure" label="被检单位" align="center"></el-table-column> -->
- <el-table-column prop="date" label="隐患类别" align="center"></el-table-column>
- <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="隐患内容" width="200" 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="address" label="隐患地点" align="center"></el-table-column>
+ <el-table-column prop="ht_content" label="隐患内容" width="200" align="center"></el-table-column>
<!-- <el-table-column prop="curWarningLevel" label="下发单位" align="center"></el-table-column> -->
<el-table-column prop="date" label="基本操作" align="center">
<template slot-scope="scope">
- <el-button @click="handleClick(scope.row)" type="text" size="small">编辑</el-button>
- <el-button @click="handleClick(scope.row)" type="text" size="small">删除</el-button>
+ <el-button @click="editDanger(scope.row)" type="text" size="small">编辑</el-button>
+ <el-button @click="deleteDanger(scope.row)" type="text" size="small">删除</el-button>
</template>
</el-table-column>
</el-table>
- <el-table ref="dataTable" v-if="radio1=='已发送'" :data="tableData" style="width: 100%" @selection-change="handleSelectionChange">
+ <el-table ref="dataTable" v-if="listQuery.type==1" :data="tableData" style="width: 100%" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" 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 prop="check_date" label="检查时间" :formatter="formatColumnDate" 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="check_branch" label="检查单位" align="center"></el-table-column>
+ <el-table-column prop="check_main_branch" label="检查单位" align="center"></el-table-column>
<el-table-column prop="checktype" label="检查类别" align="center"></el-table-column>
- <el-table-column prop="measure" label="被检单位" align="center"></el-table-column>
- <el-table-column prop="date" label="隐患类别" align="center"></el-table-column>
- <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="隐患内容" width="200" 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>
+ <el-table-column prop="ht_community" 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="address" label="隐患地点" align="center"></el-table-column>
+ <el-table-column prop="ht_content" label="隐患内容" width="200" align="center"></el-table-column>
+ <el-table-column prop="workGroupName" label="发送单位" align="center"></el-table-column>
+ <el-table-column prop="state" label="未自查单位" align="center"></el-table-column>
</el-table>
</div>
- <el-table ref="dataTable" v-if="table2" :data="tableData" style="width: 100%" @selection-change="handleSelectionChange">
+ <el-table
+ ref="dataTable"
+ v-if="table2"
+ :data="tableData" style="width: 100%"
+ @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" 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 prop="check_date" label="检查时间" :formatter="formatColumnDate" 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="check_branch" label="检查单位" align="center"></el-table-column>
+ <el-table-column prop="check_main_branch" label="检查单位" align="center"></el-table-column>
<el-table-column prop="checktype" label="检查类别" align="center"></el-table-column>
- <el-table-column prop="measure" label="被检单位" align="center"></el-table-column>
- <el-table-column prop="date" label="隐患类别" align="center"></el-table-column>
- <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="内容" width="200" align="center"></el-table-column>
- <el-table-column prop="curWarningLevel" label="发送单位" align="center"></el-table-column>
+ <el-table-column prop="ht_community" 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="address" label="隐患地点" align="center"></el-table-column>
+ <el-table-column prop="ht_content" label="内容" width="200" align="center"></el-table-column>
+ <el-table-column prop="workGroupName" label="发送单位" align="center"></el-table-column>
<el-table-column prop="date" label="自查结果" align="center">
<template slot-scope="scope">
<el-button @click="handleClick(scope.row)" type="text" size="small">不存在</el-button>
@@ -168,26 +182,192 @@
>
</el-pagination>
</div>
-
+
+ <!-- 编辑弹窗 -->
+ <el-dialog
+ title="编辑"
+ :visible.sync="dialogVisible"
+ :close-on-click-modal="false"
+ width="40%">
+ <el-form ref="form" :rules="dangerRules" :model="dangerForm" label-width="100px">
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="检查时间" prop="check_date">
+ <el-date-picker
+ v-model="dangerForm.check_date"
+ type="date"
+ value-format="yyyy-MM-dd"
+ placeholder="选择日期"
+ style="width: 100%"
+ >
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="9" :offset="4">
+ <el-form-item label="检查类别" prop="checktype">
+ <el-select v-model="dangerForm.checktype" placeholder="请选择">
+ <el-option
+ v-for="item in JCLBList"
+ :key="item.value"
+ :label="item.value"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="9" >
+ <el-form-item label="检查单位" prop="check_main_branch">
+ <el-input v-model="dangerForm.check_main_branch" class="multiline"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="地点" prop="address">
+ <el-input v-model="dangerForm.address" rows="3" type="textarea" class="multiline"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="9" :offset="4">
+ <el-form-item label="隐患内容" prop="ht_content">
+ <el-input v-model="dangerForm.ht_content" rows="3" type="textarea" class="multiline"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="9" >
+ <el-form-item label="隐患类别" prop="ht_typesub">
+ <el-select v-model="dangerForm.ht_typesub" placeholder="请选择">
+ <el-option
+ v-for="item in YHLBList"
+ :key="item.value"
+ :label="item.value"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="9" :offset="4">
+ <el-form-item label="隐患级别" prop="ht_level">
+ <el-select v-model="dangerForm.ht_level" placeholder="请选择">
+ <el-option
+ v-for="item in YHJBList"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="22">
+ <el-form-item style="text-align: center">
+ <el-button type="primary" class="btns" @click="submitDanger('form')">保存</el-button>
+ <el-button @click="dialogVisible=false">关闭</el-button>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+ </el-dialog>
+
+ <!-- 部门弹窗 -->
+ <el-dialog
+ title="责任单位"
+ :visible.sync="bmDialogVisible"
+ :close-on-click-modal="false"
+ width="40%">
+ <el-form>
+ <el-row>
+ <el-checkbox style="width: 80px;height: 30px" v-for="item in YHBMList" v-model="checked" :label="item.branch_id">
+ {{item.branch_name}}
+ </el-checkbox>
+ </el-row>
+ <el-row>
+ <el-col :span="22">
+ <el-form-item style="text-align: center;">
+ <el-button class="btn" size="small" type="primary" @click="submitForm()">
+ 保存
+ </el-button>
+ <el-button size="small" @click="bmDialogVisible = false">关闭</el-button>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+ </el-dialog>
+
</div>
</template>
<script>
+import { getPageList, edit, del, send, revoke} from "@/api/sgyhpczl/oneFromanotherN"
+import {initJCBM, initYHLX, initJCLB, initYHJB,initYHBM} from "@/api/sgyhpczl/initSelect";
+import {deepClone} from '@/utils'
+
+
export default{
data(){
return{
listQuery:{
- form:{}
+ page:1,
+ limit:10,
+ type: 0,
+ form:{},
},
radio1:'待发送',
table1:true,
- table2:false
+ table2:false,
+
+
+
+ currentPage: 1,
+ pageSize: 10,
+ recordTotal: 0,
+ YHBMList: [],
+ bmDialogVisible: false,
+ checked:[],
+ requestData:{},//发送提交参数
+ XFDWList:[],
+ YHLBList:[],
+ YHJBList:[],
+ JCLBList:[],
+ tableData:[],
+ selectedList:[],
+ listLoading: false,
+ selfInspectVisible: false,
+ selfInspectForm:{
+ id: '',
+ markUserName:'',
+ markDate:'',
+ remark:'',
+ },
+ selfInspectFormRules:{
+ markUserName: [{ required: true, message: '自查人不能为空', trigger: 'blur' }],
+ markDate: [{ required: true, message: '自查时间不能为空', trigger: 'blur' }]
+ },
+ dialogVisible:false,
+ dangerForm:{},
+ dangerRules:{
+ check_date: [{ required: true, message: '不能为空', trigger: 'blur' },],
+ check_main_branch: [{ required: true, message: '不能为空', trigger: 'blur' },],
+ checktype: [{ required: true, message: '不能为空', trigger: 'blur' },],
+ },
}
},
+ mounted() {
+ this.getPageList();
+ this.initYHBM();
+ this.initJCLB();
+ this.initXFDW();
+ this.initYHJB();
+ this.initYHLB();
+ },
methods:{
- sendBath(){
+ addDanger(){
this.$router.push({
- path:'/existN'
+ path:'/existN',
})
},
handleClick(data,val){
@@ -201,11 +381,271 @@
if(index==1){
this.table1=false
this.table2=true
+ this.listQuery.type = 2
+ this.getPageList()
}else{
+ this.listQuery.type = 0
+ this.getPageList()
this.table1=true
this.table2=false
}
+ },
+ initYHBM() {
+ initYHBM().then(res => {
+ if (res.data.ok == 1) {
+ this.YHBMList = res.data.data
+ } else {
+ this.$message({type: 'error', message: res.data.msg, duration: 3000})
+ }
+ })
+ },
+ initXFDW(){
+ initJCBM(1).then(res=>{
+ if (res.data.ok==1){
+ this.XFDWList=res.data.data
+ } else{
+ this.$message({type:'error', message:res.data.msg, duration:3000})
+ }
+ })
+ },
+ initYHLB(){
+ initYHLX().then(res=>{
+ if (res.data.ok==1){
+ this.YHLBList=res.data.data
+ } else{
+ this.$message({type:'error', message:res.data.msg, duration:3000})
+ }
+ })
+ },
+ initYHJB(){
+ initYHJB().then(res=>{
+ if (res.data.ok==1){
+ this.YHJBList=res.data.data
+ } else{
+ this.$message({type:'error', message:res.data.msg, duration:3000})
+ }
+ })
+ },
+ initJCLB(){
+ initJCLB().then(res=>{
+ if (res.data.ok==1){
+ this.JCLBList=res.data.data
+ } else{
+ this.$message({type:'error', message:res.data.msg, duration:3000})
+ }
+ })
+ },
+ checkTime(){
+ if(this.listQuery.form.check_dateStart!=null && this.listQuery.form.check_dateStart!=''){
+ if(this.listQuery.form.check_dateEnd!=null && this.listQuery.form.check_dateEnd!=''){
+ }else {
+ this.$message({type:'error', message:"请选择检查结束时间", duration:3000})
+ return
+ }
+
+ }
+ if(this.listQuery.form.check_dateEnd!=null && this.listQuery.form.check_dateEnd!=''){
+ if(this.listQuery.form.check_dateStart!=null && this.listQuery.form.check_dateStart!=''){
+ }else {
+ this.$message({type:'error', message:"请选择检查开始时间", duration:3000})
+ return
+ }
+ }
+ },
+ //搜索
+ getPageList(){
+ this.listQuery.page=1
+ this.checkTime()
+ getPageList(this.listQuery).then(res=>{
+ if (res.data.ok==1) {
+ this.tableData = res.data.data.items
+ this.recordTotal=res.data.data.total
+ }else{
+ this.$message({type:'error', message:res.data.msg, duration:3000})
+ }
+ })
+ },
+ //重置
+ reset(){
+ this.listQuery.form={};
+ this.getPageList()
+ },
+ handleSizeChange(val){
+ this.listQuery.limit = val
+ this.getPageListForPagination();
+ },
+ handleCurrentChange(val){
+ this.listQuery.page = val
+ this.getPageListForPagination();
+ },
+ getPageListForPagination(){
+ this.checkTime()
+ getPageList(this.listQuery).then(res=>{
+ if (res.data.ok==1) {
+ this.tableData = res.data.data.items
+ this.recordTotal=res.data.data.total
+ }else{
+ this.$message({type:'error', message:res.data.msg, duration:3000})
+ }
+ })
+ },
+ typeChange(val){
+ this.listQuery.type = val;
+ this.getPageList()
+ },
+ handleSelectionChange(val){
+ this.selectedList = []
+ val.forEach((item) => {
+ this.selectedList.push(item)
+ })
+ },
+ //日期格式转换
+ 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() + ' '
+ },
+ editDanger(row, index) {
+ this.dangerForm = deepClone(row);
+ this.rowIndex = index;
+ this.dialogVisible = true;
+ },
+ //编辑提交
+ submitDanger(formName){
+ this.$refs[formName].validate((valid) => {
+ if (valid) {
+ edit(this.dangerForm).then(res=>{
+ if (res.data.ok==1) {
+ this.dialogVisible=false
+ this.$message({type:'success', message:res.data.msg, duration:3000})
+ this.getPageList()
+ }else{
+ this.$message({type:'error', message:res.data.msg, duration:3000})
+ }
+ })
+ } else {
+ console.log("error submit!!");
+ return false;
+ }
+ });
+ },
+ deleteBatch() {
+ if (this.selectedList == null || this.selectedList.length == 0) {
+ this.$message({type: 'warning', message: '至少选中一条数据', duration: 3000})
+ return
+ }
+ var ids = this.selectedList.map((obj) => {
+ return obj.id
+ }).join(",")
+ this.$confirm('确认删除吗', '提示', {
+ confirmButtonText: '确认',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ del(ids).then(() => {
+ this.getPageList()
+ this.$notify({
+ title: "成功",
+ message: "删除成功",
+ type: "success",
+ duration: 2000,
+ });
+ });
+ })
+ .catch(error => {
+ });
+ },
+ deleteDanger(row) {
+ this.$confirm('确认删除吗', '提示', {
+ confirmButtonText: '确认',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ console.log(row.id)
+ del(row.id).then(() => {
+ this.getPageList()
+ this.$notify({
+ title: "成功",
+ message: "删除成功",
+ type: "success",
+ duration: 2000,
+ });
+ });
+ }).catch(error => {
+ });
+ },
+ //发送提交
+ submitForm() {
+ if (this.checked.length == 0) {
+ this.$message({
+ type: 'warning',
+ message: '请勾选需要发送的部门！'
+ });
+ return;
+ }
+ this.requestData.branchIds = this.checked.join(";");
+ send(this.requestData).then(res => {
+ if (res.data.ok) {
+ this.$message({
+ type: 'success',
+ message: res.data.msg
+ });
+ this.bmDialogVisible = false;
+ this.getPageList();
+ } else {
+ this.$message({
+ type: 'error',
+ message: res.data.msg
+ });
+ }
+ })
+ },
+ openSend() {
+ if (this.selectedList.length != 1) {
+ this.$message({
+ type: 'warning',
+ message: '请选择一条数据！'
+ });
+ return false;
+ } else {
+ this.requestData.id = this.selectedList[0].id;
+ this.bmDialogVisible = true;
+ }
+ },
+ tackBack(){
+ if (this.selectedList.length != 1) {
+ this.$message({
+ type: 'warning',
+ message: '请选择一条数据！'
+ });
+ return false;
+ }else {
+ this.$confirm('确认收回吗', '提示', {
+ confirmButtonText: '确认',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ let data = {
+ id: this.selectedList[0].id
+ }
+ revoke(data).then(() => {
+ this.getPageList()
+ this.$notify({
+ title: "成功",
+ message: "收回成功",
+ type: "success",
+ duration: 2000,
+ });
+ });
+ }).catch(error => {
+ });
+ }
}
+
}
}
</script>
@@ -240,4 +680,4 @@
background-color: #034ea2;
background-color: #034ea2;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/safetyHazardAccount/Dualbase.vue b/src/views/safetyHazardAccount/Dualbase.vue
index 14419d3..36e8cf4 100644
--- a/src/views/safetyHazardAccount/Dualbase.vue
+++ b/src/views/safetyHazardAccount/Dualbase.vue
@@ -160,8 +160,11 @@
</el-row>
</el-col>
<el-col :span="4" style="text-align:right">
- <el-button type="primary" class="btns" @click="addDanger"
- >新增隐患</el-button
+ <el-button type="primary" class="btns" size="small" @click="addDanger"
+ >编辑</el-button
+ >
+ <el-button type="primary" class="btns" size="small" @click="jump()"
+ >本单位结果</el-button
>
</el-col>
</el-row>
@@ -247,7 +250,7 @@
ref="form"
:rules="dangerRules"
:model="dangerForm"
- label-width="100px"
+ label-width="110px"
>
<el-row>
<el-col :span="9">
@@ -711,6 +714,11 @@
}
});
},
+ jump(){
+ this.$router.push({
+ path:"/DualbaseLost"
+ })
+ }
},
};
</script>
diff --git a/src/views/safetyHazardAccount/DualbaseLost.vue b/src/views/safetyHazardAccount/DualbaseLost.vue
new file mode 100644
index 0000000..44010aa
--- /dev/null
+++ b/src/views/safetyHazardAccount/DualbaseLost.vue
@@ -0,0 +1,554 @@
+<template>
+ <div class="app-container">
+ <div style="">
+ <Titlename title="双基考核"></Titlename>
+ <div class="whole-form">
+ <el-form
+ :model="ruleForm"
+ :rules="rules"
+ ref="ruleForm"
+ label-width="150px"
+ class="demo-ruleForm"
+ style="margin: 0 10% 0 10%"
+ >
+ <el-row class="title-center" style="margin-bottom: 20px" v-if="addShow">
+ <el-col :span="14">
+ <el-radio-group v-model="radio1">
+ <el-radio-button label="2022年06月">2022年06月</el-radio-button>
+ <el-radio-button label="2022年05月">2022年05月</el-radio-button>
+ <el-radio-button label="2022年04月">2022年04月</el-radio-button>
+ <el-radio-button label="2022年03月">2022年03月</el-radio-button>
+ <el-radio-button label="2022年02月">2022年02月</el-radio-button>
+ <el-radio-button label="2022年01月">2022年01月</el-radio-button>
+ </el-radio-group>
+ </el-col>
+ <el-col :span="6">
+ <el-row>
+ <el-col :span="6"><span style="font-size:14px;font-weight: bold;line-height:36px;color:#606266;">请选择年月</span></el-col>
+ <el-col :span="18">
+ <el-date-picker
+ v-model="ruleForm.check_date"
+ type="date"
+ value-format="yyyy-MM-dd"
+ placeholder="选择日期"
+ style="width: 100%"
+ >
+ </el-date-picker>
+ </el-col>
+ </el-row>
+ </el-col>
+ <!-- <el-col :span="4" style="text-align:right">
+ <el-button type="primary" class="btns" size="small" @click="addDanger"
+ >编辑</el-button
+ >
+ <el-button type="primary" class="btns" size="small" @click="addDanger"
+ >本单位结果</el-button
+ >
+ </el-col> -->
+ </el-row>
+
+ <el-row>
+ <el-table :data="tableData" style="width: 100%">
+ <el-table-column
+ type="index"
+ width="55"
+ align="center"
+ label="序号"
+ ></el-table-column>
+ <!-- <el-table-column prop="ht_branch" align="center" label="隐患部门"></el-table-column> -->
+ <el-table-column
+ prop="address"
+ align="center"
+ label="考核对象"
+ ></el-table-column>
+ <el-table-column
+ prop="ht_content"
+ align="center"
+ label="双击考核标准"
+ ></el-table-column>
+ <el-table-column
+ prop="measure"
+ align="center"
+ label="扣分"
+ ></el-table-column>
+ <el-table-column
+ prop="ht_typesub"
+ align="center"
+ label="扣分原因"
+ ></el-table-column>
+ <el-table-column
+ prop="dangerousSource"
+ align="center"
+ label="创建日期"
+ ></el-table-column>
+ <el-table-column prop="time" label="操作" align="center" width="140">
+ <template slot-scope="scope">
+ <div style="display: flex;align-items: center;flex-direction: row;">
+ <el-button
+ size="mini"
+ @click="editDanger(scope.row, scope.$index)"
+ >编辑
+ </el-button>
+ <el-button
+ size="mini"
+ v-if="addShow"
+ @click="deleteDanger(scope.row, scope.$index)"
+ >删除
+ </el-button>
+ </div>
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-row>
+
+ <!-- <el-row style="margin-top: 20px">
+ <el-col :span="22">
+ <el-form-item style="text-align: center">
+ <el-button
+ type="primary"
+ class="btns"
+ @click="submitForm('ruleForm')"
+ >保存</el-button
+ >
+ <el-button @click="returnIndex">关闭</el-button>
+ </el-form-item>
+ </el-col>
+ </el-row> -->
+ </el-form>
+ </div>
+ </div>
+ </div>
+</template>
+
+<script>
+import Titlename from "../../components/Titlename/index.vue";
+
+import {
+ initJCBM,
+ initYHLX,
+ initBC,
+ initJCLB,
+ initYHBM,
+ initYHJB,
+ initLlr,
+ initReformStatus,
+ initYwks,
+ initWxy,
+} from "@/api/sgyhpczl/initSelect";
+import {
+ saveDanger,
+ initDangerRebound,
+ getDangerInfo,
+ editDanger,
+} from "@/api/sgyhpczl/hiddenDangerRegistration";
+import { deepClone } from "@/utils";
+
+export default {
+ components: { Titlename },
+ name: "hiddenDangerList",
+ data() {
+ return {
+ radio1:"2022年06月",
+ addShow: true,
+ id: "",
+ rowIndex: -1,
+ dangerList: [],
+ dangerForm: {},
+ dangerRules: {
+ ht_branch: [{ required: true, message: "不能为空", trigger: "blur" }],
+ address: [{ required: true, message: "不能为空", trigger: "blur" }],
+ ht_content: [{ required: true, message: "不能为空", trigger: "blur" }],
+ ht_typesub: [{ required: true, message: "不能为空", trigger: "blur" }],
+ DTRisk_bankId: [
+ { required: true, message: "不能为空", trigger: "blur" },
+ ],
+ ht_level: [{ required: true, message: "不能为空", trigger: "blur" }],
+ alter_time: [{ required: true, message: "不能为空", trigger: "blur" }],
+ alter_status: [
+ { required: true, message: "不能为空", trigger: "blur" },
+ ],
+ Review: [{ required: true, message: "不能为空", trigger: "blur" }],
+ duty_officer: [
+ { required: true, message: "不能为空", trigger: "blur" },
+ ],
+ },
+ title: "新增",
+ dialogVisible: false,
+ BCList: [],
+ JCLBList: [],
+ JCDWList: [
+ { label: "众泰煤焦化", value: 0 },
+ { label: "上级单位", value: 1 },
+ ],
+ YHBMList: [],
+ YHLXList: [],
+ YHJBList: [],
+ JCBMList: [],
+ llrList: [],
+ statusList: [],
+ YWKSList: [],
+ reboundList: [],
+ ruleForm: {},
+ rules: {
+ check_date: [{ required: true, message: "不能为空", trigger: "blur" }],
+ check_class: [{ required: true, message: "不能为空", trigger: "blur" }],
+ check_main_branch: [
+ { required: true, message: "不能为空", trigger: "blur" },
+ ],
+ check_branch: [
+ { required: true, message: "不能为空", trigger: "blur" },
+ ],
+ check_man: [{ required: true, message: "不能为空", trigger: "blur" }],
+ checktype: [{ required: true, message: "不能为空", trigger: "blur" }],
+ },
+ tableData: [],
+ };
+ },
+ mounted() {
+ this.initBC();
+ this.initJCLB();
+ this.initYHJB();
+ this.initYHLX();
+ //this.initLlr()
+ this.initReformStatus();
+ this.initYHBM();
+ this.initYWKS();
+ this.initWXY();
+ this.initDangerRebound();
+ this.id = this.$route.query.id;
+ if (this.id != null && this.id != "") {
+ this.initInfo();
+ this.addShow = false;
+ }
+ },
+ methods: {
+ async initInfo() {
+ var res = await getDangerInfo(this.id);
+ if (res.data.ok == 1) {
+ this.ruleForm = res.data.data;
+ this.changeJCDW(res.data.data.check_main_branch);
+ var obj = deepClone(res.data.data);
+ this.tableData.push(obj);
+ }
+ },
+ initDangerRebound() {
+ initDangerRebound().then((res) => {
+ if (res.data.ok == 1) {
+ this.reboundList = res.data.data;
+ } else {
+ this.$message({
+ type: "error",
+ message: res.data.msg,
+ duration: 3000,
+ });
+ }
+ });
+ },
+ submitDanger(formName) {
+ this.$refs[formName].validate((valid) => {
+ if (valid) {
+ if (this.title == "新增") {
+ this.tableData.push(this.dangerForm);
+ } else {
+ var arr = this.tableData;
+ arr.splice(this.rowIndex, 1, this.dangerForm);
+ this.tableData = arr;
+ }
+ this.dialogVisible = false;
+ } else {
+ console.log("error submit!!");
+ return false;
+ }
+ });
+ },
+ deleteDanger(row, index) {
+ this.$confirm("确认删除吗", "提示", {
+ confirmButtonText: "确认",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ var arr = deepClone(this.tableData);
+ var brr = [];
+ for (var i = 0; i < arr.length; i++) {
+ if (i == index) {
+ } else {
+ brr.push(arr[i]);
+ }
+ }
+ this.tableData = deepClone(brr);
+ //this.tableData.splice(index)
+ })
+ .catch((error) => {});
+ },
+ editDanger(row, index) {
+ this.dangerForm = deepClone(row);
+ this.rowIndex = index;
+ this.dialogVisible = true;
+ this.title = "编辑";
+ },
+
+ addDanger() {
+ this.dangerForm = {};
+ this.title = "新增";
+ this.dialogVisible = true;
+ },
+ changeWxy(e) {
+ for (var i = 0; i < this.dangerList.length; i++) {
+ if (e == this.dangerList[i].id) {
+ this.dangerForm.DTRisk_level = this.dangerList[i].mriskLevel;
+ this.dangerForm.dangerousSource = this.dangerList[i].mriskPoint;
+ }
+ }
+ },
+ initWXY() {
+ var param = {
+ page: 1,
+ limit: 1000,
+ };
+ initWxy(param).then((res) => {
+ if (res.data.ok == 1) {
+ this.dangerList = res.data.data.items;
+ } else {
+ this.$message({
+ type: "error",
+ message: res.data.msg,
+ duration: 3000,
+ });
+ }
+ });
+ },
+ initYWKS() {
+ initYwks().then((res) => {
+ if (res.data.ok == 1) {
+ this.YWKSList = res.data.data;
+ } else {
+ this.$message({
+ type: "error",
+ message: res.data.msg,
+ duration: 3000,
+ });
+ }
+ });
+ },
+ initYHBM() {
+ initYHBM().then((res) => {
+ if (res.data.ok == 1) {
+ this.YHBMList = res.data.data;
+ } else {
+ this.$message({
+ type: "error",
+ message: res.data.msg,
+ duration: 3000,
+ });
+ }
+ });
+ },
+ initLlr() {
+ initLlr().then((res) => {
+ if (res.data.ok == 1) {
+ this.llrList = res.data.data;
+ } else {
+ this.$message({
+ type: "error",
+ message: res.data.msg,
+ duration: 3000,
+ });
+ }
+ });
+ },
+ initReformStatus() {
+ initReformStatus().then((res) => {
+ if (res.data.ok == 1) {
+ this.statusList = res.data.data;
+ } else {
+ this.$message({
+ type: "error",
+ message: res.data.msg,
+ duration: 3000,
+ });
+ }
+ });
+ },
+ changeJCDW(val) {
+ initJCBM(val).then((res) => {
+ if (res.data.ok == 1) {
+ this.JCBMList = res.data.data;
+ } else {
+ this.$message({
+ type: "error",
+ message: res.data.msg,
+ duration: 3000,
+ });
+ }
+ });
+ },
+ initYHLX() {
+ initYHLX().then((res) => {
+ if (res.data.ok == 1) {
+ this.YHLXList = res.data.data;
+ } else {
+ this.$message({
+ type: "error",
+ message: res.data.msg,
+ duration: 3000,
+ });
+ }
+ });
+ },
+ initYHJB() {
+ initYHJB().then((res) => {
+ if (res.data.ok == 1) {
+ this.YHJBList = res.data.data;
+ } else {
+ this.$message({
+ type: "error",
+ message: res.data.msg,
+ duration: 3000,
+ });
+ }
+ });
+ },
+ initBC() {
+ initBC().then((res) => {
+ if (res.data.ok == 1) {
+ this.BCList = res.data.data;
+ } else {
+ this.$message({
+ type: "error",
+ message: res.data.msg,
+ duration: 3000,
+ });
+ }
+ });
+ },
+ initJCLB() {
+ initJCLB().then((res) => {
+ if (res.data.ok == 1) {
+ this.JCLBList = res.data.data;
+ } else {
+ this.$message({
+ type: "error",
+ message: res.data.msg,
+ duration: 3000,
+ });
+ }
+ });
+ },
+
+ returnIndex() {
+ this.$router.push({
+ path: "/hiddenDangerRegistration",
+ });
+ },
+ submitForm(formName) {
+ this.$refs[formName].validate((valid) => {
+ if (valid) {
+ if (this.tableData == null || this.tableData.length == 0) {
+ this.$message({
+ type: "error",
+ message: "请添加隐患",
+ duration: 2000,
+ });
+ }
+ this.ruleForm.items = this.tableData;
+ if (this.addShow) {
+ saveDanger(this.ruleForm).then((res) => {
+ if (res.data.ok == 1) {
+ this.$message({
+ type: "success",
+ message: "新增成功",
+ duration: 3000,
+ });
+ this.$router.push({
+ path: "/hiddenDangerRegistration",
+ });
+ } else {
+ this.$message({
+ type: "error",
+ message: res.data.msg,
+ duration: 3000,
+ });
+ }
+ });
+ } else {
+ var param = deepClone(this.ruleForm);
+ var obj = deepClone(this.tableData[0]);
+ param.ht_branch = obj.ht_branch;
+ param.address = obj.address;
+ param.ht_content = obj.ht_content;
+ param.measure = obj.measure;
+ param.ht_typesub = obj.ht_typesub;
+ param.DTRisk_bankId = obj.DTRisk_bankId;
+ param.DTRisk_level = obj.mriskLevel;
+ param.dangerousSource = obj.mriskPoint;
+ param.ht_level = obj.ht_level;
+ param.alter_time = obj.alter_time;
+ param.duty_officer = obj.duty_officer;
+ param.alter_status = obj.alter_status;
+ param.Review = obj.Review;
+ param.repeatId = obj.repeatId;
+ editDanger(param).then((res) => {
+ if (res.data.ok == 1) {
+ this.$message({
+ type: "success",
+ message: "编辑成功",
+ duration: 3000,
+ });
+ this.$router.push({
+ path: "/hiddenDangerRegistration",
+ });
+ } else {
+ this.$message({
+ type: "error",
+ message: res.data.msg,
+ duration: 3000,
+ });
+ }
+ });
+ }
+ } else {
+ console.log("error submit!!");
+ return false;
+ }
+ });
+ },
+ },
+};
+</script>
+
+<style scoped>
+.app-container {
+ padding: 20px;
+ height: 850px;
+ overflow-y: auto;
+}
+
+.app-container /deep/ .box {
+ padding-top: 0;
+}
+
+/* /deep/ .multiline .el-input__inner {
+ height: 62px;
+} */
+.btns {
+ background-color: #034ea2;
+ border: 1px solid #034ea2;
+}
+ .title-center /deep/ .el-radio-button:first-child .el-radio-button__inner {
+ border: none;
+}
+
+.title-center /deep/ .el-radio-button__inner {
+ border: none;
+ border-radius: 0px;
+}
+
+.title-center /deep/ .el-radio-button__orig-radio:checked + .el-radio-button__inner {
+ background-color: #034ea2;
+ background-color: #034ea2;
+}
+.title-center /deep/ .el-radio-button--medium .el-radio-button__inner {
+ padding: 11px 20px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/safetyHazardAccount/accountSend.vue b/src/views/safetyHazardAccount/accountSend.vue
index 71b3cec..44e62eb 100644
--- a/src/views/safetyHazardAccount/accountSend.vue
+++ b/src/views/safetyHazardAccount/accountSend.vue
@@ -1,206 +1,382 @@
<template>
- <div>
- <table border="1" style="background: #FFFFFF;width: 80%;margin: 0 auto">
- <tr>
- <td class="table_td" style="text-align: right;">隐患编号：</td>
- <td class="table_right_td">0220512-0008</td>
- <td class="table_td" style="text-align: right;">检查单位：</td>
- <td class="table_right_td">生产技术部（一通三防）</td>
- </tr>
- <tr>
- <td class="table_td" style="text-align: right;">检查人：</td>
- <td class="table_right_td">admin</td>
- <td class="table_td" style="text-align: right;">陪检人员： </td>
- <td class="table_right_td"></td>
- </tr>
- <tr>
- <td class="table_td" style="text-align: right;">检查时间：</td>
- <td class="table_right_td">2022-05-12</td>
- <td class="table_td" style="text-align: right;">班次：</td>
- <td class="table_right_td">早班</td>
- </tr>
- <tr>
- <td class="table_td" style="text-align: right;">跟班、带班情况：</td>
- <td class="table_right_td"></td>
- <td class="table_td" style="text-align: right;">跟班、带班人员：</td>
- <td class="table_right_td"></td>
- </tr>
- <tr>
- <td class="table_td" style="text-align: right;">行走路线：</td>
- <td class="table_right_td" colspan="3"></td>
- </tr>
- <tr>
- <td class="table_td" style="text-align: right;">隐患单位：</td>
- <td class="table_right_td">众泰煤焦化</td>
- <td class="table_td" style="text-align: right;">隐患部门：</td>
- <td class="table_right_td">众泰煤焦化</td>
- </tr>
- <tr>
- <td class="table_td" style="text-align: right;">隐患地点：</td>
- <td class="table_right_td" colspan="3">sdf</td>
- </tr>
- <tr>
- <td class="table_td" style="text-align: right;">隐患内容：</td>
- <td class="table_right_td" colspan="3">sdf</td>
- </tr>
- <tr>
- <td class="table_td" style="text-align: right;">隐患类别：</td>
- <td class="table_right_td">采掘</td>
- <td class="table_td" style="text-align: right;">隐患级别：</td>
- <td class="table_right_td">一般隐患D</td>
- </tr>
- <tr>
- <td class="table_td" style="text-align: right;">整改措施：</td>
- <td class="table_right_td">sdf</td>
- <td class="table_td" style="text-align: right;">所需资金：</td>
- <td class="table_right_td">无</td>
- </tr>
- <tr>
- <td class="table_td" style="text-align: right;">限改时间：</td>
- <td class="table_right_td">2022-05-12</td>
- <td class="table_td" style="text-align: right;">责任人： </td>
- <td class="table_right_td"></td>
- </tr>
- <tr>
- <td class="table_td" style="text-align: right;">完成时间：</td>
- <td class="table_right_td">2022-05-12 </td>
- <td class="table_td" style="text-align: right;">整改完成情况： </td>
- <td class="table_right_td">整改完成</td>
- </tr>
- <tr>
- <td class="table_td" style="text-align: right;">复查时间：</td>
- <td class="table_right_td">2022-05-12 </td>
- <td class="table_td" style="text-align: right;">复查人：</td>
- <td class="table_right_td">admin</td>
- </tr>
- <tr>
- <td class="table_td" style="text-align: right;">复查结果：</td>
- <td class="table_right_td">已整改</td>
- <td class="table_td" style="text-align: right;">整改次数：</td>
- <td class="table_right_td"></td>
- </tr>
- <tr>
- <td class="table_td" style="text-align: right;">危险源：</td>
- <td class="table_right_td" colspan="3">sdf</td>
- </tr>
- <tr>
- <td class="table_td" style="text-align: right;">风险等级：</td>
- <td class="table_right_td"></td>
- <td class="table_td" style="text-align: right;">业务科室：</td>
- <td class="table_right_td">财务部</td>
- </tr>
- <tr>
- <td class="table_td" style="text-align: right;">附件：</td>
- <td class="table_right_td" colspan="3"></td>
- </tr>
- <tr>
- <td class="table_td" style="text-align: right;">流程信息：</td>
- <td class="table_right_td" colspan="3">
- <el-table
- :data="tableData"
- border
- style="margin: 10px auto 0;width:98%;">
- <el-table-column
- prop="date"
- label="日期"
- width="180">
- </el-table-column>
- <el-table-column
- prop="name"
- label="姓名"
- width="180">
- </el-table-column>
- <el-table-column
- prop="address"
- label="地址">
- </el-table-column>
- </el-table>
- </td>
- </tr>
- </table>
- <div style="text-align: center;width: 100%;margin-top: 10px;">
- <button class="btn">关闭</button>
+ <div class="app-container">
+ <div>
+ <Titlename title="发送隐患单"></Titlename>
+ <div class="whole-form">
+ <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="150px" class="demo-ruleForm"
+ style="margin: 0 14% 0 16%;">
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="隐患编号" prop="number">
+ <el-input v-model="ruleForm.number" :disabled="true"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="9" :offset="4">
+ <el-form-item label="检查单位" prop="check_main_branch">
+ <el-input v-model="ruleForm.check_main_branch" :disabled="true"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="检查人" prop="check_man">
+ <el-input v-model="ruleForm.check_man" :disabled="true"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="9" :offset="4">
+ <el-form-item label="陪检人员" prop="acc_man">
+ <el-input v-model="ruleForm.acc_man" :disabled="true"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="检查时间" prop="check_date">
+ <el-date-picker
+ v-model="ruleForm.check_date"
+ type="date"
+ :disabled="true"
+ placeholder="选择日期"
+ style="width: 100%">
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="9" :offset="4">
+ <el-form-item label="班次" prop="check_class">
+ <el-input v-model="ruleForm.check_class" :disabled="true"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="跟班、带班情况" prop="name">
+ <el-input v-model="ruleForm.name" :disabled="true"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="9" :offset="4">
+ <el-form-item label="跟班、带班人员" prop="name">
+ <el-input v-model="ruleForm.name" :disabled="true"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="22">
+ <el-form-item label="行走路线" prop="route">
+ <el-input type="textarea" v-model="ruleForm.route" class="multiline" :disabled="true"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="隐患单位" prop="ht_community">
+ <el-input v-model="ruleForm.ht_community" :disabled="true"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="9" :offset="4">
+ <el-form-item label="隐患部门" prop="ht_branch">
+ <el-input v-model="ruleForm.ht_branch" :disabled="true"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="22">
+ <el-form-item label="隐患地点" prop="address">
+ <el-input type="textarea" v-model="ruleForm.address" class="multiline" :disabled="true"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="22">
+ <el-form-item label="隐患内容" prop="ht_content">
+ <el-input type="textarea" v-model="ruleForm.ht_content" class="multiline" :disabled="true"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="隐患类别" prop="ht_typesub">
+ <el-input v-model="ruleForm.ht_typesub" :disabled="true"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="9" :offset="4">
+ <el-form-item label="隐患级别" prop="ht_level">
+ <el-input v-model="ruleForm.ht_level" :disabled="true"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="整改措施" prop="measure">
+ <el-input v-model="ruleForm.measure" :disabled="true"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="9" :offset="4">
+ <el-form-item label="所需资金" prop="name">
+ <el-input v-model="ruleForm.name" :disabled="true"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="限改时间" prop="alter_time">
+ <el-date-picker
+ v-model="ruleForm.alter_time"
+ type="date"
+ :disabled="true"
+ placeholder="选择日期"
+ style="width: 100%">
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="9" :offset="4">
+ <el-form-item label="责任人" prop="duty_officer">
+ <el-input v-model="ruleForm.duty_officer" :disabled="true"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="完成时间" prop="name">
+ <!--<el-input v-model="ruleForm.name"></el-input>-->
+ <el-date-picker
+ v-model="value1"
+ type="date"
+ :disabled="true"
+ placeholder="选择日期"
+ style="width: 100%">
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="9" :offset="4">
+ <el-form-item label="整改完成情况" prop="alter_status">
+ <el-input v-model="ruleForm.alter_status" :disabled="true"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="复查时间" prop="name">
+ <!--<el-input v-model="ruleForm.name"></el-input>-->
+ <el-date-picker
+ v-model="value1"
+ type="date"
+ :disabled="true"
+ placeholder="选择日期"
+ style="width: 100%">
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="9" :offset="4">
+ <el-form-item label="复查人" prop="name">
+ <el-input v-model="ruleForm.name" :disabled="true"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="复查结果" prop="name">
+ <el-input v-model="ruleForm.name" :disabled="true"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="9" :offset="4">
+ <el-form-item label="整改次数" prop="name">
+ <el-input v-model="ruleForm.name" :disabled="true"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="22">
+ <el-form-item label="危险源" prop="dangerousSource">
+ <el-input type="textarea" v-model="ruleForm.dangerousSource" class="multiline" :disabled="true"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="风险等级" prop="DTRisk_level">
+ <el-input v-model="ruleForm.DTRisk_level" :disabled="true"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="9" :offset="4">
+ <el-form-item label="业务科室" prop="Review">
+ <el-input v-model="ruleForm.Review" :disabled="true"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="22">
+ <el-form-item label="附件" prop="DTRisk_level">
+ <el-input v-model="ruleForm.DTRisk_level" :disabled="true"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="22">
+ <el-form-item label="流程信息" prop="name">
+ <!-- <el-input v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>-->
+ <el-table
+ :data="tableData"
+ border
+ style="width: 100%">
+ <el-table-column
+ prop="date"
+ label="步骤"
+ align="center"
+ width="60">
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="操作人"
+ align="center"
+ width="138">
+ </el-table-column>
+ <el-table-column
+ prop="province"
+ label="处理时间"
+ align="center"
+ width="200">
+ </el-table-column>
+ <el-table-column
+ prop="city"
+ label="审批意见"
+ align="center"
+ width="260">
+ </el-table-column>
+ <el-table-column
+ prop="address"
+ label="流程信息"
+ align="center"
+ width="188">
+ </el-table-column>
+ </el-table>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="22">
+ <el-form-item style="text-align: center;">
+ <el-button class="btn" size="small" type="primary" @click="close()"
+ >关闭</el-button>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+ </div>
</div>
+
</div>
</template>
<script>
+import Titlename from "../../components/Titlename/index.vue";
+import {getDangerInfo,next_step_do} from '@/api/sgyhpczl/hiddenDangerRegistration'
+import {deepClone} from '@/utils'
+
export default {
+ components: {Titlename},
name: "superiorsSend",
data() {
return {
- tableData: [{
- date: '2016-05-02',
- name: '王小虎',
- address: '上海市普陀区金沙江路 1518 弄'
- }, {
- date: '2016-05-04',
- name: '王小虎',
- address: '上海市普陀区金沙江路 1517 弄'
- }, {
- date: '2016-05-01',
- name: '王小虎',
- address: '上海市普陀区金沙江路 1519 弄'
- }, {
- date: '2016-05-03',
- name: '王小虎',
- address: '上海市普陀区金沙江路 1516 弄'
- }]
+ id:'',
+ ruleForm: {},
+ rules: {
+ reviewTime: { required: true, message: '请填写复查时间', trigger: 'blur' },
+ rechecker: { required: true, message: '请填写复查人', trigger: 'blur' },
+ reviewResults: { required: true, message: '请填写复查结果', trigger: 'blur' },
+ desc1: { required: true, message: '复查不通过时请在备注说明原因！', trigger: 'blur' },
+ },
+ tableData: [],
+ fileList: [],
+ };
+ },
+ mounted(){
+ this.id = this.$route.query.id;
+ if( this.id!=null && this.id!=''){
+ this.initInfo();
+ }
+ },
+ methods: {
+ async initInfo(){
+ var res=await getDangerInfo(this.id)
+ if (res.data.ok==1){
+ this.ruleForm=res.data.data
+ this.ruleForm.next='发送到'+res.data.data.ht_community+res.data.data.ht_branch
+
+ }
+ },
+ submitForm(formName) {
+ this.$refs[formName].validate((valid) => {
+ if (valid) {
+ var param={
+ id:this.id,
+ step: "1",
+ dealContent: this.ruleForm.dealContent
+ }
+ next_step_do(param).then(res=>{
+ if (res.data.ok==1){
+ this.$message({type:'success', message:"fas成功", duration:3000})
+ this.close()
+ }else {
+ this.$message({type:'error', message:res.data.msg, duration:3000})
+ }
+ })
+ } else {
+ console.log('error submit!!');
+ return false;
+ }
+ });
+ },
+ handleRemove(file, fileList) {
+ console.log(file, fileList);
+ },
+ handlePreview(file) {
+ console.log(file);
+ },
+ beforeUpload(file) {
+ var FileExt = file.name.replace(/.+\./, "");
+ if (['jpg','png','bmp','gif','jpeg'].indexOf(FileExt.toLowerCase()) === -1){
+ this.$message({
+ type: 'warning',
+ message: '请上传后缀名为jpg、png、bmp、gif、jpeg的图片！'
+ });
+ return false;
+ }
+ },
+ close(){
+ this.$router.push({
+ path:"/hiddenDangerRegistration"
+ })
}
}
}
</script>
<style scoped>
-table,table tr th, table tr td {
- border:1px solid #ccc;
+.app-container {
+ padding: 20px;
+ height: 850px;
+ overflow-y: auto;
}
-.table_td{
- background: #e4edf4;
- padding: 4px 2px;
- height: 26px;
- line-height: 26px;
- width: 300px;
+
+/deep/ .box {
+ padding-top: 0;
}
-.table_right_td{
- padding: 4px 2px;
- height: 26px;
- line-height: 26px;
+
+/deep/ .multiline .el-input__inner {
+ height: 62px;
}
-.table_tr{
- background: #e4edf4;
- line-height: 40px;
- height: 40px;
+/deep/ .textarea .el-textarea__inner{
+ height: 80px;
+ max-height: 80px;
+ overflow-y: auto
}
-table{
- width: 400px;
- border-collapse: collapse;
- font-size: 14px;
-}
-.input{
- background: #f9f9f9;
- border-width: 1px;
- margin: 5px 0;
+/deep/ .textarea2 .el-textarea__inner{
+ height: 100px;
+ max-height: 100px;
+ overflow-y: auto
}
.btn{
- background: url(../../assets/btn.gif) no-repeat;
- width: 76px;
- height: 26px;
- line-height: 26px;
- font-size: 14px;
- border: none;
- color: #fff;
- cursor: pointer;
- overflow: visible;
-}
-/*去掉表格背景色*/
-/deep/ .el-table tbody tr:hover > td {
- background-color: unset !important
-}
-/deep/ .el-table .el-table__body-wrapper table tr td {
- background-color: transparent;
-}
-/deep/ .el-table .el-table__header-wrapper table tr th {
- background-color: transparent;
+ background-color: #034ea2;
+ border: 1px solid #034ea2;
}
</style>
diff --git a/src/views/safetyHazardAccount/index.vue b/src/views/safetyHazardAccount/index.vue
index e535405..e15ac5a 100644
--- a/src/views/safetyHazardAccount/index.vue
+++ b/src/views/safetyHazardAccount/index.vue
@@ -5,7 +5,7 @@
<el-input v-model="listQuery.form.number" style="width:202px" placeholder="请输入内容"></el-input>
</el-form-item>
<el-form-item label="检查单位">
- <el-select v-model="listQuery.form.check_main_branch" placeholder="请选择" @change="changeJCDW">
+ <el-select v-model="listQuery.form.check_main_branch" placeholder="请选择" @change="changeJCDW">
<el-option
v-for="item in JCDWList"
:key="item.value"
@@ -115,7 +115,7 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="深入现场情况">
+ <el-form-item label="深入现场情况">
<el-select v-model="listQuery.form.createBy" placeholder="请选择">
<el-option
v-for="item in llrList"
@@ -125,7 +125,7 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="是否关联">
+ <el-form-item label="是否关联">
<el-select v-model="listQuery.form.createBy" placeholder="请选择">
<el-option
v-for="item in llrList"
@@ -135,7 +135,7 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="复查单位">
+ <el-form-item label="复查单位">
<el-select v-model="listQuery.form.createBy" placeholder="请选择">
<el-option
v-for="item in llrList"
@@ -147,48 +147,53 @@
</el-form-item>
<el-form-item label="检查时间">
<el-col :span="11">
- <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.check_dateStart" style="width: 100%;" value-format="yyyy-MM-dd"></el-date-picker>
+ <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.check_dateStart"
+ style="width: 100%;" value-format="yyyy-MM-dd"></el-date-picker>
</el-col>
<el-col style="text-align:center" :span="2">-</el-col>
<el-col :span="11">
- <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.check_dateEnd" style="width: 100%;" value-format="yyyy-MM-dd"></el-date-picker>
+ <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.check_dateEnd"
+ style="width: 100%;" value-format="yyyy-MM-dd"></el-date-picker>
</el-col>
</el-form-item>
<el-form-item label="限改时间">
<el-col :span="11">
- <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.alter_timeStart" value-format="yyyy-MM-dd" style="width: 100%;"></el-date-picker>
+ <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.alter_timeStart"
+ value-format="yyyy-MM-dd" style="width: 100%;"></el-date-picker>
</el-col>
<el-col style="text-align:center" :span="2">-</el-col>
<el-col :span="11">
- <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.alter_timeEnd" value-format="yyyy-MM-dd" style="width: 100%;"></el-date-picker>
+ <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.alter_timeEnd"
+ value-format="yyyy-MM-dd" style="width: 100%;"></el-date-picker>
</el-col>
</el-form-item>
<el-form-item style="text-align:center;padding:0 50px">
- <el-button type="primary" class="btns" size="small" icon="el-icon-search" @click="getPageList()">查询</el-button>
+ <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" @click="exportData">导出excel</el-button>
+ <el-button type="primary" class="btns" size="small" icon="el-icon-upload2">导出excel</el-button>
</el-form-item>
</el-form>
- <el-row class="title-center">
+ <el-row class="title-center">
<el-col :span="12">
- <el-radio-group v-model="YHType">
- <el-radio-button label="1">超期整改</el-radio-button>
- <el-radio-button label="2">到期未整改</el-radio-button>
- <el-radio-button label="3">二次整改</el-radio-button>
- <el-radio-button label="4">正在整改</el-radio-button>
- <el-radio-button label="5">正在复查</el-radio-button>
- <el-radio-button label="6">整改完成</el-radio-button>
- <el-radio-button label="0">全部隐患</el-radio-button>
- </el-radio-group>
+ <el-radio-group v-model="YHType">
+ <el-radio-button label="1">超期整改</el-radio-button>
+ <el-radio-button label="2">到期未整改</el-radio-button>
+ <el-radio-button label="3">二次整改</el-radio-button>
+ <el-radio-button label="4">正在整改</el-radio-button>
+ <el-radio-button label="5">正在复查</el-radio-button>
+ <el-radio-button label="6">整改完成</el-radio-button>
+ <el-radio-button label="0">全部隐患</el-radio-button>
+ </el-radio-group>
</el-col>
<el-col :span="12" style="text-align:right;" v-if="YHType=='0'">
- <el-button type="primary" class="btns" size="small">督查督办</el-button>
- <el-button type="primary" class="btns" size="small">举一反三</el-button>
+ <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">删除</el-button>
+ <el-button type="primary" class="btns" size="small" @click='deleteBatch'>删除</el-button>
</el-col>
</el-row>
- <el-table :data="tableData" style="width: 100%" @selection-change="changeBox">
+ <el-table :data="tableData" ref="pageTable" style="width: 100%" @selection-change="changeBox">
<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="check_branch" label="检查部门" align="center" width="120"></el-table-column>
@@ -196,25 +201,25 @@
<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="ht_typesub" label="类别" align="center"> </el-table-column>
- <el-table-column prop="ht_level" label="级别" 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="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="ht_branch" label="隐患部门" align="center"> </el-table-column>
- <el-table-column prop="duty_officer" label="责任人" align="center"> </el-table-column>
+ <el-table-column prop="measure" label="整改措施" align="center"></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="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="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="ACCOMPLISHTIME" label="完成时间" width="110px" 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>
- <el-table-column label="隐患处理状态" align="center">
+ <el-table-column label="隐患处理状态" align="center">
<template slot-scope="scope">
<span v-if="scope.row.step =='1'">初始状态</span>
<span v-if="scope.row.step =='2'">整改中</span>
@@ -224,19 +229,20 @@
</el-table-column>
<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>
+ <span
+ v-if="scope.row.DTRisk_bankId==0 || scope.row.DTRisk_bankId=='' || scope.row.DTRisk_bankId==null">未关联</span>
<span v-else>已关联</span>
</template>
</el-table-column>
- <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="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" fixed="right">
<template slot-scope="scope">
<el-button @click="handleClick(scope.row)" type="text" size="small">点击发送</el-button>
</template>
</el-table-column> -->
- <el-table-column prop="date" label="操作" align="center" fixed="right">
+ <el-table-column prop="date" label="操作" align="center" fixed="right">
<template slot-scope="scope">
<el-button @click="updateClick(scope.row)" type="text" size="small">编辑</el-button>
<el-button @click="deleteClick(scope.row)" type="text" size="small">删除</el-button>
@@ -256,48 +262,89 @@
>
</el-pagination>
</div>
+
+ <!--批量复查弹窗-->
+ <el-dialog
+ title="提示"
+ :visible.sync="dialogVisible"
+ :close-on-click-modal="false"
+ width="40%"
+ >
+ <el-form>
+ <el-row>
+ <el-checkbox style="width: 80px;height: 30px" v-for="item in YHBMList" v-model="checked"
+ :label="item.branch_id">{{
+ item.branch_name
+ }}
+ </el-checkbox>
+ </el-row>
+ <el-row>
+ <el-col :span="22">
+ <el-form-item style="text-align: center;">
+ <el-button class="btn" size="small" type="primary" @click="submitForm()">
+ 保存
+ </el-button>
+ <el-button size="small" @click="close()">关闭</el-button>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+ </el-dialog>
+
</div>
+
</template>
<script>
+import {getPageList, inspect_do, draw_inferences_do} from "@/api/sgyhpczl/safetyHazardAccount";
import {delDanger} from "@/api/sgyhpczl/hiddenDangerRegistration";
-import {getPageList} from "@/api/sgyhpczl/safetyHazardAccount";
-import {danger_export_do} from "@/api/sgyhpczl/hiddenDangerRectification";
-import {initJCBM ,initYHLX, initBC ,initJCLB ,initYHBM ,initYHJB,initLlr} from "@/api/sgyhpczl/initSelect";
+import {initJCBM, initYHLX, initBC, initJCLB, initYHBM, initYHJB, initLlr} from "@/api/sgyhpczl/initSelect";
+
export default {
data() {
return {
- YHType:'0',
- selectedList:[],
- reList:[{label:"未关联",value:0}],
- llrList:[],
+ dialogVisible: false,
+ checked: [],
+ YHType: '0',
+ selectedList: [],
+ reList: [{label: "未关联", value: 0}],
+ llrList: [],
options: [],
- form:{
- type:"0"
- },
-
- JCDWList:[{label:"众泰煤焦化",value:0},{label:"上级单位",value:1}],
- JCBMList:[],
- YHLXList:[],
- BCList:[],
- JCLBList:[],
- YHBMList:[],
- YHJBList:[],
+ form: {},
+ buttonType: "",
+ JCDWList: [{label: "众泰煤焦化", value: 0}, {label: "上级单位", value: 1}],
+ JCBMList: [],
+ YHLXList: [],
+ BCList: [],
+ JCLBList: [],
+ YHBMList: [],
+ YHJBList: [],
tableData: [],
- listQuery:{
- type:0,
- page:1,
- limit:10,
- form:{
- ht_community:"众泰煤焦化"
-
+ requestData: {},
+ listQuery: {
+ page: 1,
+ limit: 10,
+ form: {
+ ht_community: "众泰煤焦化"
},
- }, currentPage: 1,
+ },
+ currentPage: 1,
pageSize: 10,
recordTotal: 0,
};
},
- mounted(){
+ watch: {
+ "YHType": function (newVal, oldVal) {
+ if (newVal) {
+ this.listQuery.type = parseInt(newVal);
+ this.getPageList();
+ }
+ },
+ "dialogVisible": function (newVal, oldVal) {
+ this.checked = [];
+ }
+ },
+ mounted() {
this.getPageList()
this.initYHLX()
this.initYHJB()
@@ -306,29 +353,24 @@
this.initLlr()
this.initYHBM()
},
- watch:{
- "YHType":function (newVal,oldVal){
- if(newVal!=null){
- this.listQuery.type = parseInt(newVal);
- this.getPageList();
- }
- }
- },
- methods:{
- deleteBatch(){
- if(this.selectedList==null ||this.selectedList.length==0 ){
- this.$message({type:'warning', message:'至少选中一条数据', duration:3000})
+ methods: {
+ close() {
+ this.dialogVisible = false;
+ },
+ deleteBatch() {
+ if (this.selectedList == null || this.selectedList.length == 0) {
+ this.$message({type: 'warning', message: '至少选中一条数据', duration: 3000})
return
}
- var ids=this.selectedList.map((obj) => {
+ var ids = this.selectedList.map((obj) => {
return obj.id
}).join(",")
- this.$confirm('确认删除吗','提示', {
+ this.$confirm('确认删除吗', '提示', {
confirmButtonText: '确认',
cancelButtonText: '取消',
type: 'warning'
})
- .then(()=>{
+ .then(() => {
delDanger(ids).then(() => {
this.getPageList()
this.$notify({
@@ -339,168 +381,168 @@
});
});
})
- .catch(error =>{
+ .catch(error => {
});
},
- changeBox(val){
+ changeBox(val) {
this.selectedList = []
val.forEach((item) => {
this.selectedList.push(item)
})
},
- initLlr(){
- initLlr().then(res=>{
- if (res.data.ok==1){
- this.llrList=res.data.data
- } else{
- this.$message({type:'error', message:res.data.msg, duration:3000})
+ initLlr() {
+ initLlr().then(res => {
+ if (res.data.ok == 1) {
+ this.llrList = res.data.data
+ } else {
+ this.$message({type: 'error', message: res.data.msg, duration: 3000})
}
})
},
- initYHBM(){
- initYHBM().then(res=>{
- if (res.data.ok==1){
- this.YHBMList=res.data.data
- } else{
- this.$message({type:'error', message:res.data.msg, duration:3000})
+ initYHBM() {
+ initYHBM().then(res => {
+ if (res.data.ok == 1) {
+ this.YHBMList = res.data.data
+ } else {
+ this.$message({type: 'error', message: res.data.msg, duration: 3000})
}
})
},
- changeJCDW(val){
- initJCBM(val).then(res=>{
- if (res.data.ok==1){
- this.JCBMList=res.data.data
- } else{
- this.$message({type:'error', message:res.data.msg, duration:3000})
+ changeJCDW(val) {
+ initJCBM(val).then(res => {
+ if (res.data.ok == 1) {
+ this.JCBMList = res.data.data
+ } else {
+ this.$message({type: 'error', message: res.data.msg, duration: 3000})
}
})
},
- checkTime(){
- if(this.listQuery.form.check_dateStart!=null && this.listQuery.form.check_dateStart!=''){
- if(this.listQuery.form.check_dateEnd!=null && this.listQuery.form.check_dateEnd!=''){
- }else {
- this.$message({type:'error', message:"请选择检查结束时间", duration:3000})
+ checkTime() {
+ if (this.listQuery.form.check_dateStart != null && this.listQuery.form.check_dateStart != '') {
+ if (this.listQuery.form.check_dateEnd != null && this.listQuery.form.check_dateEnd != '') {
+ } else {
+ this.$message({type: 'error', message: "请选择检查结束时间", duration: 3000})
return
}
}
- if(this.listQuery.form.check_dateEnd!=null && this.listQuery.form.check_dateEnd!=''){
- if(this.listQuery.form.check_dateStart!=null && this.listQuery.form.check_dateStart!=''){
- }else {
- this.$message({type:'error', message:"请选择检查开始时间", duration:3000})
+ if (this.listQuery.form.check_dateEnd != null && this.listQuery.form.check_dateEnd != '') {
+ if (this.listQuery.form.check_dateStart != null && this.listQuery.form.check_dateStart != '') {
+ } else {
+ this.$message({type: 'error', message: "请选择检查开始时间", duration: 3000})
return
}
}
- if(this.listQuery.form.alter_timeStart!=null && this.listQuery.form.alter_timeStart!=''){
- if(this.listQuery.form.alter_timeEnd!=null && this.listQuery.form.alter_timeEnd!=''){
- }else {
- this.$message({type:'error', message:"请选择限改结束时间", duration:3000})
+ if (this.listQuery.form.alter_timeStart != null && this.listQuery.form.alter_timeStart != '') {
+ if (this.listQuery.form.alter_timeEnd != null && this.listQuery.form.alter_timeEnd != '') {
+ } else {
+ this.$message({type: 'error', message: "请选择限改结束时间", duration: 3000})
return
}
}
- if(this.listQuery.form.alter_timeEnd!=null && this.listQuery.form.alter_timeEnd!=''){
- if(this.listQuery.form.alter_timeStart!=null && this.listQuery.form.alter_timeStart!=''){
- }else {
- this.$message({type:'error', message:"请选择改开始时间", duration:3000})
+ if (this.listQuery.form.alter_timeEnd != null && this.listQuery.form.alter_timeEnd != '') {
+ if (this.listQuery.form.alter_timeStart != null && this.listQuery.form.alter_timeStart != '') {
+ } else {
+ this.$message({type: 'error', message: "请选择改开始时间", duration: 3000})
return
}
}
},
- getPageList(){
- this.listQuery.page=1
+ getPageList() {
+ this.listQuery.page = 1
this.checkTime()
- getPageList(this.listQuery).then(res=>{
- if (res.data.ok==1) {
+ getPageList(this.listQuery).then(res => {
+ if (res.data.ok == 1) {
this.tableData = res.data.data.items
- this.recordTotal=res.data.data.total
- }else{
- this.$message({type:'error', message:res.data.msg, duration:3000})
+ this.recordTotal = res.data.data.total
+ } else {
+ this.$message({type: 'error', message: res.data.msg, duration: 3000})
}
})
},
- reset(){
- this.listQuery.form={ht_community:"众泰煤焦化"}
+ reset() {
+ this.listQuery.form = {ht_community: "众泰煤焦化"}
this.getPageList()
},
- handleSizeChange(val){
+ handleSizeChange(val) {
this.listQuery.limit = val
this.getPageListForPagination();
},
- handleCurrentChange(val){
+ handleCurrentChange(val) {
this.listQuery.page = val
this.getPageListForPagination();
},
- getPageListForPagination(){
+ getPageListForPagination() {
this.checkTime()
- getPageList(this.listQuery).then(res=>{
- if (res.data.ok==1) {
+ getPageList(this.listQuery).then(res => {
+ if (res.data.ok == 1) {
this.tableData = res.data.data.items
- this.recordTotal=res.data.data.total
- }else{
- this.$message({type:'error', message:res.data.msg, duration:3000})
+ this.recordTotal = res.data.data.total
+ } else {
+ this.$message({type: 'error', message: res.data.msg, duration: 3000})
}
})
},
- initYHLX(){
- initYHLX().then(res=>{
- if (res.data.ok==1){
- this.YHLXList=res.data.data
- } else{
- this.$message({type:'error', message:res.data.msg, duration:3000})
+ initYHLX() {
+ initYHLX().then(res => {
+ if (res.data.ok == 1) {
+ this.YHLXList = res.data.data
+ } else {
+ this.$message({type: 'error', message: res.data.msg, duration: 3000})
}
})
},
- initYHJB(){
- initYHJB().then(res=>{
- if (res.data.ok==1){
- this.YHJBList=res.data.data
- } else{
- this.$message({type:'error', message:res.data.msg, duration:3000})
+ initYHJB() {
+ initYHJB().then(res => {
+ if (res.data.ok == 1) {
+ this.YHJBList = res.data.data
+ } else {
+ this.$message({type: 'error', message: res.data.msg, duration: 3000})
}
})
},
- initBC(){
- initBC().then(res=>{
- if (res.data.ok==1){
- this.BCList=res.data.data
- } else{
- this.$message({type:'error', message:res.data.msg, duration:3000})
+ initBC() {
+ initBC().then(res => {
+ if (res.data.ok == 1) {
+ this.BCList = res.data.data
+ } else {
+ this.$message({type: 'error', message: res.data.msg, duration: 3000})
}
})
},
- initJCLB(){
- initJCLB().then(res=>{
- if (res.data.ok==1){
- this.JCLBList=res.data.data
- } else{
- this.$message({type:'error', message:res.data.msg, duration:3000})
+ initJCLB() {
+ initJCLB().then(res => {
+ if (res.data.ok == 1) {
+ this.JCLBList = res.data.data
+ } else {
+ this.$message({type: 'error', message: res.data.msg, duration: 3000})
}
})
},
- updateClick(row){
+ updateClick(row) {
this.$router.push({
- path:"/safetyedit"
+ path: "/hiddenDangerAdd?id=" + row.id +"&route=safetyHazardAccount"
})
},
- jump(){
+ jump() {
this.$router.push({
- path:"/hiddenDangerAdd"
+ path: "/hiddenDangerAdd"
})
},
// 发送隐患单跳转
- handleClick(row){
+ handleClick(row) {
this.$router.push({
- path:"/hiddenDangerList?id="+row.id,
+ path: "/hiddenDangerList?id=" + row.id,
})
},
- deleteClick(row){
- this.$confirm('确认删除吗','提示', {
+ deleteClick(row) {
+ this.$confirm('确认删除吗', '提示', {
confirmButtonText: '确认',
cancelButtonText: '取消',
type: 'warning'
})
- .then(()=>{
+ .then(() => {
delDanger(row.id).then(() => {
this.getPageList()
this.$notify({
@@ -511,55 +553,104 @@
});
});
})
- .catch(error =>{
+ .catch(error => {
});
},
- base(){
+ base() {
this.$router.push({
- path:"/Dualbase"
+ path: "/Dualbase"
})
},
- exportData() {
- var requestData = this.listQuery;
- requestData.type = this.YHType;
- requestData.export_type = 7;
- //删除分页参数
- this.$delete(requestData, 'page')
- this.$delete(requestData, 'limit')
- danger_export_do(requestData).then(res => {
- 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)
- })
+ supervision(type) {
+ var selectDataList = this.$refs.pageTable.selection;
+ this.buttonType = type;
+ if (selectDataList.length != 1) {
+ this.$message({
+ type: 'warning',
+ message: '请选择一条数据！'
+ });
+ return false;
+ } else {
+ this.requestData.id = selectDataList[0].id;
+ this.dialogVisible = true;
+
+ }
},
+ submitForm() {
+ if (this.checked.length == 0) {
+ this.$message({
+ type: 'warning',
+ message: '请勾选需要发送的部门！'
+ });
+ return;
+ }
+ this.requestData.branchIds = this.checked.join(";");
+ if (this.buttonType == '1') {
+ inspect_do(this.requestData).then(res => {
+ if (res.data.ok) {
+ this.$message({
+ type: 'success',
+ message: res.data.msg
+ });
+ this.dialogVisible = false;
+ this.getPageList();
+ } else {
+ this.$message({
+ type: 'error',
+ message: res.data.msg
+ });
+ }
+ })
+ } else {
+ var checkData = this.YHBMList.filter(n => {
+ return this.checked.indexOf(n.branch_id) != -1;
+ })
+ var branchNames = "";
+ checkData.forEach(n => {
+ branchNames += n.branch_name + ";";
+ })
+ this.requestData.branchNames = branchNames;
+ draw_inferences_do(this.requestData).then(res => {
+ if (res.data.ok) {
+ this.$message({
+ type: 'success',
+ message: res.data.msg
+ });
+ this.dialogVisible = false;
+ this.getPageList();
+ } else {
+ this.$message({
+ type: 'error',
+ message: res.data.msg
+ });
+ }
+ })
+ }
+ }
}
};
</script>
<style scoped>
- .inquire {
- display: flex;
- justify-content: left;
- flex-wrap: wrap;
- }
- .inquire .el-form-item {
- padding: 0 30px;
- }
- .title-center {
- padding: 20px 0;
- }
- .btns {
- background-color: #034ea2;
- border: 1px solid #034ea2;
- }
- .title-center /deep/ .el-radio-button:first-child .el-radio-button__inner {
+.inquire {
+ display: flex;
+ justify-content: left;
+ flex-wrap: wrap;
+}
+
+.inquire .el-form-item {
+ padding: 0 30px;
+}
+
+.title-center {
+ padding: 20px 0;
+}
+
+.btns {
+ background-color: #034ea2;
+ border: 1px solid #034ea2;
+}
+
+.title-center /deep/ .el-radio-button:first-child .el-radio-button__inner {
border: none;
}
diff --git a/src/views/summaryPotentialSafetyHzards/index.vue b/src/views/summaryPotentialSafetyHzards/index.vue
index 34cd1a0..31747b9 100644
--- a/src/views/summaryPotentialSafetyHzards/index.vue
+++ b/src/views/summaryPotentialSafetyHzards/index.vue
@@ -1,13 +1,249 @@
<template>
-
+<div>
+ <div class="whole_top">
+ <el-form ref="form" :inline="true" :model="form" label-width="100px">
+ <div class="top">
+ <div class="select">
+ <el-form-item>
+ <el-select v-model="value1" multiple placeholder="请选择" style="color: red">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item>
+ <el-select v-model="value2" multiple placeholder="请选择" style="color: red">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item>
+ <el-select v-model="value3" multiple placeholder="请选择" style="color: red">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item>
+ <el-select v-model="value4" multiple placeholder="请选择" style="color: red">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item>
+ <el-select v-model="value5" multiple placeholder="请选择" style="color: red">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item>
+ <el-select v-model="value6" multiple placeholder="请选择" style="color: red">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </div>
+ <el-form-item>
+ <el-radio-group v-model="radio" style="padding: 20px 0;">
+ <el-radio :label="1">按隐患部门</el-radio>
+ <el-radio :label="2">按专业</el-radio>
+ <el-radio :label="3">按级别</el-radio>
+ <el-radio :label="4">按检查类别</el-radio>
+ <el-radio :label="5">按检查单位（上级单位）</el-radio>
+ <el-radio :label="6">按检查单位（本部单位）</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ <el-radio-group v-model="radio">
+ <el-radio :label="1">按隐患部门</el-radio>
+ <el-radio :label="2">按专业</el-radio>
+ <el-radio :label="3">按级别</el-radio>
+ <el-radio :label="4">按检查类别</el-radio>
+ <el-radio :label="5">按检查单位（上级单位）</el-radio>
+ <el-radio :label="6">按检查单位（本部单位）</el-radio>
+ </el-radio-group>
+ </div>
+ <div class="center" style="text-align: center;padding-top: 10px;">
+ <el-form-item label="检查时间：">
+ <el-date-picker
+ v-model="time"
+ type="daterange"
+ range-separator="至"
+ start-placeholder="开始日期"
+ end-placeholder="结束日期">
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item>
+ <el-button class="btn" size="small" type="primary" @click="close()"
+ >汇总</el-button>
+ <el-button class="btn" size="small" type="primary" @click="close()"
+ >导出Excel</el-button>
+ </el-form-item>
+ </div>
+ </el-form>
+ <el-table
+ :data="tableData"
+ style="width: 100%">
+ <el-table-column align="center" label="众泰煤焦化-安全隐患台帐">
+ <el-table-column
+ prop="name"
+ label="隐患部门\隐患专业"
+ align="center">
+ </el-table-column>
+ <el-table-column
+ prop="province"
+ label="采掘"
+ align="center">
+ </el-table-column>
+ <el-table-column
+ prop="city"
+ label="生产"
+ width="120"
+ align="center">
+ </el-table-column>
+ <el-table-column
+ prop="address"
+ label="合计"
+ width="300"
+ align="center">
+ </el-table-column>
+ </el-table-column>
+ </el-table>
+ <div style="color: #c5021a;margin-top: 20px;">
+ <div>温馨提示：</div>
+ <div>点选可查询隐患详情。</div>
+ </div>
+ </div>
+</div>
</template>
<script>
export default {
- name: "index"
+ name: "index",
+ data() {
+ return {
+ options: [{
+ value: '选项1',
+ label: '安全环保部'
+ }, {
+ value: '选项2',
+ label: '生产技术部'
+ }, {
+ value: '选项3',
+ label: '企管部'
+ }, {
+ value: '选项4',
+ label: '消防保卫部'
+ }, {
+ value: '选项5',
+ label: '质检中心'
+ }],
+ value1: [],
+ value2: [],
+ value3: [],
+ value4: [],
+ value5: [],
+ value6: [],
+ radio: 3,
+ time: '',
+ tableData: [{
+ name: '财务部',
+ province: '1',
+ city: '4',
+ address: '1'
+ }, {
+ name: '党委副书记',
+ province: '0',
+ city: '2',
+ address: '0'
+ }, {
+ name: '众泰煤焦化',
+ province: '2',
+ city: '3',
+ address: '1'
+ }, {
+ name: '王小虎',
+ province: '3',
+ city: '9',
+ address: '2'
+ }]
+ }
+ }
}
</script>
<style scoped>
-
+.top{
+ padding: 10px 5px;
+ background: #e4edf4;
+}
+/*下拉框图标隐藏*/
+.whole_top .select /deep/ .el-input__suffix-inner .is-reverse{
+ display: none;
+}
+.whole_top .select /deep/ .el-input__suffix-inner .el-icon-arrow-up{
+ display: none;
+}
+/*设下拉框颜色*/
+.select /deep/.el-input__inner {
+ border: 1px solid #c5dbec;
+ font-weight: bold;
+ background: #dfeffc;
+/*.el-icon-circle-close*/
+}
+.whole_top .select /deep/.el-select .el-input__inner:focus {
+ color: #e6860b;
+}
+.select /deep/ .is-focus .el-select__tags-text{
+ color: #000000;
+}
+/*下拉框选值之后的样式*/
+.select /deep/ .el-tag.el-tag--info {
+ background-color: transparent;;
+ border-color: transparent;
+ font-weight: bold;
+ color: #e6860b;
+}
+/*placeholder颜色修改*/
+.whole_top ::-webkit-input-placeholder {
+ color: #000000;
+}
+.whole_top :-moz-placeholder {
+ color: #000000;
+}
+.whole_top ::-moz-placeholder{
+ color: #000000;
+}
+.whole_top :-ms-input-placeholder {
+ color: #000000;
+}
+/*日期*/
+/deep/ .el-date-editor .el-range-separator{
+ width: auto;
+}
+.btn{
+ background-color: #034ea2;
+ border: 1px solid #034ea2;
+}
</style>
diff --git a/src/views/summaryPotentialSafetyHzards/summaryForm.vue b/src/views/summaryPotentialSafetyHzards/summaryForm.vue
new file mode 100644
index 0000000..6402749
--- /dev/null
+++ b/src/views/summaryPotentialSafetyHzards/summaryForm.vue
@@ -0,0 +1,386 @@
+<template>
+ <div class="app-container">
+ <div>
+ <Titlename title="发送隐患单"></Titlename>
+ <div class="whole-form">
+ <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="150px" class="demo-ruleForm"
+ style="margin: 0 14% 0 16%;">
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="隐患编号" prop="number">
+ <el-input v-model="ruleForm.number" :disabled="true"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="9" :offset="4">
+ <el-form-item label="检查单位" prop="check_main_branch">
+ <el-input v-model="ruleForm.check_main_branch" :disabled="true"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="检查人" prop="check_man">
+ <el-input v-model="ruleForm.check_man" :disabled="true"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="9" :offset="4">
+ <el-form-item label="陪检人员" prop="acc_man">
+ <el-input v-model="ruleForm.acc_man" :disabled="true"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="检查时间" prop="check_date">
+ <el-date-picker
+ v-model="ruleForm.check_date"
+ type="date"
+ :disabled="true"
+ placeholder="选择日期"
+ style="width: 100%">
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="9" :offset="4">
+ <el-form-item label="班次" prop="check_class">
+ <el-input v-model="ruleForm.check_class" :disabled="true"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="跟班、带班情况" prop="name">
+ <el-input v-model="ruleForm.name" :disabled="true"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="9" :offset="4">
+ <el-form-item label="跟班、带班人员" prop="name">
+ <el-input v-model="ruleForm.name" :disabled="true"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="22">
+ <el-form-item label="行走路线" prop="route">
+ <el-input type="textarea" v-model="ruleForm.route" class="multiline" :disabled="true"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="隐患单位" prop="ht_community">
+ <el-input v-model="ruleForm.ht_community" :disabled="true"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="9" :offset="4">
+ <el-form-item label="隐患部门" prop="ht_branch">
+ <el-input v-model="ruleForm.ht_branch" :disabled="true"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="22">
+ <el-form-item label="隐患地点" prop="address">
+ <el-input type="textarea" v-model="ruleForm.address" class="multiline" :disabled="true"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="22">
+ <el-form-item label="隐患内容" prop="ht_content">
+ <el-input type="textarea" v-model="ruleForm.ht_content" class="multiline" :disabled="true"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="隐患类别" prop="ht_typesub">
+ <el-input v-model="ruleForm.ht_typesub" :disabled="true"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="9" :offset="4">
+ <el-form-item label="隐患级别" prop="ht_level">
+ <el-input v-model="ruleForm.ht_level" :disabled="true"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="整改措施" prop="measure">
+ <el-input v-model="ruleForm.measure" :disabled="true"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="9" :offset="4">
+ <el-form-item label="所需资金" prop="name">
+ <el-input v-model="ruleForm.name" :disabled="true"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="限改时间" prop="alter_time">
+ <el-date-picker
+ v-model="ruleForm.alter_time"
+ type="date"
+ :disabled="true"
+ placeholder="选择日期"
+ style="width: 100%">
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="9" :offset="4">
+ <el-form-item label="责任人" prop="duty_officer">
+ <el-input v-model="ruleForm.duty_officer" :disabled="true"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="完成时间" prop="name">
+ <!--<el-input v-model="ruleForm.name"></el-input>-->
+ <el-date-picker
+ v-model="value1"
+ type="date"
+ :disabled="true"
+ placeholder="选择日期"
+ style="width: 100%">
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="9" :offset="4">
+ <el-form-item label="整改完成情况" prop="alter_status">
+ <el-input v-model="ruleForm.alter_status" :disabled="true"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="复查时间" prop="name">
+ <!--<el-input v-model="ruleForm.name"></el-input>-->
+ <el-date-picker
+ v-model="value1"
+ type="date"
+ :disabled="true"
+ placeholder="选择日期"
+ style="width: 100%">
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="9" :offset="4">
+ <el-form-item label="复查人" prop="name">
+ <el-input v-model="ruleForm.name" :disabled="true"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="复查结果" prop="name">
+ <el-input v-model="ruleForm.name" :disabled="true"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="9" :offset="4">
+ <el-form-item label="整改次数" prop="name">
+ <el-input v-model="ruleForm.name" :disabled="true"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="22">
+ <el-form-item label="危险源" prop="dangerousSource">
+ <el-input type="textarea" v-model="ruleForm.dangerousSource" class="multiline" :disabled="true"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="风险等级" prop="DTRisk_level">
+ <el-input v-model="ruleForm.DTRisk_level" :disabled="true"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="9" :offset="4">
+ <el-form-item label="业务科室" prop="Review">
+ <el-input v-model="ruleForm.Review" :disabled="true"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="22">
+ <el-form-item label="附件" prop="DTRisk_level">
+ <el-input v-model="ruleForm.DTRisk_level" :disabled="true"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="22">
+ <el-form-item label="流程信息" prop="name">
+ <!-- <el-input v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>-->
+ <el-table
+ :data="tableData"
+ border
+ style="width: 100%">
+ <el-table-column
+ prop="date"
+ label="步骤"
+ align="center"
+ width="60">
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="操作人"
+ align="center"
+ width="138">
+ </el-table-column>
+ <el-table-column
+ prop="province"
+ label="处理时间"
+ align="center"
+ width="200">
+ </el-table-column>
+ <el-table-column
+ prop="city"
+ label="审批意见"
+ align="center"
+ width="260">
+ </el-table-column>
+ <el-table-column
+ prop="address"
+ label="流程信息"
+ align="center"
+ width="188">
+ </el-table-column>
+ </el-table>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="22">
+ <el-form-item style="text-align: center;">
+ <el-button class="btn" size="small" type="primary" @click="close()"
+ >关闭</el-button>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+ </div>
+ </div>
+
+ </div>
+</template>
+
+<script>
+ import Titlename from "../../components/Titlename/index.vue";
+ import {getDangerInfo,next_step_do} from '@/api/sgyhpczl/hiddenDangerRegistration'
+ import {deepClone} from '@/utils'
+ export default {
+ components: {Titlename},
+ name: "hiddenDangerList",
+ data() {
+ return {
+ id:'',
+ ruleForm: {},
+ rules: {
+ reviewTime: { required: true, message: '请填写复查时间', trigger: 'blur' },
+ rechecker: { required: true, message: '请填写复查人', trigger: 'blur' },
+ reviewResults: { required: true, message: '请填写复查结果', trigger: 'blur' },
+ desc1: { required: true, message: '复查不通过时请在备注说明原因！', trigger: 'blur' },
+ },
+ tableData: [],
+ fileList: [],
+ };
+ },
+ mounted(){
+ this.id = this.$route.query.id;
+ if( this.id!=null && this.id!=''){
+ this.initInfo();
+ }
+ },
+ methods: {
+ async initInfo(){
+ var res=await getDangerInfo(this.id)
+ if (res.data.ok==1){
+ this.ruleForm=res.data.data
+ this.ruleForm.next='发送到'+res.data.data.ht_community+res.data.data.ht_branch
+
+ }
+ },
+ submitForm(formName) {
+ this.$refs[formName].validate((valid) => {
+ if (valid) {
+ var param={
+ id:this.id,
+ step: "1",
+ dealContent: this.ruleForm.dealContent
+ }
+ next_step_do(param).then(res=>{
+ if (res.data.ok==1){
+ this.$message({type:'success', message:"fas成功", duration:3000})
+ this.close()
+ }else {
+ this.$message({type:'error', message:res.data.msg, duration:3000})
+ }
+ })
+ } else {
+ console.log('error submit!!');
+ return false;
+ }
+ });
+ },
+ handleRemove(file, fileList) {
+ console.log(file, fileList);
+ },
+ handlePreview(file) {
+ console.log(file);
+ },
+ beforeUpload(file) {
+ var FileExt = file.name.replace(/.+\./, "");
+ if (['jpg','png','bmp','gif','jpeg'].indexOf(FileExt.toLowerCase()) === -1){
+ this.$message({
+ type: 'warning',
+ message: '请上传后缀名为jpg、png、bmp、gif、jpeg的图片！'
+ });
+ return false;
+ }
+ },
+ close(){
+ this.$router.push({
+ path:"/hiddenDangerRegistration"
+ })
+ }
+ }
+ }
+</script>
+
+<style scoped>
+ .app-container {
+ padding: 20px;
+ height: 850px;
+ overflow-y: auto;
+ }
+
+ /deep/ .box {
+ padding-top: 0;
+ }
+
+ /deep/ .multiline .el-input__inner {
+ height: 62px;
+ }
+ /deep/ .textarea .el-textarea__inner{
+ height: 80px;
+ max-height: 80px;
+ overflow-y: auto
+ }
+ /deep/ .textarea2 .el-textarea__inner{
+ height: 100px;
+ max-height: 100px;
+ overflow-y: auto
+ }
+ .btn{
+ background-color: #034ea2;
+ border: 1px solid #034ea2;
+ }
+ /*.el-button:hover {*/
+ /* background: #66b1ff;*/
+ /* border-color: #66b1ff;*/
+ /* color: #FFF;*/
+ /*}*/
+</style>
diff --git a/src/views/summaryPotentialSafetyHzards/summaryList.vue b/src/views/summaryPotentialSafetyHzards/summaryList.vue
new file mode 100644
index 0000000..d2de2de
--- /dev/null
+++ b/src/views/summaryPotentialSafetyHzards/summaryList.vue
@@ -0,0 +1,354 @@
+<template>
+ <div class="app-container">
+
+ <el-table :data="tableData" style="width: 100%" @selection-change="changeBox">
+ <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"></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="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="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="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="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>
+ <el-table-column label="隐患处理状态" align="center">
+ <template slot-scope="scope">
+ <span v-if="scope.row.step =='1'">初始状态</span>
+ <span v-if="scope.row.step =='2'">整改中</span>
+ <span v-if="scope.row.step =='3'">复查中</span>
+ <span v-if="scope.row.step =='end'">处理结束</span>
+ </template>
+ </el-table-column>
+ <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>
+ <span v-else>已关联</span>
+ </template>
+ </el-table-column>
+ <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" fixed="right">
+ <template slot-scope="scope">
+ <el-button @click="handleClick(scope.row)" type="text" size="small">点击发送</el-button>
+ </template>
+ </el-table-column> -->
+ <!-- <el-table-column prop="date" label="操作" align="center" fixed="right">
+ <template slot-scope="scope">
+ <el-button @click="updateClick(scope.row)" type="text" size="small">编辑</el-button>
+ <el-button @click="deleteClick(scope.row)" type="text" size="small">删除</el-button>
+ </template>
+ </el-table-column> -->
+ </el-table>
+ <div style="text-align: right">
+ <el-pagination
+ v-show="recordTotal > 0"
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange"
+ :current-page="currentPage"
+ :page-sizes="[10, 20, 30, 50]"
+ :page-size="pageSize"
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="recordTotal"
+ >
+ </el-pagination>
+ </div>
+ </div>
+</template>
+<script>
+import {getPageList,delDanger} from "@/api/sgyhpczl/hiddenDangerRegistration";
+import {initJCBM ,initYHLX, initBC ,initJCLB ,initYHBM ,initYHJB,initLlr} from "@/api/sgyhpczl/initSelect";
+export default {
+ data() {
+ return {
+ radio1:'超期整改',
+ selectedList:[],
+ reList:[{label:"未关联",value:0}],
+ llrList:[],
+ options: [],
+ form:{},
+
+ JCDWList:[{label:"众泰煤焦化",value:0},{label:"上级单位",value:1}],
+ JCBMList:[],
+ YHLXList:[],
+ BCList:[],
+ JCLBList:[],
+ YHBMList:[],
+ YHJBList:[],
+ tableData: [],
+ listQuery:{
+ page:1,
+ limit:10,
+ form:{
+ ht_community:"众泰煤焦化"
+ },
+ },
+ currentPage: 1,
+ pageSize: 10,
+ recordTotal: 0,
+ };
+ },
+ mounted(){
+ this.getPageList()
+ this.initYHLX()
+ this.initYHJB()
+ this.initBC()
+ this.initJCLB()
+ this.initLlr()
+ this.initYHBM()
+ },
+ methods:{
+ deleteBatch(){
+ if(this.selectedList==null ||this.selectedList.length==0 ){
+ this.$message({type:'warning', message:'至少选中一条数据', duration:3000})
+ return
+ }
+ var ids=this.selectedList.map((obj) => {
+ return obj.id
+ }).join(",")
+ this.$confirm('确认删除吗','提示', {
+ confirmButtonText: '确认',
+ cancelButtonText: '取消',
+ type: 'warning'
+ })
+ .then(()=>{
+ delDanger(ids).then(() => {
+ this.getPageList()
+ this.$notify({
+ title: "成功",
+ message: "删除成功",
+ type: "success",
+ duration: 2000,
+ });
+ });
+ })
+ .catch(error =>{
+ });
+ },
+ changeBox(val){
+ this.selectedList = []
+ val.forEach((item) => {
+ this.selectedList.push(item)
+ })
+ },
+ initLlr(){
+ initLlr().then(res=>{
+ if (res.data.ok==1){
+ this.llrList=res.data.data
+ } else{
+ this.$message({type:'error', message:res.data.msg, duration:3000})
+ }
+ })
+ },
+ initYHBM(){
+ initYHBM().then(res=>{
+ if (res.data.ok==1){
+ this.YHBMList=res.data.data
+ } else{
+ this.$message({type:'error', message:res.data.msg, duration:3000})
+ }
+ })
+ },
+ changeJCDW(val){
+ initJCBM(val).then(res=>{
+ if (res.data.ok==1){
+ this.JCBMList=res.data.data
+ } else{
+ this.$message({type:'error', message:res.data.msg, duration:3000})
+ }
+ })
+ },
+ checkTime(){
+ if(this.listQuery.form.check_dateStart!=null && this.listQuery.form.check_dateStart!=''){
+ if(this.listQuery.form.check_dateEnd!=null && this.listQuery.form.check_dateEnd!=''){
+ }else {
+ this.$message({type:'error', message:"请选择检查结束时间", duration:3000})
+ return
+ }
+
+ }
+ if(this.listQuery.form.check_dateEnd!=null && this.listQuery.form.check_dateEnd!=''){
+ if(this.listQuery.form.check_dateStart!=null && this.listQuery.form.check_dateStart!=''){
+ }else {
+ this.$message({type:'error', message:"请选择检查开始时间", duration:3000})
+ return
+ }
+ }
+ if(this.listQuery.form.alter_timeStart!=null && this.listQuery.form.alter_timeStart!=''){
+ if(this.listQuery.form.alter_timeEnd!=null && this.listQuery.form.alter_timeEnd!=''){
+ }else {
+ this.$message({type:'error', message:"请选择限改结束时间", duration:3000})
+ return
+ }
+
+ }
+ if(this.listQuery.form.alter_timeEnd!=null && this.listQuery.form.alter_timeEnd!=''){
+ if(this.listQuery.form.alter_timeStart!=null && this.listQuery.form.alter_timeStart!=''){
+ }else {
+ this.$message({type:'error', message:"请选择改开始时间", duration:3000})
+ return
+ }
+ }
+ },
+ getPageList(){
+ this.listQuery.page=1
+ this.checkTime()
+ getPageList(this.listQuery).then(res=>{
+ if (res.data.ok==1) {
+ this.tableData = res.data.data.items
+ this.recordTotal=res.data.data.total
+ }else{
+ this.$message({type:'error', message:res.data.msg, duration:3000})
+ }
+ })
+ },
+ reset(){
+ this.listQuery.form={ht_community:"众泰煤焦化"}
+ this.getPageList()
+ },
+ handleSizeChange(val){
+ this.listQuery.limit = val
+ this.getPageListForPagination();
+ },
+ handleCurrentChange(val){
+ this.listQuery.page = val
+ this.getPageListForPagination();
+ },
+ getPageListForPagination(){
+ this.checkTime()
+ getPageList(this.listQuery).then(res=>{
+ if (res.data.ok==1) {
+ this.tableData = res.data.data.items
+ this.recordTotal=res.data.data.total
+ }else{
+ this.$message({type:'error', message:res.data.msg, duration:3000})
+ }
+ })
+ },
+ initYHLX(){
+ initYHLX().then(res=>{
+ if (res.data.ok==1){
+ this.YHLXList=res.data.data
+ } else{
+ this.$message({type:'error', message:res.data.msg, duration:3000})
+ }
+ })
+ },
+ initYHJB(){
+ initYHJB().then(res=>{
+ if (res.data.ok==1){
+ this.YHJBList=res.data.data
+ } else{
+ this.$message({type:'error', message:res.data.msg, duration:3000})
+ }
+ })
+ },
+ initBC(){
+ initBC().then(res=>{
+ if (res.data.ok==1){
+ this.BCList=res.data.data
+ } else{
+ this.$message({type:'error', message:res.data.msg, duration:3000})
+ }
+ })
+ },
+ initJCLB(){
+ initJCLB().then(res=>{
+ if (res.data.ok==1){
+ this.JCLBList=res.data.data
+ } else{
+ this.$message({type:'error', message:res.data.msg, duration:3000})
+ }
+ })
+ },
+ updateClick(row){
+ this.$router.push({
+ path:"/safetyedit"
+ })
+ },
+ jump(){
+ this.$router.push({
+ path:"/hiddenDangerAdd"
+ })
+ },
+ // 发送隐患单跳转
+ handleClick(row){
+ this.$router.push({
+ path:"/hiddenDangerList?id="+row.id,
+ })
+ },
+ deleteClick(row){
+ this.$confirm('确认删除吗','提示', {
+ confirmButtonText: '确认',
+ cancelButtonText: '取消',
+ type: 'warning'
+ })
+ .then(()=>{
+ delDanger(row.id).then(() => {
+ this.getPageList()
+ this.$notify({
+ title: "成功",
+ message: "删除成功",
+ type: "success",
+ duration: 2000,
+ });
+ });
+ })
+ .catch(error =>{
+ });
+ },
+ base(){
+ this.$router.push({
+ path:"/Dualbase"
+ })
+ }
+ }
+};
+</script>
+<style scoped>
+ .inquire {
+ display: flex;
+ justify-content: left;
+ flex-wrap: wrap;
+ }
+ .inquire .el-form-item {
+ padding: 0 30px;
+ }
+ .title-center {
+ padding: 20px 0;
+ }
+ .btns {
+ background-color: #034ea2;
+ border: 1px solid #034ea2;
+ }
+ .title-center /deep/ .el-radio-button:first-child .el-radio-button__inner {
+ border: none;
+}
+
+.title-center /deep/ .el-radio-button__inner {
+ border: none;
+ border-radius: 0px;
+}
+
+.title-center /deep/ .el-radio-button__orig-radio:checked + .el-radio-button__inner {
+ background-color: #034ea2;
+ background-color: #034ea2;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/troubleshooting/index.vue b/src/views/troubleshooting/index.vue
new file mode 100644
index 0000000..8879d09
--- /dev/null
+++ b/src/views/troubleshooting/index.vue
@@ -0,0 +1,508 @@
+<template>
+ <div class="app-container">
+ <el-form
+ ref="form"
+ :inline="true"
+ class="inquire"
+ :model="form"
+ label-width="100px"
+ >
+ <el-form-item label="地点">
+ <el-input
+ v-model="listQuery.form.address"
+ style="width: 202px"
+ placeholder="请输入内容"
+ ></el-input>
+ </el-form-item>
+ <el-form-item label="主持人">
+ <el-input
+ v-model="listQuery.form.ht_content"
+ style="width: 202px"
+ placeholder="请输入内容"
+ ></el-input>
+ </el-form-item>
+ <el-form-item label="召开时间">
+ <el-col :span="11">
+ <el-date-picker
+ type="date"
+ placeholder="选择日期"
+ v-model="listQuery.form.check_dateStart"
+ style="width: 100%"
+ value-format="yyyy-MM-dd"
+ ></el-date-picker>
+ </el-col>
+ <el-col style="text-align: center" :span="2">-</el-col>
+ <el-col :span="11">
+ <el-date-picker
+ type="date"
+ placeholder="选择日期"
+ v-model="listQuery.form.check_dateEnd"
+ style="width: 100%"
+ value-format="yyyy-MM-dd"
+ ></el-date-picker>
+ </el-col>
+ </el-form-item>
+ <el-form-item style="text-align: center; padding: 0 50px">
+ <el-button
+ type="primary"
+ class="btns"
+ size="small"
+ icon="el-icon-search"
+ @click="getPageList()"
+ >查询</el-button
+ >
+ <el-button
+ type="primary"
+ class="btns"
+ size="small"
+ icon="el-icon-refresh-right"
+ @click="reset()"
+ >重置</el-button
+ >
+ </el-form-item>
+ </el-form>
+ <el-row class="title-center">
+ <el-col :span="10">
+ <el-radio-group v-model="listQuery.type" @change="typeChange">
+ <el-radio-button label="0">未上报</el-radio-button>
+ <el-radio-button label="1">已上报</el-radio-button>
+ <el-radio-button label="2">上级公司会议</el-radio-button>
+ </el-radio-group>
+ </el-col>
+ <div v-if="listQuery.type==0">
+ <el-col :span="10">
+ <el-row>
+ <el-col :span="7" :offset="7" style="text-align: right;"
+ ><span style="line-height: 36px; font-size: 14px; color: #606266;margin-right:10px;font-weight: bold;"
+ >请选择上报方式</span
+ ></el-col
+ >
+ <el-col :span="10">
+ <el-select
+ v-model="listQuery.form.check_main_branch"
+ placeholder="请选择"
+ @change="changeJCDW"
+ >
+ <el-option
+ v-for="item in JCDWList"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
+ <el-button type="primary" class="btns" size="small"
+ >上报</el-button
+ >
+ </el-col>
+ </el-row>
+ </el-col>
+ <el-col :span="4" style="text-align: right">
+ <el-button
+ class="btns"
+ type="primary"
+ size="small"
+ icon="el-icon-plus"
+ >添加</el-button
+ >
+ <el-button
+ class="btns"
+ type="primary"
+ size="small"
+ icon="el-icon-close"
+ @click="sendBath()"
+ >批量删除</el-button
+ >
+ </el-col>
+ </div>
+ <div v-if="listQuery.type==1">
+ <el-col :span="14" style="text-align: right">
+ <el-button
+ class="btns"
+ type="primary"
+ size="small"
+ >撤销</el-button
+ >
+ </el-col>
+ </div>
+ </el-row>
+ <el-row class="title-center">
+ <el-col :span="10">
+ <el-radio-group v-model="radio1">
+ <el-radio-button label="0">全部</el-radio-button>
+ <el-radio-button label="1">综合</el-radio-button>
+ <el-radio-button label="2">生产</el-radio-button>
+ <el-radio-button label="3">设备</el-radio-button>
+ <el-radio-button label="4">电器</el-radio-button>
+ <el-radio-button label="5">仪表</el-radio-button>
+ <el-radio-button label="6">消防</el-radio-button>
+ <el-radio-button label="7">安全管理</el-radio-button>
+ <el-radio-button label="8">其他</el-radio-button>
+ </el-radio-group>
+ </el-col>
+ </el-row>
+ <el-table
+ :data="tableData"
+ style="width: 100%"
+ @selection-change="changeBox"
+ >
+ <el-table-column
+ type="selection"
+ width="55"
+ align="center"
+ ></el-table-column>
+ <el-table-column
+ v-if="listQuery.type==2"
+ prop="number"
+ label="会议单位"
+ align="center"
+ width="120"
+ ></el-table-column>
+ <el-table-column
+ prop="number"
+ label="召开时间"
+ align="center"
+ width="120"
+ ></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
+ prop="checktype"
+ label="会议摘要"
+ align="center"
+ ></el-table-column>
+ <el-table-column prop="DTRisk_level" label="会议纪要" align="center">
+ </el-table-column>
+ <el-table-column prop="date" v-if="listQuery.type==0" label="基本操作" align="center">
+ <template slot-scope="scope">
+ <el-button @click="updateClick(scope.row)" type="text" size="small">编辑</el-button>
+ <el-button @click="updateClick(scope.row)" type="text" size="small">保存</el-button>
+ <el-button @click="deleteClick(scope.row)" type="text" size="small">删除</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <div style="text-align: right">
+ <el-pagination
+ v-show="recordTotal > 0"
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange"
+ :current-page="currentPage"
+ :page-sizes="[10, 20, 30, 50]"
+ :page-size="pageSize"
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="recordTotal"
+ >
+ </el-pagination>
+ </div>
+ </div>
+</template>
+<script>
+import { getPageList, analogy_export_do } from "@/api/sgyhpczl/oneFromanotherN";
+import {
+ initJCBM,
+ initYHLX,
+ initJCLB,
+ initYHJB,
+} from "@/api/sgyhpczl/initSelect";
+
+export default {
+ data() {
+ return {
+ listQuery: {
+ page: 1,
+ limit: 10,
+ type: 0,
+ form: {},
+ },
+ radio1: 0,
+ table1: true,
+ table2: false,
+
+ currentPage: 1,
+ pageSize: 10,
+ recordTotal: 0,
+ XFDWList: [],
+ YHLBList: [],
+ YHJBList: [],
+ JCLBList: [],
+ tableData: [],
+ selectedList: [],
+ listLoading: false,
+ selfInspectVisible: false,
+ selfInspectForm: {
+ id: "",
+ markUserName: "",
+ markDate: "",
+ remark: "",
+ },
+ selfInspectFormRules: {
+ markUserName: [
+ { required: true, message: "自查人不能为空", trigger: "blur" },
+ ],
+ markDate: [
+ { required: true, message: "自查时间不能为空", trigger: "blur" },
+ ],
+ },
+ };
+ },
+ mounted() {
+ this.getPageList();
+ this.initJCLB();
+ this.initXFDW();
+ this.initYHJB();
+ this.initYHLB();
+ },
+ methods: {
+ sendBath() {
+ this.$router.push({
+ path: "/existN",
+ });
+ },
+ handleClick(data, val) {
+ if (val == "存在") {
+ this.$router.push({
+ path: "/exist",
+ });
+ }
+ },
+ handoff(index) {
+ if (index == 1) {
+ this.table1 = false;
+ this.table2 = true;
+ this.listQuery.type = 2;
+ console.log(this.listQuery.type);
+ this.getPageList();
+ } else {
+ this.table1 = true;
+ this.table2 = false;
+ }
+ },
+ initXFDW() {
+ initJCBM(1).then((res) => {
+ if (res.data.ok == 1) {
+ this.XFDWList = res.data.data;
+ } else {
+ this.$message({
+ type: "error",
+ message: res.data.msg,
+ duration: 3000,
+ });
+ }
+ });
+ },
+ initYHLB() {
+ initYHLX().then((res) => {
+ if (res.data.ok == 1) {
+ this.YHLBList = res.data.data;
+ } else {
+ this.$message({
+ type: "error",
+ message: res.data.msg,
+ duration: 3000,
+ });
+ }
+ });
+ },
+ initYHJB() {
+ initYHJB().then((res) => {
+ if (res.data.ok == 1) {
+ this.YHJBList = res.data.data;
+ } else {
+ this.$message({
+ type: "error",
+ message: res.data.msg,
+ duration: 3000,
+ });
+ }
+ });
+ },
+ initJCLB() {
+ initJCLB().then((res) => {
+ if (res.data.ok == 1) {
+ this.JCLBList = res.data.data;
+ } else {
+ this.$message({
+ type: "error",
+ message: res.data.msg,
+ duration: 3000,
+ });
+ }
+ });
+ },
+ checkTime() {
+ if (
+ this.listQuery.form.check_dateStart != null &&
+ this.listQuery.form.check_dateStart != ""
+ ) {
+ if (
+ this.listQuery.form.check_dateEnd != null &&
+ this.listQuery.form.check_dateEnd != ""
+ ) {
+ } else {
+ this.$message({
+ type: "error",
+ message: "请选择检查结束时间",
+ duration: 3000,
+ });
+ return;
+ }
+ }
+ if (
+ this.listQuery.form.check_dateEnd != null &&
+ this.listQuery.form.check_dateEnd != ""
+ ) {
+ if (
+ this.listQuery.form.check_dateStart != null &&
+ this.listQuery.form.check_dateStart != ""
+ ) {
+ } else {
+ this.$message({
+ type: "error",
+ message: "请选择检查开始时间",
+ duration: 3000,
+ });
+ return;
+ }
+ }
+ },
+ //搜索
+ getPageList() {
+ this.listQuery.page = 1;
+ this.checkTime();
+ getPageList(this.listQuery).then((res) => {
+ if (res.data.ok == 1) {
+ this.tableData = res.data.data.items;
+ this.recordTotal = res.data.data.total;
+ } else {
+ this.$message({
+ type: "error",
+ message: res.data.msg,
+ duration: 3000,
+ });
+ }
+ });
+ },
+ //重置
+ reset() {
+ this.listQuery.form = {};
+ this.getPageList();
+ },
+ handleSizeChange(val) {
+ this.listQuery.limit = val;
+ this.getPageListForPagination();
+ },
+ handleCurrentChange(val) {
+ this.listQuery.page = val;
+ this.getPageListForPagination();
+ },
+ getPageListForPagination() {
+ this.checkTime();
+ getPageList(this.listQuery).then((res) => {
+ if (res.data.ok == 1) {
+ this.tableData = res.data.data.items;
+ this.recordTotal = res.data.data.total;
+ } else {
+ this.$message({
+ type: "error",
+ message: res.data.msg,
+ duration: 3000,
+ });
+ }
+ });
+ },
+ typeChange(val) {
+ this.listQuery.type = val;
+ this.getPageList();
+ },
+ handleSelectionChange(val) {
+ this.selectedList = [];
+ val.forEach((item) => {
+ this.selectedList.push(item);
+ });
+ },
+ exportData() {
+ var requestData = this.listQuery;
+ //删除分页参数
+ this.$delete(requestData, "page");
+ this.$delete(requestData, "limit");
+ analogy_export_do(requestData)
+ .then((res) => {
+ 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);
+ });
+ },
+ //日期格式转换
+ 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() + " "
+ );
+ },
+ },
+};
+</script>
+<style scoped>
+.inquire {
+ display: flex;
+ justify-content: left;
+ flex-wrap: wrap;
+}
+.inquire .el-form-item {
+ padding: 0 20px;
+}
+.title-center {
+ padding: 20px 0;
+}
+
+.btns {
+ background-color: #034ea2;
+ border: 1px solid #034ea2;
+}
+
+.title-center /deep/ .el-radio-button:first-child .el-radio-button__inner {
+ border: none;
+}
+
+.title-center /deep/ .el-radio-button__inner {
+ border: none;
+ border-radius: 0px;
+}
+
+.title-center
+ /deep/
+ .el-radio-button__orig-radio:checked
+ + .el-radio-button__inner {
+ background-color: #034ea2;
+ background-color: #034ea2;
+}
+</style>
--
Gitblit v1.9.2