From 9ad872e3be0f4ee2632b27f4518e52c426febca5 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Thu, 21 Nov 2024 19:01:28 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E7=BA=BF=E4=B8=8A=E5=9F=9F=E5=90=8D?= =?UTF-8?q?=E4=B8=8D=E6=9B=B4=E6=94=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IoTPerception/Videosurveillance/cpts/videoDialog.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/dataBoard/IoTPerception/Videosurveillance/cpts/videoDialog.vue b/src/views/dataBoard/IoTPerception/Videosurveillance/cpts/videoDialog.vue index fe2a69cb8..f4e825656 100644 --- a/src/views/dataBoard/IoTPerception/Videosurveillance/cpts/videoDialog.vue +++ b/src/views/dataBoard/IoTPerception/Videosurveillance/cpts/videoDialog.vue @@ -152,7 +152,7 @@ export default { async getVideoUrl(){ let {data,code} = await requestPost('/actual/base/videoMonitoring/getVideoUrl',{monitorCode:this.monitorCode}) if(code === 0){ - this.url = data.replace('http://111.34.21.222:12080/',`${window.SITE_CONFIG['liveURL']}`) + this.url = data.replace('https://111.34.21.222:12443/',`${window.SITE_CONFIG['liveURL']}`) this.play() } }, From 3b43d20e6da572e5be10d07390468538a2259052 Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Fri, 22 Nov 2024 09:26:46 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shequzhili/videomonitoring/index.vue | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/views/modules/shequzhili/videomonitoring/index.vue b/src/views/modules/shequzhili/videomonitoring/index.vue index 8948d26db..83eb1f5bb 100644 --- a/src/views/modules/shequzhili/videomonitoring/index.vue +++ b/src/views/modules/shequzhili/videomonitoring/index.vue @@ -22,16 +22,16 @@
新增 - 下载模板 + - - - 导入 - - + + + + + + + +
From 7cd8855a30bec9fda359c15dc0e1073d64a7bc06 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Fri, 22 Nov 2024 13:00:16 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E4=B8=AD=E6=9C=89=E7=BD=91=E6=A0=BC=E4=BD=86=E6=98=AF=E5=87=BA?= =?UTF-8?q?=E5=8F=91=E9=AA=8C=E8=AF=81=E6=8F=90=E7=A4=BA=E6=9C=AA=E9=80=89?= =?UTF-8?q?=E4=B8=AD=E7=BD=91=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/shequzhili/eventOld/cpts/event-detail.vue | 7 +++++-- src/views/modules/shequzhili/eventOld/cpts/event-info.vue | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/views/modules/shequzhili/eventOld/cpts/event-detail.vue b/src/views/modules/shequzhili/eventOld/cpts/event-detail.vue index 461c64778..803884c68 100644 --- a/src/views/modules/shequzhili/eventOld/cpts/event-detail.vue +++ b/src/views/modules/shequzhili/eventOld/cpts/event-detail.vue @@ -271,7 +271,7 @@ export default { watch: { "info.gridId": function (val) { this.selGridId = val; - this.$emit("changeGridId", val); + this.$emit("handelCLickGridId", val); this.gridId = this.selGridId; if (!this.eventDetailData.gridId && this.selGridId) { this.updateEvent(); @@ -294,8 +294,11 @@ export default { }, mounted() { this.user = this.$store.state.user; - if (this.eventId) { + if (this.eventId) {// this.info = JSON.parse(JSON.stringify(this.eventDetailData)); + if(this.info.gridId){ + this.$emit("handelCLickGridId", this.info.gridId); + } this.agencyId = this.info.agencyId } this.loadGrid(); diff --git a/src/views/modules/shequzhili/eventOld/cpts/event-info.vue b/src/views/modules/shequzhili/eventOld/cpts/event-info.vue index 5be3d723f..2eb143b53 100644 --- a/src/views/modules/shequzhili/eventOld/cpts/event-info.vue +++ b/src/views/modules/shequzhili/eventOld/cpts/event-info.vue @@ -510,7 +510,7 @@ export default { } }, handelCLickGridId(val){ - this.grid = val.value; + this.grid = val; }, async handelDispose() { console.log(this.grid,"DSFKDSFJDKS"); From b36c82823dead38d23c1e388f8ad85f7eb24e253 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Fri, 22 Nov 2024 14:30:53 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E6=A0=87=E8=AE=B0=E5=8A=9F=E8=83=BD=E6=81=A2?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/shequzhili/eventOld/cpts/event-detail.vue | 2 +- src/views/modules/shequzhili/eventOld/eventList.vue | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/views/modules/shequzhili/eventOld/cpts/event-detail.vue b/src/views/modules/shequzhili/eventOld/cpts/event-detail.vue index 803884c68..fcf968399 100644 --- a/src/views/modules/shequzhili/eventOld/cpts/event-detail.vue +++ b/src/views/modules/shequzhili/eventOld/cpts/event-detail.vue @@ -294,7 +294,7 @@ export default { }, mounted() { this.user = this.$store.state.user; - if (this.eventId) {// + if (this.eventId) { this.info = JSON.parse(JSON.stringify(this.eventDetailData)); if(this.info.gridId){ this.$emit("handelCLickGridId", this.info.gridId); diff --git a/src/views/modules/shequzhili/eventOld/eventList.vue b/src/views/modules/shequzhili/eventOld/eventList.vue index e8bb1c64e..a60f4cfad 100644 --- a/src/views/modules/shequzhili/eventOld/eventList.vue +++ b/src/views/modules/shequzhili/eventOld/eventList.vue @@ -125,7 +125,16 @@
新增 - + + 标记 + + 标记为难点堵点 + 标记为矛盾纠纷 + 标记为自身问题 + 标记为超出服务范围 + + 导出 批量催办
From e31b7c94598866141f1b7675298b85356658646b Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Fri, 22 Nov 2024 16:42:22 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/communityParty/communityNews/index.vue | 6 +++--- .../modules/communityParty/employmentService/index.vue | 6 +++--- .../modules/communityParty/noticeAnnouncement/index.vue | 6 +++--- .../communityParty/policeCivilianInteraction/index.vue | 6 +++--- .../modules/communityParty/threeAffairsDisclosure/index.vue | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/views/modules/communityParty/communityNews/index.vue b/src/views/modules/communityParty/communityNews/index.vue index 25ed48e42..d96fc1c78 100644 --- a/src/views/modules/communityParty/communityNews/index.vue +++ b/src/views/modules/communityParty/communityNews/index.vue @@ -53,8 +53,8 @@ - - + - + diff --git a/src/views/modules/communityParty/employmentService/index.vue b/src/views/modules/communityParty/employmentService/index.vue index c13db59ab..a9c685c4a 100644 --- a/src/views/modules/communityParty/employmentService/index.vue +++ b/src/views/modules/communityParty/employmentService/index.vue @@ -53,8 +53,8 @@ - - + - + diff --git a/src/views/modules/communityParty/noticeAnnouncement/index.vue b/src/views/modules/communityParty/noticeAnnouncement/index.vue index 1dbe900e4..0d4ba3bad 100644 --- a/src/views/modules/communityParty/noticeAnnouncement/index.vue +++ b/src/views/modules/communityParty/noticeAnnouncement/index.vue @@ -53,8 +53,8 @@ - - + - + diff --git a/src/views/modules/communityParty/policeCivilianInteraction/index.vue b/src/views/modules/communityParty/policeCivilianInteraction/index.vue index ab6fa0796..4530e9916 100644 --- a/src/views/modules/communityParty/policeCivilianInteraction/index.vue +++ b/src/views/modules/communityParty/policeCivilianInteraction/index.vue @@ -53,8 +53,8 @@ - - + - + diff --git a/src/views/modules/communityParty/threeAffairsDisclosure/index.vue b/src/views/modules/communityParty/threeAffairsDisclosure/index.vue index 09c169ee1..07a8713e5 100644 --- a/src/views/modules/communityParty/threeAffairsDisclosure/index.vue +++ b/src/views/modules/communityParty/threeAffairsDisclosure/index.vue @@ -53,8 +53,8 @@ - - + - +