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

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/data.js

@@ -80,14 +80,14 @@ export const gjSearchFormList = [
           key: "5",
           label: "扫码报警",
         },
-        {
-          key: "6",
-          label: "非机预警",
-        },
         // {
-        //   key: "7",
-        //   label: "气象监测器",
+        //   key: "6",
+        //   label: "非机预警",
         // },
+        {
+          key: "7",
+          label: "气象监测器",
+        },
       ],
     },
   },

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue

@@ -238,7 +238,13 @@ export default {
         background: "#00000052",
         text: "文件正在下载...",
       });
-      request.post(url, {}, { headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, responseType: 'blob' })
+      // request.post(url, {}, { headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, responseType: 'blob' })
+      request({
+        url: url,//感知事件
+        method: "post",
+        data: { ...this.searchData, warningState: 1 },
+        responseType: 'blob'
+      })
         .then((res) => {
           console.log(res);
           const url = window.URL.createObjectURL(new Blob([res]));