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

Merge branch 'pet' of http://47.92.113.182:3000/guoyuepeng/qa-regulatory-gwj-vue into pet

pet_li_6.6
water_xu 2024-05-08 18:19:07 +08:00
parent ef6331cd78 3af965e357
commit 36aa2d8f35
36 changed files with 4845 additions and 233 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
index.html
View File

@ -9,7 +9,7 @@
<!-- <link href="./static/map/cesium109/Widgets/widgets.css" rel="stylesheet"/>-->
<link rel="stylesheet" href="https://g.alicdn.com/de/prismplayer/2.16.0/skins/default/aliplayer-min.css" />
<script type="text/javascript" charset="utf-8" src="https://g.alicdn.com/de/prismplayer/2.16.0/aliplayer-min.js"></script>
<script type="text/javascript" charset="utf-8" src="http://10.30.20.54:8093/static/imosPlayer.min.js"></script>
<!-- <script type="text/javascript" charset="utf-8" src="http://10.30.20.54:8093/static/imosPlayer.min.js"></script>-->
<script type="text/javascript" charset="utf-8" src="https://api.tianditu.gov.cn/api?v=4.0&tk=e8a16137fd226a62a23cc7ba5c9c78ce"></script>
<script type="text/javascript" src="./static/map/cesium91/CesiumUnminified/Cesium.js"></script>

BIN
src/assets/map/gangkou_index/point/ico31_offline.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
src/assets/map/gangkou_index/point/ico31_online.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

6
src/components/OutSourced/index.vue
View File

@ -68,7 +68,11 @@
<el-table-column v-if="otherShow" prop="HIDDEN_COUNT" label="发现隐患数量" />
<el-table-column v-if="otherShow" prop="PUNISH_COUNT" label="违约处罚次数" />
<el-table-column v-if="otherShow" prop="AMOUT_SUM" label="违约处罚金额(元)" />
<el-table-column v-if="otherShow" prop="VIDEO_COUNT" label="包含视频监控数" />
<el-table-column v-if="otherShow" prop="VIDEO_COUNT" label="包含视频监控数(在线视频数)" width="200">
<template slot-scope="{row}">
<span>{{ row.VIDEO_COUNT }} ({{ row.ONLINE_COUNT }})</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="100">
<template slot-scope="{row}">
<el-button type="success" icon="el-icon-view" size="mini" @click="goDetail(row.CORPINFO_ID)">查看</el-button>

77
src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/detail_cfd.vue
View File

