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

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

@@ -211,17 +211,29 @@ export function getDeviceList(deviceType, options) {
       return reject();
     }
 
-    const data = {
+    // const data = {
-      deviceType,
+    //   deviceType,
-      ...options,
+    //   ...options,
-    };
+    // };
-
+    let newEndStakeMark = [];
+    let newStartStakeMark = [];
+
+    options.endStakeMark.forEach((item) => {
+      newEndStakeMark.push(String(item));
+    });
+    options.startStakeMark.forEach((item) => {
+      newStartStakeMark.push(String(item));
+    });
     request(
       Object.keys(options || {}).length
         ? {
             url: "/business/device/pileNumberQuery",
             method: "POST",
-            data,
+            data: {
+              deviceType,
+              endStakeMark: newEndStakeMark,
+              startStakeMark: newStartStakeMark,
+            },
           }
         : {
             url: "/business/device/query",

ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/AddNEditDialog.vue

@@ -189,24 +189,35 @@ export default {
       this.isShowTimeEdit = true;
     },
     onDeleteTaskGroup(taskG){
-      request({
+      this.$confirm("确定要删除该任务组么？", "操作确认", {
-        url: `/business/dcBatchFunctionsJob/time/${this.propData.id}/${taskG.time}`,
+        confirmButtonText: "确定",
-        method: "DELETE"
+        cancelButtonText: "取消",
-      }).then(res => {
+        type: "warning",
+      }).then(() => {
+
         request({
-          url: `/business/dcBatchFunctionsJobGroup/${this.propData.id}`,
+          url: `/business/dcBatchFunctionsJob/time/${this.propData.id}/${taskG.time}`,
-          method: "GET"
+          method: "DELETE"
         }).then(res => {
-          this.editData = {
+          request({
-            id: res.data.id,
+            url: `/business/dcBatchFunctionsJobGroup/${this.propData.id}`,
-            groupName: res.data.groupName,
+            method: "GET"
-            status: res.data.status,
+          }).then(res => {
-            remark: res.data.remark,
+            this.editData = {
-            detailedConfiguration: res.data.detailedConfiguration
+              id: res.data.id,
-          }
+              groupName: res.data.groupName,
-          this.getTaskList();   //新增task后自动刷新任务列表
+              status: res.data.status,
+              remark: res.data.remark,
+              detailedConfiguration: res.data.detailedConfiguration
+            }
+            this.getTaskList();   //新增task后自动刷新任务列表
+          });
+        });
+
+        })
+        .catch(() => {
+          this.$message.warn("取消删除。");
         });
-      });
     },
     onSubmitTime(time){
       this.isShowTimeEdit = false;

ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/TaskItem.vue

@@ -26,11 +26,18 @@
             <p>时长：{{ editData.params.SETTM }}</p>
           </div>
         </template>
-        <template v-if="editData.deviceType == '12'">
 
+        <template v-if="editData.deviceType == '12'">
+          <div class="center">
+            <p>{{ gzmsDic[editData.params.SETMD] }}</p>
+            <p>时长：{{ editData.params.SETTM }}</p>
+          </div>
         </template>
         <template v-if="editData.deviceType == '13'">
-
+          <div class="center">
+            <p>{{ gzmsDic[editData.params.SETMD] }}</p>
+            <p>时长：{{ editData.params.SETTM }}</p>
+          </div>
         </template>
 
       </div>
@@ -101,6 +108,16 @@ export default {
             SETMD: temp.functions[0].params.SET,
             SETTM: temp.functions[1].params.SET,
           }
+        } else if (temp.deviceType == '12') {
+          params = {
+            SETMD: temp.functions[0].params.SET,
+            SETTM: temp.functions[1].params.SET,
+          }
+        } else if (temp.deviceType == '13') {
+          params = {
+            SETMD: temp.functions[0].params.SET,
+            SETTM: temp.functions[1].params.SET,
+          }
         }
         this.editData = {
           id: this.propData.jobId,
@@ -130,18 +147,26 @@ export default {
       // this.$emit("onModify", {devices});
     },
     onDelete(){
-      request({
+      this.$confirm("确定要删除该任务么？", "操作确认", {
-        url: `/business/dcBatchFunctionsJob/` + this.propData.jobId,
+        confirmButtonText: "确定",
-        method: "DELETE",
+        cancelButtonText: "取消",
-        // params: {
+        type: "warning",
-        //   jobGroup: this.propData.id
+      }).then(() => {
-        // },
+
-      })
+        request({
-        .then((result) => {
+          url: `/business/dcBatchFunctionsJob/` + this.propData.jobId,
-          if (result.code != 200) return;
+          method: "DELETE",
-          this.$message.success("删除成功");
+          // params: {
-          this.$emit("onSubmit");
+          //   jobGroup: this.propData.id
+          // },
         })
+          .then((result) => {
+            if (result.code != 200) return;
+            this.$message.success("删除成功");
+            this.$emit("onSubmit");
+          })
+
+      });
     },
     initBasicData(){
       

ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/taskEditDialog.vue

@@ -83,14 +83,14 @@
 
       <template v-else-if="searchData.deviceType == '12'">
         <!-- 行车诱导 -->
-        <el-form-item label="工作状态">
+        <el-form-item label="工作模式">
-          <el-select v-model="editData.type12.mode" placeholder="请选择">
+          <el-select v-model="editData.type12.SETMD" placeholder="请选择">
-            <el-option v-for="value, key in gzztMap" :key="key" :label="value" :value="key" />
+            <el-option v-for="value, key in gzmsMap" :key="key" :label="value" :value="key" />
           </el-select>
         </el-form-item>
         <el-form-item label="工作时长">
           <el-col :span="8">
-            <el-input-number v-model="editData.type12.timeLength" :min="1" :max="600" label="描述文字" />
+            <el-input-number v-model="editData.type12.SETTM" :min="0" :max="100000" />
           </el-col>
           <!-- <el-col :span="4" style="margin-left: 10px;">分钟</el-col> -->
         </el-form-item>
@@ -98,13 +98,20 @@
 
       <template v-else-if="searchData.deviceType == '13'">
         <!-- 智能设备箱 -->
-        <el-form-item label="开启">
+        <el-form-item label="工作模式">
-          <el-switch v-model="editData.type13.switch">
+          <el-select v-model="editData.type13.SETMD" placeholder="请选择">
-            <!-- active-color="#13ce66" inactive-color="#ff4949" -->
+            <el-option v-for="value, key in gzmsMap" :key="key" :label="value" :value="key" />
-          </el-switch>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="工作时长">
+          <el-col :span="8">
+            <el-input-number v-model="editData.type13.SETTM" :min="0" :max="100000" />
+          </el-col>
+          <!-- <el-col :span="4" style="margin-left: 10px;">分钟</el-col> -->
         </el-form-item>
       </template>
 
+
       <el-form-item>
         <el-button size="mini" type="primary" @click="onSubmit">保存</el-button>
       </el-form-item>
@@ -206,7 +213,7 @@ export default {
         // { "STAY": 90, "ACTION": "1", "SPEED": "0", "COLOR": "ffff00", "FONT": "3", "FONT_SIZE": "24", "CONTENT": "长清收费站\\\\n出入口封闭", "width": "160", "height": "80", "formatStyle": "2" }
         if (this.propData.deviceType == "2"){
           this.editData.type2 = BoardUtils.contentToDeviceItem(this.propData.params);
-        } else if (this.propData.deviceType == "5" || this.propData.deviceType == "10"){
+        } else if (["5","10","12","13"].includes(this.propData.deviceType)){
           this.editData["type" + this.propData.deviceType] = { ...this.propData.params};
         }
       }else{
@@ -309,11 +316,13 @@ export default {
         }
       } else if (this.searchData.deviceType == "12") {
         return {
-
+          SETMD: this.editData.type12.SETMD,
+          SETTM: this.editData.type12.SETTM
         }
       } else if (this.searchData.deviceType == "13") {
         return {
-
+          SETMD: this.editData.type13.SETMD,
+          SETTM: this.editData.type13.SETTM
         }
       }
     },

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

@@ -96,6 +96,7 @@ export default {
   },
   data() {
     return {
+      searchData:{},
       activeOption: {
         active: {
           text: "开"
@@ -194,7 +195,7 @@ export default {
       this.getData();
     },
     onReset(){
-      this.searchData.word = undefined;
+      this.searchData && (this.searchData.word = undefined);
       // console.log(this.$refs["form"] , "__-=========");
       this.$refs["form"].handleResetForm();
       this.getData();

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts.js

@@ -79,6 +79,7 @@ let options = {
           color: "#1C82C5",
         },
       },
+      // minInterval: 1,
       splitLine: {
         show: true,
         lineStyle: {
@@ -109,6 +110,7 @@ let options = {
         //   color: "#1C82C5",
         // },
       },
+      // minInterval: 1,
       splitLine: {
         show: false,
         lineStyle: {

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts2.js

@@ -73,6 +73,7 @@ let options = {
           fontSize: 10,
         },
       },
+      // minInterval: 1,
       axisLine: {
         show: false,
       },
@@ -101,6 +102,7 @@ let options = {
           // formatter: "{value} °C",
         },
       },
+      // minInterval: 1,
       axisLine: {
         show: false,
       },

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts3.js

@@ -101,6 +101,7 @@ var options = {
           //  + minNumber;
         },
       },
+      // minInterval: 1,
     },
     {
       type: "value",
@@ -115,6 +116,7 @@ var options = {
           type: "dotted",
         },
       },
+      // minInterval: 1,
       axisTick: {
         show: false,
       },

ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherWarning/components/infowWarningList/index.vue

@@ -10,7 +10,7 @@
           style="width: 100%"
         >
           <el-table-column prop="nem" label="" width="30"> </el-table-column>
-          <el-table-column prop="stakeMark" label="桩号范围" width="230">
+          <el-table-column prop="stakeMarkRange" label="桩号范围" width="230">
           </el-table-column>
           <el-table-column
             prop="visibility"

ruoyi-ui/src/views/JiHeExpressway/utils/api/batch.js

@@ -57,6 +57,28 @@ export function submitTaskRequest(id, jobGroup, time, devices, params, others) {
                 "params": { SET: params.SETTM }
             }
         ]
+    } else if (deviceType == '12') { //行车诱导
+        functions = [
+            {
+                "functionId": "SETMD",
+                "params": { SET: params.SETMD }
+            },
+            {
+                "functionId": "SETTM",
+                "params": { SET: params.SETTM }
+            }
+        ]
+    } else if (deviceType == '13') { //智能设备箱
+        functions = [
+            {
+                "functionId": "SETMD",
+                "params": { SET: params.SETMD }
+            },
+            {
+                "functionId": "SETTM",
+                "params": { SET: params.SETTM }
+            }
+        ]
     }
 
     let temp = [{