From ed5017b4cd1f773bd333fbaf1eb2cc48b85eccda Mon Sep 17 00:00:00 2001 From: jiangyy Date: Fri, 21 Jan 2022 09:44:07 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=8E=AF=E5=A2=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production.uat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.production.uat b/.env.production.uat index 689ae107..14457f27 100644 --- a/.env.production.uat +++ b/.env.production.uat @@ -1,4 +1,4 @@ NODE_ENV=production -VUE_APP_API_SERVER = http://120.27.18.76:/api +VUE_APP_API_SERVER = https://epmet-test.elinkservice.cn/api VUE_APP_NODE_ENV=prod:uat VUE_APP_PUBLIC_PATH=epmet-oper \ No newline at end of file From b416077a834f443cabb64b036850ff5213c043d5 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Wed, 26 Jan 2022 08:54:05 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E5=B1=8F=E8=94=BD?= =?UTF-8?q?=E7=A7=AF=E5=88=86=E8=AE=B0=E5=BD=95=E3=80=81=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/communityParty/regionalParty/units.vue | 4 ++-- src/views/modules/communityService/shzz/index.vue | 4 ++-- src/views/modules/communityService/sqzzz/index.vue | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/modules/communityParty/regionalParty/units.vue b/src/views/modules/communityParty/regionalParty/units.vue index 5dc1df91..731bd9c6 100644 --- a/src/views/modules/communityParty/regionalParty/units.vue +++ b/src/views/modules/communityParty/regionalParty/units.vue @@ -190,14 +190,14 @@ style="color:#1C6AFD;text-decoration: underline;" size="small" @click="handleDetail(scope.row)">查看 - 完成情况 积分记录 + @click="handleScore(scope.row)">积分记录 -->
查看 - 积分记录 + @click="handleScore(scope.row)">积分记录 --> 查看 - 积分记录 + @click="handleScore(scope.row)">积分记录 --> Date: Wed, 26 Jan 2022 13:00:07 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=81=94=E5=BB=BA=E5=8D=95=E4=BD=8D?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E4=BA=8B=E9=A1=B9=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/communityParty/regionalParty/units.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/modules/communityParty/regionalParty/units.vue b/src/views/modules/communityParty/regionalParty/units.vue index 731bd9c6..a1aad2f7 100644 --- a/src/views/modules/communityParty/regionalParty/units.vue +++ b/src/views/modules/communityParty/regionalParty/units.vue @@ -374,11 +374,11 @@ export default { //获取服务事项下拉框 async loadService () { - const url = "/heart/serviceitem/dict-list" + const url = "/heart/icresidemanddict/subcodelist" // const url = "http://yapi.elinkservice.cn/mock/245/heart/icresidemanddict/subcodelist" let params = { - // parentCategoryCode: '1010' + parentCategoryCode: '1010' } const { data, code, msg } = await requestPost(url, params) From f331753d92426956c4868a48626dbd2fd4cb9d82 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Wed, 26 Jan 2022 15:03:04 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/visual/basicinfo/basicInfoMain.vue | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/views/modules/visual/basicinfo/basicInfoMain.vue b/src/views/modules/visual/basicinfo/basicInfoMain.vue index adae7b0e..313ff938 100644 --- a/src/views/modules/visual/basicinfo/basicInfoMain.vue +++ b/src/views/modules/visual/basicinfo/basicInfoMain.vue @@ -313,9 +313,7 @@ const vueGis = { //下钻到下一级 type点击的类型:polygon 点击多边形（分为点击组织/小区） search 点击搜索 people 点击详情 async toSubAgency (type, e, searchName) { - if (!e) { - return false - } + //点击小区neighborHood显示楼栋，点击非小区，进入下一级地图 if (type === 'people') { @@ -348,6 +346,9 @@ const vueGis = { }); } else { + if (!e) { + return false + } if (!e.selected[0]) { return false }