From aeb034cb27f113ea8608746789da9667fc248cce Mon Sep 17 00:00:00 2001
From: songwenxuan <1924103812@qq.com>
Date: Mon, 26 Feb 2024 17:47:10 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E6=9B=B9=E7=85=A4=E7=82=AD=E5=9C=B0?=
=?UTF-8?q?=E5=9B=BE=E9=A6=96=E9=A1=B5=E7=BB=9F=E8=AE=A1=E9=A1=B5=E4=B8=8E?=
=?UTF-8?q?=E6=B8=AF=E5=8A=A1=E5=B1=80=E7=9B=91=E7=AE=A1=E7=AB=AF=E6=98=BE?=
=?UTF-8?q?=E7=A4=BA=E5=86=85=E5=AE=B9=E5=90=8C=E6=AD=A5=EF=BC=8C=E5=8E=BB?=
=?UTF-8?q?=E9=99=A4=E6=B8=AF=E5=8A=A1=E5=B1=80=E7=9B=91=E7=AE=A1=E7=AB=AF?=
=?UTF-8?q?=E6=9B=B9=E5=A6=83=E7=94=B8=E6=B8=AF=E9=97=A8=E5=8F=A3=E9=97=A8?=
=?UTF-8?q?=E7=A6=81=E4=BA=BA=E5=91=98=E3=80=81=E8=BD=A6=E8=BE=86=E9=97=B8?=
=?UTF-8?q?=E6=9C=BA=E6=98=BE=E7=A4=BA=E7=9A=84id=E7=BC=96=E5=8F=B7?=
=?UTF-8?q?=E3=80=82=E4=BF=AE=E5=A4=8D=E6=B8=AF=E5=8A=A1=E5=B1=80=E7=9B=91?=
=?UTF-8?q?=E7=AE=A1=E7=AB=AF=E5=9C=B0=E5=9B=BE=E6=9B=B9=E7=85=A4=E7=82=AD?=
=?UTF-8?q?=E6=B8=AF=E4=B8=8D=E6=98=BE=E7=A4=BA=E6=B6=88=E9=98=B2=E7=AE=A1?=
=?UTF-8?q?=E6=8E=A7-=E6=B6=88=E9=98=B2=E6=95=91=E6=8F=B4=E9=98=9F?=
=?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82=E5=9B=A0=E6=9B=B9=E7=85=A4=E7=82=AD?=
=?UTF-8?q?=E6=B8=AF=E6=B2=A1=E6=9C=89=E6=B0=94=E8=B1=A1=E7=AB=99=E6=95=B0?=
=?UTF-8?q?=E6=8D=AE=EF=BC=8C=E5=8F=96=E6=B6=88=E6=B8=AF=E5=8A=A1=E5=B1=80?=
=?UTF-8?q?=E7=9B=91=E7=AE=A1=E7=AB=AF=E6=9B=B9=E7=85=A4=E7=82=AD=E6=B8=AF?=
=?UTF-8?q?=E6=B0=94=E8=B1=A1=E7=AB=99=E6=8C=89=E9=92=AE=E6=98=BE=E7=A4=BA?=
=?UTF-8?q?=EF=BC=8C=E4=BF=AE=E5=A4=8D=E5=8D=B1=E9=99=A9=E4=BD=9C=E4=B8=9A?=
=?UTF-8?q?-=E5=8F=97=E9=99=90=E7=A9=BA=E9=97=B4=E4=BD=9C=E4=B8=9A?=
=?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AF=B9=E6=8E=A5=E4=B8=A2=E5=A4=B1=E5=9D=90?=
=?UTF-8?q?=E6=A0=87=E5=AD=97=E6=AE=B5=E5=AF=BC=E8=87=B4=E5=9C=B0=E5=9B=BE?=
=?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E6=95=B0=E6=8D=AE=E7=9A=84=E9=97=AE?=
=?UTF-8?q?=E9=A2=98=E3=80=82=E5=8D=B1=E9=99=A9=E4=BD=9C=E4=B8=9A=E5=92=8C?=
=?UTF-8?q?=E9=87=8D=E7=82=B9=E5=B7=A5=E7=A8=8B=E6=95=B0=E6=8D=AE=E5=AF=B9?=
=?UTF-8?q?=E6=8E=A5=E5=AE=8C=E6=88=90=E5=90=8E=EF=BC=8C=E8=B0=83=E8=AF=95?=
=?UTF-8?q?=E6=B8=AF=E5=8A=A1=E5=B1=80=E7=9B=91=E7=AE=A1=E7=AB=AF=E5=9C=B0?=
=?UTF-8?q?=E5=9B=BE=E6=9B=B9=E7=85=A4=E7=82=AD=E6=B8=AF=E6=95=B0=E6=8D=AE?=
=?UTF-8?q?=E6=98=BE=E7=A4=BA=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/map/components/cmt_index.vue | 560 ++++++++++++++++++++++
src/views/map/dialog/index.vue | 18 +-
src/views/map/dialog/mkGateMachineCmt.vue | 2 +-
src/views/map/index.vue | 20 +-
4 files changed, 588 insertions(+), 12 deletions(-)
create mode 100644 src/views/map/components/cmt_index.vue
diff --git a/src/views/map/components/cmt_index.vue b/src/views/map/components/cmt_index.vue
new file mode 100644
index 0000000..df405cd
--- /dev/null
+++ b/src/views/map/components/cmt_index.vue
@@ -0,0 +1,560 @@
+
+
+
+
+
+
+
+
+
+
{{ item.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ item.label }}
+
+
+
+
+
+
+
+
+
+
+
{{ item.title }}
+
+
+
+ {{ item1.label }}:
+
+
+
+
+
+
+
+
+
+
+
{{ item.title }}
+
+
+
+
+ {{ item.count }}
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/map/dialog/index.vue b/src/views/map/dialog/index.vue
index 8851b63..05159b8 100644
--- a/src/views/map/dialog/index.vue
+++ b/src/views/map/dialog/index.vue
@@ -26,16 +26,16 @@
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -54,7 +54,7 @@
-
+
diff --git a/src/views/map/dialog/mkGateMachineCmt.vue b/src/views/map/dialog/mkGateMachineCmt.vue
index f28a24d..fdce7a6 100644
--- a/src/views/map/dialog/mkGateMachineCmt.vue
+++ b/src/views/map/dialog/mkGateMachineCmt.vue
@@ -2,7 +2,7 @@
diff --git a/src/views/map/index.vue b/src/views/map/index.vue
index f98c4e7..d61dd31 100644
--- a/src/views/map/index.vue
+++ b/src/views/map/index.vue
@@ -25,7 +25,7 @@
@@ -34,6 +34,11 @@
:corp-info-id="CORP_INFO_ID"
:gangkou="gangkouActive"
/>
+
0) {
if (item.label === '消防管控') {
if (e.label === '消防救援队') {
- return !(this.CORP_INFO_ID && this.CORP_INFO_ID !== '')
+ if (this.gangkouActive === '00005') {
+ return true
+ }else {
+ return !(this.CORP_INFO_ID && this.CORP_INFO_ID !== '')
+ }
}
if (e.label !== '消防救援队') {
return (this.CORP_INFO_ID && this.CORP_INFO_ID !== '')
}
}
+ if (item.label === '气象监测') {
+ if (e.label === '气象站') {
+ return this.gangkouActive !== '00005'
+ }
+ }
}
const CORP_INFO_ID = this.CORP_INFO_ID
if (e.containAuthorization.length === 0) return true
From bcd826dd048a2ac780fcf2da64cde758fd34004e Mon Sep 17 00:00:00 2001
From: liulixin
Date: Tue, 27 Feb 2024 11:30:02 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E7=BC=A9=E7=95=A5?=
=?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=B1=95=E7=A4=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/map/components/czks_index.vue | 66 ++++++++++---------------
1 file changed, 27 insertions(+), 39 deletions(-)
diff --git a/src/views/map/components/czks_index.vue b/src/views/map/components/czks_index.vue
index 020064a..b2003a7 100644
--- a/src/views/map/components/czks_index.vue
+++ b/src/views/map/components/czks_index.vue
@@ -1,19 +1,5 @@
-
-
-
-
-
{{ item.title }}
-
-
-
-
- {{ item.count }}
-
-
-
-
-
+
{{ item.title }}
@@ -55,6 +41,23 @@
+
+
+
+
+
{{ item.title }}
+
+
+
+
+ {{ item.count }}
+
+
+
+
+
+
+
@@ -138,44 +141,29 @@ export default {
],
block4OptionsList: [
{
- title: '风险指数',
+ title: '矿石作业区',
list: [
{
- label: '重大风险点数',
- count: '9'
+ label: '今日进矿石作业区车辆数',
+ count: 0
},
{
- label: '较大风险点数',
- count: '20'
- },
- {
- label: '一般风险点数',
- count: '13'
- },
- {
- label: '低风险性点数',
- count: '3'
+ label: '今日出矿石作业区车辆数',
+ count: 0
}
]
},
{
- title: '今日情况',
+ title: '杂货作业区',
list: [
- {
- label: '今日进矿石作业区车辆数',
- count: '-'
- },
- {
- label: '今日出矿石作业区车辆数',
- count: '-'
- },
+
{
label: '今日进杂货作业区车辆数',
- count: '-'
+ count: 0
},
{
label: '今日出杂货作业区车辆数',
- count: '-'
+ count: 0
}
]
}
From 68a367cbc3068cbcf450c25eff43a8e7cb5a677d Mon Sep 17 00:00:00 2001
From: liulixin
Date: Tue, 27 Feb 2024 16:56:35 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/map/components/menjinCzks.vue | 22 +++++-----------------
src/views/map/index.vue | 10 ----------
2 files changed, 5 insertions(+), 27 deletions(-)
diff --git a/src/views/map/components/menjinCzks.vue b/src/views/map/components/menjinCzks.vue
index 64aaf19..9450a2b 100644
--- a/src/views/map/components/menjinCzks.vue
+++ b/src/views/map/components/menjinCzks.vue
@@ -114,24 +114,12 @@ export default {
return {
block1OptionsList: [
{
- title: '人员闸机',
- img: require('../../../assets/map/menjin/ico1.png'),
- label1: '今日进数',
- count1: 0,
- label2: '今日出数',
- count2: 0,
- label3: '今日剩余人数',
- count3: 0
- },
- {
- title: '车辆闸机',
+ title: '车辆闸机数',
img: require('../../../assets/map/menjin/ico2.png'),
- label1: '今日进数',
- count1: 0,
- label2: '今日出数',
- count2: 0,
- label3: '今日剩余车数',
- count3: 0
+ label1: '在线数',
+ count1: 2
+ // label2: '离线数',
+ // count2: 0
},
{
title: '摄像头数',
diff --git a/src/views/map/index.vue b/src/views/map/index.vue
index f98c4e7..2aff97e 100644
--- a/src/views/map/index.vue
+++ b/src/views/map/index.vue
@@ -445,16 +445,6 @@ export default {
containAuthorization: [],
eliminateAuthorization: [],
list: [
- {
- label: '人员',
- dialog_width: '800px',
- check: false,
- img: require('../../assets/map/gangkou_index/buttom/ico1.png'),
- checkImg: require('../../assets/map/gangkou_index/buttom/ico1_on.png'),
- type: 'PERSON',
- containAuthorization: [],
- eliminateAuthorization: []
- },
{
label: '车辆',
dialog_width: '600px',
From f8af529c6e0573ebaef92ef0b4926b856da00b0d Mon Sep 17 00:00:00 2001
From: songwenxuan <1924103812@qq.com>
Date: Tue, 27 Feb 2024 17:20:54 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=89=E5=85=A8?=
=?UTF-8?q?=E7=8E=AF=E4=BF=9D=E6=A3=80=E6=9F=A5=20=E6=8C=87=E6=B4=BE?=
=?UTF-8?q?=E9=AA=8C=E6=94=B6=E9=A1=B5=E9=9D=A2=20=E7=8A=B6=E6=80=81?=
=?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/safetyenvironmental/chief/components/information.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/safetyenvironmental/chief/components/information.vue b/src/views/safetyenvironmental/chief/components/information.vue
index e9eafc5..2914ac3 100644
--- a/src/views/safetyenvironmental/chief/components/information.vue
+++ b/src/views/safetyenvironmental/chief/components/information.vue
@@ -110,7 +110,7 @@
待检查人核实
检查人核实中
待被检查人确认
- 已归档
+ 待指派
指派中
指派完成
检查待验收
From b7303e36ac87fd57942deb821ef6bedefcfd9f81 Mon Sep 17 00:00:00 2001
From: liulixin
Date: Fri, 1 Mar 2024 16:31:03 +0800
Subject: [PATCH 5/7] =?UTF-8?q?map=E4=BA=BA=E5=91=98=E5=AE=9A=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/map/dialog/index.vue | 3 +
src/views/map/dialog/peoplePositionCzks.vue | 80 +++++++++++++++++++++
src/views/map/index.vue | 12 +++-
3 files changed, 94 insertions(+), 1 deletion(-)
create mode 100644 src/views/map/dialog/peoplePositionCzks.vue
diff --git a/src/views/map/dialog/index.vue b/src/views/map/dialog/index.vue
index 8851b63..bd25c6e 100644
--- a/src/views/map/dialog/index.vue
+++ b/src/views/map/dialog/index.vue
@@ -47,6 +47,7 @@
+
@@ -95,6 +96,7 @@ import cutroadCfdD from './cutroadCfdD.vue'
import breakgroundCfdD from './breakgroundCfdD.vue'
import hoistingCfdD from './hoistingCfdD.vue'
import peoplePositionCfdD from './peoplePositionCfdD.vue'
+import peoplePositionCzks from './peoplePositionCzks.vue'
import peoplePositionCmt from './peoplePositionCmt.vue'
import carPositionCfdD from './carPositionCfdD.vue'
import peoplePositionOne from './peoplePositionOne.vue'
@@ -135,6 +137,7 @@ export default {
breakgroundCfdD,
hoistingCfdD,
MkGateMachineCfd,
+ peoplePositionCzks,
peoplePositionCfdD,
peoplePositionCmt,
carPositionCfdD,
diff --git a/src/views/map/dialog/peoplePositionCzks.vue b/src/views/map/dialog/peoplePositionCzks.vue
new file mode 100644
index 0000000..92255ff
--- /dev/null
+++ b/src/views/map/dialog/peoplePositionCzks.vue
@@ -0,0 +1,80 @@
+
+
+
+
人员信息
+
+
+
+ 照片 |
+
+ |
+ 姓名 |
+ {{ info ? info.NAME : '' }} |
+
+
+ 部门 |
+ {{ info ? info.DEPARTMENT_NAME : '' }} |
+ 岗位 |
+ {{ info ? info.POST_NAME : '' }} |
+
+
+ 人员类型 |
+ {{ info ? info.PERSON_TYPE : '' }} |
+ 是否为隐患确认人 |
+ {{ info.IS_HAZARDCONFIRMER == 0 ? '否' : '是' }} |
+
+
+
+
+
+
+
diff --git a/src/views/map/index.vue b/src/views/map/index.vue
index 2aff97e..9472b3d 100644
--- a/src/views/map/index.vue
+++ b/src/views/map/index.vue
@@ -1386,6 +1386,16 @@ export default {
id = pick.id.id
this.bubble(id)
}
+ if (this.gangkouActive === '00002' && point_type === 'peoplePositionCzks') {
+ const { label, point_type, id, corpInfoId, name, infoname } = pick.id._monitoItems.data
+ this.dialog.visible = true
+ this.dialog.title = label
+ this.dialog.type = point_type
+ this.dialog.id = id
+ this.dialog.name = name
+ this.dialog.infoname = infoname
+ this.dialog.corpInfoId = corpInfoId
+ }
if (this.gangkouActive === '00004' && point_type.indexOf('标记点') !== -1 && (point_id.substring(0, 1) === '0' || point_id.substring(0, 1) === '3' || point_id.substring(0, 3) === '1_2' || point_id.substring(0, 3) === '2_8')) {
// if (this.gangkouActive === '00004' && point_type.indexOf('标记点') !== -1 && point_id.substring(0, 1) === '0' || point_id.substring(0, 1) === '5') {
@@ -2445,7 +2455,7 @@ export default {
ry_drag.getPosition(czksPerLoc[index])
} else {
const perLoc = {
- id: item.cardId,
+ id: item.cardId + '',
name: item.realName,
idNumber: item.idNumber,
x: item.longitude,
From e72a142a73ee635bc6a588b64b344bc6ab003cd4 Mon Sep 17 00:00:00 2001
From: zhaoyu
Date: Mon, 4 Mar 2024 09:48:50 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E6=B8=AF=E8=82=A1=E5=9C=B0=E5=9B=BE?=
=?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=B2=A7=E5=B7=9E=E4=BA=BA=E5=91=98=E5=AE=9A?=
=?UTF-8?q?=E4=BD=8D=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/map/dialog/index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/map/dialog/index.vue b/src/views/map/dialog/index.vue
index 388df81..6b6097b 100644
--- a/src/views/map/dialog/index.vue
+++ b/src/views/map/dialog/index.vue
@@ -47,7 +47,7 @@
-
+
From 75c3699ef89696a8d028a34c60c196dc182c6746 Mon Sep 17 00:00:00 2001
From: songwenxuan <1924103812@qq.com>
Date: Tue, 12 Mar 2024 15:11:10 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E9=87=8D=E7=82=B9=E5=B7=A5=E7=A8=8B?=
=?UTF-8?q?=E8=A7=86=E9=A2=91=E7=9B=91=E6=8E=A7=E4=BF=A1=E6=81=AF=E7=BB=B4?=
=?UTF-8?q?=E6=8A=A4=E5=A2=9E=E5=8A=A0=E4=BC=81=E4=B8=9AID=E5=AD=97?=
=?UTF-8?q?=E6=AE=B5=E7=9A=84=E5=A2=9E=E5=88=A0=E6=94=B9=E5=92=8C=E5=AF=B9?=
=?UTF-8?q?=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../videoinfomanager/components/list.vue | 22 ++++++++++++++++++-
1 file changed, 21 insertions(+), 1 deletion(-)
diff --git a/src/views/keyprojects/videoinfomanager/components/list.vue b/src/views/keyprojects/videoinfomanager/components/list.vue
index 6652b7c..50b72ca 100644
--- a/src/views/keyprojects/videoinfomanager/components/list.vue
+++ b/src/views/keyprojects/videoinfomanager/components/list.vue
@@ -156,6 +156,13 @@
+
+
+
+
+
+
+