From f0894fca8c22b6a40f1ca875ee52a355f1df6738 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=88=98=E7=AB=8B=E6=A0=87?= <2658037827@qq.com> Date: Thu, 21 Sep 2023 09:51:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=A5=E5=85=B7=E7=B1=BB?= =?UTF-8?q?=E3=80=81=E4=BF=AE=E6=94=B9=E6=A6=82=E8=A7=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main.js | 5 ++++- src/utils/jwTool.js | 10 ++++++++++ src/views/dataBoard/overview/index.vue | 7 ++++--- 3 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 src/utils/jwTool.js diff --git a/src/main.js b/src/main.js index f27ee6174..a0549cc5d 100644 --- a/src/main.js +++ b/src/main.js @@ -22,7 +22,8 @@ import { message } from "@/utils/message.js"; import http from "@/utils/request"; import cloneDeep from "lodash/cloneDeep"; - +// 引入工具类 +import './utils/jwTool' // axios封装 import ajax from "@/js/ajax"; // service @@ -32,6 +33,7 @@ import store from "@/js/store"; //系统工具 import util from "@js/util"; // import Cookies from "js-cookie"; + import Moment from "moment"; import getQueryPara from "dai-js/modules/getQueryPara"; import NodeWrap from "@/components/Tree/nodeWrap.vue"; @@ -103,6 +105,7 @@ window.SITE_CONFIG["storeState"] = cloneDeep(store.state); Vue.prototype.tableHeaderStyle = { background: "linear-gradient(0deg, #005EB3 0%, #0083F0 100%)", color: "#FFFFFF", padding: "6px 0px" }; + new Vue({ i18n, router, diff --git a/src/utils/jwTool.js b/src/utils/jwTool.js new file mode 100644 index 000000000..5e797cf78 --- /dev/null +++ b/src/utils/jwTool.js @@ -0,0 +1,10 @@ +import Vue from "vue"; + +const paramsFormat = function (params) { + let strArray = [] + for(let key in params) { + strArray.push(key+'='+params[key]) + } + return strArray.join('&') +} +Vue.prototype.$paramsFormat = paramsFormat diff --git a/src/views/dataBoard/overview/index.vue b/src/views/dataBoard/overview/index.vue index eb50fe5c1..20da5828f 100644 --- a/src/views/dataBoard/overview/index.vue +++ b/src/views/dataBoard/overview/index.vue @@ -227,7 +227,9 @@ export default { watch: { "$store.state.chooseArea.chooseName"(val){ - this.getMapData() + if(val.orgId) { + this.getMapData() + } } }, @@ -271,7 +273,6 @@ export default { orgLevel: item.level, meta: {title: item.name}, }); - this.getMapData(item.id,item.level) }, toBread(item) { @@ -285,7 +286,7 @@ export default { breadList.push(item); this.breadList = breadList; } - this.init(item.orgId, item.orgLevel); + this.getMapData(item.orgId,item.orgLevel) }, // 点击搜索结果条目,在地图上显示点和详情弹窗