Merge branch 'dev-online' into 'PrivateReleaseOfXC'

Dev online

See merge request crowd-2019/crowd-test-service-front!207

src/components/task/Task.vue

@@ -41,16 +41,16 @@
               <span class="badge" v-if="!isModifyMode">{{ task.serviceType }}</span>
             </el-form-item>
 
+            <el-form-item label="众测序号" prop="endPoint.caseId" v-if="currType.type==1 && task.endPoint.caseId !=null && !isModifyMode">
+              <span>{{ task.endPoint.caseId}}</span>
+            </el-form-item>
+
             <el-form-item label="协同模式" prop="endPoint.collaborativeType" style="width:700px;" v-if="currType.type==1">
               <el-radio-group v-model="task.endPoint.collaborativeType" v-if="isModifyMode" @change="$forceUpdate()">
                 <el-radio :label="0">协同</el-radio>
                 <el-radio :label="1">非协同</el-radio>
               </el-radio-group>
-              <span v-if="!isModifyMode">{{ task.endPoint.collaborativeType == 1 ? '非协同' : '协同' }}</span>
-            </el-form-item>
-
-            <el-form-item label="众测序号" prop="endPoint.caseId" v-if="currType.type==1 && !isModifyMode">
-              <span>{{ task.endPoint.caseId}}</span>
+              <span v-if="!isModifyMode">{{ task.endPoint.collaborativeType ? '非协同' : '协同' }}</span>
             </el-form-item>
 
             <el-form-item label="任务可见性" prop="resource">
@@ -145,8 +145,9 @@
                   <a :href="task.endPoint.threePageUrl"><el-link :underline="false" type="primary"><i
                     class="el-icon-document"></i>下载文档</el-link></a>
                 </span>
-                <span v-if="isModifyMode"> <a href="http://mooctest-site.oss-cn-shanghai.aliyuncs.com/excel-template.xlsx">&nbsp;&nbsp;&nbsp;<i class="el-icon-document"></i>示例下载</a></span>
-            </span>
+               <span v-if="isModifyMode&&!task.endPoint.threePageUrl">
+                  <a href="http://mooctest-site.oss-cn-shanghai.aliyuncs.com/excel-template.xlsx">&nbsp;&nbsp;&nbsp;<i class="el-icon-document"></i>示例下载</a></span>
+              </span>
             </el-form-item>
 
             <el-form-item v-if="!isModifyMode && task.resource==2 && needAcceptedPWD && showBD" label="任务接收码" prop="agencyName" style="width: 700px;">
@@ -176,7 +177,7 @@
               <el-button size="mini" @click="toProject()">项目详情</el-button>
 
               <el-popover
-                placement="top-start"r
+                placement="top-start"
                title="确认拒绝？"
                 width="200"
                 trigger="hover"
@@ -250,13 +251,13 @@
             </el-form-item>
           </el-form>
         </el-col>
-        <el-col :span="9">
+        <el-col :span="9" v-if="!isModifyMode">
           <TaskCloud :info="wordCloud" v-if="wordCloud.length"></TaskCloud>
         </el-col>
       </el-row>
 
     </div>
-    <div class="create-body" v-if="!isModifyMode">
+    <div class="create-body" v-if="!isModifyMode && currType.type===0">
       <div class="title h2">用户报告列表</div>
       <el-collapse accordion style="margin: 0 30px">
         <el-collapse-item v-for="(item,index) in acceptedUserList" :key="item.id">