@ -35,6 +35,12 @@
<td class="bbg">动火人及证书编号</td>
<td colspan="3">{{ pd.WORK_USER }}</td>
</tr>
<tr>
<td class="bbg">动火操作人图片</td>
<td colspan="3">
<img v-viewer v-for="(item,index) in pd.dongHuoCaoZuoRenPic" :src="pd.dongHuoCaoZuoRenPic[index]" :key="index" alt="" width="100" height="100">
</td>
</tr>
<tr>
<td class="bbg">作业单位</td>
<td>{{ pd.CONFIRM_DEPARTMENT_NAME }}</td>
@ -52,7 +58,7 @@
<tr :key="index">
<td class="bbg">分析结果/%</td>
<td>{{ item.ANALYZE_RESULT }}</td>
<td class="bbg">分析人</td>
<td class="bbg">气体分析单位负责人</td>
<td>{{ item.ANALYZE_USER }}</td>
</tr>
</template>
@ -97,28 +103,30 @@
{{ item.CONFIRM_NAME }}
</td>
</tr>
<tr v-if="pd.CONFIRM_USER_MEASURES || pd.LEADER_USER_MEASURES || pd.AUDIT_USER_MEASURES || pd.APPROVE_USER_MEASURES || pd.MONITOR_USER_MEASURES">
<tr
v-if="pd.SAFETY_USER_MEASURES || pd.CONFIRM_OTHER_CONTENT || pd.BELONGING_USER_MEASURES || pd.GUARDIAN_USER_MEASURES || pd.LEADER_USER_MEASURES|| pd.AUDIT_USER_MEASURES || pd.APPROVE_USER_MEASURES || pd.MONITOR_USER_MEASURES">
<td>{{ measuresList.length + 1 }}</td>
<td colspan="3">
<div v-if="pd.CONFIRM_USER_MEASURES" style="display: flex;justify-content: space-between;">
<span>其他安全措施：{{ pd.CONFIRM_USER_MEASURES }}</span>
<span>编制人：{{ pd.CONFIRM_USER_NAME }}</span>
<div v-if="pd.SAFETY_USER_MEASURES" style="display: flex;justify-content: space-between;">
<span>安全措施确认人：{{ pd.SAFETY_USER_MEASURES }}</span>
</div>
<div v-if="pd.CONFIRM_OTHER_CONTENT" style="display: flex;justify-content: space-between;margin-top: 10px;">
<span>作业负责人：{{ pd.CONFIRM_OTHER_CONTENT }}</span>
</div>
<div v-if="pd.BELONGING_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
<span>项目责任负责人：{{ pd.BELONGING_USER_MEASURES }}</span>
</div>
<div v-if="pd.LEADER_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
<span>其他安全措施：{{ pd.LEADER_USER_MEASURES }}</span>
<span>编制人：{{ pd.LEADER_USER_NAME }}</span>
<span>属地监管单位：{{ pd.LEADER_USER_MEASURES }}</span>
</div>
<div v-if="pd.AUDIT_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
<span>其他安全措施：{{ pd.AUDIT_USER_MEASURES }}</span>
<span>编制人：{{ pd.AUDIT_USER_NAME }}</span>
<span>安全管理部门：{{ pd.AUDIT_USER_MEASURES }}</span>
</div>
<div v-if="pd.APPROVE_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
<span>其他安全措施：{{ pd.APPROVE_USER_MEASURES }}</span>
<span>编制人：{{ pd.APPROVE_USER_NAME }}</span>
<span>动火审批人：{{ pd.APPROVE_USER_MEASURES }}</span>
</div>
<div v-if="pd.MONITOR_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
<span>其他安全措施：{{ pd.MONITOR_USER_MEASURES }}</span>
<span>编制人：{{ pd.MONITOR_USER_NAME }}</span>
<span>动火前验票：{{ pd.MONITOR_USER_MEASURES }}</span>
</div>
</td>
</tr>
@ -128,10 +136,10 @@
<tr>
<td class="bbg">安全交底人</td>
<td colspan="10">
<div v-if="pd.CONFESS_USER_SIGNER_PATH" style="text-align: right">
<div v-for="item in confessList" :key="item.USER_ID" style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">
<span>{{ pd.CONFESS_USER_SIGNER_TIME }}</span>
<img v-viewer :src="config.fileUrl + item.APPROVAL_SIGNATURE" alt="" width="100" height="100">
<span>{{ item.APPROVAL_SIGNATURE_TIME }}</span>
</div>
</td>
</tr>
@ -155,6 +163,16 @@
</div>
</td>
</tr>
<tr>
<td class="bbg">安全措施确认人</td>
<td colspan="3">
<div v-if="pd.SAFETY_SIGNATURE" style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.SAFETY_SIGNATURE" alt="" width="100" height="100">
<span>{{ pd.SAFETY_SIGNATURE_TIME }}</span>
</div>
</td>
</tr>
<tr v-if="pd.CONFIRM_USER_SIGNER_PATH">
<td colspan="6">
<div>作业负责人意见：{{ pd.CONFIRM_CONTENT }}</div>
@ -165,6 +183,16 @@
</div>
</td>
</tr>
<tr v-if="pd.BELONGING_SIGNATURE">
<td colspan="6">
<div>项目主管部门负责人意见：{{ 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">
<span>{{ pd.BELONGING_SIGNATURE_TIME }}</span>
</div>
</td>
</tr>
<tr v-if="pd.LEADER_USER_SIGNER_PATH">
<td colspan="6">
<div>所在单位意见：{{ pd.LEADER_CONTENT }}</div>
@ -197,7 +225,7 @@
</tr>
<tr v-if="pd.MONITOR_USER_SIGNER_PATH">
<td colspan="6">
<div>动火前，岗位当班班长验票情况：{{ pd.MONITOR_CONTENT }}</div>
<div>动火前验票负责人：{{ 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 +266,8 @@ export default {
gasList: [],
imgList: [],
imgList1: [],
otherProtectiveMeasures: []
otherProtectiveMeasures: [],
confessList: []
}
},
created() {
@ -278,6 +307,11 @@ export default {
this.pd = data.pd // 参数map
this.imgList = data.imgList
this.imgList1 = data.imgList1
data.pd.confessList.forEach(item => {
if (item.APPROVAL_SIGNATURE_TIME !== undefined && item.APPROVAL_SIGNATURE_TIME.trim() !== '') {
this.confessList.push(item)
}
})
for (let i = 0; i < data.measuresList.length; i++) {
// 将字符串转成数组
const PROTECTIVE_MEASURES = data.measuresList[i].PROTECTIVE_MEASURES.split('')
@ -313,6 +347,13 @@ export default {
this.pd.APPROVE_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[3]
this.pd.MONITOR_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[4]
}
const dongHuoCaoZuoRenPic = data.imgList2
if (dongHuoCaoZuoRenPic && dongHuoCaoZuoRenPic.length > 0) {
this.pd.dongHuoCaoZuoRenPic = []
for (let i = 0; i < dongHuoCaoZuoRenPic.length; i++) {
this.pd.dongHuoCaoZuoRenPic.push(this.config.fileUrl + dongHuoCaoZuoRenPic[i].FILEPATH)
}
}
}).catch((e) => {
this.listLoading = false
})

9
src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/list_cfd.vue
View File

@ -52,12 +52,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==2">所在单位待审核</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==-2">作业负责人审核打回</span>
<span v-else-if="row.APPLY_STATUS==-4">所在单位审核打回</span>
<span v-else-if="row.APPLY_STATUS==-5">安全管理部门审核打回</span>
@ -72,12 +74,14 @@
<template slot-scope="{row}">
<span v-if="row.APPLY_STATUS==0">{{ row.CONFIRM_USER_NAME }}</span>
<span v-else-if="row.APPLY_STATUS==1">{{ row.CONFIRM_USER_NAME }}</span>
<span v-else-if="row.APPLY_STATUS==1.5">{{ row.BELONGING_USER_NAME }}</span>
<span v-else-if="row.APPLY_STATUS==2">{{ row.LEADER_USER_NAME }}</span>
<span v-else-if="row.APPLY_STATUS==4">{{ row.AUDIT_USER_NAME }}</span>
<span v-else-if="row.APPLY_STATUS==5">{{ row.APPROVE_USER_NAME }}</span>
<span v-else-if="row.APPLY_STATUS==6">{{ row.MONITOR_USER_NAME }}</span>
<span v-else-if="row.APPLY_STATUS==7">{{ row.ACCEPT_USER_NAME }}</span>
<span v-else-if="row.APPLY_STATUS==8">{{ row.ACCEPT_USER_NAME }}</span>
<span v-else-if="row.APPLY_STATUS==-1.5">{{ row.BELONGING_USER_NAME }}</span>
<span v-else-if="row.APPLY_STATUS==-2">{{ row.CONFIRM_USER_NAME }}</span>
<span v-else-if="row.APPLY_STATUS==-4">{{ row.LEADER_USER_NAME }}</span>
<span v-else-if="row.APPLY_STATUS==-5">{{ row.AUDIT_USER_NAME }}</span>
@ -144,8 +148,7 @@ export default {
statusList: [
{ ID: '0', NAME: '特级' },
{ ID: '1', NAME: '一级' },
{ ID: '2', NAME: '二级' },
{ ID: '4', NAME: '三级' }
{ ID: '2', NAME: '二级' }
],
STATUS: '',
DEPTIDS: ''

6
src/views/firefighting/fireInfoReport/components/list.vue
View File

@ -40,11 +40,11 @@
</div>
</template>
</el-table-column>
<el-table-column label="消防点位数" align="center">
<el-table-column label="消防点位数(已标点数)" align="center">
<template slot-scope="{row}">
<div class="link-type" @click="goControlRoomInfo({CORPINFO_ID:row.CORPINFO_ID,TYPE:'FirePoint'})">
<div class="link-type" @click="goControlRoomInfo({CORPINFO_ID:row.CORPINFO_ID,TYPE:'FirePoint'})" style="display: inline-block">
{{ row.xiaoFangDianWeiNum }}
</div>
</div>({{ row.xiaoFangDianWeiBiaoDianNum }})
</template>
</el-table-column>
<el-table-column label="消防器材数" align="center">

3
src/views/keyprojects/outsourced/components/list.vue
View File

@ -145,12 +145,13 @@
</template>
</el-table-column>
<el-table-column prop="OUTSOURCED_CREATOR_NAME" label="创建人" show-overflow-tooltip />
<el-table-column label="视频数量" show-overflow-tooltip>
<el-table-column label="视频数量(在线数)" show-overflow-tooltip width="150">
<template slot-scope="{row}">
<span v-if="row.VIDEO_COUNT != 0">
<a style="color: #1e9fff;text-decoration:underline" @click="clickVideoDetail(row.OUTSOURCED_ID)">{{ row.VIDEO_COUNT }}</a>
</span>
<span v-else>{{ row.VIDEO_COUNT }}</span>
<span>({{ row.VIDEO_ONLINE_COUNT }})</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="400">

6
src/views/keyprojects/videomanager/components/list.vue
View File

@ -145,7 +145,11 @@
</template>
</el-table-column>
<el-table-column prop="UNITS_NAME" label="施工相关方" width="250" show-overflow-tooltip />
<el-table-column prop="VIDEO_COUNT" label="视频个数" />
<el-table-column prop="VIDEO_COUNT" label="视频个数(在线数量)" >
<template slot-scope="{row}">
<span>{{ row.VIDEO_COUNT }}({{ row.VIDEO_ONLINE_COUNT }})</span>
</template>
</el-table-column>
<el-table-column prop="STATE" label="状态">
<template slot-scope="{row}">
<span v-if="row.STATE == -1">开工申请中</span>

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

@ -50,6 +50,11 @@
<span v-else>未定位</span>
</template>
</el-table-column>
<el-table-column prop="ONLINE_STATUS" label="是否在线" width="100">
<template slot-scope="{row}">
<span>{{ row.ONLINE_STATUS }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="left" width="500">
<template slot-scope="{row}">
<el-button :disabled="STATE == 2" type="success" icon="el-icon-caret-right" size="mini" @click="showVideo(row)">播放</el-button>

116
src/views/map/components/bianjieruqin.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="shipin">
<div class="block1">
<layout-title title="视频状态"/>
<layout-title title="视频定位"/>
<div class="options">
<div class="option">
<div class="leftimg"/>
@ -15,7 +15,7 @@
</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>
@ -26,26 +26,25 @@
</div>
</div>
</div>
<div class="block3">
<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>
<div class="scroll">
<div v-for="(item,index) in block3List" :key="index" class="tr">
<div class="td line1">{{ item.region }}</div>
<div class="td">{{ item.name }}</div>
<div class="td">{{ item.time }}</div>
</div>
</div>
</div>
</div>
</div>
<!-- <div class="block3">-->
<!-- <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>-->
<!-- <div class="scroll">-->
<!-- <div v-for="(item,index) in block3List" :key="index" class="tr">-->
<!-- <div class="td line1">{{ item.region }}</div>-->
<!-- <div class="td">{{ item.name }}</div>-->
<!-- <div class="td">{{ item.time }}</div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
</div>
</template>
@ -79,17 +78,25 @@ export default {
{
lable: '视频总数',
count: 0
},
{
lable: '在线数量',
count: 0
},
{
lable: '离线数量',
count: 0
}
],
block2OptionsList: [
{
img: require('../../../assets/map/bianjie/img1.png'),
label: '码头',
img: require('../../../assets/map/gangkou_index/point/ico15.png'),
label: '重点工程总数',
count: 0
},
{
img: require('../../../assets/map/bianjie/img2.png'),
label: '油罐区域',
img: require('../../../assets/map/gangkou_index/point/ico30.png'),
label: '重点工程开工数量',
count: 0
}
],
@ -163,33 +170,70 @@ export default {
this.initgetTable()
},
methods: {
// 初始化总摄像头数
// initCount() {
// requestFN(
// '/map/mapPlatformelectronic/listAll',
// {
// CORPINFO_ID: this.corpInfoId,
// AREA: this.area
// }
// ).then((data) => {
// this.block1OptionsList[0].count = data.allForMap
// })
// },
// 初始化总摄像头数
initCount() {
requestFN(
'/map/mapPlatformelectronic/listAll',
'/map/keyProject/listAllLocation',
{
CORPINFO_ID: this.corpInfoId,
AREA: this.area
AREA: this.area,
TYPE: 'VIDEO',
GANGKOU: this.gangkou
}
).then((data) => {
this.block1OptionsList[0].count = data.allForMap
this.block1OptionsList[0].count = data.varList.length
data.varList.forEach((item) => {
if (item.ONLINE_STATUS === '0') {
this.block1OptionsList[1].count++
} else {
this.block1OptionsList[2].count++
}
})
})
},
// 初始化港口摄像头数
// initgetTable() {
// requestFN(
// '/map/mapPlatformelectronic/listAllByArea',
// {
// CORPINFO_ID: this.corpInfoId,
// AREA: this.area
// }
// ).then((data) => {
// data.varList.forEach(item => {
// if (item.SUOSHUQUYU === '2') {
// this.block2OptionsList[0].count = item.co
// } else if (item.SUOSHUQUYU === '1') {
// this.block2OptionsList[1].count = item.co
// }
// })
// })
// }
// 初始化港口摄像头数
initgetTable() {
requestFN(
'/map/mapPlatformelectronic/listAllByArea',
'/outsourced/listForCount',
{
CORPINFO_ID: this.corpInfoId,
AREA: this.area
CORPINFO_ID: this.corpInfoId
}
).then((data) => {
this.block2OptionsList[0].count = data.varList.length
data.varList.forEach(item => {
if (item.SUOSHUQUYU === '2') {
this.block2OptionsList[0].count = item.co
} else if (item.SUOSHUQUYU === '1') {
this.block2OptionsList[1].count = item.co
if (item.STATE == 1) {
this.block2OptionsList[1].count++
}
})
})

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

@ -27,6 +27,12 @@
<td class="bbg-transparent">动火人及证书编号</td>
<td colspan="3">{{ pd.WORK_USER }}</td>
</tr>
<tr>
<td class="bbg-transparent">动火操作人图片</td>
<td colspan="3">
<img v-viewer v-for="(item,index) in pd.dongHuoCaoZuoRenPic" :src="pd.dongHuoCaoZuoRenPic[index]" :key="index" alt="" width="100" height="100">
</td>
</tr>
<tr>
<td class="bbg-transparent">作业单位</td>
<td>{{ pd.CONFIRM_DEPARTMENT_NAME }}</td>
@ -44,7 +50,7 @@
<tr :key="index">
<td class="bbg-transparent">分析结果/%</td>
<td>{{ item.ANALYZE_RESULT }}</td>
<td class="bbg-transparent">分析人</td>
<td class="bbg-transparent">气体单位负责人</td>
<td>{{ item.ANALYZE_USER }}</td>
</tr>
</template>
@ -89,28 +95,33 @@
{{ item.CONFIRM_NAME }}
</td>
</tr>
<tr v-if="pd.CONFIRM_USER_MEASURES || pd.LEADER_USER_MEASURES || pd.AUDIT_USER_MEASURES || pd.APPROVE_USER_MEASURES || pd.MONITOR_USER_MEASURES">
<tr v-if="pd.SAFETY_USER_MEASURES || pd.CONFIRM_OTHER_CONTENT || pd.BELONGING_USER_MEASURES || pd.GUARDIAN_USER_MEASURES || pd.LEADER_USER_MEASURES
|| pd.AUDIT_USER_MEASURES || pd.APPROVE_USER_MEASURES || pd.MONITOR_USER_MEASURES">
<td>{{ measuresList.length + 1 }}</td>
<td colspan="3">
<div v-if="pd.CONFIRM_USER_MEASURES" style="display: flex;justify-content: space-between;">
<span>其他安全措施：{{ pd.CONFIRM_USER_MEASURES }}</span>
<span>编制人：{{ pd.CONFIRM_USER_NAME }}</span>
<div v-if="pd.SAFETY_USER_MEASURES" style="display: flex;justify-content: space-between;">
<span>安全措施确认人：{{ pd.SAFETY_USER_MEASURES }}</span>
</div>
<div v-if="pd.CONFIRM_OTHER_CONTENT" style="display: flex;justify-content: space-between;margin-top: 10px;">
<span>作业负责人：{{ pd.CONFIRM_OTHER_CONTENT }}</span>
</div>
<div v-if="pd.BELONGING_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
<span>项目责任负责人：{{ pd.BELONGING_USER_MEASURES }}</span>
</div>
<!-- <div v-if="pd.GUARDIAN_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">-->
<!-- <span>属地监管单位：{{ pd.GUARDIAN_USER_MEASURES }}</span>-->
<!-- </div>-->
<div v-if="pd.LEADER_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
<span>其他安全措施：{{ pd.LEADER_USER_MEASURES }}</span>
<span>编制人：{{ pd.LEADER_USER_NAME }}</span>
<span>属地监管单位：{{ pd.LEADER_USER_MEASURES }}</span>
</div>
<div v-if="pd.AUDIT_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
<span>其他安全措施：{{ pd.AUDIT_USER_MEASURES }}</span>
<span>编制人：{{ pd.AUDIT_USER_NAME }}</span>
<span>安全管理部门：{{ pd.AUDIT_USER_MEASURES }}</span>
</div>
<div v-if="pd.APPROVE_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
<span>其他安全措施：{{ pd.APPROVE_USER_MEASURES }}</span>
<span>编制人：{{ pd.APPROVE_USER_NAME }}</span>
<span>动火审批人：{{ pd.APPROVE_USER_MEASURES }}</span>
</div>
<div v-if="pd.MONITOR_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
<span>其他安全措施：{{ pd.MONITOR_USER_MEASURES }}</span>
<span>编制人：{{ pd.MONITOR_USER_NAME }}</span>
<span>动火前验票：{{ pd.MONITOR_USER_MEASURES }}</span>
</div>
</td>
</tr>
@ -120,10 +131,10 @@
<tr>
<td class="bbg-transparent">安全交底人</td>
<td colspan="10">
<div v-if="pd.CONFESS_USER_SIGNER_PATH" style="text-align: right">
<div v-for="item in confessList" :key="item.USER_ID" style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">
<span>{{ pd.CONFESS_USER_SIGNER_TIME }}</span>
<img v-viewer :src="config.fileUrl + item.APPROVAL_SIGNATURE" alt="" width="100" height="100">
<span>{{ item.APPROVAL_SIGNATURE_TIME }}</span>
</div>
</td>
</tr>
@ -147,6 +158,16 @@
</div>
</td>
</tr>
<tr>
<td class="bbg-transparent">安全措施确认人</td>
<td colspan="3">
<div v-if="pd.SAFETY_SIGNATURE" style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.SAFETY_SIGNATURE" alt="" width="100" height="100">
<span>{{ pd.SAFETY_SIGNATURE_TIME }}</span>
</div>
</td>
</tr>
<tr v-if="pd.CONFIRM_USER_SIGNER_PATH">
<td colspan="6">
<div>作业负责人意见：{{ pd.CONFIRM_CONTENT }}</div>
@ -157,9 +178,19 @@
</div>
</td>
</tr>
<tr v-if="pd.BELONGING_SIGNATURE">
<td colspan="6">
<div>项目主管部门负责人意见：{{ 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">
<span>{{ pd.BELONGING_SIGNATURE_TIME }}</span>
</div>
</td>
</tr>
<tr v-if="pd.LEADER_USER_SIGNER_PATH">
<td colspan="6">
<div>所在单位意见：{{ pd.LEADER_CONTENT }}</div>
<div>属地监管单位意见：{{ 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">
@ -189,7 +220,7 @@
</tr>
<tr v-if="pd.MONITOR_USER_SIGNER_PATH">
<td colspan="6">
<div>动火前，岗位当班班长验票情况：{{ pd.MONITOR_CONTENT }}</div>
<div>动火前验票负责人：{{ 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">
@ -241,7 +272,8 @@ export default {
gasList: [],
imgList: [],
imgList1: [],
otherProtectiveMeasures: []
otherProtectiveMeasures: [],
confessList: []
}
},
created() {
@ -283,6 +315,11 @@ export default {
this.pd = data.pd // 参数map
this.imgList = data.imgList
this.imgList1 = data.imgList1
data.pd.confessList.forEach(item => {
if (item.APPROVAL_SIGNATURE_TIME !== undefined && item.APPROVAL_SIGNATURE_TIME.trim() !== '') {
this.confessList.push(item)
}
})
for (let i = 0; i < data.measuresList.length; i++) {
// 将字符串转成数组
const PROTECTIVE_MEASURES = data.measuresList[i].PROTECTIVE_MEASURES.split('')
@ -318,6 +355,13 @@ export default {
this.pd.APPROVE_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[3]
this.pd.MONITOR_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[4]
}
let dongHuoCaoZuoRenPic = data.imgList2
if (dongHuoCaoZuoRenPic && dongHuoCaoZuoRenPic.length > 0) {
this.pd.dongHuoCaoZuoRenPic = []
for (let i = 0; i < dongHuoCaoZuoRenPic.length; i++) {
this.pd.dongHuoCaoZuoRenPic.push(this.config.fileUrl + dongHuoCaoZuoRenPic[i].FILEPATH)
}
}
}).catch((e) => {
this.listLoading = false
})

2
src/views/map/dialog/index.vue
View File

@ -27,7 +27,7 @@
<hotworkFirst v-if="type === 'HOTWORK' && corpInfoId === '035958e685cf4850bc40151c5e0617a6' " :id="id" :type="type" :gangkou="gangkou"/>
<!--秦港一公司 动火作业 详细页面 end-->
<!--其他公司 动火作业 详细页面 start-->
<hotwork v-if="type === 'HOTWORK' || type === 'HOTWORK00005' && corpInfoId !== '635917e77af8461691d5da5507b56347' && corpInfoId !== '035958e685cf4850bc40151c5e0617a6'" :id="id" :type="type" :gangkou="gangkou"/>
<hotwork v-if="(type === 'HOTWORK' || type === 'HOTWORK00005') && corpInfoId !== '635917e77af8461691d5da5507b56347' && corpInfoId !== '035958e685cf4850bc40151c5e0617a6'" :id="id" :type="type" :gangkou="gangkou"/>
<!--其他公司 动火作业 详细页面 end-->
<!--其他七项作业共用一个详细页面 start-->
<confinedspace v-if="type === 'CONFINEDSPACE' || type === 'CONFINEDSPACE00005' && corpInfoId !== '635917e77af8461691d5da5507b56347'" :id="id" :type="type" :gangkou="gangkou"/>

4
src/views/map/dialog/outSourceVideoInfo.vue
View File

@ -7,7 +7,9 @@
<table class="table-ui">
<tr>
<td class="bbg-transparent">视频名称</td>
<td colspan="3">{{ pd.VIDEONAME }}</td>
<td>{{ pd.VIDEONAME }}</td>
<td class="bbg-transparent">在线状态</td>
<td>{{ pd.ONLINE_STATUS }}</td>
</tr>
<tr>
<td class="bbg-transparent">所属重点工程</td>

28
src/views/map/dialog/video_play_plat.vue
View File

@ -16,7 +16,7 @@
<script>
import { requestFN } from '@/utils/request'
const imosPlayer = window.imosPlayer
// const imosPlayer = window.imosPlayer
let iframeObj = null
export default {
@ -65,19 +65,19 @@ export default {
},
methods: {
showYsVideo() {
iframeObj = imosPlayer.createPanelWindow()
var dom = document.getElementById('aLiVideoPlayer')
iframeObj.style.margin = 'auto'
dom.appendChild(iframeObj)
imosPlayer
.playLive(iframeObj.id, {
camera: this.id,
title: this.id,
stream: 1
})
.then((e) => {
console.log(e)
})
// iframeObj = imosPlayer.createPanelWindow()
// var dom = document.getElementById('aLiVideoPlayer')
// iframeObj.style.margin = 'auto'
// dom.appendChild(iframeObj)
// imosPlayer
// .playLive(iframeObj.id, {
// camera: this.id,
// title: this.id,
// stream: 1
// })
// .then((e) => {
// console.log(e)
// })
},
showVideo() {
let url = this.requestUrl

65
src/views/map/index.vue
View File

@ -277,6 +277,7 @@ import cloneDeep from 'lodash/cloneDeep'
import fullScreenMixins from '@/assets/mixins/fullScreen'
import { animate } from 'motion'
import loadMapBoxCfd from './js/mapboxCfd'
import loadCmtMapBox from './js/mapboxCmt'
import loadMapBoxCzks from './js/mapboxCzks'
import loadMapBox from './js/mapbox'
import AnquanCfd from './components/anquanCfd'
@ -295,7 +296,7 @@ import axios from 'axios'
// md5加密
import md5 from 'md5'
const imosPlayer = window.imosPlayer
// const imosPlayer = window.imosPlayer
var PI = 3.1415926535897932384626
var a = 6378245.0 // 卫星椭球坐标投影到平面地图坐标系的投影因子。
var ee = 0.00669342162296594323 // 椭球的偏心率。//判断是否在国内，在中国国内的经纬度才需要做偏移
@ -876,6 +877,7 @@ export default {
pointBoxCfd: [],
pointBox: [],
pointBoxCzks: [],
pointBoxCmt: [],
fwebsocket: {},
redList: [],
orangeList: [],
@ -1157,6 +1159,7 @@ export default {
mounted() {
this.initMap()
this.pointBoxCfd = loadMapBoxCfd()
this.pointBoxCmt = loadCmtMapBox()
this.pointBox = loadMapBox()
this.pointBoxCzks = loadMapBoxCzks()
// this.ysVideoInit()
@ -1179,49 +1182,6 @@ export default {
})
},
ysVideoInit() {
// 第二套方案
var _this = this
requestFN(
'/map/loginOrKeepAlive',
{
}
).then((data) => {
const token = data.token
var nbsp = String.fromCharCode(160)
var arr = []
arr.length = 40
const str = arr.fill(nbsp).join('')
const voidPath = imosPlayer.getUniqueID()
window.voidPath = voidPath
document.title = document.title + str + new Date().getTime()
_this.keepalive(token)
setInterval(_this.keepalive, 30000, token)
window.videoWindow = 0
imosPlayer.setLinkPort('8093')
imosPlayer
.init({
ip: '172.14.0.54',
token: token,
title: document.title,
voidListenerPath: '\\' + voidPath
})
.then(async(resr) => {
if (resr.ErrCode === 0) {
// imosPlayer.setLiveNetLinkMode(liveNetProtocol, liveByMS)
// imosPlayer.setReplayNetLinkMode(replayNetProtocol, replayByMS)
// eslint-disable-next-line no-alert
console.info('登录成功')
} else {
// eslint-disable-next-line no-alert
console.info(resr.ErrMsg)
}
})
.catch((err) => {
console.error(err)
})
})
},
// keepalive(token) {
// axios({
@ -1386,6 +1346,15 @@ export default {
url: '/mapapi/ware/upload/qhdgysh/merge_tile.json'
})
viewer.scene.primitives.add(qhdgysh)
var czkszhmt = new Cesium.Cesium3DTileset({ //沧州矿石 杂货码头
url: '/mapapi/ware/upload/%E6%B2%A7%E5%B7%9E%E6%B8%AF%E8%A5%BF/%E6%B2%A7%E5%B7%9E%E6%B8%AF%E8%A5%BF/merge_tile.json'
})
viewer.scene.primitives.add(czkszhmt)
var czksksmt = new Cesium.Cesium3DTileset({//沧州矿石 矿石码头
url: '/mapapi/ware/upload/%E6%B2%A7%E5%B7%9E%E6%B8%AF%E4%B8%9C/%E6%B2%A7%E5%B7%9E%E6%B8%AF%E4%B8%9C/merge_tile.json'
})
viewer.scene.primitives.add(czksksmt)
},
leftDownAction() {
@ -2158,6 +2127,14 @@ export default {
point.name = varList[i].MAP_POINT_NAME
point.infoname = varList[i].MAP_POINT_NAME
}
// 摄像头是否在线
if (point.icon_type.indexOf('6_1') > -1) {
if (varList[i].ONLINE_STATUS === '0') {
point.icon_type = point.icon_type + '_online'
} else {
point.icon_type = point.icon_type + '_offline'
}
}
points.push(point)
}
if (this.gangkouActive === '00004' && urlType === 'carPosition') {

7
src/views/map/js/dragentity.js
View File

@ -44,6 +44,8 @@ const img5_0 = require('../../../assets/map/gangkou_index/point/ico26.png')
const img6_0 = require('../../../assets/map/gangkou_index/point/ico30.png')
const img6_1 = require('../../../assets/map/gangkou_index/point/ico31.png')
const img6_1_online = require('../../../assets/map/gangkou_index/point/ico31_online.png')
const img6_1_offline = require('../../../assets/map/gangkou_index/point/ico31_offline.png')
const img7_0 = require('../../../assets/map/gangkou_index/point/ico26.png')
@ -62,7 +64,8 @@ const imgMap = {
img6_0, img6_1,
img7_0,
img8_0, img8_1, img8_2, img8_3,
cfd_img1_0, cfd_img1_0_1, cfd_img1_0_2, cfd_img1_0_3
cfd_img1_0, cfd_img1_0_1, cfd_img1_0_2, cfd_img1_0_3,
img6_1_online, img6_1_offline
}
export { imgMap }
@ -70,10 +73,12 @@ import './PolylineTrailLinkMaterialProperty'
import loadMapBox from './mapbox'
import loadMapBoxCfd from './mapboxCfd'
import loadMapBoxCzks from './mapboxCzks'
import loadCmtMapBox from './mapboxCmt'
const polygonMap = {
'00003': loadMapBox,
'00002': loadMapBoxCzks,
'00005': loadCmtMapBox,
'00004': loadMapBoxCfd
}

4481
src/views/map/js/mapboxCmt.js Normal file
View File

File diff suppressed because it is too large Load Diff

6
src/views/threeSystems/safetyOperationRegulations/components/editTextLibrary.vue
View File

@ -1,7 +1,7 @@
<template>
<el-dialog v-loading="loading" v-if="dialogVisible" :visible.sync="dialogVisible" :before-close="goBack" :title="title">
<el-form ref="form" :model="form" :rules="rules" label-width="180px">
<el-form-item label="规程属性:" prop="CATEGORY_LIST">
<el-form-item v-if="false" label="规程属性:" prop="CATEGORY_LIST">
<multiple-choice
:dynamic-tags.sync="form.CATEGORY_LIST"
:labels="categoryList"
@ -13,14 +13,14 @@
<el-form-item label="安全操作规程名称:" prop="REMARKS">
<el-input v-model="form.REMARKS" style="width: 100%"/>
</el-form-item>
<el-form-item label="类型:" prop="TYPES">
<el-form-item v-if="false" label="类型:" prop="TYPES">
<multiple-choice
:dynamic-tags.sync="form.TYPES"
:labels="typeList"
:row-key="key.typeKey"
:row-name="key.typeName"/>
</el-form-item>
<el-form-item v-if="remoteControl.keyOne" label="国民经济行业类型:" prop="SPECIFICATION_TYPES">
<el-form-item v-if="remoteControl.keyOne && false" label="国民经济行业类型:" prop="SPECIFICATION_TYPES">
<multiple-choice
:dynamic-tags.sync="form.SPECIFICATION_TYPES"
:labels="industryTypeList"

9
src/views/threeSystems/safetyOperationRegulations/components/list.vue
View File

@ -21,7 +21,7 @@
<el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
搜索
</el-button>
<el-button v-waves class="filter-item" type="success" icon="el-icon-magic-stick" @click="addCondition">
<el-button v-waves v-if="false" class="filter-item" type="success" icon="el-icon-magic-stick" @click="addCondition">
添加其他搜索条件
</el-button>
<el-button v-waves class="filter-item" type="success" icon="el-icon-magic-stick" @click="clearMessage">
@ -56,7 +56,7 @@
align="center"/>
<el-table-column type="index" label="序号" width="50" align="center"/>
<el-table-column align="center" prop="REMARKS" label="安全操作规程名称"/>
<el-table-column align="center" prop="TYPES" label="类型">
<el-table-column v-if="false" align="center" prop="TYPES" label="类型">
<template slot-scope="{row}">
<el-tag
v-for="tag in row.TYPES"
@ -80,7 +80,7 @@
</el-tag>
</template>
</el-table-column>
<el-table-column align="center" prop="SPECIFICATION_TYPES" label="国民经济行业类型" width="300px">
<el-table-column v-if="false" align="center" prop="SPECIFICATION_TYPES" label="国民经济行业类型" width="300px">
<template slot-scope="{row}">
<div
v-if="(row.SPECIFICATION_TYPES && row.SPECIFICATION_TYPES.length > 0) && ((!row.CATEGORY_LIST) || (!row.CATEGORY_LIST[0]) || (row.CATEGORY_LIST[0].CATEGORY_ID !== '8051d985a2bc406a83ea9360b64182b2')) ">
@ -98,13 +98,14 @@
</div>
</template>
</el-table-column>
<el-table-column align="center" prop="UPLOAD_TIME" label="上传时间" width="90px"/>
<el-table-column align="center" prop="UPLOAD_TIME" label="上传时间" width="200px"/>
<el-table-column align="center" prop="STATUS" label="状态" width="80px">
<template slot-scope="{row}">
{{ row.STATUS === '0' ? '停用' : '正常' }}
</template>
</el-table-column>
<el-table-column
v-if="false"
:show-overflow-tooltip="true"
align="center"
prop="UPLOAD_USER_NAME"

8
src/views/threeSystems/safetyOperationRegulations/components/listEm.vue
View File

@ -21,7 +21,7 @@
<el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
搜索
</el-button>
<el-button v-waves class="filter-item" type="success" icon="el-icon-magic-stick" @click="addCondition">
<el-button v-waves v-if="false" class="filter-item" type="success" icon="el-icon-magic-stick" @click="addCondition">
添加其他搜索条件
</el-button>
<el-button v-waves class="filter-item" type="success" icon="el-icon-magic-stick" @click="clearMessage">
@ -56,7 +56,7 @@
align="center"/>
<el-table-column type="index" label="序号" width="50" align="center" />
<el-table-column align="center" prop="REMARKS" label="安全操作规程名称" />
<el-table-column align="center" prop="TYPES" label="类型" >
<el-table-column v-if="false" align="center" prop="TYPES" label="类型" >
<template slot-scope="{row}">
<el-tag
v-for="tag in row.TYPES"
@ -80,7 +80,7 @@
</el-tag>
</template>
</el-table-column>
<el-table-column align="center" prop="SPECIFICATION_TYPES" label="国民经济行业类型" width="300px">
<el-table-column v-if="false" align="center" prop="SPECIFICATION_TYPES" label="国民经济行业类型" width="300px">
<template slot-scope="{row}">
<div v-if="row.SPECIFICATION_TYPES && row.SPECIFICATION_TYPES.length > 0">
<el-tag
@ -97,7 +97,7 @@
</div>
</template>
</el-table-column>
<el-table-column align="center" prop="UPLOAD_TIME" label="上传时间" width="90px"/>
<el-table-column align="center" prop="UPLOAD_TIME" label="上传时间" width="200px"/>
<el-table-column align="center" prop="STATUS" label="状态" width="80px">
<template slot-scope="{row}">
{{ row.STATUS === '0'?'停用':'正常' }}

6
src/views/threeSystems/safetyOperationRegulations/components/textLibraryInfo.vue
View File

@ -4,7 +4,7 @@
<el-form-item label="安全操作规程:" prop="FILE_NAME">
<el-input v-model="form.REMARKS" disabled style="width: 70%"/>
</el-form-item>
<el-form-item label="规程属性:" prop="FILE_NAME">
<el-form-item v-if="false" label="规程属性:" prop="FILE_NAME">
<el-tag
v-for="tag in form.CATEGORY_LIST"
:key="tag.value"
@ -13,7 +13,7 @@
{{ tag.CATEGORY_NAME }}
</el-tag>
</el-form-item>
<el-form-item label="类型:" prop="FILE_NAME">
<el-form-item v-if="false" label="类型:" prop="FILE_NAME">
<el-tag
v-for="tag in form.TYPES"
:key="tag.value"
@ -22,7 +22,7 @@
{{ tag.CATEGORY_NAME }}
</el-tag>
</el-form-item>
<el-form-item v-if="remoteControl.keyOne" label="国民经济行业类型:" prop="FILE_NAME">
<el-form-item v-if="false" label="国民经济行业类型:" prop="FILE_NAME">
<el-tag
v-for="tag in form.SPECIFICATION_TYPES"
:key="tag.value"

6
src/views/threeSystems/safetyProductionManagementSystem/components/editTextLibrary.vue
View File

@ -1,16 +1,16 @@
<template>
<el-dialog v-loading="loading" v-if="dialogVisible" :visible.sync="dialogVisible" :before-close="goBack" :title="title">
<el-form ref="form" :model="form" :rules="rules" label-width="180px">
<el-form-item label="规程属性:" prop="CATEGORY_LIST">
<el-form-item v-if="false" label="规程属性:" prop="CATEGORY_LIST">
<multiple-choice :dynamic-tags.sync="form.CATEGORY_LIST" :labels="categoryList" :row-key="key.categoryKey" :row-name="key.categoryName" :limit="1" @getChooseOne="getChooseOne"/>
</el-form-item>
<el-form-item label="安全生产管理制度名称:" prop="REMARKS">
<el-input v-model="form.REMARKS" style="width: 100%"/>
</el-form-item>
<el-form-item label="类型:" prop="TYPES">
<el-form-item v-if="false" label="类型:" prop="TYPES">
<multiple-choice :dynamic-tags.sync="form.TYPES" :labels="typeList" :row-key="key.typeKey" :row-name="key.typeName"/>
</el-form-item>
<el-form-item v-if="remoteControl.keyOne" label="国民经济行业类型:" prop="SPECIFICATION_TYPES">
<el-form-item v-if="remoteControl.keyOne && false" label="国民经济行业类型:" prop="SPECIFICATION_TYPES">
<multiple-choice
:dynamic-tags.sync="form.SPECIFICATION_TYPES"
:labels="industryTypeList"

10
src/views/threeSystems/safetyProductionManagementSystem/components/list.vue
View File

@ -21,7 +21,7 @@
<el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
搜索
</el-button>
<el-button v-waves class="filter-item" type="success" icon="el-icon-magic-stick" @click="addCondition">
<el-button v-waves v-if="false" class="filter-item" type="success" icon="el-icon-magic-stick" @click="addCondition">
添加其他搜索条件
</el-button>
<el-button v-waves class="filter-item" type="success" icon="el-icon-magic-stick" @click="clearMessage">
@ -55,7 +55,7 @@
align="center"/>
<el-table-column type="index" label="序号" width="50" align="center" />
<el-table-column align="center" prop="REMARKS" label="安全生产管理制度名称" />
<el-table-column align="center" prop="TYPES" label="类型" >
<el-table-column v-if="false" align="center" prop="TYPES" label="类型" >
<template slot-scope="{row}">
<el-tag
v-for="tag in row.TYPES"
@ -79,7 +79,7 @@
</el-tag>
</template>
</el-table-column>
<el-table-column align="center" prop="SPECIFICATION_TYPES" label="国民经济行业类型" width="300px">
<el-table-column v-if="false" align="center" prop="SPECIFICATION_TYPES" label="国民经济行业类型" width="300px">
<template slot-scope="{row}">
<div v-if="(row.SPECIFICATION_TYPES && row.SPECIFICATION_TYPES.length > 0) && ((!row.CATEGORY_LIST) || (!row.CATEGORY_LIST[0]) || (row.CATEGORY_LIST[0].CATEGORY_ID !== '691346658ed744a1bda2ed3a755f606c')) ">
<el-tag
@ -96,13 +96,13 @@
</div>
</template>
</el-table-column>
<el-table-column align="center" prop="UPLOAD_TIME" label="上传时间" width="90px"/>
<el-table-column align="center" prop="UPLOAD_TIME" label="上传时间" width="200px"/>
<el-table-column align="center" prop="STATUS" label="状态" width="80px">
<template slot-scope="{row}">
{{ row.STATUS === '0'?'停用':'正常' }}
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="true" align="center" prop="UPLOAD_USER_NAME" label="数据来源" >
<el-table-column v-if="false" :show-overflow-tooltip="true" align="center" prop="UPLOAD_USER_NAME" label="数据来源" >
<template slot-scope="{row}">
{{ !row.CORP_NAME ? '自建' : row.CORP_NAME }}
</template>

10
src/views/threeSystems/safetyProductionManagementSystem/components/listEm.vue
View File

@ -21,7 +21,7 @@
<el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
搜索
</el-button>
<el-button v-waves class="filter-item" type="success" icon="el-icon-magic-stick" @click="addCondition">
<el-button v-waves v-if="false" class="filter-item" type="success" icon="el-icon-magic-stick" @click="addCondition">
添加其他搜索条件
</el-button>
<el-button v-waves class="filter-item" type="success" icon="el-icon-magic-stick" @click="clearMessage">
@ -55,7 +55,7 @@
align="center"/>
<el-table-column type="index" label="序号" width="50" align="center" />
<el-table-column align="center" prop="REMARKS" label="安全生产管理制度名称" />
<el-table-column align="center" prop="TYPES" label="类型" >
<el-table-column v-if="false" align="center" prop="TYPES" label="类型" >
<template slot-scope="{row}">
<el-tag
v-for="tag in row.TYPES"
@ -79,7 +79,7 @@
</el-tag>
</template>
</el-table-column>
<el-table-column align="center" prop="SPECIFICATION_TYPES" label="国民经济行业类型" width="300px">
<el-table-column v-if="false" align="center" prop="SPECIFICATION_TYPES" label="国民经济行业类型" width="300px">
<template slot-scope="{row}">
<div v-if="row.SPECIFICATION_TYPES && row.SPECIFICATION_TYPES.length > 0">
<el-tag
@ -96,13 +96,13 @@
</div>
</template>
</el-table-column>
<el-table-column align="center" prop="UPLOAD_TIME" label="上传时间" width="90px"/>
<el-table-column align="center" prop="UPLOAD_TIME" label="上传时间" width="200px"/>
<el-table-column align="center" prop="STATUS" label="状态" width="80px">
<template slot-scope="{row}">
{{ row.STATUS === '0'?'停用':'正常' }}
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="true" align="center" prop="UPLOAD_USER_NAME" label="数据来源" >
<el-table-column v-if="false" :show-overflow-tooltip="true" align="center" prop="UPLOAD_USER_NAME" label="数据来源" >
<template slot-scope="{row}">
{{ !row.CORP_NAME ? '自建' : row.CORP_NAME }}
</template>

6
src/views/threeSystems/safetyProductionManagementSystem/components/textLibraryInfo.vue
View File

@ -4,7 +4,7 @@
<el-form-item label="安全生产管理制度:" prop="FILE_NAME">
<el-input v-model="form.REMARKS" disabled style="width: 70%"/>
</el-form-item>
<el-form-item label="规程属性:" prop="FILE_NAME">
<el-form-item v-if="false" label="规程属性:" prop="FILE_NAME">
<el-tag
v-for="tag in form.CATEGORY_LIST"
:key="tag.value"
@ -13,7 +13,7 @@
{{ tag.CATEGORY_NAME }}
</el-tag>
</el-form-item>
<el-form-item label="类型:" prop="FILE_NAME">
<el-form-item v-if="false" label="类型:" prop="FILE_NAME">
<el-tag
v-for="tag in form.TYPES"
:key="tag.value"
@ -22,7 +22,7 @@
{{ tag.CATEGORY_NAME }}
</el-tag>
</el-form-item>
<el-form-item v-if="remoteControl.keyOne" label="国民经济行业类型:" prop="FILE_NAME">
<el-form-item v-if="false" label="国民经济行业类型:" prop="FILE_NAME">
<el-tag
v-for="tag in form.SPECIFICATION_TYPES"
:key="tag.value"

30
src/views/threeSystems/safetyProductionResponsibilitySystem/components/editTextLibrary.vue
View File

@ -1,16 +1,16 @@
<template>
<el-dialog v-loading="loading" v-if="dialogVisible" :visible.sync="dialogVisible" :before-close="goBack" :title="title">
<el-form ref="form" :model="form" :rules="rules" label-width="180px">
<el-form-item label="规程属性:" prop="CATEGORY_LIST">
<el-form-item v-if="false" label="规程属性:" prop="CATEGORY_LIST">
<multiple-choice :dynamic-tags.sync="form.CATEGORY_LIST" :labels="categoryList" :row-key="key.categoryKey" :row-name="key.categoryName" :limit="1" @getChooseOne="getChooseOne"/>
</el-form-item>
<el-form-item label="安全生产责任制名称:" prop="REMARKS">
<el-input v-model="form.REMARKS" style="width: 100%"/>
</el-form-item>
<el-form-item label="类型:" prop="TYPES">
<multiple-choice :dynamic-tags.sync="form.TYPES" :labels="typeList" :row-key="key.typeKey" :row-name="key.typeName"/>
</el-form-item>
<el-form-item v-if="remoteControl.keyOne" label="国民经济行业类型:" prop="SPECIFICATION_TYPES">
<!-- <el-form-item label="类型:" prop="TYPES">-->
<!-- <multiple-choice :dynamic-tags.sync="form.TYPES" :labels="typeList" :row-key="key.typeKey" :row-name="key.typeName"/>-->
<!-- </el-form-item>-->
<el-form-item v-if="remoteControl.keyOne && false" label="国民经济行业类型:" prop="SPECIFICATION_TYPES">
<multiple-choice
:dynamic-tags.sync="form.SPECIFICATION_TYPES"
:labels="industryTypeList"
@ -104,16 +104,16 @@ export default {
REMARKS: [{ required: true, message: '请输安全操作规程', trigger: 'change' }],
STATUS: [{ required: true, message: '请选择状态', trigger: 'change' }],
FILE: [{ required: true, message: '请选择文件', trigger: 'blur' }],
TYPES: [{
required: true,
validator: (rules, value, callback) => {
if (!value || value.length === 0 || value[0] === '') {
return callback(new Error('类型必选'))
}
return callback()
},
trigger: 'blur'
}],
// TYPES: [{
// required: true,
// validator: (rules, value, callback) => {
// if (!value || value.length === 0 || value[0] === '') {
// return callback(new Error('类型必选'))
// }
// return callback()
// },
// trigger: 'blur'
// }],
SPECIFICATION_TYPES: [{
required: true,
validator: (rules, value, callback) => {

12
src/views/threeSystems/safetyProductionResponsibilitySystem/components/list.vue
View File

@ -21,7 +21,7 @@
<el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
搜索
</el-button>
<el-button v-waves class="filter-item" type="success" icon="el-icon-magic-stick" @click="addCondition">
<el-button v-waves v-if="false" class="filter-item" type="success" icon="el-icon-magic-stick" @click="addCondition">
添加其他搜索条件
</el-button>
<el-button v-waves class="filter-item" type="success" icon="el-icon-magic-stick" @click="clearMessage">
@ -58,7 +58,7 @@
<template slot-scope="props">
<el-form label-position="left" inline>
<el-row :gutter="20">
<el-col :span="24">
<el-col v-if="false" :span="24">
<el-form-item label="国民经济行业类型:">
<div v-if="(props.row.SPECIFICATION_TYPES && props.row.SPECIFICATION_TYPES.length > 0) && ((!props.row.CATEGORY_LIST) || (!props.row.CATEGORY_LIST[0]) || (props.row.CATEGORY_LIST[0].CATEGORY_ID !== '7158f688d0f34054a28a9275139298df'))">
<el-tag
@ -94,7 +94,7 @@
<el-table-column type="index" label="序号" width="50" align="center" />
<el-table-column align="center" prop="REMARKS" label="安全生产责任制名称" />
<el-table-column align="center" prop="TYPES" label="类型" >
<el-table-column v-if="false" align="center" prop="TYPES" label="类型" >
<template slot-scope="{row}">
<el-tag
v-for="tag in row.TYPES"
@ -106,7 +106,7 @@
</el-tag>
</template>
</el-table-column>
<el-table-column v-if="false" prop="LABEL" align="center" label="标签" >
<el-table-column prop="LABEL" align="center" label="标签" >
<template slot-scope="{row}">
<el-tag
v-for="tag in row.labels"
@ -135,13 +135,13 @@
</div>
</template>
</el-table-column>
<el-table-column align="center" prop="UPLOAD_TIME" label="上传时间" width="90px"/>
<el-table-column align="center" prop="UPLOAD_TIME" label="上传时间" width="200px"/>
<el-table-column align="center" prop="STATUS" label="状态" width="80px">
<template slot-scope="{row}">
{{ row.STATUS === '0'?'停用':'正常' }}
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="true" align="center" prop="UPLOAD_USER_NAME" label="数据来源" >
<el-table-column v-if="false" :show-overflow-tooltip="true" align="center" prop="UPLOAD_USER_NAME" label="数据来源" >
<template slot-scope="{row}">
{{ !row.CORP_NAME ? '自建' : row.CORP_NAME }}
</template>

10
src/views/threeSystems/safetyProductionResponsibilitySystem/components/listEm.vue
View File

@ -21,7 +21,7 @@
<el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
搜索
</el-button>
<el-button v-waves class="filter-item" type="success" icon="el-icon-magic-stick" @click="addCondition">
<el-button v-waves v-if="false" class="filter-item" type="success" icon="el-icon-magic-stick" @click="addCondition">
添加其他搜索条件
</el-button>
<el-button v-waves class="filter-item" type="success" icon="el-icon-magic-stick" @click="clearMessage">
@ -55,7 +55,7 @@
align="center"/>
<el-table-column type="index" label="序号" width="50" align="center" />
<el-table-column align="center" prop="REMARKS" label="安全生产责任制名称" />
<el-table-column align="center" prop="TYPES" label="类型" >
<el-table-column v-if="false" align="center" prop="TYPES" label="类型" >
<template slot-scope="{row}">
<el-tag
v-for="tag in row.TYPES"
@ -80,7 +80,7 @@
</template>
</el-table-column>
<el-table-column align="center" prop="SPECIFICATION_TYPES" label="国民经济行业类型" width="300px">
<el-table-column v-if="false" align="center" prop="SPECIFICATION_TYPES" label="国民经济行业类型" width="300px">
<template slot-scope="{row}">
<div v-if="row.SPECIFICATION_TYPES && row.SPECIFICATION_TYPES.length > 0">
<el-tag
@ -97,13 +97,13 @@
</div>
</template>
</el-table-column>
<el-table-column align="center" prop="UPLOAD_TIME" label="上传时间" width="90px"/>
<el-table-column align="center" prop="UPLOAD_TIME" label="上传时间" width="200px"/>
<el-table-column align="center" prop="STATUS" label="状态" width="80px">
<template slot-scope="{row}">
{{ row.STATUS === '0'?'停用':'正常' }}
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="true" align="center" prop="UPLOAD_USER_NAME" label="数据来源" >
<el-table-column v-if="false" :show-overflow-tooltip="true" align="center" prop="UPLOAD_USER_NAME" label="数据来源" >
<template slot-scope="{row}">
{{ !row.CORP_NAME ? '自建' : row.CORP_NAME }}
</template>

6
src/views/threeSystems/safetyProductionResponsibilitySystem/components/textLibraryInfo.vue
View File

@ -4,7 +4,7 @@
<el-form-item label="安全生产责任制:" prop="FILE_NAME">
<el-input v-model="form.REMARKS" disabled style="width: 70%"/>
</el-form-item>
<el-form-item label="规程属性:" prop="FILE_NAME">
<el-form-item v-if="false" label="规程属性:" prop="FILE_NAME">
<el-tag
v-for="tag in form.CATEGORY_LIST"
:key="tag.value"
@ -13,7 +13,7 @@
{{ tag.CATEGORY_NAME }}
</el-tag>
</el-form-item>
<el-form-item label="类型:" prop="FILE_NAME">
<el-form-item v-if="false" label="类型:" prop="FILE_NAME">
<el-tag
v-for="tag in form.TYPES"
:key="tag.value"
@ -22,7 +22,7 @@
{{ tag.CATEGORY_NAME }}
</el-tag>
</el-form-item>
<el-form-item v-if="remoteControl.keyOne" label="国民经济行业类型:" prop="FILE_NAME">
<el-form-item v-if="false" label="国民经济行业类型:" prop="FILE_NAME">
<el-tag
v-for="tag in form.SPECIFICATION_TYPES"
:key="tag.value"

14
src/views/threeSystems/soLibrary/components/list.vue
View File

@ -13,7 +13,7 @@
<el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
搜索
</el-button>
<el-button v-waves class="filter-item" type="success" icon="el-icon-magic-stick" @click="addCondition">
<el-button v-waves v-if="false" class="filter-item" type="success" icon="el-icon-magic-stick" @click="addCondition">
添加其他搜索条件
</el-button>
<el-button v-waves class="filter-item" type="success" icon="el-icon-magic-stick" @click="clearMessage">
@ -46,12 +46,12 @@
<el-form label-position="left" inline>
<el-form-item label="标签">
<el-tag
v-for="tag in props.row.labels"
v-for="tag in props.row.TYPES"
:key="tag.BUS_LIBRARY_LABELS_ID"
:disable-transitions="false"
type="warning"
style="margin-right: 10px;margin-bottom: 10px">
{{ tag.NAME }}
{{ tag.CATEGORY_NAME }}
</el-tag>
</el-form-item>
<el-form-item label="国民经济行业类型">
@ -81,7 +81,7 @@
align="center"/>
<el-table-column type="index" label="序号" width="50" align="center" />
<el-table-column align="center" prop="REMARKS" label="安全操作规程名称" />
<el-table-column align="center" prop="TYPES" label="类型" >
<el-table-column v-if="false" align="center" prop="TYPES" label="类型" >
<template slot-scope="{row}">
<el-tag
v-for="tag in row.TYPES"
@ -93,7 +93,7 @@
</el-tag>
</template>
</el-table-column>
<el-table-column v-if="false" prop="LABEL" align="center" label="标签" >
<el-table-column prop="LABEL" align="center" label="标签" >
<template slot-scope="{row}">
<el-tag
v-for="tag in row.labels"
@ -131,10 +131,10 @@
<el-table-column label="操作" align="center" width="200px">
<template slot-scope="{row}">
<el-row>
<el-col :span="14">
<el-col :span="12">
<el-button v-show="!row.LOCKTOOL" type="primary" icon="el-icon-edit" size="mini" @click="handleExport(row)">导出</el-button>
</el-col>
<el-col :span="10">
<el-col :span="12">
<el-button type="primary" icon="el-icon-edit" size="mini" @click="getInformation(row)">查看</el-button>
</el-col>
</el-row>

6
src/views/threeSystems/soLibrary/components/textLibraryInfo.vue
View File

@ -4,7 +4,7 @@
<el-form-item label="安全操作规程名称:" prop="FILE_NAME">
<el-input v-model="form.REMARKS" disabled style="width: 70%"/>
</el-form-item>
<el-form-item label="规程属性:" prop="FILE_NAME">
<el-form-item v-if="false" label="规程属性:" prop="FILE_NAME">
<el-tag
v-for="tag in form.CATEGORY_LIST"
:key="tag.value"
@ -13,7 +13,7 @@
{{ tag.CATEGORY_NAME }}
</el-tag>
</el-form-item>
<el-form-item label="类型:" prop="FILE_NAME">
<el-form-item v-if="false" label="类型:" prop="FILE_NAME">
<el-tag
v-for="tag in form.TYPES"
:key="tag.value"
@ -22,7 +22,7 @@
{{ tag.CATEGORY_NAME }}
</el-tag>
</el-form-item>
<el-form-item v-if="remoteControl.keyOne" label="国民经济行业类型:" prop="FILE_NAME">
<el-form-item v-if="false" label="国民经济行业类型:" prop="FILE_NAME">
<el-tag v-for="tag in form.SPECIFICATION_TYPES" :key="tag.value" :disable-transitions="false" style="margin-right: 10px">
{{ tag.CATEGORY_NAME }}
</el-tag>

14
src/views/threeSystems/spmLibrary/components/list.vue
View File

@ -13,7 +13,7 @@
<el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
搜索
</el-button>
<el-button v-waves class="filter-item" type="success" icon="el-icon-magic-stick" @click="addCondition">
<el-button v-waves v-if="false" class="filter-item" type="success" icon="el-icon-magic-stick" @click="addCondition">
添加其他搜索条件
</el-button>
<el-button v-waves class="filter-item" type="success" icon="el-icon-magic-stick" @click="clearMessage">
@ -53,12 +53,12 @@
<el-form label-position="left" inline>
<el-form-item label="标签">
<el-tag
v-for="tag in props.row.labels"
v-for="tag in props.row.TYPES"
:key="tag.BUS_LIBRARY_LABELS_ID"
:disable-transitions="false"
type="warning"
style="margin-right: 10px;margin-bottom: 10px">
{{ tag.NAME }}
{{ tag.CATEGORY_NAME }}
</el-tag>
</el-form-item>
<el-form-item label="国民经济行业类型">
@ -82,7 +82,7 @@
</el-table-column>
<el-table-column type="index" label="序号" width="50" align="center" />
<el-table-column align="center" prop="REMARKS" label="安全生产管理制度名称" />
<el-table-column align="center" prop="TYPES" label="类型" >
<el-table-column v-if="false" align="center" prop="TYPES" label="类型" >
<template slot-scope="{row}">
<el-tag
v-for="tag in row.TYPES"
@ -94,7 +94,7 @@
</el-tag>
</template>
</el-table-column>
<el-table-column v-if="false" prop="LABEL" align="center" label="标签" >
<el-table-column prop="LABEL" align="center" label="标签" >
<template slot-scope="{row}">
<el-tag
v-for="tag in row.labels"
@ -132,10 +132,10 @@
<el-table-column label="操作" align="center" width="200px">
<template slot-scope="{row}">
<el-row>
<el-col :span="14">
<el-col :span="12">
<el-button v-show="!row.LOCKTOOL" type="primary" icon="el-icon-edit" size="mini" @click="handleExport(row)">导出</el-button>
</el-col>
<el-col :span="10">
<el-col :span="12">
<el-button type="primary" icon="el-icon-edit" size="mini" @click="getInformation(row)">查看</el-button>
</el-col>
</el-row>

6
src/views/threeSystems/spmLibrary/components/textLibraryInfo.vue
View File

@ -4,7 +4,7 @@
<el-form-item label="安全管理制度名称:" prop="FILE_NAME">
<el-input v-model="form.REMARKS" disabled style="width: 70%"/>
</el-form-item>
<el-form-item label="规程属性:" prop="FILE_NAME">
<el-form-item v-if="false" label="规程属性:" prop="FILE_NAME">
<el-tag
v-for="tag in form.CATEGORY_LIST"
:key="tag.value"
@ -13,7 +13,7 @@
{{ tag.CATEGORY_NAME }}
</el-tag>
</el-form-item>
<el-form-item label="类型:" prop="FILE_NAME">
<el-form-item v-if="false" label="类型:" prop="FILE_NAME">
<el-tag
v-for="tag in form.TYPES"
:key="tag.value"
@ -22,7 +22,7 @@
{{ tag.CATEGORY_NAME }}
</el-tag>
</el-form-item>
<el-form-item v-if="remoteControl.keyOne" label="国民经济行业类型:" prop="FILE_NAME">
<el-form-item v-if="false" label="国民经济行业类型:" prop="FILE_NAME">
<el-tag v-for="tag in form.SPECIFICATION_TYPES" :key="tag.value" :disable-transitions="false" style="margin-right: 10px">
{{ tag.CATEGORY_NAME }}
</el-tag>

14
src/views/threeSystems/sprLibrary/components/list.vue
View File

@ -13,7 +13,7 @@
<el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
搜索
</el-button>
<el-button v-waves class="filter-item" type="success" icon="el-icon-magic-stick" @click="addCondition">
<el-button v-waves v-if="false" class="filter-item" type="success" icon="el-icon-magic-stick" @click="addCondition">
添加其他搜索条件
</el-button>
<el-button v-waves class="filter-item" type="success" icon="el-icon-magic-stick" @click="clearMessage">
@ -53,12 +53,12 @@
<el-form label-position="left" inline>
<el-form-item label="标签">
<el-tag
v-for="tag in props.row.labels"
v-for="tag in props.row.TYPES"
:key="tag.BUS_LIBRARY_LABELS_ID"
:disable-transitions="false"
type="warning"
style="margin-right: 10px;margin-bottom: 10px">
{{ tag.NAME }}
{{ tag.CATEGORY_NAME }}
</el-tag>
</el-form-item>
<el-form-item label="国民经济行业类型">
@ -82,7 +82,7 @@
</el-table-column>
<el-table-column type="index" label="序号" width="50" align="center" />
<el-table-column align="center" prop="REMARKS" label="安全生产责任制名称" />
<el-table-column align="center" prop="TYPES" label="类型" >
<el-table-column v-if="false" align="center" prop="TYPES" label="类型" >
<template slot-scope="{row}">
<el-tag
v-for="tag in row.TYPES"
@ -94,7 +94,7 @@
</el-tag>
</template>
</el-table-column>
<el-table-column v-if="false" align="center" prop="LABEL" label="标签" >
<el-table-column align="center" prop="LABEL" label="标签" >
<template slot-scope="{row}">
<el-tag
v-for="tag in row.labels"
@ -132,10 +132,10 @@
<el-table-column label="操作" align="center" width="200px">
<template slot-scope="{row}">
<el-row>
<el-col :span="14">
<el-col :span="12">
<el-button v-show="!row.LOCKTOOL" type="primary" icon="el-icon-edit" size="mini" @click="handleExport(row)">导出</el-button>
</el-col>
<el-col :span="10">
<el-col :span="12">
<el-button type="primary" icon="el-icon-edit" size="mini" @click="getInformation(row)">查看</el-button>
</el-col>
</el-row>

6
src/views/threeSystems/sprLibrary/components/textLibraryInfo.vue
View File

@ -4,7 +4,7 @@
<el-form-item label="安全生产责任制名称:" prop="FILE_NAME">
<el-input v-model="form.REMARKS" disabled style="width: 70%"/>
</el-form-item>
<el-form-item label="规程属性:" prop="FILE_NAME">
<el-form-item v-if="false" label="规程属性:" prop="FILE_NAME">
<el-tag
v-for="tag in form.CATEGORY_LIST"
:key="tag.value"
@ -13,7 +13,7 @@
{{ tag.CATEGORY_NAME }}
</el-tag>
</el-form-item>
<el-form-item label="类型:" prop="FILE_NAME">
<el-form-item v-if="false" label="类型:" prop="FILE_NAME">
<el-tag
v-for="tag in form.TYPES"
:key="tag.value"
@ -22,7 +22,7 @@
{{ tag.CATEGORY_NAME }}
</el-tag>
</el-form-item>
<el-form-item v-if="remoteControl.keyOne" label="国民经济行业类型:" prop="FILE_NAME">
<el-form-item v-if="false" label="国民经济行业类型:" prop="FILE_NAME">
<el-tag v-for="tag in form.SPECIFICATION_TYPES" :key="tag.value" :disable-transitions="false" style="margin-right: 10px">
{{ tag.CATEGORY_NAME }}
</el-tag>