From 051f1d7412bbb40640cf6b56c405630c89693fc7 Mon Sep 17 00:00:00 2001 From: liujun Date: Thu, 13 Jun 2024 15:01:53 +0800 Subject: [PATCH 1/5] =?UTF-8?q?1=E3=80=81=E8=BE=B9=E7=95=8C=E5=85=A5?= =?UTF-8?q?=E4=BE=B5=E7=95=8C=E9=9D=A2=E6=9B=B4=E6=96=B0=202=E3=80=81?= =?UTF-8?q?=E8=BE=B9=E7=95=8C=E5=85=A5=E4=BE=B5=E6=91=84=E5=83=8F=E5=A4=B4?= =?UTF-8?q?=E6=A0=87=E7=82=B9=E4=B8=8D=E6=98=BE=E7=A4=BAbug=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/map/components/zhongdian.vue | 102 ++++++++++++++++++++----- 1 file changed, 82 insertions(+), 20 deletions(-) diff --git a/src/views/map/components/zhongdian.vue b/src/views/map/components/zhongdian.vue index 9500a6b..fc24fb8 100644 --- a/src/views/map/components/zhongdian.vue +++ b/src/views/map/components/zhongdian.vue @@ -1,7 +1,7 @@ @@ -78,26 +93,15 @@ export default { return { block1OptionsList: [ { - title: '开工数量', + title: '监控数量', img: require('../../../assets/map/zhongdian/ico1.png'), count: '-' }, { - title: '视频数量', + title: '监控数量', img: require('../../../assets/map/zhongdian/ico2.png'), count: '-' - }, - { - title: '检查次数', - img: require('../../../assets/map/zhongdian/ico3.png'), - count: '-' - }, - { - title: '发现隐患数量', - img: require('../../../assets/map/zhongdian/ico4.png'), - count: '-' } - ], block2OptionsList: [ { @@ -120,11 +124,12 @@ export default { CHECK_COUNT: '-', HIDDEN_COUNT: '-' } - ] + ], + block4List: [] } }, mounted() { - this.getCount() + this.initNum() this.initgetTable() }, methods: { @@ -147,6 +152,21 @@ export default { this.block2OptionsList[1].count = data.pd.AMOUT_SUM }) }, + initNum() { + requestFN('/map/getAllDwMessage', { corpId: this.corpInfoId } + ).then((data) => { + this.block1OptionsList[0].count = data.alarmList.total + requestFN('/map/mapPlatformelectronic/listAllLocatio', { corpId: this.corpInfoId, TYPE: 'bianjieruqin' } + ).then((data) => { + this.block4List = data.alarmList.list + this.block1OptionsList[0].count = data.alarmList.total + }).catch((e) => { + this.$message.error(e) + }) + }).catch((e) => { + this.$message.error(e) + }) + }, initgetTable() { requestFN( '/map/keyProject/list?showCount=10¤tPage=1', @@ -357,6 +377,48 @@ export default { } } } + + .block4 { + margin-top: 10px; + width: 410px; + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.8)); + + .content { + border: 1px solid; + border-image: linear-gradient(to bottom, rgba(58, 122, 149, 0), rgba(58, 122, 149, 1)) 1; + border-top: none; + padding: 10px; + + .options { + display: flex; + justify-content: flex-end; + + .title { + cursor: pointer; + } + } + + .table { + margin-top: 5px; + + .tr { + display: flex; + + &:nth-child(odd) { + background-color: rgba(42, 86, 158, 0.53); + } + + .td { + flex: 1; + text-align: center; + font-size: 12px; + color: #fff; + padding: 5px; + } + } + } + } + } } @keyframes scale { From 5eb8bd04848d36fdb8f0a79fb2bb832b7b16ef3f Mon Sep 17 00:00:00 2001 From: liujun Date: Mon, 24 Jun 2024 19:47:40 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=B7=A5=E5=8C=A0=E5=AD=A6=E5=91=98?= =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E7=8F=AD=E7=BA=A7=E4=BF=A1=E6=81=AF=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../keyprojects/platformelectronic/index.vue | 75 ++++++++++++++++--- src/views/map/components/zhongdian.vue | 14 ++-- 2 files changed, 70 insertions(+), 19 deletions(-) diff --git a/src/views/keyprojects/platformelectronic/index.vue b/src/views/keyprojects/platformelectronic/index.vue index a7d2cf4..045c281 100644 --- a/src/views/keyprojects/platformelectronic/index.vue +++ b/src/views/keyprojects/platformelectronic/index.vue @@ -96,13 +96,13 @@ - - + + - + @@ -126,7 +126,7 @@
- 取 消 + 取 消 确 定
@@ -198,11 +198,7 @@ export default { }, quyuList: [], shexiangtouForm: {}, - statusList: [ - { id: '0', name: '请选择' }, - { id: '1', name: '油管区' }, - { id: '2', name: '码头区' } - ] + statusList: [] } }, async created() { @@ -266,7 +262,7 @@ export default { this.msg = 'add' this.resetForm() this.dialogForm = true - // this.$refs.platformvideo.init() + this.getDic() }, resetForm() { this.shexiangtouForm.LONGITUDE = '' @@ -312,6 +308,7 @@ export default { ).then(async(data) => { await this.getAllList() this.getList() + this.shexiangtouForm = {} }).catch((e) => { this.listLoading = false }) @@ -326,6 +323,7 @@ export default { goEdit(row) { this.dialogForm = true this.listLoading = true + this.getDic() return new Promise(resolve => { requestFN( '/platformelectronic/goEdit', @@ -334,11 +332,13 @@ export default { } ).then((data) => { this.shexiangtouForm = data.pd + this.form.SUOSHUQUYU = data.pd.SUOSHUQUYU + this.getSendDic() this.form.bianjiequyu = data.pd.FANGQU_IDS.split(',') this.form.CORPINFO_ID = data.pd.CORPINFO_ID this.form.VIDEONAME = data.pd.NAME this.form.CODE = data.pd.INDEXCODE - this.form.SUOSHUQUYU = data.pd.SUOSHUQUYU + this.form.LONGITUDEANDLATITUDE = data.pd.LONGITUDE + ',' + data.pd.LATITUDE this.listLoading = false resolve() @@ -381,8 +381,8 @@ export default { }, // 获取列表 setPosition() { + // eslint-disable-next-line no-empty if (this.shexiangtouForm.PLATFORMELECTRONIC_ID != null) { - } this.shexiangtouForm.LONGITUDE = this.form.LONGITUDE this.shexiangtouForm.LATITUDE = this.form.LATITUDE @@ -505,6 +505,57 @@ export default { handleBack() { this.player.dispose() this.dialogVideoHLS = false + }, + + getDic() { // 获取区域字典信息 + const loading = this.$loading({ + lock: true, + text: 'Loading', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }) + requestFN('/dictionaries/listSelectTree', { DICTIONARIES_ID: 'f0bae7becdee4d779a2cb82037948ab4' } + ).then((data) => { + this.statusList = JSON.parse(data.zTreeNodes) + loading.close() + }).catch((e) => { + loading.close() + }) + }, + getSendDic() { + const loading = this.$loading({ + lock: true, + text: 'Loading', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }) + this.form.quyuList = [] + requestFN('/dictionaries/listSelectTree', { DICTIONARIES_ID: this.form.SUOSHUQUYU } + ).then((data) => { + loading.close() + this.quyuList = JSON.parse(data.zTreeNodes) + }).catch((e) => { + loading.close() + }) + }, + closeDia() { + this.dialogForm = false + this.form = { + CORPINFO_ID: '', + bianjiequyu: [], + PLATFORMELECTRONIC_ID: '', + LONGITUDEANDLATITUDE: '', + VIDEOMANAGER_ID: '', + VIDEO_RESOURCES_ID: '', + VIDEO_TYPE: 1, + VIDEONAME: '', // + VIDEOURL: '', + CODE: '', + PLATFORMVIDEOMANAGEMENT_ID: '', + LATITUDE: '', + LONGITUDE: '', + SUOSHUQUYU: '' + } } } } diff --git a/src/views/map/components/zhongdian.vue b/src/views/map/components/zhongdian.vue index fc24fb8..6e1fb57 100644 --- a/src/views/map/components/zhongdian.vue +++ b/src/views/map/components/zhongdian.vue @@ -93,7 +93,7 @@ export default { return { block1OptionsList: [ { - title: '监控数量', + title: '报警数量', img: require('../../../assets/map/zhongdian/ico1.png'), count: '-' }, @@ -154,12 +154,12 @@ export default { }, initNum() { requestFN('/map/getAllDwMessage', { corpId: this.corpInfoId } - ).then((data) => { - this.block1OptionsList[0].count = data.alarmList.total - requestFN('/map/mapPlatformelectronic/listAllLocatio', { corpId: this.corpInfoId, TYPE: 'bianjieruqin' } - ).then((data) => { - this.block4List = data.alarmList.list - this.block1OptionsList[0].count = data.alarmList.total + ).then((data0) => { + this.block1OptionsList[0].count = data0.alarmList.total + requestFN('/map/mapPlatformelectronic/listAllLocation', { corpId: this.corpInfoId, TYPE: 'bianjieruqin' } + ).then((data1) => { + this.block4List = data0.alarmList.list + this.block1OptionsList[0].count = data1.varList.total }).catch((e) => { this.$message.error(e) }) From a78960d1071d3a00e16597882f0fef8b0fbff2c3 Mon Sep 17 00:00:00 2001 From: liujun Date: Tue, 25 Jun 2024 17:55:04 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E8=BE=B9=E7=95=8C=E5=85=A5=E4=BE=B5?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=9C=B0=E5=9B=BE=E7=9B=91=E7=AE=A1=E6=AE=B5?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/map/components/zhongdian.vue | 215 +++++++++++++++---------- 1 file changed, 126 insertions(+), 89 deletions(-) diff --git a/src/views/map/components/zhongdian.vue b/src/views/map/components/zhongdian.vue index 6e1fb57..79afba2 100644 --- a/src/views/map/components/zhongdian.vue +++ b/src/views/map/components/zhongdian.vue @@ -14,35 +14,10 @@ -
- +
+
-
-
-
-
{{ item.label }}
-
-
-
-
-
-
- -
-
-
-
公司名称
-
创建数
-
检查次数
-
隐患数量
-
-
-
{{ item.CORP_NAME }}
-
{{ item.OUTSOURCED_COUNT }}
-
{{ item.CHECK_COUNT }}
-
{{ item.HIDDEN_COUNT }}
-
-
+
@@ -69,7 +44,9 @@ import layoutTitle from './title.vue' import CountTo from 'vue-count-to' import { requestFN } from '@/utils/request' +import * as echarts from 'echarts' +let Echarts1 export default { components: { CountTo, @@ -131,6 +108,12 @@ export default { mounted() { this.initNum() this.initgetTable() + window.onresize = function() { + Echarts1 && Echarts1.resize() + } + }, + beforeDestroy() { + Echarts1 = null }, methods: { getCount() { @@ -153,13 +136,14 @@ export default { }) }, initNum() { - requestFN('/map/getAllDwMessage', { corpId: this.corpInfoId } + requestFN('/map/getAllDwMessage', { corpId: this.corpInfoId, source: '0' } ).then((data0) => { - this.block1OptionsList[0].count = data0.alarmList.total + this.block1OptionsList[0].count = data0.alarmList.page.total requestFN('/map/mapPlatformelectronic/listAllLocation', { corpId: this.corpInfoId, TYPE: 'bianjieruqin' } ).then((data1) => { this.block4List = data0.alarmList.list - this.block1OptionsList[0].count = data1.varList.total + this.block1OptionsList[1].count = data1.varList.length + this.initEcharts1(data1.iconData) }).catch((e) => { this.$message.error(e) }) @@ -178,6 +162,112 @@ export default { ).then((data) => { this.block3List = data.varList }) + }, + initEcharts1(data) { + console.log(data) + const XaxisData = [] + const seriesData1 = [] + for (const optionKey in data) { + console.log(data[optionKey]) + for (let i = 0; i < data[optionKey].length; i++) { + console.log(data[optionKey][i]) + XaxisData.push(data[optionKey][i].NAME) + seriesData1.push(data[optionKey][i].num) + } + } + + // eslint-disable-next-line no-undef + Echarts1 = echarts.init(document.querySelector('#main1')) + const option = { + tooltip: { + trigger: 'axis', + axisPointer: { + type: 'shadow' + } + }, + grid: { + left: '2%', + right: '4%', + bottom: '5%', + top: '12%', + containLabel: true + }, + legend: { + top: '0%', + right: '0%', + textStyle: { + color: '#fff', + fontSize: 14 + }, + itemWidth: 12, + itemHeight: 10 + }, + xAxis: { + type: 'category', + data: XaxisData, + axisLine: { + lineStyle: { + color: '#fff' + } + }, + axisLabel: { + textStyle: { + fontSize: 12 + } + } + }, + yAxis: { + type: 'value', + max: '50', + axisLine: { + show: false, + lineStyle: { + color: '#fff' + } + }, + splitLine: { + show: true, + lineStyle: { + color: '#8c9493' + } + }, + axisLabel: { + textStyle: { + fontSize: 14 + } + } + }, + series: [ + { + name: '摄像头', + type: 'bar', + barWidth: '10%', + itemStyle: { + normal: { + color: new echarts.graphic.LinearGradient( + 0, + 0, + 0, + 1, + [ + { + offset: 0, + color: '#00f0ff' + }, + { + offset: 1, + color: '#0066ff' + } + ], + false + ) + } + }, + data: seriesData1 + } + ] + } + Echarts1.setOption(option) } } } @@ -263,6 +353,7 @@ export default { } } } + .block2 { width: 410px; background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.8)); @@ -273,66 +364,11 @@ export default { border: 1px solid; border-image: linear-gradient(to bottom, rgba(58, 122, 149, 0), rgba(58, 122, 149, 1)) 1; border-top: none; - display: flex; - flex-wrap: wrap; - justify-content: space-between; - align-items: center; - position: relative; - height: 150px; - - .option{ - width: 50%; - display: flex; - align-items: center; - - justify-content: space-around; - .circular { - margin-top: 5px; - background-image: url("../../../assets/map/anquan/icobg.png"); - background-size: 100% 100%; - background-repeat: no-repeat; - width: 70px; - height: 70px; - text-align: center; - padding-top: 13px; - - img { - width: 25px; - height: 26px; - animation: slideY 2s infinite; - } - } - - .info{ - flex: 1; - text-align: center; - - .title{ - background-image: url("../../../assets/map/anquan/label.png"); - background-size: 100% 100%; - background-repeat: no-repeat; - width: 120px; - height: 24px; - margin-top: 5px; - font-size: 12px; - line-height: 25px; - text-align: center; - color: #fff; - } - .count{ - margin-top: 10px; - font-size: 24px; - background: linear-gradient(to top, #48bbf0, #ffffff); - -webkit-background-clip: text; - -webkit-text-fill-color: transparent; - font-weight: bold; - font-family: "PingFang SC", "Helvetica Neue", "Hiragino Sans GB", "Segoe UI", "Microsoft YaHei", "微软雅黑", sans-serif; - - } - } + #main1 { + width: 100%; + height: 250px; } - } } @@ -432,6 +468,7 @@ export default { transform: scale(0.9); } } + @keyframes slideY { 0% { transform: translateY(0); From 08555f1a10e345f41fabd149f125ea90dfaf2952 Mon Sep 17 00:00:00 2001 From: liujun Date: Thu, 27 Jun 2024 14:48:12 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=BE=B9=E7=95=8C=E5=85=A5=E4=BE=B5?= =?UTF-8?q?=E6=9C=AA=E5=88=9D=E5=A7=8B=E5=8C=96bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/keyprojects/platformelectronic/index.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/keyprojects/platformelectronic/index.vue b/src/views/keyprojects/platformelectronic/index.vue index 045c281..1fd60f6 100644 --- a/src/views/keyprojects/platformelectronic/index.vue +++ b/src/views/keyprojects/platformelectronic/index.vue @@ -334,7 +334,7 @@ export default { this.shexiangtouForm = data.pd this.form.SUOSHUQUYU = data.pd.SUOSHUQUYU this.getSendDic() - this.form.bianjiequyu = data.pd.FANGQU_IDS.split(',') + this.form.bianjiequyu = data.pd.FANGQU_IDS?data.pd.FANGQU_IDS.split(','):[] this.form.CORPINFO_ID = data.pd.CORPINFO_ID this.form.VIDEONAME = data.pd.NAME this.form.CODE = data.pd.INDEXCODE @@ -343,6 +343,7 @@ export default { this.listLoading = false resolve() }).catch((e) => { + console.log(e) this.listLoading = false }) }) @@ -529,6 +530,7 @@ export default { spinner: 'el-icon-loading', background: 'rgba(0, 0, 0, 0.7)' }) + this.form.bianjiequyu = [] this.form.quyuList = [] requestFN('/dictionaries/listSelectTree', { DICTIONARIES_ID: this.form.SUOSHUQUYU } ).then((data) => { From 3b4803ee19db4f7fdf419859c538fea0ce66ecb7 Mon Sep 17 00:00:00 2001 From: zy <907315977@qq.com> Date: Thu, 27 Jun 2024 18:16:12 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=85=AB=E9=A1=B9=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../blindboard/components/detail.vue | 2 +- .../breakground/components/detail.vue | 2 +- .../breakground/components/list.vue | 17 +- .../components/corpInfo.vue | 10 +- .../electricity/components/detail.vue | 269 +++++++++++++++++ .../components/list.vue | 191 ++++-------- .../{lectricity => electricity}/index.vue | 21 +- .../highwork/components/corpInfo.vue | 10 +- .../highwork/components/detail.vue | 195 ++++++------ .../highwork/components/list.vue | 156 ++++------ src/views/dangerousWork/highwork/index.vue | 28 +- .../hoisting/components/corpInfo.vue | 10 +- .../hoisting/components/detail.vue | 246 ++++++++------- .../hoisting/components/list.vue | 160 +++++----- src/views/dangerousWork/hoisting/index.vue | 25 +- .../lectricity/components/detail.vue | 279 ------------------ .../limitspace/components/detail.vue | 2 +- .../limitspace/components/list.vue | 2 +- 18 files changed, 771 insertions(+), 854 deletions(-) rename src/views/dangerousWork/{lectricity => electricity}/components/corpInfo.vue (85%) create mode 100644 src/views/dangerousWork/electricity/components/detail.vue rename src/views/dangerousWork/{lectricity => electricity}/components/list.vue (54%) rename src/views/dangerousWork/{lectricity => electricity}/index.vue (52%) delete mode 100644 src/views/dangerousWork/lectricity/components/detail.vue diff --git a/src/views/dangerousWork/blindboard/components/detail.vue b/src/views/dangerousWork/blindboard/components/detail.vue index d253af5..225a315 100644 --- a/src/views/dangerousWork/blindboard/components/detail.vue +++ b/src/views/dangerousWork/blindboard/components/detail.vue @@ -7,7 +7,7 @@
-

断路安全作业票

+

盲板作业票

编号:{{ pd.CHECK_NO }}
diff --git a/src/views/dangerousWork/breakground/components/detail.vue b/src/views/dangerousWork/breakground/components/detail.vue index 5adb003..ead3fbf 100644 --- a/src/views/dangerousWork/breakground/components/detail.vue +++ b/src/views/dangerousWork/breakground/components/detail.vue @@ -7,7 +7,7 @@
-

断路安全作业票

+

动土安全作业票

编号:{{ pd.CHECK_NO }}
diff --git a/src/views/dangerousWork/breakground/components/list.vue b/src/views/dangerousWork/breakground/components/list.vue index 18587cc..82cfb2e 100644 --- a/src/views/dangerousWork/breakground/components/list.vue +++ b/src/views/dangerousWork/breakground/components/list.vue @@ -258,22 +258,7 @@ export default { this.listLoading = false }) }, - // 判断按钮权限，用于是否显示按钮 - hasButton() { - var keys = 'cutroad:add,cutroad:del,cutroad:edit,toExcel' - requestFN( - '/head/hasButton', - { - keys: keys - } - ).then((data) => { - this.add = data.cutroadfhadminadd // 新增权限 - this.del = data.cutroadfhadmindel // 删除权限 - this.edit = data.cutroadfhadminedit // 修改权限 - }).catch((e) => { - this.listLoading = false - }) - }, + goChart(row) { this.pd = row this.dialogFormShow = true diff --git a/src/views/dangerousWork/lectricity/components/corpInfo.vue b/src/views/dangerousWork/electricity/components/corpInfo.vue similarity index 85% rename from src/views/dangerousWork/lectricity/components/corpInfo.vue rename to src/views/dangerousWork/electricity/components/corpInfo.vue index eefa197..bce1003 100644 --- a/src/views/dangerousWork/lectricity/components/corpInfo.vue +++ b/src/views/dangerousWork/electricity/components/corpInfo.vue @@ -33,22 +33,22 @@ @@ -108,7 +108,7 @@ export default { return new Promise((resolve) => { this.listLoading = true requestFN( - '/dangerousWork/gfcutroad/corpCountlist?showCount=' + this.listQuery.limit + '¤tPage=' + this.listQuery.page, + '/dangerousWork/gfElectricity/corpCountlist?showCount=' + this.listQuery.limit + '¤tPage=' + this.listQuery.page, { COPRINF_ID: sessionStorage.getItem('user').CORPINFO_ID || '', KEYWORDS: this.KEYWORDS diff --git a/src/views/dangerousWork/electricity/components/detail.vue b/src/views/dangerousWork/electricity/components/detail.vue new file mode 100644 index 0000000..68d76d5 --- /dev/null +++ b/src/views/dangerousWork/electricity/components/detail.vue @@ -0,0 +1,269 @@ + + + + + diff --git a/src/views/dangerousWork/lectricity/components/list.vue b/src/views/dangerousWork/electricity/components/list.vue similarity index 54% rename from src/views/dangerousWork/lectricity/components/list.vue rename to src/views/dangerousWork/electricity/components/list.vue index 6241d41..5a22405 100644 --- a/src/views/dangerousWork/lectricity/components/list.vue +++ b/src/views/dangerousWork/electricity/components/list.vue @@ -27,58 +27,46 @@ - + - - - - - - - - - - - - - + + + + + + +
+ +
- + + + diff --git a/src/views/dangerousWork/highwork/components/corpInfo.vue b/src/views/dangerousWork/highwork/components/corpInfo.vue index 377ebb3..9c4b976 100644 --- a/src/views/dangerousWork/highwork/components/corpInfo.vue +++ b/src/views/dangerousWork/highwork/components/corpInfo.vue @@ -33,22 +33,22 @@ @@ -108,7 +108,7 @@ export default { return new Promise((resolve) => { this.listLoading = true requestFN( - '/gfHighWork/corpCountlist?showCount=' + this.listQuery.limit + '¤tPage=' + this.listQuery.page, + '/dangerousWork/gfHighWork/corpCountlist?showCount=' + this.listQuery.limit + '¤tPage=' + this.listQuery.page, { COPRINF_ID: sessionStorage.getItem('user').CORPINFO_ID || '', KEYWORDS: this.KEYWORDS diff --git a/src/views/dangerousWork/highwork/components/detail.vue b/src/views/dangerousWork/highwork/components/detail.vue index d253af5..b551ab1 100644 --- a/src/views/dangerousWork/highwork/components/detail.vue +++ b/src/views/dangerousWork/highwork/components/detail.vue @@ -4,26 +4,41 @@ - - - + + + - + - - - - + + - - + + + + + + + + + + + + + + - - + + + + - - - - + - + - + - - - - - - - - - - - + + + + + + +
-
-

断路安全作业票

-
编号:{{ pd.CHECK_NO }}
-
-
+
+

高处安全作业票

+
编号:{{ pd.CHECK_NO }}
+
+
申请单位作业申请单位 {{ pd.APPLY_DEPARTMENT_NAME }}作业单位{{ pd.CONSTRUCTION_DEPARTMENT_NAME }}作业负责人{{ pd.CONSTRUCTION_USER_NAME }}作业申请时间{{ pd.CREATTIME }}
涉及相关单位（部门）{{ pd.OTHER_DEPT }}作业地点{{ pd.WORK_PLACE }}作业内容{{ pd.WORK_CONTENT }}
作业高度{{ pd.WORK_HIGH }}高处作业级别 + {{ pd.WORK_LEVEL == '1' ? 'I级高处作业' : '' }} + {{ pd.WORK_LEVEL == '2' ? 'II级高处作业' : '' }} + {{ pd.WORK_LEVEL == '3' ? 'III级高处作业' : '' }} + {{ pd.WORK_LEVEL == '4' ? 'IV级高处作业' : '' }} +
作业单位{{ pd.CONSTRUCTION_DEPARTMENT_NAME }} 监护人
@@ -34,36 +49,25 @@
断路原因{{ pd.WORK_REASON }}作业人{{ pd.PROJECT_MANAGER }}作业负责人{{ pd.CONSTRUCTION_USER_NAME }}
关联的其他特殊作业及安全作业票编号{{ pd.SPECIAL_WORK }}
-
断路地段示意图（可另附图）及相关说明：{{ pd.WORK_CONTENT }}
-
- -
- 编制人： - - {{ pd.APPLY_USER_SIGNER_TIME }} -
-
- 		{{ pd.SPECIAL_WORK }}
风险辨识结果{{ pd.HAZARD_IDENTIFICATION.split(";_;")[0] }}{{ pd.HAZARD_IDENTIFICATION }}
作业实施时间{{ pd.WORK_START_DATE }}至{{ pd.WORK_END_DATE }}止{{ pd.WORK_START_DATE }}至{{ pd.WORK_END_DATE }}止
+ @@ -75,36 +79,32 @@ - +
序号{{ index + 1 }} {{ item.PROTECTIVE_MEASURES }} - 涉   及 + 涉    及 不涉及 {{ item.CONFIRM_NAME }}
{{ measuresList.length + 1 }} -
- 其他安全措施：{{ pd.APPLY_USER_MEASURES }} - 编制人：{{ pd.APPLY_USER_NAME }} -
-
- 其他安全措施：{{ pd.CONSTRUCTION_USER_MEASURES }} +
+ 其他安全措施：{{ pd.CONFIRM_USER_MEASURES }} 编制人：{{ pd.CONSTRUCTION_USER_NAME }}
-
- 其他安全措施：{{ pd.PRODUCTION_USER_MEASURES }} - 编制人：{{ pd.PRODUCTION_USER_NAME }} -
-
- 其他安全措施：{{ pd.SAFETY_USER_MEASURES }} - 编制人：{{ pd.SAFETY_USER_NAME }} -
-
+
其他安全措施：{{ pd.LEADER_USER_MEASURES }} 编制人：{{ pd.LEADER_USER_NAME }}
+
+ 其他安全措施：{{ pd.AUDIT_USER_MEASURES }} + 编制人：{{ pd.AUDIT_USER_NAME }} +
+
+ 其他安全措施：{{ pd.APPROVE_USER_MEASURES }} + 编制人：{{ pd.APPROVE_USER_NAME }} +
@@ -123,15 +123,15 @@
接受交底人 -
+
签字： - - {{ item.ACCEPT_CONFESS_USER_SIGNER_TIME }} + + {{ pd.ACCEPT_CONFESS_USER_SIGNER_TIME }}
+
作业负责人意见：{{ pd.CONSTRUCTION_CONTENT }}
签字： @@ -140,29 +140,9 @@
-
所在单位意见：{{ pd.PRODUCTION_CONTENT }}
-
- 签字： - - {{ pd.PRODUCTION_USER_SIGNER_TIME }} -
-
-
消防、安全管理部门意见：{{ pd.SAFETY_CONTENT }}
-
- 签字： - - {{ pd.SAFETY_USER_SIGNER_TIME }} -
-
-
审批部门意见：{{ pd.LEADER_CONTENT }}
+ 		+
所在单位意见：{{ pd.LEADER_CONTENT }}
签字： @@ -170,19 +150,39 @@
-
完工验收：{{ pd.ACCEPT_CONTENT }}
-
+
+
审核部门意见：{{ pd.AUDIT_CONTENT }}
+
签字： - - {{ item.ACCEPT_USER_SIGNER_TIME }} + + {{ pd.AUDIT_USER_SIGNER_TIME }} +
+
+
审批部门意见：{{ pd.APPROVE_CONTENT }}
+
+ 签字： + + {{ pd.APPROVE_USER_SIGNER_TIME }} +
+
+
完工验收：{{ pd.ACCEPT_CONTENT }}
+
+ 签字： + + {{ pd.ACCEPT_USER_SIGNER_TIME }}
-
+
返 回
@@ -196,12 +196,10 @@ export default { data() { return { config: config, - CUTROAD_ID: this.$parent.CUTROAD_ID, // 主键ID + HIGHWORK_ID: this.$parent.HIGHWORK_ID, // 主键ID pd: [], // 存放字段参数 measuresList: [], otherProtectiveMeasures: [], - imgList: [], - imgList1: [], hazardIdentification: [] } }, @@ -228,32 +226,29 @@ export default { } }, getRowKey(row) { - return row.CUTROAD_ID + return row.HIGHWORK_ID }, getData() { this.listLoading = true requestFN( - '/dangerousWork/gfcutroad/goEdit', + '/dangerousWork/gfHighWork/goEdit', { - CUTROAD_ID: this.CUTROAD_ID + HIGHWORK_ID: this.HIGHWORK_ID } ).then((data) => { this.listLoading = false this.pd = data.pd // 参数map this.measuresList = data.measuresList // 参数map - this.imgList = data.imgList - this.pd.APPLY_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[0] - this.pd.CONSTRUCTION_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[1] - this.pd.PRODUCTION_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[2] - this.pd.SAFETY_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[3] - this.pd.LEADER_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[4] + this.pd.CONFIRM_USER_MEASURES = data.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[0] + this.pd.LEADER_USER_MEASURES = data.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[1] + this.pd.AUDIT_USER_MEASURES = data.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[2] + this.pd.APPROVE_USER_MEASURES = data.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[3] }).catch((e) => { this.listLoading = false }) }, goBack() { - this.$parent.activeName = 'circuit_list' - this.$parent.CUTROAD_ID = '' + this.$parent.activeName = 'List' } } @@ -274,6 +269,6 @@ export default { img width: 100% height: 100% -.level-code - margin-left: auto +.app-container + margin-bottom: 50px diff --git a/src/views/dangerousWork/highwork/components/list.vue b/src/views/dangerousWork/highwork/components/list.vue index 37a1684..b2ab9b8 100644 --- a/src/views/dangerousWork/highwork/components/list.vue +++ b/src/views/dangerousWork/highwork/components/list.vue @@ -27,39 +27,39 @@ - + - + - - - - - - - + + + + + + + @@ -67,51 +67,53 @@
+ +
- + - + - + - - - - - - + + + + + + -
-
-
- 监护人：{{ pd.GUARDIAN_USER_NAME }}已签字 -
-
-
-
- 监护人：{{ pd.GUARDIAN_USER_NAME }}未签字 -
-
-
-
- 安全交底人：{{ pd.CONFESS_USER_NAME }}已签字 -
-
-
-
- 安全交底人：{{ pd.CONFESS_USER_NAME }}未签字 -
-
-
-
- 接受交底人：{{ pd.ACCEPT_CONFESS_USER_NAME }}已签字 -
-
-
-
- 接受交底人：{{ pd.ACCEPT_CONFESS_USER_NAME }}未签字 -
-
-
确 定
-
-
- 返 回 -
+ + diff --git a/src/views/dangerousWork/hoisting/components/corpInfo.vue b/src/views/dangerousWork/hoisting/components/corpInfo.vue index d7d1966..6d0d7d4 100644 --- a/src/views/dangerousWork/hoisting/components/corpInfo.vue +++ b/src/views/dangerousWork/hoisting/components/corpInfo.vue @@ -33,22 +33,22 @@ @@ -108,7 +108,7 @@ export default { return new Promise((resolve) => { this.listLoading = true requestFN( - '/gfHoisting/corpCountlist?showCount=' + this.listQuery.limit + '¤tPage=' + this.listQuery.page, + '/dangerousWork/gfHoisting/corpCountlist?showCount=' + this.listQuery.limit + '¤tPage=' + this.listQuery.page, { COPRINF_ID: sessionStorage.getItem('user').CORPINFO_ID || '', KEYWORDS: this.KEYWORDS diff --git a/src/views/dangerousWork/hoisting/components/detail.vue b/src/views/dangerousWork/hoisting/components/detail.vue index d253af5..5d4c98f 100644 --- a/src/views/dangerousWork/hoisting/components/detail.vue +++ b/src/views/dangerousWork/hoisting/components/detail.vue @@ -7,23 +7,33 @@
-

断路安全作业票

-
编号:{{ pd.CHECK_NO }}
+

吊装安全作业票

+
编号:{{ pd.CHECK_NO }}
- 申请单位 + 作业申请单位 {{ pd.APPLY_DEPARTMENT_NAME }} 作业单位 - {{ pd.CONSTRUCTION_DEPARTMENT_NAME }} - 作业负责人 - {{ pd.CONSTRUCTION_USER_NAME }} + {{ pd.LEADER_DEPARTMENT_NAME }} + 作业申请时间 + {{ pd.CREATTIME }} - 涉及相关单位（部门） - {{ pd.OTHER_DEPT }} + 吊装地点 + {{ pd.WORK_PLACE }} + 吊具名称 + {{ pd.TOOL_NAME }} + 吊物内容 + {{ pd.WORK_CONTENT }} + + + 吊装作业人 + {{ pd.WORK_USER }} + 司索人 + {{ pd.SISUO_USER }} 监护人
@@ -34,29 +44,21 @@ - 断路原因 - {{ pd.WORK_REASON }} - - - 关联的其他特殊作业及安全作业票编号 - {{ pd.SPECIAL_WORK }} - - - -
断路地段示意图（可另附图）及相关说明：{{ pd.WORK_CONTENT }}
-
- -
- 编制人： - - {{ pd.APPLY_USER_SIGNER_TIME }} -
-
+ 指挥人员 + {{ pd.PROJECT_MANAGER }} + 吊物质量（t）及作业级别 + + {{ pd.PART_WEIGHT }}t + + {{ pd.WORK_LEVEL == '1' ? '一级作业级别' : '' }} + {{ pd.WORK_LEVEL == '2' ? '二级作业级别' : '' }} + {{ pd.WORK_LEVEL == '3' ? '三级作业级别' : '' }} + 风险辨识结果 - {{ pd.HAZARD_IDENTIFICATION.split(";_;")[0] }} + {{ pd.HAZARD_IDENTIFICATION }} 作业实施时间 @@ -73,38 +75,36 @@ {{ index + 1 }} - {{ item.PROTECTIVE_MEASURES }} + {{ item.PROTECTIVE_MEASURES }} + + - 涉   及 + 涉    及 不涉及 {{ item.CONFIRM_NAME }} - + {{ measuresList.length + 1 }} -
- 其他安全措施：{{ pd.APPLY_USER_MEASURES }} - 编制人：{{ pd.APPLY_USER_NAME }} -
-
- 其他安全措施：{{ pd.CONSTRUCTION_USER_MEASURES }} - 编制人：{{ pd.CONSTRUCTION_USER_NAME }} -
-
- 其他安全措施：{{ pd.PRODUCTION_USER_MEASURES }} - 编制人：{{ pd.PRODUCTION_USER_NAME }} -
-
- 其他安全措施：{{ pd.SAFETY_USER_MEASURES }} - 编制人：{{ pd.SAFETY_USER_NAME }} -
-
+
其他安全措施：{{ pd.LEADER_USER_MEASURES }} 编制人：{{ pd.LEADER_USER_NAME }}
+
+ 其他安全措施：{{ pd.CONFIRM_USER_MEASURES }} + 编制人：{{ pd.CONSTRUCTION_USER_NAME }} +
+
+ 其他安全措施：{{ pd.AUDIT_USER_MEASURES }} + 编制人：{{ pd.AUDIT_USER_NAME }} +
+
+ 其他安全措施：{{ pd.APPROVE_USER_MEASURES }} + 编制人：{{ pd.APPROVE_USER_NAME }} +
@@ -123,46 +123,16 @@ 接受交底人 -
+
签字： - - {{ item.ACCEPT_CONFESS_USER_SIGNER_TIME }} -
- - - - -
作业负责人意见：{{ pd.CONSTRUCTION_CONTENT }}
-
- 签字： - - {{ pd.CONSTRUCTION_USER_SIGNER_TIME }} -
- - - - -
所在单位意见：{{ pd.PRODUCTION_CONTENT }}
-
- 签字： - - {{ pd.PRODUCTION_USER_SIGNER_TIME }} -
- - - - -
消防、安全管理部门意见：{{ pd.SAFETY_CONTENT }}
-
- 签字： - - {{ pd.SAFETY_USER_SIGNER_TIME }} + + {{ pd.ACCEPT_CONFESS_USER_SIGNER_TIME }}
-
审批部门意见：{{ pd.LEADER_CONTENT }}
+
作业指挥意见：{{ pd.LEADER_CONTENT }}
签字： @@ -170,20 +140,51 @@
- - -
完工验收：{{ pd.ACCEPT_CONTENT }}
-
+ + +
所在单位意见：{{ pd.CONSTRUCTION_CONTENT }}
+
签字： - - {{ item.ACCEPT_USER_SIGNER_TIME }} + + {{ pd.CONSTRUCTION_USER_SIGNER_TIME }} +
+ + + + +
审核部门意见：{{ pd.AUDIT_CONTENT }}
+
+ 签字： + + {{ pd.AUDIT_USER_SIGNER_TIME }} +
+ + + + +
审批部门意见：{{ pd.APPROVE_CONTENT }}
+
+ 签字： + + {{ pd.APPROVE_USER_SIGNER_TIME }} +
+ + + + +
完工验收：{{ pd.ACCEPT_CONTENT }}
+
+ 签字： + + {{ pd.ACCEPT_USER_SIGNER_TIME }}
-
+
+ 返 回
@@ -196,21 +197,47 @@ export default { data() { return { config: config, - CUTROAD_ID: this.$parent.CUTROAD_ID, // 主键ID + HOISTING_ID: this.$parent.HOISTING_ID, // 主键ID pd: [], // 存放字段参数 measuresList: [], - otherProtectiveMeasures: [], - imgList: [], - imgList1: [], - hazardIdentification: [] + otherProtectiveMeasures: [] } }, created() { this.getData() }, methods: { + handleStr(measuresList) { + for (let i = 0; i < measuresList.length; i++) { + // 将字符串转成数组 + const PROTECTIVE_MEASURES = measuresList[i].PROTECTIVE_MEASURES.split('') + for (let j = 1; j <= 3; j++) { + // 判断字符串是否存在 + if (this.findCharIndex(PROTECTIVE_MEASURES, '（', j) !== -1) { + // 给字符串后面添加上需要的数据 + PROTECTIVE_MEASURES.splice( + this.findCharIndex(PROTECTIVE_MEASURES, '（', j) + 1, + 0, + measuresList[i]['ANSWER' + j] + ) + } + } + // 将数组转回字符串 + measuresList[i].PROTECTIVE_MEASURES = PROTECTIVE_MEASURES.join('') + } + return measuresList + }, + findCharIndex(str, char, num) { + let index = str.indexOf(char) + for (let i = 0; i < num - 1; i++) { + index = str.indexOf(char, index + 1) + } + return index + }, validStr(str) { - if (str != null && str != '' && typeof (str) != 'undefined' && str != 0) { return true } + if (str != null && str != '' && typeof (str) != 'undefined' && str != 0) { + return true + } return false }, formatTime(date, column) { @@ -228,32 +255,29 @@ export default { } }, getRowKey(row) { - return row.CUTROAD_ID + return row.HOISTING_ID }, getData() { this.listLoading = true requestFN( - '/dangerousWork/gfcutroad/goEdit', + '/dangerousWork/gfHoisting/goEdit', { - CUTROAD_ID: this.CUTROAD_ID + HOISTING_ID: this.HOISTING_ID } ).then((data) => { this.listLoading = false this.pd = data.pd // 参数map - this.measuresList = data.measuresList // 参数map - this.imgList = data.imgList - this.pd.APPLY_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[0] - this.pd.CONSTRUCTION_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[1] - this.pd.PRODUCTION_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[2] - this.pd.SAFETY_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[3] - this.pd.LEADER_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[4] + this.measuresList = this.handleStr(data.measuresList) // 参数map + this.pd.LEADER_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[0] + this.pd.CONFIRM_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[1] + this.pd.AUDIT_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[2] + this.pd.APPROVE_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[3] }).catch((e) => { this.listLoading = false }) }, goBack() { - this.$parent.activeName = 'circuit_list' - this.$parent.CUTROAD_ID = '' + this.$parent.activeName = 'hoisting_list' } } @@ -263,17 +287,19 @@ export default { diff --git a/src/views/dangerousWork/hoisting/components/list.vue b/src/views/dangerousWork/hoisting/components/list.vue index 6241d41..c5f6c07 100644 --- a/src/views/dangerousWork/hoisting/components/list.vue +++ b/src/views/dangerousWork/hoisting/components/list.vue @@ -27,39 +27,39 @@ - + - - - + + + - + - + @@ -67,49 +67,51 @@
+ +
- + - + - + - + - + @@ -125,47 +127,11 @@ -
-
-
- 监护人：{{ pd.GUARDIAN_USER_NAME }}已签字 -
-
-
-
- 监护人：{{ pd.GUARDIAN_USER_NAME }}未签字 -
-
-
-
- 安全交底人：{{ pd.CONFESS_USER_NAME }}已签字 -
-
-
-
- 安全交底人：{{ pd.CONFESS_USER_NAME }}未签字 -
-
-
-
- 接受交底人：{{ pd.ACCEPT_CONFESS_USER_NAME }}已签字 -
-
-
-
- 接受交底人：{{ pd.ACCEPT_CONFESS_USER_NAME }}未签字 -
-
-
确 定
-
-
- 返 回 -
+ + + diff --git a/src/views/dangerousWork/lectricity/components/detail.vue b/src/views/dangerousWork/lectricity/components/detail.vue deleted file mode 100644 index d253af5..0000000 --- a/src/views/dangerousWork/lectricity/components/detail.vue +++ /dev/null @@ -1,279 +0,0 @@ - - - - - diff --git a/src/views/dangerousWork/limitspace/components/detail.vue b/src/views/dangerousWork/limitspace/components/detail.vue index d253af5..c1dbe84 100644 --- a/src/views/dangerousWork/limitspace/components/detail.vue +++ b/src/views/dangerousWork/limitspace/components/detail.vue @@ -7,7 +7,7 @@
-

断路安全作业票

+

有限空间作业票

编号:{{ pd.CHECK_NO }}
diff --git a/src/views/dangerousWork/limitspace/components/list.vue b/src/views/dangerousWork/limitspace/components/list.vue index 6241d41..f2b598a 100644 --- a/src/views/dangerousWork/limitspace/components/list.vue +++ b/src/views/dangerousWork/limitspace/components/list.vue @@ -242,7 +242,7 @@ export default { getList() { this.listLoading = true requestFN( - '/dangerousWork/gfcutroad/list?showCount=' + this.listQuery.limit + '¤tPage=' + this.listQuery.page, + '/gfLimitSpace/list?showCount=' + this.listQuery.limit + '¤tPage=' + this.listQuery.page, { KEYWORDS: this.KEYWORDS, APPLY_STATUS: this.STATUS, DEPTIDS: this.DEPTIDS, tm: new Date().getTime(),