修改获取页面类型

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

@@ -102,7 +102,11 @@
             :empty-text="tableText">
             <el-table-column prop="pageCode" label="事件编码" min-width="100" align="left"></el-table-column>
             <el-table-column prop="actionName" label="事件名" min-width="120" align="left"></el-table-column>
-            <el-table-column prop="pageName" label="所属页面" min-width="100" align="left"></el-table-column>
+            <el-table-column prop="pageName" label="所属页面" min-width="100" align="left">
+                <template slot-scope="scope">
+                    <span>{{scope.row.pageName}}-{{scope.row.pageTypeValue}}</span>
+                </template>
+            </el-table-column>
             <el-table-column prop="actionTypeValue" label="事件类型" min-width="100" align="left"></el-table-column>
             <el-table-column prop="releaseVersion" label="发布版本" min-width="100" align="left"></el-table-column>
             <el-table-column prop="releaseTime" label="发布时间" min-width="100" align="left"></el-table-column>
@@ -145,12 +149,13 @@
             <el-row :gutter="30" class="row search" type="flex" style="margin-bottom:0;">
                 <el-form ref="assignForm" 
                 :model="assignForm"
+                :rules="assignRule"
                 label-width="150px"
                 label-suffix=":"
                 label-position="right"
                 size="mini">
                     <el-col :span="20">
-                        <el-form-item label="任务状态" prop="changeStatus">
+                        <el-form-item label="任务状态" prop="status">
                             <el-select v-model="assignForm.status" placeholder="请选择任务状态" style="width:200px">
                                 <el-option
                                 v-for="(eItem,eIndex) in assignstatusSelect"
@@ -160,7 +165,7 @@
                                 </el-option>
                             </el-select>
                         </el-form-item>
-                        <el-form-item label="指派人" prop="member">
+                        <el-form-item label="指派人" prop="handlerIds">
                             <el-select v-model="assignForm.handlerIds" multiple  placeholder="请选择指派人" style="width:200px">
                                 <el-option
                                 v-for="(eItem,eIndex) in assignSelect"
@@ -221,7 +226,7 @@
                                 </el-option>
                             </el-select>
                         </el-form-item>
-                        <el-form-item v-if="form.pageType == 1" label="发布时间" prop="releaseTime">
+                        <el-form-item v-if="form.pageType != 2" label="发布时间" prop="releaseTime">
                             <el-date-picker
                                 type="date"
                                 placeholder="结束时间"
@@ -280,7 +285,7 @@
                 label-position="right"
                 :rules="downRules"
                 size="mini">
-                    <el-col :span="20">
+                    <el-col :span="24">
                         <el-form-item label="事件名">
                             <div>{{downForm.actionName}}</div>
                         </el-form-item>
@@ -305,7 +310,7 @@
                                 type="date"
                                 placeholder="请选择下线时间"
                                 v-model="downForm.offTime"
-                                style="width: 140px;"
+                                style="width: 200px;"
                                 value-format="yyyy-MM-dd">
                             </el-date-picker>
                         </el-form-item>
@@ -478,6 +483,14 @@ export default {
                 offTime: [
                     { required: true, message: '请选择下线时间', trigger: 'change' }
                 ]
+           },
+           assignRule: {
+                status: [
+                    { required: true, message: '请选择任务状态', trigger: 'change' }
+                ],
+                handlerIds: [
+                    { required: true, message: '请选择指派人', trigger: 'change' }
+                ],
            },
             imageUrl: '',
             detailVisible: false,
@@ -485,10 +498,10 @@ export default {
         }
     },
     created() {
-        this.searchParam.pageId = this.$route.query.id;
+        this.searchParam.pageId = parseInt(this.$route.query.id);
     },
     mounted() {
-        this.getActionType(this.searchParam.pageId);
+        // this.getActionType(this.searchParam.pageId);
         this.getPageList();
         this.getVersionList();
         this.getStatusList();
@@ -604,14 +617,14 @@ export default {
             );
         },
         // 获取页面类型
-        getActionType(id) {
-            this.getData(
-                "get", `/basic-data/bi/page/search/pageType?id=${id}`, {},
-                res => {
-                    this.form.pageType = res.data.name;
-                }
-            );
-        },
+        // getActionType(id) {
+        //     this.getData(
+        //         "get", `/basic-data/bi/page/search/pageType?id=${id}`, {},
+        //         res => {
+        //             this.form.pageType = res.data.name;
+        //         }
+        //     );
+        // },
         // 详情
         getActionDetail(id) {
             this.getData(
@@ -628,6 +641,7 @@ export default {
         // 编辑
         editColumn(row) {
             this.dialogVisible = true;
+            this.form.pageType = row.pageType;
             this.getActionDetail(row.id);
             this.getTagList();
         },
@@ -688,7 +702,7 @@ export default {
         // 指派
         assignDialog(row) {
             this.assignVisible = true;
-            this.assignForm.id = row.pageId;
+            this.assignForm.id = row.id;
             this.assignForm.handlerIds = [];
             this.assignForm.status = '';
             this.getData(
@@ -701,20 +715,24 @@ export default {
         },
         // 确定指派
         confirmAssign() {
-            this.assignForm.handlerIds.forEach((item, index) => {
-                this.assignForm.handlerIds[index] = {
-                    id: item.split("&")[0],
-                    name: item.split("&")[1]
+            this.$refs.assignForm.validate((valid) => {
+                if(valid) {
+                    this.assignForm.handlerIds.forEach((item, index) => {
+                        this.assignForm.handlerIds[index] = {
+                            id: item.split("&")[0],
+                            name: item.split("&")[1]
+                        }
+                    })
+                    this.getData(
+                        "post", `/basic-data/bi/pageAction/assign`, this.assignForm,
+                        res => {
+                            this.$message.success("指派成功");
+                            this.assignVisible = false;
+                            this.search();
+                        }
+                    );
                 }
             })
-            this.getData(
-                "post", `/basic-data/bi/pageAction/assign`, this.assignForm,
-                res => {
-                    this.$message.success("指派成功");
-                    this.assignVisible = false;
-                    this.search();
-                }
-            );
         },
         // 查看详情
         detail(row) {