diff --git a/.env.development b/.env.development index 5db66bc54..dcf5228ce 100644 --- a/.env.development +++ b/.env.development @@ -9,6 +9,8 @@ VUE_APP_API_SERVER = http://192.168.1.144/api # VUE_APP_API_SERVER = https://epmet-dev.elinkservice.cn:41080/api # VUE_APP_API_SERVER = https://epmet-dev.elinkservice.cn/api +VUE_APP_BIPASS_API_SERVER = http://bipaas.elinkservice.cn/linkdata/linkdata-gateway/route + # VUE_APP_NODE_ENV=dev_sdtdt VUE_APP_NODE_ENV=dev #项目根路径 diff --git a/.env.production b/.env.production index 5b72f6d9d..8bd35e8c6 100644 --- a/.env.production +++ b/.env.production @@ -1,4 +1,5 @@ NODE_ENV=production VUE_APP_API_SERVER = https://epmet-cloud.elinkservice.cn/api +VUE_APP_BIPASS_API_SERVER = http://bipaas.elinkservice.cn/linkdata/linkdata-gateway/route VUE_APP_NODE_ENV=prod VUE_APP_PUBLIC_PATH=epmet-oper diff --git a/.env.production.sit b/.env.production.sit index 0efd4a570..393de85b5 100644 --- a/.env.production.sit +++ b/.env.production.sit @@ -2,5 +2,6 @@ NODE_ENV=production # VUE_APP_API_SERVER = https://epmet-test.elinkservice.cn/api # VUE_APP_API_SERVER = http://192.168.1.140/api VUE_APP_API_SERVER = http://192.168.1.144/api +VUE_APP_BIPASS_API_SERVER = http://bipaas.elinkservice.cn/linkdata/linkdata-gateway/route VUE_APP_NODE_ENV=prod:sit VUE_APP_PUBLIC_PATH=epmet-oper diff --git a/.env.shibei_production b/.env.shibei_production index b227d2fa1..56b236051 100644 --- a/.env.shibei_production +++ b/.env.shibei_production @@ -1,4 +1,5 @@ NODE_ENV=production VUE_APP_API_SERVER = https://epdc-shibei.elinkservice.cn/api +# VUE_APP_BIPASS_API_SERVER = http://bipaas.elinkservice.cn/linkdata/linkdata-gateway/route VUE_APP_NODE_ENV=shibei_prod VUE_APP_PUBLIC_PATH=epmet-oper \ No newline at end of file diff --git a/src/assets/images/shuju/main/back-on.png b/src/assets/images/shuju/main/back-on.png new file mode 100644 index 000000000..edd96a89f Binary files /dev/null and b/src/assets/images/shuju/main/back-on.png differ diff --git a/src/assets/images/shuju/main/back.png b/src/assets/images/shuju/main/back.png new file mode 100644 index 000000000..f8d9aed8c Binary files /dev/null and b/src/assets/images/shuju/main/back.png differ diff --git a/src/assets/images/shuju/main/close.png b/src/assets/images/shuju/main/close.png new file mode 100644 index 000000000..2752f9004 Binary files /dev/null and b/src/assets/images/shuju/main/close.png differ diff --git a/src/assets/images/shuju/renfang/index/per/dy.png b/src/assets/images/shuju/renfang/index/per/dy.png index 365eb4994..41a464aaf 100644 Binary files a/src/assets/images/shuju/renfang/index/per/dy.png and b/src/assets/images/shuju/renfang/index/per/dy.png differ diff --git a/src/assets/images/shuju/renfang/index/per/lnr.png b/src/assets/images/shuju/renfang/index/per/lnr.png index 466c3401e..759f64934 100644 Binary files a/src/assets/images/shuju/renfang/index/per/lnr.png and b/src/assets/images/shuju/renfang/index/per/lnr.png differ diff --git a/src/assets/images/shuju/renfang/index/per/qsn.png b/src/assets/images/shuju/renfang/index/per/qsn.png index 3d1918ac0..1d13cb93c 100644 Binary files a/src/assets/images/shuju/renfang/index/per/qsn.png and b/src/assets/images/shuju/renfang/index/per/qsn.png differ diff --git a/src/assets/images/shuju/renfang/index/per/syry.png b/src/assets/images/shuju/renfang/index/per/syry.png index c41b6c72a..646fc1b35 100644 Binary files a/src/assets/images/shuju/renfang/index/per/syry.png and b/src/assets/images/shuju/renfang/index/per/syry.png differ diff --git a/src/assets/images/shuju/renfang/index/per/ygxl.png b/src/assets/images/shuju/renfang/index/per/ygxl.png new file mode 100644 index 000000000..98db91297 Binary files /dev/null and b/src/assets/images/shuju/renfang/index/per/ygxl.png differ diff --git a/src/assets/images/shuju/renfang/index/per/zyz.png b/src/assets/images/shuju/renfang/index/per/zyz.png index f951854e4..b619f5870 100644 Binary files a/src/assets/images/shuju/renfang/index/per/zyz.png and b/src/assets/images/shuju/renfang/index/per/zyz.png differ diff --git a/src/assets/scss/dataBoard/listBox.scss b/src/assets/scss/dataBoard/listBox.scss index 56d538a25..e33b8383c 100644 --- a/src/assets/scss/dataBoard/listBox.scss +++ b/src/assets/scss/dataBoard/listBox.scss @@ -1,15 +1,55 @@ -.m-listbox-main{ +.g-pgi { min-height: 100%; box-sizing: border-box; - margin-left:16px; - - .g-listbox{ - - } + padding: 0 25px 50px; +} +.m-title { + display: flex; + align-items: center; + margin-top: 15px; -} + .title_img { + width: 17px; + height: 17px; + } + .tip_title { + margin-left: 8px; + font-size: 16px; + font-family: PingFangSC-Medium, PingFang SC; + font-weight: 500; + color: #ffffff; + line-height: 22px; + } + .title_line { + margin-left: 8px; + width: 244px; + height: 1px; + background: linear-gradient(270deg, rgba(55, 198, 255, 0.1) 0%, #1995ff 100%); + } + .second-select { + margin: 0 10px 0 10px; + ::v-deep .el-input { + width: 180px; + height: 36px; + .el-input__inner { + height: 100%; + padding: 0 10px; + color: #fff; + line-height: 36px; + background: #06186d; + border: 1px solid #1a64cc; + } + .el-icon-arrow-up:before { + content: "\e78f"; + } + // .el-select__caret:before { + // content: '\E790' + // } + } + } +} diff --git a/src/assets/scss/dataBoard/popup-info.scss b/src/assets/scss/dataBoard/popup-info.scss new file mode 100644 index 000000000..31791fcb3 --- /dev/null +++ b/src/assets/scss/dataBoard/popup-info.scss @@ -0,0 +1,66 @@ +@import "../c/config"; +@import "../c/function"; +@import "./c/common"; + +.m-info { + padding: 20px 50px 10px; + + .subtitle { + display: flex; + margin-left: -10px; + padding: 10px; + align-items: center; + font-size: 16px; + font-family: PingFangSC-Medium, PingFang SC; + font-weight: 500; + color: rgba(255, 255, 255, 0.85); + line-height: 22px; + + .i-chunk { + margin-right: 5px; + width: 4px; + height: 12px; + background: #1a95ff; + border-radius: 1px; + } + + .i-line { + margin-left: 8px; + flex: 1; + width: 100%; + height: 1px; + border: 1px dashed rgba(26, 149, 255, 0.45); + } + } + + .row { + display: flex; + flex-wrap: wrap; + + .item { + display: flex; + padding: 15px 0; + min-width: 50%; + line-height: 24px; + + .field { + width: 80px; + font-size: 14px; + text-align: right; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: rgba(#ffffff, 0.5); + } + + .value { + flex: 1; + width: 100%; + margin-left: 10px; + font-size: 14px; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: rgba(#ffffff, 0.85); + } + } + } +} diff --git a/src/assets/scss/dataBoard/renfang/index.scss b/src/assets/scss/dataBoard/renfang/index.scss index bfa76a3a8..ca35bb0d7 100644 --- a/src/assets/scss/dataBoard/renfang/index.scss +++ b/src/assets/scss/dataBoard/renfang/index.scss @@ -32,6 +32,7 @@ top: 560px; left: 0; width: 100%; + background-color: transparent; .btn { position: relative; width: 213px; @@ -266,7 +267,10 @@ height: 115px; } .m-rkyj { - height: 253px; + height: 423px; + &.z-shrink { + height: 253px; + } } .m-per { @@ -277,27 +281,32 @@ right: 0; display: flex; align-items: center; + justify-content: space-around; padding-left: 10px; .item { display: flex; - width: 160px; + width: 120px; - img { - display: block; - margin-right: 16px; - width: 48px; - height: 48px; - } .item-info { font-size: 14px; font-family: PingFangSC-Regular, PingFang SC; font-weight: 400; color: rgba(255, 255, 255, 0.65); - line-height: 20px; + line-height: 40px; vertical-align: bottom; div { margin-bottom: 6px; + &:first-child { + line-height: 20px; + } + } + img { + display: inline-block; + margin-right: 5px; + width: 20px; + height: 20px; + vertical-align: bottom; } b { font-weight: 500; diff --git a/src/assets/scss/dataBoardMain.scss b/src/assets/scss/dataBoardMain.scss index 16752561e..4594321ce 100644 --- a/src/assets/scss/dataBoardMain.scss +++ b/src/assets/scss/dataBoardMain.scss @@ -54,16 +54,50 @@ color: #ffffff; } + .btn-back { + position: absolute; + top: 52px; + left: 40px; + display: flex; + width: 60px; + align-items: center; + line-height: 22px; + font-size: 16px; + color: #1a95ff; + cursor: pointer; + + img { + width: 16px; + margin-right: 5px; + } + .z-default { + display: block; + } + .z-on { + display: none; + } + + &:hover { + color: #fff; + .z-default { + display: none; + } + .z-on { + display: block; + } + } + } + .nav-list { position: absolute; top: 40px; - left: 40px; + left: 120px; display: flex; width: 500px; &.z-right { left: auto; - right: 40px; + right: 120px; .nav-item { background-image: url(../images/shuju/main/nav-right.png); &.z-on { diff --git a/src/assets/scss/modules/index.scss b/src/assets/scss/modules/index.scss index ee59af828..c3ff9044a 100644 --- a/src/assets/scss/modules/index.scss +++ b/src/assets/scss/modules/index.scss @@ -323,6 +323,16 @@ border-radius: 2px; overflow: hidden; + .empty { + text-align: center; + color: #999; + img { + display: block; + width: 120px; + margin: 100px auto 20px; + } + } + .item { padding: 16px 0 12px; border-bottom: 1px dashed #f0f5fa; diff --git a/src/js/dai/request-bipass.js b/src/js/dai/request-bipass.js new file mode 100644 index 000000000..6c30b8965 --- /dev/null +++ b/src/js/dai/request-bipass.js @@ -0,0 +1,114 @@ +/*--------------------------------------------------------------- + | 【数据中台专用】请求接口封装 | + ---------------------------------------------------------------*/ +import axios from "axios"; +import curry from "dai-js/tools/curry"; +import { Message } from "element-ui"; +import { clearLoginInfo } from "@/utils"; + +axios.defaults.withCredentials = true; +axios.defaults.crossDomain = true; + +const request = curry((method, uri, data = {}, params = {}) => { + return new Promise((reslove) => { + let returnIniData = { + httpCode: "", + data: {}, + msg: "", + code: "", + }; + + const { headers, mockId } = params; + + // env文件配置接口 + let url = process.env.VUE_APP_BIPASS_API_SERVER; + + // mock 开发临时用接口 + if (mockId) { + url = "https://mock.apifox.cn/m2/2242395-0-default/" + mockId; + } + + 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); + } + if (res.code == 1007 || res.code == 1024 || res.code == 2003) { + // 10005 token为空 10006登陆超时 10007别处登录 + console.log("登录失效"); + Message.error(res.data.msg); + clearLoginInfo(); + return next({ + name: "login", + }); + } + + reslove(retData); + }; + + const failFn = (err) => { + // log(`[request失败] ${url}`, data, err); + + reslove( + Object.assign({}, returnIniData, { + httpCode: "9999", //访问出现意外 + msg: "网络错误", + }) + ); + }; + + if (method.toUpperCase() == "POST") { + axios + .post( + url, + { + apiCode: "/api/post", + dispatcherSystem: "dataservice", + param: { + ds_code: uri, + app_code: "empet", + orderby: "[]", + ...data, + }, + }, + { + headers, + responseType: "json", + } + ) + .then(succFn) + .catch(failFn); + } else { + axios + .post( + url, + { + apiCode: "/api/get", + dispatcherSystem: "dataservice", + param: { + ds_code: uri, + app_code: "empet", + orderby: "[]", + ...data, + }, + }, + { + headers, + responseType: "json", + } + ) + .then(succFn) + .catch(failFn); + } + }); +}); + +export const requestPostBi = request("post"); diff --git a/src/router/index.js b/src/router/index.js index 4dbf47817..257509d9b 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -9,375 +9,424 @@ Vue.use(Router); const CUSTOMER = process.env.VUE_APP_CUSTOMER; // 页面路由(独立页面) export const pageRoutes = [ - { - path: "/login", - component: () => import("@/views/pages/login"), - name: "login", - meta: { - title: "登录", - }, - }, - { - path: "/", - name: "index", - // component: () => import("@/views/pages/index"), - redirect: { - path: "/main/home", - }, - }, - { - path: "/404", - component: () => import("@/views/pages/404"), - name: "404", - meta: { - title: "404未找到", - }, - beforeEnter(to, from, next) { - // 拦截处理特殊业务场景 - // 如果, 重定向路由包含__双下划线, 为临时添加路由 - if (/__.*/.test(to.redirectedFrom)) { - return next(to.redirectedFrom.replace(/__.*/, "")); - } - next(); - }, - }, + { + path: "/login", + component: () => import("@/views/pages/login"), + name: "login", + meta: { + title: "登录", + }, + }, + { + path: "/", + name: "index", + // component: () => import("@/views/pages/index"), + redirect: { + path: "/main/home", + }, + }, + { + path: "/404", + component: () => import("@/views/pages/404"), + name: "404", + meta: { + title: "404未找到", + }, + beforeEnter(to, from, next) { + // 拦截处理特殊业务场景 + // 如果, 重定向路由包含__双下划线, 为临时添加路由 + if (/__.*/.test(to.redirectedFrom)) { + return next(to.redirectedFrom.replace(/__.*/, "")); + } + next(); + }, + }, ]; // 模块路由(基于主入口布局页面) export const moduleRoutes = { - path: "/main", - component: () => import("@/views/main"), - name: "main", - redirect: { - path: "/main/home", - }, - meta: { - title: "主入口布局", - isTab: false, - }, - children: [ - { - path: "home", - component: () => import("@/views/modules/home/index"), - name: "home", - meta: { - title: "首页", - isTab: true, - }, - }, - { - path: "unopen", - component: () => import("@/views/modules/unopen"), - name: "unopen", - meta: { - title: "未开放功能", - isTab: true, - }, - }, - { - path: "404", - props: true, - component: () => import("@/views/modules/404"), - name: "main-404", - meta: { - title: "页面未找到或无权访问", - isTab: false, - }, - }, - { - path: "home-notice", - props: true, - name: "home-notice", - component: () => import("@/views/modules/home/notice"), - meta: { - isTab: true, - title: "智能提醒", - parent: [ - { - title: "首页", - path: "/main/home-index", - }, - ], - }, - }, - { - path: "shequ-chaxun", - props: true, - name: "shequ-chaxun", - component: () => import("@/views/modules/shequ/chaxun"), - meta: { - isTab: true, - title: "社区查询", - }, - }, - ], + path: "/main", + component: () => import("@/views/main"), + name: "main", + redirect: { + path: "/main/home", + }, + meta: { + title: "主入口布局", + isTab: false, + }, + children: [ + { + path: "home", + component: () => import("@/views/modules/home/index"), + name: "home", + meta: { + title: "首页", + isTab: true, + }, + }, + { + path: "unopen", + component: () => import("@/views/modules/unopen"), + name: "unopen", + meta: { + title: "未开放功能", + isTab: true, + }, + }, + { + path: "404", + props: true, + component: () => import("@/views/modules/404"), + name: "main-404", + meta: { + title: "页面未找到或无权访问", + isTab: false, + }, + }, + { + path: "home-notice", + props: true, + name: "home-notice", + component: () => import("@/views/modules/home/notice"), + meta: { + isTab: true, + title: "智能提醒", + parent: [ + { + title: "首页", + path: "/main/home-index", + }, + ], + }, + }, + { + path: "shequ-chaxun", + props: true, + name: "shequ-chaxun", + component: () => import("@/views/modules/shequ/chaxun"), + meta: { + isTab: true, + title: "社区查询", + }, + }, + ], }; // pc端菜单的 如果没有配置 默认的 或者配置了默认的 但没有权限 默认选中第一 function cookApiDataItem(item) { - function n2one(v) { - let ret = []; - for (let i = 0; i < v.length; i++) { - // console.log("xxxxx", v[i]); - ret.push(v[i]); - if (Array.isArray(v[i].children) && v[i].children.length > 0) { - ret.push(...n2one(v[i].children)); - } - } - // console.log("aaaa", ret); - return ret; - } + function n2one(v) { + let ret = []; + for (let i = 0; i < v.length; i++) { + // console.log("xxxxx", v[i]); + ret.push(v[i]); + if (Array.isArray(v[i].children) && v[i].children.length > 0) { + ret.push(...n2one(v[i].children)); + } + } + // console.log("aaaa", ret); + return ret; + } - let allChildrenUrl = n2one(item.children) - .filter((i) => i.url != "" && i.showFlag == 1) - .map((i) => i.url); - // console.log("))))))))))))", allChildrenUrl); + let allChildrenUrl = n2one(item.children) + .filter((i) => i.url != "" && i.showFlag == 1) + .map((i) => i.url); + // console.log("))))))))))))", allChildrenUrl); - if (item.children.length > 0) { - if (item.url == "" || !allChildrenUrl.find((i) => i.url == item.url)) { - item.url = allChildrenUrl[0]; - } - } - // item.children.forEach((item) => { - // item.color = "#f00"; - // return item; - // }); - return item; + if (item.children.length > 0) { + if (item.url == "" || !allChildrenUrl.find((i) => i.url == item.url)) { + item.url = allChildrenUrl[0]; + } + } + // item.children.forEach((item) => { + // item.color = "#f00"; + // return item; + // }); + return item; } // 把按钮都化为页面内部的权限 function cookApiDataItem2(item) { - let { children } = item; - if (children && Array.isArray(children) && children.length > 0) { - let btns = item.children.filter((item) => item.type == 1); - item.btns = btns; - item.children = item.children - .filter((val) => val.type == 0) - .map((val) => cookApiDataItem2(val)); - } - return item; + let { children } = item; + if (children && Array.isArray(children) && children.length > 0) { + let btns = item.children.filter((item) => item.type == 1); + item.btns = btns; + item.children = item.children + .filter((val) => val.type == 0) + .map((val) => cookApiDataItem2(val)); + } + return item; } // 把父级拼到子集 function cookApiDataItem3(item, parent = []) { - item.parent = parent; - let { children } = item; - if (children && Array.isArray(children) && children.length > 0) { - item.children = children.map((val) => - cookApiDataItem3(val, [ - ...parent, - { - title: item.name || "", - path: (item.url || "").replace(/{{([^}}]+)?}}/g, (s1, s2) => - eval(s2) - ), - }, - ]) - ); - } - return item; + item.parent = parent; + let { children } = item; + if (children && Array.isArray(children) && children.length > 0) { + item.children = children.map((val) => + cookApiDataItem3(val, [ + ...parent, + { + title: item.name || "", + path: (item.url || "").replace(/{{([^}}]+)?}}/g, (s1, s2) => + eval(s2) + ), + }, + ]) + ); + } + return item; } // 新数据模块 export const dataBoardRoutes = { - path: "/dataBoard", - component: () => import("@/views/dataBoardMain/main"), - name: "dataBoard", - redirect: { - path: "/dataBoard/renfang/index", - }, - meta: { - title: "主入口布局", - }, - children: [ - { - path: "renfang/index", - props: true, - component: () => import("@/views/dataBoard/renfang/index"), - name: "dataBoard-renfang-index", - meta: { - title: "人房总览", - isTab: false, - }, - }, - { - path: "404", - props: true, - component: () => import("@/views/dataBoard/404"), - name: "dataBoard-404", - meta: { - title: "页面未找到或无权访问", - isTab: false, - }, - beforeEnter(to, from, next) { - // 拦截处理特殊业务场景 - // 如果, 重定向路由包含__双下划线, 为临时添加路由 - if (/__.*/.test(to.redirectedFrom)) { - return next(to.redirectedFrom.replace(/__.*/, "")); - } - next(); - }, - }, - ], + path: "/dataBoard", + component: () => import("@/views/dataBoardMain/main"), + name: "dataBoard", + redirect: { + path: "/dataBoard/renfang/index", + }, + meta: { + title: "主入口布局", + }, + children: [ + { + path: "renfang/index", + props: true, + component: () => import("@/views/dataBoard/renfang/index"), + name: "dataBoard-renfang-index", + meta: { + title: "人房总览", + isTab: false, + }, + }, + { + path: "renfang/resi-list", + props: true, + component: () => import("@/views/dataBoard/renfang/resi/list"), + name: "dataBoard-renfang-resi-list", + meta: { + title: "居民列表", + isTab: false, + }, + }, + { + path: "renfang/resi-class", + props: true, + component: () => import("@/views/dataBoard/renfang/resi/class"), + name: "dataBoard-renfang-resi-class", + meta: { + title: "居民分类列表", + isTab: false, + }, + }, + { + path: "renfang/house-list", + props: true, + component: () => import("@/views/dataBoard/renfang/house/list"), + name: "dataBoard-renfang-house-list", + meta: { + title: "房屋列表", + isTab: false, + }, + }, + { + path: "renfang/warn-building", + props: true, + component: () => import("@/views/dataBoard/renfang/warn/building"), + name: "dataBoard-renfang-warn-building", + meta: { + title: "预警楼栋列表", + isTab: false, + }, + }, + { + path: "renfang/warn-resi", + props: true, + component: () => import("@/views/dataBoard/renfang/warn/resi"), + name: "dataBoard-renfang-warn-resi", + meta: { + title: "预警楼栋居民", + isTab: false, + }, + }, + { + path: "404", + props: true, + component: () => import("@/views/dataBoard/404"), + name: "dataBoard-404", + meta: { + title: "页面未找到或无权访问", + isTab: false, + }, + beforeEnter(to, from, next) { + // 拦截处理特殊业务场景 + // 如果, 重定向路由包含__双下划线, 为临时添加路由 + if (/__.*/.test(to.redirectedFrom)) { + return next(to.redirectedFrom.replace(/__.*/, "")); + } + next(); + }, + }, + ], }; // 模块路由(基于主入口布局页面) 可视化数据 export const moduleShujuRoutes = { - path: "/main-shuju", - component: () => import("@/views/main-shuju/main"), - name: "main-shuju", - redirect: { - path: "/main-shuju/visual-basicinfo-basicInfoMain", - }, - meta: { - title: "主入口布局", - }, - children: [ - { - path: "/main-shuju/visual-basicinfo-people/:uid", - props: true, - component: () => import("@/views/modules/visual/basicinfo/people"), - name: "visual-basicinfo-people", - meta: { - title: "个人详情", - isTab: false, - }, - }, - { - path: "/main-shuju/visual-basicinfo-people-list", - props: true, - component: () => import("@/views/modules/visual/basicinfo/peopleList"), - name: "visual-basicinfo-people-list", - meta: { - title: "人员列表", - isTab: false, - }, - }, - { - path: "404", - props: true, - component: () => import("@/views/modules/visual/404"), - name: "main-shuju-404", - meta: { - title: "页面未找到或无权访问", - isTab: false, - }, - }, - ], + path: "/main-shuju", + component: () => import("@/views/main-shuju/main"), + name: "main-shuju", + redirect: { + path: "/main-shuju/visual-basicinfo-basicInfoMain", + }, + meta: { + title: "主入口布局", + }, + children: [ + { + path: "/main-shuju/visual-basicinfo-people/:uid", + props: true, + component: () => import("@/views/modules/visual/basicinfo/people"), + name: "visual-basicinfo-people", + meta: { + title: "个人详情", + isTab: false, + }, + }, + { + path: "/main-shuju/visual-basicinfo-people-list", + props: true, + component: () => + import("@/views/modules/visual/basicinfo/peopleList"), + name: "visual-basicinfo-people-list", + meta: { + title: "人员列表", + isTab: false, + }, + }, + { + path: "404", + props: true, + component: () => import("@/views/modules/visual/404"), + name: "main-shuju-404", + meta: { + title: "页面未找到或无权访问", + isTab: false, + }, + }, + ], }; export function addDynamicRoute(routeParams, router) { - // 组装路由名称, 并判断是否已添加, 如是: 则直接跳转 - var routeName = routeParams.routeName; - var dynamicRoute = window.SITE_CONFIG["dynamicRoutes"].filter( - (item) => item.name === routeName - )[0]; - if (dynamicRoute) { - return router.push({ - name: routeName, - params: routeParams.params, - }); - } - // 否则: 添加并全局变量保存, 再跳转 - dynamicRoute = { - path: routeName, - component: () => import(`@/views/modules/${routeParams.path}`), - name: routeName, - meta: { - ...window.SITE_CONFIG["contentTabDefault"], - menuId: routeParams.menuId, - title: `${routeParams.title}`, - }, - }; - router.addRoutes([ - { - ...moduleRoutes, - name: `main-dynamic__${dynamicRoute.name}`, - children: [dynamicRoute], - }, - ]); - window.SITE_CONFIG["dynamicRoutes"].push(dynamicRoute); - router.push({ - name: dynamicRoute.name, - params: routeParams.params, - }); + // 组装路由名称, 并判断是否已添加, 如是: 则直接跳转 + var routeName = routeParams.routeName; + var dynamicRoute = window.SITE_CONFIG["dynamicRoutes"].filter( + (item) => item.name === routeName + )[0]; + if (dynamicRoute) { + return router.push({ + name: routeName, + params: routeParams.params, + }); + } + // 否则: 添加并全局变量保存, 再跳转 + dynamicRoute = { + path: routeName, + component: () => import(`@/views/modules/${routeParams.path}`), + name: routeName, + meta: { + ...window.SITE_CONFIG["contentTabDefault"], + menuId: routeParams.menuId, + title: `${routeParams.title}`, + }, + }; + router.addRoutes([ + { + ...moduleRoutes, + name: `main-dynamic__${dynamicRoute.name}`, + children: [dynamicRoute], + }, + ]); + window.SITE_CONFIG["dynamicRoutes"].push(dynamicRoute); + router.push({ + name: dynamicRoute.name, + params: routeParams.params, + }); } const router = new Router({ - mode: "hash", - scrollBehavior: () => ({ - y: 0, - }), - routes: pageRoutes.concat(moduleRoutes, moduleShujuRoutes, dataBoardRoutes), + mode: "hash", + scrollBehavior: () => ({ + y: 0, + }), + routes: pageRoutes.concat(moduleRoutes, moduleShujuRoutes, dataBoardRoutes), }); router.beforeEach((to, from, next) => { - // 添加动态(菜单)路由 - // 已添加或者当前路由为页面路由, 可直接访问 - if (to.name === "caiji") { - return next(); - } - if ( - window.SITE_CONFIG["dynamicMenuRoutesHasAdded"] || - fnCurrentRouteIsPageRoute(to, pageRoutes) - ) { - return next(); - } + // 添加动态(菜单)路由 + // 已添加或者当前路由为页面路由, 可直接访问 + if (to.name === "caiji") { + return next(); + } + if ( + window.SITE_CONFIG["dynamicMenuRoutesHasAdded"] || + fnCurrentRouteIsPageRoute(to, pageRoutes) + ) { + return next(); + } - const customerId = localStorage.getItem("customerId"); - console.log("customerId：", customerId); + const customerId = localStorage.getItem("customerId"); + console.log("customerId：", customerId); - http - .get("gov/access/menu/navDigitalCommunity?tableName=data_menu") - .then(({ data: res }) => { - if (res.code == 10005 || res.code == 10006 || res.code == 10007) { - // 10005 token为空 10006登陆超时 10007别处登录 - console.log("登录失效"); - Vue.prototype.$message.error(res.msg); - return next({ - name: "login", - }); - } + http.get("gov/access/menu/navDigitalCommunity?tableName=data_menu") + .then(({ data: res }) => { + if (res.code == 10005 || res.code == 10006 || res.code == 10007) { + // 10005 token为空 10006登陆超时 10007别处登录 + console.log("登录失效"); + Vue.prototype.$message.error(res.msg); + return next({ + name: "login", + }); + } - window.SITE_CONFIG["menuShujuList"] = res.data; - fnAddDynamicMenuRoutes2(window.SITE_CONFIG["menuShujuList"]); + window.SITE_CONFIG["menuShujuList"] = res.data; + fnAddDynamicMenuRoutes2(window.SITE_CONFIG["menuShujuList"]); - next({ - ...to, - replace: true, - }); - }) - .catch(() => { - next({ - name: "login", - }); - }); + next({ + ...to, + replace: true, + }); + }) + .catch(() => { + next({ + name: "login", + }); + }); - http - .get("gov/access/menu/navDigitalCommunity") - .then(({ data: res }) => { - if (res.code == 10005 || res.code == 10006 || res.code == 10007) { - // 10005 token为空 10006登陆超时 10007别处登录 - console.log("登录失效"); - Vue.prototype.$message.error(res.msg); - return next({ - name: "login", - }); - } - window.SITE_CONFIG["menuList"] = res.data - .map((item) => cookApiDataItem3(item)) - .map((item) => cookApiDataItem2(item)) - .map((item) => cookApiDataItem(item)); - fnAddDynamicMenuRoutes(window.SITE_CONFIG["menuList"]); - // next({ ...to, replace: true }) - next({ - ...to, - replace: true, - }); - }) - .catch(() => { - // next({ - // name: "login", - // }); - }); + http.get("gov/access/menu/navDigitalCommunity") + .then(({ data: res }) => { + if (res.code == 10005 || res.code == 10006 || res.code == 10007) { + // 10005 token为空 10006登陆超时 10007别处登录 + console.log("登录失效"); + Vue.prototype.$message.error(res.msg); + return next({ + name: "login", + }); + } + window.SITE_CONFIG["menuList"] = res.data + .map((item) => cookApiDataItem3(item)) + .map((item) => cookApiDataItem2(item)) + .map((item) => cookApiDataItem(item)); + fnAddDynamicMenuRoutes(window.SITE_CONFIG["menuList"]); + // next({ ...to, replace: true }) + next({ + ...to, + replace: true, + }); + }) + .catch(() => { + // next({ + // name: "login", + // }); + }); }); /** @@ -386,16 +435,16 @@ router.beforeEach((to, from, next) => { * @param {*} pageRoutes 页面路由 */ function fnCurrentRouteIsPageRoute(route, pageRoutes = []) { - var temp = []; - for (var i = 0; i < pageRoutes.length; i++) { - if (route.path === pageRoutes[i].path) { - return true; - } - if (pageRoutes[i].children && pageRoutes[i].children.length >= 1) { - temp = temp.concat(pageRoutes[i].children); - } - } - return temp.length >= 1 ? fnCurrentRouteIsPageRoute(route, temp) : false; + var temp = []; + for (var i = 0; i < pageRoutes.length; i++) { + if (route.path === pageRoutes[i].path) { + return true; + } + if (pageRoutes[i].children && pageRoutes[i].children.length >= 1) { + temp = temp.concat(pageRoutes[i].children); + } + } + return temp.length >= 1 ? fnCurrentRouteIsPageRoute(route, temp) : false; } /** @@ -404,154 +453,160 @@ function fnCurrentRouteIsPageRoute(route, pageRoutes = []) { * @param {*} routes 递归创建的动态(菜单)路由 */ function fnAddDynamicMenuRoutes(menuList = [], routes = []) { - var temp = []; - for (var i = 0; i < menuList.length; i++) { - if (menuList[i].children && menuList[i].children.length >= 1) { - temp = temp.concat(menuList[i].children); - // continue; - } - // 组装路由 - var route = { - path: "", - component: null, - name: "", - meta: { - ...window.SITE_CONFIG["contentTabDefault"], - menuId: menuList[i].id, - title: menuList[i].name, - btns: menuList[i].btns || [], - parent: menuList[i].parent || [], - }, - }; - // eslint-disable-next-line - let URL = (menuList[i].url || "").replace(/{{([^}}]+)?}}/g, (s1, s2) => - eval(s2) - ); // URL支持{{ window.xxx }}占位符变量 - if (isURL(URL)) { - if (menuList[i].children && menuList[i].children.length >= 1) { - let item = menuList[i].children.find( - (subMenu) => subMenu.url == menuList[i].url - ); - if (item) { - route["path"] = route["name"] = `i-${menuList[i].id}`; - route["redirect"] = `i-${item.id}`; - } else { - route["path"] = route["name"] = `i-${menuList[i].id}`; - route["meta"]["iframeURL"] = URL; - } - } else { - route["path"] = route["name"] = `i-${menuList[i].id}`; - route["meta"]["iframeURL"] = URL; - } - } else { - URL = URL.replace(/^\//, "").replace(/_/g, "-"); - if (URL.startsWith("unopen")) { - route["path"] = route["name"] = URL.replace(/\//g, "-"); - route["component"] = () => import(`@/views/modules/unopen`); - } else if (menuList[i].children && menuList[i].children.length >= 1) { - route["path"] = route["name"] = URL; - route["redirect"] = URL.replace(/\//g, "-"); - } else { - route["path"] = route["name"] = URL.replace(/\//g, "-"); - route["component"] = () => import(`@/views/modules/${URL}`); - } - } - routes.push(route); - } - if (temp.length >= 1) { - return fnAddDynamicMenuRoutes(temp, routes); - } - // routers.reverse(); - // 添加路由 - router.addRoutes([ - { - ...moduleRoutes, - name: "main-dynamic-menu", - children: routes, - }, - { - path: "/main/*", - redirect: { - path: "/main/404", - }, - }, - ]); - window.SITE_CONFIG["dynamicMenuRoutes"] = routes; - window.SITE_CONFIG["dynamicMenuRoutesHasAdded"] = true; + var temp = []; + for (var i = 0; i < menuList.length; i++) { + if (menuList[i].children && menuList[i].children.length >= 1) { + temp = temp.concat(menuList[i].children); + // continue; + } + // 组装路由 + var route = { + path: "", + component: null, + name: "", + meta: { + ...window.SITE_CONFIG["contentTabDefault"], + menuId: menuList[i].id, + title: menuList[i].name, + btns: menuList[i].btns || [], + parent: menuList[i].parent || [], + }, + }; + // eslint-disable-next-line + let URL = (menuList[i].url || "").replace(/{{([^}}]+)?}}/g, (s1, s2) => + eval(s2) + ); // URL支持{{ window.xxx }}占位符变量 + if (isURL(URL)) { + if (menuList[i].children && menuList[i].children.length >= 1) { + let item = menuList[i].children.find( + (subMenu) => subMenu.url == menuList[i].url + ); + if (item) { + route["path"] = route["name"] = `i-${menuList[i].id}`; + route["redirect"] = `i-${item.id}`; + } else { + route["path"] = route["name"] = `i-${menuList[i].id}`; + route["meta"]["iframeURL"] = URL; + } + } else { + route["path"] = route["name"] = `i-${menuList[i].id}`; + route["meta"]["iframeURL"] = URL; + } + } else { + URL = URL.replace(/^\//, "").replace(/_/g, "-"); + if (URL.startsWith("unopen")) { + route["path"] = route["name"] = URL.replace(/\//g, "-"); + route["component"] = () => import(`@/views/modules/unopen`); + } else if ( + menuList[i].children && + menuList[i].children.length >= 1 + ) { + route["path"] = route["name"] = URL; + route["redirect"] = URL.replace(/\//g, "-"); + } else { + route["path"] = route["name"] = URL.replace(/\//g, "-"); + route["component"] = () => import(`@/views/modules/${URL}`); + } + } + routes.push(route); + } + if (temp.length >= 1) { + return fnAddDynamicMenuRoutes(temp, routes); + } + // routers.reverse(); + // 添加路由 + router.addRoutes([ + { + ...moduleRoutes, + name: "main-dynamic-menu", + children: routes, + }, + { + path: "/main/*", + redirect: { + path: "/main/404", + }, + }, + ]); + window.SITE_CONFIG["dynamicMenuRoutes"] = routes; + window.SITE_CONFIG["dynamicMenuRoutesHasAdded"] = true; } function fnAddDynamicMenuRoutes2(menuList = [], routes = []) { - var temp = []; - for (var i = 0; i < menuList.length; i++) { - if (menuList[i].children && menuList[i].children.length >= 1) { - temp = temp.concat(menuList[i].children); - continue; - } - // 组装路由 - var route = { - path: "", - component: null, - name: "", - meta: { - // ...window.SITE_CONFIG["contentTabDefault"], - menuId: menuList[i].id, - title: menuList[i].name, - }, - }; - // eslint-disable-next-line - let URL = (menuList[i].url || "").replace(/{{([^}}]+)?}}/g, (s1, s2) => - eval(s2) - ); // URL支持{{ window.xxx }}占位符变量 - if (isURL(URL)) { - if (menuList[i].children && menuList[i].children.length >= 1) { - let item = menuList[i].children.find( - (subMenu) => subMenu.url == menuList[i].url - ); - if (item) { - route["path"] = route["name"] = `i-${menuList[i].id}`; - route["redirect"] = `i-${item.id}`; - } else { - route["path"] = route["name"] = `i-${menuList[i].id}`; - route["meta"]["iframeURL"] = URL; - } - } else { - route["path"] = route["name"] = `i-${menuList[i].id}`; - route["meta"]["iframeURL"] = URL; - } - } else { - URL = URL.replace(/^\//, "").replace(/_/g, "-"); - if (URL.startsWith("unopen")) { - route["path"] = route["name"] = URL.replace(/\//g, "-"); - route["component"] = () => import(`@/views/modules/unopen`); - } else if (menuList[i].children && menuList[i].children.length >= 1) { - route["path"] = route["name"] = URL; - route["redirect"] = URL.replace(/\//g, "-"); - } else { - route["path"] = route["name"] = URL.replace(/\//g, "-"); - route["component"] = () => import(`@/views/modules/${URL}`); - } - } - routes.push(route); - } - if (temp.length >= 1) { - return fnAddDynamicMenuRoutes2(temp, routes); - } - // 添加路由 - router.addRoutes([ - { - ...moduleShujuRoutes, - name: "main-dynamic-menu-shuju", - children: routes, - }, - { - path: "/main-shuju/*", - redirect: { - path: "/main-shuju/404", - }, - }, - ]); - window.SITE_CONFIG["dynamicMenuRoutesShuju"] = routes; - window.SITE_CONFIG["dynamicMenuRoutesShujuHasAdded"] = true; + var temp = []; + for (var i = 0; i < menuList.length; i++) { + if (menuList[i].children && menuList[i].children.length >= 1) { + temp = temp.concat(menuList[i].children); + continue; + } + // 组装路由 + var route = { + path: "", + component: null, + name: "", + meta: { + // ...window.SITE_CONFIG["contentTabDefault"], + menuId: menuList[i].id, + title: menuList[i].name, + }, + }; + // eslint-disable-next-line + let URL = (menuList[i].url || "").replace(/{{([^}}]+)?}}/g, (s1, s2) => + eval(s2) + ); // URL支持{{ window.xxx }}占位符变量 + if (isURL(URL)) { + if (menuList[i].children && menuList[i].children.length >= 1) { + let item = menuList[i].children.find( + (subMenu) => subMenu.url == menuList[i].url + ); + if (item) { + route["path"] = route["name"] = `i-${menuList[i].id}`; + route["redirect"] = `i-${item.id}`; + } else { + route["path"] = route["name"] = `i-${menuList[i].id}`; + route["meta"]["iframeURL"] = URL; + } + } else { + route["path"] = route["name"] = `i-${menuList[i].id}`; + route["meta"]["iframeURL"] = URL; + } + } else { + URL = URL.replace(/^\//, "").replace(/_/g, "-"); + if (URL.startsWith("unopen")) { + route["path"] = route["name"] = URL.replace(/\//g, "-"); + route["component"] = () => import(`@/views/modules/unopen`); + } else if ( + menuList[i].children && + menuList[i].children.length >= 1 + ) { + route["path"] = route["name"] = URL; + route["redirect"] = URL.replace(/\//g, "-"); + } else { + route["path"] = route["name"] = URL.replace(/\//g, "-"); + route["component"] = () => import(`@/views/modules/${URL}`); + } + } + routes.push(route); + } + if (temp.length >= 1) { + return fnAddDynamicMenuRoutes2(temp, routes); + } + // 添加路由 + router.addRoutes([ + { + ...moduleShujuRoutes, + name: "main-dynamic-menu-shuju", + children: routes, + }, + { + path: "/main-shuju/*", + redirect: { + path: "/main-shuju/404", + }, + }, + ]); + window.SITE_CONFIG["dynamicMenuRoutesShuju"] = routes; + window.SITE_CONFIG["dynamicMenuRoutesShujuHasAdded"] = true; } export default router; diff --git a/src/views/components/blackSearch.vue b/src/views/components/blackSearch.vue index 0a71a31ed..4f3deaf0f 100644 --- a/src/views/components/blackSearch.vue +++ b/src/views/components/blackSearch.vue @@ -568,7 +568,7 @@ export default { } - - diff --git a/src/views/dataBoard/cpts/house-details.vue b/src/views/dataBoard/cpts/house-details.vue new file mode 100644 index 000000000..5d53c42f5 --- /dev/null +++ b/src/views/dataBoard/cpts/house-details.vue @@ -0,0 +1,135 @@ + + + + + diff --git a/src/views/dataBoard/cpts/map/index.vue b/src/views/dataBoard/cpts/map/index.vue index e74e119ee..bc72a0552 100644 --- a/src/views/dataBoard/cpts/map/index.vue +++ b/src/views/dataBoard/cpts/map/index.vue @@ -1,35 +1,44 @@ diff --git a/src/views/dataBoard/cpts/map/popup.vue b/src/views/dataBoard/cpts/map/popup.vue new file mode 100644 index 000000000..5cffd9376 --- /dev/null +++ b/src/views/dataBoard/cpts/map/popup.vue @@ -0,0 +1,398 @@ + + + + + diff --git a/src/views/dataBoard/cpts/popup.vue b/src/views/dataBoard/cpts/popup.vue new file mode 100644 index 000000000..daa4aa103 --- /dev/null +++ b/src/views/dataBoard/cpts/popup.vue @@ -0,0 +1,155 @@ + + + + + diff --git a/src/views/dataBoard/cpts/resi-details.vue b/src/views/dataBoard/cpts/resi-details.vue new file mode 100644 index 000000000..6a377ec5b --- /dev/null +++ b/src/views/dataBoard/cpts/resi-details.vue @@ -0,0 +1,378 @@ + + + + + + diff --git a/src/views/dataBoard/cpts/tb.vue b/src/views/dataBoard/cpts/tb.vue index e7173e66d..aec02a806 100644 --- a/src/views/dataBoard/cpts/tb.vue +++ b/src/views/dataBoard/cpts/tb.vue @@ -1,431 +1,424 @@ diff --git a/src/views/dataBoard/renfang/cpts/bread.vue b/src/views/dataBoard/renfang/cpts/bread.vue new file mode 100644 index 000000000..da8c680f6 --- /dev/null +++ b/src/views/dataBoard/renfang/cpts/bread.vue @@ -0,0 +1,149 @@ + + + + + diff --git a/src/views/dataBoard/renfang/cpts/fwgl.vue b/src/views/dataBoard/renfang/cpts/fwgl.vue index 7ce6c16d9..685d7a715 100644 --- a/src/views/dataBoard/renfang/cpts/fwgl.vue +++ b/src/views/dataBoard/renfang/cpts/fwgl.vue @@ -1,404 +1,522 @@ diff --git a/src/views/dataBoard/renfang/cpts/jmgl.vue b/src/views/dataBoard/renfang/cpts/jmgl.vue index 530ef723e..fa79e6fd8 100644 --- a/src/views/dataBoard/renfang/cpts/jmgl.vue +++ b/src/views/dataBoard/renfang/cpts/jmgl.vue @@ -1,387 +1,462 @@ diff --git a/src/views/dataBoard/renfang/cpts/rkfx.vue b/src/views/dataBoard/renfang/cpts/rkfx.vue index cd67cb530..179aa2453 100644 --- a/src/views/dataBoard/renfang/cpts/rkfx.vue +++ b/src/views/dataBoard/renfang/cpts/rkfx.vue @@ -1,263 +1,366 @@ diff --git a/src/views/dataBoard/renfang/cpts/rkfxPieOption.js b/src/views/dataBoard/renfang/cpts/rkfxPieOption.js index 02d08cd24..c266dc44e 100644 --- a/src/views/dataBoard/renfang/cpts/rkfxPieOption.js +++ b/src/views/dataBoard/renfang/cpts/rkfxPieOption.js @@ -1,32 +1,54 @@ -import * as echarts from 'echarts' +import * as echarts from "echarts"; export function pieOption() { - const center = ["50%", "170px"]; - return { - color: ['#1A95FF', '#FF6138'], - series: [ - { - name: 'Nightingale Chart', - type: 'pie', - radius: [40, 130], - center: ['50%', '50%'], - roseType: 'area', - itemStyle: { - borderRadius: 1 - }, - label:{ - normal:{ - position:'inner', - show:true, - formatter:'{d}%', - fontSize:24, - color: "#FFFFFF", - } - }, - data: [ - - - ] - } - ] - }; + const center = ["50%", "170px"]; + return { + color: [ + "#1A95FF", + "#FF6138", + "#2adcea", + "#2cc4ad", + "#7377f5", + "#32de66", + "#8155d4", + "#c7ea48", + "#ef47c2", + "d43349", + ], + tooltip: { + trigger: "item", + }, + series: [ + { + name: "", + type: "pie", + radius: [40, 130], + center: ["50%", "50%"], + roseType: "area", + itemStyle: { + borderRadius: 1, + }, + avoidLabelOverlap: false, + labelLine: { + show: false, + }, + label: { + normal: { + position: "inner", + show: true, + formatter: "{d}%", + fontSize: 24, + color: "#FFFFFF", + }, + }, + emphasis: { + label: { + show: true, + fontSize: 36, + fontWeight: "bold", + }, + }, + data: [], + }, + ], + }; } diff --git a/src/views/dataBoard/renfang/cpts/rkyj.vue b/src/views/dataBoard/renfang/cpts/rkyj.vue index 9841ea39e..0a8ee33e1 100644 --- a/src/views/dataBoard/renfang/cpts/rkyj.vue +++ b/src/views/dataBoard/renfang/cpts/rkyj.vue @@ -1,142 +1,176 @@ diff --git a/src/views/dataBoard/renfang/cpts/szsq.vue b/src/views/dataBoard/renfang/cpts/szsq.vue index e71084ae8..b2a767e4a 100644 --- a/src/views/dataBoard/renfang/cpts/szsq.vue +++ b/src/views/dataBoard/renfang/cpts/szsq.vue @@ -1,115 +1,195 @@ diff --git a/src/views/dataBoard/renfang/house/list.vue b/src/views/dataBoard/renfang/house/list.vue new file mode 100644 index 000000000..2be9203c4 --- /dev/null +++ b/src/views/dataBoard/renfang/house/list.vue @@ -0,0 +1,241 @@ + + + + + diff --git a/src/views/dataBoard/renfang/index.vue b/src/views/dataBoard/renfang/index.vue index e76fe82ba..3c2e89b27 100644 --- a/src/views/dataBoard/renfang/index.vue +++ b/src/views/dataBoard/renfang/index.vue @@ -1,295 +1,369 @@ diff --git a/src/views/dataBoard/renfang/resi/class.vue b/src/views/dataBoard/renfang/resi/class.vue new file mode 100644 index 000000000..4f0a38ec8 --- /dev/null +++ b/src/views/dataBoard/renfang/resi/class.vue @@ -0,0 +1,284 @@ + + + + + diff --git a/src/views/dataBoard/renfang/resi/list.vue b/src/views/dataBoard/renfang/resi/list.vue new file mode 100644 index 000000000..7a8ff4ecb --- /dev/null +++ b/src/views/dataBoard/renfang/resi/list.vue @@ -0,0 +1,225 @@ + + + + + diff --git a/src/views/dataBoard/renfang/warn/building.vue b/src/views/dataBoard/renfang/warn/building.vue new file mode 100644 index 000000000..d11e25670 --- /dev/null +++ b/src/views/dataBoard/renfang/warn/building.vue @@ -0,0 +1,223 @@ + + + + + diff --git a/src/views/dataBoard/renfang/warn/resi.vue b/src/views/dataBoard/renfang/warn/resi.vue new file mode 100644 index 000000000..560d0fab4 --- /dev/null +++ b/src/views/dataBoard/renfang/warn/resi.vue @@ -0,0 +1,199 @@ + + + + + diff --git a/src/views/dataBoardMain/main-navbar.vue b/src/views/dataBoardMain/main-navbar.vue index c71a722b5..7f8422023 100644 --- a/src/views/dataBoardMain/main-navbar.vue +++ b/src/views/dataBoardMain/main-navbar.vue @@ -1,171 +1,196 @@ diff --git a/src/views/modules/base/community/communityExportInfo.vue b/src/views/modules/base/community/communityExportInfo.vue index 26dc60c7a..bc75c4cc1 100644 --- a/src/views/modules/base/community/communityExportInfo.vue +++ b/src/views/modules/base/community/communityExportInfo.vue @@ -104,6 +104,8 @@ +
自定义表头：
+ 保存为常用模板 @@ -333,7 +335,7 @@ export default { searchForm: { ...this.search }, exportConfig: { ...this.form, - formCode: 'resi_base_info', + formCode: 'community_info', itemList: this.rightList.map(item => { return { itemId: item.id, @@ -371,7 +373,7 @@ export default { }, async getTemplateList () { let params = { - formCode: 'resi_base_info' + formCode: 'community_info' } await this.$http .post('/oper/customize/icExportTemplate/templateList', params) @@ -427,277 +429,283 @@ export default { let params = {} const { data, code, msg } = await requestPost(url, params) - if (code === 0) { - let dataTemp = [] - - if (groupId === '45687aa479955f9d06204d415238f7cc_0') { - dataTemp = [ - { - columnName: "GRID_ID", - customerId: "45687aa479955f9d06204d415238f7cc", - itemGroupId: "45687aa479955f9d06204d415238f7cc_0", - itemId: "20220422102809_1001", - itemType: null, - label: "所属组织", - optionSourceType: "remote", - optionSourceValue: "/gov/org/customergrid/gridoption", - options: null, - sort: 0, - supportAdd: false, - tableName: "ic_resi_user", - }, - { - columnName: "VILLAGE_ID", - customerId: "45687aa479955f9d06204d415238f7cc", - itemGroupId: "45687aa479955f9d06204d415238f7cc_0", - itemId: "20220422102809_1002", - itemType: null, - label: "所属网格", - optionSourceType: "remote", - optionSourceValue: "/actual/base/communityQuarters/listQuartersOptions?20220422102809_1001", - options: null, - sort: 1, - supportAdd: false, - tableName: "ic_resi_user", - }, - { - columnName: "BUILD_ID", - customerId: "45687aa479955f9d06204d415238f7cc", - itemGroupId: "45687aa479955f9d06204d415238f7cc_0", - itemId: "20220422102809_1003", - itemType: null, - label: "小区名称", - optionSourceType: "remote", - optionSourceValue: "/actual/base/communityBuilding/buildingoption?20220422102809_1002", - options: null, - sort: 2, - supportAdd: false, - tableName: "ic_resi_user", - }, - { - columnName: "UNIT_ID", - customerId: "45687aa479955f9d06204d415238f7cc", - itemGroupId: "45687aa479955f9d06204d415238f7cc_0", - itemId: "20220422102809_10031", - itemType: null, - label: "关联物业", - optionSourceType: "remote", - optionSourceValue: "/actual/base/communityBuildingUnit/unitoption?20220422102809_1003", - options: null, - sort: 3, - supportAdd: false, - tableName: "ic_resi_user", - }, - { - columnName: "HOME_ID", - customerId: "45687aa479955f9d06204d415238f7cc", - itemGroupId: "45687aa479955f9d06204d415238f7cc_0", - itemId: "20220422102809_1004", - itemType: null, - label: "详细地址", - optionSourceType: "remote", - optionSourceValue: "/actual/base/communityHouse/houseoption?20220422102809_10031", - options: null, - sort: 4, - supportAdd: false, - tableName: "ic_resi_user", - }, - { - columnName: "IS_BDHJ", - customerId: "45687aa479955f9d06204d415238f7cc", - itemGroupId: "45687aa479955f9d06204d415238f7cc_0", - itemId: "20220422102809_1005", - itemType: null, - label: "备注", - optionSourceType: "local", - optionSourceValue: "options表取", - options: null, - sort: 5, - supportAdd: false, - tableName: "ic_resi_user", - }, - - ] - } - - if (groupId === '20220422102809_101') { - dataTemp = [ - { - columnName: "GRID_ID", - customerId: "45687aa479955f9d06204d415238f7cc", - itemGroupId: "20220422102809_101", - itemId: "20220422102809_1001", - itemType: null, - label: "所属小区", - optionSourceType: "remote", - optionSourceValue: "/gov/org/customergrid/gridoption", - options: null, - sort: 0, - supportAdd: false, - tableName: "ic_resi_user", - }, - - { - columnName: "VILLAGE_ID", - customerId: "45687aa479955f9d06204d415238f7cc", - itemGroupId: "20220422102809_101", - itemId: "20220422102809_1002", - itemType: null, - label: "楼栋名称", - optionSourceType: "remote", - optionSourceValue: "/actual/base/communityQuarters/listQuartersOptions?20220422102809_1001", - options: null, - sort: 1, - supportAdd: false, - tableName: "ic_resi_user", - }, - - { - columnName: "BUILD_ID", - customerId: "45687aa479955f9d06204d415238f7cc", - itemGroupId: "20220422102809_101", - itemId: "20220422102809_1003", - itemType: null, - label: "楼栋类型", - optionSourceType: "remote", - optionSourceValue: "/actual/base/communityBuilding/buildingoption?20220422102809_1002", - options: null, - sort: 2, - supportAdd: false, - tableName: "ic_resi_user", - }, - - { - columnName: "UNIT_ID", - customerId: "45687aa479955f9d06204d415238f7cc", - itemGroupId: "20220422102809_101", - itemId: "20220422102809_10031", - itemType: null, - label: "单元数", - optionSourceType: "remote", - optionSourceValue: "/actual/base/communityBuildingUnit/unitoption?20220422102809_1003", - options: null, - sort: 3, - supportAdd: false, - tableName: "ic_resi_user", - }, - - { - columnName: "HOME_ID", - customerId: "45687aa479955f9d06204d415238f7cc", - itemGroupId: "20220422102809_101", - itemId: "20220422102809_1004", - itemType: null, - label: "楼栋地址", - optionSourceType: "remote", - optionSourceValue: "/actual/base/communityHouse/houseoption?20220422102809_10031", - options: null, - sort: 4, - supportAdd: false, - tableName: "ic_resi_user", - }, - ] - } - - if (groupId === '20220422102809_102') { - dataTemp = [ - { - columnName: "GRID_ID", - customerId: "45687aa479955f9d06204d415238f7cc", - itemGroupId: "20220422102809_102", - itemId: "20220422102809_1001", - itemType: null, - label: "所属楼栋", - optionSourceType: "remote", - optionSourceValue: "/gov/org/customergrid/gridoption", - options: null, - sort: 0, - supportAdd: false, - tableName: "ic_resi_user", - }, - - { - columnName: "VILLAGE_ID", - customerId: "45687aa479955f9d06204d415238f7cc", - itemGroupId: "20220422102809_102", - itemId: "20220422102809_1002", - itemType: null, - label: "单元号", - optionSourceType: "remote", - optionSourceValue: "/actual/base/communityQuarters/listQuartersOptions?20220422102809_1001", - options: null, - sort: 1, - supportAdd: false, - tableName: "ic_resi_user", - }, - - { - columnName: "BUILD_ID", - customerId: "45687aa479955f9d06204d415238f7cc", - itemGroupId: "20220422102809_102", - itemId: "20220422102809_1003", - itemType: null, - label: "门牌号", - optionSourceType: "remote", - optionSourceValue: "/actual/base/communityBuilding/buildingoption?20220422102809_1002", - options: null, - sort: 2, - supportAdd: false, - tableName: "ic_resi_user", - }, - - { - columnName: "UNIT_ID", - customerId: "45687aa479955f9d06204d415238f7cc", - itemGroupId: "20220422102809_102", - itemId: "20220422102809_10031", - itemType: null, - label: "房屋类型", - optionSourceType: "remote", - optionSourceValue: "/actual/base/communityBuildingUnit/unitoption?20220422102809_1003", - options: null, - sort: 3, - supportAdd: false, - tableName: "ic_resi_user", - }, - - { - columnName: "HOME_ID", - customerId: "45687aa479955f9d06204d415238f7cc", - itemGroupId: "20220422102809_102", - itemId: "20220422102809_1004", - itemType: null, - label: "房屋用途", - optionSourceType: "remote", - optionSourceValue: "/actual/base/communityHouse/houseoption?20220422102809_10031", - options: null, - sort: 4, - supportAdd: false, - tableName: "ic_resi_user", - }, - { - columnName: "IS_BDHJ", - customerId: "45687aa479955f9d06204d415238f7cc", - itemGroupId: "20220422102809_102", - itemId: "20220422102809_1005", - itemType: null, - label: "房屋状态", - optionSourceType: "local", - optionSourceValue: "options表取", - options: null, - sort: 5, - supportAdd: false, - tableName: "ic_resi_user", - }, - ] - } - return dataTemp + return data } else { this.$message.error(msg) } + // if (code === 0) { + // let dataTemp = [] + // + // if (groupId === '45687aa479955f9d06204d415238f7cc_0') { + // dataTemp = [ + // { + // columnName: "GRID_ID", + // customerId: "45687aa479955f9d06204d415238f7cc", + // itemGroupId: "45687aa479955f9d06204d415238f7cc_0", + // itemId: "20220422102809_1001", + // itemType: null, + // label: "所属组织", + // optionSourceType: "remote", + // optionSourceValue: "/gov/org/customergrid/gridoption", + // options: null, + // sort: 0, + // supportAdd: false, + // tableName: "ic_resi_user", + // }, + // { + // columnName: "VILLAGE_ID", + // customerId: "45687aa479955f9d06204d415238f7cc", + // itemGroupId: "45687aa479955f9d06204d415238f7cc_0", + // itemId: "20220422102809_1002", + // itemType: null, + // label: "所属网格", + // optionSourceType: "remote", + // optionSourceValue: "/actual/base/communityQuarters/listQuartersOptions?20220422102809_1001", + // options: null, + // sort: 1, + // supportAdd: false, + // tableName: "ic_resi_user", + // }, + // { + // columnName: "BUILD_ID", + // customerId: "45687aa479955f9d06204d415238f7cc", + // itemGroupId: "45687aa479955f9d06204d415238f7cc_0", + // itemId: "20220422102809_1003", + // itemType: null, + // label: "小区名称", + // optionSourceType: "remote", + // optionSourceValue: "/actual/base/communityBuilding/buildingoption?20220422102809_1002", + // options: null, + // sort: 2, + // supportAdd: false, + // tableName: "ic_resi_user", + // }, + // { + // columnName: "UNIT_ID", + // customerId: "45687aa479955f9d06204d415238f7cc", + // itemGroupId: "45687aa479955f9d06204d415238f7cc_0", + // itemId: "20220422102809_10031", + // itemType: null, + // label: "关联物业", + // optionSourceType: "remote", + // optionSourceValue: "/actual/base/communityBuildingUnit/unitoption?20220422102809_1003", + // options: null, + // sort: 3, + // supportAdd: false, + // tableName: "ic_resi_user", + // }, + // { + // columnName: "HOME_ID", + // customerId: "45687aa479955f9d06204d415238f7cc", + // itemGroupId: "45687aa479955f9d06204d415238f7cc_0", + // itemId: "20220422102809_1004", + // itemType: null, + // label: "详细地址", + // optionSourceType: "remote", + // optionSourceValue: "/actual/base/communityHouse/houseoption?20220422102809_10031", + // options: null, + // sort: 4, + // supportAdd: false, + // tableName: "ic_resi_user", + // }, + // { + // columnName: "IS_BDHJ", + // customerId: "45687aa479955f9d06204d415238f7cc", + // itemGroupId: "45687aa479955f9d06204d415238f7cc_0", + // itemId: "20220422102809_1005", + // itemType: null, + // label: "备注", + // optionSourceType: "local", + // optionSourceValue: "options表取", + // options: null, + // sort: 5, + // supportAdd: false, + // tableName: "ic_resi_user", + // }, + // + // ] + // } + // + // if (groupId === '20220422102809_101') { + // dataTemp = [ + // { + // columnName: "GRID_ID", + // customerId: "45687aa479955f9d06204d415238f7cc", + // itemGroupId: "20220422102809_101", + // itemId: "20220422102809_1001", + // itemType: null, + // label: "所属小区", + // optionSourceType: "remote", + // optionSourceValue: "/gov/org/customergrid/gridoption", + // options: null, + // sort: 0, + // supportAdd: false, + // tableName: "ic_resi_user", + // }, + // + // { + // columnName: "VILLAGE_ID", + // customerId: "45687aa479955f9d06204d415238f7cc", + // itemGroupId: "20220422102809_101", + // itemId: "20220422102809_1002", + // itemType: null, + // label: "楼栋名称", + // optionSourceType: "remote", + // optionSourceValue: "/actual/base/communityQuarters/listQuartersOptions?20220422102809_1001", + // options: null, + // sort: 1, + // supportAdd: false, + // tableName: "ic_resi_user", + // }, + // + // { + // columnName: "BUILD_ID", + // customerId: "45687aa479955f9d06204d415238f7cc", + // itemGroupId: "20220422102809_101", + // itemId: "20220422102809_1003", + // itemType: null, + // label: "楼栋类型", + // optionSourceType: "remote", + // optionSourceValue: "/actual/base/communityBuilding/buildingoption?20220422102809_1002", + // options: null, + // sort: 2, + // supportAdd: false, + // tableName: "ic_resi_user", + // }, + // + // { + // columnName: "UNIT_ID", + // customerId: "45687aa479955f9d06204d415238f7cc", + // itemGroupId: "20220422102809_101", + // itemId: "20220422102809_10031", + // itemType: null, + // label: "单元数", + // optionSourceType: "remote", + // optionSourceValue: "/actual/base/communityBuildingUnit/unitoption?20220422102809_1003", + // options: null, + // sort: 3, + // supportAdd: false, + // tableName: "ic_resi_user", + // }, + // + // { + // columnName: "HOME_ID", + // customerId: "45687aa479955f9d06204d415238f7cc", + // itemGroupId: "20220422102809_101", + // itemId: "20220422102809_1004", + // itemType: null, + // label: "楼栋地址", + // optionSourceType: "remote", + // optionSourceValue: "/actual/base/communityHouse/houseoption?20220422102809_10031", + // options: null, + // sort: 4, + // supportAdd: false, + // tableName: "ic_resi_user", + // }, + // ] + // } + // + // if (groupId === '20220422102809_102') { + // dataTemp = [ + // { + // columnName: "GRID_ID", + // customerId: "45687aa479955f9d06204d415238f7cc", + // itemGroupId: "20220422102809_102", + // itemId: "20220422102809_1001", + // itemType: null, + // label: "所属楼栋", + // optionSourceType: "remote", + // optionSourceValue: "/gov/org/customergrid/gridoption", + // options: null, + // sort: 0, + // supportAdd: false, + // tableName: "ic_resi_user", + // }, + // + // { + // columnName: "VILLAGE_ID", + // customerId: "45687aa479955f9d06204d415238f7cc", + // itemGroupId: "20220422102809_102", + // itemId: "20220422102809_1002", + // itemType: null, + // label: "单元号", + // optionSourceType: "remote", + // optionSourceValue: "/actual/base/communityQuarters/listQuartersOptions?20220422102809_1001", + // options: null, + // sort: 1, + // supportAdd: false, + // tableName: "ic_resi_user", + // }, + // + // { + // columnName: "BUILD_ID", + // customerId: "45687aa479955f9d06204d415238f7cc", + // itemGroupId: "20220422102809_102", + // itemId: "20220422102809_1003", + // itemType: null, + // label: "门牌号", + // optionSourceType: "remote", + // optionSourceValue: "/actual/base/communityBuilding/buildingoption?20220422102809_1002", + // options: null, + // sort: 2, + // supportAdd: false, + // tableName: "ic_resi_user", + // }, + // + // { + // columnName: "UNIT_ID", + // customerId: "45687aa479955f9d06204d415238f7cc", + // itemGroupId: "20220422102809_102", + // itemId: "20220422102809_10031", + // itemType: null, + // label: "房屋类型", + // optionSourceType: "remote", + // optionSourceValue: "/actual/base/communityBuildingUnit/unitoption?20220422102809_1003", + // options: null, + // sort: 3, + // supportAdd: false, + // tableName: "ic_resi_user", + // }, + // + // { + // columnName: "HOME_ID", + // customerId: "45687aa479955f9d06204d415238f7cc", + // itemGroupId: "20220422102809_102", + // itemId: "20220422102809_1004", + // itemType: null, + // label: "房屋用途", + // optionSourceType: "remote", + // optionSourceValue: "/actual/base/communityHouse/houseoption?20220422102809_10031", + // options: null, + // sort: 4, + // supportAdd: false, + // tableName: "ic_resi_user", + // }, + // { + // columnName: "IS_BDHJ", + // customerId: "45687aa479955f9d06204d415238f7cc", + // itemGroupId: "20220422102809_102", + // itemId: "20220422102809_1005", + // itemType: null, + // label: "房屋状态", + // optionSourceType: "local", + // optionSourceValue: "options表取", + // options: null, + // sort: 5, + // supportAdd: false, + // tableName: "ic_resi_user", + // }, + // ] + // } + // + // return dataTemp + // + // } else { + // this.$message.error(msg) + // } }, formatData (res) { const fileReader = new FileReader() @@ -815,4 +823,4 @@ export default { .wd200 { width: 200px; } - \ No newline at end of file + diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue index c7da40a76..ad96eefe5 100644 --- a/src/views/modules/base/community/communityTable.vue +++ b/src/views/modules/base/community/communityTable.vue @@ -310,7 +310,7 @@ ref="ref_diy" :list="exportList" :search="{ - formCode: 'resi_base_info', + formCode: 'community_info', pageNo: pageNo, pageSize: pageSize, conditions: conditions, @@ -756,66 +756,21 @@ export default { }, async getExportList (type) { - const url = "/oper/customize//icformitemgroup/list"; + const url = "/oper/customize/icformitemgroup/list"; let params = { - formCode: "resi_base_info", + formCode: "community_info", }; const { data, code, msg } = await requestPost(url, params); if (code === 0) { - //暂无接口 - let dataTemp = [ - { - childShowFlag: "0", - customerId: "45687aa479955f9d06204d415238f7cc", - display: false, - formCode: "resi_base_info", - formId: "20220422102809_1", - groupCode: "jcxx", - id: "45687aa479955f9d06204d415238f7cc_0", - label: "小区信息", - policyFlag: "1", - sort: 0, - supportAdd: false, - tableName: "ic_resi_user" - }, - { - childShowFlag: "0", - customerId: "45687aa479955f9d06204d415238f7cc", - display: true, - formCode: "resi_base_info", - formId: "20220422102809_1", - groupCode: "jyxx", - id: "20220422102809_101", - label: "楼栋信息", - policyFlag: "1", - sort: 1, - supportAdd: false, - tableName: "ic_resi_user", - }, - { - childShowFlag: "0", - customerId: "45687aa479955f9d06204d415238f7cc", - display: true, - formCode: "resi_base_info", - formId: "20220422102809_1", - groupCode: "xqah", - id: "20220422102809_102", - label: "房屋信息", - policyFlag: "1", - sort: 2, - supportAdd: false, - tableName: "ic_resi_user", - } - ] - dataTemp.forEach((item) => { + data.forEach((item) => { (async (id) => { // item.queryItemList = await this.getExportChildList(id) item.queryItemList = []; })(item.id); }); - this.exportList = [...dataTemp]; + this.exportList = [...data]; this.$nextTick(() => { this.diyDialog = true; }); @@ -823,6 +778,67 @@ export default { } else { this.$message.error(msg); } + + // if (code === 0) { + // //暂无接口 + // let dataTemp = [ + // { + // childShowFlag: "0", + // customerId: "45687aa479955f9d06204d415238f7cc", + // display: false, + // formCode: "resi_base_info", + // formId: "20220422102809_1", + // groupCode: "jcxx", + // id: "45687aa479955f9d06204d415238f7cc_0", + // label: "小区信息", + // policyFlag: "1", + // sort: 0, + // supportAdd: false, + // tableName: "ic_resi_user" + // }, + // { + // childShowFlag: "0", + // customerId: "45687aa479955f9d06204d415238f7cc", + // display: true, + // formCode: "resi_base_info", + // formId: "20220422102809_1", + // groupCode: "jyxx", + // id: "20220422102809_101", + // label: "楼栋信息", + // policyFlag: "1", + // sort: 1, + // supportAdd: false, + // tableName: "ic_resi_user", + // }, + // { + // childShowFlag: "0", + // customerId: "45687aa479955f9d06204d415238f7cc", + // display: true, + // formCode: "resi_base_info", + // formId: "20220422102809_1", + // groupCode: "xqah", + // id: "20220422102809_102", + // label: "房屋信息", + // policyFlag: "1", + // sort: 2, + // supportAdd: false, + // tableName: "ic_resi_user", + // } + // ] + // dataTemp.forEach((item) => { + // (async (id) => { + // // item.queryItemList = await this.getExportChildList(id) + // item.queryItemList = []; + // })(item.id); + // }); + // this.exportList = [...dataTemp]; + // this.$nextTick(() => { + // this.diyDialog = true; + // }); + // console.log("获取详情成功getExportList----", this.exportList); + // } else { + // this.$message.error(msg); + // } }, //导出表格 以前是导出 现在改成导出房屋数据 async handleExport () { diff --git a/src/views/modules/base/diyInfo.vue b/src/views/modules/base/diyInfo.vue index aafdaa0f7..62cbe0574 100644 --- a/src/views/modules/base/diyInfo.vue +++ b/src/views/modules/base/diyInfo.vue @@ -7,11 +7,11 @@
-
- +
@@ -21,7 +21,7 @@
- 删除 - 预览 - 导出 @@ -84,6 +84,8 @@
模板名称：
+
自定义表头：
+ 保存为常用模板
@@ -115,10 +117,10 @@ :key="i" align="center" min-width="120"> - + - + @@ -178,7 +180,7 @@ export default { rightList: { handler(val) { if (val.length > 0) this.dragSort() - + }, deep: true }, @@ -211,7 +213,7 @@ export default { }) } else { this.rightList.push(obj) - + this.$nextTick(() => { console.log('itemttt------', this.$refs[`drag${pid}`]) this.$refs[`drag${pid}`][0].dragSort() @@ -235,7 +237,7 @@ export default { if (n == item.itemId) { checkList.splice(i, 1) this.$refs[`checkbox${item.itemGroupId}`][0].handleChange(checkList) - } + } }) this.rightList.forEach((n, i) => { if (n.id === item.itemGroupId) { @@ -281,7 +283,7 @@ export default { this.$message({ type: 'info', message: '已取消删除' - }); + }); }) }, handlePreview(id) { @@ -337,13 +339,13 @@ export default { console.log('res----dddd', res) // this.download(res.data, title + '.xls') // this.getTemplateList() - + this.exportLoading = false // if (res.data.code && res.data.code == 9999) { // return this.$message.error(res.data.msg) // } this.formatData(res) - + }) .catch(err => { console.log('err', err) @@ -519,7 +521,7 @@ export default { // max-height: calc(80vh - 220px); // // overflow: auto; // } - + // } // } .mb10 { @@ -534,4 +536,4 @@ export default { .wd200 { width: 200px; } - \ No newline at end of file + diff --git a/src/views/modules/base/resi copy.vue b/src/views/modules/base/resi copy.vue index 63d9fb32e..85c67e52a 100644 --- a/src/views/modules/base/resi copy.vue +++ b/src/views/modules/base/resi copy.vue @@ -142,7 +142,7 @@ type="text" size="small" class="btn-color-look">查看 --> - @@ -1335,7 +1335,7 @@ export default { }); }, async getExportList (type) { - const url = "/oper/customize//icformitemgroup/list"; + const url = "/oper/customize/icformitemgroup/list"; let params = { formCode: "resi_base_info", }; diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue index cb805615a..29f223fc7 100644 --- a/src/views/modules/base/resi.vue +++ b/src/views/modules/base/resi.vue @@ -1,45 +1,9 @@ @@ -142,82 +153,93 @@ export default { @import "~@/assets/scss/c/function.scss"; .m-tx { - position: relative; - margin: 10px 6px; - padding: 12px 20px; - background: #ffffff; - box-shadow: 0px 6px 16px 0px rgba(0, 0, 0, 0.08), - 0px 3px 6px -4px rgba(0, 0, 0, 0.12); - border-radius: 2px; - - .cnt { - box-sizing: border-box; - border-radius: 2px; - overflow: hidden; - padding: 0 12px; - - .z-readed { - opacity: 0.5; - } - - .item { - display: flex; - align-items: center; - padding: 16px 0 12px; - border-bottom: 1px dashed #f0f5fa; - &:last-child { - border-bottom: none; - } - - .item-tag { - display: block; - margin-right: 15px; - width: 24px; - height: 24px; - } - .item-title { - // @include toe; - width: 60%; - margin-right: 100px; - font-size: 14px; - font-family: PingFangSC-Regular, PingFang SC; - font-weight: 400; - color: rgba(0, 0, 0, 0.85); - line-height: 22px; - } - .item-date { - font-size: 12px; - font-family: PingFangSC-Regular, PingFang SC; - font-weight: 400; - color: rgba(0, 0, 0, 0.45); - line-height: 17px; - } - } - } - .btn-clear { - position: absolute; - top: 14px; - right: 15px; - width: 32px; - height: 12px; - width: 75px; - height: 25px; - background: linear-gradient(0deg, #db3b3b 1%, #ff8080 100%); - border-radius: 3px; - font-size: 14px; - font-weight: 500; - color: #ffffff; - line-height: 25px; - text-align: center; - } + position: relative; + margin: 10px 6px; + padding: 12px 20px; + background: #ffffff; + box-shadow: 0px 6px 16px 0px rgba(0, 0, 0, 0.08), + 0px 3px 6px -4px rgba(0, 0, 0, 0.12); + border-radius: 2px; + + .cnt { + box-sizing: border-box; + border-radius: 2px; + overflow: hidden; + padding: 0 12px; + + .empty { + margin: 100px 0; + text-align: center; + color: #999; + img { + display: block; + width: 120px; + margin: 20px auto; + } + } + + .z-readed { + opacity: 0.5; + } + + .item { + display: flex; + align-items: center; + padding: 16px 0 12px; + border-bottom: 1px dashed #f0f5fa; + &:last-child { + border-bottom: none; + } + + .item-tag { + display: block; + margin-right: 15px; + width: 24px; + height: 24px; + } + .item-title { + // @include toe; + width: 60%; + margin-right: 100px; + font-size: 14px; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: rgba(0, 0, 0, 0.85); + line-height: 22px; + } + .item-date { + font-size: 12px; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: rgba(0, 0, 0, 0.45); + line-height: 17px; + } + } + } + .btn-clear { + position: absolute; + top: 14px; + right: 15px; + width: 32px; + height: 12px; + width: 75px; + height: 25px; + background: linear-gradient(0deg, #db3b3b 1%, #ff8080 100%); + border-radius: 3px; + font-size: 14px; + font-weight: 500; + color: #ffffff; + line-height: 25px; + text-align: center; + } } /deep/ .el-tabs__nav-wrap::after { - height: 1px; - background-color: #f0f5fa; + height: 1px; + background-color: #f0f5fa; } /deep/ .el-pagination__total { - // float: left; + // float: left; } diff --git a/src/views/modules/productConfig/autoTest/autoTestList copy.vue b/src/views/modules/productConfig/autoTest/autoTestList copy.vue index 9140bcc2a..ea7eabdd0 100644 --- a/src/views/modules/productConfig/autoTest/autoTestList copy.vue +++ b/src/views/modules/productConfig/autoTest/autoTestList copy.vue @@ -897,7 +897,7 @@ export default { } -