From 2697e109da871cb81936965c16c47c97635ecfb6 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期六, 16 十一月 2024 20:36:11 +0800
Subject: [PATCH] 修改了对应的bug
---
ruoyi-ui/src/views/device/equipmentInfo.vue | 4 ++--
ruoyi-ui/src/views/genealogy/index.vue | 4 ++--
ruoyi-ui/vue.config.js | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ruoyi-ui/src/views/device/equipmentInfo.vue b/ruoyi-ui/src/views/device/equipmentInfo.vue
index 147e1f9..da479d6 100644
--- a/ruoyi-ui/src/views/device/equipmentInfo.vue
+++ b/ruoyi-ui/src/views/device/equipmentInfo.vue
@@ -446,9 +446,9 @@
//this.$store.dispatch('tagsView/addView', { title:"ZfDevice",path: "/familymodel/zfDevice" })
//this.$store.dispatch('tagsView/addIframeView', { title:"ZfDevice",ZfDevicepath: "/familymodel/zfDevice" })
// this.$tab.refreshPage({ path: "/familymodel/zfDevice" });
- // this.$router.replace({ path: "/familymodel/zfDevice?cache=true" });
+ this.$router.replace({ path: "/familymodel/zfDevice?cache=true" });
// this.$router.push("/familymodel/zfDevice");
- window.location.url="https://localhost:80/familymodel/zfDevice"
+ window.location.url="https://www.bendudu.com/familymodel/zfDevice"
// this.open = false;
if(this.formData.status==1)
this.formData.status = '鏄�'
diff --git a/ruoyi-ui/src/views/genealogy/index.vue b/ruoyi-ui/src/views/genealogy/index.vue
index 3278f67..45edc93 100644
--- a/ruoyi-ui/src/views/genealogy/index.vue
+++ b/ruoyi-ui/src/views/genealogy/index.vue
@@ -302,11 +302,11 @@
},
typeOption: [{
- value: '1',
+ value: '0',
label: '鐢�',
},
{
- value: '0',
+ value: '1',
label: '濂�',
}],
typeOptions: [{
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index 9b0772d..02bed06 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -36,9 +36,9 @@
proxy: {
// detail: https://cli.vuewww.bendudu.comjs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
- target: `https://10.39.18.174:8080/`,
+ // target: `https://10.39.18.174:8080/`,
// target: `https://192.168.1.7:8080/`,
- // target: 'https://www.bendudu.com:8080/',
+ target: 'https://www.bendudu.com:8080/',
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''
--
Gitblit v1.9.1