Merge branch 'Test' into 'master'

Test

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

src/components/project/Project.vue

@@ -49,17 +49,19 @@
             <!--</el-input>-->
             <!--<span v-if="!isModifyMode">{{project.price}}¥</span>-->
             <!--</el-form-item>-->
-            <el-form-item label="平台" prop="platform">
-              <el-checkbox-group v-if="isModifyMode" v-model="project.platform">
-            <span v-for="(item,index) in platforms" :key="index">
-              <el-checkbox :label="item">{{ item }}&nbsp;&nbsp;&nbsp;&nbsp;</el-checkbox>
+
+            <el-form-item label="应用类型" prop="platform">
+              <el-radio-group v-if="isModifyMode" v-model="project.platform">
+                <span v-for="(item,index) in platforms" :key="index">
+              <el-radio :label="item" style="margin: 3px">{{ item }}&nbsp;&nbsp;&nbsp;&nbsp;</el-radio>
             </span>
-              </el-checkbox-group>
+              </el-radio-group>
               <span
                 v-if="!isModifyMode"
                 class="badge"
-                v-for="item in project.platform"
-              >{{item}}</span>
+              >
+<!--                v-for="item in project.platform"-->
+              {{project.platform}}</span>
             </el-form-item>
             <el-form-item label="服务类型" prop="type">
               <el-checkbox-group v-if="isModifyMode" v-model="project.type">
@@ -169,7 +171,7 @@
                   :picker-options="pickerOptions"
                 ></el-date-picker>
               </div>
-              <span v-if="!isModifyMode">{{reformDate(new Date(project.datetime))}}</span>
+              <span v-if="!isModifyMode">{{dateFormat(new Date(project.datetime),'yyyy-MM-dd HH:mm:ss')}}</span>
             </el-form-item>
             <el-form-item v-if="isModifyMode">
               <div class="btn btn-small btn-info" @click="submitForm('project')">确认修改</div>
