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

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/addAndEditDialog/ScopeTable.vue

@@ -155,7 +155,7 @@
                     <el-option label="智能发布" :value="2"></el-option>
                 </el-select>
             </el-col> -->
-            <el-col v-if="tableInfo.deviceType == 5 && tableInfo.hf_operationType == 1" :span="4">
+            <el-col v-if="tableInfo.deviceType == 5" :span="4">
                 <el-input v-model="tableInfo.hf_content" placeholder="请输入发布内容"></el-input>
             </el-col>
         </el-row>
@@ -213,10 +213,6 @@ export default {
                 },
                 {
                     value: 3,
-                    label: '事发下游最近'
-                },
-                {
-                    value: 4,
                     label: '最近公里数'
                 },
             ],

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

@@ -273,7 +273,7 @@ export default {
           let dcArr = [];
           this.tableData.forEach(item => {
             let dcData = {
-              id: item.id || '',
+              id: null,
               deviceType: item.deviceType,
               searchRule: item.searchRule,
               number: item.number
@@ -346,13 +346,13 @@ export default {
                 if (result.code != 200) return Message.error(result?.msg);
                 Message.success("提交成功");
                 this.modelVisible = false;
+                this.$emit("reInitData", true);
               })
               .catch(() => {
                 Message.error("提交失败");
               })
               .finally(() => {
                 this.submitting = false;
-                this.$emit("reInitData", true);
               });
           }
         }