Merge branch 'dev-tracking-20201221' of...

Merge branch 'dev-tracking-20201221' of http://192.168.110.53/com.pica.cloud.foundation.frontend/pica-sensitive-admin into dev-tracking-20201221

src/views/strack-data/create-point.vue

@@ -5,10 +5,10 @@
             <el-row :gutter="30" class="row search" type="flex" style="margin-bottom:0;">
                 <el-col :span="15">
                     <el-form-item label="">
-                        <el-input 
-                        v-model="searchParam.action" 
-                        clearable 
-                        placeholder="请输入要查找的埋点编码或名称" 
+                        <el-input
+                        v-model="searchParam.action"
+                        clearable
+                        placeholder="请输入要查找的埋点编码或名称"
                         style="width:400px;margin-left: -74px;"
                         @change="search(1)"></el-input>
                     </el-form-item>
@@ -147,7 +147,7 @@
             :visible.sync="assignVisible"
             width="30%">
             <el-row :gutter="30" class="row search" type="flex" style="margin-bottom:0;">
-                <el-form ref="assignForm" 
+                <el-form ref="assignForm"
                 :model="assignForm"
                 :rules="assignRule"
                 label-width="150px"
@@ -189,7 +189,7 @@
             :visible.sync="dialogVisible"
             width="30%">
             <el-row :gutter="30" class="row search" type="flex" style="margin-bottom:0;">
-                <el-form ref="menuForm" 
+                <el-form ref="menuForm"
                 :model="form"
                 label-width="150px"
                 label-suffix=":"
@@ -247,8 +247,8 @@
                         </el-form-item>
                         <div v-for="(item, index) in form.actionTagResqs" :key="index" style="width: 400px;">
                             <el-form-item :label="'额外投递' + parseInt(index + 1)">
-                                <el-select 
-                                v-model="item.tagCode" 
+                                <el-select
+                                v-model="item.tagCode"
                                 clearable
                                 filterable
                                 placeholder="请选择额外投递"
@@ -279,7 +279,7 @@
             :visible.sync="downPageVisible"
             width="30%">
             <el-row :gutter="30" class="row search" type="flex" style="margin-bottom:0;">
-                <el-form ref="downForm" 
+                <el-form ref="downForm"
                 :model="downForm"
                 label-width="150px"
                 label-suffix=":"
@@ -329,7 +329,7 @@
             :visible.sync="detailVisible"
             width="30%">
             <el-row :gutter="30" class="row search" type="flex" style="margin-bottom:0;">
-                <el-form ref="detailForm" 
+                <el-form ref="detailForm"
                 :model="detailForm"
                 label-width="150px"
                 label-suffix=":"
@@ -369,7 +369,7 @@
             :visible.sync="tagVisible"
             width="30%">
             <el-row :gutter="30" class="row search" type="flex" style="margin-bottom:0;">
-                <el-form ref="tagForm" 
+                <el-form ref="tagForm"
                 rules="tagRules"
                 :model="tagForm"
                 label-width="150px"
@@ -528,6 +528,9 @@ export default {
     },
     created() {
         this.searchParam.pageId = parseInt(this.$route.query.id) || '';
+        if (this.searchParam.pageId > 0) {
+            this.search();
+        }
     },
     mounted() {
         this.getPageList();
@@ -688,7 +691,7 @@ export default {
                     );
                 }
             })
-            
+
         },
         addTag(index) {
             this.form.actionTagResqs.push({tagName: '', tagCode: '', tagDesc: ''});
@@ -771,7 +774,7 @@ export default {
             this.detailVisible = true;
             this.getActionDetail(row.id);
         },
-        
+
         // 上传页面图片
         beforeAvatarUpload(file) {
             let _this = this;
@@ -788,7 +791,7 @@ export default {
                  _this.form.location = path.fullPath;
                  _this.$message.success('上传成功');
              });
-             return false;  
+             return false;
         },
         handleSizeChange(value) {
             this.searchParam.pageSize = value;
@@ -807,4 +810,4 @@ export default {
         margin-bottom: 30px;
     }
 }
-</style>
+</style>
\ No newline at end of file