Merge branch 'Dev' into 'Test'

Dev

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

package-lock.json

@@ -550,7 +550,7 @@
     },
     "axios": {
       "version": "0.19.0",
-      "resolved": "https://registry.npm.taobao.org/axios/download/axios-0.19.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Faxios%2Fdownload%2Faxios-0.19.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/axios/download/axios-0.19.0.tgz",
       "integrity": "sha1-jgm/89kSLhM/e4EByPvdAO09Krg=",
       "requires": {
         "follow-redirects": "1.5.10",

src/components/Mine.vue

@@ -59,11 +59,12 @@
           </span>
           <el-row v-if="unFinishedTaskList != null && unFinishedTaskList.length != 0" type="flex" align="middle"
                   justify="center" style="font-size: 14px;">
-            <el-col :span="6">任务封面</el-col>
-            <el-col :span="5">任务名称</el-col>
-            <el-col :span="5">任务类型</el-col>
+            <el-col :span="5">任务封面</el-col>
+            <el-col :span="4">任务名称</el-col>
+            <el-col :span="4">任务类型</el-col>
             <el-col :span="4">任务预算</el-col>
-            <el-col :span="4">操作</el-col>
+            <el-col :span="4">领取人数</el-col>
+            <el-col :span="3">操作</el-col>
           </el-row>
           <span v-if="unFinishedTaskList == null || unFinishedTaskList.length == 0"> 暂无任务 </span>
           <task-item v-if="unFinishedTaskList != null || unFinishedTaskList.length > 0"
@@ -75,12 +76,12 @@
           </span>
           <el-row v-if="finishedTaskList != null && finishedTaskList.length != 0" type="flex" align="middle"
                   justify="center" style="font-size: 14px;">
-
-            <el-col :span="6">任务封面</el-col>
-            <el-col :span="5">任务名称</el-col>
-            <el-col :span="5">任务类型</el-col>
+            <el-col :span="5">任务封面</el-col>
+            <el-col :span="4">任务名称</el-col>
+            <el-col :span="4">任务类型</el-col>
             <el-col :span="4">任务预算</el-col>
-            <el-col :span="4">操作</el-col>
+            <el-col :span="4">领取人数</el-col>
+            <el-col :span="3">操作</el-col>
           </el-row>
           <span v-if="finishedTaskList == null || finishedTaskList.length == 0"> 暂无任务 </span>
           <task-item v-if="finishedTaskList != null || finishedTaskList.length > 0"

src/components/Square.vue

@@ -4,11 +4,12 @@
 
     <div class="square-list-container" v-loading="loading" type="flex" align="middle">
       <el-row v-if="list != null && list.length != 0" type="flex" align="middle" justify="center"  style="font-size: 14px;">
-        <el-col :span="6">任务封面</el-col>
-        <el-col :span="5">任务名称</el-col>
-        <el-col :span="5">任务类型</el-col>
+        <el-col :span="5">任务封面</el-col>
+        <el-col :span="4">任务名称</el-col>
+        <el-col :span="4">任务类型</el-col>
         <el-col :span="4">任务预算</el-col>
-        <el-col :span="4">操作</el-col>
+        <el-col :span="4">领取次数</el-col>
+        <el-col :span="3">操作</el-col>
       </el-row>
       <task-item v-if="list!=null&&list.length>0" v-for="(item,index) in list" :key="index" :task="item"/>
       <!--<div v-if="loading" class="loading">-->

src/components/commons/TaskItem.vue

@@ -1,20 +1,23 @@
 <template>
   <div class="task-item-container">
     <el-row type="flex" align="middle" justify="center" style="font-size: 14px;">
-      <el-col :span="6" type="flex" align="middle" justify="center">
+      <el-col :span="5" type="flex" align="middle" justify="center">
         <el-badge :value="taskTable.statusVO.text" class="item" :type="taskTable.statusVO.style">
           <img class="task-cover" src="@/assets/img/home_ban1.jpg">
         </el-badge>
       </el-col>
-      <el-col :span="5" type="flex" align="middle" justify="center">{{taskTable.title}}</el-col>
+      <el-col :span="4" type="flex" align="middle" justify="center">{{taskTable.title}}</el-col>
       <!--<el-col :span="4">{{project.id}}</el-col>-->
-      <el-col :span="5" type="flex" align="middle" justify="center">{{taskTable.serviceType}}</el-col>
+      <el-col :span="4" type="flex" align="middle" justify="center">{{taskTable.serviceType}}</el-col>
       <el-col :span="4" type="flex" align="middle" justify="center">
         <div class="badge" type="flex" align="middle" justify="center">
           ¥{{taskTable.quotePrice==null?0:taskTable.quotePrice}}
         </div>
       </el-col>
-      <el-col :span="4" type="flex" align="middle" justify="center"><span class="btn btn-medium btn-info"
+      <el-col :span="4" type="flex" align="middle" justify="center">
+        {{taskTable.acceptedCount}} / {{  taskTable.participantCount}}
+      </el-col>
+      <el-col :span="3" type="flex" align="middle" justify="center"><span class="btn btn-medium btn-info"
                                                                           @click="goToTaskDetail(taskTable.projectId,taskTable.id)">查看详情</span>
       </el-col>
     </el-row>

src/components/project/Project.vue

@@ -306,6 +306,7 @@ export default {
       }
     }
     return {
+      acceptedUserList:[],
       projectId: 0,
       user: {},
       loading: false,
@@ -839,6 +840,7 @@ export default {
             }
         }
 
+
       }).catch((error) => {
         this.hideLoading()
         notify('error', error.data)

src/components/project/ProjectCreate.vue

@@ -21,7 +21,6 @@
           <el-input type="textarea" style="width: 400px" v-model="project.desc"
                     placeholder="请输入对项目的描述"></el-input>
         </el-form-item>
-
         <!--<el-form-item label="价格" prop="price">-->
         <!--<el-input type="number" v-model="project.price">-->
         <!--<template slot="append">¥</template>-->

src/components/report/ReportList.vue

@@ -10,6 +10,15 @@
     </el-row>-->
 
     <el-table :showHeader="true" :data="reportList" style="width: 100%">
+<!--      <el-table-column-->
+<!--        prop="userName"-->
+<!--        label="提交用户"-->
+<!--      >-->
+<!--      </el-table-column>-->
+      <el-table-column
+        prop="name"
+        label="报告名称"
+      ></el-table-column>
       <el-table-column prop="type" label="报告类型" title="报告类型">
         <template slot-scope="scope">
           <span class="badge">{{scope.row.type}}</span>
@@ -110,10 +119,13 @@ export default {
 
 <style lang="less" scoped>
   .report-container {
-    margin: 0 30px;
+    margin: 0 30px 0 0;
   }
 
   .el-row {
     margin-bottom: 20px;
   }
+  .el-collapse-item__content{
+    padding-bottom: 0 !important;
+  }
 </style>

src/components/report/TaskReport.vue

@@ -97,7 +97,8 @@ export default {
         content: '',
         file: [],
         fileUrl: '',
-        conclusion: ''
+        conclusion: '',
+        participantCount: 1
       },
       rules: {
         name: [
@@ -149,7 +150,8 @@ export default {
             target: this.report.target,
             content: this.report.content,
             file: this.report.fileUrl,
-            conclusion: this.report.conclusion
+            conclusion: this.report.conclusion,
+            participantCount: this.report.participantCount
           }
           console.log(newReport)
           Http.put(Apis.REPORT.UPDATE_TASK_REPORT.replace('{projectId}', this.projectId).replace('{taskId}', this.taskId).replace('{reportId}', this.reportId), newReport).then((res) => {
@@ -175,6 +177,7 @@ export default {
       this.report.file = ''
       this.report.type = ''
       this.report.conclusion = ''
+      this.report.participantCount = 1
     },
     cancelCreate () {
       this.isModifyMode = false
@@ -235,6 +238,7 @@ export default {
         this.report.fileUrl = res.crowdReportVO.file
         this.report.conclusion = res.crowdReportVO.conclusion
         this.report.target = res.crowdReportVO.target
+        this.report.participantCount = res.crowdReportVO.participantCount
         this.hideLoading()
       }).catch((error) => {
         this.hideLoading()

src/components/task/TaskCreate.vue

@@ -26,6 +26,9 @@
             </span>
           </el-radio-group>
         </el-form-item>
+        <el-form-item label="领取人数" prop="contactPhone" v-if="task.resource !== '0'">
+          <el-input-number v-model="task.participantCount" :min="1" :max="10" label="领取人数"></el-input-number>
+        </el-form-item>
         <el-form-item label="任务可见性" prop="resource">
           <el-tabs :tab-position="tabPosition" v-model="task.resource" style="width: 800px">
             <el-tab-pane :label="resourceType[0]" name="0">
@@ -126,7 +129,8 @@ export default {
         quotePrice: '',
         fixedPrice: '',
         doc: [],
-        requireDocUrl: '123.doc'
+        requireDocUrl: '123.doc',
+        participantCount: 1
       },
       pickerOptions: {
         shortcuts: [
@@ -261,7 +265,8 @@ export default {
             datetime: this.task.datetime,
             quotePrice: this.task.quotePrice,
             fixedPrice: this.task.fixedPrice,
-            requirementFile: this.task.requireDocUrl
+            requirementFile: this.task.requireDocUrl,
+            participantCount: this.task.participantCount
           }
           Http.post(Apis.TASK.CREATE_TASK.replace('{projectId}', this.projectId), newTask).then((res) => {
             console.log(res)
@@ -287,7 +292,8 @@ export default {
       this.task.resource = '广场'; //如果是广场不用管Location和institution ,定向看institution,区域看location
       (this.task.location = {provinceCode: '', cityCode: ''}),
         (this.task.institution = '')
-      this.task.datetime = ''
+      this.task.datetime = '',
+        this.task.participantCount = 1
     },
     locationChange (provinceId, cityId) {
       if (provinceId || cityId) {

src/main.js

@@ -58,6 +58,7 @@ import {
   TimeSelect,
   Tooltip,
   Upload,
+  Progress
 } from 'element-ui'
 function getCurrentUserSuccess(res){
 
@@ -180,6 +181,7 @@ Vue.use(DropdownMenu)
 Vue.use(Image)
 Vue.use(Badge)
 Vue.use(Popover)
+Vue.use(Progress)
 
 Vue.prototype.$msgbox = MessageBox
 Vue.prototype.$alert = MessageBox.alert

tool4deploy/conf.d/nginx.conf

@@ -1,6 +1,6 @@
 server {
         listen       80;
-        server_name  crowd.test.mooctest.net;
+        server_name  www.callfortest.com;
         root /usr/share/nginx/html;
         #charset koi8-r;
         client_max_body_size 100m;