Merge branch 'dev-online' into 'PrivateReleaseOfXC'

Dev online

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

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

@@ -138,16 +138,15 @@
                 </div>
               </el-upload>
               <span>
-<!--              <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 == ''">
+                <i class="el-icon-document"></i>暂无文件
+              </span>
                 <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>
-
+                <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> <a href="http://mooctest-site.oss-cn-shanghai.aliyuncs.com/excel-template.xlsx"><i class="el-icon-document"></i>示例下载</a></span>
             </el-form-item>
 
             <el-form-item v-if="!isModifyMode && task.resource==2 && needAcceptedPWD && showBD" label="任务接收码" prop="agencyName" style="width: 700px;">
@@ -244,7 +243,7 @@
                 trigger="hover"
                 content="测评机构已提交结束申请，请确认是否结束该任务">
                 <el-button v-if="taskOperationControl.confirmFinish" type="success" size="mini" slot="reference"
-                           @click="endTask()">确认结束
+                           @click="endTask()">结束任务
                 </el-button>
               </el-popover>
 
@@ -726,13 +725,12 @@ export default {
       }
       // this.wordCloud = res.wordCloudList;
       // console.log(res.crowdTaskVO.endPointVO.token)
-      // console.log(this.editShortLink)
       // console.log(this.isModifyMode)
     },
     //获取任务详情失败时回调函数
     getTaskDetailFail(error) {
       this.hideLoading()
-      // notify('error', '获取任务详情失败:' + error.data)
+      notify('error', '获取任务详情失败：' + error.data)
     },
 
     //处理显示报告
@@ -834,7 +832,7 @@ export default {
     },
     //更新任务信息失败时回调函数
     updateTaskFail(error) {
-      notify('error', '修改失败:' + error.data)
+      notify('error', '修改失败：' + error.data)
       this.hideLoading()
     },
     //上传任务需求文档
@@ -850,7 +848,7 @@ export default {
         // console.log(res)
         this.task.requireDocUrl = res.data
       }).catch((error) => {
-        // notify('error', '上传失败:' + error.data)
+        // notify('error', '上传失败：' + error.data)
         this.uploadRequireDocFail(error)
       })
     },
@@ -867,7 +865,7 @@ export default {
         this.task.endPoint.threePageUrl = res.data
         console.log("this.task.endPoint.threePageUrl " + this.task.endPoint.threePageUrl)
       }).catch((error) => {
-        // notify('error', '上传失败:' + error.data)
+        // notify('error', '上传失败：' + error.data)
         this.uploadRequireDocFail(error)
       })
     },

src/components/task/TaskCreate.vue

@@ -119,7 +119,7 @@
             <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"><i class="el-icon-document"></i>示例下载</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>
         </el-form-item>
 
         <el-form-item size="small" label="任务截止时间" prop="datetime">

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/Homepage.vue

@@ -150,7 +150,7 @@
         if (storageGet('user') != null) {
           this.isLogin = true;
         }
-        this.setFields();
+        // this.setFields();
         let p1 = new Promise((resolve, reject) => {
           Http.get('/api/common/index/info/cache').then((res) => {
             this.homeData = res.data;
@@ -158,6 +158,7 @@
             //   item.height = (item.testTypeList.length / 2) * 24 + 100;
             //   return item;
             // })
+            this.homeTabArr.menuArr2 = res.data.fieldList
             resolve(res.data);
           }).catch((error) => {
             notify('error', error.data)
@@ -194,7 +195,7 @@
           Http.get(Apis.USER.IS_PART.replace('{userId}', this.user.id)).then((res) => {
             this.$router.push('/project/create');
           }).catch((error) => {
-            notify('error', error)
+            notify('error', error.data)
           })
         }
       },
@@ -250,7 +251,7 @@
     watch: {
       getUserInfo(val) {
         this.setUserInfo();
-        this.loadData();
+        // this.loadData();
       }
     }
   }

src/pages/Homepage/HomepagePrivate.vue

@@ -145,7 +145,7 @@
         if (storageGet('user') != null) {
           this.isLogin = true;
         }
-        this.setFields();
+        // this.setFields();
         let p1 = new Promise((resolve, reject) => {
           Http.get('/api/common/index/info/cache').then((res) => {
             this.homeData = res.data;
@@ -153,6 +153,7 @@
             //   item.height = (item.testTypeList.length / 2) * 24 + 100;
             //   return item;
             // })
+            this.homeTabArr.menuArr2 = res.data.fieldList
             resolve(res.data);
           }).catch((error) => {
             notify('error', error.data)
@@ -192,7 +193,7 @@
           Http.get(Apis.USER.IS_PART.replace('{userId}', this.user.id)).then((res) => {
             this.$router.push('/project/create');
           }).catch((error) => {
-            notify('error', error)
+            notify('error', error.data)
           })
         }
       },

tool4deploy-privatecloud/crowd-web/index.html

@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>crowd-test-service</title><link href=/static/css/app.c82b373e275d00eae8dc0360168a90c7.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.b48cbabf4ecc29351713.js></script><script type=text/javascript src=/static/js/vendor.e0b22b6bf64e1b3af804.js></script><script type=text/javascript src=/static/js/app.61017d708f6fa9acd1ec.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>crowd-test-service</title><link href=/static/css/app.c82b373e275d00eae8dc0360168a90c7.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.dd7b23c99d3f4b4c46bd.js></script><script type=text/javascript src=/static/js/vendor.e0b22b6bf64e1b3af804.js></script><script type=text/javascript src=/static/js/app.d4220ce9c0498491d680.js></script></body></html>