wangJJ vor 5 Jahren
Ursprung
Commit
6a625e9e63
2 geänderte Dateien mit 22 neuen und 24 gelöschten Zeilen
  1. 17 17
      src/components/task/Task.vue
  2. 5 7
      src/components/task/TaskCreate.vue

+ 17 - 17
src/components/task/Task.vue

@@ -3,7 +3,7 @@
     <div class="title h1" v-if="!isModifyMode">任务</div>
     <div class="create-body">
       <div class="title h2" v-if="!isModifyMode">基本信息</div>
-      <el-form :model="task" :rules="rules" ref="task" label-width="12%" class="demo-task">
+      <el-form :model="task" :rules="rules" ref="task" label-width="120px" class="demo-task" style="margin-left: 100px;width: 700px">
         <el-form-item label="任务名称" prop="title">
           <el-input size="small" v-if="isModifyMode" v-model="task.title"></el-input>
               <span v-if="!isModifyMode">{{task.title}}</span>
@@ -34,17 +34,15 @@
           <span class="badge" v-if="!isModifyMode">{{task.serviceType}}</span>
         </el-form-item>
 
-        <el-form-item label="examId" prop="endpoint.examId" v-if="task.serviceType=='北斗众测'"
-                      :rules="[{ required: true, type: 'number',message: 'examID必须是数字类型'}]">
-          <el-input v-if="isModifyMode" v-model.number="task.endpoint.examId" label="examId"></el-input>
-          <span v-if="!isModifyMode">{{task.endpoint.examId}}</span>
+        <el-form-item label="examId" prop="endPointVO.examId" v-if="task.endPointVO&&task.serviceType=='北斗众测'" required>
+          <el-input v-if="isModifyMode" v-model="task.endPointVO.examId" label="examId"></el-input>
+          <span v-if="!isModifyMode&&taskOperationControl.update">{{task.endPointVO.examId}}</span>
         </el-form-item>
 
 
-        <el-form-item label="caseId" prop="endpoint.caseId" v-if="task.serviceType=='北斗众测'"
-                      :rules="[{ required: true, type: 'number',message: 'caseID必须是数字类型'}]">
-          <el-input v-if="isModifyMode" v-model.number="task.endpoint.caseId" label="caseId"></el-input>
-          <span v-if="!isModifyMode">{{task.endpoint.caseId}}</span>
+        <el-form-item label="caseId" prop="endPointVO.caseId" v-if="task.endPointVO&&task.serviceType=='北斗众测'" required>
+          <el-input v-if="isModifyMode" v-model.number="task.endPointVO.caseId" label="caseId"></el-input>
+          <span v-if="!isModifyMode&&taskOperationControl.update">{{task.endPointVO.caseId}}</span>
         </el-form-item>
 
 
@@ -281,6 +279,7 @@
           update: false,
           uploadReport: false
         },
+        crowdReportUrl:'',
         task: {
           agencyId: '',
           status: '',
@@ -298,7 +297,7 @@
           participantCount:1,
           title:'',
           description:'',
-          endpoint:{
+          endPointVO:{
             caseId:'',
             examId:''
           }
@@ -414,7 +413,7 @@
 
       //北斗测试报告填写跳转
       gotoWriteReport(){
-
+        window.open(this.crowdReportUrl,'_blank');
       },
 
       //跳转至项目详情页面
@@ -446,8 +445,8 @@
         this.task.institution = ''
         this.task.datetime = ''
         this.task.participantCount = 1
-        // this.task.endpoint.caseId = ''
-        // this.task.endpoint.examId = ''
+        // this.task.endPointVO.caseId = ''
+        // this.task.endPointVO.examId = ''
       },
       //显示页面加载画面
       showLoading() {
@@ -485,7 +484,7 @@
       },
       //获取任务详情成功时回调函数
       getTaskDetailSuccess(res) {
-        console.log(res);
+        console.log('获取task信息')
         this.hideLoading()
         console.log(res.crowdTaskVO)
         this.taskId = res.crowdTaskVO.id
@@ -506,9 +505,10 @@
         this.task.agencyId = res.crowdTaskVO.agencyId
         this.task.status = res.crowdTaskVO.status
         this.task.statusVO = res.crowdTaskVO.statusVO
-        // this.task.endpoint = res.crowdTaskVO.endpoint
+        this.task.endPointVO = res.crowdTaskVO.endPointVO
         this.taskOperationControl = res.taskOperationControl
         this.acceptedUserList = res.acceptedUserList;
+        this.crowdReportUrl = res.crowdTaskVO.writeReportUrl;
         this.handleFormatReport(this.acceptedUserList);
       },
       //获取任务详情失败时回调函数
@@ -566,7 +566,7 @@
               fixedPrice: this.task.fixedPrice,
               requirementFile: this.task.requireDocUrl,
               participantCount: this.task.participantCount,
-              endpoint:this.task.endpoint
+              endpoint:this.task.endPointVO
             }
             //console.log(newTask)
             updateTask(this.projectId, this.taskId, newTask, this.updateTaskSuccess, this.updateTaskFail)
@@ -593,7 +593,7 @@
         this.task.datetime = new Date(res.crowdTaskVO.datetime)
         this.task.quotePrice = res.crowdTaskVO.quotePrice
         this.task.fixedPrice = res.crowdTaskVO.fixedPrice
-        // this.task.endpoint = res.crowdTaskVO.endpoint
+        // this.task.endPointVO = res.crowdTaskVO.endPointVO
         this.task.doc = []
         this.task.requireDocUrl = res.crowdTaskVO.requirementFile,
           this.task.participantCount = res.crowdTaskVO.participantCount

+ 5 - 7
src/components/task/TaskCreate.vue

@@ -2,7 +2,7 @@
   <div class="create-container" v-loading="loading">
     <div class="title h1">创建任务</div>
     <div class="create-body">
-      <el-form :model="task" :rules="rules" ref="task" label-width="12%" class="demo-task">
+      <el-form :model="task" :rules="rules" ref="task" label-width="120px" class="demo-task" style="margin-left: 100px;width: 700px">
         <el-form-item label="任务名称" prop="name">
           <el-input size="small" v-model="task.name"></el-input>
         </el-form-item>
@@ -28,13 +28,11 @@
         </el-form-item>
 
 
-        <el-form-item label="examId" prop="endpoint.examId" v-if="task.type=='BDSPT'"
-                      :rules="[{ required: true, type: 'number',message: 'examID必须是数字类型'}]">
-          <el-input v-model.number="task.endpoint.examId" label="examId"></el-input>
+        <el-form-item label="examId" prop="endpoint.examId" v-if="task.type=='BDSPT'" required>
+          <el-input v-model="task.endpoint.examId" label="examId"></el-input>
         </el-form-item>
-        <el-form-item label="caseId" prop="endpoint.caseId" v-if="task.type=='BDSPT'"
-                      :rules="[{ required: true, type: 'number',message: 'caseID必须是数字类型'}]">
-          <el-input v-model.number="task.endpoint.caseId" label="caseId"></el-input>
+        <el-form-item label="caseId" prop="endpoint.caseId" v-if="task.type=='BDSPT'" required>
+          <el-input v-model="task.endpoint.caseId" label="caseId"></el-input>
         </el-form-item>