From de918d48dcfa3b8b41c1b762948540b6f22e8a70 Mon Sep 17 00:00:00 2001 From: aixianling Date: Tue, 2 Apr 2024 17:24:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=BB=94=E8=A5=BF=E5=8D=97?= =?UTF-8?q?=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- examples/router/axios.js | 8 ++++---- packages/bigscreen/dv/AppQxnDv.vue | 2 +- ui/packages/tools/AiEchartV2.vue | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/router/axios.js b/examples/router/axios.js index f3621870..af795cae 100644 --- a/examples/router/axios.js +++ b/examples/router/axios.js @@ -26,15 +26,15 @@ instance.interceptors.request.use(config => { } else if (/#url-/.test(location.hash)) { config.baseURL = location.hash.replace(/#url-/, '/') } - if (["/omsapi"].includes(config.baseURL)) { - config.url = config.url.replace(/(app|auth|admin|api)\//, "api/") - } - if (["/xsjr", "/tfx"].includes(config.baseURL)) { + if (["/xsjr", "/tfx", "/omsapi"].includes(config.baseURL)) { config.url = config.url.replace(/(app|auth|admin|api)\//, "api/") } if (['/qxn', '/analysis'].includes(config.baseURL)) { config.url = config.url.replace(/(app|auth|admin)\//, "api/") } + if (process.env.VUE_APP_IS_SIMPLE_SERVER == 1) { + config.url = config.url.replace(/(app|auth|admin)\//, "api/") + } return config }, error => Message.error(error)) export default instance diff --git a/packages/bigscreen/dv/AppQxnDv.vue b/packages/bigscreen/dv/AppQxnDv.vue index 923e607e..01700e7a 100644 --- a/packages/bigscreen/dv/AppQxnDv.vue +++ b/packages/bigscreen/dv/AppQxnDv.vue @@ -929,7 +929,7 @@ gridId: this.gridId || this.gridParentId } }).then(res => { - if (res.code === 0) { + if (res?.data) { this.wjwqgkInfo = res.data } }) diff --git a/ui/packages/tools/AiEchartV2.vue b/ui/packages/tools/AiEchartV2.vue index 14dfb9d4..3745db99 100644 --- a/ui/packages/tools/AiEchartV2.vue +++ b/ui/packages/tools/AiEchartV2.vue @@ -53,7 +53,7 @@ export default { return ['#FFBA44', '#EC6666', '#FF3E18', '#C9FF82', '#29D7FA', '#ea7ccc'] }, chartOptions() { - const {daemon} = this.$echartTpls[this.tpl] + const {daemon = {}} = this.$echartTpls[this.tpl] || {} let {type, data, ops: options = {}} = this, style = this.series ? this.series : this.ops.daemon ? this.ops.daemon : {}, colors = this.theme === '1' ? this.colors : (options.color || this.colors),