From 799f206549b25ca0ae8dee94d21b987fc1e6e26c Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 19 十一月 2024 15:21:12 +0800
Subject: [PATCH] 修改bug
---
ruoyi-ui/src/views/device/equipmentInfo.vue | 18 +++++++++---------
ruoyi-ui/src/views/genealogy/index.vue | 8 ++------
ruoyi-ui/src/views/clanManager/clan/index.vue | 3 ++-
ruoyi-ui/vue.config.js | 4 ++--
ruoyi-ui/src/views/secret/index.vue | 9 +++++----
5 files changed, 20 insertions(+), 22 deletions(-)
diff --git a/ruoyi-ui/src/views/clanManager/clan/index.vue b/ruoyi-ui/src/views/clanManager/clan/index.vue
index d45b7e4..e0ed7c6 100644
--- a/ruoyi-ui/src/views/clanManager/clan/index.vue
+++ b/ruoyi-ui/src/views/clanManager/clan/index.vue
@@ -384,7 +384,8 @@
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
- this.dateRange = [];
+ //this.dateRange = [];
+ this.queryParams.clanName = undefined
this.resetForm("queryForm");
this.handleQuery();
},
diff --git a/ruoyi-ui/src/views/device/equipmentInfo.vue b/ruoyi-ui/src/views/device/equipmentInfo.vue
index f2c606e..742076f 100644
--- a/ruoyi-ui/src/views/device/equipmentInfo.vue
+++ b/ruoyi-ui/src/views/device/equipmentInfo.vue
@@ -441,16 +441,16 @@
updateEquipment(this.formData).then(response => {
this.$modal.msgSuccess("淇敼鎴愬姛");
console.log(this.$route)
- // this.$tab.closePage({ path: "/familymodel/zfDevice" })
-
-
- //this.$tab.closePage({ path: "/familymodel/zfDevice" })
-
- //
- // localtion.reload()
- //alert(25)
- // window.location.url="https://localhost:80/familymodel/zfDevice"
+ this.$tab.closePage({ path: "/familymodel/zfDevice" })
+ // this.$store.dispatch("tagsView/delView",{ path: "/familymodel/zfDevice" }); //鍏抽棴褰撳墠椤�
+ //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.push("/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 45edc93..08f94c2 100644
--- a/ruoyi-ui/src/views/genealogy/index.vue
+++ b/ruoyi-ui/src/views/genealogy/index.vue
@@ -39,9 +39,9 @@
</el-select>
</el-form-item>
- <el-form-item label="鐢熸棩" prop="birth deadDay">
+ <el-form-item label="鐢熸棩" prop="birth">
<el-date-picker
- v-model="dateRange"
+ v-model="queryParams.birth"
style="width: 240px;
height: 30px;
background: #FFFFFF;
@@ -49,10 +49,6 @@
opacity: 0.5;
border: 1px solid rgba(0,0,0,0.25);"
value-format="yyyy-MM-dd"
- type="daterange"
- range-separator="-"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
@keyup.enter.native="handleQuery"
></el-date-picker>
diff --git a/ruoyi-ui/src/views/secret/index.vue b/ruoyi-ui/src/views/secret/index.vue
index dea3e5d..6e61327 100644
--- a/ruoyi-ui/src/views/secret/index.vue
+++ b/ruoyi-ui/src/views/secret/index.vue
@@ -53,11 +53,12 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="鏈熼檺" prop="timeLimit">
- <el-input
- v-model="queryParams.timeLimit"
+ <el-form-item label="鏈熼檺" prop="validityDate">
+ <el-date-picker
+ v-model="queryParams.validityDate"
placeholder="璇疯緭鍏ユ湡闄�"
clearable
+ value-format="yyyy-MM-dd"
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
@@ -670,7 +671,7 @@
type:undefined,
accNo:undefined,
happenTime:undefined,
- timeLimit:undefined,
+ validityDate:undefined,
},
// 琛ㄥ崟鍙傛暟
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index 02bed06..4ca64d0 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -37,8 +37,8 @@
// 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://192.168.1.7:8080/`,
- target: 'https://www.bendudu.com:8080/',
+ target: `https://192.168.1.3:8080/`,
+ // target: 'https://www.bendudu.com:8080/',
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''
--
Gitblit v1.9.1