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 c248f009..e4071ff4 100644 --- a/src/js/dai/request.js +++ b/src/js/dai/request.js @@ -2,7 +2,12 @@ | 请求接口封装 | ---------------------------------------------------------------*/ import axios from "axios"; +<<<<<<< HEAD // import message from "dai-js/modules/message/message"; +======= +import message from "dai-js/modules/message/message"; +import { Message } from "element-ui"; +>>>>>>> dev-20220218 import curry from "dai-js/tools/curry"; import { Message } from "element-ui"; diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue index d317dc06..86049103 100644 --- a/src/views/modules/base/community/buildTable.vue +++ b/src/views/modules/base/community/buildTable.vue @@ -587,8 +587,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 61834588..bcbc2023 100644 --- a/src/views/modules/base/community/communityTable.vue +++ b/src/views/modules/base/community/communityTable.vue @@ -621,8 +621,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 5c1b9180..7dc64508 100644 --- a/src/views/modules/base/community/roomTable.vue +++ b/src/views/modules/base/community/roomTable.vue @@ -550,8 +550,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 /> -