From cec0f16c10b8068a26bdae25d498b3711e1e8432 Mon Sep 17 00:00:00 2001
From: hui <770260999@qq.com>
Date: Sun, 28 Apr 2024 17:31:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/JiHeExpressway/components/InputSearch/index.vue  | 4 +++-
 .../components/infoBoard/BoardInfoEditor.vue               | 4 ++--
 .../views/JiHeExpressway/pages/service/sensitive/index.vue | 7 +++++--
 ruoyi-ui/src/views/login.vue                               | 3 ++-
 ruoyi-ui/vue.config.js                                     | 4 ++--
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/InputSearch/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/InputSearch/index.vue
index 1ea6d06f..00dc66c9 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/InputSearch/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/InputSearch/index.vue
@@ -161,11 +161,13 @@ export default {
       if(this.params && this.types == 'input'){
         this.value = "";
       }
+      console.log(this.$refs.FormConfigRef?.formData , "重置前");
       // this.visible = true;
       this.$refs.FormConfigRef?.reset();
       this.$refs.FormConfigRef?.$refs.ElFormRef.resetFields();
       // this.$refs.PopoverRef.doClose();
-      
+      // console.log(this.$refs.FormConfigRef?.formData , "fdddddddd");
+      console.log(this.$refs.FormConfigRef?.formData , "重置后");
       this.$emit(
         "handleSearch",
         cloneDeep(this.$refs.FormConfigRef?.formData),
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardInfoEditor.vue b/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardInfoEditor.vue
index 3be1387b..c82cb99c 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardInfoEditor.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardInfoEditor.vue
@@ -361,10 +361,10 @@ export default {
     calcTitle() {
       let str = "";
       if (this.mode == "toDevice") {
-        str = `从模板添加设备信息`;
+        str = `从模板添加待下发信息`;
       } else {
         str = `${this.mode == "add" ? "新增" : "编辑"}${
-          this.type == "template" ? "信息模板" : "设备信息"
+          this.type == "template" ? "信息模板" : "待下发信息"
         }`;
       }
       return str;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/sensitive/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/sensitive/index.vue
index 9db3668f..e2841a55 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/sensitive/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/sensitive/index.vue
@@ -129,6 +129,7 @@ export default {
   },
   data() {
     return {
+      searchData:{},
       isLoading: false,
       searchText: "请输入敏感词，回车搜索",
       searchFormList,
@@ -203,10 +204,12 @@ export default {
       this.getData();
     },
     onReset(){
-      this.searchData.word = undefined;
+      if (this.searchData){
+        this.searchData.word = undefined;
+      }
       // console.log(this.$refs["form"] , "__-=========");
       this.$refs["form"].handleResetForm();
-      this.getData();
+      // this.getData();
     },
     async getData() {
       // const closeLoading = setLoading();
diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue
index cb7e7aed..010f3298 100644
--- a/ruoyi-ui/src/views/login.vue
+++ b/ruoyi-ui/src/views/login.vue
@@ -208,7 +208,8 @@ export default {
           .dispatch("Login", this.loginForm)
           .then(() => {
             this.$store.commit("menu/resetRecent");
-            this.$router.push({ path: this.redirect || "/" }).catch(() => {});
+            // this.$router.push({ path: this.redirect || "/" }).catch(() => {});
+            this.$router.push({ path: "/" }).catch(() => {});
             // this.getManageStation();
           })
           .catch(() => {
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index 77f27227..35bf9094 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -52,9 +52,9 @@ module.exports = {
         // target: `http://10.0.81.204:8087`, //现场后台 刘文阁
         // target: `http://10.168.69.255:8087`, //正晨后台 连现场物联 刘文阁
         // target: `http://10.168.78.135:8087`,  //王钦
-        target: `http://10.168.66.196:8087`, //正晨后台 连现场物联 刘文阁2
+        // target: `http://10.168.66.196:8087`, //正晨后台 连现场物联 刘文阁2
         // target: `http://10.168.68.42:8087`, //王思祥
-        // target: `http://10.168.72.174:8087`, //赵祥龙
+        target: `http://10.168.72.174:8087`, //赵祥龙
         // target: `http://10.168.65.156:8097`, //孟
         // target: `http://10.168.56.165:8087`, //王家宝
         // target: `http://10.168.77.128:8087`, //王兴琳