Merge branch 'hot-fix' into 'Test'

修改类型问题

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

src/components/Mine.vue

@@ -61,7 +61,7 @@
                   justify="center" style="font-size: 14px;">
             <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>
@@ -78,7 +78,7 @@
                   justify="center" style="font-size: 14px;">
             <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>
@@ -102,7 +102,7 @@
                   style="font-size: 14px;">
             <el-col :span="6" type="flex" align="middle" justify="center">项目图片</el-col>
             <el-col :span="6" type="flex" align="middle" justify="center">项目名称</el-col>
-            <el-col :span="6" type="flex" align="middle" justify="center">项目平台</el-col>
+            <el-col :span="6" type="flex" align="middle" justify="center">应用类型</el-col>
             <el-col :span="2" type="flex" align="middle" justify="center">项目预算</el-col>
             <el-col :span="4" type="flex" align="middle" justify="center">操作</el-col>
           </el-row>
@@ -120,7 +120,7 @@
                   justify="center" style="font-size: 14px;">
             <el-col :span="6">项目图片</el-col>
             <el-col :span="6">项目名称</el-col>
-            <el-col :span="6">项目平台</el-col>
+            <el-col :span="6">应用类型</el-col>
             <el-col :span="2">项目预算</el-col>
             <el-col :span="4">操作</el-col>
           </el-row>
@@ -139,7 +139,7 @@
                   justify="center" style="font-size: 14px;">
             <el-col :span="6">项目图片</el-col>
             <el-col :span="6">项目名称</el-col>
-            <el-col :span="6">项目平台</el-col>
+            <el-col :span="6">应用类型</el-col>
             <el-col :span="2">项目预算</el-col>
             <el-col :span="4">操作</el-col>
           </el-row>

src/components/Square.vue

@@ -6,7 +6,7 @@
       <el-row v-if="list != null && list.length != 0" type="flex" align="middle" justify="center"  style="font-size: 14px;">
         <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>

src/components/authen/AgencyAuthentication.vue

@@ -163,7 +163,7 @@ export default {
           {
             type: 'array',
             required: true,
-            message: '请至少选择一种服务类型',
+            message: '请至少选择一种测试类型',
             trigger: 'change'
           }
         ],
@@ -355,7 +355,7 @@ export default {
         }
       })
     },
-    //设置服务类型
+    //设置测试类型
     setServiceTypes () {
       getAllServiceTypes().then((res) => {
         this.serviceTypes = res

src/components/authen/AgencyAuthenticationCreate.vue

@@ -145,7 +145,7 @@ export default {
           {
             type: 'array',
             required: true,
-            message: '请至少选择一种服务类型',
+            message: '请至少选择一种测试类型',
             trigger: 'change'
           }
         ],
@@ -325,7 +325,7 @@ export default {
         }
       })
     },
-    //设置服务类型
+    //设置测试类型
     setServiceTypes () {
       getAllServiceTypes().then((res) => {
         this.serviceTypes = res

src/components/cheat/AgencyAdd.vue

@@ -400,7 +400,7 @@ export default {
         username: '',
       }
     },
-    //设置服务类型
+    //设置测试类型
     setServiceTypes () {
       this.serviceTypes = getAllAbilities()
     },

src/components/cheat/AgencyDetail.vue

@@ -221,7 +221,7 @@ export default {
         // params: {projectId: projectId, taskId: taskId}
       })
     },
-    //设置服务类型
+    //设置测试类型
     setServiceTypes () {
       this.serviceTypes = getAllAbilities()
     },

src/components/cheat/ProjectAdd.vue

@@ -37,7 +37,7 @@
 <!--              &lt;!&ndash;v-for="item in project.platform"&ndash;&gt;-->
 <!--              &lt;!&ndash;&gt;{{platformType[item]}}</span>&ndash;&gt;-->
 <!--            </el-form-item>-->
-<!--            <el-form-item label="服务类型" prop="type">-->
+<!--            <el-form-item label="测试类型" prop="type">-->
 <!--              <el-checkbox-group v-if="isModifyMode" v-model="project.type">-->
 <!--            <span v-for="(item,index) in serviceType" :key="index">-->
 <!--              <el-checkbox :label="item.code" name="type">{{item.name}}&nbsp;&nbsp;&nbsp;&nbsp;</el-checkbox>-->

src/components/commons/ProvinceCity.vue

@@ -21,7 +21,7 @@
       style="width: calc(50% - 20px);margin-right: 0px"
     >
       <el-select v-model="city" :loading="loadingCity" @change="cityChanged" placeholder="请选择">
-<!--        <el-option :key="''" :label="'全部'" :value="''"></el-option>-->
+        <el-option :key="''" :label="'请选择'" :value="''"></el-option>
         <el-option v-for="item in cities" :key="item.code" :label="item.name" :value="item.code"></el-option>
       </el-select>
     </el-form-item>

src/components/commons/TaskItem.vue

@@ -8,12 +8,13 @@
       </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="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}}
+          {{taskTable.serviceType}}
         </div>
       </el-col>
