Merge branch 'http_mock'

src/apiConfig/api.js

@@ -1,10 +1,10 @@
 /*eslint-disable*/   //规避eslint的检查，如没有eslint可不写
-// export const mockUrl = 'http://10.179.24.176:8980' // 线下
-export const mockUrl = 'http://10.179.24.123:8980' // 线上
+export const mockUrl = 'http://10.179.24.176:8980' // 线下
+// export const mockUrl = 'http://10.179.24.123:8980' // 线上
 
 // export const mockUrl = 'http://172.23.162.226:8980' // 舒宁本地
 
 export const qualityUrl = 'http://10.179.209.19:8898' // 质量度量
 
-// export const HMvehicleUrl = 'http://10.96.113.197:9999' // 电单车 线下
-export const HMvehicleUrl = 'http://10.179.91.236:9999' // 电单车 线上
+export const HMvehicleUrl = 'http://10.96.113.197:9999' // 电单车 线下
+// export const HMvehicleUrl = 'http://10.179.91.236:9999' // 电单车 线上

src/apiConfig/mock.js

@@ -1,4 +1,4 @@
 /*eslint-disable*/   //规避eslint的检查，如没有eslint可不写
-// export const mockUrl = 'http://10.179.88.110:8089' // stable
-export const mockUrl = 'http://mock.Intra.xiaojukeji.com' // 线上
+export const mockUrl = 'http://10.179.88.110:8089' // stable
+// export const mockUrl = 'http://mock.Intra.xiaojukeji.com' // 线上
 // export const mockUrl = 'http://10.179.101.226:8089' // test

src/apiConfig/virtualDevices.js

@@ -1,3 +1,3 @@
 /*eslint-disable*/ //规避eslint的检查，如没有eslint可不写
-export const mockUrl = 'http://10.179.91.236:9999/virtual-devices' // 线上
-// export const mockUrl = 'http://10.96.113.197:9999/virtual-devices' // 线下
+// export const mockUrl = 'http://10.179.91.236:9999/virtual-devices' // 线上
+export const mockUrl = 'http://10.96.113.197:9999/virtual-devices' // 线下

src/views/Platform/defectManagement.vue

@@ -462,7 +462,7 @@
   </div></template>
 
 <script>
-import { bugList, bugGet, bugDelete, bugUpdate, bugCreate, bugCopy, taskListCreate, bugGetEnum, projectListOnlyInfo } from '@/api/defectManage'
+import { bugList, bugDelete, bugUpdate, bugCreate, bugCopy, taskListCreate, bugGetEnum, projectListOnlyInfo } from '@/api/defectManage'
 import { projectGetTypeMap, groupDataGet, teamMembers } from '@/api/projectPage.js'
 import axios from 'axios'
 
