From 0cdcd706bca12a8eb2a9883ff13b87fb5797d8c4 Mon Sep 17 00:00:00 2001 From: liujun Date: Tue, 2 Jul 2024 15:24:09 +0800 Subject: [PATCH 01/25] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=86=B2=E7=AA=81?= =?UTF-8?q?=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../threeSystems/lawsRegulations/components/editTextLibrary.vue | 2 +- src/views/threeSystems/lawsRegulations/components/list.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/threeSystems/lawsRegulations/components/editTextLibrary.vue b/src/views/threeSystems/lawsRegulations/components/editTextLibrary.vue index 757be5c..57990cd 100644 --- a/src/views/threeSystems/lawsRegulations/components/editTextLibrary.vue +++ b/src/views/threeSystems/lawsRegulations/components/editTextLibrary.vue @@ -326,7 +326,7 @@ export default { SPECIFICATION_TYPES: [''], CATEGORY_LIST: [''], STATUS: '', - ASSOCIATION: '0', + ASSOCIATION: '4', types: [], specification_types: [], category_list: [], diff --git a/src/views/threeSystems/lawsRegulations/components/list.vue b/src/views/threeSystems/lawsRegulations/components/list.vue index bff4c88..3b82100 100644 --- a/src/views/threeSystems/lawsRegulations/components/list.vue +++ b/src/views/threeSystems/lawsRegulations/components/list.vue @@ -288,7 +288,7 @@ export default { STATUS: this.form.STATUS, TYPE: this.form.TYPE_NAME, DATE: this.form.DATE, - TEXT_NAME: this.TEXT_NAME, + TEXT_NAME: this.form.TEXT_NAME, ASSOCIATION: '4', CORPINFO_ID: '0', MIGRATION_FLAG: '1' From 0832284f06b4f0628e9b74cd085b7a9fe67f4706 Mon Sep 17 00:00:00 2001 From: water_xu Date: Mon, 8 Jul 2024 15:35:51 +0800 Subject: [PATCH 02/25] =?UTF-8?q?=E5=AE=89=E5=85=A8=E7=8E=AF=E4=BF=9D?= =?UTF-8?q?=E6=A3=80=E6=9F=A5=E7=AE=A1=E7=90=86=20-=20=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=A3=80=E6=9F=A5=E6=83=85=E5=86=B5=E6=A8=A1?= =?UTF-8?q?=E7=B3=8A=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../safetyenvironmental/inspection/components/list.vue | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/views/safetyenvironmental/inspection/components/list.vue b/src/views/safetyenvironmental/inspection/components/list.vue index a48e9da..b5ca0b3 100644 --- a/src/views/safetyenvironmental/inspection/components/list.vue +++ b/src/views/safetyenvironmental/inspection/components/list.vue @@ -68,6 +68,11 @@ + + + + + @@ -252,7 +257,8 @@ export default { INSPECTION_TYPE: '', // 检查类型 INSPECTION_TIME: ['', ''], // 检查时间 INSPECTION_STATUS: '', // 检查状态 - INSPECTION_SUBJECT: '' // 检查题目 + INSPECTION_SUBJECT: '', // 检查题目 + INSPECTION_CASE:'' // 检查情况 }, statusList: [ { ID: '', NAME: '请选择' }, From ba3033160564bc764a964126d1ba4133bd2cb643 Mon Sep 17 00:00:00 2001 From: water_xu Date: Tue, 9 Jul 2024 08:30:52 +0800 Subject: [PATCH 03/25] =?UTF-8?q?=E9=9A=90=E6=82=A3=E6=8E=92=E6=9F=A5?= =?UTF-8?q?=E6=B2=BB=E7=90=86=E7=B3=BB=E7=BB=9F=20-=20=E4=B8=80=E8=88=AC?= =?UTF-8?q?=E9=9A=90=E6=82=A3=E7=AE=A1=E7=90=86=E6=94=AF=E6=8C=81=E6=8C=89?= =?UTF-8?q?=E6=95=B4=E6=94=B9=E9=83=A8=E9=97=A8=E6=9D=A1=E4=BB=B6=E6=90=9C?= =?UTF-8?q?=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commonly/components/companiesList.vue | 30 +++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/src/views/hidden/commonly/commonly/components/companiesList.vue b/src/views/hidden/commonly/commonly/components/companiesList.vue index 5e3bd38..c972f85 100644 --- a/src/views/hidden/commonly/commonly/components/companiesList.vue +++ b/src/views/hidden/commonly/commonly/components/companiesList.vue @@ -101,6 +101,18 @@ style="width: 100%;"/> + + + + + @@ -223,6 +235,7 @@ export default { total: 0, varList: [], treeData: [], + departmentTreeData:[], hiddenPartList: [], hiddenTypeList: [], // 隐患类型 hiddenlevelList: [ @@ -266,7 +279,8 @@ export default { HIDDENFIND_NAME: '', CORPINFO_ID: '', HIDDEN_TYPE: '', - HIDDEN_STATUS: undefined + HIDDEN_STATUS: undefined, + RECTIFICATION_DEPT:'' } } }, @@ -275,6 +289,7 @@ export default { this.getList() this.getDict() this.getHiddenReginTreeList() + this.getTreeData() }, methods: { getQuery() { @@ -294,7 +309,8 @@ export default { CONFIRM_USER: '', CORPINFO_ID: '', HIDDENFIND_NAME: '', - HIDDEN_STATUS: undefined + HIDDEN_STATUS: undefined, + RECTIFICATION_DEPT:'' } this.$refs.deptTree_Select.clearHandle() this.getQuery() @@ -331,6 +347,16 @@ export default { }).catch((e) => { }) }, + // 获得部门树 + getTreeData() { + requestFN( + '/department/listTreeCorpInfo', + {CORPINFO_ID:this.$parent.CORPINFO_ID} + ).then((data) => { + this.departmentTreeData = JSON.parse(data.zTreeNodes) + }).catch((e) => { + }) + }, getDict() { // requestFN( // '/dictionaries/listSelectTree', From b0e5a2826eb16c83ede014dcc9195c276cf50145 Mon Sep 17 00:00:00 2001 From: water_xu Date: Wed, 17 Jul 2024 19:22:44 +0800 Subject: [PATCH 04/25] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=96=B9=E6=89=80?= =?UTF-8?q?=E6=9C=89=E4=BA=BA=E5=91=98=E7=AE=A1=E7=90=86=20-=20=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=E6=8E=A8=E9=80=81=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/xgf/allPeopleList/components/list.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/xgf/allPeopleList/components/list.vue b/src/views/xgf/allPeopleList/components/list.vue index 8a8bd8f..f47f4f6 100644 --- a/src/views/xgf/allPeopleList/components/list.vue +++ b/src/views/xgf/allPeopleList/components/list.vue @@ -206,7 +206,7 @@ export default { this.form.FLOWS_TYPE = '2' if (this.form.TYPE !== '2') { this.loading = true - requestFN('/xgf/user/approveMax', this.form) + requestFN('/xgf/user/repeatPush', this.form) .then((data) => { if (data.code === '0') { this.$message.success('推送成功') From 21ac0c21dbe0ed822611a30b36544f903ad92959 Mon Sep 17 00:00:00 2001 From: water_xu Date: Wed, 31 Jul 2024 14:43:09 +0800 Subject: [PATCH 05/25] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=96=B9=E8=B5=84?= =?UTF-8?q?=E6=BA=90=E6=8A=A5=E8=A1=A8=20-=20=E6=9D=A1=E4=BB=B6=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xgf/personStrucManage/components/list.vue | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/views/xgf/personStrucManage/components/list.vue b/src/views/xgf/personStrucManage/components/list.vue index b7d519b..2f6756c 100644 --- a/src/views/xgf/personStrucManage/components/list.vue +++ b/src/views/xgf/personStrucManage/components/list.vue @@ -5,17 +5,17 @@ - + - + - + @@ -162,9 +162,9 @@ export default { return { config: config, searchParmas: { - enterpriseName: '', - groupUnit: '', - shareSuperdepart: '' + KEYWORDS: '', + CORP_TYPE_NAME: '', + MAIN_DEP: '' }, varList: [], // el-table表格的动态高度值 @@ -559,9 +559,9 @@ export default { }, goKeyReset() { this.searchParmas = { - enterpriseName: '', - groupUnit: '', - shareSuperdepart: '' + KEYWORDS: '', + CORP_TYPE_NAME: '', + MAIN_DEP: '' } this.getQuery() }, @@ -573,7 +573,7 @@ export default { this.listQuery.limit + '¤tPage=' + this.listQuery.page, - { KEYWORDS: this.KEYWORDS, ISSMALL: '2' } + { ...this.searchParmas, ISSMALL: '2', ...this.listQuery} ) .then(data => { this.loading = false From 6768b8464479e231f2cb3cc1422987f3becf00b5 Mon Sep 17 00:00:00 2001 From: water_xu Date: Wed, 31 Jul 2024 14:49:46 +0800 Subject: [PATCH 06/25] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=96=B9=E8=B5=84?= =?UTF-8?q?=E6=BA=90=E6=8A=A5=E8=A1=A8=20-=20=E6=9D=A1=E4=BB=B6=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/xgf/personStrucManage/components/list.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/xgf/personStrucManage/components/list.vue b/src/views/xgf/personStrucManage/components/list.vue index 2f6756c..3c673c5 100644 --- a/src/views/xgf/personStrucManage/components/list.vue +++ b/src/views/xgf/personStrucManage/components/list.vue @@ -8,14 +8,14 @@ - + - + - + - + From ee3ea210ea4c25463b9611e1712aea4687f50abb Mon Sep 17 00:00:00 2001 From: water_xu Date: Mon, 5 Aug 2024 15:30:24 +0800 Subject: [PATCH 07/25] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=96=B9=20-=20?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=96=B9=E5=AE=89=E5=85=A8=E5=91=8A=E7=9F=A5?= =?UTF-8?q?=E5=9F=B9=E8=AE=AD=E5=90=88=E6=A0=BC=E8=AF=81=E5=A4=B4=E5=83=8F?= =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E7=9B=AE=E5=89=8D=E5=90=8E=E7=AB=AF=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/classMessage/classMessage/components/user.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/classMessage/classMessage/components/user.vue b/src/views/classMessage/classMessage/components/user.vue index ac90c53..a9d655d 100644 --- a/src/views/classMessage/classMessage/components/user.vue +++ b/src/views/classMessage/classMessage/components/user.vue @@ -134,7 +134,7 @@ export default { }) }, getShowPicture(row) { - if (row.PHOTO && row.PHOTO !== '' && (row.PHOTO.indexOf('.jpg') >= 0 || row.PHOTO.indexOf('.png') >= 0 || row.PHOTO.indexOf('.jpeg') >= 0)) { + if (row.PHOTO && row.PHOTO != '' ) { return true } }, From bce6393a4e68569c0360dbf6beefe9ee02895c99 Mon Sep 17 00:00:00 2001 From: water_xu Date: Mon, 5 Aug 2024 15:54:56 +0800 Subject: [PATCH 08/25] revert ee3ea210ea4c25463b9611e1712aea4687f50abb MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit revert 相关方 - 相关方安全告知培训合格证头像对接目前后端格式 --- src/views/classMessage/classMessage/components/user.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/classMessage/classMessage/components/user.vue b/src/views/classMessage/classMessage/components/user.vue index a9d655d..ac90c53 100644 --- a/src/views/classMessage/classMessage/components/user.vue +++ b/src/views/classMessage/classMessage/components/user.vue @@ -134,7 +134,7 @@ export default { }) }, getShowPicture(row) { - if (row.PHOTO && row.PHOTO != '' ) { + if (row.PHOTO && row.PHOTO !== '' && (row.PHOTO.indexOf('.jpg') >= 0 || row.PHOTO.indexOf('.png') >= 0 || row.PHOTO.indexOf('.jpeg') >= 0)) { return true } }, From 19aa0aa8f055f4767cae9999eb955450c7dac3bd Mon Sep 17 00:00:00 2001 From: water_xu Date: Mon, 5 Aug 2024 16:01:10 +0800 Subject: [PATCH 09/25] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=96=B9=20-=20?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=96=B9=E5=AE=89=E5=85=A8=E5=91=8A=E7=9F=A5?= =?UTF-8?q?=E5=9F=B9=E8=AE=AD=E5=90=88=E6=A0=BC=E8=AF=81=E5=A4=B4=E5=83=8F?= =?UTF-8?q?=E5=8C=B9=E9=85=8D=E5=9B=BE=E7=89=87=E6=B5=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/classMessage/classMessage/components/user.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/classMessage/classMessage/components/user.vue b/src/views/classMessage/classMessage/components/user.vue index ac90c53..a9d655d 100644 --- a/src/views/classMessage/classMessage/components/user.vue +++ b/src/views/classMessage/classMessage/components/user.vue @@ -134,7 +134,7 @@ export default { }) }, getShowPicture(row) { - if (row.PHOTO && row.PHOTO !== '' && (row.PHOTO.indexOf('.jpg') >= 0 || row.PHOTO.indexOf('.png') >= 0 || row.PHOTO.indexOf('.jpeg') >= 0)) { + if (row.PHOTO && row.PHOTO != '' ) { return true } }, From 39ec65ad0bff68f1adf1209d05b3738004f2d430 Mon Sep 17 00:00:00 2001 From: guoyuepeng <770272267@qq.com> Date: Mon, 19 Aug 2024 16:59:24 +0800 Subject: [PATCH 10/25] =?UTF-8?q?1.=E6=9B=B9=E7=85=A4=E7=82=AD=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E5=AE=9A=E4=BD=8D=E6=9B=B4=E6=8D=A2=E5=AF=B9=E6=8E=A5?= =?UTF-8?q?=E5=8E=82=E5=95=86,=E6=B3=A8=E9=87=8A=E5=8E=9F=E6=9C=89?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/map/components/caofeidian_index.vue | 22 +++++++-------- src/views/map/components/cmt_index.vue | 20 ++++++------- src/views/map/components/czks_index.vue | 22 +++++++-------- src/views/map/components/fengongsi_index.vue | 18 ++++++------ src/views/map/components/renyuanCmt.vue | 28 +++++++++---------- 5 files changed, 55 insertions(+), 55 deletions(-) diff --git a/src/views/map/components/caofeidian_index.vue b/src/views/map/components/caofeidian_index.vue index 515cf1e..e2b3197 100644 --- a/src/views/map/components/caofeidian_index.vue +++ b/src/views/map/components/caofeidian_index.vue @@ -352,17 +352,17 @@ export default { }) }, getPersonPositioningCount() { - requestFN( - '/map/getPersonPositioningCount', - { - CORPINFO_ID: this.corpInfoId, - GANGKOU: this.gangkou - } - ).then((data) => { - this.block3OptionsList[2].count = data.perCount - this.block4OptionsList[0].list[0].count = data.perCount + 3 - this.block4OptionsList[0].list[1].count = 3 - }) + // requestFN( + // '/map/getPersonPositioningCount', + // { + // CORPINFO_ID: this.corpInfoId, + // GANGKOU: this.gangkou + // } + // ).then((data) => { + // this.block3OptionsList[2].count = data.perCount + // this.block4OptionsList[0].list[0].count = data.perCount + 3 + // this.block4OptionsList[0].list[1].count = 3 + // }) } } } diff --git a/src/views/map/components/cmt_index.vue b/src/views/map/components/cmt_index.vue index df405cd..8b9547a 100644 --- a/src/views/map/components/cmt_index.vue +++ b/src/views/map/components/cmt_index.vue @@ -327,16 +327,16 @@ export default { }) }, getPersonPositioningCount() { - requestFN( - '/map/getPersonPositioningCount', - { - CORPINFO_ID: this.corpInfoId, - GANGKOU: this.gangkou - } - ).then((data) => { - this.block3OptionsList[0].count = data.personPositioningCount[0] - this.block3OptionsList[1].count = data.personPositioningCount[1] - }) + // requestFN( + // '/map/getPersonPositioningCount', + // { + // CORPINFO_ID: this.corpInfoId, + // GANGKOU: this.gangkou + // } + // ).then((data) => { + // this.block3OptionsList[0].count = data.personPositioningCount[0] + // this.block3OptionsList[1].count = data.personPositioningCount[1] + // }) } } } diff --git a/src/views/map/components/czks_index.vue b/src/views/map/components/czks_index.vue index b2003a7..be9ce50 100644 --- a/src/views/map/components/czks_index.vue +++ b/src/views/map/components/czks_index.vue @@ -341,17 +341,17 @@ export default { }) }, getPersonPositioningCount() { - requestFN( - '/map/getPersonPositioningCount', - { - CORPINFO_ID: this.corpInfoId, - GANGKOU: this.gangkou - } - ).then((data) => { - this.block3OptionsList[0].count = data.userCount - this.block3OptionsList[1].count = data.departCount - this.block3OptionsList[2].count = data.total - }) + // requestFN( + // '/map/getPersonPositioningCount', + // { + // CORPINFO_ID: this.corpInfoId, + // GANGKOU: this.gangkou + // } + // ).then((data) => { + // this.block3OptionsList[0].count = data.userCount + // this.block3OptionsList[1].count = data.departCount + // this.block3OptionsList[2].count = data.total + // }) } } } diff --git a/src/views/map/components/fengongsi_index.vue b/src/views/map/components/fengongsi_index.vue index 5beede0..ba0078d 100644 --- a/src/views/map/components/fengongsi_index.vue +++ b/src/views/map/components/fengongsi_index.vue @@ -346,15 +346,15 @@ export default { }) }, getPersonPositioningCount() { - requestFN( - '/map/getPersonPositioningCount', - { - CORPINFO_ID: this.corpInfoId, - GANGKOU: this.gangkou - } - ).then((data) => { - this.personPositioningCount = data.personPositioningCount - }) + // requestFN( + // '/map/getPersonPositioningCount', + // { + // CORPINFO_ID: this.corpInfoId, + // GANGKOU: this.gangkou + // } + // ).then((data) => { + // this.personPositioningCount = data.personPositioningCount + // }) } } } 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 From 652a051a2d847099ae235e8b22bbeff656fc0a84 Mon Sep 17 00:00:00 2001 From: liujun Date: Thu, 5 Sep 2024 10:19:48 +0800 Subject: [PATCH 11/25] =?UTF-8?q?=E5=B0=B1=E5=85=AC=E5=8F=B8=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E5=AE=9A=E4=BD=8D=E7=B3=BB=E7=BB=9F=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/map/components/renyuan.vue | 103 ++++++++++++++------- src/views/map/dialog/peoplePositionYGS.vue | 31 ++++++- src/views/map/index.vue | 40 ++++---- src/views/map/js/ry_dragentity.js | 2 +- 4 files changed, 120 insertions(+), 56 deletions(-) diff --git a/src/views/map/components/renyuan.vue b/src/views/map/components/renyuan.vue index 3a1e6e9..4205302 100644 --- a/src/views/map/components/renyuan.vue +++ b/src/views/map/components/renyuan.vue @@ -55,7 +55,7 @@ -
+
@@ -72,6 +72,25 @@
+
+ +
+
+
+
报警类型
+
报警时间
+
触发人
+
报警地点
+
+
+
{{ item.alarmName }}
+
{{ item.alarmTime }}
+
{{ item.foulUserName }}
+
{{ item.place }}
+
+
+
+
@@ -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.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/dialog/peoplePositionYGS.vue b/src/views/map/dialog/peoplePositionYGS.vue index 552186d..c954e60 100644 --- a/src/views/map/dialog/peoplePositionYGS.vue +++ b/src/views/map/dialog/peoplePositionYGS.vue @@ -29,12 +29,12 @@ {{ otherInfo?otherInfo.postName:'' }} - + +
- @@ -48,6 +48,25 @@
姓名 {{ info?info.userName:'' }}
定位卡号: {{ info?info.id:'' }}{{ info?info.departmentName:'' }}
+ + + + + + + + + + + + + + + + + + +
姓名{{ (info && info.name) ? info.name : '未绑定人员' }}
定位卡号:{{ info?info.id:'' }}
定位卡电量{{ info?info.battery:'' }}
公司{{ info?info.corpName:'' }}
@@ -94,8 +113,12 @@ export default { corpId: this.corpId } ).then((data) => { - this.info = data.userInfo - this.otherInfo = data.statusInfo + if (data.code === 9999) { + this.$message.success(data.msg) + } else { + this.info = data.userInfo + this.otherInfo = data.statusInfo + } }).catch((e) => { }) } diff --git a/src/views/map/index.vue b/src/views/map/index.vue index 5f017d6..efbc8b6 100644 --- a/src/views/map/index.vue +++ b/src/views/map/index.vue @@ -226,13 +226,13 @@ enter-active-class="animate__animated animate__fadeInDown" leave-active-class="animate__animated animate__fadeOutUp" > -
- - - - 搜索 - 重置 -
+
+ + + + 搜索 + 重置 +
@@ -925,7 +925,7 @@ export default { RyPostName: '', RyRealName: '', personTypeName: '', - GATE_VIDEO_ID:'' + GATE_VIDEO_ID: '' }, /* 曹妃甸使用参数开始*/ // 人员定位 @@ -1215,8 +1215,8 @@ export default { VIIDPort: '8088' }, trajectoryEntityCollection: {}, - isPeopleTrajectory:false, - peopleTrajectoryValue:'' + isPeopleTrajectory: false, + peopleTrajectoryValue: '' } }, mounted() { @@ -2121,7 +2121,7 @@ export default { } this.carLocArr = [] } - if(urlType === 'peopleTrajectory'){ + if (urlType === 'peopleTrajectory'){ this.isPeopleTrajectory = false } if (this.gangkouActive === '00003' && this.CORP_INFO_ID === '035958e685cf4850bc40151c5e0617a6' && urlType === 'peoplePosition') { @@ -2129,8 +2129,8 @@ export default { this.clearMqttPoint('+/UwbBQ/') this.removeTrajectory() for (let i = 0; i < this.bottomOptionsList[pindex].list.length; i++) { - if(this.bottomOptionsList[pindex].list[i].type === 'peopleTrajectory'){ - if(this.bottomOptionsList[pindex].list[i].check){ + if (this.bottomOptionsList[pindex].list[i].type === 'peopleTrajectory') { + if (this.bottomOptionsList[pindex].list[i].check) { this.bottomOptionsList[pindex].list[i].check = false this.isPeopleTrajectory = false break @@ -2154,7 +2154,7 @@ export default { } }) } else { - if(urlType === 'peopleTrajectory'){ + if (urlType === 'peopleTrajectory') { let flag = false for (let i = 0; i < this.bottomOptionsList[pindex].list.length; i++) { if(this.bottomOptionsList[pindex].list[i].type === 'peoplePosition'){ @@ -2164,10 +2164,10 @@ export default { } } } - if(flag){ + if (flag) { this.$message.warning('请先选择人员定位！！！') return - }else{ + } else { this.isPeopleTrajectory = true } } @@ -2652,8 +2652,7 @@ export default { personTypeName: item.personTypeName, data_id: item.cardId + '', point_type: 'peoplePositionCzks', - label: item.realName, - + label: item.realName } czksPerLoc.push(perLoc) ry_drag.addEntity(perLoc) @@ -2942,14 +2941,14 @@ export default { _this.fwebsocket = new WebSocket(encodeURI(wsUrl)) _this.fwebsocket.onmessage = function(message) { console.info('接收消息') - const peopleList = JSON.parse(message.data).data.data + const peopleList = JSON.parse(message.data) console.log(peopleList) for (let i = 0; i < peopleList.length; i++) { const item = peopleList[i] if ((!item)) continue // 将地图上剩余的点与最新的定位人员点进行对比 更新地图上已存在的点 新增地图上之前没有的点 const index = _this.onePerLocArr.findIndex(item1 => { - return item1.id.toString() === item.id.toString() + return item1.id === item.id }) const x = item.lon const y = item.lat @@ -2962,6 +2961,7 @@ export default { } else { const perLoc = { id: item.id, + name: item.name, x: x, y: y, icon_type: 'img4_0' + pointColor, diff --git a/src/views/map/js/ry_dragentity.js b/src/views/map/js/ry_dragentity.js index 3a65fbb..82c02e8 100644 --- a/src/views/map/js/ry_dragentity.js +++ b/src/views/map/js/ry_dragentity.js @@ -31,7 +31,7 @@ export default class DragEntity { disableDepthTestDistance: Number.POSITIVE_INFINITY }, label: { - text: point.id, + text: point.name ? point.name : point.id, font: '13px sans-serif', pixelOffset: new Cesium.Cartesian2(0, -55), showBackground: true, From bd2a4144d2a9926af7283c5907f06711446f8f18 Mon Sep 17 00:00:00 2001 From: fangjiakai <450850793@qq.com> Date: Thu, 5 Sep 2024 10:26:34 +0800 Subject: [PATCH 12/25] =?UTF-8?q?=E6=B5=B7=E5=BA=B7=E5=8F=A3=E9=97=A8?= =?UTF-8?q?=E9=97=A8=E7=A6=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/map/100.png | Bin 0 -> 5324 bytes src/assets/images/map/50.png | Bin 0 -> 3265 bytes src/assets/images/map/c.png | Bin 0 -> 1562 bytes src/assets/images/map/h.png | Bin 0 -> 1491 bytes src/assets/images/map/hh.png | Bin 0 -> 1557 bytes src/assets/images/map/jc.png | Bin 0 -> 1921 bytes src/assets/images/map/l.png | Bin 0 -> 1542 bytes src/assets/images/map/ls.png | Bin 0 -> 1568 bytes src/views/door/platformVideo/index.vue | 535 ++++++++++++++++ .../area/components/EditDevice.vue | 278 +++++++++ .../gatemachine/area/components/edit.vue | 275 +++++++++ .../gatemachine/area/components/infoList.vue | 205 +++++++ .../gatemachine/area/components/list.vue | 356 +++++++++++ .../area/components/listDevice.vue | 295 +++++++++ src/views/gatemachine/area/index.vue | 37 ++ .../gateDoor/components/EditDevice.vue | 295 +++++++++ .../gateDoor/components/EditPath.vue | 204 ++++++ .../gateDoor/components/ListDevice.vue | 307 ++++++++++ .../gatemachine/gateDoor/components/edit.vue | 340 ++++++++++ .../gateDoor/components/infoList.vue | 208 +++++++ .../gatemachine/gateDoor/components/list.vue | 284 +++++++++ .../gateDoor/components/listPath.vue | 297 +++++++++ .../gateDoor/components/platformvideo.vue | 179 ++++++ .../gateDoor/components/videoList.vue | 579 ++++++++++++++++++ src/views/gatemachine/gateDoor/index.vue | 47 ++ 25 files changed, 4721 insertions(+) create mode 100644 src/assets/images/map/100.png create mode 100644 src/assets/images/map/50.png create mode 100644 src/assets/images/map/c.png create mode 100644 src/assets/images/map/h.png create mode 100644 src/assets/images/map/hh.png create mode 100644 src/assets/images/map/jc.png create mode 100644 src/assets/images/map/l.png create mode 100644 src/assets/images/map/ls.png create mode 100644 src/views/door/platformVideo/index.vue create mode 100644 src/views/gatemachine/area/components/EditDevice.vue create mode 100644 src/views/gatemachine/area/components/edit.vue create mode 100644 src/views/gatemachine/area/components/infoList.vue create mode 100644 src/views/gatemachine/area/components/list.vue create mode 100644 src/views/gatemachine/area/components/listDevice.vue create mode 100644 src/views/gatemachine/area/index.vue create mode 100644 src/views/gatemachine/gateDoor/components/EditDevice.vue create mode 100644 src/views/gatemachine/gateDoor/components/EditPath.vue create mode 100644 src/views/gatemachine/gateDoor/components/ListDevice.vue create mode 100644 src/views/gatemachine/gateDoor/components/edit.vue create mode 100644 src/views/gatemachine/gateDoor/components/infoList.vue create mode 100644 src/views/gatemachine/gateDoor/components/list.vue create mode 100644 src/views/gatemachine/gateDoor/components/listPath.vue create mode 100644 src/views/gatemachine/gateDoor/components/platformvideo.vue create mode 100644 src/views/gatemachine/gateDoor/components/videoList.vue create mode 100644 src/views/gatemachine/gateDoor/index.vue diff --git a/src/assets/images/map/100.png b/src/assets/images/map/100.png new file mode 100644 index 0000000000000000000000000000000000000000..2639bbaba51cf943192eb22c91a700a6561f3303 GIT binary patch literal 5324 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 N8tIwoKGVJ$@-OX_h8q9? literal 0 HcmV?d00001 diff --git a/src/assets/images/map/50.png b/src/assets/images/map/50.png new file mode 100644 index 0000000000000000000000000000000000000000..e67c5d0f1f3e8d92891a685be738a3fb0f6c137e GIT binary patch literal 3265 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 literal 0 HcmV?d00001 diff --git a/src/assets/images/map/h.png b/src/assets/images/map/h.png new file mode 100644 index 0000000000000000000000000000000000000000..31cec4a4f8d93446bbc76b3a2b5021143e38e523 GIT binary patch literal 1491 zcmeAS@N?(olHy`uVBq!ia0vp^;y^6P!3HF6DQvv};*_{XlmzFem6RtIr7}3CY?O))XmO*Ar1(=|&rOfoV}vM^0aN`aY!O~0eDi?fr7i?gYtvzwuz ztCORFv5}*po2#RVo0+4tvlC3OXI^nhVqS78%|UUo?>$}CGwaVyHtRR9OFRVEe(5a)S_ z{uFWpPao(geNak4N;xngU~&X8;rRf_f#;;uJYe=I0_GE)K(R&!2F7omE{-7;x0X!v z)o=+EIeuPNp0n3*iVn}jH99&QKtOS+hUerUF)^_)v1?*VH~qwNR3^`Qqrv@2kh@yd z?93iR;}hXCPky$)S8M9~{p{?@_gB_`ez*JipXYn3{g(^wS|=R6WMN~`8D_SF0x#Hm z5AaWVz&WRZxqzi^v#`6#+xyce-Kugt;eF+$Xw#~V8qBH+&LPKZ65jh>e}1ns??aVX z%<5IAw|W*x2`t(ydgyCJh)3dPskqO-&E6=l0mC za<$LZA&-2Y>K#q3b5PZb$(qe{irY6WrfWH`cyMQY-A<9|Kf|>?epo%n*w6Rbd(ET4 zE-QPwl`9p!4!m7`#IQR<`Q3)9ncLa+txY?fHAmxDY?O))XmO*Ar1(=|&rOfoV}vM^0aN`aY!O~0j?qoJXjxv8n6vzwuz ztCN$tvyp|Pk%6h9qm!|TxgkuiXI^nhVqS78%|UUo?>$}CGwaVyHtRR9OFRVEe(5a)S_ z{uFWpPao(geNak4N;xngU~&X8;rRf_f#;;uJYe=I0_KxX`nlB%3``cDE{-7;x0Xz` z&A5^vaeV$0p}^mjy&O%tTa?OPK3Kp91hHDJO?pbp6)b?j(!yHAHKscvwyT2U(UPX- z0Nv68eX&1#b|3Su`et_|?$fdV!uOn{?!PuYDgW<@?#1nW$yZWyfH^Y6a5+<_CBTk`Y!_>wkWEiL?Wnm=D~ zJ=X`PnwNneKgsvY8%|A_%D3SDj~SVZezMrzd3ayACweJo2Q07IU&nK{SnEe?jn{{1DSs+O|G4-cdfVZBY<|eW_U|)pJ}|0t zVLk7b*062wp2Y?1@*Zki_kPG;zv6-S*=Z+O^0ztt*u)hV^M5X{-sAb24}VOF-MQt+ ztsM3zS6oETKG&*XuG0)xz mjB3O-|2q&q^TWDd>IWFwQm)l7aB(Mr3TjVRKbLh*2~7aaicp0B literal 0 HcmV?d00001 diff --git a/src/assets/images/map/jc.png b/src/assets/images/map/jc.png new file mode 100644 index 0000000000000000000000000000000000000000..38bbc8f1ac8ba295d0c6e5e127f7c3960da3cfa6 GIT binary patch literal 1921 zcmbVNX;c$e6b>L@L2+l%RL9X;pd>R1Sx6*O%z#7*A_-fy$|N&^0LjG3Kmuw-+z>1( zB8Ao#P1R#cckc3^ba-@DDH>P<0Yc0V+IRtCxTe57&Z#7L$O{ zd^s#PNbv-1NIHot(!-SM^dz+i0|RCO{$?>9K!;N(VAdt;jbgI|9EdBX*Vb(a1O{BF zBnkMMRE#_vkP;*g2-q-74Z~bOC}ML2Jf5GQ55R@FFa!%B4$R_m#jrrk_XP$okj_S8 z8gT>?JeZ5NBwzwX8N?7|GMU&WUp7I;LmZJv1i@U0%Vp6XEMuCULd`6_aoSJ>1UITl zt%1@KdcYbHRS_wa1f-e1K7!65m%jp$6E*;f9Y|Oki&&B)E5}Pu7q~$bLUVz8C zW_Vq-P0yWU7_At;-hwc1Osz}~eKKW)n^@^0NT$N#hA{cJJeBN>FT9oqPo~;j0{niw@tzhDZ`Czx3sc;Lw&DDMBH)~fPGB-aU zC;33UQoAo7jA$5jw3ae34zrg}Z>_ zW1T z>03@suNpSyzV_Ak>^sQ@PJ6>b+x{m=`(KX~4s+_JCblJ3?slG5;+@O1Gdxqyf4n?D z=1J(-Nw9;<$^6|rk9hJc_)Xnj%T#moy+#Gd3~?*&eY7G&U2;aUucr3Ai^NZGH*Ygf zoY|^p^)T8O#ZiS`CDoG+m(vnj3P%M?TWmQyGOoJe&lWJDx~DnS-St?5b9`e)=%HKG zk(r$h*^V3^i@bI9#-EJE&ie`$#xVC*Z>X7)Z#lcMw~WnnVl2)+(RI0KAK3abtJ94L zuioLWf7o01?U}I`_aCe;l{;U*W%6)YG>P%6Tcpr_g|hv6cu$G%wicI1t!z7DUwMb< zGNZEn=nC?WuCil!p5gMlmO||d!6y+=nuC4+2+eX{h*O>^0qBlB@+wb3-SdA?Tza&= zaK>DWSycx;YfDu$6*-HV)JMBBOd&?@mdMjt@kPTQ9qhMb9hl$QvuW2XM4hpjqUB75nr^fIeS+?V^H&F(rU5fe#gA9*}40Ba_W*2 g$JrD|zI+d6*q<~njK0KY?O))XmO*Ar1(=|&rOfoV}vM^0aN`aY!O~0dofrXi)o3W{*vzwuz ztCOXnlZmT|p@Es1xwDytkt0m6XI^nhVqS78%|UUo?>$}CGwaVyHtRR9OFRVEe(5a)S_ z{uFWpPao(geNak4N;xngU~&X8;rRf_f#;;uJYe=I0_KybYb&QPFfeI)x;TbZ+*&f# z)GU$ATOx0!|!_4Xv&dLd33VIxV^(Cw8l& zf@6{%W4DK$fvbl!$1RuhpKU~Y=lw36{C{`sN1OD!yYJfnxp8xE<^Q?0`OoG~2ohSI zzG|vg2z%Q>4hg1m2k9Hk(GQG&FxWLFRX$k%@$aQj^{s3UUfGLU?x}d}_Eb@FP@W`q zH|b5XS44Z!8M{UEXIOL9tq2QWxjaEvO1v{-`GOOFp{)@;L6miS@qdc{8ewp$V^Q)F0|7v~Sy~u9KPGR}*neC@fwl;5C zP;DWzQ043;)x}2t^X9i0mp{H9`YiLeLz~g|IX_gF?wq;2=E9W%uQj!&5_haIvS%|+ zGrRGMSN)x>#n)H5?|XD|Z~xCaV>&JM-LzXDzLfTMhyTBI=IXYp@_(y8g;sC9!}=ue z=!uZ;Ov%xUCQNxYEA;aDNc~=()HTlg?=pU#8)W4+RsEWB-|ByRHYj$#JGf)fBFB&$ zQ~rGa#`7fGFuj&#^07WE+jr|`F|3}q_n7+9{4+93&u`P)|KQDf7r{)y!`rW$8SUSE z@TKAAEp>4T`;us*th`5s>ks?UX3M|F{x+Y=6~8iPD(m-+Z})w?s=H(T bKW+ntS>Lu6oKKXp1eMI5u6{1-oD!Mt%2YP= zJl))OyZJE?<-^ap+t70=9-^Q!jyb=kclf~s>eML{*m>g4&!tG+{_y-`xl8iCZ=T=t z{GQ+QJXw>Mn;kVWb|e4*QPv!bU4F;N_r%Co<>zH^|Jl$+%5+H%-Xj&0A_Jt+yqf{7 zK5`*rXGnTUVH=YQ0K@&P(T5U( zfh=u;=HfQgCS)-AY)*;DI7)JzREd`|(vW#Nm>M8t2R=q3!GN!T^AiCRH0YO**P&ws z0tZbbuL*ia%4N#~GkB2!bt)95P!t38MwMEp)fx=RAckTng6a`93S$_7>Ihr|4qcEO zO{6`9-I6sFOWv8Fd`S`r1Su{qRuyYhytoii8;wQ;#SjdGWeeE9gpTB0gUzuR&|SWM}@R@j`3A zbBVwpcE-;aiIiLqPeK?hYxnX%Aw!uBF-v6SqL2j^o+|P&oMg3_Ao+`mW@$o)(gs?M z(Xif#yJ3db;xLKf9#}`I-5BmR;Ix|#`*{&wtJB~b6gS{$7L8h+nQp|>HR(nprZea< ztu{*+##%YQL~;}pj?K!khp_sWVu=iqAthdP@_a$K3-a=LiTCI80*GNM6ik}Sax`D; zSB7fzEM*HLvWpoyOXPjvpvVOK0s9%QC2Sq(LX=uP5Em z5T5?O;vq6AB-APY>74M9+>W8;^Er?=&nJoD%#vGE+qG+y&T}4R@IrIiq`0`adE;xUXMP1nDin%b#c4(DYOk^u%p5(U&>_73 zs9MomRvme&d_X)@H*b2$nx}773Oo3U8@*#nx7_b-yub1Ova5ADkC#`uTGmI!+J_wh z=C3@{oZXeNN5MBw?$YkUj=JJcD981TK1^(GQz>sJ+jhP?Baty!O`XVt8a79;(s*5Wk}-A-(CIH%d8O_lXfIp zYiCFArdFINd)V-Sq9XFi_VXgu+~E82_>RaA*+ZV>`kPwA;c>_IuJ19G>cttU4SQDv zS4H+V&8qxqabkT+*RKijO}qA8ub~R&76xq*+((KU$I{W}t9@O;tDS}LGAM99ZfR*s zhj(n{{x3Qj5A>8OA`TQqMYD4Pr!5CR&(QVO(D(}5{ubid +
+ + + + + + + + + + + 搜索 + + + 重置 + + + + + + + + + + + + + + + + + + +
+
+ +
+ + +
+
+ 取 消 +
+ + + + + + + + + + +
+ + +
+ 经度： + + 纬度： + + 取 消 + 确 定 +
+ + + + + + + + + + + + + + + +
+ 返 回 +
+ + +
+ + + diff --git a/src/views/gatemachine/area/components/EditDevice.vue b/src/views/gatemachine/area/components/EditDevice.vue new file mode 100644 index 0000000..ef26556 --- /dev/null +++ b/src/views/gatemachine/area/components/EditDevice.vue @@ -0,0 +1,278 @@ + + + + + diff --git a/src/views/gatemachine/area/components/edit.vue b/src/views/gatemachine/area/components/edit.vue new file mode 100644 index 0000000..b37c4e5 --- /dev/null +++ b/src/views/gatemachine/area/components/edit.vue @@ -0,0 +1,275 @@ + + + + + diff --git a/src/views/gatemachine/area/components/infoList.vue b/src/views/gatemachine/area/components/infoList.vue new file mode 100644 index 0000000..fb0f533 --- /dev/null +++ b/src/views/gatemachine/area/components/infoList.vue @@ -0,0 +1,205 @@ + + + + + diff --git a/src/views/gatemachine/area/components/list.vue b/src/views/gatemachine/area/components/list.vue new file mode 100644 index 0000000..30c1a09 --- /dev/null +++ b/src/views/gatemachine/area/components/list.vue @@ -0,0 +1,356 @@ + + + + + diff --git a/src/views/gatemachine/area/components/listDevice.vue b/src/views/gatemachine/area/components/listDevice.vue new file mode 100644 index 0000000..cd94605 --- /dev/null +++ b/src/views/gatemachine/area/components/listDevice.vue @@ -0,0 +1,295 @@ + + + + + diff --git a/src/views/gatemachine/area/index.vue b/src/views/gatemachine/area/index.vue new file mode 100644 index 0000000..ac842eb --- /dev/null +++ b/src/views/gatemachine/area/index.vue @@ -0,0 +1,37 @@ + + + + + + diff --git a/src/views/gatemachine/gateDoor/components/EditDevice.vue b/src/views/gatemachine/gateDoor/components/EditDevice.vue new file mode 100644 index 0000000..474442a --- /dev/null +++ b/src/views/gatemachine/gateDoor/components/EditDevice.vue @@ -0,0 +1,295 @@ + + + + + diff --git a/src/views/gatemachine/gateDoor/components/EditPath.vue b/src/views/gatemachine/gateDoor/components/EditPath.vue new file mode 100644 index 0000000..d6854c6 --- /dev/null +++ b/src/views/gatemachine/gateDoor/components/EditPath.vue @@ -0,0 +1,204 @@ + + + + + diff --git a/src/views/gatemachine/gateDoor/components/ListDevice.vue b/src/views/gatemachine/gateDoor/components/ListDevice.vue new file mode 100644 index 0000000..74d6703 --- /dev/null +++ b/src/views/gatemachine/gateDoor/components/ListDevice.vue @@ -0,0 +1,307 @@ + + + + + diff --git a/src/views/gatemachine/gateDoor/components/edit.vue b/src/views/gatemachine/gateDoor/components/edit.vue new file mode 100644 index 0000000..e3f3c09 --- /dev/null +++ b/src/views/gatemachine/gateDoor/components/edit.vue @@ -0,0 +1,340 @@ + + + + + diff --git a/src/views/gatemachine/gateDoor/components/infoList.vue b/src/views/gatemachine/gateDoor/components/infoList.vue new file mode 100644 index 0000000..25b411f --- /dev/null +++ b/src/views/gatemachine/gateDoor/components/infoList.vue @@ -0,0 +1,208 @@ + + + + + diff --git a/src/views/gatemachine/gateDoor/components/list.vue b/src/views/gatemachine/gateDoor/components/list.vue new file mode 100644 index 0000000..6fde6db --- /dev/null +++ b/src/views/gatemachine/gateDoor/components/list.vue @@ -0,0 +1,284 @@ + + + + + diff --git a/src/views/gatemachine/gateDoor/components/listPath.vue b/src/views/gatemachine/gateDoor/components/listPath.vue new file mode 100644 index 0000000..ebf4ee4 --- /dev/null +++ b/src/views/gatemachine/gateDoor/components/listPath.vue @@ -0,0 +1,297 @@ + + + + + diff --git a/src/views/gatemachine/gateDoor/components/platformvideo.vue b/src/views/gatemachine/gateDoor/components/platformvideo.vue new file mode 100644 index 0000000..6f442f4 --- /dev/null +++ b/src/views/gatemachine/gateDoor/components/platformvideo.vue @@ -0,0 +1,179 @@ + + + diff --git a/src/views/gatemachine/gateDoor/components/videoList.vue b/src/views/gatemachine/gateDoor/components/videoList.vue new file mode 100644 index 0000000..93ab6ac --- /dev/null +++ b/src/views/gatemachine/gateDoor/components/videoList.vue @@ -0,0 +1,579 @@ +