finx

package-lock.json

@@ -13520,11 +13520,6 @@
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
       "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
     },
-    "v-dropdown": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npm.taobao.org/v-dropdown/download/v-dropdown-2.1.1.tgz",
-      "integrity": "sha1-XhpJ1hwpE6ar3aPMtGLiZH+dae0="
-    },
     "validate-npm-package-license": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",

src/components/project/Project.vue

@@ -708,7 +708,7 @@
       },
       receiveProjectFail(error) {
         this.hideLoading()
-        notify('error', '接收项目失败:' + error.data)
+        notify('error', '接收项目失败：' + error.data)
       },
       //拒绝项目
       rejectProject() {
@@ -824,7 +824,7 @@
       },
       deleteTaskFail(error) {
         console.log(error)
-        notify('error', '删除失败:' + error)
+        notify('error', '删除失败：' + error)
       },
       beforeApkUpload(file) {
         return true;
@@ -876,7 +876,7 @@
           }
         }).catch((error) => {
           this.hideLoading()
-          // notify('error', error.data)
+          notify('error', '获取项目详情失败：' + error.data)
         })
       },
 
@@ -923,7 +923,7 @@
           notify('success', '需求文档上传成功')
         }).catch((error) => {
           this.hideLoading()
-          notify('error', '需求文档上传失败:' + error.data)
+          notify('error', '需求文档上传失败：' + error.data)
         })
       },
       uploadApkFile(param) {

src/components/report/ProjectReport.vue

@@ -45,14 +45,12 @@
               将文件拖到此处，或
               <em>点击上传</em>
             </div>
-            <div class="el-upload__tip" slot="tip">请上传报告文件</div>
+<!--            <div class="el-upload__tip" slot="tip">请上传报告文件</div>-->
           </el-upload>
-          <div v-if="!isModifyMode">
-            <span v-if="report.fileUrl==null"><i class="el-icon-document"></i>暂无文件</span>
-            <a :href="report.fileUrl" v-if="report.fileUrl!=null">
+            <span v-if="report.fileUrl==''"><i class="el-icon-document"></i>暂无文件</span>
+            <a :href="report.fileUrl" v-if="report.fileUrl!=''">
               <el-link :underline="false" type="primary"><i class="el-icon-document"></i>下载文档</el-link>
             </a>
-          </div>
         </el-form-item>
 
         <el-form-item label="结论" prop="conclusion">
@@ -151,7 +149,7 @@
             dependencyCode: this.taskId == null ? this.projectId : this.taskId,
             target: this.report.target,
             content: this.report.content,
-            file: '123.pdf',
+            file: this.report.fileUrl,
             conclusion: this.report.conclusion
           }
           console.log(newReport)

src/components/task/Task.vue

@@ -46,8 +46,16 @@
                 <el-radio :label="0">协同</el-radio>
                 <el-radio :label="1">非协同</el-radio>
               </el-radio-group>
+<<<<<<< HEAD
               {{task.endPoint.collaborativeType}}
               <span v-if="!isModifyMode">{{ task.endPoint.collaborativeType ? '非协同' : '协同' }}</span>
+=======
+              <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>
+>>>>>>> 517e05937e67e50d61eea1b7e250be34cedceaa2
             </el-form-item>
 
             <el-form-item label="任务可见性" prop="resource">
@@ -56,13 +64,9 @@
                 <div v-if="task.resource==0">定向</div>
                 <div v-if="task.resource==2">{{ resourceType[task.resource] }}</div>
               </div>
-              <el-tabs
-                :tab-position="tabPosition"
-                v-model="task.resource"
-                v-if="isModifyMode"
-              >
+              <el-tabs :tab-position="tabPosition" v-model="task.resource"  v-if="isModifyMode">
                 <el-tab-pane v-if="currType.type==0" :label="resourceType[0]" name="0">
-                  <el-radio-group v-model="task.institution" @change="handleTestTypeChange">
+                  <el-radio-group v-model="task.institution">
                     <el-radio v-for="(item,index) in institutionArray" :label="item.userId" name="type" :key="index">
                       {{item.name}}
                     </el-radio>
