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

Merge remote-tracking branch 'origin/pet' into dev

liujun-07-22-风向模块迁移
liujun 2024-07-02 15:16:01 +08:00
parent aef8f54afb 9ea27fbb7f
commit cc83fc0828
17 changed files with 12509 additions and 23736 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/index.js
View File

@ -11,7 +11,7 @@ module.exports = {
assetsPublicPath: '/',
proxyTable: {
'/api': {
target: 'http://192.168.151.43:8091/',
target: 'http://192.168.0.49:8091/',
changeOrigin: true,
pathRewrite: {
'^/api': ''

24072
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
package.json
View File

@ -5,7 +5,7 @@
"author": "",
"private": true,
"scripts": {
"dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js --host 192.168.151.43",
"dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js --host 192.168.0.90",
"start": "npm run dev",
"unit": "jest --config test/unit/jest.conf.js --coverage",
"e2e": "node test/e2e/runner.js",

55
src/views/hotwork_cfd/hotwork/components/detail.vue
View File

@ -75,6 +75,22 @@
<td class="bbg">动火作业实施时间</td>
<td colspan="3">{{ pd.WORK_START_DATE }}至{{ pd.WORK_END_DATE }}止</td>
</tr>
<tr v-if="pd.FIRE_COMPLETED === '1' && pd.SITE_CLEANED === '1'">
<td class="bbg">动火是否完成</td>
<td>
<span>已完成</span>
</td>
<td class="bbg">动火是否完成</td>
<td>
<span>已清理</span>
</td>
</tr>
<tr v-if="pd.NO_REMAINING_EMBERS === '1'">
<td class="bbg">是否存在遗留火种</td>
<td>
<span>无遗留火种</span>
</td>
</tr>
<tr>
<td colspan="4">
<table class="table-ui">
@ -149,10 +165,12 @@
<tr>
<td class="bbg">接受交底人</td>
<td colspan="10">
<div v-for="item in imgList" :key="item.ACCEPT_CONFESS_ID" style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + item.ACCEPT_CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">
<span>{{ item.ACCEPT_CONFESS_USER_SIGNER_TIME }}</span>
<div v-for="item in acceptConfessList" :key="item.USER_ID">
<div v-for="(signature, index) in item.APPROVAL_SIGNATURE" :key="index" style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + signature.trim()" alt="" width="100" height="100">
<span>{{ item.APPROVAL_SIGNATURE_TIME.split(',')[0] }}</span>
</div>
</div>
</td>
</tr>
@ -178,7 +196,7 @@
</tr>
<tr v-if="pd.CONFIRM_USER_SIGNER_PATH">
<td colspan="6">
<div>作业负责人意见：{{ pd.CONFIRM_CONTENT }}</div>
<div>作业负责人意见：{{ pd.CONFIRM_CONTENT === '无' ? '同意' : pd.CONFIRM_CONTENT }}</div>
<div style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.CONFIRM_USER_SIGNER_PATH" alt="" width="100" height="100">
@ -188,7 +206,7 @@
</tr>
<tr v-if="pd.BELONGING_SIGNATURE">
<td colspan="6">
<div>项目主管部门负责人意见：{{ pd.BELONGING_OPINIONS }}</div>
<div>项目主管部门负责人意见：{{ pd.BELONGING_OPINIONS === '' ? '同意' : pd.BELONGING_OPINIONS }}</div>
<div style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.BELONGING_SIGNATURE" alt="" width="100" height="100">
@ -198,7 +216,7 @@
</tr>
<tr v-if="pd.LEADER_USER_SIGNER_PATH">
<td colspan="6">
<div>属地监管单位意见：{{ pd.LEADER_CONTENT }}</div>
<div>属地监管单位意见：{{ pd.LEADER_CONTENT === '无' ? '同意' : pd.LEADER_CONTENT }}</div>
<div style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.LEADER_USER_SIGNER_PATH" alt="" width="100" height="100">
@ -208,7 +226,7 @@
</tr>
<tr v-if="pd.AUDIT_USER_SIGNER_PATH">
<td colspan="6">
<div>安全管理部门意见：{{ pd.AUDIT_CONTENT }}</div>
<div>安全管理部门意见：{{ pd.AUDIT_CONTENT === '无' ? '同意' : pd.AUDIT_CONTENT }}</div>
<div style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.AUDIT_USER_SIGNER_PATH" alt="" width="100" height="100">
@ -218,7 +236,7 @@
</tr>
<tr v-if="pd.APPROVE_USER_SIGNER_PATH">
<td colspan="6">
<div>动火审批人意见：{{ pd.APPROVE_CONTENT }}</div>
<div>动火审批人意见：{{ pd.APPROVE_CONTENT === '无' ? '同意' : pd.APPROVE_CONTENT }}</div>
<div style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.APPROVE_USER_SIGNER_PATH" alt="" width="100" height="100">
@ -228,7 +246,7 @@
</tr>
<tr v-if="pd.MONITOR_USER_SIGNER_PATH">
<td colspan="6">
<div>动火前验票负责人：{{ pd.MONITOR_CONTENT }}</div>
<div>动火前验票负责人：{{ pd.MONITOR_CONTENT === '无' ? '同意' : pd.MONITOR_CONTENT }}</div>
<div style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.MONITOR_USER_SIGNER_PATH" alt="" width="100" height="100">
@ -238,7 +256,7 @@
</tr>
<tr v-if="imgList1.length>0">
<td colspan="10">
<div>完工验收：{{ pd.ACCEPT_CONTENT }}</div>
<div>完工验收：{{ pd.ACCEPT_CONTENT === '无' ? '同意' : pd.ACCEPT_CONTENT }}</div>
<div v-for="item in imgList1" :key="item.ACCEPT_CONFESS_ID" style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + item.ACCEPT_USER_SIGNER_PATH" alt="" width="100" height="100">
@ -270,6 +288,7 @@ export default {
imgList: [],
imgList1: [],
otherProtectiveMeasures: [],
acceptConfessList: [],
confessList: []
}
},
@ -315,6 +334,20 @@ export default {
this.confessList.push(item)
}
})
// data.pd.acceptConfessList.forEach(item => {
// if (item.APPROVAL_SIGNATURE_TIME !== undefined && item.APPROVAL_SIGNATURE_TIME.trim() !== '') {
// this.acceptConfessList.push(item)
// }
// })
data.pd.acceptConfessList.forEach(item => {
// 将 APPROVAL_SIGNATURE 转换为数组
if (item.APPROVAL_SIGNATURE) {
item.APPROVAL_SIGNATURE = item.APPROVAL_SIGNATURE.split(';')
}
if (item.APPROVAL_SIGNATURE_TIME !== undefined && item.APPROVAL_SIGNATURE_TIME.trim() !== '') {
this.acceptConfessList.push(item)
}
})
for (let i = 0; i < data.measuresList.length; i++) {
// 将字符串转成数组
const PROTECTIVE_MEASURES = data.measuresList[i].PROTECTIVE_MEASURES.split('')

6
src/views/hotwork_cfd/hotwork/components/list.vue
View File

@ -51,14 +51,14 @@
<template slot-scope="{row}">
<span v-if="row.APPLY_STATUS==0">动火作业待提交</span>
<span v-else-if="row.APPLY_STATUS==1">作业负责人待审核</span>
<span v-else-if="row.APPLY_STATUS==1.5">项目负责人待审核</span>
<span v-else-if="row.APPLY_STATUS==1.5">项目主管部门待审核</span>
<span v-else-if="row.APPLY_STATUS==2">属地监管单位待审核</span>
<span v-else-if="row.APPLY_STATUS==4">安全管理部门待审核</span>
<span v-else-if="row.APPLY_STATUS==5">动火审批人待审核</span>
<span v-else-if="row.APPLY_STATUS==6">班长待验票</span>
<span v-else-if="row.APPLY_STATUS==7">待验收</span>
<span v-else-if="row.APPLY_STATUS==8">验收归档</span>
<span v-else-if="row.APPLY_STATUS==-1.5">项目负责人审核打回</span>
<span v-else-if="row.APPLY_STATUS==-1.5">项目主管部门审核打回</span>
<span v-else-if="row.APPLY_STATUS==-2">作业负责人审核打回</span>
<span v-else-if="row.APPLY_STATUS==-4">属地监管单位审核打回</span>
<span v-else-if="row.APPLY_STATUS==-5">安全管理部门审核打回</span>
@ -217,7 +217,7 @@ export default {
{ ID: '', NAME: '请选择' },
{ ID: '0', NAME: '动火作业待提交' },
{ ID: '1', NAME: '作业负责人待审核' },
{ ID: '1.5', NAME: '项目负责人待审核' },
{ ID: '1.5', NAME: '项目主管部门待审核' },
{ ID: '2', NAME: '属地监管单位待审核' },
{ ID: '4', NAME: '安全管理部门待审核' },
{ ID: '5', NAME: '动火审批人待审核' },

56
src/views/hotwork_cfd/pigeonhole/components/detail.vue
View File

@ -74,7 +74,22 @@
<td class="bbg">动火作业实施时间</td>
<td colspan="3">{{ pd.WORK_START_DATE }}至{{ pd.WORK_END_DATE }}止</td>
</tr>
<tr v-if="pd.FIRE_COMPLETED === '1' && pd.SITE_CLEANED === '1'">
<td class="bbg">动火是否完成</td>
<td>
<span>已完成</span>
</td>
<td class="bbg">动火是否完成</td>
<td>
<span>已清理</span>
</td>
</tr>
<tr v-if="pd.NO_REMAINING_EMBERS === '1'">
<td class="bbg">是否存在遗留火种</td>
<td>
<span>无遗留火种</span>
</td>
</tr>
<tr>
<td colspan="4">
<table class="table-ui">
@ -149,10 +164,12 @@
<tr>
<td class="bbg">接受交底人</td>
<td colspan="10">
<div v-for="item in imgList" :key="item.ACCEPT_CONFESS_ID" style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + item.ACCEPT_CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">
<span>{{ item.ACCEPT_CONFESS_USER_SIGNER_TIME }}</span>
<div v-for="item in acceptConfessList" :key="item.USER_ID">
<div v-for="(signature, index) in item.APPROVAL_SIGNATURE" :key="index" style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + signature.trim()" alt="" width="100" height="100">
<span>{{ item.APPROVAL_SIGNATURE_TIME.split(',')[0] }}</span>
</div>
</div>
</td>
</tr>
@ -178,7 +195,7 @@
</tr>
<tr v-if="pd.CONFIRM_USER_SIGNER_PATH">
<td colspan="6">
<div>作业负责人意见：{{ pd.CONFIRM_CONTENT }}</div>
<div>作业负责人意见：{{ pd.CONFIRM_CONTENT === '无' ? '同意' : pd.CONFIRM_CONTENT }}</div>
<div style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.CONFIRM_USER_SIGNER_PATH" alt="" width="100" height="100">
@ -188,7 +205,7 @@
</tr>
<tr v-if="pd.BELONGING_SIGNATURE">
<td colspan="6">
<div>项目主管部门负责人意见：{{ pd.BELONGING_OPINIONS }}</div>
<div>项目主管部门负责人意见：{{ pd.BELONGING_OPINIONS === '' ? '同意' : pd.BELONGING_OPINIONS }}</div>
<div style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.BELONGING_SIGNATURE" alt="" width="100" height="100">
@ -198,7 +215,7 @@
</tr>
<tr v-if="pd.LEADER_USER_SIGNER_PATH">
<td colspan="6">
<div>属地监管单位意见：{{ pd.LEADER_CONTENT }}</div>
<div>属地监管单位意见：{{ pd.LEADER_CONTENT === '无' ? '同意' : pd.LEADER_CONTENT }}</div>
<div style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.LEADER_USER_SIGNER_PATH" alt="" width="100" height="100">
@ -208,7 +225,7 @@
</tr>
<tr v-if="pd.AUDIT_USER_SIGNER_PATH">
<td colspan="6">
<div>安全管理部门意见：{{ pd.AUDIT_CONTENT }}</div>
<div>安全管理部门意见：{{ pd.AUDIT_CONTENT === '无' ? '同意' : pd.AUDIT_CONTENT }}</div>
<div style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.AUDIT_USER_SIGNER_PATH" alt="" width="100" height="100">
@ -218,7 +235,7 @@
</tr>
<tr v-if="pd.APPROVE_USER_SIGNER_PATH">
<td colspan="6">
<div>动火审批人意见：{{ pd.APPROVE_CONTENT }}</div>
<div>动火审批人意见：{{ pd.APPROVE_CONTENT === '无' ? '同意' : pd.APPROVE_CONTENT }}</div>
<div style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.APPROVE_USER_SIGNER_PATH" alt="" width="100" height="100">
@ -228,7 +245,7 @@
</tr>
<tr v-if="pd.MONITOR_USER_SIGNER_PATH">
<td colspan="6">
<div>动火前验票负责人：{{ pd.MONITOR_CONTENT }}</div>
<div>动火前验票负责人：{{ pd.MONITOR_CONTENT === '无' ? '同意' : pd.MONITOR_CONTENT }}</div>
<div style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.MONITOR_USER_SIGNER_PATH" alt="" width="100" height="100">
@ -238,7 +255,7 @@
</tr>
<tr v-if="imgList1.length>0">
<td colspan="10">
<div>完工验收：{{ pd.ACCEPT_CONTENT }}</div>
<div>完工验收：{{ pd.ACCEPT_CONTENT === '无' ? '同意' : pd.ACCEPT_CONTENT }}</div>
<div v-for="item in imgList1" :key="item.ACCEPT_CONFESS_ID" style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + item.ACCEPT_USER_SIGNER_PATH" alt="" width="100" height="100">
@ -274,6 +291,7 @@ export default {
imgList: [],
imgList1: [],
otherProtectiveMeasures: [],
acceptConfessList: [],
confessList: []
}
},
@ -399,6 +417,20 @@ export default {
this.confessList.push(item)
}
})
// data.pd.acceptConfessList.forEach(item => {
// if (item.APPROVAL_SIGNATURE_TIME !== undefined && item.APPROVAL_SIGNATURE_TIME.trim() !== '') {
// this.acceptConfessList.push(item)
// }
// })
data.pd.acceptConfessList.forEach(item => {
// 将 APPROVAL_SIGNATURE 转换为数组
if (item.APPROVAL_SIGNATURE) {
item.APPROVAL_SIGNATURE = item.APPROVAL_SIGNATURE.split(';')
}
if (item.APPROVAL_SIGNATURE_TIME !== undefined && item.APPROVAL_SIGNATURE_TIME.trim() !== '') {
this.acceptConfessList.push(item)
}
})
for (let i = 0; i < data.measuresList.length; i++) {
// 将字符串转成数组
const PROTECTIVE_MEASURES = data.measuresList[i].PROTECTIVE_MEASURES.split('')

2
src/views/hotwork_cfd/pigeonhole/components/list.vue
View File

@ -44,7 +44,7 @@
<template slot-scope="{row}">
<span v-if="row.APPLY_STATUS==0">动火作业待提交</span>
<span v-else-if="row.APPLY_STATUS==1">作业负责人待审核</span>
<span v-else-if="row.APPLY_STATUS==1.5">项目负责人待审核</span>
<span v-else-if="row.APPLY_STATUS==1.5">项目主管部门待审核</span>
<span v-else-if="row.APPLY_STATUS==2">属地监管单位待审核</span>
<span v-else-if="row.APPLY_STATUS==4">安全管理部门待审核</span>
<span v-else-if="row.APPLY_STATUS==5">动火审批人待审核</span>

1
src/views/keyprojects/punish/components/list.vue
View File

@ -45,6 +45,7 @@
<el-table-column prop="UNITS_PIC_NAME" label="相关方单位负责人" show-overflow-tooltip />
<el-table-column prop="UNITS_PHONE" label="电话" show-overflow-tooltip />
<el-table-column prop="CHECK_COUNT" label="安全环保检查次数" />
<el-table-column prop="AI_COUNT" label="AI报警隐患数" />
<el-table-column label="操作" align="center" width="100">
<template slot-scope="{row}">
<el-button icon="el-icon-view" size="mini" @click="goDetail(row.OUTSOURCED_ID)">查看</el-button>

19
src/views/keyprojects/videomanager/components/video-list.vue
View File

@ -141,9 +141,16 @@
<el-dialog v-if="dialogVideoAll" :visible.sync="dialogVideoAll" :before-close="handleBack" title="视频" width="1200px">
<!-- <iframe src="http://192.168.192.121:10800/?menu=no/#/screen" width="100%" height="500px" allowfullscreen allow="autoplay; fullscreen" style="position: relative;border:none"/>-->
<div style="display: flex;flex-wrap: wrap;justify-content: space-between">
<div v-for="(video,index) in videoList" :key="index" style="margin-bottom: 10px;width: 45%">
<iframe v-if="video.GBSVIDEOURL" :src="video.GBSVIDEOURL" width="100%" height="380" allowfullscreen allow="autoplay; fullscreen;microphone" style="position: relative;border:none"/>
<div style="display: flex;flex-wrap: wrap; gap:20px">
<div v-for="(video,index) in videoList" :key="index" style="margin-bottom: 10px;width: 30%">
<iframe
v-if="video.GBSVIDEOURL"
:src="video.GBSVIDEOURL"
width="100%"
height="250"
allowfullscreen
allow="autoplay; fullscreen;microphone"
style="position: relative;border:none"/>
<div v-if="video.HLSVIDEOURL" :id="'aLiVideoPlayer'+index" class="prism-player"/>
</div>
</div>
@ -376,7 +383,7 @@ export default {
// 五分钟关闭视频播放页面定时任务
start() {
console.log('定时器开启')
this.timer = setInterval(this.closeVideoStart, (5 * 60 * 1000)) // 5分钟;
// this.timer = setInterval(this.closeVideoStart, (5 * 60 * 1000)) // 5分钟;
},
over() {
// 定时器手动关闭
@ -411,7 +418,7 @@ export default {
'id': 'aLiVideoPlayer',
'source': res.data.url,
'width': '100%',
'height': '500px',
'height': '380px',
'autoplay': true,
'isLive': true,
'rePlay': false,
@ -499,7 +506,7 @@ export default {
'id': 'aLiVideoPlayer' + i,
'source': this.videoList[i].HLSVIDEOURL.data.url,
'width': '100%',
'height': '500px',
'height': '380px',
'autoplay': true,
'isLive': true,
'rePlay': false,

289
src/views/map/components/zhongdian.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="renyuan">
<div class="block1">
<layout-title title="重点工程统计"/>
<layout-title title="边界入侵统计"/>
<div class="options">
<div v-for="(item,index) in block1OptionsList" :key="index" class="option">
<div class="imger">
@ -10,39 +10,29 @@
<div class="info">
<div class="label">{{ item.title }}</div>
<div class="text">{{ item.count }}</div>
<!-- <div class="text"><count-to :start-val="0" :end-val="item.count" :duration="3600"/></div>-->
</div>
</div>
</div>
</div>
<div class="block2">
<layout-title title="区域报警数"/>
<layout-title title="区域摄像头数量"/>
<div class="options">
<div v-for="(item,index) in block2OptionsList" :key="index" class="option">
<div class="circular"><img :src="item.img" alt=""></div>
<div class="info">
<div class="title">{{ item.label }}</div>
<div class="count"> <count-to :start-val="0" :end-val="+item.count" :duration="3600"/></div>
</div>
</div>
<div id="main1"/>
</div>
</div>
<div class="block3">
<layout-title title="安全管理记录"/>
<div class="block4">
<layout-title title="报警列表"/>
<div class="content">
<div class="table">
<div class="tr">
<div class="td">公司名称</div>
<div class="td">创建数</div>
<div class="td">检查次数</div>
<div class="td">隐患数量</div>
<div class="td">区域名称</div>
<div class="td">报警设备编号</div>
<div class="td">状态告警</div>
</div>
<div v-for="(item,index) in block3List" :key="index" class="tr">
<div class="td">{{ item.CORP_NAME }}</div>
<div class="td">{{ item.OUTSOURCED_COUNT }}</div>
<div class="td">{{ item.CHECK_COUNT }}</div>
<div class="td">{{ item.HIDDEN_COUNT }}</div>
<div v-for="(item,index) in block4List" :key="index" class="tr">
<div class="td">{{ item.alarmName }}</div>
<div class="td">{{ item.equipmentName }}</div>
<div class="td">{{ item.statusName }}</div>
</div>
</div>
</div>
@ -54,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,
@ -78,26 +70,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,12 +101,19 @@ export default {
CHECK_COUNT: '-',
HIDDEN_COUNT: '-'
}
]
],
block4List: []
}
},
mounted() {
this.getCount()
this.initNum()
this.initgetTable()
window.onresize = function() {
Echarts1 && Echarts1.resize()
}
},
beforeDestroy() {
Echarts1 = null
},
methods: {
getCount() {
@ -147,6 +135,22 @@ export default {
this.block2OptionsList[1].count = data.pd.AMOUT_SUM
})
},
initNum() {
requestFN('/map/getAllDwMessage', { corpId: this.corpInfoId, source: '0' }
).then((data0) => {
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[1].count = data1.varList.length
this.initEcharts1(data1.iconData)
}).catch((e) => {
this.$message.error(e)
})
}).catch((e) => {
this.$message.error(e)
})
},
initgetTable() {
requestFN(
'/map/keyProject/list?showCount=10&currentPage=1',
@ -158,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)
}
}
}
@ -243,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));
@ -253,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;
}
}
}
@ -357,6 +413,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 {
@ -370,6 +468,7 @@ export default {
transform: scale(0.9);
}
}
@keyframes slideY {
0% {
transform: translateY(0);

39
src/views/map/dialog/hotworkFirst.vue
View File

@ -138,10 +138,12 @@
<tr>
<td class="bbg-transparent">接受交底人</td>
<td colspan="10">
<div v-for="item in imgList" :key="item.ACCEPT_CONFESS_ID" style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + item.ACCEPT_CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">
<span>{{ item.ACCEPT_CONFESS_USER_SIGNER_TIME }}</span>
<div v-for="item in acceptConfessList" :key="item.USER_ID">
<div v-for="(signature, index) in item.APPROVAL_SIGNATURE" :key="index" style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + signature.trim()" alt="" width="100" height="100">
<span>{{ item.APPROVAL_SIGNATURE_TIME.split(',')[0] }}</span>
</div>
</div>
</td>
</tr>
@ -167,7 +169,7 @@
</tr>
<tr v-if="pd.CONFIRM_USER_SIGNER_PATH">
<td colspan="6">
<div>作业负责人意见：{{ pd.CONFIRM_CONTENT }}</div>
<div>作业负责人意见：{{ pd.CONFIRM_CONTENT === '无' ? '同意' : pd.CONFIRM_CONTENT }}</div>
<div style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.CONFIRM_USER_SIGNER_PATH" alt="" width="100" height="100">
@ -177,7 +179,7 @@
</tr>
<tr v-if="pd.BELONGING_SIGNATURE">
<td colspan="6">
<div>项目主管部门负责人意见：{{ pd.BELONGING_OPINIONS }}</div>
<div>项目主管部门负责人意见：{{ pd.BELONGING_OPINIONS === '' ? '同意' : pd.BELONGING_OPINIONS }}</div>
<div style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.BELONGING_SIGNATURE" alt="" width="100" height="100">
@ -187,7 +189,7 @@
</tr>
<tr v-if="pd.LEADER_USER_SIGNER_PATH">
<td colspan="6">
<div>属地监管单位意见：{{ pd.LEADER_CONTENT }}</div>
<div>属地监管单位意见：{{ pd.LEADER_CONTENT === '无' ? '同意' : pd.LEADER_CONTENT }}</div>
<div style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.LEADER_USER_SIGNER_PATH" alt="" width="100" height="100">
@ -197,7 +199,7 @@
</tr>
<tr v-if="pd.AUDIT_USER_SIGNER_PATH">
<td colspan="6">
<div>安全管理部门意见：{{ pd.AUDIT_CONTENT }}</div>
<div>安全管理部门意见：{{ pd.AUDIT_CONTENT === '无' ? '同意' : pd.AUDIT_CONTENT }}</div>
<div style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.AUDIT_USER_SIGNER_PATH" alt="" width="100" height="100">
@ -207,7 +209,7 @@
</tr>
<tr v-if="pd.APPROVE_USER_SIGNER_PATH">
<td colspan="6">
<div>动火审批人意见：{{ pd.APPROVE_CONTENT }}</div>
<div>动火审批人意见：{{ pd.APPROVE_CONTENT === '无' ? '同意' : pd.APPROVE_CONTENT }}</div>
<div style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.APPROVE_USER_SIGNER_PATH" alt="" width="100" height="100">
@ -217,7 +219,7 @@
</tr>
<tr v-if="pd.MONITOR_USER_SIGNER_PATH">
<td colspan="6">
<div>动火前验票负责人：{{ pd.MONITOR_CONTENT }}</div>
<div>动火前验票负责人：{{ pd.MONITOR_CONTENT === '无' ? '同意' : pd.MONITOR_CONTENT }}</div>
<div style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.MONITOR_USER_SIGNER_PATH" alt="" width="100" height="100">
@ -227,7 +229,7 @@
</tr>
<tr v-if="imgList1.length>0">
<td colspan="10">
<div>完工验收：{{ pd.ACCEPT_CONTENT }}</div>
<div>完工验收：{{ pd.ACCEPT_CONTENT === '无' ? '同意' : pd.ACCEPT_CONTENT }}</div>
<div v-for="item in imgList1" :key="item.ACCEPT_CONFESS_ID" style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + item.ACCEPT_USER_SIGNER_PATH" alt="" width="100" height="100">
@ -271,6 +273,7 @@ export default {
imgList: [],
imgList1: [],
otherProtectiveMeasures: [],
acceptConfessList: [],
confessList: []
}
},
@ -318,6 +321,20 @@ export default {
this.confessList.push(item)
}
})
// data.pd.acceptConfessList.forEach(item => {
// if (item.APPROVAL_SIGNATURE_TIME !== undefined && item.APPROVAL_SIGNATURE_TIME.trim() !== '') {
// this.acceptConfessList.push(item)
// }
// })
data.pd.acceptConfessList.forEach(item => {
// 将 APPROVAL_SIGNATURE 转换为数组
if (item.APPROVAL_SIGNATURE) {
item.APPROVAL_SIGNATURE = item.APPROVAL_SIGNATURE.split(';')
}
if (item.APPROVAL_SIGNATURE_TIME !== undefined && item.APPROVAL_SIGNATURE_TIME.trim() !== '') {
this.acceptConfessList.push(item)
}
})
for (let i = 0; i < data.measuresList.length; i++) {
// 将字符串转成数组
const PROTECTIVE_MEASURES = data.measuresList[i].PROTECTIVE_MEASURES.split('')

11410
src/views/map/js/mapbox.js
View File

File diff suppressed because it is too large Load Diff

240
src/views/oneCompany/territory/components/list.vue Normal file
View File

@ -0,0 +1,240 @@
<template>
<div class="app-container">
<el-form ref="searchForm" :model="searchForm" label-width="80px">
<el-row>
<el-col :span="4">
<el-form-item label="报警状态" prop="status">
<el-select v-model="searchForm.status" style="width: 100%;">
<el-option v-for="item in alarmStatusList" :key="item.value" :value="item.value" :label="item.name"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" label-width="10px" style="margin-left: 20px">
<el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getList">
搜索
</el-button>
<el-button v-waves class="filter-item" type="success" icon="el-icon-refresh" @click="resetSearchForm">
重置
</el-button>
</el-col>
</el-row>
</el-form>
<el-table v-loading="listLoading" ref="multipleTable" :data="varList" :row-key="getRowKey" :header-cell-style="{'font-weight': 'bold','color': '#000'}" height="600px" tooltip-effect="dark" border fit highlight-current-row>
<el-table-column :reserve-selection="true" type="selection" width="55" align="center" />
<el-table-column fixed="left" type="index" label="序号" width="50" align="center" />
<el-table-column prop="alarmName" label="报警名称" width="100"/>
<el-table-column v-if="false" prop="alarmMessage" label="报警信息" />
<el-table-column v-if="false" prop="relatedFunctions" label="相关功能" />
<el-table-column v-if="false" prop="typeName" label="类型名称" />
<el-table-column prop="message" label="报警信息" width="200"/>
<el-table-column v-if="false" prop="idRemak" label="其他系统备注" />
<el-table-column v-if="false" prop="remark" label="备注" />
<el-table-column prop="corpName" label="企业名称" width="150"/>
<el-table-column v-if="false" prop="departmentName" label="部门名称" />
<el-table-column prop="equipmentName" label="报警来源" width="100"/>
<el-table-column prop="createdTime" label="创建时间" width="150"/>
<el-table-column prop="level" label="报警等级" />
<el-table-column prop="address" label="报警地址" />
<el-table-column prop="statusName" label="状态名称" />
<el-table-column prop="opinion" label="处理意见" width="200"/>
<el-table-column fixed="right" label="操作" align="center" width="200">
<template slot-scope="{row}">
<el-button v-if="row.status == null || row.status == '0'" icon="el-icon-view" type="danger" size="mini" @click="goInfo(row.dwAlarmId,'ignore')">忽略</el-button>
<el-button v-if="row.status == null || row.status == '0'" icon="el-icon-view" type="primary" size="mini" @click="goInfo(row.dwAlarmId,'confirm')">确认</el-button>
</template>
</el-table-column>
</el-table>
<div class="page-btn-group">
<div>
<!-- <el-button v-show="add" type="primary" icon="el-icon-plus" @click="handleAdd">新增</el-button>-->
<!-- <el-button v-show="del" type="danger" icon="el-icon-delete" plain @click="batchDel">删除</el-button>-->
</div>
<pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
</div>
<el-dialog :visible.sync="dialogManageAlarm" :title="dialogType === 'ignore' ? '忽略报警' : '确认报警'" width="650px">
<el-form ref="form" :model="manageAlarmForm" :rules="manageAlarmRules" label-width="110px" style="width: 500px;">
<el-form-item label="处理意见" prop="opinion">
<el-input v-model="manageAlarmForm.opinion" :rows="4" type="textarea" placeholder="这里输入处理意见..." />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="closeManageAlarm()">取 消</el-button>
<el-button type="primary" @click="manageAlarm()">确 定</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
import { requestFN } from '@/utils/request'
import waves from '@/directive/waves' // waves directive
import SelectTree from '@/components/SelectTree'
export default {
components: { Pagination, SelectTree },
directives: { waves },
data() {
return {
listLoading: true,
add: false,
del: false,
edit: false,
listQuery: {
page: 1,
limit: 20
},
total: 0,
KEYWORDS: '',
varList: [],
pd: [],
multipleSelectionAll: [], // 所有选中的数据包含跨页数据
multipleSelection: [], // 当前页选中的数据
treeData: [], // 动火前管辖单位
dialogType: 'ignore',
replyListQuery: {
page: 1,
limit: 20
},
defaultProps: {
value: 'id',
children: 'nodes',
label: 'name'
},
loginUserID: '',
loginRoleNumber: JSON.parse(sessionStorage.getItem('user')).RNUMBER,
dialogManageAlarm: false,
manageAlarmForm: {
opinion: '', // 处理意见
DW_ALARM_ID: '',
status: ''
},
manageAlarmRules: {
opinion: [{ required: true, message: '处理意见不能为空', trigger: 'blur' }]
},
searchForm: {
status: ''
},
alarmStatusList: []
}
},
created() {
this.getList()
this.getEditMyInfo()
this.getDictTreeData()
this.getDictionary()
},
methods: {
getRowKey(row) {
return row.dwAlarmId
},
// 搜索
getQuery() {
this.$refs.multipleTable.clearSelection()
this.getList()
},
// 获取登录人信息
getEditMyInfo() {
requestFN(
'/user/goEditMyInfo',
{}
).then((data) => {
this.loginUserID = data.pd.USER_ID // 主职角色ID
}).catch((e) => {
})
},
resetSearchForm() {
this.searchForm = {
status: ''
}
this.getList()
},
// 获取列表
getList() {
this.listLoading = true
requestFN(
'/dingWei/getAlarmList?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
{
status: this.searchForm.status,
sourceNum: '1'
}
).then((data) => {
this.listLoading = false
this.varList = data.list
this.total = data.page.total
}).catch((e) => {
this.listLoading = false
})
},
getDictionary() {
requestFN(
'/dingWei/getDictionary',
{}
).then((data) => {
if (data.code === 200) {
var alarmStatusList = JSON.parse(data.AlarmStatus)
this.alarmStatusList = alarmStatusList
}
}).catch((e) => {
})
},
goInfo(id, type) {
this.dialogManageAlarm = true
this.dialogType = type
this.manageAlarmForm.DW_ALARM_ID = id
if (type === 'ignore') {
this.manageAlarmForm.status = '2'
} else {
this.manageAlarmForm.status = '1'
}
},
manageAlarm() {
this.$refs.form.validate(valid => {
if (valid) {
this.listLoading = true
requestFN(
'/dingWei/manageAlarm',
this.manageAlarmForm
).then((data) => {
if (data.code === 200) {
this.closeManageAlarm()
this.getList()
this.$message({
message: '操作成功',
type: 'success'
})
} else {
this.$message.error(data.message)
}
})
}
})
},
closeManageAlarm() {
this.dialogManageAlarm = false
this.resetForm()
},
resetForm() {
this.manageAlarmForm = {
opinion: '', // 处理意见
DW_ALARM_ID: '',
status: ''
}
},
getDictTreeData() {
return new Promise((resolve) => {
requestFN(
'/department/listTreeCorpDept',
{}
).then((data) => {
this.treeData = this.listTransTree(JSON.parse(data.zTreeNodes), 'id', 'pId', 'nodes')
resolve('ok')
}).catch((e) => {
})
})
}
}
}
</script>

29
src/views/oneCompany/territory/index.vue Normal file
View File

@ -0,0 +1,29 @@
<template>
<div>
<List v-show="activeName=='List'" ref="list" />
</div>
</template>
<script>
import List from './components/list'
export default {
components: {
List: List
},
data() {
return {
activeName: 'List'
}
},
watch: {
activeName(val) {
if (val == 'List') {
this.$refs.list.getList()
}
}
}
}
</script>
<style scoped>
</style>

13
src/views/xgf/flow/components/sendUtil.vue
View File

@ -292,10 +292,15 @@ export default {
}
upload('/xgf/user/approveMax', formData)
.then((data) => {
this.$message.success('推送成功')
this.visible = false
this.$emit('refresh', '')
this.handleClose()
if (data.code !== '0') {
this.$message.error(data.errorMessage)
} else {
this.$message.success('推送成功')
this.visible = false
this.handleClose()
this.$emit('refresh', '')
}
this.loading = false
})
.catch((e) => {

4
static/config.js
View File

@ -1,7 +1,7 @@
// eslint-disable-next-line no-unused-vars
const config = {
weburl: 'http://192.168.151.43:8080/', // 前台地址
httpurl: 'http://192.168.151.43:8091/', // 后台地址
weburl: 'http://192.168.0.49:8080/', // 前台地址
httpurl: 'http://192.168.0.49:8091/', // 后台地址
qyurl: 'https://qgqy.qhdsafety.com/', // 企业前台
adminurl: 'https://www.qdkjchina.com/qa-prevention-admin/',
// 正式

6
static/config_dev.js
View File

@ -1,7 +1,9 @@
// eslint-disable-next-line no-unused-vars
const config = {
weburl: 'http://192.168.151.43:8080/', // 前台地址
httpurl: 'http://qgqy.qhdsafety.com/qa-prevention-gwj/', // 后台地址
// weburl: 'http://192.168.151.43:8080/', // 前台地址
// httpurl: 'http://qgqy.qhdsafety.com/qa-prevention-gwj/', // 后台地址
weburl: 'http://192.168.0.49:8080/', // 前台地址
httpurl: 'http://192.168.0.49:8091/', // 后台地址
qyurl: 'https://qgqy.qhdsafety.com/', // 企业前台
adminurl: 'https://www.qdkjchina.com/qa-prevention-admin/',
// 正式