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/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/renfang/index.scss b/src/assets/scss/dataBoard/renfang/index.scss index bfa76a3a8..aee1b1183 100644 --- a/src/assets/scss/dataBoard/renfang/index.scss +++ b/src/assets/scss/dataBoard/renfang/index.scss @@ -277,27 +277,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/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/views/dataBoard/renfang/index.vue b/src/views/dataBoard/renfang/index.vue index e76fe82ba..195962cbd 100644 --- a/src/views/dataBoard/renfang/index.vue +++ b/src/views/dataBoard/renfang/index.vue @@ -1,295 +1,334 @@ diff --git a/src/views/dataBoardMain/main-navbar.vue b/src/views/dataBoardMain/main-navbar.vue index c71a722b5..699a4252f 100644 --- a/src/views/dataBoardMain/main-navbar.vue +++ b/src/views/dataBoardMain/main-navbar.vue @@ -1,171 +1,196 @@