Browse Source

修改任务界面中任务展示链接的编辑和显示控制

guo00guo 4 years ago
parent
commit
a645a92fdf
2 changed files with 25 additions and 12 deletions
  1. 22 9
      src/components/task/Task.vue
  2. 3 3
      src/pages/Technology/CrowdCase.vue

+ 22 - 9
src/components/task/Task.vue

@@ -138,17 +138,17 @@
           <div class="btn btn-small" @click="cancelMode()">取消</div>
         </el-form-item>
 
-        <el-form-item v-if="editShortLink && task.endPoint.serverCode && taskOperationControl.confirmFinish" label="报告短链接" props="shortLink">
-          <el-input v-model="shortLink" placeholder="请输入短链接生成任务报告" style="width: 400px">
+        <el-form-item v-if="editShortLink && task.endPoint.serverCode && taskOperationControl.confirmFinish" label="任务面板链接" props="shortLink">
+          <el-input v-model="shortLink" placeholder="请输入短链接生成任务报告" style="width: 800px">
             <template slot="append">
-              <el-button @click="getTaskDataBoard()">点击生成</el-button>
+              <el-button @click="getTaskDataBoard()">确定</el-button>
             </template>
           </el-input>
         </el-form-item>
 
-        <el-form-item v-if="!editShortLink && task.endPoint.serverCode && taskOperationControl.confirmFinish">
-          {{task.endPointVO&&task.endPointVO.token}}
-          <i class="el-icon-edit" @click="this.editShortLink = !this.editShortLink"/>
+        <el-form-item v-if="(!editShortLink) && shortLink" label="任务面板链接" props="shortLink">
+          {{shortLink}}
+          <i class="el-icon-edit" @click="editShortLink = !editShortLink"/>
         </el-form-item>
 
         <el-form-item v-if="!isModifyMode">
@@ -206,7 +206,7 @@
             上传报告
           </el-button>
           <el-button v-if="taskOperationControl.taskDemonstrate" type="success" size="mini" @click="gotoDataboard()">
-            数据面板
+            任务面板
           </el-button>
           <!--<div class="btn btn-small btn-info"-->
           <!--v-if="taskOperationControl.confirmFinish"-->
@@ -320,6 +320,7 @@
           description: '',
           endPoint: {
             serverCode: '',
+            token: ''
           }
         },
         reportList: [],
@@ -398,7 +399,7 @@
         },
         acceptedUserList: [],
         shortLink:'',
-        editShortLink:true,
+        editShortLink:false,
       }
     },
     watch: {
@@ -440,10 +441,14 @@
       },
       //根据短链接获取生成databoard
       getTaskDataBoard(){
+        this.showLoading()
         Http.put(`/api/project/${this.projectId}/task/${this.taskId}/addToken`,{"token":this.shortLink}).then((res)=>{
           this.taskOperationControl = res.taskOperationControl;
           this.task.endPoint = res.crowdTaskVO.endPointVO;
+          this.shortLink = res.crowdTaskVO.endPointVO.token;
+          this.editShortLink = false;
         })
+        this.hideLoading()
       },
       getServiceByCode(code){
         let serviceName = this.serviceType.filter((item) => {
@@ -550,6 +555,7 @@
       //获取任务详情成功时回调函数
       getTaskDetailSuccess(res) {
         this.hideLoading()
+        console.log(res)
         this.taskId = res.crowdTaskVO.id
         this.projectId = res.crowdTaskVO.projectId
         this.task.title = res.crowdTaskVO.title
@@ -577,7 +583,14 @@
         this.handleFormatReport(this.acceptedUserList);
         this.handleTestTypeChange(res.crowdTaskVO.serviceType);
         this.serviceName = this.getServiceByCode(res.crowdTaskVO.serviceType);
-        this.shortLink = res.crowdTaskVO.endPointVO && res.crowdTaskVO.endPointVO.token;
+        if(res.crowdTaskVO.endPointVO){
+          if(res.crowdTaskVO.endPointVO.token){
+            this.shortLink = res.crowdTaskVO.endPointVO.token
+          }
+        }
+        // console.log(res.crowdTaskVO.endPointVO.token)
+        // console.log(this.editShortLink)
+        // console.log(this.isModifyMode)
       },
       //获取任务详情失败时回调函数
       getTaskDetailFail(error) {

+ 3 - 3
src/pages/Technology/CrowdCase.vue

@@ -6,8 +6,8 @@
           <el-col :span="21">
             <div class="technology-title">
               {{item.title}}
-              <el-tag :type="item.statusVO&&item.statusVO.style" size="medium" class="case-status">{{item.statusVO&&item.statusVO.text}}</el-tag>
-              <el-tag :type="item.fullStatusVO&&item.fullStatusVO.style" size="medium" class="case-status">{{item.fullStatusVO&&item.fullStatusVO.text}}</el-tag>
+<!--              <el-tag :type="item.statusVO&&item.statusVO.style" size="medium" class="case-status">{{item.statusVO&&item.statusVO.text}}</el-tag>-->
+              <el-tag size="medium" class="case-status">{{item.serviceType}}</el-tag>
             </div>
             <div class="technology-info">
               任务描述:{{item.description}}
@@ -41,7 +41,7 @@
     props:['caseList'],
     methods:{
       gotoDetail(item){
-        // item.chineseBrief ? window.open(item.chineseBrief) : null
+        window.open(item.endPointVO.token)
       }
     }
   }