Merge remote-tracking branch 'origin/pet' into pet
commit
05a8219cf7
Binary file not shown.
After Width: | Height: | Size: 1.4 KiB |
Binary file not shown.
After Width: | Height: | Size: 1.5 KiB |
Binary file not shown.
After Width: | Height: | Size: 1.8 KiB |
Binary file not shown.
After Width: | Height: | Size: 1.5 KiB |
Binary file not shown.
After Width: | Height: | Size: 1.5 KiB |
|
@ -1,6 +1,6 @@
|
||||||
<template>
|
<template>
|
||||||
<div class="renyuan">
|
<div class="renyuan">
|
||||||
<div v-if="false" class="block1">
|
<div class="block1">
|
||||||
<layout-title title="定位基础信息"/>
|
<layout-title title="定位基础信息"/>
|
||||||
<div class="options">
|
<div class="options">
|
||||||
<div v-for="(item,index) in block1OptionsList" :key="index" class="option">
|
<div v-for="(item,index) in block1OptionsList" :key="index" class="option">
|
||||||
|
@ -10,7 +10,6 @@
|
||||||
<div class="info">
|
<div class="info">
|
||||||
<div class="label">{{ item.title }}</div>
|
<div class="label">{{ item.title }}</div>
|
||||||
<div class="text">{{ item.count }}</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>
|
</div>
|
||||||
|
@ -156,7 +155,13 @@ export default {
|
||||||
facount: '-'
|
facount: '-'
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
block4List: []
|
block4List: [],
|
||||||
|
message: {
|
||||||
|
onlineDeviceNum: '',
|
||||||
|
UwbBQ: '',
|
||||||
|
UwbJiZhan: '',
|
||||||
|
tklyr: ''
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
created() {
|
created() {
|
||||||
|
@ -168,10 +173,37 @@ export default {
|
||||||
},
|
},
|
||||||
getData() {
|
getData() {
|
||||||
requestFN(
|
requestFN(
|
||||||
'/map/getAlarmList',
|
'/map/getAllDwMessage',
|
||||||
{ corpId: this.corpInfoId }
|
{ corpId: this.corpInfoId }
|
||||||
).then((data) => {
|
).then((data) => {
|
||||||
this.block4List = data.list
|
this.block4List = data.alarmList.list
|
||||||
|
this.block1OptionsList = [
|
||||||
|
{
|
||||||
|
title: '在线设备数',
|
||||||
|
img: require('../../../assets/map/renyuan/ico1.png'),
|
||||||
|
count: data.orthermessage.onlineDeviceNum
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: '在线人员',
|
||||||
|
img: require('../../../assets/map/renyuan/img1ico1.png'),
|
||||||
|
count: data.orthermessage.infoList.UwbBQ.num
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: '在线基站数',
|
||||||
|
img: require('../../../assets/map/renyuan/ico3.png'),
|
||||||
|
count: data.orthermessage.infoList.UwbJiZhan.num
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: '在线摄像头数',
|
||||||
|
img: require('../../../assets/map/renyuan/ico4.png'),
|
||||||
|
count: data.orthermessage.infoList.HKcamera.num
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: '在线报警设备数',
|
||||||
|
img: require('../../../assets/map/renyuan/ico5.png'),
|
||||||
|
count: data.orthermessage.infoList.tklyr.num
|
||||||
|
}
|
||||||
|
]
|
||||||
}).catch((e) => {
|
}).catch((e) => {
|
||||||
this.$message.error(e)
|
this.$message.error(e)
|
||||||
})
|
})
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<template>
|
<template>
|
||||||
<div class="app-container print-work">
|
<div class="app-container print-work" style="width: 100%">
|
||||||
<div class="level-title">
|
<div class="level-title">
|
||||||
<h1>盲板抽堵作业许可证</h1>
|
<h1>盲板抽堵作业许可证</h1>
|
||||||
<div class="level-btns">编号:{{ info.CHECK_NO }}</div>
|
<div class="level-btns">编号:{{ info.CHECK_NO }}</div>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<template>
|
<template>
|
||||||
<div class="app-container print-work">
|
<div class="app-container print-work" style="width: 100%">
|
||||||
<div class="level-title">
|
<div class="level-title">
|
||||||
<h1>有限空间作业许可证</h1>
|
<h1>有限空间作业许可证</h1>
|
||||||
<div class="level-btns">编号:{{ info.CHECK_NO }}</div>
|
<div class="level-btns">编号:{{ info.CHECK_NO }}</div>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<template>
|
<template>
|
||||||
<div>
|
<div style="width: 100%">
|
||||||
<div class="level-title">
|
<div class="level-title">
|
||||||
<h1>临时用电作业许可证</h1>
|
<h1>临时用电作业许可证</h1>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<template>
|
<template>
|
||||||
<div class="app-container print-work">
|
<div class="app-container print-work" style="width: 100%">
|
||||||
<div class="level-title">
|
<div class="level-title">
|
||||||
<h1>高处作业许可证</h1>
|
<h1>高处作业许可证</h1>
|
||||||
<div class="level-btns">编号:{{ info.CHECK_NO }}</div>
|
<div class="level-btns">编号:{{ info.CHECK_NO }}</div>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<template>
|
<template>
|
||||||
<div class="app-container print-work">
|
<div class="app-container print-work" style="width: 100%">
|
||||||
<div class="level-title">
|
<div class="level-title">
|
||||||
<h1>吊装安全作业证</h1>
|
<h1>吊装安全作业证</h1>
|
||||||
<div class="level-btns">编号:{{ info.NUMBERING }}</div>
|
<div class="level-btns">编号:{{ info.NUMBERING }}</div>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<template>
|
<template>
|
||||||
<div class="app-container print-work">
|
<div class="app-container print-work" style="width: 100%">
|
||||||
<div class="level-title">
|
<div class="level-title">
|
||||||
<h1>动火安全作业票</h1>
|
<h1>动火安全作业票</h1>
|
||||||
<div class="level-btns">编号:{{ pd.CHECK_NO }}</div>
|
<div class="level-btns">编号:{{ pd.CHECK_NO }}</div>
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
<div class="level-title">
|
<div class="level-title">
|
||||||
<h1>人员信息</h1>
|
<h1>人员信息</h1>
|
||||||
</div>
|
</div>
|
||||||
<table class="table-ui">
|
<table v-if="false" class="table-ui">
|
||||||
<tr>
|
<tr>
|
||||||
<td class="bbg-transparent">照片</td>
|
<td class="bbg-transparent">照片</td>
|
||||||
<td ><img src="../../../assets/map/index/touxiang.png" alt="" width="50" height="50"></td>
|
<td ><img src="../../../assets/map/index/touxiang.png" alt="" width="50" height="50"></td>
|
||||||
|
@ -29,6 +29,25 @@
|
||||||
<td>{{ otherInfo?otherInfo.postName:'' }}</td>
|
<td>{{ otherInfo?otherInfo.postName:'' }}</td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
|
<table class="table-ui">
|
||||||
|
<tr>
|
||||||
|
<td class="bbg-transparent">姓名</td>
|
||||||
|
<td >{{ info?info.userName:'' }}</td>
|
||||||
|
</tr>
|
||||||
|
|
||||||
|
<tr>
|
||||||
|
<td class="bbg-transparent">定位卡号:</td>
|
||||||
|
<td >{{ info?info.id:'' }}</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="bbg-transparent">定位卡电量</td>
|
||||||
|
<td >{{ info?otherInfo.data[3].currentValBody.val:'' }}</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="bbg-transparent">部门</td>
|
||||||
|
<td>{{ info?info.departmentName:'' }}</td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
@ -69,14 +88,18 @@ export default {
|
||||||
methods: {
|
methods: {
|
||||||
getData() {
|
getData() {
|
||||||
requestFN(
|
requestFN(
|
||||||
'/map/getPersonByCardNo',
|
'/map/getLastProp',
|
||||||
{
|
{
|
||||||
CARDNO: this.id,
|
CARDNO: this.id,
|
||||||
corpId: this.corpId
|
corpId: this.corpId
|
||||||
}
|
}
|
||||||
).then((data) => {
|
).then((data) => {
|
||||||
this.info = data.info.required
|
if (data.code === 9999) {
|
||||||
this.otherInfo = data.otherInfo
|
this.$message.success(data.msg)
|
||||||
|
} else {
|
||||||
|
this.info = data.userInfo
|
||||||
|
this.otherInfo = data.statusInfo
|
||||||
|
}
|
||||||
}).catch((e) => {
|
}).catch((e) => {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
|
@ -652,6 +652,16 @@ export default {
|
||||||
eliminateAuthorization: []
|
eliminateAuthorization: []
|
||||||
}
|
}
|
||||||
// {
|
// {
|
||||||
|
// label: '摄像头',
|
||||||
|
// dialog_width: '1200px',
|
||||||
|
// check: false,
|
||||||
|
// type: 'platcamera',
|
||||||
|
// img: require('../../assets/map/gangkou_index/buttom/ico26.png'),
|
||||||
|
// checkImg: require('../../assets/map/gangkou_index/buttom/ico26_on.png'),
|
||||||
|
// containAuthorization: [],
|
||||||
|
// eliminateAuthorization: []
|
||||||
|
// }
|
||||||
|
// {
|
||||||
// label: '车辆定位',
|
// label: '车辆定位',
|
||||||
// dialog_width: '1200px',
|
// dialog_width: '1200px',
|
||||||
// check: false,
|
// check: false,
|
||||||
|
@ -1401,7 +1411,6 @@ export default {
|
||||||
// eslint-disable-next-line no-unused-vars
|
// eslint-disable-next-line no-unused-vars
|
||||||
var _this = this
|
var _this = this
|
||||||
const collection = new Cesium.CustomDataSource('clickEntityCollection')
|
const collection = new Cesium.CustomDataSource('clickEntityCollection')
|
||||||
debugger
|
|
||||||
poin.forEach(item => {
|
poin.forEach(item => {
|
||||||
if (!this.poinEntity.hasOwnProperty(item.id)) {
|
if (!this.poinEntity.hasOwnProperty(item.id)) {
|
||||||
const entity = drag.addEntity(item)
|
const entity = drag.addEntity(item)
|
||||||
|
@ -1755,7 +1764,7 @@ export default {
|
||||||
this.cfdBottomOptionsList[pindex].list[index].check = true
|
this.cfdBottomOptionsList[pindex].list[index].check = true
|
||||||
this.bottomOptionsList[pindex].list[index].check = false
|
this.bottomOptionsList[pindex].list[index].check = false
|
||||||
}
|
}
|
||||||
|
console.log('~~~~~~~~~' + urlType, pointUrl)
|
||||||
if (this.gangkouActive === '00003' && this.CORP_INFO_ID === '035958e685cf4850bc40151c5e0617a6' && urlType === 'peoplePosition') {
|
if (this.gangkouActive === '00003' && this.CORP_INFO_ID === '035958e685cf4850bc40151c5e0617a6' && urlType === 'peoplePosition') {
|
||||||
!this.connecting ? this.createConnection(this.CORP_INFO_ID) : this.doSubscribe()
|
!this.connecting ? this.createConnection(this.CORP_INFO_ID) : this.doSubscribe()
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in New Issue