From 4c6d4b7709626fc172d02c6651e1460577a1b397 Mon Sep 17 00:00:00 2001 From: guoyuepeng <770272267@qq.com> Date: Tue, 12 Nov 2024 10:50:48 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=8F=A3=E9=97=A8=E9=97=A8?= =?UTF-8?q?=E7=A6=81=E7=B3=BB=E7=BB=9F=E7=9A=84=E8=8F=9C=E5=8D=95=202.?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5=E7=9A=84=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E5=AE=9A=E4=BD=8D=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../area/components/EditDevice.vue | 0 .../{ => second}/area/components/edit.vue | 0 .../{ => second}/area/components/infoList.vue | 0 .../{ => second}/area/components/list.vue | 0 .../area/components/listDevice.vue | 0 .../gatemachine/{ => second}/area/index.vue | 0 .../gateDoor/components/EditDevice.vue | 0 .../gateDoor/components/EditPath.vue | 0 .../gateDoor/components/ListDevice.vue | 0 .../{ => second}/gateDoor/components/edit.vue | 4 ++-- .../gateDoor/components/infoList.vue | 0 .../{ => second}/gateDoor/components/list.vue | 3 ++- .../gateDoor/components/listPath.vue | 0 .../gateDoor/components/platformvideo.vue | 0 .../gateDoor/components/videoList.vue | 2 +- .../{ => second}/gateDoor/index.vue | 0 src/views/gatemachine/second/index.vue | 3 +++ src/views/map/components/fengongsi_index.vue | 23 ++++++++++--------- 18 files changed, 20 insertions(+), 15 deletions(-) rename src/views/gatemachine/{ => second}/area/components/EditDevice.vue (100%) rename src/views/gatemachine/{ => second}/area/components/edit.vue (100%) rename src/views/gatemachine/{ => second}/area/components/infoList.vue (100%) rename src/views/gatemachine/{ => second}/area/components/list.vue (100%) rename src/views/gatemachine/{ => second}/area/components/listDevice.vue (100%) rename src/views/gatemachine/{ => second}/area/index.vue (100%) rename src/views/gatemachine/{ => second}/gateDoor/components/EditDevice.vue (100%) rename src/views/gatemachine/{ => second}/gateDoor/components/EditPath.vue (100%) rename src/views/gatemachine/{ => second}/gateDoor/components/ListDevice.vue (100%) rename src/views/gatemachine/{ => second}/gateDoor/components/edit.vue (98%) rename src/views/gatemachine/{ => second}/gateDoor/components/infoList.vue (100%) rename src/views/gatemachine/{ => second}/gateDoor/components/list.vue (99%) rename src/views/gatemachine/{ => second}/gateDoor/components/listPath.vue (100%) rename src/views/gatemachine/{ => second}/gateDoor/components/platformvideo.vue (100%) rename src/views/gatemachine/{ => second}/gateDoor/components/videoList.vue (99%) rename src/views/gatemachine/{ => second}/gateDoor/index.vue (100%) create mode 100644 src/views/gatemachine/second/index.vue diff --git a/src/views/gatemachine/area/components/EditDevice.vue b/src/views/gatemachine/second/area/components/EditDevice.vue similarity index 100% rename from src/views/gatemachine/area/components/EditDevice.vue rename to src/views/gatemachine/second/area/components/EditDevice.vue diff --git a/src/views/gatemachine/area/components/edit.vue b/src/views/gatemachine/second/area/components/edit.vue similarity index 100% rename from src/views/gatemachine/area/components/edit.vue rename to src/views/gatemachine/second/area/components/edit.vue diff --git a/src/views/gatemachine/area/components/infoList.vue b/src/views/gatemachine/second/area/components/infoList.vue similarity index 100% rename from src/views/gatemachine/area/components/infoList.vue rename to src/views/gatemachine/second/area/components/infoList.vue diff --git a/src/views/gatemachine/area/components/list.vue b/src/views/gatemachine/second/area/components/list.vue similarity index 100% rename from src/views/gatemachine/area/components/list.vue rename to src/views/gatemachine/second/area/components/list.vue diff --git a/src/views/gatemachine/area/components/listDevice.vue b/src/views/gatemachine/second/area/components/listDevice.vue similarity index 100% rename from src/views/gatemachine/area/components/listDevice.vue rename to src/views/gatemachine/second/area/components/listDevice.vue diff --git a/src/views/gatemachine/area/index.vue b/src/views/gatemachine/second/area/index.vue similarity index 100% rename from src/views/gatemachine/area/index.vue rename to src/views/gatemachine/second/area/index.vue diff --git a/src/views/gatemachine/gateDoor/components/EditDevice.vue b/src/views/gatemachine/second/gateDoor/components/EditDevice.vue similarity index 100% rename from src/views/gatemachine/gateDoor/components/EditDevice.vue rename to src/views/gatemachine/second/gateDoor/components/EditDevice.vue diff --git a/src/views/gatemachine/gateDoor/components/EditPath.vue b/src/views/gatemachine/second/gateDoor/components/EditPath.vue similarity index 100% rename from src/views/gatemachine/gateDoor/components/EditPath.vue rename to src/views/gatemachine/second/gateDoor/components/EditPath.vue diff --git a/src/views/gatemachine/gateDoor/components/ListDevice.vue b/src/views/gatemachine/second/gateDoor/components/ListDevice.vue similarity index 100% rename from src/views/gatemachine/gateDoor/components/ListDevice.vue rename to src/views/gatemachine/second/gateDoor/components/ListDevice.vue diff --git a/src/views/gatemachine/gateDoor/components/edit.vue b/src/views/gatemachine/second/gateDoor/components/edit.vue similarity index 98% rename from src/views/gatemachine/gateDoor/components/edit.vue rename to src/views/gatemachine/second/gateDoor/components/edit.vue index e3f3c09..6f1a96d 100644 --- a/src/views/gatemachine/gateDoor/components/edit.vue +++ b/src/views/gatemachine/second/gateDoor/components/edit.vue @@ -77,14 +77,14 @@ import Pagination from '@/components/Pagination' // 通过 el-pagination二次 import { requestFN } from '@/utils/request' import SelectTree from '@/components/SelectTree' import waves from '@/directive/waves' -import TiandiMap from '../../../../components/TianMap/TiandiMap' +import TiandiMap from '../../../../../components/TianMap/TiandiMap' let viewer = null const Cesium = window.Cesium Cesium.Ion.defaultAccessToken = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJkOWQ0MGYwMy0yODUwLTQ1YzktOGM4OC02MTMwY2UyZjNlMzQiLCJpZCI6MTY0NTUwLCJpYXQiOjE2OTM4OTU1Mjd9.1cC0sSzyj79LZv0ILNCcl0Mabw6hl8TNngFNFr7H8f4' var subdomains = ['0', '1', '2', '3', '4', '5', '6', '7'] var tiandituTk = 'e8a16137fd226a62a23cc7ba5c9c78ce' -const img_h = require('../../../../assets/images/map/h.png') +const img_h = require('../../../../../assets/images/map/h.png') export default { components: { Pagination, SelectTree, TiandiMap }, diff --git a/src/views/gatemachine/gateDoor/components/infoList.vue b/src/views/gatemachine/second/gateDoor/components/infoList.vue similarity index 100% rename from src/views/gatemachine/gateDoor/components/infoList.vue rename to src/views/gatemachine/second/gateDoor/components/infoList.vue diff --git a/src/views/gatemachine/gateDoor/components/list.vue b/src/views/gatemachine/second/gateDoor/components/list.vue similarity index 99% rename from src/views/gatemachine/gateDoor/components/list.vue rename to src/views/gatemachine/second/gateDoor/components/list.vue index 6fde6db..141057a 100644 --- a/src/views/gatemachine/gateDoor/components/list.vue +++ b/src/views/gatemachine/second/gateDoor/components/list.vue @@ -191,7 +191,8 @@ export default { requestFN( '/mkmjDoor/list?showCount=' + this.listQuery.limit + '¤tPage=' + this.listQuery.page, { - KEYWORDS: this.KEYWORDS + KEYWORDS: this.KEYWORDS, + AREA_LEVEL: '2' } ).then((data) => { this.listLoading = false diff --git a/src/views/gatemachine/gateDoor/components/listPath.vue b/src/views/gatemachine/second/gateDoor/components/listPath.vue similarity index 100% rename from src/views/gatemachine/gateDoor/components/listPath.vue rename to src/views/gatemachine/second/gateDoor/components/listPath.vue diff --git a/src/views/gatemachine/gateDoor/components/platformvideo.vue b/src/views/gatemachine/second/gateDoor/components/platformvideo.vue similarity index 100% rename from src/views/gatemachine/gateDoor/components/platformvideo.vue rename to src/views/gatemachine/second/gateDoor/components/platformvideo.vue diff --git a/src/views/gatemachine/gateDoor/components/videoList.vue b/src/views/gatemachine/second/gateDoor/components/videoList.vue similarity index 99% rename from src/views/gatemachine/gateDoor/components/videoList.vue rename to src/views/gatemachine/second/gateDoor/components/videoList.vue index b26d7c8..7ff3258 100644 --- a/src/views/gatemachine/gateDoor/components/videoList.vue +++ b/src/views/gatemachine/second/gateDoor/components/videoList.vue @@ -145,7 +145,7 @@ import Pagination from '@/components/Pagination' // 通过 el-pagination二次 import { requestFN } from '@/utils/request' import waves from '@/directive/waves' import Platformvideo from './platformvideo' -import TiandiMap from '../../../../components/TianMap/TiandiMap' +import TiandiMap from '../../../../../components/TianMap/TiandiMap' export default { components: { Platformvideo, Pagination, TiandiMap }, diff --git a/src/views/gatemachine/gateDoor/index.vue b/src/views/gatemachine/second/gateDoor/index.vue similarity index 100% rename from src/views/gatemachine/gateDoor/index.vue rename to src/views/gatemachine/second/gateDoor/index.vue diff --git a/src/views/gatemachine/second/index.vue b/src/views/gatemachine/second/index.vue new file mode 100644 index 0000000..98240ae --- /dev/null +++ b/src/views/gatemachine/second/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/map/components/fengongsi_index.vue b/src/views/map/components/fengongsi_index.vue index ba0078d..685a260 100644 --- a/src/views/map/components/fengongsi_index.vue +++ b/src/views/map/components/fengongsi_index.vue @@ -35,7 +35,7 @@
{{ item.label }}
- +
@@ -83,7 +83,6 @@ export default { timer: '', value: 0, riskIdentificationCount: {}, - personPositioningCount: {}, doorManagementList: [], block1OptionsList: [ { @@ -346,15 +345,17 @@ 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.block3OptionsList[0].count = data.personPositioningCount[0] + this.block3OptionsList[1].count = data.personPositioningCount[1] + this.block3OptionsList[2].count = data.personPositioningCount[2] + }) } } }