From c215c89ecda16e4d32593f3e942fe871898071e9 Mon Sep 17 00:00:00 2001
From: surprise <15810472099@163.com>
Date: 星期一, 05 二月 2024 17:51:53 +0800
Subject: [PATCH] 代码提交
---
src/views/PackageTwo/WareInspection.vue | 5 ++---
public/config/config.js | 2 +-
src/components/navMenu.vue | 8 +++-----
3 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/public/config/config.js b/public/config/config.js
index 5b883ab..cc6a5dd 100644
--- a/public/config/config.js
+++ b/public/config/config.js
@@ -1,4 +1,4 @@
-var isLocal = false;
+var isLocal = true;
var is_production = false; // 鏄惁涓虹敓浜х幆澧�
diff --git a/src/components/navMenu.vue b/src/components/navMenu.vue
index e863a03..57b86e2 100644
--- a/src/components/navMenu.vue
+++ b/src/components/navMenu.vue
@@ -267,7 +267,6 @@
}
},
setLiClick(res, index) {
-
this.changeSelectStyle = index;
sessionStorage.setItem('changeSelectStyle', index)
sessionStorage.removeItem('hanleselectmochaitmo')
@@ -275,10 +274,9 @@
// this.signInsertOpLog(this.listMenu[index].cnName, res.cnName)
setTimeout(() => {
-
this.changeliSelect = res.cnName;
sessionStorage.setItem('changeliSelect', res.cnName)
- if (res.url.indexOf('http') != -1) {
+ if (res.url.indexOf('{fmeHost}') != -1) {
this.$store.reporturl = res.url;
sessionStorage.setItem('iframehttpurl', this.$store.reporturl)
this.$router.push('/QualityInspection');
@@ -441,8 +439,8 @@
};
Window.ws = null;
}
-
- if (index.indexOf('http') != -1) {
+debugger
+ if (index.indexOf('{fmeHost}') != -1) {
this.$router.push('/databaseMonitoring');
this.$store.commit('getIframe', index);
} else if (isNaN(Number(index))) {
diff --git a/src/views/PackageTwo/WareInspection.vue b/src/views/PackageTwo/WareInspection.vue
index 581506d..e9904e4 100644
--- a/src/views/PackageTwo/WareInspection.vue
+++ b/src/views/PackageTwo/WareInspection.vue
@@ -56,8 +56,6 @@
},
showChangeIfream(res) {
- //
- console.log(res)
if (this.$store.state.themeflag == true) {
if (res.indexOf('theme=white') != -1) {
res = res.replace('theme=white', 'theme=dark');
@@ -77,11 +75,12 @@
res = res.replace('lang=zh', 'lang=en');
}
}
+
if (res.indexOf('{fmeHost}') != -1) {
res = res.replace('{fmeHost}', fmeHost)
}
-
+ console.log("2", this.reportUrl)
if (res.indexOf('token=') != -1) {
res = res + getToken();
}
--
Gitblit v1.9.3