+
+
+
+
+
+
diff --git a/src/views/map/components/menjin_index.vue b/src/views/map/components/menjin_index.vue
new file mode 100644
index 0000000..00b8d54
--- /dev/null
+++ b/src/views/map/components/menjin_index.vue
@@ -0,0 +1,207 @@
+
+
+
+
+
+
+
+ {{ item.title }}
+
+ ![]()
+
+
+ {{ item.label1 }}：
+
+ {{ item.label2 }}：
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 卡口名称
+ {{ block3OptionsIndex===0 ? '人员':'车牌' }}
+ 时间
+ 状态
+
+
+ {{ item.DOORNAME }}
+ {{ item.NAME }}
+ {{ item.TIME.substring(11) }}
+ {{ item.STATUS }}
+
+ {{ corpInfoId }}
+ {{ area }}
+ {{ gangkou }}
+
+
+
+
+
+
diff --git a/src/views/map/components/renyuan.vue b/src/views/map/components/renyuan.vue
index 3a1e6e9..0038468 100644
--- a/src/views/map/components/renyuan.vue
+++ b/src/views/map/components/renyuan.vue
@@ -55,7 +55,7 @@
-
+
@@ -173,37 +192,59 @@ export default {
},
getData() {
requestFN(
- '/map/getAllDwMessage',
- { corpId: this.corpInfoId }
+ '/map/getAllDwMessage', { corpId: this.corpInfoId }
).then((data) => {
- 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
- }
- ]
+ // 一公司人员定位系统（我知道这里写的拉但是没办法，一天要把功能改完，后续有缘人在重构吧）
+ if (this.corpInfoId === '035958e685cf4850bc40151c5e0617a6') {
+ 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
+ }
+ ]
+ }
+ if (this.corpInfoId === '21590a00ea5e462e9ee44dd332dddc26' || this.corpInfoId === '033549ed3bd648e49c8a65eb4993ec2f' ) {
+ this.block1OptionsList = [
+ {
+ title: '总设备数',
+ img: require('../../../assets/map/renyuan/img1ico1.png'),
+ count: data.orthermessage.onlineDeviceNum
+ },
+ {
+ title: '在线人员数',
+ img: require('../../../assets/map/renyuan/img1ico1.png'),
+ count: data.orthermessage.lockNum
+ },
+ {
+ title: '离线人数',
+ img: require('../../../assets/map/renyuan/img1ico1.png'),
+ count: data.orthermessage.unLockNum
+ }
+ ]
+ this.block4List = data.orthermessage.alarmList
+ }
}).catch((e) => {
this.$message.error(e)
})
diff --git a/src/views/map/components/renyuanCmt.vue b/src/views/map/components/renyuanCmt.vue
index 138a6cf..351d6b2 100644
--- a/src/views/map/components/renyuanCmt.vue
+++ b/src/views/map/components/renyuanCmt.vue
@@ -179,22 +179,22 @@ export default {
},
methods: {
getCmtWorkCardLocationCount() {
- requestFN(
- '/map/findWorkCardLocation',
- {}
- ).then((data) => {
- this.block1OptionsList[0].count = data.onlineCount
- }).catch((e) => {
- })
+ // requestFN(
+ // '/map/findWorkCardLocation',
+ // {}
+ // ).then((data) => {
+ // this.block1OptionsList[0].count = data.onlineCount
+ // }).catch((e) => {
+ // })
},
getCmtWorkCardLocation() {
- requestFN(
- '/map/findWorkCardLocation',
- {}
- ).then((data) => {
- this.block3List = this.block3List.concat(data.list)
- }).catch((e) => {
- })
+ // requestFN(
+ // '/map/findWorkCardLocation',
+ // {}
+ // ).then((data) => {
+ // this.block3List = this.block3List.concat(data.list)
+ // }).catch((e) => {
+ // })
},
block3OptionsClick(index) {
this.currentPage = 1
diff --git a/src/views/map/dialog/index.vue b/src/views/map/dialog/index.vue
index 7ebba32..f5519d2 100644
--- a/src/views/map/dialog/index.vue
+++ b/src/views/map/dialog/index.vue
@@ -11,7 +11,16 @@
@@ -72,6 +72,25 @@
+
+
+
+
+
+
+ 报警类型
+ 报警时间
+ 触发人
+ 报警地点
+
+
+ {{ item.alarmName }}
+ {{ item.alarmTime }}
+ {{ item.foulUserName }}
+ {{ item.place }}
+
+
@@ -55,26 +55,26 @@
- 区域名称：{{ info.GATE_AREA_NAME }}
+
-
+
-
-
区域名称：{{ info.GATE_AREA_NAME }}
| 闸机名称 | {{ item.GATE_NAME }} | |||||||
| 今日进 | -{{ item.CAR_IN}} | +{{ item.CAR_IN }} | 今日出 | -{{ item.CAR_OUT}} | +{{ item.CAR_OUT }} | 当前滞留 | -{{ item.CAR_IN - item.CAR_OUT}} | +{{ item.CAR_IN - item.CAR_OUT }} |
|
-
摄像头名称：{{ info.VIDEONAME }}+摄像头名称：{{ name }}
-
@@ -166,6 +166,24 @@ export default {
default() {
return ''
}
+ },
+ code: {
+ type: String,
+ default() {
+ return ''
+ }
+ },
+ videoType: {
+ type: String,
+ default() {
+ return ''
+ }
+ },
+ name: {
+ type: String,
+ default() {
+ return ''
+ }
}
},
data() {
@@ -173,14 +191,18 @@ export default {
config: config,
info: {},
recordAllList: [],
- varList:[],
- carRecordAllList:[]
+ varList: [],
+ carRecordAllList: []
}
},
created() {
- this.getData()
- this.getListData()
+ if (this.type !== 'CAMERA') {
+ this.getData()
+ this.getListData()
+ } else {
+
+ }
},
methods: {
formatDate(date, format) {
diff --git a/src/views/map/dialog/peoplePositionYGS.vue b/src/views/map/dialog/peoplePositionYGS.vue
index 552186d..157e4e2 100644
--- a/src/views/map/dialog/peoplePositionYGS.vue
+++ b/src/views/map/dialog/peoplePositionYGS.vue
@@ -29,12 +29,12 @@
| {{ otherInfo?otherInfo.postName:'' }} | ||||||||
| 姓名 | {{ info?info.userName:'' }} | |
| 定位卡号: | {{ info?info.id:'' }} | @@ -48,6 +48,25 @@{{ info?info.departmentName:'' }} |
| 姓名 | +{{ (info && info.name) ? info.name : '未绑定人员' }} | +
| 定位卡号: | +{{ info?info.id:'' }} | +
| 定位卡电量 | +{{ info?info.battery:'' }} | +
| 公司 | +{{ info?info.corpName:'' }} | +