Merge branch 'http_mock' into http_test

src/apiConfig/api.js

@@ -2,16 +2,16 @@ import { requestIp } from './requestIP'
 
 /*eslint-disable*/   //规避eslint的检查，如没有eslint可不写
 
-export const mockUrl = 'http://10.179.53.173:8980' // 线上
+export const mockUrl = 'http://10.190.5.222:8980' // 测试用例 测试计划
 
-export const qualityUrl = 'http://10.190.6.249:8898' // 质量度量
+// export const qualityUrl = 'http://10.190.6.249:8898' // 质量度量 （废弃，下次发版删除）
 
 //虚拟硬件线下环境
 export const vehicleUrl_stable = 'http://10.190.3.48:9999' // 虚拟硬件 zhihui
   //虚拟硬件预发环境
-export const vehicleUrl_preonline = 'http://10.179.53.173:9999' // 虚拟硬件 zhihui
+export const vehicleUrl_preonline = 'http://10.190.5.222:9999' // 虚拟硬件 zhihui
   //虚拟硬件线上环境
-export const vehicleUrl_online = 'http://10.179.91.236:9999' // 虚拟硬件 zhihui
+export const vehicleUrl_online = 'http://10.190.9.230:9999' // 虚拟硬件 zhihui
 
 // -----------------------------------------2.0-----------------------------------------------
 
@@ -30,3 +30,5 @@ export const envWebUrl = requestIp + '/env-web' //环境web
 export const workbenchUrl = projectManagementUrl //工作台
 
 export const httpMock = requestIp + '/mock' // mock
+
+export const qualityUrl = requestIp + '/quality-metric' // 质量度量

src/router/index.js

@@ -173,7 +173,6 @@ export const constantRoutes = [{
   }
   ]
 },
