From 791388c1ac89e2afda25193ef2bb4eaecee48496 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Thu, 3 Mar 2022 15:16:47 +0800 Subject: [PATCH 01/30] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 76 ++++++++++++------------ src/views/modules/importRecord/index.vue | 2 +- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index e278ad84..e138f4ec 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -282,44 +282,44 @@ router.beforeEach((to, from, next) => { url: "visual/heart/index", children: [], }, - // { - // icon: "icon-setting", - // id: "44rq22222q2222", - // name: "AI安防", - // // url: "visual/basicinfo/basicInfoMain", - // children: [ - // { - // url: "/visual/ai/index", - // name: "AI安防", - // id: "5feawfwa111111efwa57", - // }, - // { - // url: "/visual/ai/renliu", - // name: "人流数据", - // id: "5fwaefwae222112fawef58", - // }, - // { - // url: "/visual/ai/cheliu", - // name: "车流数据", - // id: "erawerwecsxefwaw", - // }, - // { - // url: "/visual/ai/shebei", - // name: "设备数据", - // id: "zfzffewaf", - // }, - // { - // url: "/visual/ai/gongdan", - // name: "工单数据", - // id: "fewafwafewaefddd", - // }, - // { - // url: "/visual/ai/yujing", - // name: "预警事件", - // id: "545345fdsfs", - // }, - // ], - // }, + { + icon: "icon-setting", + id: "44rq22222q2222", + name: "AI安防", + // url: "visual/basicinfo/basicInfoMain", + children: [ + { + url: "/visual/ai/index", + name: "AI安防", + id: "5feawfwa111111efwa57", + }, + { + url: "/visual/ai/renliu", + name: "人流数据", + id: "5fwaefwae222112fawef58", + }, + { + url: "/visual/ai/cheliu", + name: "车流数据", + id: "erawerwecsxefwaw", + }, + { + url: "/visual/ai/shebei", + name: "设备数据", + id: "zfzffewaf", + }, + { + url: "/visual/ai/gongdan", + name: "工单数据", + id: "fewafwafewaefddd", + }, + { + url: "/visual/ai/yujing", + name: "预警事件", + id: "545345fdsfs", + }, + ], + }, ]; fnAddDynamicMenuRoutes2(window.SITE_CONFIG["menuShujuList"]); diff --git a/src/views/modules/importRecord/index.vue b/src/views/modules/importRecord/index.vue index 1796ece1..1198e63a 100644 --- a/src/views/modules/importRecord/index.vue +++ b/src/views/modules/importRecord/index.vue @@ -22,7 +22,7 @@ >导入中 已完成 Date: Fri, 4 Mar 2022 09:28:51 +0800 Subject: [PATCH 02/30] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E4=BC=98=E5=8C=963?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/importRecord/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/importRecord/index.vue b/src/views/modules/importRecord/index.vue index 1198e63a..c77d1cf5 100644 --- a/src/views/modules/importRecord/index.vue +++ b/src/views/modules/importRecord/index.vue @@ -85,7 +85,7 @@ export default { }, computed: { maxTableHeight() { - return this.clientHeight - 450; + return this.clientHeight - 300; }, ...mapGetters(["clientHeight"]), }, From 87ea87d2bbc97bc1ee4b18ef5d100bda2870bc30 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Fri, 4 Mar 2022 10:32:52 +0800 Subject: [PATCH 03/30] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E4=BC=98=E5=8C=964?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/importRecord/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/importRecord/index.vue b/src/views/modules/importRecord/index.vue index c77d1cf5..bd98184c 100644 --- a/src/views/modules/importRecord/index.vue +++ b/src/views/modules/importRecord/index.vue @@ -33,7 +33,7 @@ > 导入失败导入失败，未知错误 From d48f05ab04d7bc92fabeff894297df184e0a506b Mon Sep 17 00:00:00 2001 From: jiangyy Date: Fri, 4 Mar 2022 16:12:13 +0800 Subject: [PATCH 04/30] =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/js/dai/request.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/js/dai/request.js b/src/js/dai/request.js index e4071ff4..41864aea 100644 --- a/src/js/dai/request.js +++ b/src/js/dai/request.js @@ -2,12 +2,8 @@ | 请求接口封装 | ---------------------------------------------------------------*/ 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"; From 46d604ac8bcc6f46054143d762d674ea5df060f0 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Fri, 4 Mar 2022 16:17:43 +0800 Subject: [PATCH 05/30] 11 --- src/js/dai/request.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/js/dai/request.js b/src/js/dai/request.js index 41864aea..93b51680 100644 --- a/src/js/dai/request.js +++ b/src/js/dai/request.js @@ -2,8 +2,6 @@ | 请求接口封装 | ---------------------------------------------------------------*/ 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"; From b8802c7ef2efcec8d7a22e3e3adeb8ec1f4fbf27 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Fri, 4 Mar 2022 16:31:05 +0800 Subject: [PATCH 06/30] =?UTF-8?q?=E5=B0=8F=E5=8C=BA=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=AF=BC=E5=85=A5=E6=88=90=E5=8A=9F=E6=8F=90?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/base/community/buildTable.vue | 2 +- src/views/modules/base/community/communityTable.vue | 2 +- src/views/modules/base/community/roomTable.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue index 86049103..9066cd7d 100644 --- a/src/views/modules/base/community/buildTable.vue +++ b/src/views/modules/base/community/buildTable.vue @@ -588,7 +588,7 @@ export default { (data, rspMsg) => { if (data.code === 0 && data.msg == 'success') { - this.$message.success('导入成功') + // this.$message.success('导入成功') } else { this.$message({ showClose: true, diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue index bcbc2023..e4e504cb 100644 --- a/src/views/modules/base/community/communityTable.vue +++ b/src/views/modules/base/community/communityTable.vue @@ -622,7 +622,7 @@ export default { (data, rspMsg) => { if (data.code === 0 && data.msg == 'success') { - this.$message.success('导入成功') + // this.$message.success('导入成功') } else { this.$message({ showClose: true, diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue index 7dc64508..d17e7a9b 100644 --- a/src/views/modules/base/community/roomTable.vue +++ b/src/views/modules/base/community/roomTable.vue @@ -551,7 +551,7 @@ export default { (data, rspMsg) => { if (data.code === 0 && data.msg == 'success') { - this.$message.success('导入成功') + // this.$message.success('导入成功') } else { this.$message({ showClose: true, From 16f9572a9cc86582d5f021cb15055a80594c8e8c Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Mon, 7 Mar 2022 15:10:02 +0800 Subject: [PATCH 07/30] ddd --- src/js/dai/request.js | 7 +- src/js/dai/request2.js | 90 ++++++++++++++++++++++++ src/views/modules/importRecord/index.vue | 2 +- 3 files changed, 92 insertions(+), 7 deletions(-) create mode 100644 src/js/dai/request2.js diff --git a/src/js/dai/request.js b/src/js/dai/request.js index 93b51680..8365bd3e 100644 --- a/src/js/dai/request.js +++ b/src/js/dai/request.js @@ -36,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/js/dai/request2.js b/src/js/dai/request2.js new file mode 100644 index 00000000..8c38025d --- /dev/null +++ b/src/js/dai/request2.js @@ -0,0 +1,90 @@ +/*--------------------------------------------------------------- + | 请求接口封装 | + ---------------------------------------------------------------*/ +import axios from "axios"; +import curry from "dai-js/tools/curry"; +import { Message } from "element-ui"; + +const request = curry( + (method, url, data = {}, headers = {}, progress = () => {}) => { + return new Promise((reslove) => { + let returnIniData = { + httpCode: "", + data: {}, + msg: "", + code: "", + }; + + // 添加服务器端URL + function processUrl(url) { + if (url.indexOf("http://") > -1 || url.indexOf("https://") > -1) { + return url; + } + return process.env.VUE_APP_API_SERVER + url; + } + + url = processUrl(url); + + const succFn = (res) => { + // log(`[request成功] ${url}`, data, res); + let retData = { + ...returnIniData, + ...res.data, + httpCode: res.statusCode, + }; + // if(typeof Vue.$afterRequestHook == 'function'){ + // retData = Vue.$afterRequestHook(retData); + // } + if (res.data.code > 8000 && res.data.code < 10000) { + Message.error(res.data.msg); + } + + reslove(retData); + }; + + const failFn = (err) => { + // log(`[request失败] ${url}`, data, err); + + reslove( + Object.assign({}, returnIniData, { + httpCode: "9999", //访问出现意外 + msg: "网络错误", + }) + ); + }; + + if (method.toUpperCase() == "POST") { + axios + .post(url, data, { + headers, + responseType: "json", + // progress, + // credentials: false, + }) + .then(succFn) + .catch(failFn); + } else { + axios + .get(url, { + params: data, + headers, + responseType: "json", + // credentials: true, + }) + .then(succFn) + .catch(failFn); + } + }); + } +); + +export const requestGet = request("get"); + +export const requestPost = request("post"); + +export default { + install(Vue) { + Vue.prototype.$requestGet = requestGet; + Vue.prototype.$requestPost = requestPost; + }, +}; diff --git a/src/views/modules/importRecord/index.vue b/src/views/modules/importRecord/index.vue index bd98184c..978ab1d3 100644 --- a/src/views/modules/importRecord/index.vue +++ b/src/views/modules/importRecord/index.vue @@ -55,7 +55,7 @@ <% } %> - + <!– 验收测试环境 aliyun –> <% if (process.env.VUE_APP_NODE_ENV==='prod:uat' ) { %> <% } %> - + <!– 生产环境 –> <% if (process.env.VUE_APP_NODE_ENV==='prod' ) { %> - <% } %> + <% } %>--> + + From cf801c8c094757e661639735e9639e73a7d48ba4 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Wed, 9 Mar 2022 16:02:19 +0800 Subject: [PATCH 12/30] =?UTF-8?q?=E6=96=87=E5=AD=97=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/communityService/ninePlaces/inspect/inspect.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/communityService/ninePlaces/inspect/inspect.vue b/src/views/modules/communityService/ninePlaces/inspect/inspect.vue index 0ac581be..cd892114 100644 --- a/src/views/modules/communityService/ninePlaces/inspect/inspect.vue +++ b/src/views/modules/communityService/ninePlaces/inspect/inspect.vue @@ -132,7 +132,7 @@ Date: Thu, 10 Mar 2022 14:16:40 +0800 Subject: [PATCH 13/30] =?UTF-8?q?=E5=8F=AF=E8=A7=86=E5=8C=96=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0=E7=BB=86=E8=8A=82=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/img/modules/visual/popup.png | Bin 0 -> 4384 bytes .../modules/visual/basicInfoMain copy.scss | 499 +++++++ .../scss/modules/visual/basicInfoMain.scss | 131 +- src/assets/scss/modules/visual/people.scss | 1151 +++++++++-------- .../scss/modules/visual/personCategory.scss | 57 +- .../modules/base/community/buildTable.vue | 2 +- .../modules/base/community/communityTable.vue | 2 +- .../modules/base/community/roomTable.vue | 2 +- .../visual/basicinfo/basicInfoMain copy.vue | 1074 +++++++++++++++ .../visual/basicinfo/basicInfoMain.vue | 142 +- src/views/modules/visual/basicinfo/people.vue | 475 +++---- .../visual/basicinfo/personCategory/index.vue | 33 +- 12 files changed, 2543 insertions(+), 1025 deletions(-) create mode 100644 src/assets/img/modules/visual/popup.png create mode 100644 src/assets/scss/modules/visual/basicInfoMain copy.scss create mode 100644 src/views/modules/visual/basicinfo/basicInfoMain copy.vue diff --git a/src/assets/img/modules/visual/popup.png b/src/assets/img/modules/visual/popup.png new file mode 100644 index 0000000000000000000000000000000000000000..a529d9267853078b1f0307cced2e8ec8006e0f8d GIT binary patch literal 4384 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 img { + width: 24px; + height: 24px; + } + } + + > span { + line-height: 56px; + margin-left: 10px; + } + } + + .btn { + text-align: center; + flex: 0 0 113px; + height: 56px; + background: linear-gradient(90deg, #1a5afd, #26c4ff); + font-size: 20px; + font-family: PingFang SC; + font-weight: 400; + color: #ffffff; + line-height: 56px; + border-radius: 0 4px 4px 0; + } + } + + .div_search:hover { + cursor: pointer; + } + + .div_info { + box-sizing: border-box; + width: 100%; + margin-top: 21px; + height: calc(88vh - 87px); + color: #fff; + background: url('../../../img/modules/visual/warning-box.png') no-repeat + center; + background-size: 100% 100%; + // padding: 45px 21px 35px 24px; + + .info_loading { + margin-top: 50px; + } + .info_tip { + padding: 31px 0 0 19px; + display: flex; + > img { + height: 34px; + width: 46px; + } + + .tip_title { + line-height: 34px; + margin-left: 7px; + font-size: 22px; + font-family: PingFang SC; + font-weight: 800; + color: #ffffff; + } + } + + .info_list { + margin-top: 9px; + + .item { + .item_line { + margin-top: 13px; + margin-left: 24px; + width: 517px; + height: 0px; + border: 1px dotted #1797ff31; + border-width: 0.5px; + } + .last_line { + border: 1px dotted #1797ff00; + } + .list_item { + display: flex; + padding: 18px 59px 0; + justify-content: space-between; + + .list_item_col { + flex: 0 0 240px; + display: flex; + + > img { + height: 76px; + width: 76px; + } + + .item_content { + margin-left: 10px; + height: 76px; + display: flex; + flex-direction: column; + justify-content: center; + + .item_label { + font-size: 18px; + font-family: PingFang SC; + font-weight: 400; + color: #ffffff; + } + .item_count { + margin-top: 10px; + font-size: 28px; + font-family: PingFang SC; + font-weight: bold; + color: #00fffc; + } + } + } + } + + ::v-deep .el-popper { + padding: 0px; + } + // + } + } + } + + .div_info { + /deep/ .el-scrollbar__wrap { + overflow-x: hidden !important; + } + } + } +} + +.div_community_info { + box-sizing: border-box; + flex: 0 0 calc(100vw - 620px); + // width: calc(100vw - 560px); + + height: calc(88vh - 10px); + color: #fff; + background: url('../../../img/modules/visual/warning-box.png') no-repeat + center; + background-size: 100% 100%; + + .div_select { + margin-top: 28px; + margin-left: 24px; + display: flex; + .customer_select { + display: flex; + justify-content: flex-start; + + > span { + width: auto; + font-size: 22px; + font-family: PingFang SC; + font-weight: 800; + color: #ffffff; + line-height: 34px; + } + } + > img { + height: 34px; + width: 46px; + } + + .tip_title { + line-height: 34px; + margin-left: 12px; + font-size: 22px; + font-family: PingFang SC; + font-weight: 800; + color: #ffffff; + } + } + + .div_room_bar { + box-sizing: border-box; + + margin-top: 9px; + height: calc(88vh - 120px); + } + + .div_room { + // height: calc(88vh - 40px); + // margin-top: 9px; + display: flex; + flex-wrap: wrap; + justify-content: flex-start; + margin: 0 21px 0 21px; + + .item:hover { + cursor: pointer; + } + .item_sel { + box-shadow: 0 0 10px inset #1a5afd; + } + .item { + background-color: #011168; + margin-top: 12px; + width: 244px; + height: 190px; + border: 1px solid #037ddc; + border-radius: 8px; + text-align: center; + margin-left: 11px; + position: relative; + + // &:first-child { + // margin-left: 0; + // } + + .housename { + margin-top: 70px; + font-size: 24px; + font-family: PingFang SC; + font-weight: 500; + color: #ffffff; + // line-height: 180px; + } + + .icon_party { + position: absolute; + top: 13px; + left: 18px; + } + + .icon_category { + position: absolute; + bottom: 14px; + left: 9px; + // margin-left: 7px; + + > img { + margin-left: 5px; + width: 21px; + height: 20px; + } + } + .div_user:hover { + cursor: pointer; + } + + .div_user { + position: absolute; + bottom: 10px; + right: 11px; + width: 88px; + height: 30px; + background: #073082; + border-radius: 15px; + + > img { + width: 10px; + height: 6px; + margin-left: 4px; + } + + > span { + font-size: 14px; + font-family: PingFang SC; + font-weight: 400; + color: #ffffff; + line-height: 30px; + } + } + } + } + + .div_room::after { + content: ''; + flex: 1; + } +} + +.user_list { + position: relative; + z-index: 10; + + background: #020340; + border: 1px solid #0a359b; + border-radius: 4px; + box-shadow: 0 0 10px inset #1a5afd; + + .user_item { + padding: 13px 8px 0 14px; + font-size: 16px; + font-family: PingFang SC; + font-weight: 400; + color: #ffffff; + + .user_item_content { + display: flex; + // justify-content: space-between; + align-items: center; + + .name { + max-width: 80%; + text-align: left; + } + + > img { + margin-left: auto; + + margin-top: 4px; + width: 8px; + height: 12px; + } + } + + .item_line { + margin-top: 9px; + width: 70px; + height: 0px; + border: 1px dotted #1797ff31; + border-width: 0.5px; + } + .last_line { + border: 1px dotted #1797ff00; + } + } +} +.div_agency_tran { + transition: width 2s ease-out, opacity 1s ease-in, visibility 1s ease-in; + width: 0; + height: 470px; + z-index: 1000; + position: absolute; + top: 50px; + right: 600px; + box-sizing: border-box; + display: flex; + justify-content: center; + align-items: center; + + .div_agency_list { + width: 320px; + height: 470px; + color: #fff; + background: url('../../../img/modules/visual/box-2.png') no-repeat center; + background-size: 100% 100%; + padding: 45px 20px 35px 20px; + + .agency_main { + height: 100%; + position: relative; + } + + .agency_main { + /deep/ .el-scrollbar__wrap { + overflow-x: hidden !important; + } + } + + .no-data-img { + text-align: center; + margin-top: 50px; + margin-left: 15px; + } + .agency_list { + .agency_item { + // height: 60px; + padding: 15px 0; + font-size: 17px; + font-family: PingFang SC; + font-weight: 400; + color: #ffffff; + // 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 { + background: #08216c; + border-radius: 2px; + } + + .agency_item:hover { + cursor: pointer; + background-color: #011168; + border-radius: 4px 0 0 4px; + border: none; + box-shadow: 0 0 10px inset #1a5afd; + border-radius: 2px; + } + } + } + + .arrow_tip { + margin-right: -2px; + > img { + width: 21px; + height: 176px; + } + } + .arrow_tip:hover { + cursor: pointer; + } +} + +.div_agency_tran-fade-in { + width: 341px; + opacity: 1; + visibility: 1; +} +.div_agency_tran-fade-out { + visibility: 0; + opacity: 1; + width: 0; + right: 575px; +} +// .div_agency_list-fade-in { +// width: 341px; +// opacity: 1; +// visibility: 1; +// } +// .div_agency_list-fade-out { +// visibility: 0; +// opacity: 0; +// width: 0; +// } diff --git a/src/assets/scss/modules/visual/basicInfoMain.scss b/src/assets/scss/modules/visual/basicInfoMain.scss index 8b7cfd43..72c37bd1 100644 --- a/src/assets/scss/modules/visual/basicInfoMain.scss +++ b/src/assets/scss/modules/visual/basicInfoMain.scss @@ -42,6 +42,7 @@ // background: url('../../../img/modules/visual/warning-box.png') no-repeat // center; // background-size: 100% 100%; + position: relative; } .div_data { @@ -392,72 +393,98 @@ } } -.div_agency_list { - z-index: 1000; +.m-sidebar { position: absolute; + right: 0; top: 50px; - right: 600px; - box-sizing: border-box; - width: 320px; + z-index: 1000; + width: 370px; height: 470px; - color: #fff; - background: url('../../../img/modules/visual/box-2.png') no-repeat center; - background-size: 100% 100%; - padding: 45px 20px 35px 20px; + overflow: hidden; - .agency_main { - height: 100%; - position: relative; - .arrow_tip { - position: absolute; - top: 180px; - left: -20px; - } + .wrap { + display: flex; + justify-content: flex-start; + align-items: center; + background-color: rgba(rgb(173, 173, 173), 0); + transform: translateX(-5px); + transition: all ease 1s; + border-radius: 4px; } - .agency_main { - /deep/ .el-scrollbar__wrap { - overflow-x: hidden !important; - } + .wrap-hidden { + transform: translateX(339px); } - .no-data-img { - text-align: center; - margin-top: 50px; - margin-left: 15px; - } - .agency_list { - .agency_item { - // height: 60px; - padding: 15px 0; - font-size: 17px; - font-family: PingFang SC; - font-weight: 400; - color: #ffffff; - // line-height: 50px; - padding-left: 12px; - display: flex; - flex-direction: row; - align-items: center; - // padding-top: 15px; + .div_agency_list { + width: 320px; + height: 470px; + color: #fff; + background: url('../../../img/modules/visual/box-2.png') no-repeat center; + background-size: 100% 100%; + padding: 45px 20px 35px 20px; - .agency_item_name { - // line-height: 20px; + .agency_main { + height: 100%; + position: relative; + } + + .agency_main { + /deep/ .el-scrollbar__wrap { + overflow-x: hidden !important; } } - .agency_item_on { - background: #08216c; - border-radius: 2px; + .no-data-img { + text-align: center; + margin-top: 50px; + margin-left: 15px; } + .agency_list { + .agency_item { + // height: 60px; + padding: 15px 0; + font-size: 17px; + font-family: PingFang SC; + font-weight: 400; + color: #ffffff; + // line-height: 50px; + padding-left: 12px; + display: flex; + flex-direction: row; + align-items: center; + // padding-top: 15px; - .agency_item:hover { - cursor: pointer; - background-color: #011168; - border-radius: 4px 0 0 4px; - border: none; - box-shadow: 0 0 10px inset #1a5afd; - border-radius: 2px; + .agency_item_name { + // line-height: 20px; + } + } + + .agency_item_on { + background: #08216c; + border-radius: 2px; + } + + .agency_item:hover { + cursor: pointer; + background-color: #011168; + border-radius: 4px 0 0 4px; + border: none; + box-shadow: 0 0 10px inset #1a5afd; + border-radius: 2px; + } } } + + .arrow_tip { + margin-right: -2px; + margin-left: 10px; + > img { + width: 22px; + height: 176px; + } + } + .arrow_tip:hover { + cursor: pointer; + } } diff --git a/src/assets/scss/modules/visual/people.scss b/src/assets/scss/modules/visual/people.scss index 5a6edb5f..01c04348 100644 --- a/src/assets/scss/modules/visual/people.scss +++ b/src/assets/scss/modules/visual/people.scss @@ -1,650 +1,657 @@ -@import "../../c/config"; -@import "../../c/function"; -@import "./c/common"; +@import '../../c/config'; +@import '../../c/function'; +@import './c/common'; .g-cpt { + display: flex; + flex-wrap: wrap; + justify-content: center; + margin-top: 5px; + + .g-l { + width: 850px; + margin-bottom: 20px; + } + + .g-r { + margin-left: 6px; + width: calc(100% - 850px - 6px); + min-width: 850px; + } +} + +.m-people { + position: relative; + + .title { + padding: 10px; + font-size: 22px; + font-family: PingFang SC; + font-weight: 800; + color: #ffffff; display: flex; - flex-wrap: wrap; - justify-content: center; - margin-top: 5px; + align-items: center; - .g-l { - width: 850px; - margin-bottom: 20px; + img { + display: block; + margin-right: 5px; } - - .g-r { - margin-left: 6px; - width: calc(100% - 850px - 6px); - min-width: 850px; + span { + display: block; } -} - -.m-people { + } + + .more { + // position: absolute; + margin-left: auto; + margin-top: -10px; + width: 90px; + height: 29px; + line-height: 29px; + background: linear-gradient(90deg, #1a5afd, #26c4ff); + border-radius: 15px; + font-size: 14px; + font-family: PingFang SC; + font-weight: 500; + color: #ffffff; + text-align: center; + cursor: pointer; + } + + .ren { position: relative; + margin-top: 0; + padding-bottom: 15px; + + .ren-name { + position: absolute; + left: 0; + right: 0; + top: -10px; + width: 400px; + margin: 0 auto; + font-size: 24px; + line-height: 40px; + font-family: PingFang SC; + font-weight: 500; + color: #ffffff; + + > span { + @include toe; + display: block; + text-align: center; + } - .title { - padding: 10px; - font-size: 22px; - font-family: PingFang SC; - font-weight: 800; - color: #ffffff; - display: flex; - align-items: center; - - img { - display: block; - margin-right: 5px; - } - span { - display: block; - } + > img { + display: block; + margin: 3px auto; + } } - .more { - // position: absolute; - margin-left: auto; - margin-top: -10px; - width: 90px; - height: 29px; - line-height: 29px; - background: linear-gradient(90deg, #1a5afd, #26c4ff); - border-radius: 15px; - font-size: 14px; + .pic-ren { + margin: 0 auto; + display: block; + pointer-events: none; + } + .ren-prop { + position: absolute; + width: 100px; + height: 120px; + + &.z-1 { + left: 170px; + top: 10px; + } + &.z-6 { + right: 170px; + top: 10px; + } + &.z-2 { + left: 55px; + top: 110px; + } + &.z-5 { + right: 55px; + top: 110px; + } + &.z-3 { + left: 115px; + top: 245px; + } + &.z-4 { + right: 115px; + top: 245px; + } + + > img { + margin: 0 auto; + } + > span { + display: block; + font-size: 16px; + line-height: 30px; font-family: PingFang SC; font-weight: 500; color: #ffffff; text-align: center; - cursor: pointer; - } - - .ren { - position: relative; - margin-top: 0; - padding-bottom: 15px; - - .ren-name { - position: absolute; - left: 0; - right: 0; - top: -10px; - width: 400px; - margin: 0 auto; - font-size: 24px; - line-height: 40px; - font-family: PingFang SC; - font-weight: 500; - color: #ffffff; - - > span { - @include toe; - display: block; - text-align: center; - } + } - > img { - display: block; - margin: 3px auto; - } + &:hover { + .ren-cnt { + display: block; } + } - .pic-ren { - margin: 0 auto; - display: block; - pointer-events: none; + .ren-cnt { + position: absolute; + z-index: 10; + display: none; + box-sizing: border-box; + top: 60px; + left: 90px; + padding: 10px; + width: 162px; + min-height: 60px; + background: rgba(#b7c7e0, 0.24); + line-height: 20px; + + h5 { + margin: 0; + font-size: 16px; + font-family: PingFang SC; + font-weight: 500; + color: #fefefe; } - .ren-prop { - position: absolute; - width: 100px; - height: 120px; - - &.z-1 { - left: 170px; - top: 10px; - } - &.z-6 { - right: 170px; - top: 10px; - } - &.z-2 { - left: 55px; - top: 110px; - } - &.z-5 { - right: 55px; - top: 110px; - } - &.z-3 { - left: 115px; - top: 245px; - } - &.z-4 { - right: 115px; - top: 245px; - } - - > img { - margin: 0 auto; - } - > span { - display: block; - font-size: 16px; - line-height: 30px; - font-family: PingFang SC; - font-weight: 500; - color: #ffffff; - text-align: center; - } - &:hover { - .ren-cnt { - display: block; - } - } - - .ren-cnt { - position: absolute; - z-index: 10; - display: none; - box-sizing: border-box; - top: 60px; - left: 90px; - padding: 10px; - width: 162px; - min-height: 60px; - background: rgba(#b7c7e0, 0.24); - line-height: 20px; - - h5 { - margin: 0; - font-size: 16px; - font-family: PingFang SC; - font-weight: 500; - color: #fefefe; - } - - p { - margin: 0; - margin-top: 4px; - font-size: 14px; - font-family: PingFang SC; - font-weight: 400; - color: #fefefe; - } - } + p { + margin: 0; + margin-top: 4px; + font-size: 14px; + font-family: PingFang SC; + font-weight: 400; + color: #fefefe; } + } } + } } .m-pop { - @include shield; - background-color: rgba(#000, 0.9); - overflow-y: auto; - - .wrap { - position: relative; - margin: 120px auto; - width: 1000px; + @include shield; + background-color: rgba(#000, 0.9); + overflow-y: auto; - .title { - padding: 10px; - font-size: 22px; - font-family: PingFang SC; - font-weight: 800; - color: #ffffff; - display: flex; - align-items: center; + .wrap { + position: relative; + margin: 120px auto; + width: 1000px; - img { - display: block; - margin-right: 5px; - } - span { - display: block; - } - } + .title { + padding: 10px; + font-size: 22px; + font-family: PingFang SC; + font-weight: 800; + color: #ffffff; + display: flex; + align-items: center; + + img { + display: block; + margin-right: 5px; + } + span { + display: block; + } + } - .btn-close { - position: absolute; - top: -15px; - right: -15px; - cursor: pointer; - } + .btn-close { + position: absolute; + top: -15px; + right: -15px; + cursor: pointer; + } - .list { - display: flex; - flex-wrap: wrap; - padding: 10px 30px; - - .item { - position: relative; - box-sizing: border-box; - padding: 0 15px; - width: 33%; - color: #fff; - font-size: 18px; - font-family: PingFang SC; - font-weight: 400; - color: #ffffff; - line-height: 24px; - margin: 20px 0; - - &::before { - position: absolute; - left: 0; - top: 9px; - content: ""; - display: block; - width: 7px; - height: 7px; - background: #0c81fe; - border-radius: 3px; - } - } - } + .list { + display: flex; + flex-wrap: wrap; + padding: 10px 30px; - .line { - margin: 20px auto; - width: 900px; - height: 1px; - border: 1px dashed #1257c9; + .item { + position: relative; + box-sizing: border-box; + padding: 0 15px; + width: 33%; + color: #fff; + font-size: 18px; + font-family: PingFang SC; + font-weight: 400; + color: #ffffff; + line-height: 24px; + margin: 20px 0; + + &::before { + position: absolute; + left: 0; + top: 9px; + content: ''; + display: block; + width: 7px; + height: 7px; + background: #0c81fe; + border-radius: 3px; } + } + } - .tabs { - margin-top: 30px; - display: flex; - align-items: center; - padding-left: 20px; + .line { + margin: 20px auto; + width: 900px; + height: 1px; + border: 1px dashed #1257c9; + } - .tab-btn { - width: 30px; - text-align: center; - cursor: pointer; - } + .tabs { + margin-top: 30px; + display: flex; + align-items: center; + padding-left: 20px; - .tab { - margin: 0 5px; - min-width: 76px; - padding: 0 5px; - height: 30px; - background: rgba(255, 255, 255, 0); - border: 1px solid #1257c9; - box-shadow: 0 0 10px 0 inset #1257c9; - border-radius: 2px; - text-align: center; - font-size: 14px; - font-family: PingFang SC; - font-weight: 400; - color: #ffffff; - line-height: 30px; - cursor: pointer; - transition: all ease 0.5s; - &.z-on { - background: linear-gradient(90deg, #1a5afd, #009cff); - box-shadow: none; - } - } + .tab-btn { + width: 30px; + text-align: center; + cursor: pointer; + } + + .tab { + margin: 0 5px; + min-width: 76px; + padding: 0 5px; + height: 30px; + background: rgba(255, 255, 255, 0); + border: 1px solid #1257c9; + box-shadow: 0 0 10px 0 inset #1257c9; + border-radius: 2px; + text-align: center; + font-size: 14px; + font-family: PingFang SC; + font-weight: 400; + color: #ffffff; + line-height: 30px; + cursor: pointer; + transition: all ease 0.5s; + &.z-on { + background: linear-gradient(90deg, #1a5afd, #009cff); + box-shadow: none; } + } } + } } .m-relation { + position: relative; + margin-top: 10px; + + .title { + padding: 10px; + font-size: 22px; + font-family: PingFang SC; + font-weight: 800; + color: #ffffff; + display: flex; + align-items: center; + + img { + display: block; + margin-right: 5px; + } + span { + display: block; + } + } + + .info { position: relative; - margin-top: 10px; + width: 410px; + height: 312px; + margin: 0 auto; + .huzhu { + position: relative; - .title { - padding: 10px; - font-size: 22px; + .huzhu-bg { + display: block; + } + + .huzhu-ico { + position: absolute; + display: block; + top: 90px; + left: 0; + right: 0; + margin: 0 auto; + } + .huzhu-name { + position: absolute; + display: block; + top: 170px; + width: 100%; + font-size: 24px; font-family: PingFang SC; - font-weight: 800; + font-weight: 500; color: #ffffff; - display: flex; - align-items: center; - - img { - display: block; - margin-right: 5px; - } - span { - display: block; - } + line-height: 30px; + text-align: center; + } + > p { + position: absolute; + top: 200px; + font-size: 16px; + width: 100%; + font-family: PingFang SC; + font-weight: 500; + color: #ffffff; + text-align: center; + } } - .info { - position: relative; - width: 410px; - height: 312px; - margin: 0 auto; - .huzhu { - position: relative; + .rel { + position: absolute; + width: 128px; + height: 38px; - .huzhu-bg { - display: block; - } + .rel-line { + position: absolute; + z-index: 1; + } + .rel-bg { + height: 70px; + width: 128px; + } + + .rel-text { + @include toe; + position: absolute; + z-index: 2; + top: 0; + left: 0; + width: 100%; + padding: 7px 10px; + line-height: 24px; + text-align: center; + color: #fff; + font-size: 18px; + font-family: PingFang SC; + font-weight: 500; + cursor: pointer; - .huzhu-ico { - position: absolute; - display: block; - top: 90px; - left: 0; - right: 0; - margin: 0 auto; - } - .huzhu-name { - position: absolute; - display: block; - top: 170px; - width: 100%; - font-size: 24px; - font-family: PingFang SC; - font-weight: 500; - color: #ffffff; - line-height: 30px; - text-align: center; - } - > p { - position: absolute; - top: 200px; - font-size: 16px; - width: 100%; - font-family: PingFang SC; - font-weight: 500; - color: #ffffff; - text-align: center; - } + .rel-name { + font-size: 14px; } - - .rel { - position: absolute; - width: 128px; - height: 38px; - - .rel-line { - position: absolute; - z-index: 1; - } - - .rel-text { - @include toe; - position: absolute; - z-index: 2; - top: 0; - left: 0; - width: 100%; - line-height: 38px; - text-align: center; - color: #fff; - font-size: 18px; - font-family: PingFang SC; - font-weight: 500; - cursor: pointer; - - .rel-name { - font-size: 14px; - } - } - - &.z-zuo-2 { - top: 138px; - left: -33px - 128px; - .rel-line { - left: 127px; - top: -28px; - } - } - - &.z-you-2 { - top: 138px; - right: -33px - 128px; - .rel-line { - right: 127px; - top: -28px; - } - } - - &.z-zuo-1 { - top: 43px; - left: -33px - 128px; - .rel-line { - left: 131px; - } - } - &.z-you-1 { - top: 43px; - right: -33px - 128px; - .rel-line { - right: 131px; - } - } - - &.z-zuo-3 { - bottom: 41px; - left: -33px - 128px; - .rel-line { - left: 131px; - bottom: -2px; - } - } - &.z-you-3 { - bottom: 41px; - right: -33px - 128px; - .rel-line { - right: 131px; - bottom: -2px; - } - } + } + + &.z-zuo-2 { + top: 124px; + left: -33px - 128px; + .rel-line { + left: 127px; + top: -8px; + } + } + + &.z-you-2 { + top: 124px; + right: -33px - 128px; + .rel-line { + right: 127px; + top: -8px; } + } + + &.z-zuo-1 { + top: 25px; + left: -33px - 128px; + .rel-line { + top: 17px; + left: 131px; + } + } + &.z-you-1 { + top: 25px; + right: -33px - 128px; + .rel-line { + top: 17px; + right: 131px; + } + } + + &.z-zuo-3 { + bottom: 45px; + left: -33px - 128px; + .rel-line { + left: 131px; + bottom: -15px; + } + } + &.z-you-3 { + bottom: 45px; + right: -33px - 128px; + .rel-line { + right: 131px; + bottom: -15px; + } + } } + } } .m-tb { + .title { + padding: 10px; + font-size: 22px; + font-family: PingFang SC; + font-weight: 800; + color: #ffffff; + display: flex; + align-items: center; + + img { + display: block; + margin-right: 5px; + } + span { + display: block; + } + } + .tb { + height: 300px; + overflow-y: auto; + @include scrollBar; + } +} + +.m-row { + display: flex; + justify-content: space-between; + margin-top: 10px; + + .m-list { + width: calc(50% - 3px); + .title { - padding: 10px; + padding: 10px; + font-size: 22px; + font-family: PingFang SC; + font-weight: 800; + color: #ffffff; + display: flex; + align-items: center; + + img { + display: block; + margin-right: 5px; + } + span { + display: block; + } + + a { + display: block; + color: rgba(#fff, 0.5); font-size: 22px; font-family: PingFang SC; font-weight: 800; - color: #ffffff; - display: flex; - align-items: center; + margin-right: 10px; + cursor: pointer; + + &.z-on { + color: #fff; + cursor: default; - img { - display: block; - margin-right: 5px; + &:hover { + color: #fff; + text-decoration: none; + } } - span { - display: block; + + &:hover { + color: rgba(#fff, 0.5); + text-decoration: underline; } + } } - .tb { - height: 300px; - overflow-y: auto; - @include scrollBar; - } -} -.m-row { - display: flex; - justify-content: space-between; - margin-top: 10px; - - .m-list { - width: calc(50% - 3px); - - .title { - padding: 10px; - font-size: 22px; - font-family: PingFang SC; - font-weight: 800; - color: #ffffff; + .list-wrap { + height: 480px; + overflow-y: auto; + @include scrollBar; + + .list { + .item { + position: relative; + background-color: #104ba4; + padding: 10px 20px; + margin-bottom: 4px; + cursor: pointer; + transition: all ease 0.1s; + + .item-row { display: flex; + justify-content: space-between; align-items: center; - img { - display: block; - margin-right: 5px; + .item-l { + width: 25%; } - span { - display: block; + .item-r { + width: 75%; } - a { + &:hover { + &::before { + content: ''; + position: absolute; display: block; - color: rgba(#fff, 0.5); - font-size: 22px; - font-family: PingFang SC; - font-weight: 800; - margin-right: 10px; - cursor: pointer; - - &.z-on { - color: #fff; - cursor: default; - - &:hover { - color: #fff; - text-decoration: none; - } - } - - &:hover { - color: rgba(#fff, 0.5); - text-decoration: underline; - } - } - } + left: 0; + top: 0; + bottom: 0; + width: 6px; + background: linear-gradient(270deg, #0336ff, #01b4ff); + border-radius: 2px; + } - .list-wrap { - height: 480px; - overflow-y: auto; - @include scrollBar; - - .list { - .item { - position: relative; - background-color: #104ba4; - padding: 10px 20px; - margin-bottom: 4px; - cursor: pointer; - transition: all ease 0.1s; - - .item-row { - display: flex; - justify-content: space-between; - align-items: center; - - .item-l { - width: 25%; - } - .item-r { - width: 75%; - } - - &:hover { - &::before { - content: ""; - position: absolute; - display: block; - left: 0; - top: 0; - bottom: 0; - width: 6px; - background: linear-gradient(270deg, #0336ff, #01b4ff); - border-radius: 2px; - } - - &::after { - content: ""; - position: absolute; - display: block; - left: 15px; - top: 0; - bottom: 0; - margin: auto 0; - width: 0; - height: 0; - border-width: 10px; - border-style: solid; - border-color: transparent transparent transparent #20edff; - } - } - } - - .item-point { - text-align: center; - padding-left: 10%; - height: 16px; - font-size: 22px; - font-family: PingFang SC; - font-weight: bold; - color: #ffffff; - line-height: 12px; - } - - .item-title { - padding: 10px 0; - font-size: 18px; - font-family: PingFang SC; - font-weight: 400; - color: #ffffff; - line-height: 24px; - } - - .item-date { - padding: 10px 0; - border-top: 1px dashed #8398d9; - font-size: 14px; - font-family: PingFang SC; - font-weight: 400; - color: #ffffff; - opacity: 0.67; - } - &:hover { - box-shadow: 0 0 30px 5px inset #22f; - background-color: darken(#104ba4, 12); - } - } - } + &::after { + content: ''; + position: absolute; + display: block; + left: 15px; + top: 0; + bottom: 0; + margin: auto 0; + width: 0; + height: 0; + border-width: 10px; + border-style: solid; + border-color: transparent transparent transparent #20edff; + } + } + } + + .item-point { + text-align: center; + padding-left: 10%; + height: 16px; + font-size: 22px; + font-family: PingFang SC; + font-weight: bold; + color: #ffffff; + line-height: 12px; + } + + .item-title { + padding: 10px 0; + font-size: 18px; + font-family: PingFang SC; + font-weight: 400; + color: #ffffff; + line-height: 24px; + } + + .item-date { + padding: 10px 0; + border-top: 1px dashed #8398d9; + font-size: 14px; + font-family: PingFang SC; + font-weight: 400; + color: #ffffff; + opacity: 0.67; + } + &:hover { + box-shadow: 0 0 30px 5px inset #22f; + background-color: darken(#104ba4, 12); + } } + } } + } } .m-pagination { - box-sizing: border-box; - margin-top: 20px; - width: 100%; - height: 40px; - display: flex; - justify-content: flex-end; - - /deep/ .el-pagination.is-background .el-pager li:not(.disabled).active { - background: #0266d1; - color: #000d3f; - } - - /deep/ .el-pagination .el-pager li { - background: #002e74; - } - - /deep/ .el-pagination .btn-prev { - background: #002e74; - } - - /deep/ .el-pagination .btn-next { - background: #002e74; - } + box-sizing: border-box; + margin-top: 20px; + width: 100%; + height: 40px; + display: flex; + justify-content: flex-end; + + /deep/ .el-pagination.is-background .el-pager li:not(.disabled).active { + background: #0266d1; + color: #000d3f; + } + + /deep/ .el-pagination .el-pager li { + background: #002e74; + } + + /deep/ .el-pagination .btn-prev { + background: #002e74; + } + + /deep/ .el-pagination .btn-next { + background: #002e74; + } } .m-hint { - position: relative; - height: 300px; - - // 暂无数据 - img { - position: absolute; - top: 0; - left: 0; - right: 0; - bottom: 0; - margin: auto; - } + position: relative; + height: 300px; + + // 暂无数据 + img { + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + margin: auto; + } } diff --git a/src/assets/scss/modules/visual/personCategory.scss b/src/assets/scss/modules/visual/personCategory.scss index 3a9d5913..ddf1da35 100644 --- a/src/assets/scss/modules/visual/personCategory.scss +++ b/src/assets/scss/modules/visual/personCategory.scss @@ -76,10 +76,42 @@ width: 100%; display: flex; position: relative; - flex-direction: column; - align-items: space-between; + justify-content: space-between; + align-items: flex-start; + margin-top: 10px; // border: 1px solid red; + .item_left { + font-size: 16px; + font-family: PingFang SC; + font-weight: 400; + color: #ffffff; + } + + .item_right { + width: 160px; + display: flex; + flex-direction: column; + align-items: space-between; + + font-size: 16px; + font-family: PingFang SC; + font-weight: 500; + color: #ffffff; + + .item_right_row { + display: flex; + justify-content: space-between; + + .item_right_title { + } + } + + .row2 { + margin-top: 10px; + } + } + .num-item { position: relative; width: 100%; @@ -90,19 +122,6 @@ justify-content: space-between; padding: 0 10px 0 9px; - // &::after { - // display: block; - // content: ""; - // width: 8px; - // height: 8px; - // background: #f0f3f7; - // border-radius: 50%; - // position: absolute; - // left: 12px; - // top: 50%; - // transform: translate(0, -50%); - // } - div:nth-child(1) { font-size: 16px; font-family: PingFang SC; @@ -111,17 +130,15 @@ } div:nth-child(2) { + display: flex; + align-items: center; + justify-content: space-between; // width: 70%; display: flex; font-size: 20px; font-family: PingFang SC; font-weight: 500; color: #ffffff; - - .right-icon { - width: 10px; - height: 14px; - } } } diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue index 17b182b6..6d71cd1e 100644 --- a/src/views/modules/base/community/buildTable.vue +++ b/src/views/modules/base/community/buildTable.vue @@ -172,7 +172,7 @@ style="margin-left:15px" type="red" size="small" - @click="deleteBatch">批量删除 + @click="deleteBatch">删除 diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue index 0f3e390e..51949ae8 100644 --- a/src/views/modules/base/community/communityTable.vue +++ b/src/views/modules/base/community/communityTable.vue @@ -193,7 +193,7 @@ style="margin-left:15px" type="red" size="small" - @click="deleteBatch">批量删除 + @click="deleteBatch">删除 diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue index 3beb3b0b..62e31c49 100644 --- a/src/views/modules/base/community/roomTable.vue +++ b/src/views/modules/base/community/roomTable.vue @@ -164,7 +164,7 @@ style="margin-left:15px" type="red" size="small" - @click="deleteBatch">批量删除 + @click="deleteBatch">删除 diff --git a/src/views/modules/visual/basicinfo/basicInfoMain copy.vue b/src/views/modules/visual/basicinfo/basicInfoMain copy.vue new file mode 100644 index 00000000..c8daa908 --- /dev/null +++ b/src/views/modules/visual/basicinfo/basicInfoMain copy.vue @@ -0,0 +1,1074 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/views/modules/visual/basicinfo/basicInfoMain.vue b/src/views/modules/visual/basicinfo/basicInfoMain.vue index 44b04d0f..d85baf72 100644 --- a/src/views/modules/visual/basicinfo/basicInfoMain.vue +++ b/src/views/modules/visual/basicinfo/basicInfoMain.vue @@ -14,57 +14,6 @@ - - -
-
- - -
-
-
{{item.name}}
- -
-
-
- -
- - -
- -
-
-
- - - - @@ -84,8 +33,44 @@ class="div_map" id="map" ref="map"> - + +
+
+
+ +
+ +
+
+ + +
+
+
{{item.name}}
+ +
+
+
+ +
+ + +
+
+
+
+
@@ -269,7 +254,8 @@ const vueGis = { name: 'HomeMap', data () { return { - isshow: true, + showAgencyList: true, + agencyFadeIn: true, centerPoint: [],//中心点位置 zoom: 14,//缩放范围：区14 minZoom: 1,//最小缩放 @@ -327,7 +313,21 @@ const vueGis = { }, methods: { + hideAgencyList () { + this.showAgencyList = !this.showAgencyList + // if (this.showAgencyList) { + // this.agencyFadeIn = false + // setTimeout(() => { + // this.showAgencyList = false + // }, 1000) + + // } else { + // this.agencyFadeIn = true + // this.showAgencyList = true + // } + + }, handleSearch () { this.toSubAgency('search') }, @@ -997,38 +997,4 @@ export default vueGis; \ No newline at end of file diff --git a/src/views/modules/visual/basicinfo/people.vue b/src/views/modules/visual/basicinfo/people.vue index f2585b70..edfe119d 100644 --- a/src/views/modules/visual/basicinfo/people.vue +++ b/src/views/modules/visual/basicinfo/people.vue @@ -7,9 +7,11 @@ 人员情况
-
查看更多
+
查看更多
- +
{{ info.name }} @@ -106,13 +108,11 @@
- +
@@ -122,168 +122,99 @@
- - + +
{{ houseInfo.ownerName }}

（户主）

-
- - -
- {{ +
+ + +
+
岳父母或公婆
+
吉克隽逸
+
-
- - -
- {{ - houseInfo.userList[1].relation - }} - （{{ houseInfo.userList[1].userName }}） +
+ + +
+
{{ houseInfo.userList[1].relation }}
+
{{ houseInfo.userList[1].userName }}
-
- - -
- {{ - houseInfo.userList[2].relation - }} - （{{ houseInfo.userList[2].userName }}） +
+ + +
+
{{ houseInfo.userList[2].relation }}
+
{{ houseInfo.userList[2].userName }}
-
- - -
- {{ - houseInfo.userList[3].relation - }} - （{{ houseInfo.userList[3].userName }}） +
+ + +
+
{{ houseInfo.userList[3].relation }}
+ {{ houseInfo.userList[3].userName }}
-
- - -
- {{ - houseInfo.userList[4].relation - }} - （{{ houseInfo.userList[4].userName }}） +
+ + +
+
{{ houseInfo.userList[4].relation }}
+
{{ houseInfo.userList[4].userName }}
-
- - -
- {{ - houseInfo.userList[5].relation - }} - （{{ houseInfo.userList[5].userName }}） +
+ + +
+
{{ houseInfo.userList[5].relation }}
+
{{ houseInfo.userList[5].userName }}
@@ -299,23 +230,20 @@
- - -
- + + +
+
@@ -327,83 +255,68 @@
- 上报事件 - 发布话题 + 上报事件 + 发布话题
-
+
-
+
{{ item.eventContent }}
{{ item.reportTime }}
-
- +
+
-
- +
+
-
+
-
+
{{ item.topicContent }}
{{ item.releaseTime }}
-
- +
+
-
- +
+
@@ -418,12 +331,10 @@
-
+
{{ item.point }}
@@ -436,23 +347,21 @@
-
- +
+
-
- +
+
@@ -460,29 +369,23 @@
- - - - - + + + + +
@@ -498,7 +401,7 @@ import cptTb from "@/views/modules/visual/cpts/tb"; export default { name: "HomeMap", - data() { + data () { return { showedMoreInfo: false, showedDemandInfo: false, @@ -619,24 +522,24 @@ export default { }, watch: { - uid(id) { + uid (id) { this.userId = id; }, - userId() { + userId () { this.getApiData(); window.scrollTo(0, 0); }, }, - async mounted() { + async mounted () { this.userId = this.uid; this.getApiData(); }, methods: { - handleSearch() {}, + handleSearch () { }, - async getApiData() { + async getApiData () { await this.getInfo(); this.getHouseInfo(); this.getDemandData(); @@ -645,12 +548,12 @@ export default { this.getPointData(); }, - toUserInfo(uid) { + toUserInfo (uid) { this.$router.push({ path: `/main-shuju/visual-basicinfo-people/${uid}` }); }, //加载组织数据 - async getInfo() { + async getInfo () { const url = "/epmetuser/icresiuser/persondata"; let params = { userId: this.userId, @@ -666,7 +569,7 @@ export default { }, //加载组织数据 - async getHouseInfo() { + async getHouseInfo () { const url = "/epmetuser/icresiuser/ownerrelation"; let params = { userId: this.userId, @@ -681,12 +584,12 @@ export default { } }, - handlePageNoChangeDemand(val) { + handlePageNoChangeDemand (val) { this.demand.pageNo = val; this.getDemandData(); }, - handleOperateDemandList(index, type) { + handleOperateDemandList (index, type) { if (type == "查看") { this.showedDemandInfo = true; this.demand.currentIndex = index; @@ -694,7 +597,7 @@ export default { }, //加载组织数据 - async getDemandData() { + async getDemandData () { const url = "/heart/userdemand/mydemand"; let params = { epmetUserIdList: this.info.epmetUserIdList, @@ -724,18 +627,18 @@ export default { } }, - handlePageNoChangeIncident(val) { + handlePageNoChangeIncident (val) { this.incident.pageNo = val; this.getIncidentData(); }, - handleClickIncident(index) { + handleClickIncident (index) { this.incident.showedInfo = true; this.incident.currentIndex = index; }, //加载组织数据 - async getIncidentData() { + async getIncidentData () { const url = "/gov/project/resievent/pageuserreported"; let params = { epmetUserIdList: this.info.epmetUserIdList, @@ -755,18 +658,18 @@ export default { } }, - handlePageNoChangeTopic(val) { + handlePageNoChangeTopic (val) { this.topic.pageNo = val; this.getTopicData(); }, - handleClickTopic(index) { + handleClickTopic (index) { this.topic.showedInfo = true; this.topic.currentIndex = index; }, //加载组织数据 - async getTopicData() { + async getTopicData () { const url = "/data/aggregator/resigroup/pageusertopic"; let params = { epmetUserIdList: this.info.epmetUserIdList, @@ -786,18 +689,18 @@ export default { } }, - handlePageNoChangePoint(val) { + handlePageNoChangePoint (val) { this.point.pageNo = val; this.getPointData(); }, - handleClickPoint(index) { + handleClickPoint (index) { this.point.showedInfo = true; this.point.currentIndex = index; }, //加载组织数据 - async getPointData() { + async getPointData () { const url = "/point/resi/point/pageuserpoint"; let params = { epmetUserIdList: this.info.epmetUserIdList, diff --git a/src/views/modules/visual/basicinfo/personCategory/index.vue b/src/views/modules/visual/basicinfo/personCategory/index.vue index 09a5e1bc..8d6607fa 100644 --- a/src/views/modules/visual/basicinfo/personCategory/index.vue +++ b/src/views/modules/visual/basicinfo/personCategory/index.vue @@ -46,25 +46,50 @@
-
+
较上月
+
+
+
新人员增加
+
+ {{ "+" }} + {{ item.immigration }} +
+ +
+ +
+
原人员减少
+
+ {{ "-" }} + {{ item.emigration }} +
+ +
+ +
+ +
From 10488342cf1485f719d5d36e2e9f62a5ffd7eca5 Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Thu, 10 Mar 2022 14:33:33 +0800 Subject: [PATCH 14/30] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=B9=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 48 +++++++ src/views/components/editResi.vue | 8 +- src/views/modules/base/resi.vue | 133 +++++++++++------- .../modules/communityParty/elegant/index.vue | 53 +++++-- .../communityService/measure/index.vue | 24 +++- 5 files changed, 193 insertions(+), 73 deletions(-) diff --git a/src/App.vue b/src/App.vue index dbd953b1..4b5a899c 100644 --- a/src/App.vue +++ b/src/App.vue @@ -120,4 +120,52 @@ export default { z-index: 200000; } } +.search-card { + .el-card__body { + padding: 20px 20px 0 20px; + } +} +.dialog-h { + .el-dialog__body { + position: relative; + height: 72vh; + box-sizing: border-box; + padding: 0 10px 20px !important; + .dialog-h-content { + height: calc(72vh - 80px); + box-sizing: border-box; + overflow: auto; + } + } +} +.scroll-h { + &::-webkit-scrollbar { + // display: none; + width: 8px; + height: 8px; + // background: linear-gradient(270deg, #0063FE, #0095FF); + } + + &::-webkit-scrollbar-corner, + /* 滚动条角落 */ + &::-webkit-scrollbar-thumb, + &::-webkit-scrollbar-track { /*滚动条的轨道*/ + border-radius: 4px; + } + + &::-webkit-scrollbar-corner, + &::-webkit-scrollbar-track { + /* 滚动条轨道 */ + + // background: rgba(12, 129, 254, .24); + box-shadow: inset 0 0 1px rgba(180, 160, 120, 0.5); + } + + &::-webkit-scrollbar-thumb { + /* 滚动条手柄 */ + + background:rgba(0,0,0,0.3); + // background: linear-gradient(270deg, #0063FE, #0095FF); + } +} diff --git a/src/views/components/editResi.vue b/src/views/components/editResi.vue index ed807fd9..d7afc877 100644 --- a/src/views/components/editResi.vue +++ b/src/views/components/editResi.vue @@ -38,7 +38,7 @@
@@ -54,7 +58,10 @@ :show-overflow-tooltip="true" :width="item.itemType === 'radio' ? computedWidth(item.label) : 180"> @@ -119,32 +126,36 @@ :visible.sync="dialogVisible" width="80%" append-to-body + class="dialog-h" :close-on-click-modal="false" :before-close="handlerCancle"> - + -
-
其他
-
- - - - - +
+
其他
+
+ + + + + +
+
取消 @@ -159,9 +170,11 @@ :visible.sync="dialogEditVisible" width="80%" append-to-body + class="dialog-h" :close-on-click-modal="false" :before-close="handlerEditCancle"> - + -
-
其他
-
- - - - - +
+
其他
+
+ + + + + +
@@ -235,6 +249,7 @@ import resiSearch from '../../components/resiSearch.vue' import resiForm from '../../components/resiForm.vue' import editResi from '../../components/editResi.vue' import axios from 'axios' +import { mapGetters } from 'vuex' import resiTransfer from '../../components/resiTransfer.vue' import resiChangeRecord from '../../components/resiChangeRecord.vue' @@ -265,6 +280,7 @@ export default { currentPage: 1, pageSize: 20, total: null, + tableHeight: 0, conditions: [], activeName: '', tableData: [], @@ -315,13 +331,23 @@ export default { await this.getTableHeader() // console.log('this.$refs.resiSearch', this) this.$refs.resiSearch.handleSearch() + // this.handleSearch() // this.getTableData() this.pageLoading = true console.log('storeoooo----0000', this.$store) + console.log('resiSearch', this.$refs.resiSearch.$el.offsetHeight) + this.tableHeight = document.documentElement.clientHeight - this.$refs.resiSearch.$el.offsetHeight - 280 + 'px' + }, + mounted() { + + console.log('document.documentElement.clientWidth', document.documentElement.clientHeight) }, methods: { - + checkSelect (row, index) { + + return row.isChecked + }, //调动 async handleTransfer (row) { this.tranferShow = true @@ -378,7 +404,10 @@ export default { this.$refs.ref_table.clearSelection(); if (selectAllFlag) { this.tableData.forEach(row => { - this.$refs.ref_table.toggleRowSelection(row); + // this.$refs.ref_table.toggleRowSelection(row); + if (row.isChecked) { + this.$refs.ref_table.toggleRowSelection(row); + } }); } }, @@ -820,7 +849,12 @@ export default { if (res.code !== 0) { return this.$message.error(res.msg) } else { - this.tableData = res.data.list + this.tableData = res.data.list.map(item => { + return { + ...item, + isChecked: this.filterEdit(item.ORG_ID) + } + }) this.total = res.data.total } }) @@ -1084,6 +1118,9 @@ export default { color: rgba(0, 167, 169, 1); } } +.name-a { + cursor: pointer; +} From 8531ec3174fa5c9df6db6e3536e518e5534f0ec7 Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Thu, 10 Mar 2022 15:30:13 +0800 Subject: [PATCH 17/30] dd --- src/views/modules/base/resi.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue index e89989a9..f90b10eb 100644 --- a/src/views/modules/base/resi.vue +++ b/src/views/modules/base/resi.vue @@ -55,6 +55,7 @@ :prop="item.columnName" :label="item.label" align="center" + :fixed="item.columnName == 'NAME' ? 'left' : false" :show-overflow-tooltip="true" :width="item.itemType === 'radio' ? computedWidth(item.label) : 180">