重置时间

src/views/user-path/add-funnel.vue

@@ -39,8 +39,14 @@
                     style="width:100%;">
                         <el-col :span="11">
                             <el-form-item label="步骤名称">
-                                <el-input :class="{'red-b': item.nameCheck}" v-model="item.actionName" @blur="stepNameRepeat(item.actionName, index)" maxlength="30" placeholder="请输入步骤名称" style="width:70%"></el-input>
-                                <p v-show="item.nameCheck" style="color: red; font-size: 12px;">名称重复，请重新输入</p>
+                                <el-input 
+                                :class="{'red-b': item.nameCheck && item.actionName}" 
+                                v-model="item.actionName" 
+                                @blur="stepNameRepeat(item.actionName, index)"
+                                 maxlength="30" 
+                                 placeholder="请输入步骤名称" 
+                                 style="width:70%"></el-input>
+                                <p v-show="item.nameCheck && item.actionName" style="color: red; font-size: 12px;">名称重复，请重新输入</p>
                             </el-form-item>
                         </el-col>
                         <el-col :span="11">
@@ -102,7 +108,8 @@ export default {
             },
             eventSelect: [],
             tipText: '名称重复，请重新输入',
-            nameTip: '请输入漏斗名称'
+            nameTip: '请输入漏斗名称',
+            repIndex: 0
         }
     },
     created() {
@@ -165,14 +172,15 @@ export default {
         stepNameRepeat(val, index) {
             this.$set(this.searchParam.actionModelList[index], 'nameCheck', false);
             if(!val) return;
-            //this.$set(this.searchParam.actionModelList[index], 'nameCheck', false);
             for(let i = 0; i < this.searchParam.actionModelList.length; i++) {
                 if(i != index) {
                     if(val == this.searchParam.actionModelList[i].actionName) {
+                        this.searchParam.actionModelList[index].actionName = ''
                         this.$set(this.searchParam.actionModelList[index], 'nameCheck', true);
                     }
                 }
             }
+            console.log(this.searchParam.actionModelList)
         },
         // 触发事件选择时重复判断
         eventChange(item, index) {
@@ -181,7 +189,7 @@ export default {
                 if(index != i) {
                     if(item.eventId == this.searchParam.actionModelList[i].eventId) {
                         this.$set(this.searchParam.actionModelList[index], 'repChecked', true);
-                        this.searchParam.actionModelList[index].eventId = ''
+                        this.repIndex = index;
                     }
                 }
             }
@@ -214,7 +222,7 @@ export default {
                     this.$set(this.searchParam.actionModelList[i], 'repChecked', false);
                     return;
                 }
-                if(this.searchParam.actionModelList[i].nameCheck || this.searchParam.actionModelList[i].unchecked || this.searchParam.actionModelList[i].repChecked) {  // 有步骤名称重复
+                if((this.searchParam.actionModelList[i].nameCheck && this.searchParam.actionModelList[i].actionName) || this.searchParam.actionModelList[i].unchecked || this.searchParam.actionModelList[i].repChecked) {  // 有步骤名称重复
                     return;
                 }
                 this.eventSelect.forEach(item => {

src/views/user-path/funnel-data.vue

@@ -112,10 +112,12 @@ export default {
             endDateOpt1: {
                 disabledDate: time => {
                     return (
-                        time.getTime() < (new Date(this.searchParam.startDate).getTime()) || time.getTime() > (new Date(this.searchParam.startDate).getTime() + 3600 * 1000 * 24 * 29)
+                        time.getTime() < (new Date(this.searchParam.startDate).getTime() - 3600 * 1000 * 24 * 1) || time.getTime() > (new Date(this.searchParam.startDate).getTime() + 3600 * 1000 * 24 * 29)
                     );
                 }
-            }
+            },
+            beginTime: '',
+            endTime: ''
         }
     },
     created() {
@@ -133,6 +135,8 @@ export default {
         let dt1 = date3.getDate() > 10 ? date3.getDate() : '0' + date3.getDate();
         this.searchParam.startDate = date2.getFullYear() + "-" + (date2.getMonth() + 1) + "-" + dt;
         this.searchParam.endDate = date3.getFullYear() + "-" + (date3.getMonth() + 1) + "-" + dt1;
+        this.beginTime = date2.getFullYear() + "-" + (date2.getMonth() + 1) + "-" + dt;
+        this.endTime = date3.getFullYear() + "-" + (date3.getMonth() + 1) + "-" + dt1;
         this.getVersionData();
     },
     methods: {
@@ -484,8 +488,8 @@ export default {
         },
         reset() {
             this.searchParam = {
-                endDate: '2020-11-23',
-                startDate: '2020-11-20',
+                endDate: this.endTime,
+                startDate: this.beginTime,
                 version: this.versionSelect[0]
             };
             this.getAnalysisData(this.searchParam);