@@ -415,7 +417,6 @@ export default {
         ],
         platform: [
           {
-            type: 'array',
             required: true,
             message: '请至少选择一个平台',
             trigger: 'change'
@@ -569,7 +570,7 @@ export default {
             userId: this.user.userVO.id,
             name: this.project.name,
             type: this.project.type,
-            platform: this.project.platform,
+            platform: this.project.platform.split('&#'),
             desc: this.project.desc,
             resource: this.project.resource,
             location: getProvinceNameByProvinceCode(this.project.location.provinceCode, this.project.location.cityCode),
@@ -583,6 +584,7 @@ export default {
             datetime: this.project.datetime,
             usage: this.project.usage,
           }
+          console.log(newProject);
           Http.put(Apis.PROJECT.UPDATE_PROJECT.replace('{projectId}', this.projectId), newProject).then((res) => {
             console.log(res)
             this.projectId = res.projectDetails.id
@@ -590,7 +592,7 @@ export default {
             this.project.contactName = res.projectDetails.contactName
             this.project.contactPhone = res.projectDetails.contactPhone
             this.project.type = res.projectDetails.type
-            this.project.platform = res.projectDetails.platform
+            this.project.platform = res.projectDetails.platform[0]
             this.project.desc = res.projectDetails.desc
             this.project.doc = []
             this.project.file = []
@@ -819,7 +821,7 @@ export default {
         this.project.contactName = res.projectDetails.contactName
         this.project.contactPhone = res.projectDetails.contactPhone
         this.project.type = res.projectDetails.type
-        this.project.platform = res.projectDetails.platform
+        this.project.platform = res.projectDetails.platform[0]
         this.project.desc = res.projectDetails.desc
         this.project.doc = []
         this.project.file = []
@@ -949,6 +951,27 @@ export default {
     },
     reformDate (date) {
       return getFormalTimeFromDate(date)
+    },
+    dateFormat (date, format) {
+      date = new Date(date)
+      let o = {
+        'M+' : date.getMonth() + 1, //month
+        'd+' : date.getDate(), //day
+        'H+' : date.getHours(), //hour+8小时
+        'm+' : date.getMinutes(), //minute
+        's+' : date.getSeconds(), //second
+        'q+' : Math.floor((date.getMonth() + 3) / 3), //quarter
+        'S' : date.getMilliseconds() //millisecond
+      }
+      if (/(y+)/.test(format)){
+        format = format.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length));
+      }
+
+      for (let k in o)
+        if (new RegExp('(' + k + ')').test(format))
+          format = format.replace(RegExp.$1, RegExp.$1.length == 1 ? o[k] : ('00' + o[k]).substr(('' + o[k]).length));
+
+      return format;
     }
   }
 }

src/components/project/ProjectCreate.vue

@@ -26,13 +26,15 @@
         <!--<template slot="append">¥</template>-->
         <!--</el-input>-->
         <!--</el-form-item>-->
-        <el-form-item label="平台" prop="platform">
-          <el-checkbox-group v-model="project.platform">
+
+        <el-form-item label="应用类型" prop="platform">
+          <el-radio-group v-model="project.platform">
             <span v-for="(item,index) in platforms" :key="index">
-              <el-checkbox :label="item">{{ item }}&nbsp;&nbsp;&nbsp;&nbsp;</el-checkbox>
+              <el-radio :label="item">{{ item }}&nbsp;&nbsp;&nbsp;&nbsp;</el-radio>
             </span>
-          </el-checkbox-group>
+          </el-radio-group>
         </el-form-item>
+
         <el-form-item label="服务类型" prop="type">
           <el-checkbox-group v-model="project.type">
             <span v-for="(item,index) in serviceType" :key="index">
@@ -239,7 +241,6 @@ export default {
         ],
         type: [
           {
-            type: 'array',
             required: true,
             message: '请至少选择一种服务类型',
             trigger: 'change'
@@ -247,9 +248,8 @@ export default {
         ],
         platform: [
           {
-            type: 'array',
             required: true,
-            message: '请至少选择一个平台',
+            message: '请至少选择一个应用类型',
             trigger: 'change'
           }
         ],
@@ -356,7 +356,7 @@ export default {
             userId: this.user.userVO.id,
             name: this.project.name,
             type: this.project.type,
-            platform: this.project.platform,
+            platform: this.project.platform.split('&#'),
             desc: this.project.desc,
             resource: this.project.resource,
             location: newLocation,
@@ -370,6 +370,7 @@ export default {
             usage: this.project.usage,
             price: this.project.price
           }
+          console.log(newProject)
           Http.post(Apis.PROJECT.CREATE_PROJECT, newProject).then((res) => {
             //notify('success', '创建成功')
             this.hideLoading()

src/components/task/Task.vue

@@ -6,12 +6,12 @@
       <el-form :model="task" :rules="rules" ref="task" label-width="12%" class="demo-task">
         <el-form-item label="任务名称" prop="title">
           <el-input size="small" v-if="isModifyMode" v-model="task.title"></el-input>
-          <span v-if="!isModifyMode">{{task.title}}</span>
+              <span v-if="!isModifyMode">{{task.title}}</span>
           <el-tag v-if="!isModifyMode" :type="task.statusVO&&task.statusVO.style">{{task.statusVO ? task.statusVO.text:''}}</el-tag>
         </el-form-item>
         <el-form-item label="任务描述" prop="desc">
           <el-input autosize v-if="isModifyMode" type="textarea" v-model="task.description"></el-input>
-          <span v-if="!isModifyMode">{{task.description}}</span>
+            <span v-if="!isModifyMode">{{task.description}}</span>
         </el-form-item>
         <el-form-item label="任务报价" prop="quotePrice">
           <el-input size="small" type="number" v-if="isModifyMode" v-model="task.quotePrice">
@@ -116,7 +116,7 @@
               :picker-options="pickerOptions"
             ></el-date-picker>
           </div>
-          <span v-if="!isModifyMode">{{reformDate(new Date(task.datetime))}}</span>
+          <span v-if="!isModifyMode">{{dateFormat(new Date(task.datetime),'yyyy-MM-dd HH:mm:ss')}}</span>
         </el-form-item>
         <el-form-item v-if="isModifyMode">
           <div class="btn btn-small btn-info" @click="updateTask()">确认修改</div>
@@ -278,7 +278,9 @@
           fixedPrice: '',
           doc: [],
           requireDocUrl: '',
-          participantCount:1
+          participantCount:1,
+          title:'',
+          description:''
         },
         reportList: [],
         pickerOptions: {
@@ -494,6 +496,28 @@
         })
       },
 
+      dateFormat (date, format) {
+        date = new Date(date)
+        let o = {
+          'M+' : date.getMonth() + 1, //month
+          'd+' : date.getDate(), //day
+          'H+' : date.getHours(), //hour+8小时
+          'm+' : date.getMinutes(), //minute
+          's+' : date.getSeconds(), //second
+          'q+' : Math.floor((date.getMonth() + 3) / 3), //quarter
+          'S' : date.getMilliseconds() //millisecond
+        }
+        if (/(y+)/.test(format)){
+          format = format.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length));
+        }
+
+        for (let k in o)
+          if (new RegExp('(' + k + ')').test(format))
+            format = format.replace(RegExp.$1, RegExp.$1.length == 1 ? o[k] : ('00' + o[k]).substr(('' + o[k]).length));
+
+        return format;
+      },
+
       //更新任务信息
       updateTask() {
         this.$refs['task'].validate(valid => {

src/js/generalService.js

@@ -51,7 +51,7 @@ export const getAllReportTypes = () => {
 
 //获取所有平台类型
 export const getAllPlatformTypes = () => {
-  return ['ANDROID', 'IOS', 'WEB']
+  return ['AndroidAPP', 'IOSAPP', 'Web应用', 'C/S应用软件', '嵌入式软件', '工业控制软件', '信息技术产品', '其他']
   //return Http.get(Apis.GENERAL.GET_ALL_ABILITIES)
 }
 //获取所有定向发布的目标