From 1101db0867a258c372dd2f347f249492a26bf537 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Tue, 1 Mar 2022 15:18:08 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E8=81=94=E8=B0=832?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/importRecord/index.vue | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/views/modules/importRecord/index.vue b/src/views/modules/importRecord/index.vue index d0ae9e9a..1796ece1 100644 --- a/src/views/modules/importRecord/index.vue +++ b/src/views/modules/importRecord/index.vue @@ -27,10 +27,14 @@ > 下载失败说明 + 导入失败 From 1c17724dc5a9ba9302107b3964b03b13181455d5 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Thu, 3 Mar 2022 14:07:26 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF-?= =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=88=97=E8=A1=A8=E9=AB=98=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/scss/modules/visual/basicInfoMain.scss | 13 +++++++++++-- .../modules/visual/basicinfo/basicInfoMain.vue | 2 +- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/assets/scss/modules/visual/basicInfoMain.scss b/src/assets/scss/modules/visual/basicInfoMain.scss index 5729b473..e3e624d7 100644 --- a/src/assets/scss/modules/visual/basicInfoMain.scss +++ b/src/assets/scss/modules/visual/basicInfoMain.scss @@ -399,13 +399,22 @@ } .agency_list { .agency_item { - height: 50px; + // height: 60px; + padding: 15px 0; font-size: 17px; font-family: PingFang SC; font-weight: 400; color: #ffffff; - line-height: 50px; + // line-height: 50px; padding-left: 12px; + display: flex; + flex-direction: row; + align-items: center; + // padding-top: 15px; + + .agency_item_name { + // line-height: 20px; + } } .agency_item_on { diff --git a/src/views/modules/visual/basicinfo/basicInfoMain.vue b/src/views/modules/visual/basicinfo/basicInfoMain.vue index d5dc1da0..b4e451e0 100644 --- a/src/views/modules/visual/basicinfo/basicInfoMain.vue +++ b/src/views/modules/visual/basicinfo/basicInfoMain.vue @@ -27,7 +27,7 @@ :key="index" @click="clickAgencyItem(item,index)" :class="['agency_item',{'agency_item_on':index%2 ==0}]"> -
{{item.name}}
+
{{item.name}}
From 0e116b17d9787dc69a522ff2ac7f6cf71f282001 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Fri, 4 Mar 2022 15:29:45 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E5=B0=8F=E5=8C=BA=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E6=8F=90=E9=86=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scss/modules/visual/basicInfoMain.scss | 94 ++++++++++--------- src/js/dai/request.js | 8 +- .../modules/base/community/buildTable.vue | 12 ++- .../modules/base/community/communityTable.vue | 12 ++- .../modules/base/community/roomTable.vue | 12 ++- .../visual/basicinfo/basicInfoCommunity.vue | 45 ++++++++- .../basicinfo/personCategory/recordList.vue | 2 +- 7 files changed, 129 insertions(+), 56 deletions(-) diff --git a/src/assets/scss/modules/visual/basicInfoMain.scss b/src/assets/scss/modules/visual/basicInfoMain.scss index e3e624d7..bb946c9c 100644 --- a/src/assets/scss/modules/visual/basicInfoMain.scss +++ b/src/assets/scss/modules/visual/basicInfoMain.scss @@ -182,6 +182,11 @@ } } } + + ::v-deep .el-popper { + padding: 0px; + } + // } } } @@ -320,62 +325,61 @@ color: #ffffff; line-height: 30px; } + } + } + } - .user_list { - margin-top: 2px; - position: relative; - z-index: 10; + .div_room::after { + content: ''; + flex: 1; + } +} - background: #020340; - border: 1px solid #0a359b; - border-radius: 4px; - box-shadow: 0 0 10px inset #1a5afd; +.user_list { + position: relative; + z-index: 10; - .user_item { - padding: 13px 8px 0 14px; - font-size: 16px; - font-family: PingFang SC; - font-weight: 400; - color: #ffffff; + background: #020340; + border: 1px solid #0a359b; + border-radius: 4px; + box-shadow: 0 0 10px inset #1a5afd; - .user_item_content { - display: flex; - // justify-content: space-between; - align-items: center; + .user_item { + padding: 13px 8px 0 14px; + font-size: 16px; + font-family: PingFang SC; + font-weight: 400; + color: #ffffff; - .name { - max-width: 80%; - text-align: left; - } + .user_item_content { + display: flex; + // justify-content: space-between; + align-items: center; - > img { - margin-left: auto; + .name { + max-width: 80%; + text-align: left; + } - margin-top: 4px; - width: 8px; - height: 12px; - } - } + > img { + margin-left: auto; - .item_line { - margin-top: 9px; - width: 70px; - height: 0px; - border: 1px dotted #1797ff31; - border-width: 0.5px; - } - .last_line { - border: 1px dotted #1797ff00; - } - } - } + margin-top: 4px; + width: 8px; + height: 12px; } } - } - .div_room::after { - content: ''; - flex: 1; + .item_line { + margin-top: 9px; + width: 70px; + height: 0px; + border: 1px dotted #1797ff31; + border-width: 0.5px; + } + .last_line { + border: 1px dotted #1797ff00; + } } } diff --git a/src/js/dai/request.js b/src/js/dai/request.js index 80d8118e..8ae312fe 100644 --- a/src/js/dai/request.js +++ b/src/js/dai/request.js @@ -3,6 +3,7 @@ ---------------------------------------------------------------*/ import axios from "axios"; import message from "dai-js/modules/message/message"; +import { Message } from "element-ui"; import curry from "dai-js/tools/curry"; const request = curry( @@ -36,7 +37,12 @@ const request = curry( // retData = Vue.$afterRequestHook(retData); // } if (res.data.code > 8000 && res.data.code < 10000) { - message.error(res.data.msg); + Message({ + showClose: true, + message: res.data.msg, + duration: 0 + }) + } reslove(retData); diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue index bc1bbb95..c24a0649 100644 --- a/src/views/modules/base/community/buildTable.vue +++ b/src/views/modules/base/community/buildTable.vue @@ -476,8 +476,16 @@ export default { window.app.ajax.post2(url, fileFormData, (data, rspMsg) => { - if (data.code === 0 || data.code > 8000) { - + if (data.code === 0 && data.msg == 'success') { + this.$message.success('导入成功') + } else { + this.$message({ + showClose: true, + message: rspMsg, + duration: 0, + type: "error" + }) + // this.$message.error(rspMsg) } this.$emit('refreshTree') this.loadTable() diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue index 04007c1e..8060ebfe 100644 --- a/src/views/modules/base/community/communityTable.vue +++ b/src/views/modules/base/community/communityTable.vue @@ -509,8 +509,16 @@ export default { window.app.ajax.post2(url, fileFormData, (data, rspMsg) => { - if (data.code === 0 || data.code > 8000) { - + if (data.code === 0 && data.msg == 'success') { + this.$message.success('导入成功') + } else { + this.$message({ + showClose: true, + message: rspMsg, + duration: 0, + type: "error" + }) + // this.$message.error(rspMsg) } this.$emit('refreshTree') this.loadTable() diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue index 21bd0f91..ff7ed790 100644 --- a/src/views/modules/base/community/roomTable.vue +++ b/src/views/modules/base/community/roomTable.vue @@ -439,8 +439,16 @@ export default { window.app.ajax.post2(url, fileFormData, (data, rspMsg) => { - if (data.code === 0 || data.code > 8000) { - + if (data.code === 0 && data.msg == 'success') { + this.$message.success('导入成功') + } else { + this.$message({ + showClose: true, + message: rspMsg, + duration: 0, + type: "error" + }) + // this.$message.error(rspMsg) } this.$emit('refreshTree') this.loadTable() diff --git a/src/views/modules/visual/basicinfo/basicInfoCommunity.vue b/src/views/modules/visual/basicinfo/basicInfoCommunity.vue index b977f3c6..180bffbe 100644 --- a/src/views/modules/visual/basicinfo/basicInfoCommunity.vue +++ b/src/views/modules/visual/basicinfo/basicInfoCommunity.vue @@ -46,7 +46,39 @@ :src="iconItem.iconUrl" alt /> -
+
+
+
+
{{userItem.name}}
+ + + +
+
+
+ +
+
+ + 全部成员 + +
+ + + +
@@ -458,4 +490,11 @@ export default { overflow-x: hidden !important; } } - \ No newline at end of file + + diff --git a/src/views/modules/visual/basicinfo/personCategory/recordList.vue b/src/views/modules/visual/basicinfo/personCategory/recordList.vue index c0303141..db350194 100644 --- a/src/views/modules/visual/basicinfo/personCategory/recordList.vue +++ b/src/views/modules/visual/basicinfo/personCategory/recordList.vue @@ -405,7 +405,7 @@ export default { align-items: center; .name { - max-width: 80%; + max-width: 100%; text-align: left; } From 7f16b83130132daaacebcfefc12f28ff3c14fd6e Mon Sep 17 00:00:00 2001 From: jiangyy Date: Fri, 4 Mar 2022 15:51:11 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF--?= =?UTF-8?q?=E5=B0=8F=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../visual/basicinfo/basicInfoCommunity.vue | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/views/modules/visual/basicinfo/basicInfoCommunity.vue b/src/views/modules/visual/basicinfo/basicInfoCommunity.vue index 180bffbe..9e5f972c 100644 --- a/src/views/modules/visual/basicinfo/basicInfoCommunity.vue +++ b/src/views/modules/visual/basicinfo/basicInfoCommunity.vue @@ -47,7 +47,8 @@ alt /> - @@ -75,10 +76,10 @@ - - + + --> - + @@ -132,7 +133,7 @@ export default { selBuildingId: '', selBuildingName: '', - roomLoaded: true, + roomLoaded: false, roomArray: [], selHouseId: '', selHouseName: '', @@ -238,6 +239,7 @@ export default { const { data, code, msg } = await requestPost(url, params) if (code === 0) { + this.buildingArray = data this.buildingArray.forEach(item => { if (!this.buildingArray[0].buildingName) { From 5c79d064f8b5b41679b63e3fd9e2469f86516c82 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Fri, 4 Mar 2022 17:48:24 +0800 Subject: [PATCH 05/11] fdsfs --- src/views/modules/importRecord/index.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/modules/importRecord/index.vue b/src/views/modules/importRecord/index.vue index 1796ece1..bd98184c 100644 --- a/src/views/modules/importRecord/index.vue +++ b/src/views/modules/importRecord/index.vue @@ -22,7 +22,7 @@ >导入中 已完成 导入失败导入失败，未知错误 @@ -85,7 +85,7 @@ export default { }, computed: { maxTableHeight() { - return this.clientHeight - 450; + return this.clientHeight - 300; }, ...mapGetters(["clientHeight"]), }, From 408f70d3b7741bcadb3d26b5c55edd11f78e080d Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 4 Mar 2022 18:05:44 +0800 Subject: [PATCH 06/11] =?UTF-8?q?-=E4=BF=AE=E6=94=B9=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production | 2 +- public/index.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.env.production b/.env.production index 17eebff3..6592f042 100644 --- a/.env.production +++ b/.env.production @@ -1,4 +1,4 @@ NODE_ENV=production -VUE_APP_API_SERVER = https://epdc-shibei.elinkservice.cn/api +VUE_APP_API_SERVER = https://epmet-cloud.elinkservice.cn/api VUE_APP_NODE_ENV=prod VUE_APP_PUBLIC_PATH=epmet-oper \ No newline at end of file diff --git a/public/index.html b/public/index.html index 6b33435e..1fcf3218 100644 --- a/public/index.html +++ b/public/index.html @@ -64,7 +64,7 @@ <% if (process.env.VUE_APP_NODE_ENV==='prod' ) { %> <% } %> From 736c35d4acb83ac7334a5f4ca9c9b8575d5955fa Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 4 Mar 2022 18:14:05 +0800 Subject: [PATCH 07/11] =?UTF-8?q?-=E4=BF=AE=E6=94=B9=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=9C=B0=E5=9D=80=20=E6=8F=90=E4=B8=AA=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production | 2 +- public/index.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.env.production b/.env.production index 6592f042..eb6b823a 100644 --- a/.env.production +++ b/.env.production @@ -1,4 +1,4 @@ NODE_ENV=production -VUE_APP_API_SERVER = https://epmet-cloud.elinkservice.cn/api +VUE_APP_API_SERVER = https://epmet-cloud.elinkservice.cn/api22 VUE_APP_NODE_ENV=prod VUE_APP_PUBLIC_PATH=epmet-oper \ No newline at end of file diff --git a/public/index.html b/public/index.html index 1fcf3218..308bf5ae 100644 --- a/public/index.html +++ b/public/index.html @@ -64,7 +64,7 @@ <% if (process.env.VUE_APP_NODE_ENV==='prod' ) { %> <% } %> From 820abc70788ca31882849a6bd9b54bb348a30cb3 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 4 Mar 2022 18:14:27 +0800 Subject: [PATCH 08/11] =?UTF-8?q?-=E4=BF=AE=E6=94=B9=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=9C=B0=E5=9D=80=20=E6=8F=90=E4=B8=AA=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production | 2 +- public/index.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.env.production b/.env.production index eb6b823a..6592f042 100644 --- a/.env.production +++ b/.env.production @@ -1,4 +1,4 @@ NODE_ENV=production -VUE_APP_API_SERVER = https://epmet-cloud.elinkservice.cn/api22 +VUE_APP_API_SERVER = https://epmet-cloud.elinkservice.cn/api VUE_APP_NODE_ENV=prod VUE_APP_PUBLIC_PATH=epmet-oper \ No newline at end of file diff --git a/public/index.html b/public/index.html index 308bf5ae..1fcf3218 100644 --- a/public/index.html +++ b/public/index.html @@ -64,7 +64,7 @@ <% if (process.env.VUE_APP_NODE_ENV==='prod' ) { %> <% } %> From ba46ba45e6818a0105bdc14bf1f2616325373369 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Mon, 7 Mar 2022 14:06:04 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E6=89=93=E6=89=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/scss/modules/search.scss | 4 +++- src/views/modules/shequ/index.vue | 16 +++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/assets/scss/modules/search.scss b/src/assets/scss/modules/search.scss index d0222b5c..7b4cb925 100644 --- a/src/assets/scss/modules/search.scss +++ b/src/assets/scss/modules/search.scss @@ -26,13 +26,15 @@ .input { position: relative; - select { + .select-show { border: none; + display: block; font-size: 16px; width: 90px; line-height: 32px; text-align: center; color: #0082fb; + cursor: default; } input { diff --git a/src/views/modules/shequ/index.vue b/src/views/modules/shequ/index.vue index c0f09f69..7469479e 100644 --- a/src/views/modules/shequ/index.vue +++ b/src/views/modules/shequ/index.vue @@ -9,11 +9,17 @@
- + + + {{{jumin:'居民', fangwu: '房屋', xuqiu:'需求'}[searchData.type]}} + + + 居民 + 房屋 + 需求 + + Date: Mon, 7 Mar 2022 15:12:39 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/js/dai/request.js | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/js/dai/request.js b/src/js/dai/request.js index 8ae312fe..7d908450 100644 --- a/src/js/dai/request.js +++ b/src/js/dai/request.js @@ -2,9 +2,9 @@ | 请求接口封装 | ---------------------------------------------------------------*/ import axios from "axios"; -import message from "dai-js/modules/message/message"; -import { Message } from "element-ui"; + import curry from "dai-js/tools/curry"; +import { Message } from "element-ui"; const request = curry( (method, url, data = {}, headers = {}, progress = () => {}) => { @@ -37,12 +37,7 @@ const request = curry( // retData = Vue.$afterRequestHook(retData); // } if (res.data.code > 8000 && res.data.code < 10000) { - Message({ - showClose: true, - message: res.data.msg, - duration: 0 - }) - + // Message.error(res.data.msg); } reslove(retData); From 9ca52aa4cea7545358d89797e59793d2d5f4f989 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Mon, 7 Mar 2022 16:25:43 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E5=B0=8F=E5=8C=BA=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/base/community/buildTable.vue | 14 +++++++------- .../modules/base/community/communityTable.vue | 14 +++++++------- src/views/modules/base/community/roomTable.vue | 14 +++++++------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue index c24a0649..05415d91 100644 --- a/src/views/modules/base/community/buildTable.vue +++ b/src/views/modules/base/community/buildTable.vue @@ -477,14 +477,14 @@ export default { (data, rspMsg) => { if (data.code === 0 && data.msg == 'success') { - this.$message.success('导入成功') + // this.$message.success('导入成功') } else { - this.$message({ - showClose: true, - message: rspMsg, - duration: 0, - type: "error" - }) + // this.$message({ + // showClose: true, + // message: rspMsg, + // duration: 0, + // type: "error" + // }) // this.$message.error(rspMsg) } this.$emit('refreshTree') diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue index 8060ebfe..429c782a 100644 --- a/src/views/modules/base/community/communityTable.vue +++ b/src/views/modules/base/community/communityTable.vue @@ -510,14 +510,14 @@ export default { (data, rspMsg) => { if (data.code === 0 && data.msg == 'success') { - this.$message.success('导入成功') + // this.$message.success('导入成功') } else { - this.$message({ - showClose: true, - message: rspMsg, - duration: 0, - type: "error" - }) + // this.$message({ + // showClose: true, + // message: rspMsg, + // duration: 0, + // type: "error" + // }) // this.$message.error(rspMsg) } this.$emit('refreshTree') diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue index ff7ed790..5a0c736e 100644 --- a/src/views/modules/base/community/roomTable.vue +++ b/src/views/modules/base/community/roomTable.vue @@ -440,14 +440,14 @@ export default { (data, rspMsg) => { if (data.code === 0 && data.msg == 'success') { - this.$message.success('导入成功') + // this.$message.success('导入成功') } else { - this.$message({ - showClose: true, - message: rspMsg, - duration: 0, - type: "error" - }) + // this.$message({ + // showClose: true, + // message: rspMsg, + // duration: 0, + // type: "error" + // }) // this.$message.error(rspMsg) } this.$emit('refreshTree')