@@ -142,7 +146,7 @@
               <span v-if="task.endPoint.threePageUrl == null || task.endPoint.threePageUrl == ''">
                 <i class="el-icon-document"></i>暂无文件
               </span>
-                <span v-if="task.endPoint.threePageUrl != null && task.endPoint.threePageUrl != ''">
+              <span v-if="task.endPoint.threePageUrl != null && task.endPoint.threePageUrl != ''">
                   <a :href="task.endPoint.threePageUrl"><el-link :underline="false" type="primary"><i
                     class="el-icon-document"></i>下载文档</el-link></a>
                 </span>
@@ -244,7 +248,7 @@
                 trigger="hover"
                 content="测评机构已提交结束申请，请确认是否结束该任务">
                 <el-button v-if="taskOperationControl.confirmFinish" type="success" size="mini" slot="reference"
-                           @click="endTask()">确认结束
+                           @click="endTask()">结束任务
                 </el-button>
               </el-popover>
 
@@ -396,7 +400,8 @@ export default {
         endPoint: {
           collaborativeType:-1,
           token: '',
-          threePageUrl:''
+          threePageUrl:'',
+          caseId: '',
         },
         writeReportUrl:'',
         threePageList: []
@@ -573,6 +578,8 @@ export default {
       //this.loadData(this.projectId, this.taskId)
       this.getTaskDetail()
       this.getWordCloud()
+
+      console.log(this.task.endPoint.collaborativeType)
       // this.setInstitutions()
     },
 
@@ -599,6 +606,7 @@ export default {
     //切换至可编辑页面
     modifyForm() {
       // this.task.serviceType = '
+      console.log("task.endPoint.collaborativeType " + this.task.endPoint.collaborativeType);
       this.setServiceType()
       this.setInstitutions();
       this.isModifyMode = true
@@ -724,14 +732,13 @@ export default {
       }
       // this.wordCloud = res.wordCloudList;
       // console.log(res.crowdTaskVO.endPointVO.token)
-      // console.log(this.editShortLink)
       // console.log(this.isModifyMode)
       console.log(this.task)
     },
     //获取任务详情失败时回调函数
     getTaskDetailFail(error) {
       this.hideLoading()
-      // notify('error', '获取任务详情失败:' + error.data)
+      notify('error', '获取任务详情失败：' + error.data)
     },
 
     //处理显示报告
@@ -832,7 +839,7 @@ export default {
     },
     //更新任务信息失败时回调函数
     updateTaskFail(error) {
-      notify('error', '修改失败:' + error.data)
+      notify('error', '修改失败：' + error.data)
       this.hideLoading()
     },
     //上传任务需求文档
@@ -848,7 +855,7 @@ export default {
         // console.log(res)
         this.task.requireDocUrl = res.data
       }).catch((error) => {
-        // notify('error', '上传失败:' + error.data)
+        // notify('error', '上传失败：' + error.data)
         this.uploadRequireDocFail(error)
       })
     },
@@ -866,7 +873,7 @@ export default {
         this.task.endPoint.threePageUrl = res.data;
         this.$refs.task.validateField('endPoint.threePageUrl');
       }).catch((error) => {
-        // notify('error', '上传失败:' + error.data)
+        // notify('error', '上传失败：' + error.data)
         this.uploadRequireDocFail(error)
       })
     },

src/mock/getTaskDetailMock.js

@@ -38,7 +38,8 @@ var data = Mock.mock({
     'status': 1,
     //任务截止时间Date()类型
     //new Date("2018-11-11 23:11:11")
-    'datetime': 'Sun Nov 11 2018 23:11:11 GMT+0800 (中国标准时间)'
+    'datetime': 'Sun Nov 11 2018 23:11:11 GMT+0800 (中国标准时间)',
+
   },
   // 任务报告列表
   'crowdReportVOList': [

src/pages/Homepage/HomepagePrivate.vue

@@ -251,7 +251,7 @@
     watch: {
       getUserInfo(val) {
         this.setUserInfo();
-        // this.loadData();
+        this.loadData();
       }
     }
   }