Merge branch 'develop' of http://39.106.31.193:9211/mengff/jihe-hs into develop

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),

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;

ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFilter/index.vue

@@ -4,7 +4,7 @@
       popper-class="global-input-search-popover">
 
       <div slot="reference">
-        <el-tooltip effect="light" content="设备筛选" placement="left">
+        <el-tooltip effect="light" content="筛选" placement="left">
           <Button :class="['btn', { 'btn-active': activeIcon }]" @click.native="handleClick('filter')">
             <img src="@screen/images/home-filter/filter.svg" />
           </Button>
@@ -12,7 +12,7 @@
       </div>
 
       <div class="body">
-        <div class="title">设备筛选</div>
+        <div class="title">筛选</div>
         <Form v-model="data" labelWidth="90px" column="1" class="form" ref="FormConfigRef" :formList="formList" />
         <div class="footer">
           <Button style="background-color: rgba(0, 179, 204, 0.3)" @click.native="handleResetForm">

ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js

@@ -319,14 +319,16 @@ export const eventMap = {
   // 感知事件
   async "事件专题/感知事件"(item, filterData, isDefault, cb) {
     let loadingMessage;
-    if (!isDefault) {
-      loadingMessage = Message.info({
-        message: `${item.title}位置加载中...`,
-        duration: 0,
-        customClass: "loading-message",
-        iconClass: "el-icon-loading",
-      });
-    }
+
+    loadingMessage = Message.info({
+      message: `${item.title}位置${!isDefault?'加载':'更新'}中...`,
+      duration: 0,
+      customClass: "loading-message",
+      iconClass: "el-icon-loading",
+    });
+    // if (!isDefault) {
+     
+    // } 
     const warningState = 1;
     const data = await getPerceiveEventList({ warningState }, filterData)
       .then(async (data) => {
@@ -337,7 +339,6 @@ export const eventMap = {
 
     loadingMessage?.close();
     if (!data) return this.emitter.emit("selectedCompleted", item);
-
     if (!data?.length && !isDefault) {
       this.emitter.emit("selectedCompleted", item);
       return Message.warning(`没有${item.title}数据!`);

ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js

@@ -391,19 +391,19 @@ export function getPerceiveEventList(data = {}, options = {}) {
     // data.startTime = startTime;
     // data.completeTime = completeTime;
 
-    // const { endStakeMark, startStakeMark } = options;
-    // if (endStakeMark) {
-    //   let formatEndStakeMark = `K${padZero(endStakeMark[0])}+${padZero(
-    //     endStakeMark[1]
-    //   )}`;
-    //   data.endStakeMark = formatEndStakeMark;
-    // }
-    // if (startStakeMark) {
-    //   let formatStartStakeMark = `K${padZero(startStakeMark[0])}+${padZero(
-    //     startStakeMark[1]
-    //   )}`;
-    //   data.startStakeMark = formatStartStakeMark;
-    // }
+    const { endStakeMark, startStakeMark } = options;
+    if (endStakeMark) {
+      let formatEndStakeMark = `K${padZero(endStakeMark[0])}+${padZero(
+        endStakeMark[1]
+      )}`;
+      data.endStakeMark = formatEndStakeMark;
+    }
+    if (startStakeMark) {
+      let formatStartStakeMark = `K${padZero(startStakeMark[0])}+${padZero(
+        startStakeMark[1]
+      )}`;
+      data.startStakeMark = formatStartStakeMark;
+    }
 
     request({
       url: `/perceivedEvents/warning/warningList`,

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();

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(() => {

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`, //王兴琳