6.2

admin/src/views/schemeV2/index.vue

@@ -178,6 +178,7 @@
           </template>
         </vxe-modal>
       </el-main>
+      <!-- <a href="../model/index.vue"></a> -->
     </el-container>
   </div>
 </template>

admin/src/views/schemeV2/schemeAdd.vue

@@ -632,7 +632,7 @@
             <el-date-picker
               type="datetimerange"
               clearable
-              v-model="datetimerange"
+              v-model="form.datetimerange"
               start-placeholder="开始日期"
               end-placeholder="结束日期"
               range-separator="至"
@@ -735,7 +735,8 @@ export default {
       strategyInfoNewList: [],
       //策略匹配
       activeNames: ["1"],
-      datetimerange: [],
+     
+
       timerange: [],
       checkAll: false,
       weeksList: weekOptions,
@@ -749,6 +750,13 @@ export default {
       checkedchannel: [],
       //策略表单
       form: {
+        datetimerange: [],
+        activeStartDate: "",
+        activeStartTime: "00:00:00",
+        activeEndDate: "",
+        activeEndTime: "23:59:59",
+        strategyId: "",
+
         strategyName: "",
         strategyType: "",
         templateId: 104,
@@ -797,11 +805,6 @@ export default {
       },
       //策略匹配信息
       rulesform: {
-        activeStartDate: "",
-        activeStartTime: "00:00:00",
-        activeEndDate: "",
-        activeEndTime: "23:59:59",
-        strategyId: "",
         weeks: "",
         firstChannelId: "",
         secondChannelIds: "",
@@ -872,12 +875,12 @@ export default {
     datetimerange(val) {
       console.log(val);
       if (val) {
-        this.rulesform.activeStartDate = val[0];
-        this.rulesform.activeEndDate = val[1];
+        this.form.activeStartDate = val[0];
+        this.form.activeEndDate = val[1];
         console.log(val[1], this.rulesform, 111);
       } else {
-        this.rulesform.activeStartDate = "";
-        this.rulesform.activeEndDate = "";
+        this.form.activeStartDate = "";
+        this.form.activeEndDate = "";
       }
     },
     timerange(val) {
@@ -906,7 +909,13 @@ export default {
         res = res.data[0];
         this.oldform = JSON.parse(JSON.stringify(res));
         this.form = {
-        
+          activeStartDate: res.activeStartDate,
+          activeStartTime: res.activeStartTime,
+          activeEndDate: res.activeEndDate,
+          activeEndTime: res.activeEndTime,
+
+
+          strategyId: res.strategyName,
           strategyName: res.strategyName,
           strategyType: res.strategyType,
           templateId: res.templateId,
@@ -934,7 +943,7 @@ export default {
           }
         }
         if (res.activeStartDate) {
-          this.datetimerange = [res.activeStartDate, res.activeEndDate];
+          this.from.datetimerange = [res.activeStartDate, res.activeEndDate];
         }
         if (res.weeks) {
           let checkedWeeks = res.weeks.split(",");
@@ -948,10 +957,13 @@ export default {
         //   checkedchannel.push([item.firstChannelId, item.secondChannelId]);
         // });
         // this.checkedchannel = checkedchannel;
-        
+
         this.rulesform = {
           activeStartTime: res.activeStartTime,
           activeEndTime: res.activeEndTime,
+
+           activeStartDate: res.activeStartDate,
+          activeEndDate: res.activeEndDate,
           strategyId: this.$route.query.id,
           firstChannelId: res.firstChannelId,
           secondChannelIds: res.secondChannelIds,
@@ -992,7 +1004,7 @@ export default {
           }
         }
         if (res.activeStartDate) {
-          this.datetimerange = [res.activeStartDate, res.activeEndDate];
+          this.form.datetimerange = [res.activeStartDate, res.activeEndDate];
         }
         if (res.weeks) {
           let checkedWeeks = res.weeks.split(",");
@@ -1095,47 +1107,6 @@ export default {
                 .sort()
                 .toString();
 
-              var array1 = JSON.parse(JSON.stringify(this.oldform));
-              var array2 = JSON.parse(JSON.stringify(this.form));
-              array2["activeEndDate"] = this.rulesform.activeEndDate
-                ? this.rulesform.activeEndDate
-                : null;
-              array2["activeEndTime"] = this.rulesform.activeEndTime
-                ? this.rulesform.activeEndTime
-                : null;
-              array2["activeStartDate"] = this.rulesform.activeStartDate
-                ? this.rulesform.activeStartDate
-                : null;
-              array2["activeStartTime"] = this.rulesform.activeStartTime
-                ? this.rulesform.activeStartTime
-                : null;
-              array2["weeks"] = this.rulesform.weeks;
-              let text = "策略：" + this.form.strategyName;
-              console.log(333);
-              XEUtils.objectEach(array2, (item, key) => {
-                if (item != array1[key]) {
-                  if (key == "extJson") {
-                    let ext = JSON.parse(item);
-                    if (array1[key]) {
-                      let arr = JSON.parse(array1[key]);
-                      XEUtils.objectEach(ext, (i, k) => {
-                        if (i != arr[k]) {
-                          text += `\n${k}:${arr[k]} 改为 ${i ? i : "空"}`;
-                        }
-                      });
-                    } else {
-                      XEUtils.objectEach(ext, (i, k) => {
-                        text += `\n${k}:空 改为 ${i ? i : "空"}`;
-                      });
-                    }
-                  } else {
-                    text += `\n${key}:${array1[key]} 改为 ${
-                      item ? item : "空"
-                    }`;
-                  }
-                }
-              });
-
               if (this.$route.query.ids) {
                 // post("/strategyInfoNew/savelog", {
                 //   type: array2.activityType ? array2.activityType : 0,
@@ -1144,7 +1115,6 @@ export default {
                 //   strategyName: array2.strategyName,
                 // });
                 this.id = this.$route.ids;
-                // console.log(this.id);
                 console.log(this.form);
                 //修改
                 put("/strategy/strategy-info/update", this.form).then((res) => {
@@ -1180,25 +1150,25 @@ export default {
                 });
               } else {
                 post(
-                  "/strategy/strategy-info/create",
-                  this.form,
-                  this.rulesform
-                ).then((res) => {
-                  let params = {
-                    activeStartDate: "",
-                    activeStartTime: "00:00:00",
-                    activeEndDate: "",
-                    activeEndTime: "23:59:59",
-                    channelInfoDatas: [
-                      {
-                        firstChannelId: "",
-                        secondChannelId: "",
-                      },
-                    ],
-                    strategyId: "",
-                    weeks: "",
-                  };
-                  console.log(res);
+                  "/strategy/strategy-info/create", this.form).then((res) => {
+                    console.log(this.form,this.rulesform,this.form.datetimerange);
+                    
+                  // console.log(this.form);
+                  // let params = {
+                  //   activeStartDate: "",
+                  //   activeStartTime: "00:00:00",
+                  //   activeEndDate: "",
+                  //   activeEndTime: "23:59:59" ,
+                  //   channelInfoDatas: [
+                  //     {
+                  //       firstChannelId: "",
+                  //       secondChannelId: "",
+                  //     },
+                  //   ],
+                  //   strategyId: "",
+                  //   weeks: "",
+                  // };
+                  // console.log(res);
                   // post("strategyInfoNew/updateStrategyRules", params).then(
                   //   (res) => {
                   //     // this.close()