页面提示语修改

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

@@ -17,7 +17,7 @@
                                 placeholder="请输入漏斗名称" 
                                 style="width:430px;"
                                 @blur="validValue"></el-input>
-                                <span v-show="disabledSave" style="color: red; font-size: 12px;">请输入漏斗名称</span>
+                                <span v-show="disabledSave" style="color: red; font-size: 12px;">{{nameTip}}</span>
                             </el-form-item>
                             
                         </el-col>
@@ -100,7 +100,8 @@ export default {
                 }]
             },
             eventSelect: [],
-            tipText: '名称重复，请重新输入'
+            tipText: '名称重复，请重新输入',
+            nameTip: '请输入漏斗名称'
         }
     },
     created() {
@@ -123,8 +124,9 @@ export default {
                     let data = res.data;
                     if (data.code == "000000") {
                         if (callback) callback(data);
-                    } else {
-                        this.$message.error(data.message);
+                    }else if(data.code == '227002' || data.code == '227003'){
+                        this.disabledSave = true;
+                        this.nameTip = '名称重复，请重新输入';
                     }
                 })
         },
@@ -187,6 +189,7 @@ export default {
         saveAddAndEdit() {
             if(!this.searchParam.name) {
                 this.disabledSave = true;
+                this.nameTip = '请输入漏斗名称';
                 return;
             }
             for(let i = 0; i < this.searchParam.actionModelList.length; i++) {
@@ -216,11 +219,6 @@ export default {
                     if(res.code == '000000') {
                         this.$message.success('转化漏斗保存成功');
                         this.$router.push({ path: 'path-data', query: {id: res.data.id, name: res.data.name} });
-                    }else if(res.code == '227002' || res.code == '227003'){
-                        this.disabledSave = true;
-                        this.$message.error(res.message);
-                    }else {
-                        this.$message.error(res.message);
                     }
                 }
             );
@@ -253,10 +251,9 @@ export default {
     }
     .add-content {
         background: #F2F2F4;
-        padding: 20px 0 0 20px;
-        height: 85vh;
+        padding: 20px 0 20px 20px;
         .con {
-            height: 82vh;
+            padding-bottom: 30px;
             background: #fff;
             .save {
                 padding: 20px 20px 0;

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

@@ -126,7 +126,7 @@ export default {
         this.searchParam.endDate = new Date().format("yyyy-MM-dd");
         let date1 = new Date();
         let date2 = new Date(date1);
-        date2.setDate(date1.getDate() - 29);
+        date2.setDate(date1.getDate() - 6);
         let dt = date2.getDate() > 10 ? date2.getDate() : '0'+date2.getDate();
         this.searchParam.startDate = date2.getFullYear() + "-" + (date2.getMonth() + 1) + "-" + dt;
         this.getVersionData();
@@ -291,7 +291,7 @@ export default {
                         type: 'funnel',
                         height: 300 + len * 20,   // 块高度
                         gap: 40,  // 块间距
-                        minSize: 150, // 块两边斜度
+                        minSize: 200, // 块两边斜度
                         left: '5%',  // 块左边距离
                         width: '45%', // 块宽度
                         label: {
@@ -473,11 +473,8 @@ export default {
     }
     .data-content {
         background: #F2F2F4;
-        padding: 20px 0 0 20px;
-        min-height: 85vh;
-        padding-bottom: 20px;
+        padding: 20px 0 20px 20px;
         .con {
-            min-height: 82vh;
             background: #fff;
             padding-bottom: 50px;
             .search {

src/views/user-path/funnel.vue

@@ -24,7 +24,7 @@
                         class="search-table"
                         :data="tableData"
                         style="width: 100%"
-                        empty-text="暂未创建漏斗">
+                        :empty-text="tableText">
                         <el-table-column prop="name" label="漏斗名称" min-width="140" align="center"></el-table-column>
                         <el-table-column prop="stepStartName" label="起始步骤" min-width="140" align="center"></el-table-column>
                         <el-table-column prop="stepEndName" label="转化目标" min-width="150" align="center"></el-table-column>
@@ -71,6 +71,7 @@ import { openLoading, closeLoading } from "../../common/utils";
 export default {
     data() {
         return {
+            tableText: '暂未创建漏斗',
             searchParam: {
                 searchName: '',
                 pageNo: 1,
@@ -108,6 +109,9 @@ export default {
                 res => {
                     this.tableData = res.data.data;
                     this.totalRows = res.data.totalRows;
+                    if(this.tableData.length == 0) {
+                        this.tableText = param ? "暂无数据" : '暂未创建漏斗';
+                    }
                 }
             );
         },
@@ -161,10 +165,9 @@ export default {
     }
     .funnel-content {
         background: #F2F2F4;
-        padding: 20px 0 0 20px;
-        height: 85vh;
+        padding: 20px 0 20px 20px;
         .con {
-            height: 82vh;
+            padding-bottom: 30px;
             background: #fff;
             .search {
                 padding: 20px 20px 0;