guoyuepeng
/
qa-prevention-gwj-vue
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

企业端安全环保检查确认时退出验证已关闭、其他页面二次退出验证也已经关闭

2024年2月1日V1.0.53
limingyu 2024-02-05 16:09:28 +08:00
parent d12840b2f7
commit b371d51094
6 changed files with 282 additions and 342 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/views/corpInfo/information/info/components/corpEdit.vue
View File

@ -206,17 +206,17 @@
</el-form-item>
</el-col>
</el-row>
<!-- <el-row>-->
<!-- <el-col :span="12">-->
<!-- <el-form-item label="四色图类型">-->
<!-- <template>-->
<!-- <el-radio v-model="form.FOURTYPE" label="1">平面四色图</el-radio>-->
<!-- <el-radio v-model="form.FOURTYPE" label="2">3D图</el-radio>-->
<!-- </template>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<el-row v-if="form.FOURTYPE==='1'">
<el-row>
<el-col :span="12">
<el-form-item label="四色图类型">
<template>
<el-radio v-model="form.FOURTYPE" label="1">平面四色图</el-radio>
<el-radio v-model="form.FOURTYPE" label="2">3D图</el-radio>
</template>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="form.FOURTYPE=='1'">
<el-col :span="24">
<div class="lh-1">
<el-form-item label="四色图">
@ -258,7 +258,7 @@
</div>
</el-col>
</el-row>
<el-row v-else-if="form.FOURTYPE==='2'">
<el-row v-else-if="form.FOURTYPE=='2'">
<el-col :span="12">
<el-form-item label="四色图">
<span v-if="form.FFILE">{{ form.FFILE.name }}</span>
@ -1077,14 +1077,7 @@ export default {
// map.addOverlay(marker) // 将标注添加到地图中
},
goBack() {
this.$confirm('确定要退出吗?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.$parent.activeName = 'corpView'
}).catch(() => {
})
},
handleChangeIMGFour(file, fileList) {
const types = ['image/jpeg', 'image/jpg', 'image/png']

6
src/views/hidden/major/confirmationperson/components/detail.vue
View File

@ -142,7 +142,7 @@
</el-col>
</td>
</tr>
<tr v-if="HIDDENLEVEL !='jdyh001' && HIDDENLEVEL !='hiddenLevel2002' && HIDDENLEVEL != '' && HIDDENLEVEL != 'hiddenLevel1001'">
<tr v-if="HIDDENLEVEL !='jdyh001' && HIDDENLEVEL !='hiddenLevel2002' && HIDDENLEVEL != '' ">
<td class="tbg">整改期限</td>
<td>
<el-col :span="24">
@ -150,7 +150,7 @@
</el-col>
</td>
</tr>
<tr v-if="HIDDENLEVEL !='jdyh001' && HIDDENLEVEL !='hiddenLevel2002' && HIDDENLEVEL != '' && HIDDENLEVEL != 'hiddenLevel1001'">
<tr v-if="HIDDENLEVEL !='jdyh001' && HIDDENLEVEL !='hiddenLevel2002' && HIDDENLEVEL != ''">
<td class="tbg">整改负责人</td>
<td>
<el-col :span="12">
@ -175,7 +175,7 @@
<td class="tbg">隐患确认人</td>
<td>{{ pd.conUserName }}</td>
</tr>
<tr v-if="HIDDENLEVEL != 'hiddenLevel1001'">
<tr>
<td class="tbg">隐患确认时间</td>
<td>
<el-col :span="24">

7
src/views/safetyenvironmental/inspection/components/add.vue
View File

@ -957,15 +957,8 @@ export default {
},
goBack() {
this.$confirm('确定要退出吗', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.$parent.INSPECTION_ID = ''
this.$parent.activeName = 'List'
}).catch(() => {
})
},
// 获取整改人列表
getUserList(DEPARTMENT_ID) {

7
src/views/safetyenvironmental/inspection/components/edit.vue
View File

@ -964,15 +964,8 @@ export default {
},
goBack() {
this.$confirm(('确定要退出吗?'), {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.$parent.INSPECTION_ID = ''
this.$parent.activeName = 'List'
}).catch(() => {
})
},
// 获取整改人列表
getUserList(DEPARTMENT_ID) {

2
src/views/safetyenvironmental/inspection/components/list.vue
View File

@ -149,7 +149,7 @@
<el-button icon="el-icon-view" size="mini" @click="goDetail(row)">查看</el-button>
<el-button type="success" icon="el-icon-view" size="mini" @click="checkFlow(row)">流程图</el-button>
<el-button
v-show="edit && ( row.INSPECTION_STATUS == '-1') && loginUserId == row.INSPECTION_ORIGINATOR_ID"
v-show="edit && ( row.INSPECTION_STATUS == '-1')"
type="primary"
icon="el-icon-edit"
size="mini"

289
static/bi/index.html
View File

@ -13,8 +13,6 @@
<script src="./js/ezuikit.js"></script>
<script src="./swiper-master/package/swiper-bundle.min.js"></script>
<script src="https://statics.ys7.com/openweb/common/scripts/jquery-39b5fb0510.cookie.js"></script>
<link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
<script src="https://unpkg.com/element-ui/lib/index.js"></script>
<!-- <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/echarts@4/dist/echarts.min.js"></script>
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/echarts-gl@1/dist/echarts-gl.min.js"></script>
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/echarts-stat@1/dist/ecStat.min.js"></script> -->
@ -142,7 +140,6 @@
本年隐患
</div>
</div>
<el-tooltip class="item" effect="dark" content="本周期除已验收、已归档的重大隐患、忽略隐患及重大隐患以外的数量" placement="top">
<div class="task-text">
<div class="title">
待处理
@ -151,8 +148,6 @@
{{hdCount.yearUncheck}}
</div>
</div>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="本周期已验收、已归档的重大隐患、忽略隐患及重大隐患的数量" placement="top">
<div class="task-text">
<div class="title">
已处理
@ -161,9 +156,6 @@
{{hdCount.yearChecked}}
</div>
</div>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="(本周期已处理/(本周期待处理+本周期已处理))*100%" placement="top">
<div class="task-text">
<div class="title">
隐患整改率
@ -174,7 +166,6 @@
<span class="f14">%</span>
</div>
</div>
</el-tooltip>
</div>
<div class="task-item">
<div class="task-textsp">
@ -185,7 +176,6 @@
本季隐患
</div>
</div>
<el-tooltip class="item" effect="dark" content="本周期除已验收、已归档的重大隐患、忽略隐患及重大隐患以外的数量" placement="top">
<div class="task-text">
<div class="title">
待处理
@ -194,8 +184,6 @@
{{hdCount.quarterUncheck}}
</div>
</div>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="本周期已验收、已归档的重大隐患、忽略隐患及重大隐患的数量" placement="top">
<div class="task-text">
<div class="title">
已处理
@ -204,8 +192,6 @@
{{hdCount.quarterChecked}}
</div>
</div>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="(本周期已处理/(本周期待处理+本周期已处理))*100%" placement="top">
<div class="task-text">
<div class="title">
隐患整改率
@ -216,7 +202,6 @@
<span class="f14">%</span>
</div>
</div>
</el-tooltip>
</div>
<div class="task-item">
<div class="task-textsp">
@ -227,7 +212,6 @@
本月隐患
</div>
</div>
<el-tooltip class="item" effect="dark" content="本周期除已验收、已归档的重大隐患、忽略隐患及重大隐患以外的数量" placement="top">
<div class="task-text">
<div class="title">
待处理
@ -236,8 +220,6 @@
{{hdCount.monthUncheck}}
</div>
</div>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="本周期已验收、已归档的重大隐患、忽略隐患及重大隐患的数量" placement="top">
<div class="task-text">
<div class="title">
已处理
@ -246,8 +228,6 @@
{{hdCount.monthChecked}}
</div>
</div>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="(本周期已处理/(本周期待处理+本周期已处理))*100%" placement="top">
<div class="task-text">
<div class="title">
隐患整改率
@ -258,7 +238,6 @@
<span class="f14">%</span>
</div>
</div>
</el-tooltip>
</div>
</div>
<div class="swiper-slide">
@ -271,7 +250,6 @@
本旬隐患
</div>
</div>
<el-tooltip class="item" effect="dark" content="本周期除已验收、已归档的重大隐患、忽略隐患及重大隐患以外的数量" placement="top">
<div class="task-text">
<div class="title">
待处理
@ -280,8 +258,6 @@
{{hdCount.xunUncheck}}
</div>
</div>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="本周期已验收、已归档的重大隐患、忽略隐患及重大隐患的数量" placement="top">
<div class="task-text">
<div class="title">
已处理
@ -290,8 +266,6 @@
{{hdCount.xunChecked}}
</div>
</div>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="(本周期已处理/(本周期待处理+本周期已处理))*100%" placement="top">
<div class="task-text">
<div class="title">
隐患整改率
@ -302,7 +276,6 @@
<span class="f14">%</span>
</div>
</div>
</el-tooltip>
</div>
<div class="task-item">
<div class="task-textsp">
@ -313,7 +286,6 @@
本周隐患
</div>
</div>
<el-tooltip class="item" effect="dark" content="本周期除已验收、已归档的重大隐患、忽略隐患及重大隐患以外的数量" placement="top">
<div class="task-text">
<div class="title">
待处理
@ -322,8 +294,6 @@
{{hdCount.weekUncheck}}
</div>
</div>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="本周期已验收、已归档的重大隐患、忽略隐患及重大隐患的数量" placement="top">
<div class="task-text">
<div class="title">
已处理
@ -332,8 +302,6 @@
{{hdCount.weekChecked}}
</div>
</div>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="(本周期已处理/(本周期待处理+本周期已处理))*100%" placement="top">
<div class="task-text">
<div class="title">
隐患整改率
@ -344,7 +312,6 @@
<span class="f14">%</span>
</div>
</div>
</el-tooltip>
</div>
<div class="task-item">
<div class="task-textsp">
@ -355,7 +322,6 @@
本日隐患
</div>
</div>
<el-tooltip class="item" effect="dark" content="本周期除已验收、已归档的重大隐患、忽略隐患及重大隐患以外的数量" placement="top">
<div class="task-text">
<div class="title">
待处理
@ -364,8 +330,6 @@
{{hdCount.dayUncheck}}
</div>
</div>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="本周期已验收、已归档的重大隐患、忽略隐患及重大隐患的数量" placement="top">
<div class="task-text">
<div class="title">
已处理
@ -374,8 +338,6 @@
{{hdCount.dayChecked}}
</div>
</div>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="(本周期已处理/(本周期待处理+本周期已处理))*100%" placement="top">
<div class="task-text">
<div class="title">
隐患整改率
@ -386,7 +348,6 @@
<span class="f14">%</span>
</div>
</div>
</el-tooltip>
</div>
</div>
</div>
@ -1860,135 +1821,135 @@ var vm = new Vue({
}, 2000)
})
// 周检查
// $.ajax({
// xhrFields: {
// withCredentials: true
// },
// type: 'POST',
// url: config.httpurl + 'checkrecord/goBiListCount',
// data: {
// COUNTTYPE: 'week',
// tm: new Date().getTime()
// },
// dataType: 'json',
// success: function(data) {
// if (data.result == 'success') {
// _this.listCountWeek = data.all
// vm.$forceUpdate() // 强制刷新
// } else if (data.result == 'exception') {
// showException('系统首页', '数据异常') // 显示异常
// }
// }
// }).done().fail(function() {
// swal('登录失效!', '请求服务器无响应，稍后再试', 'warning')
// setTimeout(function() {
// window.location.href = config.weburl + '#/login'
// }, 2000)
// })
$.ajax({
xhrFields: {
withCredentials: true
},
type: 'POST',
url: config.httpurl + 'checkrecord/goBiListCount',
data: {
COUNTTYPE: 'week',
tm: new Date().getTime()
},
dataType: 'json',
success: function(data) {
if (data.result == 'success') {
_this.listCountWeek = data.all
vm.$forceUpdate() // 强制刷新
} else if (data.result == 'exception') {
showException('系统首页', '数据异常') // 显示异常
}
}
}).done().fail(function() {
swal('登录失效!', '请求服务器无响应，稍后再试', 'warning')
setTimeout(function() {
window.location.href = config.weburl + '#/login'
}, 2000)
})
// 旬检查
// $.ajax({
// xhrFields: {
// withCredentials: true
// },
// type: 'POST',
// url: config.httpurl + 'checkrecord/goBiListCount',
// data: {
// COUNTTYPE: 'xun',
// tm: new Date().getTime()
// },
// dataType: 'json',
// success: function(data) {
// if (data.result == 'success') {
// _this.listCountXun = data.all
// vm.$forceUpdate() // 强制刷新
// } else if (data.result == 'exception') {
// showException('系统首页', '数据异常') // 显示异常
// }
// }
// }).done().fail(function() {
// swal('登录失效!', '请求服务器无响应，稍后再试', 'warning')
// setTimeout(function() {
// window.location.href = config.weburl + '#/login'
// }, 2000)
// })
$.ajax({
xhrFields: {
withCredentials: true
},
type: 'POST',
url: config.httpurl + 'checkrecord/goBiListCount',
data: {
COUNTTYPE: 'xun',
tm: new Date().getTime()
},
dataType: 'json',
success: function(data) {
if (data.result == 'success') {
_this.listCountXun = data.all
vm.$forceUpdate() // 强制刷新
} else if (data.result == 'exception') {
showException('系统首页', '数据异常') // 显示异常
}
}
}).done().fail(function() {
swal('登录失效!', '请求服务器无响应，稍后再试', 'warning')
setTimeout(function() {
window.location.href = config.weburl + '#/login'
}, 2000)
})
// 月检查
// $.ajax({
// xhrFields: {
// withCredentials: true
// },
// type: 'POST',
// url: config.httpurl + 'checkrecord/goBiListCount',
// data: {
// COUNTTYPE: 'month',
// tm: new Date().getTime()
// },
// dataType: 'json',
// success: function(data) {
// if (data.result == 'success') {
// _this.listCountMonth = data.all
// vm.$forceUpdate() // 强制刷新
// } else if (data.result == 'exception') {
// showException('系统首页', '数据异常') // 显示异常
// }
// }
// }).done().fail(function() {
// swal('登录失效!', '请求服务器无响应，稍后再试', 'warning')
// setTimeout(function() {
// window.location.href = config.weburl + '#/login'
// }, 2000)
// })
$.ajax({
xhrFields: {
withCredentials: true
},
type: 'POST',
url: config.httpurl + 'checkrecord/goBiListCount',
data: {
COUNTTYPE: 'month',
tm: new Date().getTime()
},
dataType: 'json',
success: function(data) {
if (data.result == 'success') {
_this.listCountMonth = data.all
vm.$forceUpdate() // 强制刷新
} else if (data.result == 'exception') {
showException('系统首页', '数据异常') // 显示异常
}
}
}).done().fail(function() {
swal('登录失效!', '请求服务器无响应，稍后再试', 'warning')
setTimeout(function() {
window.location.href = config.weburl + '#/login'
}, 2000)
})
// 季检查
// $.ajax({
// xhrFields: {
// withCredentials: true
// },
// type: 'POST',
// url: config.httpurl + 'checkrecord/goBiListCount',
// data: {
// COUNTTYPE: 'quarter',
// tm: new Date().getTime()
// },
// dataType: 'json',
// success: function(data) {
// if (data.result == 'success') {
// _this.listCountQuarter = data.all
// vm.$forceUpdate() // 强制刷新
// } else if (data.result == 'exception') {
// showException('系统首页', '数据异常') // 显示异常
// }
// }
// }).done().fail(function() {
// swal('登录失效!', '请求服务器无响应，稍后再试', 'warning')
// setTimeout(function() {
// window.location.href = config.weburl + '#/login'
// }, 2000)
// })
$.ajax({
xhrFields: {
withCredentials: true
},
type: 'POST',
url: config.httpurl + 'checkrecord/goBiListCount',
data: {
COUNTTYPE: 'quarter',
tm: new Date().getTime()
},
dataType: 'json',
success: function(data) {
if (data.result == 'success') {
_this.listCountQuarter = data.all
vm.$forceUpdate() // 强制刷新
} else if (data.result == 'exception') {
showException('系统首页', '数据异常') // 显示异常
}
}
}).done().fail(function() {
swal('登录失效!', '请求服务器无响应，稍后再试', 'warning')
setTimeout(function() {
window.location.href = config.weburl + '#/login'
}, 2000)
})
// 年检查
// $.ajax({
// xhrFields: {
// withCredentials: true
// },
// type: 'POST',
// url: config.httpurl + 'checkrecord/goBiListCount',
// data: {
// COUNTTYPE: 'year',
// tm: new Date().getTime()
// },
// dataType: 'json',
// success: function(data) {
// if (data.result == 'success') {
// _this.listCountYear = data.all
// vm.$forceUpdate() // 强制刷新
// } else if (data.result == 'exception') {
// showException('系统首页', '数据异常') // 显示异常
// }
// }
// }).done().fail(function() {
// swal('登录失效!', '请求服务器无响应，稍后再试', 'warning')
// setTimeout(function() {
// window.location.href = config.weburl + '#/login'
// }, 2000)
// })
$.ajax({
xhrFields: {
withCredentials: true
},
type: 'POST',
url: config.httpurl + 'checkrecord/goBiListCount',
data: {
COUNTTYPE: 'year',
tm: new Date().getTime()
},
dataType: 'json',
success: function(data) {
if (data.result == 'success') {
_this.listCountYear = data.all
vm.$forceUpdate() // 强制刷新
} else if (data.result == 'exception') {
showException('系统首页', '数据异常') // 显示异常
}
}
}).done().fail(function() {
swal('登录失效!', '请求服务器无响应，稍后再试', 'warning')
setTimeout(function() {
window.location.href = config.weburl + '#/login'
}, 2000)
})
},
// 退出系统