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

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({
+    loadingMessage = Message.info({
-        message: `${item.title}位置加载中...`,
+      message: `${item.title}位置${!isDefault?'加载':'更新'}中...`,
-        duration: 0,
+      duration: 0,
-        customClass: "loading-message",
+      customClass: "loading-message",
-        iconClass: "el-icon-loading",
+      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;
+    const { endStakeMark, startStakeMark } = options;
-    // if (endStakeMark) {
+    if (endStakeMark) {
-    //   let formatEndStakeMark = `K${padZero(endStakeMark[0])}+${padZero(
+      let formatEndStakeMark = `K${padZero(endStakeMark[0])}+${padZero(
-    //     endStakeMark[1]
+        endStakeMark[1]
-    //   )}`;
+      )}`;
-    //   data.endStakeMark = formatEndStakeMark;
+      data.endStakeMark = formatEndStakeMark;
-    // }
+    }
-    // if (startStakeMark) {
+    if (startStakeMark) {
-    //   let formatStartStakeMark = `K${padZero(startStakeMark[0])}+${padZero(
+      let formatStartStakeMark = `K${padZero(startStakeMark[0])}+${padZero(
-    //     startStakeMark[1]
+        startStakeMark[1]
-    //   )}`;
+      )}`;
-    //   data.startStakeMark = formatStartStakeMark;
+      data.startStakeMark = formatStartStakeMark;
-    // }
+    }
 
     request({
       url: `/perceivedEvents/warning/warningList`,