From 64fb2018b3432e09ddfe92c43b7ed11580acab88 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Sun, 9 Jan 2022 11:15:58 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9:1.=E5=90=8E=E7=AB=AFap?= =?UTF-8?q?i=E5=9C=B0=E5=9D=80,=E9=93=BE=E6=8E=A5=E5=B8=82=E5=8C=97?= =?UTF-8?q?=E6=95=B0=E5=AD=97=E7=A4=BE=E5=8C=BA=E6=B5=8B=E8=AF=95=E7=8E=AF?= =?UTF-8?q?=E5=A2=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production.uat | 2 +- public/index.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.env.production.uat b/.env.production.uat index 14457f27c..689ae107d 100644 --- a/.env.production.uat +++ b/.env.production.uat @@ -1,4 +1,4 @@ NODE_ENV=production -VUE_APP_API_SERVER = https://epmet-test.elinkservice.cn/api +VUE_APP_API_SERVER = http://120.27.18.76:/api VUE_APP_NODE_ENV=prod:uat VUE_APP_PUBLIC_PATH=epmet-oper \ No newline at end of file diff --git a/public/index.html b/public/index.html index ebeef6102..9e0f4e3e5 100644 --- a/public/index.html +++ b/public/index.html @@ -57,7 +57,7 @@ <% if (process.env.VUE_APP_NODE_ENV==='prod:uat' ) { %> <% } %> From 1602383a00affab33d1d6a2206cd4f2d4f85c436 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Fri, 14 Jan 2022 17:49:56 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E5=B8=82=E5=8C=97=20=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=88=86=E6=9E=90=20=E5=8A=A8=E5=8A=9B=E7=BD=91=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/visual/heart/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/modules/visual/heart/index.vue b/src/views/modules/visual/heart/index.vue index 1267d16bb..11799d9e6 100644 --- a/src/views/modules/visual/heart/index.vue +++ b/src/views/modules/visual/heart/index.vue @@ -229,7 +229,8 @@ export default { //加载组织数据 async getTb1() { const { agencyId, areaCode } = this; - const url = "/data/report/screen/index/advancedbranchrank"; + //const url = "/data/report/screen/index/advancedbranchrank"; + const url = "/data/report/screen/index/advancedbranchrank-shibei"; let params = { agencyId, areaCode, From b22da2aa3e590f6434c4478910ce957b62315a5a Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 14 Jan 2022 17:54:41 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E5=B8=82=E5=8C=97=20=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=88=86=E6=9E=90=20=E5=8A=A8=E5=8A=9B=E7=BD=91=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/visual/heart/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/modules/visual/heart/index.vue b/src/views/modules/visual/heart/index.vue index 11799d9e6..489f30c0b 100644 --- a/src/views/modules/visual/heart/index.vue +++ b/src/views/modules/visual/heart/index.vue @@ -303,7 +303,8 @@ export default { { type: "index" }, item.userName, item.gridName, - item.pointTotal, + //item.pointTotal, + item.score,, ]; }); this.tb3.srcList = data; From 9d0223e3c6c55de7351a16918400d54e050e1982 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 14 Jan 2022 17:54:53 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E5=B8=82=E5=8C=97=20=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=88=86=E6=9E=90=20=E5=8A=A8=E5=8A=9B=E7=BD=91=E6=A0=BC2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/visual/heart/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/visual/heart/index.vue b/src/views/modules/visual/heart/index.vue index 489f30c0b..a07a16712 100644 --- a/src/views/modules/visual/heart/index.vue +++ b/src/views/modules/visual/heart/index.vue @@ -304,7 +304,7 @@ export default { item.userName, item.gridName, //item.pointTotal, - item.score,, + item.score, ]; }); this.tb3.srcList = data; From bb716694b5589265763bdb8a9be27a92b8f30000 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 14 Jan 2022 18:09:02 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E5=B8=82=E5=8C=97=20=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=88=86=E6=9E=90=20=E5=8A=A8=E5=8A=9B=E7=BD=91=E6=A0=BC=20?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=8F=96=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/visual/heart/index.vue | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/views/modules/visual/heart/index.vue b/src/views/modules/visual/heart/index.vue index a07a16712..5089af17a 100644 --- a/src/views/modules/visual/heart/index.vue +++ b/src/views/modules/visual/heart/index.vue @@ -244,7 +244,7 @@ export default { if (code === 0) { this.tb1.list = data.map((item) => { - return [{ type: "index" }, item.name, item.scroe]; + return [{ type: "index" }, item.name, item.score]; }); this.tb1.srcList = data; } else { @@ -303,8 +303,7 @@ export default { { type: "index" }, item.userName, item.gridName, - //item.pointTotal, - item.score, + item.pointTotal, ]; }); this.tb3.srcList = data; From 4fe744e0d78e16f6ce0dcd480fca4597aa8aef9b Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 19 Jan 2022 13:18:47 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/communityService/shzz/cpts/edit.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/modules/communityService/shzz/cpts/edit.vue b/src/views/modules/communityService/shzz/cpts/edit.vue index ff4c47eaa..61df0c9e8 100644 --- a/src/views/modules/communityService/shzz/cpts/edit.vue +++ b/src/views/modules/communityService/shzz/cpts/edit.vue @@ -366,7 +366,8 @@ export default { }, //加载网格 async loadStaff() { - const url = "/data/aggregator/org/stafflist"; + //const url = "/data/aggregator/org/stafflist"; + const url = "/data/aggregator/org/currentOrgStafflist"; let params = { orgId: this.agencyId, From 299b357e19532a09d8f316cc5c9443e9a127628c Mon Sep 17 00:00:00 2001 From: jiangyy Date: Thu, 20 Jan 2022 17:56:24 +0800 Subject: [PATCH 07/11] groupName --- .../visual/basicinfo/cpts/topic-info.vue | 204 ++++++++---------- .../communityGovern/cpt/project-info.vue | 3 +- 2 files changed, 97 insertions(+), 110 deletions(-) diff --git a/src/views/modules/visual/basicinfo/cpts/topic-info.vue b/src/views/modules/visual/basicinfo/cpts/topic-info.vue index bccd5855e..159f4b545 100644 --- a/src/views/modules/visual/basicinfo/cpts/topic-info.vue +++ b/src/views/modules/visual/basicinfo/cpts/topic-info.vue @@ -7,7 +7,8 @@ 话题详情 -
+
@@ -15,12 +16,10 @@
话题内容
{{ info.topicContent }}
- +
发布时间： @@ -37,65 +36,57 @@
-
+
-
+
{{ item.label }}
-
+
-
+
- + 加载中
-
- +
+
-
- +
+
-
+
议题标题： @@ -113,7 +104,8 @@ 议题发起人： {{ issueInfo.issueInitiator }}
-
+
议题来源： {{ issueInfo.topicInfo.groupName }}
@@ -143,22 +135,20 @@
- +
-
- +
+
-
+
项目标题： @@ -176,33 +166,36 @@ 当前处理部门： {{ projectInfo.departmentNameList.join("、") }}
-
+
分类： -
+
{{ item.name }}
-
+
标签： -
+
{{ item.name }}
-
+
处理进展
-
+
{{ item.processName }}
@@ -215,20 +208,16 @@
{{ item.departmentName }}
-
+
说 明：
{{ item.publicReply }}
-
+
内部备注：
{{ @@ -238,12 +227,10 @@
- + {{ att.name }} @@ -253,11 +240,10 @@
-
- +
+
@@ -276,7 +262,7 @@ import analyse from "@/views/modules/visual/cpts/analyse"; import foldText from "@/views/components/foldText"; import dateFormat from "dai-js/tools/dateFormat"; -function iniData() { +function iniData () { return { groupList: [ { label: "研判分析" }, @@ -434,7 +420,7 @@ export default { computed: {}, watch: { - topicId() { + topicId () { let data = iniData(); Object.keys(data).forEach((k) => { this[k] = data[k]; @@ -443,16 +429,16 @@ export default { }, }, - mounted() { + mounted () { this.getApiData(); }, methods: { - watchImg(src) { + watchImg (src) { window.open(src); }, - addStartGroupIndex() { + addStartGroupIndex () { const { startGroupIndex, groupList } = this; if (startGroupIndex < groupList.length - 9) { this.startGroupIndex = startGroupIndex + 1; @@ -460,7 +446,7 @@ export default { this.startGroupIndex = groupList.length - 9; } }, - subStartGroupIndex() { + subStartGroupIndex () { const { startGroupIndex, groupList } = this; if (startGroupIndex > 0) { this.startGroupIndex = startGroupIndex - 1; @@ -468,11 +454,11 @@ export default { this.startGroupIndex = 0; } }, - handleClose() { + handleClose () { this.$emit("close"); }, - async getApiData() { + async getApiData () { this.getComment(); await this.getInfo(); await this.getIssueInfo(); @@ -484,7 +470,7 @@ export default { }, //加载组织数据 - async getInfo() { + async getInfo () { const url = "/resi/group/topic/gettopicdetail"; const { data, code, msg } = await requestPost(url, { @@ -499,7 +485,7 @@ export default { }, //加载组织数据 - async getComment() { + async getComment () { const url = "/resi/group/comment/getcommentlistoftopic"; const { data, code, msg } = await requestPost(url, { @@ -526,7 +512,7 @@ export default { } }, - checkTopicCommentImg(index) { + checkTopicCommentImg (index) { const { comment: { srcList }, } = this; @@ -536,7 +522,7 @@ export default { }, //加载组织数据 - async getIssueInfo() { + async getIssueInfo () { const { info: { issueId }, } = this; @@ -555,7 +541,7 @@ export default { }, //加载组织数据 - async getIssueTrend() { + async getIssueTrend () { const { info: { issueId }, } = this; @@ -592,7 +578,7 @@ export default { }, //加载组织数据 - async getProjectProcess() { + async getProjectProcess () { const { issueInfo } = this; if (!issueInfo || !issueInfo.projectId) return; const url = "/gov/project/trace/processlist-v2"; @@ -615,7 +601,7 @@ export default { }, //加载组织数据 - async getProjectInfo() { + async getProjectInfo () { const { issueInfo } = this; if (!issueInfo || !issueInfo.projectId) return; const url = "/gov/project/trace/projectdetail"; @@ -631,7 +617,7 @@ export default { } }, - async getProjectCate() { + async getProjectCate () { const { issueInfo } = this; if (!issueInfo || !issueInfo.projectId) return; const url = "/gov/project/projectcategory/categorytaglist"; @@ -649,7 +635,7 @@ export default { }, //加载组织数据 - async getYanPan() { + async getYanPan () { const url = "/gov/project/project/topic-research-analysis"; if (!this.issueInfo.projectId) return; @@ -685,13 +671,13 @@ export default { } }, - toUserInfo(item) { + toUserInfo (item) { this.$router.push({ path: `/main-shuju/visual-basicinfo-people/${item.icResiUserId}`, }); }, - toProjectInfo(item) { + toProjectInfo (item) { console.log(item); this.topicId = item.topicId; }, diff --git a/src/views/modules/visual/communityGovern/cpt/project-info.vue b/src/views/modules/visual/communityGovern/cpt/project-info.vue index 2810747bc..2645a0503 100644 --- a/src/views/modules/visual/communityGovern/cpt/project-info.vue +++ b/src/views/modules/visual/communityGovern/cpt/project-info.vue @@ -173,7 +173,8 @@ 议题发起人： {{ issueInfo.issueInitiator }}
-
+
议题来源： {{ issueInfo.topicInfo.groupName }}
From d2a4c4edbebe6b30d4f205381b59d63933b81aeb Mon Sep 17 00:00:00 2001 From: jiangyy Date: Fri, 21 Jan 2022 09:21:22 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/scss/modules/visual/basicInfoMain.scss | 6 +++--- src/views/modules/base/community/buildTable.vue | 2 +- src/views/modules/base/community/communityTable.vue | 2 +- src/views/modules/base/community/roomTable.vue | 2 +- src/views/modules/visual/basicinfo/basicInfoCommunity.vue | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/assets/scss/modules/visual/basicInfoMain.scss b/src/assets/scss/modules/visual/basicInfoMain.scss index 88e617d66..e82983401 100644 --- a/src/assets/scss/modules/visual/basicInfoMain.scss +++ b/src/assets/scss/modules/visual/basicInfoMain.scss @@ -267,13 +267,13 @@ // margin-left: 0; // } - > span { + .housename { + margin-top: 70px; font-size: 24px; font-family: PingFang SC; font-weight: 500; color: #ffffff; - line-height: 18px; - line-height: 190px; + // line-height: 180px; } .icon_party { diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue index c8a0d7c2a..718273aa9 100644 --- a/src/views/modules/base/community/buildTable.vue +++ b/src/views/modules/base/community/buildTable.vue @@ -156,7 +156,7 @@ export default { return { loading: false, total: 0, - pageSize: 10, + pageSize: 20, pageNo: 0, tableLoading: true, diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue index a57e6a1e2..4608b461c 100644 --- a/src/views/modules/base/community/communityTable.vue +++ b/src/views/modules/base/community/communityTable.vue @@ -157,7 +157,7 @@ export default { return { loading: false, total: 0, - pageSize: 10, + pageSize: 20, pageNo: 0, tableLoading: true, diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue index 797b047e1..7aacb8352 100644 --- a/src/views/modules/base/community/roomTable.vue +++ b/src/views/modules/base/community/roomTable.vue @@ -167,7 +167,7 @@ export default { return { loading: false, total: 0, - pageSize: 10, + pageSize: 20, pageNo: 0, tableLoading: true, diff --git a/src/views/modules/visual/basicinfo/basicInfoCommunity.vue b/src/views/modules/visual/basicinfo/basicInfoCommunity.vue index dbb0a3c43..46e4c4d46 100644 --- a/src/views/modules/visual/basicinfo/basicInfoCommunity.vue +++ b/src/views/modules/visual/basicinfo/basicInfoCommunity.vue @@ -29,7 +29,7 @@ :key="index" :class="['item',{'item_sel':selHouseIndex==index}]" @click="handleClickRoom(index)"> - {{item.houseName}} +
{{item.houseName}}
Date: Fri, 21 Jan 2022 09:43:34 +0800 Subject: [PATCH 09/11] 111 --- .env.production.uat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.production.uat b/.env.production.uat index 689ae107d..14457f27c 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 40dac3adbb6df85af09eaca66c13f758b28349a6 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Fri, 21 Jan 2022 09:45:17 +0800 Subject: [PATCH 10/11] =?UTF-8?q?index=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/index.html b/public/index.html index 9e0f4e3e5..ebeef6102 100644 --- a/public/index.html +++ b/public/index.html @@ -57,7 +57,7 @@ <% if (process.env.VUE_APP_NODE_ENV==='prod:uat' ) { %> <% } %> From c098eed24cf2aaf4af51709190f5d9a54d748f61 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Fri, 21 Jan 2022 09:55:53 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E5=8A=A8=E5=8A=9B=E7=BD=91=E6=A0=BC?= =?UTF-8?q?=E6=81=A2=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/visual/heart/index.vue | 75 +++++++++++------------- 1 file changed, 33 insertions(+), 42 deletions(-) diff --git a/src/views/modules/visual/heart/index.vue b/src/views/modules/visual/heart/index.vue index 5089af17a..c22f2dda4 100644 --- a/src/views/modules/visual/heart/index.vue +++ b/src/views/modules/visual/heart/index.vue @@ -2,14 +2,12 @@
时间： - +
@@ -22,13 +20,11 @@
- +
@@ -41,13 +37,11 @@
- +
@@ -60,13 +54,11 @@
- +
@@ -84,7 +76,7 @@ import dateFormat from "dai-js/tools/dateFormat"; export default { name: "heart", - data() { + data () { return { agencyId: this.$store.state.user.agencyId, areaCode: "", @@ -187,33 +179,33 @@ export default { }, watch: { - monthId() { + monthId () { this.getApiData(); }, }, - async mounted() { + async mounted () { this.userId = this.uid; await nextTick(100); this.getApiData(); }, methods: { - handleSearch() {}, + handleSearch () { }, - async getApiData() { + async getApiData () { //await this.getAgencyInfo(); this.getTb1(); this.getTb2(); this.getTb3(); }, - toUserInfo(uid) { + toUserInfo (uid) { this.$router.push({ path: `/main-shuju/visual-basicinfo-people/${uid}` }); }, // 获取当前组织信息 - async getAgencyInfo() { + async getAgencyInfo () { const { data, code, msg } = await requestPost( "/data/report/screen/agency/agencydetail-multic", { @@ -227,10 +219,9 @@ export default { }, //加载组织数据 - async getTb1() { + async getTb1 () { const { agencyId, areaCode } = this; - //const url = "/data/report/screen/index/advancedbranchrank"; - const url = "/data/report/screen/index/advancedbranchrank-shibei"; + const url = "/data/report/screen/index/advancedbranchrank"; let params = { agencyId, areaCode, @@ -244,7 +235,7 @@ export default { if (code === 0) { this.tb1.list = data.map((item) => { - return [{ type: "index" }, item.name, item.score]; + return [{ type: "index" }, item.name, item.scroe]; }); this.tb1.srcList = data; } else { @@ -253,7 +244,7 @@ export default { }, //加载组织数据 - async getTb2() { + async getTb2 () { const { agencyId, areaCode } = this; const url = "/data/report/screen/user/partypointrank"; let params = { @@ -283,7 +274,7 @@ export default { }, //加载组织数据 - async getTb3() { + async getTb3 () { const { agencyId, areaCode } = this; const url = "/data/report/screen/user/userpointrank/withoutpartymember"; let params = {