From 7b9214fdded05720f33dedbd679ddf4bcfc16302 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Mon, 13 Jun 2022 16:04:35 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=9C=B0=E5=9B=BE?= =?UTF-8?q?=E5=81=8F=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/visual/basicinfo/basicInfoMain.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/modules/visual/basicinfo/basicInfoMain.vue b/src/views/modules/visual/basicinfo/basicInfoMain.vue index c304c20cf..67a95e410 100644 --- a/src/views/modules/visual/basicinfo/basicInfoMain.vue +++ b/src/views/modules/visual/basicinfo/basicInfoMain.vue @@ -172,8 +172,8 @@ let iconSource; // icon let polygonSource;//变电站标注多边形 let select;//选中标注 -let xoffset = 0.0051 -let yoffset = 0.0002 +// let xoffset = 0.0051 +// let yoffset = 0.0002 //url图标 From 9692bf70ce13111432f5b549b2aaf5b451a208eb Mon Sep 17 00:00:00 2001 From: jiangyy Date: Mon, 13 Jun 2022 16:09:59 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=9D=90=E6=A0=87=E5=81=8F=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/visual/basicinfo/basicInfoMain.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/views/modules/visual/basicinfo/basicInfoMain.vue b/src/views/modules/visual/basicinfo/basicInfoMain.vue index 67a95e410..263f24beb 100644 --- a/src/views/modules/visual/basicinfo/basicInfoMain.vue +++ b/src/views/modules/visual/basicinfo/basicInfoMain.vue @@ -174,6 +174,8 @@ let select;//选中标注 // let xoffset = 0.0051 // let yoffset = 0.0002 +let xoffset = 0 +let yoffset = 0 //url图标 From 399ca4ca2646082c71b27aaca7aa69af873df4b3 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Tue, 14 Jun 2022 13:25:53 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=81=8F=E7=A7=BB=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/workSys/mapConfig.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/modules/workSys/mapConfig.vue b/src/views/modules/workSys/mapConfig.vue index 6e53153d5..a381d5977 100644 --- a/src/views/modules/workSys/mapConfig.vue +++ b/src/views/modules/workSys/mapConfig.vue @@ -285,10 +285,10 @@ const vueGis = { xOffset: 0, yOffset: 0, - xOffset_customize: 0, - yOffset_customize: 0, - // xOffset_customize: 0.0051,//市北默认偏移 - // yOffset_customize: 0.0002,//市北默认偏移 + // xOffset_customize: 0, + // yOffset_customize: 0, + xOffset_customize: 0.0051,//市北默认偏移 + yOffset_customize: 0.0002,//市北默认偏移 longitude: undefined, latitude: undefined, From 137384dfa00bfe2cba8e4cfc44c7cd3f7dfc830c Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Thu, 16 Jun 2022 11:10:58 +0800 Subject: [PATCH 4/7] dd --- src/views/main-shuju/main.vue | 2 +- src/views/main.vue | 2 +- src/views/modules/visual/communityParty/community.vue | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/main-shuju/main.vue b/src/views/main-shuju/main.vue index 8d4f0bc2c..4abb6808f 100644 --- a/src/views/main-shuju/main.vue +++ b/src/views/main-shuju/main.vue @@ -123,7 +123,7 @@ export default { localStorage.setItem("customerName", data.customerName || ""); } } else { - this.$message.error(rspMsg); + this.$message.error(msg); } }, }, diff --git a/src/views/main.vue b/src/views/main.vue index f12112f35..eb6f306e1 100644 --- a/src/views/main.vue +++ b/src/views/main.vue @@ -159,7 +159,7 @@ export default { localStorage.setItem("customerName", data.customerName || ""); } } else { - this.$message.error(rspMsg); + this.$message.error(msg); } }, }, diff --git a/src/views/modules/visual/communityParty/community.vue b/src/views/modules/visual/communityParty/community.vue index e8f825ace..34cff4b25 100644 --- a/src/views/modules/visual/communityParty/community.vue +++ b/src/views/modules/visual/communityParty/community.vue @@ -530,6 +530,7 @@ export default { this.unitTableData = data.list.map((item, index) => { return { ...item, + index: index + 1, urlIndex: index } }) From 8bc1ced9d43f5e8d6e6cb87442f64fc7d533ba37 Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Thu, 16 Jun 2022 16:20:27 +0800 Subject: [PATCH 5/7] dd --- src/views/modules/visual/communityParty/party.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/modules/visual/communityParty/party.vue b/src/views/modules/visual/communityParty/party.vue index 016d7e59d..534391913 100644 --- a/src/views/modules/visual/communityParty/party.vue +++ b/src/views/modules/visual/communityParty/party.vue @@ -317,6 +317,7 @@ export default { // return // } if (params.seriesIndex == 0 || params.seriesIndex == 2) { + console.log('请求了吗') this.ageCode = '' // this.getUnitList(this.agencyId) this.getAgeList() @@ -378,7 +379,7 @@ export default { // this.getEduList() // return // } - this.clickEduPie(params.dataIndex) + // this.clickEduPie(params.dataIndex) if (params.seriesIndex == 0 || params.seriesIndex == 2) { this.eduCode = '' this.getEduList() From 0e267d89622dc232a84235fc74ae0a6e3c3e41ae Mon Sep 17 00:00:00 2001 From: zhaoyongnian <541231643@qq.com> Date: Thu, 16 Jun 2022 16:56:42 +0800 Subject: [PATCH 6/7] bug --- .../partymember/icpartyorg-add-or-update.vue | 32 ++++++++++++------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/src/views/modules/partymember/icpartyorg-add-or-update.vue b/src/views/modules/partymember/icpartyorg-add-or-update.vue index 04bbde23e..93c020d7c 100644 --- a/src/views/modules/partymember/icpartyorg-add-or-update.vue +++ b/src/views/modules/partymember/icpartyorg-add-or-update.vue @@ -145,12 +145,6 @@ agencyOrgList:[] } }, - // mounted () { - // setTimeout(() => { - // console.log(':::::::::::::::::::::::') - // this.initMap() - // }, 800); - // }, methods: { init() { this.visible = true @@ -159,10 +153,10 @@ this.dataForm.staffId = localStorage.getItem('staffId') this.keyWords = '' //设置党组织类型 - - this.$nextTick(() => { + setTimeout(() => { this.$refs['dataForm'].resetFields() this.dataForm.latitude = '' + this.dataForm.agencyId = '' if (this.dataForm.id) { this.setPartyOrgType() this.getInfo() @@ -174,14 +168,17 @@ this.dataForm.orgPid = this.dataForm.orgId this.dataForm.orgPids = this.dataForm.orgPids ? this.dataForm.orgPids + ':' + this.dataForm.orgId : this.dataForm.orgId this.dataForm.partyOrgType = this.dataForm._partyOrgType - console.log(this.dataForm.partyOrgType, this.dataForm.orgPid, this.dataForm.orgPids) + this.setPartyOrgType_xzxj() this.getInfoAgencyLisy() } else { this.dataForm.mySelectOrg = '' } } - }) + }, 50); + // this.$nextTick(() => { + + // }) }, // 设置组织类型 新增党组织 setPartyOrgType_xzxj() { @@ -250,9 +247,22 @@ if(value == '5'){ // 支部 不选择行政组织 this.dataForm.agencyId = localStorage.getItem('agencyId') this.dataForm.agencyPids = '' + // 先清空数据 + this.orgList = [] + this.dataForm.mySelectOrg = '', // 我选中的当前党组织 + this.dataForm.orgPid = '', // 党组织的上级ID,没有上级时为0 + this.dataForm.orgPids = '' this.getOrgList() } else { - //根据组织类型获取行政组织 + // 先清空数据 + this.agencyOrgList = [] + this.dataForm.agencyId = '' + + // 先清空数据 + this.orgList = [] + this.dataForm.mySelectOrg = '', // 我选中的当前党组织 + this.dataForm.orgPid = '', // 党组织的上级ID,没有上级时为0 + this.dataForm.orgPids = '' this.getInfoAgencyLisy() } }, From 40457fc2cf51077f5f908bf197aa7da138f55adf Mon Sep 17 00:00:00 2001 From: zhaoyongnian <541231643@qq.com> Date: Thu, 16 Jun 2022 17:00:37 +0800 Subject: [PATCH 7/7] bug --- src/views/modules/partymember/icpartyorgtree.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/partymember/icpartyorgtree.vue b/src/views/modules/partymember/icpartyorgtree.vue index b7935dd09..776585349 100644 --- a/src/views/modules/partymember/icpartyorgtree.vue +++ b/src/views/modules/partymember/icpartyorgtree.vue @@ -1,5 +1,5 @@