From 0e116b17d9787dc69a522ff2ac7f6cf71f282001 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Fri, 4 Mar 2022 15:29:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E5=8C=BA=E5=AF=BC=E5=85=A5=E6=8F=90?= =?UTF-8?q?=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; }