From 5260ec8123f769bc1fb5e46854d30a77a5ff95bc Mon Sep 17 00:00:00 2001 From: jiangyy Date: Wed, 11 Jan 2023 14:18:53 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/cpts/base/index.vue | 9 ++ src/views/modules/renFangTongJi/index.vue | 170 +++++++++++----------- 2 files changed, 90 insertions(+), 89 deletions(-) diff --git a/src/views/modules/cpts/base/index.vue b/src/views/modules/cpts/base/index.vue index 685e21816..7e66c198d 100644 --- a/src/views/modules/cpts/base/index.vue +++ b/src/views/modules/cpts/base/index.vue @@ -123,6 +123,7 @@
-
+
{{ item.num }}
{{ item.name }}
-
+

下级平台使用进度汇总

- - - + + + - + - - - - - - - + + + + + + +
- - + + @@ -115,10 +94,12 @@ import shequtongji from "./cpts/shequtongji"; export default { name: "renFangTongJi", components: { shequtongji }, - data() { + data () { return { displayedDetail: false, tableData: [], + tableLoading: false, + loadInfo: '', orgId: "", orgType: "", @@ -185,35 +166,35 @@ export default { }; }, computed: { - maxTableHeight() { + maxTableHeight () { return this.clientHeight - 420; }, ...mapGetters(["clientHeight"]), }, watch: { - orgId() { + orgId () { this.getTableData(); }, }, - mounted() { + mounted () { this.getCommunityData(); this.getResiData(); this.getHouseData(); this.getTableData(); }, methods: { - handleClickCard(item) { + handleClickCard (item) { if (item.name == "开通平台社区数") { this.showDetail(); } }, - async showDetail(orgId = "") { + async showDetail (orgId = "") { this.displayedDetail = true; this.detailOrgId = orgId; }, - async getCommunityData() { + async getCommunityData () { const url = "/gov/org/agency/usingCommunityStats"; const { data, code, msg } = await requestPost(url, { @@ -230,7 +211,7 @@ export default { } }, - async getResiData() { + async getResiData () { const url = "/epmetuser/icresiuser/userchart"; const { data, code, msg } = await requestPost(url, { @@ -257,7 +238,7 @@ export default { } }, - async getHouseData() { + async getHouseData () { const url = "/gov/org/house/housechart"; const { data, code, msg } = await requestPost(url, { @@ -286,7 +267,9 @@ export default { } }, - async getTableData() { + async getTableData () { + this.loadInfo = '数据加载中' + this.tableLoading = true const url = "/gov/org/house/subuserhouselist"; const { data, code, msg } = await requestPost(url, { @@ -297,9 +280,17 @@ export default { if (code === 0) { this.tableData = data ? data.map((item) => { - return item; - }) + return item; + }) : []; + + if (this.tableData.length === 0) { + this.loadInfo = '暂无数据' + } else { + this.loadInfo = '' + + } + } }, }, @@ -318,6 +309,7 @@ export default { .item { display: flex; + justify-content: center; width: 24%; margin-top: 15px; // margin-right: 1%; From 56b051aa70d3ba81eea2715660afba2ac28d845f Mon Sep 17 00:00:00 2001 From: jiangyy Date: Wed, 11 Jan 2023 15:02:58 +0800 Subject: [PATCH 2/8] 111 --- src/views/modules/base/epidemic/antiInfo.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/modules/base/epidemic/antiInfo.vue b/src/views/modules/base/epidemic/antiInfo.vue index f3da2d964..166dd41b8 100644 --- a/src/views/modules/base/epidemic/antiInfo.vue +++ b/src/views/modules/base/epidemic/antiInfo.vue @@ -293,6 +293,7 @@ :close-on-press-escape="false" :title="formTitle" width="1150px" + :z-index="1000" top="5vh" class="dialog-h" @closed="handleCnalceForm"> @@ -879,7 +880,7 @@ export default { let params = { id } - + this.$message.error('111') const { data, code, msg } = await requestPost(url, params) if (code === 0) { From affd6ba55d956b3ee2a5d92683e8277808e57769 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Wed, 11 Jan 2023 17:58:34 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E8=BD=AC=E6=9C=8D=E5=8A=A1=E7=9A=84?= =?UTF-8?q?=E5=9D=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../event/cpts/process-form-demand.vue | 661 +++++++++--------- 1 file changed, 312 insertions(+), 349 deletions(-) diff --git a/src/views/modules/shequzhili/event/cpts/process-form-demand.vue b/src/views/modules/shequzhili/event/cpts/process-form-demand.vue index 77c0193f0..df5912b9c 100644 --- a/src/views/modules/shequzhili/event/cpts/process-form-demand.vue +++ b/src/views/modules/shequzhili/event/cpts/process-form-demand.vue @@ -1,10 +1,12 @@ - - - - \ No newline at end of file + diff --git a/src/views/modules/shequzhili/event/cpts/process-form-demand.vue b/src/views/modules/shequzhili/event/cpts/process-form-demand.vue index df5912b9c..f5a0c1bce 100644 --- a/src/views/modules/shequzhili/event/cpts/process-form-demand.vue +++ b/src/views/modules/shequzhili/event/cpts/process-form-demand.vue @@ -607,34 +607,6 @@ export default { } }, - convert(lat, lng) { - markers.setGeometries([]); - // var input = document.getElementById('location').value.split(','); - let location; - if (lat && lng) { - location = new TMap.LatLng(lat, lng); - } else { - location = new TMap.LatLng( - this.formData.latitude, - this.formData.longitude - ); - } - - // map.setCenter(location); - markers.updateGeometries([ - { - id: "main", // 点标注数据数组 - position: location, - }, - ]); - geocoder - .getAddress({ location: location }) // 将给定的坐标位置转换为地址 - .then((result) => { - this.formData.serviceLocation = result.result.address; - // 显示搜索到的地址 - }); - }, - // 开启加载动画 startLoading() { loading = Loading.service({ From 6d06a086c2f0f439ad720d35441ecc6062c4b901 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Fri, 13 Jan 2023 09:30:46 +0800 Subject: [PATCH 5/8] 11 --- src/views/modules/base/epidemic/antiInfo.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/base/epidemic/antiInfo.vue b/src/views/modules/base/epidemic/antiInfo.vue index 166dd41b8..b9d79224e 100644 --- a/src/views/modules/base/epidemic/antiInfo.vue +++ b/src/views/modules/base/epidemic/antiInfo.vue @@ -293,7 +293,7 @@ :close-on-press-escape="false" :title="formTitle" width="1150px" - :z-index="1000" + :z-index="2000" top="5vh" class="dialog-h" @closed="handleCnalceForm"> From dca2761304b72c363d43492103efa7c58684462b Mon Sep 17 00:00:00 2001 From: jiangyy Date: Fri, 13 Jan 2023 09:32:16 +0800 Subject: [PATCH 6/8] 11 --- src/views/modules/base/epidemic/antiInfo.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/base/epidemic/antiInfo.vue b/src/views/modules/base/epidemic/antiInfo.vue index b9d79224e..3dcf9377a 100644 --- a/src/views/modules/base/epidemic/antiInfo.vue +++ b/src/views/modules/base/epidemic/antiInfo.vue @@ -880,7 +880,7 @@ export default { let params = { id } - this.$message.error('111') + // this.$message.error('111') const { data, code, msg } = await requestPost(url, params) if (code === 0) { From 19647284da396a8e708dc776c7d9b79bbacb272f Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Tue, 31 Jan 2023 15:02:51 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E7=A1=AE=E5=AE=9E=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../communityParty/orgActivity/activivityList/addActivity.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue b/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue index bbc79ac31..4b8e251ec 100644 --- a/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue +++ b/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue @@ -171,14 +171,14 @@
- +
From 6a968b50fb81e8e122a92c9839682195f568bf22 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Tue, 31 Jan 2023 17:52:16 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dpackage=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=B3=BB=E5=88=97=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 +- package.json | 96 +++++++++++++++---------------- src/views/modules/shequ/index.vue | 3 +- 3 files changed, 52 insertions(+), 51 deletions(-) diff --git a/.env.development b/.env.development index e6ba13a97..d1c8a3e7c 100644 --- a/.env.development +++ b/.env.development @@ -1,9 +1,9 @@ NODE_ENV=development -# VUE_APP_API_SERVER = http://192.168.1.140/api +VUE_APP_API_SERVER = http://192.168.1.140/api # VUE_APP_API_SERVER = https://epmet-yantai.elinkservice.cn/api # VUE_APP_API_SERVER = https://epmet-test.elinkservice.cn/api -VUE_APP_API_SERVER = https://epmet-cloud.elinkservice.cn/api +# VUE_APP_API_SERVER = https://epmet-cloud.elinkservice.cn/api # VUE_APP_API_SERVER = https://epdc-shibei.elinkservice.cn/api # VUE_APP_API_SERVER = https://epmet-dev.elinkservice.cn:41080/api # VUE_APP_API_SERVER = https://epmet-dev.elinkservice.cn/api diff --git a/package.json b/package.json index 799ec0ed1..76454b2f6 100644 --- a/package.json +++ b/package.json @@ -19,60 +19,60 @@ "@antv/l7": "2.9.14", "@antv/l7-draw": "3.0.5", "@antv/l7-maps": "2.9.14", - "@riophae/vue-treeselect": "^0.4.0", - "@tinymce/tinymce-vue": "^3.2.8", - "async-validator": "^4.2.5", - "axios": "^0.19.0", - "babel-eslint": "^8.0.1", - "babel-plugin-component": "^1.1.1", - "echarts": "^5.2.2", - "echarts-gl": "^2.0.9", + "@riophae/vue-treeselect": "0.4.0", + "@tinymce/tinymce-vue": "3.2.8", + "async-validator": "4.2.5", + "axios": "0.19.0", + "babel-eslint": "8.0.1", + "babel-plugin-component": "1.1.1", + "echarts": "5.2.2", + "echarts-gl": "2.0.9", "element-theme": "2.0.1", "element-ui": "2.13.2", - "file-saver": "^2.0.5", - "gulp-autoprefixer": "^6.1.0", - "gulp-clean-css": "^4.2.0", - "gulp-load-plugins": "^2.0.0", - "gulp-rename": "^1.4.0", - "gulp-sass": "^4.0.2", - "js-cookie": "^2.2.0", - "jsencrypt": "^3.0.3", - "lodash": "^4.17.15", - "mint-ui": "^2.2.13", - "node-sass": "^4.12.0", - "ol": "^6.9.0", - "portfinder": "^1.0.21", - "proj4": "^2.8.0", - "qs": "^6.7.0", - "quill": "^1.3.6", - "screenfull": "^4.2.1", - "sortablejs": "^1.12.0", - "svg-sprite-loader": "^4.1.6", - "throttle-debounce": "^3.0.1", - "v-distpicker": "^1.2.2", - "vue": "^2.6.11", - "vue-baidu-map": "^0.21.22", - "vue-i18n": "^8.12.0", - "vue-quill-editor": "^3.0.6", - "vue-router": "^3.0.7", - "vuex": "^3.1.1", - "xlsx": "^0.17.1" + "file-saver": "2.0.5", + "gulp-autoprefixer": "6.1.0", + "gulp-clean-css": "4.2.0", + "gulp-load-plugins": "2.0.0", + "gulp-rename": "1.4.0", + "gulp-sass": "4.0.2", + "js-cookie": "2.2.0", + "jsencrypt": "3.0.3", + "lodash": "4.17.15", + "mint-ui": "2.2.13", + "node-sass": "4.12.0", + "ol": "6.9.0", + "portfinder": "1.0.21", + "proj4": "2.8.0", + "qs": "6.7.0", + "quill": "1.3.6", + "screenfull": "4.2.1", + "sortablejs": "1.12.0", + "svg-sprite-loader": "4.1.6", + "throttle-debounce": "3.0.1", + "v-distpicker": "1.2.2", + "vue": "2.6.11", + "vue-baidu-map": "0.21.22", + "vue-i18n": "8.12.0", + "vue-quill-editor": "3.0.6", + "vue-router": "3.0.7", + "vuex": "3.1.1", + "xlsx": "0.17.1" }, "devDependencies": { - "@antv/f2": "^3.8.10-beta.1", + "@antv/f2": "3.8.10-beta.1", "@tinymce/tinymce-vue": "3.2.8", - "@vue/cli-plugin-babel": "^3.10.0", - "@vue/cli-plugin-eslint": "^3.10.0", - "@vue/cli-service": "^3.10.0", - "@vue/eslint-config-standard": "^4.0.0", - "dai-js": "^0.0.12", - "element-theme-chalk": "^2.13.0", - "natives": "^1.1.6", - "ol": "^6.9.0", - "sass-loader": "^7.3.1", - "script-loader": "^0.7.2", + "@vue/cli-plugin-babel": "3.10.0", + "@vue/cli-plugin-eslint": "3.10.0", + "@vue/cli-service": "3.10.0", + "@vue/eslint-config-standard": "4.0.0", + "dai-js": "0.0.12", + "element-theme-chalk": "2.13.0", + "natives": "1.1.6", + "ol": "6.9.0", + "sass-loader": "7.3.1", + "script-loader": "0.7.2", "tinymce": "5.8.2", - "vue-template-compiler": "^2.6.11" + "vue-template-compiler": "2.6.11" }, "eslintConfig": { "root": true, diff --git a/src/views/modules/shequ/index.vue b/src/views/modules/shequ/index.vue index 1e9825252..03c824e91 100644 --- a/src/views/modules/shequ/index.vue +++ b/src/views/modules/shequ/index.vue @@ -823,7 +823,8 @@ export default { }); } }); - return selectedFuncIdList.map((id) => obj[id]); + console.log('88888888888888888', selectedFuncIdList) + return selectedFuncIdList.filter((id) => obj[id]).map((id) => obj[id]); }, maxTableHeight() { // return this.clientHeight - 450;