Merge branch 'feature-test' of E:\NanDaShiXi\crowd-test-service-front with conflicts.

src/components/project/Project.vue

@@ -569,7 +569,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 +583,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

src/components/project/ProjectCreate.vue

@@ -26,12 +26,13 @@
         <!--<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">
@@ -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

@@ -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>
@@ -494,6 +494,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 ['Android APP', 'IOS APP', 'Web应用', 'C/S应用软件', '嵌入式软件', '工业控制软件', '信息技术产品', '其他']
   //return Http.get(Apis.GENERAL.GET_ALL_ABILITIES)
 }
 //获取所有定向发布的目标