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' ) { %> <% } %> 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/assets/scss/modules/visual/basicInfoMain.scss b/src/assets/scss/modules/visual/basicInfoMain.scss index 5729b473..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; + } } } @@ -399,13 +403,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/js/dai/request.js b/src/js/dai/request.js index c248f009..8365bd3e 100644 --- a/src/js/dai/request.js +++ b/src/js/dai/request.js @@ -2,7 +2,6 @@ | 请求接口封装 | ---------------------------------------------------------------*/ import axios from "axios"; -// import message from "dai-js/modules/message/message"; import curry from "dai-js/tools/curry"; import { Message } from "element-ui"; @@ -37,12 +36,7 @@ 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 - }) + // Message.error(res.data.msg); } reslove(retData); diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue index d317dc06..002c73e0 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..8566f09b 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..5b3b80fc 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/importRecord/index.vue b/src/views/modules/importRecord/index.vue index d0ae9e9a..bd98184c 100644 --- a/src/views/modules/importRecord/index.vue +++ b/src/views/modules/importRecord/index.vue @@ -22,15 +22,19 @@ >导入中 已完成 下载失败说明 + 导入失败,未知错误 @@ -81,7 +85,7 @@ export default { }, computed: { maxTableHeight() { - return this.clientHeight - 450; + return this.clientHeight - 300; }, ...mapGetters(["clientHeight"]), }, 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 @@ 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; }