@@ -393,7 +394,7 @@ export default {
         title: '',
         description: '',
         endPoint: {
-          collaborativeType:0,
+          collaborativeType:-1,
           token: '',
           threePageUrl:'',
           caseId: '',
@@ -533,18 +534,18 @@ export default {
       window.open(this.task.endPoint.token)
     },
     //根据短链接获取生成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;
-        if (this.shortLink != '') {
-          this.editShortLink = false;
-        }
-        this.hideLoading()
-      })
-    },
+    // 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;
+    //     if (this.shortLink != '') {
+    //       this.editShortLink = false;
+    //     }
+    //     this.hideLoading()
+    //   })
+    // },
     getServiceByCode(code) {
       let serviceName = this.serviceType.filter((item) => {
         return item.code === code;
@@ -562,7 +563,6 @@ export default {
         this.$refs.task.clearValidate('endPoint');
       } else {
         this.task.resource = '2';
-        this.task.endPoint.collaborativeType = 0;
       }
     },
     init() {
@@ -686,7 +686,6 @@ export default {
     //获取任务详情成功时回调函数
     getTaskDetailSuccess(res) {
       this.hideLoading()
-      // console.log(res)
       this.task = res.crowdTaskVO
       this.taskId = res.crowdTaskVO.id
       this.projectId = res.crowdTaskVO.projectId
@@ -711,9 +710,7 @@ export default {
       this.task.status = res.crowdTaskVO.status
       this.task.statusVO = res.crowdTaskVO.statusVO
       this.task.writeReportUrl = res.crowdTaskVO.writeReportUrl
-
-      this.task.endPoint = res.crowdTaskVO.endPointVO ? res.crowdTaskVO.endPointVO : {}
-      console.log(this.task.endPoint.collaborativeType)
+      this.task.endPoint = {...res.crowdTaskVO.endPointVO};
       this.taskOperationControl = res.taskOperationControl;
       this.acceptedUserList = res.acceptedUserList;
       this.crowdReportUrl = res.crowdTaskVO.writeReportUrl;
@@ -732,6 +729,7 @@ export default {
       // this.wordCloud = res.wordCloudList;
       // console.log(res.crowdTaskVO.endPointVO.token)
       // console.log(this.isModifyMode)
+      console.log(this.task)
     },
     //获取任务详情失败时回调函数
     getTaskDetailFail(error) {
@@ -818,13 +816,13 @@ export default {
       this.task.datetime = new Date(res.crowdTaskVO.datetime)
       this.task.quotePrice = res.crowdTaskVO.quotePrice
       this.task.fixedPrice = res.crowdTaskVO.fixedPrice
-      // this.task.endPointVO = res.crowdTaskVO.endPointVO
+      this.task.endPoint = res.crowdTaskVO.endPointVO
       this.task.doc = []
       this.task.requireDocUrl = res.crowdTaskVO.requirementFile
       this.task.participantCount = res.crowdTaskVO.participantCount
-      this.task.endPoint = res.crowdTaskVO.endPointVO ? res.crowdTaskVO.endPointVO : {
-        serverCode: '',
-      }
+      // this.task.endPoint = res.crowdTaskVO.endPointVO ? res.crowdTaskVO.endPointVO : {
+      //   serverCode: '',
+      // }
       this.task.createTime = res.crowdTaskVO.createTime,
         this.reportList = res.crowdReportVOList
       this.crowdReportUrl = res.crowdTaskVO.writeReportUrl;
@@ -833,7 +831,6 @@ export default {
       this.serviceName = this.getServiceByCode(res.crowdTaskVO.serviceType)
       this.getWordCloudByDescription()
       this.hideLoading()
-
       notify('success', '修改成功')
     },
     //更新任务信息失败时回调函数
@@ -869,7 +866,8 @@ export default {
       Http.upload(Apis.FILE.REQUIREMENT_FILE.replace('{userId}', this.user.userVO.id), formData, config).then((res) => {
         notify('success', '上传成功')
         this.task.endPoint.threePageUrl = res.data
-        console.log("this.task.endPoint.threePageUrl " + this.task.endPoint.threePageUrl)
+        this.task.endPoint.threePageUrl = res.data;
+        this.$refs.task.validateField('endPoint.threePageUrl');
       }).catch((error) => {
         // notify('error', '上传失败：' + error.data)
         this.uploadRequireDocFail(error)

src/components/task/TaskCreate.vue

@@ -119,7 +119,8 @@
             <a :href="task.endPoint.threePageUrl"><el-link :underline="false" type="primary"><i
               class="el-icon-document"></i>下载文档</el-link></a>
           </span>
-          <span> <a href="http://mooctest-site.oss-cn-shanghai.aliyuncs.com/excel-template.xlsx">&nbsp;&nbsp;&nbsp;<i class="el-icon-document"></i>示例下载</a></span>
+          <span v-if="!task.endPoint.threePageUrl">
+            <a href="http://mooctest-site.oss-cn-shanghai.aliyuncs.com/excel-template.xlsx">&nbsp;&nbsp;&nbsp;<i class="el-icon-document"></i>示例下载</a></span>
         </el-form-item>
 
         <el-form-item size="small" label="任务截止时间" prop="datetime">
@@ -460,7 +461,8 @@ export default {
       formData.append('file', param.file)
       Http.upload(Apis.FILE.REQUIREMENT_FILE.replace('{userId}', this.user.userVO.id), formData, config).then((res) => {
         notify('success', '上传成功')
-        this.task.endPoint.threePageUrl = res.data
+        this.task.endPoint.threePageUrl = res.data;
+        this.$refs.task.validateField('endPoint.threePageUrl');
       }).catch((error) => {
         notify('error', '上传失败:' + error.data)
       })

src/pages/Homepage/HomepagePrivate.vue

@@ -7,22 +7,22 @@
           <div class="pull-left to-mooctest-ranking" :style="{backgroundImage: 'url(' + mooctest_rank_logo_url + ')'}"  @click="handleLogoClick"></div>
         </el-col>
         <el-col :span="15">
-          <div class="search-nav-input">
-            <div id="search-block ">
-              <el-tabs v-model="searchType" type="card" @tab-click="handleTypeClick">
-                <el-tab-pane v-for="item in searchTypeArr" v-if="item.value!=='all'" :label="item.name"
-                             :name="item.value" :key="item.value"></el-tab-pane>
-              </el-tabs>
-              <div class="search-input">
-                <el-input ref="searchInput" placeholder="请输入内容" v-model="searchVal" class="input-with-select">
-                  <el-button class="search-button" slot="append" type="primary" @click="handleSearchData">搜索</el-button>
-                </el-input>
-              </div>
-            </div>
-          </div>
+<!--          <div class="search-nav-input">-->
+<!--            <div id="search-block ">-->
+<!--              <el-tabs v-model="searchType" type="card" @tab-click="handleTypeClick">-->
+<!--                <el-tab-pane v-for="item in searchTypeArr" v-if="item.value!=='all'" :label="item.name"-->
+<!--                             :name="item.value" :key="item.value"></el-tab-pane>-->
+<!--              </el-tabs>-->
+<!--              <div class="search-input">-->
+<!--                <el-input ref="searchInput" placeholder="请输入内容" v-model="searchVal" class="input-with-select">-->
+<!--                  <el-button class="search-button" slot="append" type="primary" @click="handleSearchData">搜索</el-button>-->
+<!--                </el-input>-->
+<!--              </div>-->
+<!--            </div>-->
+<!--          </div>-->
 
         </el-col>
-        <el-col :span="4">
+        <el-col :span="19">
           <el-button type="primary pull-right" class="releaseBtn" @click="checkLogin()">发布众测需求</el-button>
         </el-col>
       </el-row>

src/style/search-nav.scss

@@ -59,7 +59,7 @@
 }
 
 .releaseBtn{
-  margin-top: 40px !important;
+  margin-top: 35px !important;
 }
 
 .tab-menu1 {