-
 {
   path: '/onlineProblem',
   name: '线上问题',

src/views/projectManage/bugList/details/bugTableDialog.vue

@@ -218,7 +218,6 @@ export default {
       handler(newV, oldV) {
         if (newV !== null) {
           this.eleId = newV
-          this.bugGetTableList(newV, false)
         }
       },
       deep: true,
@@ -239,6 +238,11 @@ export default {
       immediate: true
     }
   },
+  mounted() {
+    this.$nextTick(() => {
+      this.bugGetTableList(this.eleId, false)
+    })
+  },
   methods: {
     async getBugSelect() { //  获取下拉菜单option
       const res = await bugGetEnum()

src/views/projectManage/components/demand.vue

@@ -38,7 +38,7 @@
               <div v-else ref="Simulation" style="visibility: hidden;">{{ '你好' }}</div>
             </div>
 
-            <div class="templatTaskName cursorPo" @click="clickTemplatTaskName(scope.row.id)">{{ scope.row.name }}</div>
+            <div class="templatTaskName cursorPo" @click="clickTemplatTaskName(scope.row)">{{ scope.row.name }}</div>
 
             <div class="templatCreator">
               <el-tooltip class="item" effect="dark" content="点击修改" placement="top">
@@ -467,7 +467,7 @@ export default {
       this.$refs.taskSchedule.addSchedule()
     },
     clickTemplatTaskName(id) { // 任务名称店家跳转
-      const bizId_id = EncryptId(`${this.bizId}_${id}`)
+      const bizId_id = EncryptId(`${id.bizId}_${id.id}`)
       const { href } = this.$router.resolve({ name: '任务详情', query: { bizId_id: bizId_id }})
       window.open(href, '_blank')
     },

src/views/projectManage/projectList/components/scheduleList.vue

@@ -73,7 +73,7 @@
     </el-table>
     <div class="bottom-detail">
       <el-row>交付日期：{{ scheduleDetail.endTime }}</el-row>
-      <el-row>排期：{{ scheduleDetail.startTime | handlerDate }} ~ {{ scheduleDetail.endTime | handlerDate }} <span style="color: #999999; font-size: 14px;">{{ '(' + scheduleDetail.scheduleTimeAnnotation.所有 + ')' }}</span></el-row>
+      <el-row>排期：{{ scheduleDetail.startTime | handlerDate }} ~ {{ scheduleDetail.endTime | handlerDate }} <span style="color: #999999; font-size: 14px;">{{ '(' + scheduleDetail.scheduleTimeAnnotation ? '' : scheduleDetail.scheduleTimeAnnotation.所有 + ')' }}</span></el-row>
       <el-row v-if="scheduleDetail.preOnlineVersion && scheduleDetail.preOnlineVersion.length>0">
         <el-col :span="2">预计上线版本：</el-col>
         <el-col :span="6">

src/views/projectManage/requirement/components/scheduleList.vue

@@ -43,7 +43,7 @@
     </el-table>
     <div class="bottom-detail">
       <el-row>交付日期：{{ scheduleDetail.endTime }}</el-row>
-      <el-row>排期：{{ scheduleDetail.startTime | handlerDate }} ~ {{ scheduleDetail.endTime | handlerDate }} <span style="color: #999999; font-size: 14px;">{{ '(' + scheduleDetail.scheduleTimeAnnotation.所有 + ')' }}</span></el-row>
+      <el-row>排期：{{ scheduleDetail.startTime | handlerDate }} ~ {{ scheduleDetail.endTime | handlerDate }} <span style="color: #999999; font-size: 14px;">{{ '(' + scheduleDetail.scheduleTimeAnnotation ? '' : scheduleDetail.scheduleTimeAnnotation.所有 + ')' }}</span></el-row>
       <el-row v-if="scheduleDetail.preOnlineVersion && scheduleDetail.preOnlineVersion.length>0">
         <el-col :span="2" style="width: 100px">预计上线版本：</el-col>
         <el-col :span="6">

src/views/projectManage/taskList/components/scheduleList.vue

@@ -104,7 +104,7 @@
     </el-table>
     <div class="bottom-detail">
       <el-row>交付日期：{{ scheduleDetail.endTime }}</el-row>
-      <el-row>排期：{{ scheduleDetail.startTime | handlerDate }} ~ {{ scheduleDetail.endTime | handlerDate }} <span style="color: #999999; font-size: 14px;">{{ '(' + scheduleDetail.scheduleTimeAnnotation.所有 + ')' }}</span></el-row>
+      <el-row>排期：{{ scheduleDetail.startTime | handlerDate }} ~ {{ scheduleDetail.endTime | handlerDate }} <span style="color: #999999; font-size: 14px;">{{ '(' + scheduleDetail.scheduleTimeAnnotation ? '' : scheduleDetail.scheduleTimeAnnotation.所有 + ')' }}</span></el-row>
       <el-row>预计上线版本：
         <span v-if="scheduleDetail.preOnlineVersion && scheduleDetail.preOnlineVersion.length > 0">
           <span v-for="item in scheduleDetail.preOnlineVersion" :key="item">{{ item }}</span>

src/views/projectManage/version/components/scheduleList.vue

@@ -76,7 +76,7 @@
     </el-table>
     <div class="bottom-detail">
       <el-row>交付日期：{{ scheduleDetail.endTime }}</el-row>
-      <el-row>排期：{{ scheduleDetail.startTime | handlerDate }} ~ {{ scheduleDetail.endTime | handlerDate }} <span style="color: #999999; font-size: 14px;">{{ '(' + scheduleDetail.scheduleTimeAnnotation.所有 + ')' }}</span></el-row>
+      <el-row>排期：{{ scheduleDetail.startTime | handlerDate }} ~ {{ scheduleDetail.endTime | handlerDate }} <span style="color: #999999; font-size: 14px;">{{ '(' + scheduleDetail.scheduleTimeAnnotation ? '' : scheduleDetail.scheduleTimeAnnotation.所有 + ')' }}</span></el-row>
       <el-row v-if="scheduleDetail.preOnlineVersion && scheduleDetail.preOnlineVersion.length>0">
         <el-col :span="2">预计上线版本：</el-col>
         <el-col :span="6">