From 265a24170dfa554e033cfe0fd3d49c2bf49a0c63 Mon Sep 17 00:00:00 2001 From: liujun Date: Mon, 28 Oct 2024 13:57:41 +0800 Subject: [PATCH 1/4] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D=EF=BC=9A=E7=9B=91?= =?UTF-8?q?=E7=AE=A1=E7=AB=AF=E4=B9=9D=E5=85=AC=E5=8F=B8=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E5=AE=9A=E4=BD=8D=E7=B3=BB=E7=BB=9F=E4=B8=8D=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=AE=9A=E4=BD=8D=E7=94=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/map/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/map/index.vue b/src/views/map/index.vue index d2b4712..f18f7f2 100644 --- a/src/views/map/index.vue +++ b/src/views/map/index.vue @@ -2999,7 +2999,7 @@ 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] From b974030b5f65382c785604f994cb7d98737ce4a6 Mon Sep 17 00:00:00 2001 From: liujun Date: Fri, 1 Nov 2024 17:50:31 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E5=AE=9A=E4=BD=8D=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/map/index.vue | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/src/views/map/index.vue b/src/views/map/index.vue index 2e5b981..a43ab61 100644 --- a/src/views/map/index.vue +++ b/src/views/map/index.vue @@ -93,11 +93,11 @@ :corp-info-id="CORP_INFO_ID" :area="area" :gangkou="gangkouActive"/> - - - - - + + {{ item.label }} @@ -1597,7 +1598,7 @@ export default { const collection = new Cesium.CustomDataSource('trajectoryEntityCollection') collection.entities.add(entity) viewer.dataSources.add(collection) - trajectoryEntityCollection = collection + trajectoryEntityCollection = Object.freeze(collection) } }) }, @@ -1679,11 +1680,11 @@ export default { transformWGS84ToCartesian: function(position, alt) { // eslint-disable-next-line no-return-assign return position ? Cesium.Cartesian3.fromDegrees( - position.lng || position.lon, - position.lat, - position.alt = alt || position.alt, - Cesium.Ellipsoid.WGS84 - ) + position.lng || position.lon, + position.lat, + position.alt = alt || position.alt, + Cesium.Ellipsoid.WGS84 + ) : Cesium.Cartesian3.ZERO }, closeBubbles() { @@ -2246,7 +2247,7 @@ export default { } if (this.gangkouActive === '00003' && this.CORP_INFO_ID === '035958e685cf4850bc40151c5e0617a6' && urlType === 'peoplePosition') { !this.connecting ? this.createConnection(this.CORP_INFO_ID) : this.doSubscribe() - } else if (this.gangkouActive === '00003' && (this.CORP_INFO_ID === '21590a00ea5e462e9ee44dd332dddc26' || this.CORP_INFO_ID === '033549ed3bd648e49c8a65eb4993ec2f') && urlType === 'peoplePosition') { + } else if (this.gangkouActive === '00003' && (this.CORP_INFO_ID === '21590a00ea5e462e9ee44dd332dddc26' || this.CORP_INFO_ID === '033549ed3bd648e49c8a65eb4993ec2f') && urlType === 'peoplePosition') { // websocket实时获取人员定位 this.initRYDWWebsocket(this.CORP_INFO_ID) } else { @@ -3000,9 +3001,7 @@ export default { const wsUrl = config.noDwSysUrl + '/ltLocation/DW_' + new Date().getTime() + '_98' _this.fwebsocket = new WebSocket(encodeURI(wsUrl)) _this.fwebsocket.onmessage = function(message) { - console.info('接收消息') const peopleList = JSON.parse(message.data) - console.log(peopleList) viewer.entities.suspendEvents() for (let i = 0; i < peopleList.length; i++) { const item = peopleList[i] @@ -3072,12 +3071,12 @@ export default { if (decodedStr) { // const perTrack = JSON.parse(decodedStr) const perTrack = { 'msg': '000', 'data': [ - '8905,118.50022313549867,38.92716921306408,-88.96163116878053,0.15,8905,测试工单', - '8001,118.5044033058593,38.926660124965956,-88.96163116878053,0.15,8001,张悦', - '8002,118.48886198164132,38.916885738277635,-88.96163116878053,0.15,8002,齐津铖', - '8003,118.50289308906841,38.92012841170512,-88.96163116878053,0.15,8003,白伟', - '8004,118.48820877892216,38.91690951376236,-88.96163116878053,0.15,8004,孙海官' - ] } + '8905,118.50022313549867,38.92716921306408,-88.96163116878053,0.15,8905,测试工单', + '8001,118.5044033058593,38.926660124965956,-88.96163116878053,0.15,8001,张悦', + '8002,118.48886198164132,38.916885738277635,-88.96163116878053,0.15,8002,齐津铖', + '8003,118.50289308906841,38.92012841170512,-88.96163116878053,0.15,8003,白伟', + '8004,118.48820877892216,38.91690951376236,-88.96163116878053,0.15,8004,孙海官' + ] } if (perTrack.msg === '000' && perTrack.data && perTrack.data.length > 0) { perTrack.data.forEach(item => { const newPos = item.split(',') 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 3/4] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=8F=A3=E9=97=A8?= =?UTF-8?q?=E9=97=A8=E7=A6=81=E7=B3=BB=E7=BB=9F=E7=9A=84=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=202.=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5=E7=9A=84=E4=BA=BA?= =?UTF-8?q?=E5=91=98=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] + }) } } } From 8d6a314800dcf77fb9b9d442904abc6f2450c6e3 Mon Sep 17 00:00:00 2001 From: shanao Date: Thu, 14 Nov 2024 10:33:41 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E3=80=90bug=E4=BF=AE=E6=94=B9=E3=80=91=201?= =?UTF-8?q?.=20=E6=B7=BB=E5=8A=A0=E9=9A=90=E6=82=A3=E5=8F=91=E7=8E=B0?= =?UTF-8?q?=E6=97=B6=E9=97=B4=202.=20=E5=9C=A8=E8=80=83=E8=AF=84=E8=BF=87?= =?UTF-8?q?=E7=A8=8B=EF=BC=8C=E6=9F=A5=E7=9C=8B=E5=AE=8C=E9=9A=90=E6=82=A3?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=90=8E=E7=82=B9=E5=87=BB=E2=80=9C=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E2=80=9D=EF=BC=8C=E7=B3=BB=E7=BB=9F=E7=9B=B4=E6=8E=A5?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=88=B0=E9=9A=90=E6=82=A3=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E7=9A=84=E9=A6=96=E9=A1=B5=EF=BC=8C=E7=BC=BA=E5=B0=91=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=AE=9A=E4=BD=8D=E7=9A=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/KeyProjectHidden/index.vue | 8 ++++++++ .../components/evaluation.vue | 3 +++ .../branch_hazard_assessment/components/list.vue | 3 ++- .../branch_hazard_assessment/index.vue | 16 +++++++++++----- 4 files changed, 24 insertions(+), 6 deletions(-) diff --git a/src/components/KeyProjectHidden/index.vue b/src/components/KeyProjectHidden/index.vue index b3d7267..89b0c09 100644 --- a/src/components/KeyProjectHidden/index.vue +++ b/src/components/KeyProjectHidden/index.vue @@ -35,6 +35,10 @@ 隐患处置 限期整改 + + 发现时间 + {{ formatDate(pd.CREATTIME,'yyyy-MM-DD HH:mm') }} + 整改期限 {{ pd.RECTIFICATIONDEADLINE }} @@ -145,6 +149,7 @@ import { requestFN } from '@/utils/request' import { videoPlayer } from 'vue-video-player' import 'video.js/dist/video-js.css' +import { formatDate } from 'element-ui/src/utils/date-util' export default { components: { videoPlayer }, props: { @@ -184,9 +189,11 @@ export default { } }, created() { + this.activeName = this.$parent.previousPage this.getData() }, methods: { + formatDate, getData() { requestFN( '/keyprojectcheck/findHidden', @@ -206,6 +213,7 @@ export default { this.$refs.hdVideoPlayer.player.pause() }, goBack() { + this.$parent.previousPage = true if (this.activeName) { this.$parent.activeName = this.activeName } else { diff --git a/src/views/keyproject_evaluation/branch_hazard_assessment/components/evaluation.vue b/src/views/keyproject_evaluation/branch_hazard_assessment/components/evaluation.vue index 03460a9..4c7fb05 100644 --- a/src/views/keyproject_evaluation/branch_hazard_assessment/components/evaluation.vue +++ b/src/views/keyproject_evaluation/branch_hazard_assessment/components/evaluation.vue @@ -335,12 +335,15 @@ export default { } }, goBack() { + this.$parent.isEvaluationKeepAlive = false this.$parent.activeName = 'List' }, fnViewHidden(HIDDEN_ID) { // this.visible = true // this.HIDDEN_ID = HIDDEN_ID this.$parent.HIDDEN_ID = HIDDEN_ID + this.$parent.previousPage = this.$parent.activeName + this.$parent.isEvaluationKeepAlive = true this.$parent.activeName = 'KeyProjectHidden' }, fnEvaluationDialogChangeShow() { diff --git a/src/views/keyproject_evaluation/branch_hazard_assessment/components/list.vue b/src/views/keyproject_evaluation/branch_hazard_assessment/components/list.vue index 9f169ae..7f286c8 100644 --- a/src/views/keyproject_evaluation/branch_hazard_assessment/components/list.vue +++ b/src/views/keyproject_evaluation/branch_hazard_assessment/components/list.vue @@ -52,7 +52,7 @@ @@ -126,6 +126,7 @@ export default { this.$parent.CORPINFO_ID = CORPINFO_ID this.$parent.EVALUATIONCONFIG_ID = EVALUATIONCONFIG_ID this.$parent.TYPE = TYPE + this.$parent.isEvaluationKeepAlive = true this.$parent.activeName = 'Evaluation' } } diff --git a/src/views/keyproject_evaluation/branch_hazard_assessment/index.vue b/src/views/keyproject_evaluation/branch_hazard_assessment/index.vue index 5e38916..1459e91 100644 --- a/src/views/keyproject_evaluation/branch_hazard_assessment/index.vue +++ b/src/views/keyproject_evaluation/branch_hazard_assessment/index.vue @@ -1,15 +1,19 @@ +