@@ -491,9 +491,7 @@ export default {
       isDeleteStr: [{ name: '保留', value: 0 }, { name: '删除', value: 1 }],
       serviceDataRules: {
         bizId: [{ required: true, message: '业务线不能为空', trigger: 'change' }],
-        // bugName: [{ required: true, message: '主题不能为空', trigger: 'change' }],
         taskId: [{ required: true, message: '任务不能为空', trigger: 'change' }],
-        // projectId: [{ required: true, message: '项目ID不能为空', trigger: 'change' }],
         bugType: [{ required: true, message: 'bug类型不能为空', trigger: 'change' }],
         discoveryMethod: [{ required: true, message: '发现方式不能为空', trigger: 'change' }],
         reason: [{ required: true, message: '问题原因不能为空', trigger: 'change' }],
@@ -530,7 +528,6 @@ export default {
         reasonPause: [{ required: true, message: '问题原因不能为空', trigger: 'change' }],
         bugTypePause: [{ required: true, message: 'bug类型不能为空', trigger: 'change' }],
         pauseRepairResult: [{ required: true, message: '修复结果不能为空', trigger: 'change' }]
-        // pauseReasonsAndSolutionForTheProblem: [{ required: true, message: '修复方式不能为空', trigger: 'change' }]
       },
       dialogInDevelopment: false,
       dialogWaitTest: false,
@@ -562,7 +559,6 @@ export default {
       formLabelWidth1: '22%',
       serviceTypeEnumList: [],
       clientTypeEnumList: [],
-      bizIdEnumList: [],
       objData: '',
       userData: '',
       titName: '',
@@ -628,7 +624,6 @@ export default {
         this.repairResultStr = res.data.repairResultEnumList
         this.clientTypeEnumList = res.data.clientTypeEnumList
         this.serviceTypeEnumList = res.data.serviceTypeEnumList
-        this.bizIdEnumList = res.data.bizIdEnumList
       })
     },
     reopenAndWait(scope, status) {
@@ -651,8 +646,6 @@ export default {
       this.formUpdateValue = {}
     },
     clickChangeType(e) {
-      // console.log(this.form.businessType)
-      // this.form.businessType = ''
       if (e === '服务端') {
         this.businessTypeStr = this.serviceTypeEnumList
       } else {
@@ -993,15 +986,7 @@ export default {
       })
     },
     toReportView(e) {
-      // this.dialogFormQuery = true
-      // this.buildShow(e)
-      bugGet(e).then(res => {
-        this.form = res.data
-        for (var a of this.bizIdEnumList) {
-          res.data.bizId === a.code ? this.form.bizId = a.name : ''
-        }
-        this.$router.push({ name: '查看Bug', query: { id: this.form.id }})
-      })
+      this.$router.push({ name: '查看Bug', query: { id: e }})
     },
 
     handleChange(file, fileList) {

src/views/Platform/presentation/acceptTheReport.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 提测预览 -->
-  <div class="eleStyle">
+  <div class="eleStyle_one">
     <div style="height:100%;width:94%; background:#ffffff; margin: 3%; border-radius: 8px; overflow: hidden;">
       <div style="padding:2% 9%;">
         <div style="display: flex; white-space: nowrap; font-family:SimSuncss">
@@ -61,7 +61,7 @@
 
             <div style="display: flex;">
               <div style="flex:1"><el-form-item label="新增Apollo : "><span :style="configInfo1">{{ config }}</span></el-form-item><br></div>
-              <div style="flex:1;"><el-form-item v-show="showDelay1" label="Apollo名称">{{ fromCreateData.configInfo }}</el-form-item><br></div>
+              <div style="flex:1;"><el-form-item v-show="showDelay1" label="Apollo名称 : ">{{ fromCreateData.configInfo }}</el-form-item><br></div>
             </div>
 
             <div style="display: flex;">
@@ -69,7 +69,7 @@
               <div style="flex:1;"><el-form-item v-show="showDelay2" label="组件名称 : ">{{ fromCreateData.dependentComponents }}</el-form-item></div>
             </div>
 
-            <div style="display: flex; margin:1% 0;">
+            <div style="display: flex;">
               <div style="flex:1"><el-form-item label="是否延期 : "><span :style="lateStatus1">{{ lateStatus }}</span></el-form-item></div>
               <div style="flex:1;"><el-form-item v-show="showDelay" label="延期原因 : ">{{ fromCreateData.lateReason }}</el-form-item></div>
             </div>
@@ -99,7 +99,7 @@
         <el-button type="primary" size="mini" @click="dialogFormVisible = true">确定发送</el-button>
         <el-button size="mini" @click="download()">确定下载</el-button>
       </div>
-      <div id="resumeId" class="eleStyle">
+      <div id="resumeId" class="eleStyle_one">
         <div style="height:100%;width:94%; background:#ffffff; margin: 3%; border-radius: 8px; overflow: hidden;">
           <div style="padding:2% 9%;">
             <div style="display: flex; white-space: nowrap; font-family:SimSuncss">
@@ -325,7 +325,7 @@ export default {
   .marage {
     margin: 0.5% 0;
   }
-  .eleStyle {
+  .eleStyle_one {
     width: 100%;
     height:100%;
     background:#F2F3F6;
@@ -333,6 +333,9 @@ export default {
     font-size: 14px;
     color: #606266;
   }
+   .eleStyle_one .el-form-item {
+      margin-bottom: -15px;
+    }
   .titleStyle {
     color: #333B4A;
     margin: 1% 0;
@@ -347,6 +350,7 @@ export default {
 <style lang="stylus" scoped>
  .noWrap >>> .el-form-item
   display flex
- .noWrap >>> .el-form-item__label
+ .eleStyle_one  >>> .el-form-item__label
   text-align left
+  font-weight 400 !important
 </style>