+      <el-col :span="4" type="flex" align="middle" justify="center">¥{{taskTable.quotePrice==null?0:taskTable.quotePrice}}</el-col>
+
       <el-col :span="4" type="flex" align="middle" justify="center">
         {{taskTable.acceptedCount}} / {{  taskTable.participantCount}}
       </el-col>

src/components/project/Project.vue

@@ -87,7 +87,7 @@
               >
               {{project.platform}}</span>
             </el-form-item>
-            <el-form-item label="服务类型" prop="type">
+            <el-form-item label="测试类型" prop="type">
               <el-checkbox-group v-if="isModifyMode" v-model="project.type">
             <span v-for="(item,index) in serviceType" :key="index">
               <el-checkbox :label="item.code" name="type">{{ item.name }}&nbsp;&nbsp;</el-checkbox>
@@ -293,7 +293,7 @@
     </div>
 
     <div class="create-body" v-if="!isModifyMode">
-      <div class="title h2">用户报告列表</div>
+      <div class="title h2">项目报告</div>
       <report-list v-bind:reports="reportList" v-bind:taskId=null v-bind:projectId="projectId"/>
     </div>
   </div>
@@ -445,7 +445,7 @@ export default {
           {
             type: 'array',
             required: true,
-            message: '请至少选择一种服务类型',
+            message: '请至少选择一种测试类型',
             trigger: 'change'
           }
         ],

src/components/project/ProjectCreate.vue

@@ -46,7 +46,7 @@
           </el-radio-group>
         </el-form-item>
 
-        <el-form-item label="服务类型" prop="type">
+        <el-form-item label="测试类型" prop="type">
           <el-checkbox-group v-model="project.type">
             <span v-for="(item,index) in serviceType" :key="index">
               <el-checkbox :label="item.code" name="type">{{item.name}}&nbsp;&nbsp;&nbsp;&nbsp;</el-checkbox>
@@ -258,7 +258,7 @@ export default {
         type: [
           {
             required: true,
-            message: '请至少选择一种服务类型',
+            message: '请至少选择一种测试类型',
             trigger: 'change'
           }
         ],

src/components/task/Task.vue

@@ -434,12 +434,12 @@
         this.user = storageGet('user')
         this.rolesPermissions = storageGet('rolesPermissions')
       },
-      //加载任务的服务类型
+      //加载任务的测试类型
       setServiceType() {
         getAllServiceTypes().then((res) => {
           this.serviceType = res
         }).catch((error) => {
-          notify('error', '加载任务类型失败')
+          notify('error', '加载测试类型失败')
         })
       },
       //加载所有的测评机构

src/js/generalService.js

@@ -52,7 +52,7 @@ export const getAllPlatformTypes = () => {
   return Http.get(Apis.GENERAL.GET_ALL_ApplicationType)
 }
 
-//获取所有服务类型
+//获取所有测试类型
 export const getAllServiceTypes = () => {
   // const data = ['接口测试', '兼容性测试', '可靠性测试', '稳定性测试', '功能测试', '性能测试', '安全测试','易用性测试', '应用故障诊断', '应用漏洞扫描', '代码安全审计', '风险评估', '等保测评', '评估评价', '定制测试']
   // return new Promise((resolve) => {

src/js/index.js

@@ -207,7 +207,7 @@ export {
   getAllFields,
   //TODO 目前使用本地数据 需要修改 获取所有报告类型
   getAllReportTypes,
-  //TODO 目前使用本地数据 需要修改 获取所有服务类型(与获取所有测评能力相同)
+  //TODO 目前使用本地数据 需要修改 获取所有测试类型(与获取所有测评能力相同)
   getAllServiceTypes,
   //获取绿色通道创建项目时的模板文件
   getGreenChannelAddProjectExcelTemplateFile,
@@ -537,7 +537,7 @@ export const defaultValue = {
 //   //return Http.get(Apis.GENERAL.GET_ALL_ABILITIES)
 // }
 //
-// //获取所有服务类型
+// //获取所有测试类型
 // export const getAllServiceTypes = () => {
 //   const data = ['接口测试', '兼容性测试', '可靠性测试', '稳定性测试', '功能测试', '性能测试', '安全测试','易用性测试', '应用故障诊断', '应用漏洞扫描', '代码安全审计', '风险评估', '等保测评', '评估评价', '定制测试']
 //   return new Promise((resolve) => {

src/mock/getSquarePageMock.js

@@ -16,7 +16,7 @@ var data = Mock.mock({
       'description': '任务描述文字xxxx',
       //任务标价
       'price': '30',
-      //任务服务类型
+      //任务测试类型
       // 0: "接口测试",
       // 1: "安全漏洞扫描",
       // 2: "风险评估服务",

src/mock/getTaskDetailMock.js

@@ -22,7 +22,7 @@ var data = Mock.mock({
     'location': {'provinceCode': '3200', 'cityCode': '3201'},
     //当任务发布类型为1或2时，institution字段无效；发布类型为0时，institution字段表示接收任务的区域
     'institution': '',
-    //任务服务类型
+    //任务测试类型
     // 0: "接口测试",
     // 1: "安全漏洞扫描",
     // 2: "风险评估服务",