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

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

@@ -54,7 +54,7 @@
 
     </template>
 
-    <taskEditDialog v-model="isEditing" :groupId="propData.id" :time="selectedTaskGroup.time" :propData="{}"
+    <taskEditDialog v-model="isEditing" :groupId="editData.id" :time="selectedTaskGroup.time" :propData="{}"
       @onSubmit="onSubmitTaskItem" />
 
     <timeEditDialog v-model="isShowTimeEdit" :propData="editingTime" @onSubmit="onSubmitTime" />
@@ -166,8 +166,9 @@ export default {
     onSubmitTaskItem(){
       this.isEditing = false;
       this.selectedTaskGroup = {};
+      console.log("onSubmitTaskItemonSubmitTaskItemonSubmitTaskItem");
       request({
-        url: `/business/dcBatchFunctionsJobGroup/${this.propData.id}`,
+        url: `/business/dcBatchFunctionsJobGroup/${this.editData.id}`,
         method: "GET"
       }).then(res=>{
         this.editData = {
@@ -196,11 +197,11 @@ export default {
       }).then(() => {
 
         request({
-          url: `/business/dcBatchFunctionsJob/time/${this.propData.id}/${taskG.time}`,
+          url: `/business/dcBatchFunctionsJob/time/${this.editData.id}/${taskG.time}`,
           method: "DELETE"
         }).then(res => {
           request({
-            url: `/business/dcBatchFunctionsJobGroup/${this.propData.id}`,
+            url: `/business/dcBatchFunctionsJobGroup/${this.editData.id}`,
             method: "GET"
           }).then(res => {
             this.editData = {
@@ -242,7 +243,6 @@ export default {
       })
         .then((result) => {
           if (result.code != 200) return;
-          
           Message.success(`提交成功!`);
         })
     },