panxiandiao_i 5 gadi atpakaļ
vecāks
revīzija
12b91b5177

+ 27 - 20
src/views/onlineProblem/problemCreate.vue

@@ -11,7 +11,7 @@
               </el-select>
             </el-form-item>
             <el-form-item label="所处阶段" prop="stage" label-width="147px">
-              <el-select v-model="form.stage" placeholder="所处阶段" style="width:76%;">
+              <el-select v-model="form.stage" disabled placeholder="所处阶段" style="width:76%;">
                 <el-option v-for="item in stageStr" :key="item.name" :label="item.name" :value="item.code" />
               </el-select>
             </el-form-item>
@@ -41,24 +41,19 @@
             </el-form-item>
           </div>
           <div class="line-between">
-            <el-form-item prop="taskId" label="任务" label-width="124px">
-              <el-select v-model="form.taskId" filterable placeholder="任务" style="width:76%;">
-                <el-option v-for="item in taskIdStr" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
-            </el-form-item>
-            <el-form-item prop="bizId" label="业务线" label-width="147px">
+            <el-form-item prop="bizId" label="业务线" label-width="124px">
               <el-select v-model="form.bizId" placeholder="业务线" style="width:76%;" @change="clickChangePlatform(form.bizId)">
                 <el-option v-for="item in bizOptions" :key="item.value" :label="item.name" :value="item.code" />
               </el-select>
             </el-form-item>
-          </div>
-          <div class="line-between-add">
-            <el-form-item label="平台类型" prop="platformType" label-width="124px">
+            <el-form-item label="平台类型" prop="platformType" label-width="147px">
               <el-select ref="clearPlatform" v-model="form.platformType" placeholder="平台类型" style="width:76%;" @change="clickChangeBusiness(form.platformType)">
                 <el-option v-for="item in platformTypeStr" :key="item.name" :label="item.name" :value="item.code" />
               </el-select>
             </el-form-item>
-            <el-form-item v-if="businessTypeShow" prop="clientType" label="业务模块" label-width="147px">
+          </div>
+          <div class="line-between-add">
+            <el-form-item v-if="businessTypeShow" prop="clientType" label="业务模块" label-width="127px">
               <el-select ref="clearBusiness" v-model="form.clientType" placeholder="业务模块" style="width:76%;" @change="clickChangeModule(form.clientType)">
                 <el-option v-for="item in businessTypeStr" :key="item.name" :label="item.name" :value="item.code" />
               </el-select>
@@ -71,14 +66,14 @@
               </el-select>
             </el-form-item>
           </div>
-          <el-form-item label="bug描述" prop="bugDescribe" label-width="110px"><el-input v-model="form.bugDescribe" type="textarea" placeholder="bug描述" rows="2" style="width:90%;" /></el-form-item>
+          <el-form-item label="故障描述" prop="bugDescribe" label-width="110px"><el-input v-model="form.bugDescribe" type="textarea" placeholder="故障详细信息以及复盘wiki地址" rows="2" style="width:90%;" /></el-form-item>
         </div>
       </div>
       <div class="block">
         <div class="block-flex">
           <div class="line-between">
             <el-form-item label="创建人" label-width="124px"><el-input v-model="form.creator" autocomplete="off" style="width:76%;" /></el-form-item>
-            <el-form-item label="bug责任人" prop="assigner" label-width="147px">
+            <el-form-item label="故障责任人" prop="assigner" label-width="147px">
               <el-select v-model="form.assigner" multiple filterable placeholder="公司邮箱前缀" style="width:76%;">
                 <el-option
                   v-for="item in optionsAssigner"
@@ -100,7 +95,7 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item label="开始开发时间" label-width="147px">    <el-date-picker
+            <el-form-item label="故障开始时间" label-width="147px">    <el-date-picker
               v-model="form.startDevTime"
               type="datetime"
               placeholder="选择时间"
@@ -108,10 +103,9 @@
               value-format="yyyy-MM-dd HH:hh:mm"
             /></el-form-item>
           </div>
-          <div class="line-between">
-            <el-form-item label="reopen次数" prop="reopenTimes" label-width="124px"><el-input v-model="form.reopenTimes" autocomplete="off" style="width:76%;" /></el-form-item>
-            <el-form-item label="提交测试时间" label-width="147px">    <el-date-picker
-              v-model="form.waitTestTime"
+          <div class="line-between-add">
+            <el-form-item label="故障结束时间" label-width="124px">    <el-date-picker
+              v-model="form.finishTime"
               type="datetime"
               placeholder="选择时间"
               style="width:76%;"
@@ -211,7 +205,8 @@ export default {
         taskId: '',
         platformType: '',
         clientType: '',
-        creator: ''
+        creator: '',
+        stage: 6
       },
       businessTypeStr: [],
       optionsAssigner: [],
@@ -288,7 +283,8 @@ export default {
     },
     async bugListSelect() {
       await bugGetEnum().then(res => {
-        this.bugStatusStr = res.data.bugEnumList
+        this.bugStatusStr = this.problemStatus(res.data.bugEnumList)
+        console.log(this.bugStatusStr)
         this.stageStr = res.data.bugStageEnumList
         this.reasonStr = res.data.reasonEnumList
         this.bugTypeStr = res.data.bugTypeEnumList
@@ -323,6 +319,17 @@ export default {
       }
       this.getMember() // 保证bizId存在
     },
+    problemStatus(arr) {
+      return arr.filter(each => {
+        if (each.code === 0) {
+          each.name = '待修复'
+          return true
+        } else if (each.code === 3) {
+          each.name = '已修复'
+          return true
+        }
+      })
+    },
     forkDown() {
       projectGetTypeMap().then(res => {
         if (res.code === 200) {

+ 1 - 1
src/views/onlineProblem/problemList.vue

@@ -47,7 +47,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <e8l-pagination style="margin-top:30px;" align="center" :current-page="curIndex" :page-sizes="[5, 10, 20]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
+    <el-pagination style="margin-top:30px;" align="center" :current-page="curIndex" :page-sizes="[5, 10, 20]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
   </div>
 </template>
 

+ 488 - 0
src/views/onlineProblem/problemQuery.vue

@@ -0,0 +1,488 @@
+<template>
+  <div class="set-background">
+    <el-form :model="form">
+      <div class="block">
+        <el-form-item label="标题 :" label-width="48px">{{ form.bugName }}</el-form-item>
+        <div style="display:flex;margin-bottom:10px">
+          <el-form-item label="级别 : " prop="priority" style="display:flex;" label-width="48px">
+            <el-select v-model="form.priority" placeholder="级别" style="width:80%;" @change="priorityChange">
+              <el-option v-for="item in bugLevelStr" :key="item.name" :label="item.name" :value="item.code" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="状态 : " prop="status" style="display:flex;" label-width="48px">
+            <el-select v-model="form.status" placeholder="状态" style="width:80%;" @change="statusChange">
+              <el-option v-for="item in bugStatusStr" :key="item.name" :label="item.name" :value="item.code" />
+            </el-select>
+          </el-form-item>
+          <el-button type="primary" style="height:40px" @click="enterUpdate">编 辑</el-button>
+        </div>
+        <div class="display-messege">
+          描述 :&nbsp;&nbsp;&nbsp;{{ form.bugDescribe }}
+        </div>
+        <div class="display-messege">
+          <div class="divide-threeparts">业务线 :&nbsp;&nbsp;&nbsp;{{ bizId }}</div>
+          <div class="divide-threeparts">平台类型 :&nbsp;&nbsp;&nbsp;{{ form.platformTypeName }}</div>
+          <div class="divide-threeparts">工程模块 :&nbsp;&nbsp;&nbsp;{{ form.bizModuleName }}</div>
+        </div>
+        <div class="display-messege">
+          <div class="divide-threeparts">类型 :&nbsp;&nbsp;&nbsp;{{ bugType }}</div>
+          <div class="divide-threeparts">业务模块 :&nbsp;&nbsp;&nbsp;{{ form.clientName }}</div>
+          <div class="divide-threeparts">所处阶段 :&nbsp;&nbsp;&nbsp;{{ form.stageName }}</div>
+        </div>
+        <div class="display-messege-end">
+          <div class="divide-threeparts">发现方式 :&nbsp;&nbsp;&nbsp;{{ form.discoveryMethodName }}</div>
+          <div class="divide-threeparts">问题原因 :&nbsp;&nbsp;&nbsp;{{ form.reasomName }}</div>
+        </div>
+      </div>
+      <div class="block">
+        <div class="display-messege">
+          <div class="divide-threeparts">创建人 :&nbsp;&nbsp;&nbsp;{{ form.creator }}</div>
+          <div class="divide-threeparts"><span>故障责任人 :</span>&nbsp;&nbsp;&nbsp;{{ form.assigner }}</div>
+          <div class="divide-threeparts"><span>当前处理人 :</span>&nbsp;&nbsp;&nbsp;{{ currentHandler }}</div>
+        </div>
+        <div class="display-messege-end">
+          <div class="divide-threeparts">故障开始时间 :&nbsp;&nbsp;&nbsp;{{ form.startDevTime }}</div>
+          <div class="divide-threeparts">创建时间 :&nbsp;&nbsp;&nbsp;{{ form.gmtCreate }}</div>
+          <div class="divide-threeparts">故障结束时间 :&nbsp;&nbsp;&nbsp;{{ form.finishTime }}</div>
+        </div>
+      </div>
+      <div class="block-end">
+        <div class="display-messege">
+          <div class="divide-threeparts">机型 :&nbsp;&nbsp;&nbsp;{{ form.model }}</div>
+          <div class="divide-threeparts">地图类型 :&nbsp;&nbsp;&nbsp;{{ form.mapType }}</div>
+          <div class="divide-threeparts">os类型 :&nbsp;&nbsp;&nbsp;{{ form.osType }}</div>
+        </div>
+        <div class="display-messege">
+          <div class="divide-threeparts">地图版本号 :&nbsp;&nbsp;&nbsp;{{ form.mapVersion }}</div>
+          <div class="divide-threeparts">网络类型 :&nbsp;&nbsp;&nbsp;{{ form.networkType }}</div>
+          <div class="divide-threeparts">SDK版本 :&nbsp;&nbsp;&nbsp;{{ form.sdkVersion }}</div>
+        </div>
+        <div class="display-messege">
+          <div class="divide-threeparts">app版本号 :&nbsp;&nbsp;&nbsp;{{ form.appVersion }}</div>
+          <div class="divide-threeparts">修复方式 :&nbsp;&nbsp;&nbsp;{{ repairResult }}</div>
+          <div class="divide-threeparts">修复结果 :&nbsp;&nbsp;&nbsp;{{ reasonsAndSolutionForTheProblem }}</div>
+        </div>
+        <div class="display-messege-end">
+          app版本号 :&nbsp;&nbsp;&nbsp;{{ form.remark }}
+        </div>
+      </div>
+      <div class="block-end cla">
+        <div class="display-messege">
+          附件 :
+          <el-table :data="uptataKey" fit style="width: 100%;">
+            <el-table-column label="" min-width="150">
+              <template slot-scope="scope">{{ scope.row.name }}</template>
+            </el-table-column>
+            <el-table-column label="" min-width="300">
+              <template slot-scope="scope">
+                <a :href="scope.row.url" style="color:blue;">{{ scope.row.url }}</a>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+      </div>
+    </el-form>
+    <el-dialog :visible.sync="dialogInDevelopment" width="40%" @close="cancelInput()">
+      <el-form ref="refeshDevelopmentDialog" :model="pauseData" :rules="serviceDataRules">
+        <el-form-item label="开发RD" prop="pauseCurrentHandler" label-width="30%">
+          <el-select v-model="pauseData.pauseCurrentHandler" multiple filterable placeholder="公司邮箱前缀" style="width:76%;">
+            <el-option
+              v-for="item in optionsCurrentHandlerRD"
+              :key="item.id"
+              :label="item.email"
+              :value="item.email"
+            />
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogInDevelopment = false">取 消</el-button>
+        <el-button type="primary" @click="queryFormData">确 定</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog :visible.sync="dialogWaitTest" width="40%" @close="cancelInput()">
+      <el-form ref="refeshWaitTestDialog" :model="pauseData" :rules="serviceDataRules">
+        <el-form-item label="验收QA" prop="pauseCurrentHandler" label-width="30%">
+          <el-select v-model="pauseData.pauseCurrentHandler" multiple filterable placeholder="公司邮箱前缀" style="width:76%;">
+            <el-option
+              v-for="item in optionsCurrentHandlerQA"
+              :key="item.id"
+              :label="item.email"
+              :value="item.email"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item style="flex-grow:1" label="问题原因" prop="reasonPause" label-width="30%">
+          <el-select v-model="pauseData.reasonPause" placeholder="问题原因" style="width:76%;">
+            <el-option v-for="item in reasonStr" :key="item.name" :label="item.name" :value="item.code" />
+          </el-select>
+        </el-form-item>
+        <el-form-item style="flex-grow:1" label="bug类型" prop="bugTypePause" label-width="30%">
+          <el-select v-model="pauseData.bugTypePause" placeholder="bug类型" style="width:76%;">
+            <el-option v-for="item in bugTypeStr" :key="item.name" :label="item.name" :value="item.code" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="修复方式" prop="pauseReasonsAndSolutionForTheProblem" label-width="30%"><el-input v-model="pauseData.pauseReasonsAndSolutionForTheProblem" type="textarea" autocomplete="off" rows="3" style="width:76%;" /></el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogWaitTest = false">取 消</el-button>
+        <el-button type="primary" @click="queryFormDataTest">确 定</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog :visible.sync="dialogInRepairResult" width="40%">
+      <el-form ref="refeshResultDialog" :model="pauseData" :rules="serviceDataRules">
+        <el-form-item label="修复结果" prop="pauseRepairResult" label-width="30%">
+          <el-select v-model="pauseData.pauseRepairResult" placeholder="修复结果" style="width:76%;">
+            <el-option v-for="item in repairStr" :key="item.name" :label="item.name" :value="item.code" />
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogInRepairResult = false">取 消</el-button>
+        <el-button type="primary" @click="queryFormDataRepair">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { bugGetEnum, bugUpdate, bugGet } from '@/api/defectManage'
+import { teamMembers } from '@/api/projectPage'
+
+export default {
+  data() {
+    return {
+      form: {
+        id: ''
+      },
+      uptataKey: [],
+      formUpdateValue: {},
+      pauseData: {
+        reasonPause: '',
+        bugTypePause: '',
+        pauseCurrentHandler: '',
+        pauseRepairResult: '',
+        pauseReasonsAndSolutionForTheProblem: ''
+      },
+      serviceDataRules: {
+        pauseCurrentHandler: [{ required: true, message: '处理人不能为空', trigger: 'blur' }],
+        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' }]
+      },
+      bizId: '',
+      optionsCurrentHandlerQA: [],
+      optionsCurrentHandlerRD: [],
+      currentHandler: '',
+      formLabelWidth: '5.1%',
+      twoLable: '20%',
+      bugLevelStr: [],
+      bugStatusStr: [],
+      repairStr: [],
+      repairResult: '',
+      reasonsAndSolutionForTheProblem: '',
+      userData: '',
+      bugTypeStr: [],
+      reasonStr: [],
+      reason: [],
+      bugType: [],
+      bizIdEnumList: [],
+      userInformation: localStorage.getItem('username'),
+      userNames: localStorage.getItem('realname'),
+      dialogInDevelopment: false,
+      dialogWaitTest: false,
+      dialogInRepairResult: false
+    }
+  },
+  created() {
+    this._initBegin()
+    // this.getLocalStor()
+  },
+  methods: {
+    // getLocalStor() {
+    //   var str = localStorage.getItem('updata')
+    //   var obj = JSON.parse(str.split('{}')[0])
+    //   for (var a of obj) {
+    //     this.uptataKey.push(a)
+    //   }
+    // },
+    // 先后获取
+    async _initBegin() {
+      await bugGetEnum().then(res => {
+        this.bugStatusStr = this.problemStatus(res.data.bugEnumList)
+        this.bugLevelStr = res.data.priorityEnumList
+        this.bizIdEnumList = res.data.bizIdEnumList
+        this.bugTypeStr = res.data.bugTypeEnumList
+        this.reasonStr = res.data.reasonEnumList
+        this.repairStr = res.data.repairResultEnumList
+      })
+      bugGet(this.$route.query.id).then(res => {
+        this.form = res.data
+        if (res.data.accessory === '') {
+          var str = res.data.accessory
+          if (str !== '') {
+            var obj = JSON.parse(str.split('{}')[0])
+            for (var a of obj) {
+              this.uptataKey.push(a)
+            }
+          }
+        }
+        for (const a of this.bizIdEnumList) {
+          if (this.form.bizId === a.code) {
+            this.bizId = this.form.bizName
+            this.currentHandler = this.form.currentHandler
+            this.repairResult = this.form.repairResultName
+            this.reason = this.form.reason
+            this.bugType = this.form.bugTypeName
+            this.reasonsAndSolutionForTheProblem = this.form.reasonsAndSolutionForTheProblem
+            return
+          } else {
+            this.bizId = ''
+          }
+        }
+        // this.bizId = this.form.bizId
+      })
+    },
+    priorityChange() {
+      this.formUpdateValue.currentHandler = this.form.currentHandler
+      this.formUpdateValue.id = this.form.id
+      this.formUpdateValue.priority = this.form.priority
+      this.userData = { id: '', ename: this.userInformation, name: this.userNames }
+      this.objData = { bugBaseInfo: this.formUpdateValue, user: this.userData }
+      bugUpdate(this.objData).then(res => {
+        if (res.code === 200) {
+          this.successFun()
+          if (this.$refs.refeshDevelopmentDialog !== undefined) {
+            this.$refs.refeshDevelopmentDialog.resetFields()
+          }
+        } else {
+          this.errorFun()
+        }
+        this.formUpdateValue = {}
+      })
+    },
+    // 待修复已修复
+    problemStatus(arr) {
+      return arr.filter(each => {
+        if (each.code === 0) {
+          each.name = '待修复'
+          return true
+        } else if (each.code === 3) {
+          each.name = '已修复'
+          return true
+        }
+      })
+    },
+    // 弹窗关闭时重置
+    cancelInput() {
+      this.pauseData.pauseCurrentHandler = ''
+    },
+    statusChange(e) {
+      if (e === 1) {
+        this.dialogInDevelopment = true
+        this.getMember('rd') // 人员搜索
+      } else if (e === 2) {
+        this.dialogWaitTest = true
+        this.getMember('qa') // 人员搜索
+      } else if (e === 3) {
+        this.dialogInRepairResult = true
+      } else {
+        this.formUpdateValue.currentHandler = this.form.currentHandler
+        this.formUpdateValue.id = this.form.id
+        this.formUpdateValue.status = this.form.status
+        this.userData = { id: '', ename: this.userInformation, name: this.userNames }
+        this.objData = { bugBaseInfo: this.formUpdateValue, user: this.userData }
+        bugUpdate(this.objData).then(res => {
+          if (res.code === 200) {
+            this.successFun()
+            if (this.$refs.refeshDevelopmentDialog !== undefined) {
+              this.$refs.refeshDevelopmentDialog.resetFields()
+            }
+          } else {
+            this.errorFun()
+          }
+        })
+        this.formUpdateValue = {}
+      }
+    },
+    // 人员搜索
+    getMember(role) {
+      const objDataCurrentHandler = { bizId: this.form.bizId, email: '', role: role }
+      teamMembers(objDataCurrentHandler).then((res) => {
+        if (res.code === 200 && role === 'qa') {
+          this.optionsCurrentHandlerQA = res.data
+        } else if (res.code === 200 && role === 'rd') {
+          this.optionsCurrentHandlerRD = res.data
+        } else {
+          this.errorFun()
+        }
+      })
+    },
+    queryFormData() {
+      this.$refs.refeshDevelopmentDialog.validate((valid) => {
+        if (valid) {
+          if (this.dialogWaitTest || this.dialogInDevelopment) {
+            this.form.currentHandler = this.pauseData.pauseCurrentHandler.join(',')
+          }
+          this.formUpdateValue.currentHandler = this.form.currentHandler
+          this.formUpdateValue.id = this.form.id
+          this.formUpdateValue.status = this.form.status
+          this.userData = { id: '', ename: this.userInformation, name: this.userNames }
+          this.objData = { bugBaseInfo: this.formUpdateValue, user: this.userData }
+          bugUpdate(this.objData).then(res => {
+            if (res.code === 200) {
+              this.successFun()
+              this.currentHandler = this.form.currentHandler
+              if (this.$refs.refeshDevelopmentDialog !== undefined) {
+                this.$refs.refeshDevelopmentDialog.resetFields()
+              }
+            } else {
+              this.errorFun()
+            }
+            this.dialogInDevelopment = false
+            this.formUpdateValue = {}
+          })
+        }
+      })
+    },
+    queryFormDataTest() {
+      this.$refs.refeshWaitTestDialog.validate((valid) => {
+        if (valid) {
+          if (this.dialogWaitTest || this.dialogInDevelopment) {
+            this.form.currentHandler = this.pauseData.pauseCurrentHandler.join(',')
+            this.form.reason = this.pauseData.reasonPause
+            this.form.bugType = this.pauseData.bugTypePause
+          }
+          this.formUpdateValue.currentHandler = this.form.currentHandler
+          this.formUpdateValue.id = this.form.id
+          this.formUpdateValue.status = this.form.status
+          this.formUpdateValue.reason = this.pauseData.reasonPause
+          this.formUpdateValue.bugType = this.pauseData.bugTypePause
+          this.formUpdateValue.reasonsAndSolutionForTheProblem = this.pauseData.pauseReasonsAndSolutionForTheProblem
+          this.userData = { id: '', ename: this.userInformation, name: this.userNames }
+          this.objData = { bugBaseInfo: this.formUpdateValue, user: this.userData }
+          bugUpdate(this.objData).then(res => {
+            if (res.code === 200) {
+              this.successFun()
+              this.currentHandler = this.form.currentHandler
+              this.form.reasomName = this.reasonStr.filter(value => value.code === this.pauseData.reasonPause)[0].name
+              this.bugType = this.bugTypeStr.filter(value => value.code === this.pauseData.bugTypePause)[0].name
+              this.reasonsAndSolutionForTheProblem = this.form.reasonsAndSolutionForTheProblem
+              if (this.$refs.refeshWaitTestDialog !== undefined) {
+                this.$refs.refeshWaitTestDialog.resetFields()
+              }
+            } else {
+              this.errorFun()
+            }
+            this.dialogWaitTest = false
+            this.formUpdateValue = {}
+          })
+        }
+      })
+    },
+    queryFormDataRepair() {
+      this.$refs.refeshResultDialog.validate((valid) => {
+        if (valid) {
+          if (this.dialogInRepairResult) {
+            this.form.repairResult = this.pauseData.pauseRepairResult
+          }
+          this.formUpdateValue.currentHandler = this.form.currentHandler
+          this.formUpdateValue.id = this.form.id
+          this.formUpdateValue.status = this.form.status
+          this.formUpdateValue.repairResult = this.form.repairResult
+          this.userData = { id: '', ename: this.userInformation, name: this.userNames }
+          this.objData = { bugBaseInfo: this.formUpdateValue, user: this.userData }
+          bugUpdate(this.objData).then(res => {
+            if (res.code === 200) {
+              this.successFun()
+              this.repairResult = this.form.repairResult
+              if (this.$refs.refeshResultDialog !== undefined) {
+                this.$refs.refeshResultDialog.resetFields()
+              }
+            } else {
+              this.errorFun()
+            }
+            this.dialogInRepairResult = false
+            this.formUpdateValue = {}
+          })
+        }
+      })
+    },
+    enterUpdate() {
+      this.$router.push({ name: '更新线上问题', params: { formData: this.form }, query: { id: this.form.id }})
+    },
+    successFun() {
+      this.$notify({ title: 'Success', message: 'Update Successfully', type: 'success', duration: 2000 })
+    },
+    errorFun() {
+      this.$notify({ title: 'Failed', message: 'Update Failed', type: 'error', duration: 2000 })
+    }
+  }
+}
+</script>
+
+<style>
+ .cla .el-table td {
+    padding:0px;
+  }
+</style>
+
+<style lang="stylus" scoped>
+  .set-background
+    background-color #F2F3F6
+    display flex
+    justify-content center
+    .block
+      background-color rgba(255,255,255,1)
+      box-shadow 0px 0px 11px 0px rgba(238,240,245,1)
+      border-radius 7px
+      width 78vw
+      margin-top 25px
+      padding 29px 50px
+    .block >>> .el-form-item__content
+      margin-left 0 !important
+    .display-messege
+      font-size 14px
+      font-family PingFangSC-Regular,PingFangSC
+      font-weight 400
+      color rgba(51,59,74,1)
+      display flex
+      width 100%
+      margin-bottom 40px
+    .display-messege-end
+      font-size 14px
+      font-family PingFangSC-Regular,PingFangSC
+      font-weight 400
+      color rgba(51,59,74,1)
+      display flex
+      width 100%
+    .divide-threeparts
+      width 33.3%
+      white-space pre-wrap
+      word-wrap break-word
+      padding-right 30px
+      span
+        white-space nowrap
+    .block-end
+      background-color rgba(255,255,255,1)
+      box-shadow 0px 0px 11px 0px rgba(238,240,245,1)
+      border-radius 7px
+      width 78vw
+      margin-top 25px
+      padding 29px 50px
+      margin-bottom 22px
+      .wrap
+        display flex
+        flex-wrap wrap
+      .wrap >>> .el-form-item__content
+        width 250px
+        display block
+        word-break break-all
+        word-wrap break-word
+      // .remark-length >>> .el-form-item__content
+      //   width 450px
+      //   display block
+      //   word-break break-all
+      //   word-wrap break-word
+</style>

+ 486 - 0
src/views/onlineProblem/problemUpdate.vue

@@ -0,0 +1,486 @@
+<template>
+  <div class="set-background">
+    <el-form ref="form" :model="form" :rules="serviceDataRules">
+      <div class="block">
+        <div class="block-flex">
+          <el-form-item label="标题" prop="bugName" label-width="110px"><el-input v-model="form.bugName" autocomplete="off" placeholder="普惠质量产品工具平台..." style="width:90%;" /></el-form-item>
+          <div class="line-between">
+            <el-form-item label="类型" prop="bugType" label-width="124px">
+              <el-select v-model="form.bugType" style="width:76%;" placeholder="类型">
+                <el-option v-for="item in bugTypeStr" :key="item.name" :label="item.name" :value="item.code" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="所处阶段" prop="stage" label-width="147px">
+              <el-select v-model="form.stage" disabled placeholder="所处阶段" style="width:76%;">
+                <el-option v-for="item in stageStr" :key="item.name" :label="item.name" :value="item.code" />
+              </el-select>
+            </el-form-item>
+          </div>
+          <div class="line-between">
+            <el-form-item label="状态" prop="status" label-width="124px">
+              <el-select v-model="form.status" placeholder="状态" style="width:76%;">
+                <el-option v-for="item in bugStatusStr" :key="item.name" :label="item.name" :value="item.code" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="问题原因" prop="reason" label-width="147px">
+              <el-select v-model="form.reason" style="width:76%;" placeholder="问题原因">
+                <el-option v-for="item in reasonStr" :key="item.name" :label="item.name" :value="item.code" />
+              </el-select>
+            </el-form-item>
+          </div>
+          <div class="line-between">
+            <el-form-item label="级别" prop="priority" label-width="124px">
+              <el-select v-model="form.priority" style="width:76%;" placeholder="级别">
+                <el-option v-for="item in bugLevelStr" :key="item.name" :label="item.name" :value="item.code" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="发现方式" prop="discoveryMethod" label-width="147px">
+              <el-select v-model="form.discoveryMethod" style="width:76%;" placeholder="发现方式">
+                <el-option v-for="item in discoveryMethodStr" :key="item.name" :label="item.name" :value="item.code" />
+              </el-select>
+            </el-form-item>
+          </div>
+          <div class="line-between">
+            <el-form-item prop="bizId" label="业务线" label-width="124px">
+              <el-select v-model="form.bizId" placeholder="业务线" style="width:76%;" @change="clickChangePlatform(form.bizId)">
+                <el-option v-for="item in bizOptions" :key="item.value" :label="item.name" :value="item.code" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="平台类型" prop="platformType" label-width="147px">
+              <el-select ref="clearPlatform" v-model="form.platformType" placeholder="平台类型" style="width:76%;" @change="clickChangeBusiness(form.platformType)">
+                <el-option v-for="item in platformTypeStr" :key="item.name" :label="item.name" :value="item.code" />
+              </el-select>
+            </el-form-item>
+          </div>
+          <div class="line-between-add">
+            <el-form-item v-if="businessTypeShow" prop="clientType" label="业务模块" label-width="127px">
+              <el-select ref="clearBusiness" v-model="form.clientType" placeholder="业务模块" style="width:76%;" @change="clickChangeModule(form.clientType)">
+                <el-option v-for="item in businessTypeStr" :key="item.name" :label="item.name" :value="item.code" />
+              </el-select>
+            </el-form-item>
+          </div>
+          <div class="line-between-add">
+            <el-form-item v-if="moduleTypeShow" label="工程模块" prop="moduleId" label-width="124px">
+              <el-select ref="clearPlatform" v-model="form.moduleId" placeholder="工程模块" style="width:76%;">
+                <el-option v-for="item in moduleStr" :key="item.name" :label="item.name" :value="item.code" />
+              </el-select>
+            </el-form-item>
+          </div>
+          <el-form-item label="故障描述" prop="bugDescribe" label-width="110px"><el-input v-model="form.bugDescribe" type="textarea" placeholder="故障详细信息以及复盘wiki地址" rows="2" style="width:90%;" /></el-form-item>
+        </div>
+      </div>
+      <div class="block">
+        <div class="block-flex">
+          <div class="line-between">
+            <el-form-item label="创建人" label-width="124px"><el-input v-model="form.creator" autocomplete="off" style="width:76%;" /></el-form-item>
+            <el-form-item label="故障责任人" prop="assigner" label-width="147px">
+              <el-select v-model="form.assigner" multiple filterable placeholder="公司邮箱前缀" style="width:76%;">
+                <el-option
+                  v-for="item in optionsAssigner"
+                  :key="item.id"
+                  :label="item.email"
+                  :value="item.email"
+                />
+              </el-select>
+            </el-form-item>
+          </div>
+          <div class="line-between">
+            <el-form-item label="当前处理人" prop="currentHandler" label-width="124px">
+              <el-select v-model="form.currentHandler" multiple filterable placeholder="公司邮箱前缀" style="width:76%;">
+                <el-option
+                  v-for="item in optionsCurrentHandler"
+                  :key="item.id"
+                  :label="item.email"
+                  :value="item.email"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="故障开始时间" label-width="147px">    <el-date-picker
+              v-model="form.startDevTime"
+              type="datetime"
+              placeholder="选择时间"
+              style="width:76%;"
+              value-format="yyyy-MM-dd HH:hh:mm"
+            /></el-form-item>
+          </div>
+          <div class="line-between-add">
+            <el-form-item label="故障结束时间" label-width="124px">    <el-date-picker
+              v-model="form.finishTime"
+              type="datetime"
+              placeholder="选择时间"
+              style="width:76%;"
+              value-format="yyyy-MM-dd HH:hh:mm"
+            /></el-form-item>
+          </div>
+        </div>
+      </div>
+      <div class="block">
+        <div class="block-flex">
+          <div class="line-between">
+            <el-form-item label="机型" label-width="124px"><el-input v-model="form.model" autocomplete="off" style="width:76%;" /></el-form-item>
+            <el-form-item label="地图类型" label-width="147px"><el-input v-model="form.mapType" autocomplete="off" style="width:76%;" /></el-form-item>
+          </div>
+          <div class="line-between">
+            <el-form-item label="OS类型" label-width="124px"><el-input v-model="form.osType" autocomplete="off" style="width:76%;" /></el-form-item>
+            <el-form-item label="地图版本号" label-width="147px"><el-input v-model="form.mapVersion" autocomplete="off" style="width:76%;" /></el-form-item>
+          </div>
+          <div class="line-between">
+            <el-form-item label="网络类型" label-width="124px"><el-input v-model="form.networkType" autocomplete="off" style="width:76%;" /></el-form-item>
+            <el-form-item label="SDK版本" label-width="147px"><el-input v-model="form.sdkVersion" autocomplete="off" style="width:76%;" /></el-form-item>
+          </div>
+          <div class="line-between-add">
+            <el-form-item label="app版本号" label-width="124px"><el-input v-model="form.appVersion" autocomplete="off" style="width:76%;" /></el-form-item>
+          </div>
+        </div>
+      </div>
+      <div class="block-end">
+        <div class="font">备注</div>
+        <el-input v-model="form.remark" type="textarea" autocomplete="off" rows="5" style="margin: 20px 0;" />
+        <div>
+          <el-upload
+            ref="upload"
+            class="upload-demo"
+            multiple
+            :file-list="fileList"
+            action="http://star.xiaojukeji.com/upload/img.node"
+            :on-success="handleChange"
+            :auto-upload="false"
+          >
+            <!-- action="http://page-daily.kuaidadi.com/upload/img.node" 线下 -->
+            <!-- action="http://star.xiaojukeji.com/upload/img.node" 线上 -->
+            <!-- action="https://jsonplaceholder.typicode.com/posts/" 原始地址-->
+            <!-- <el-button size="small">点击上传</el-button> -->
+            <el-button slot="trigger" size="small" type="primary" @click="createdDis">选取文件</el-button>
+            <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>
+          </el-upload>
+        </div>
+        <!-- accept="image/jpeg, image/png, image/gif, audio/mp4, video/mp4, application/pdf, audio/mpeg, text/plain, application/vnd.ms-excel, application/vnd.ms-works, application/msword" -->
+        <el-form-item class="submit">
+          <el-button size="mini" type="primary" @click="createFormData(form)">提 交</el-button>
+          <el-button class="move-button" size="mini" @click="$router.go(-1)">取 消</el-button>
+        </el-form-item>
+      </div>
+      <!-- <div style="flex:1">
+        <el-form-item v-show="statusShow" label="问题原因和修复方法" :label-width="formLabelWidth"><el-input v-model="form.reasonsAndSolutionForTheProblem" type="textarea" placeholder="问题原因和修复方法" rows="4" style="width:77.2%;" /></el-form-item>
+      </div>
+      <div style="flex:1">
+        <el-form-item v-show="repairShow" label="修复结果" :label-width="formLabelWidth">
+          <el-select v-model="form.repairResult" placeholder="发现方法">
+            <el-option v-for="item in repairResultStr" :key="item.name" :label="item.name" :value="item.name" />
+          </el-select>
+        </el-form-item>
+      </div> -->
+      <!-- <el-form-item label="逻辑删" :label-width="formLabelWidth">
+            <el-select v-model="form.isDelete" placeholder="发现方法">
+              <el-option v-for="item in isDeleteStr" :key="item.value" :label="item.name" :value="item.value" />
+            </el-select>
+          </el-form-item> -->
+      <!-- <el-form-item label="reopen的次数" :label-width="formLabelWidth"> <el-input v-model="form.reopenTimes" autocomplete="off" /></el-form-item> -->
+      <!-- <el-form-item label="业务线" prop="bizId" :label-width="formLabelWidth"><el-input v-model="form.bizId" autocomplete="off" /></el-form-item> -->
+      <!-- <el-form-item label="模块" :label-width="formLabelWidth"><el-input v-model="form.moduleId" autocomplete="off" /></el-form-item> -->
+      <!-- <el-form-item label="项目名" :label-width="formLabelWidth"><el-input v-model="form.projectName" autocomplete="off" /></el-form-item> -->
+      <!-- <el-form-item label="项目ID" :label-width="formLabelWidth"><el-input v-model="form.projectId" autocomplete="off" /></el-form-item> -->
+      <!-- <el-form-item label="测试计划ID" prop="planId" :label-width="formLabelWidth"><el-input v-model="form.planId" autocomplete="off" /></el-form-item> -->
+      <!-- <el-form-item label="caseID" :label-width="formLabelWidth"><el-input v-model="form.caseId" autocomplete="off" /></el-form-item> -->
+      <!-- <el-form-item label="bug创建人" :label-width="formLabelWidth"> <el-input v-model="form.creator" autocomplete="off" /></el-form-item> -->
+      <!-- <el-form-item label="开始开发时间" :label-width="formLabelWidth"><el-input v-model="form.startDevTime" autocomplete="off" /></el-form-item> -->
+      <!-- <el-form-item label="开始等待测试时间" :label-width="formLabelWidth"><el-input v-model="form.waitTestTime" autocomplete="off" /></el-form-item> -->
+      <!-- <el-form-item label="创建时间" :label-width="formLabelWidth"><el-input v-model="form.gmtCreate" autocomplete="off" /></el-form-item> -->
+      <!-- <el-form-item label="修改时间" :label-width="formLabelWidth"><el-input v-model="form.gmtModify" autocomplete="off" /></el-form-item> -->
+    </el-form>
+  </div>
+</template>
+
+<script>
+import { bugGetEnum, taskListCreate, bugUpdate, bugGet } from '@/api/defectManage'
+import { projectGetTypeMap, teamMembers } from '@/api/projectPage'
+import axios from 'axios'
+
+export default {
+  data() {
+    return {
+      form: {
+        id: '',
+        platformType: '',
+        clientType: ''
+      },
+      optionsAssigner: [],
+      optionsCurrentHandler: [],
+      businessTypeStr: [],
+      taskIdStr: '',
+      platformTypeStr: [],
+      bugTypeStr: [],
+      discoveryMethodStr: [],
+      reasonStr: [],
+      bugStatusStr: [],
+      moduleStr: [],
+      stageStr: [],
+      fileList: [],
+      uptataKey: [],
+      // uptataKey: [{ name: '智慧平台.png', url: 'http://pt-starimg.didistatic.com/static/starimg/node/qo4sKioLko1571277086594.png' }, { name: '智慧平台.png', url: 'http://pt-starimg.didistatic.com/static/starimg/node/qo4sKioLko1571277086594.png' }],
+      serviceTypeEnumList: [],
+      clientTypeEnumList: [],
+      bugLevelStr: [],
+      bizOptions: [],
+      serviceDataRules: {
+        bugName: [{ required: true, message: '标题不能为空', trigger: 'change' }],
+        bizId: [{ required: true, message: '业务线不能为空', trigger: 'change' }],
+        // bugName: [{ required: true, message: '主题不能为空', trigger: 'change' }],
+        taskId: [{ required: true, message: '任务不能为空', trigger: 'change' }],
+        moduleId: [{ required: true, message: '工程模块不能为空', trigger: 'change' }],
+        // projectId: [{ required: true, message: '项目ID不能为空', trigger: 'change' }],
+        bugType: [{ required: true, message: 'bug类型不能为空', trigger: 'change' }],
+        reopenTimes: [{ required: true, message: 'reopen不能为空', trigger: 'change' }],
+        discoveryMethod: [{ required: true, message: '发现方式不能为空', trigger: 'change' }],
+        reason: [{ required: true, message: '问题原因不能为空', trigger: 'change' }],
+        priority: [{ required: true, message: '级别不能为空', trigger: 'change' }],
+        status: [{ required: true, message: '状态不能为空', trigger: 'change' }],
+        platformType: [{ required: true, message: '平台类型不能为空', trigger: 'change' }],
+        stage: [{ required: true, message: '所处阶段不能为空', trigger: 'change' }],
+        assigner: [{ required: true, message: 'bug责任人不能为空', trigger: 'blur' }],
+        currentHandler: [{ required: true, message: 'bug处理人不能为空', trigger: 'blur' }],
+        bugDescribe: [{ required: true, message: 'bug描述不能为空', trigger: 'change' }],
+        clientType: [{ required: true, message: '业务模块不能为空', trigger: 'change' }]
+      },
+      userData: '',
+      formLabelWidth1: '22%',
+      businessTypeShow: false,
+      moduleTypeShow: false,
+      userInformation: localStorage.getItem('username'),
+      userNames: localStorage.getItem('realname'),
+      accessory: '',
+      dis: false
+    }
+  },
+  created() {
+    this._initBegin()
+    this.taskIdGet()
+  },
+  methods: {
+    createdDis() {
+      this.dis = true
+    },
+    submitUpload() {
+      this.$refs.upload.submit()
+      this.dis = true
+      this.$message({ showClose: true, message: '文件正在上传······', type: 'success' })
+    },
+    handleChange(response, file, fileList) {
+      this.fileDbList = []
+      this.fileList = fileList.slice(-3)
+      for (var a of this.fileList) {
+        this.fileDbList.push({ 'name': a.name, 'url': 'http:' + a.response.url })
+      }
+      this.accessory = JSON.stringify(this.fileDbList)
+      this.dis = false
+      this.$message({ showClose: true, message: '文件上传成功', type: 'success' })
+    },
+    async _initBegin() {
+      await bugGetEnum().then(res => {
+        this.bugStatusStr = this.problemStatus(res.data.bugEnumList)
+        this.stageStr = res.data.bugStageEnumList
+        this.reasonStr = res.data.reasonEnumList
+        this.bugTypeStr = res.data.bugTypeEnumList
+        this.bugLevelStr = res.data.priorityEnumList
+        this.discoveryMethodStr = res.data.discoveryMethodEnumList
+        this.clientTypeEnumList = res.data.clientTypeEnumList
+        this.serviceTypeEnumList = res.data.serviceTypeEnumList
+      })
+      await projectGetTypeMap().then(res => {
+        if (res.code === 200) {
+          this.bizOptions = res.data
+        } else {
+          this.errorFun()
+        }
+      })
+      bugGet(this.$route.query.id).then(res => {
+        this.form = res.data
+        var str = res.data.accessory
+        if (str !== '') {
+          var obj = JSON.parse(str.split('{}')[0])
+          for (var a of obj) {
+            this.uptataKey.push(a)
+          }
+        }
+        this.platformTypeStr = this.bizOptions.filter(value => value.code === this.form.bizId)[0].child
+        if (this.form.clientType) {
+          this.businessTypeShow = true
+          this.businessTypeStr = this.platformTypeStr.filter(value => value.code === this.form.platformType)[0].child
+          if (this.form.moduleId) {
+            this.moduleTypeShow = true
+            this.moduleStr = this.businessTypeStr.filter(value => value.code === this.form.clientType)[0].child
+          }
+        }
+        this.getMember() // 保证bizId存在
+        if (this.form.assigner) {
+          this.form.assigner = this.form.assigner.split(',')
+        }
+        if (this.form.currentHandler) {
+          this.form.currentHandler = this.form.currentHandler.split(',')
+        }
+      })
+    },
+    // 获取任务数据
+    taskIdGet() {
+      taskListCreate({ statusList: [5, 6, 7, 8, 9, 10] }).then(res => {
+        this.taskIdStr = res.data
+      })
+    },
+    // 业务线取子数据
+    clickChangePlatform(e) {
+      this.platformTypeStr = this.bizOptions.filter(value => value.code === e)[0].child
+      this.businessTypeStr = []
+      this.moduleStr = []
+      this.$set(this.form, 'platformType', '')
+      this.$set(this.form, 'clientType', '')
+      this.$set(this.form, 'moduleId', '')
+      this.getMember() // 保证bizId存在
+    },
+    // 业务线取子数据
+    clickChangeBusiness(e) {
+      if (this.platformTypeStr.filter(value => value.code === e)[0].child) {
+        this.businessTypeShow = true
+        this.businessTypeStr = this.platformTypeStr.filter(value => value.code === e)[0].child
+        this.moduleStr = []
+      } else {
+        this.businessTypeShow = false
+      }
+      this.$set(this.form, 'clientType', '')
+      this.$set(this.form, 'moduleId', '')
+    },
+    // 业务线取子数据
+    clickChangeModule(e) {
+      if (this.businessTypeStr.filter(value => value.code === e)[0].child) {
+        this.moduleTypeShow = true
+        this.moduleStr = this.businessTypeStr.filter(value => value.code === e)[0].child
+      } else {
+        this.moduleTypeShow = false
+      }
+      this.$set(this.form, 'moduleId', '')
+    },
+    // 人员搜索
+    getMember() {
+      const objDataAssigner = { bizId: this.form.bizId, email: '', role: 'rd' }
+      const objDataCurrentHandler = { bizId: this.form.bizId, email: '' }
+      axios.all([teamMembers(objDataAssigner), teamMembers(objDataCurrentHandler)]).then(axios.spread((resAssigner, resCurrentHandler) => {
+        if (resAssigner.code === 200 && resCurrentHandler.code === 200) {
+          this.optionsAssigner = resAssigner.data
+          this.optionsCurrentHandler = resCurrentHandler.data
+        } else {
+          this.errorFun('人员数据获取失败')
+        }
+      }))
+    },
+    // 待修复已修复
+    problemStatus(arr) {
+      return arr.filter(each => {
+        if (each.code === 0) {
+          each.name = '待修复'
+          return true
+        } else if (each.code === 3) {
+          each.name = '已修复'
+          return true
+        }
+      })
+    },
+    handleDelContractList(val) {
+      for (var i = 0; i <= this.uptataKey.length; i++) {
+        if (val.name === this.uptataKey[i].name) {
+          this.uptataKey.splice(i, 1)
+        }
+      }
+      console.log(this.uptataKey)
+    },
+    // 提交表单并且返回刷新
+    createFormData(form) {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          if (form.assigner) {
+            form.assigner = form.assigner.join(',')
+          }
+          if (form.currentHandler) {
+            form.currentHandler = form.currentHandler.join(',')
+          }
+          form.reopenTimes = parseInt(form.reopenTimes)
+          form.accessory = this.accessory
+          this.userData = { id: '', ename: this.userInformation, name: this.userNames }
+          this.objData = { bugBaseInfo: form, user: this.userData }
+          bugUpdate(this.objData).then(res => {
+            res.code === 200 ? this.successFun() : this.errorFun()
+            this.$router.go(-1)
+          })
+        }
+      })
+    },
+    successFun() {
+      this.$notify({ title: 'Success', message: 'Updated Successfully', type: 'success', duration: 2000 })
+    },
+    errorFun() {
+      this.$notify({ title: 'Failed', message: 'Updated Failed', type: 'error', duration: 2000 })
+    }
+  }
+}
+</script>
+<style>
+ .cla .el-table td {
+    padding:0px;
+  }
+  .deleteSty {
+    cursor: pointer;
+    border: none;
+  }
+</style>
+
+<style lang="stylus" scoped>
+  .set-background
+    background-color #F2F3F6
+    display flex
+    justify-content center
+    min-width 700px
+    .block
+      background-color rgba(255,255,255,1)
+      box-shadow 0px 0px 11px 0px rgba(238,240,245,1)
+      border-radius 7px
+      width 78vw
+      margin-top 25px
+      padding 29px 50px
+      .block-flex
+        display flex
+        flex-wrap wrap
+      .block-flex >>> .el-form-item
+        width 100%
+        display flex
+      .block-flex >>> .el-form-item__content
+        width 100%
+        margin-left 0 !important
+      .line-between
+        width 100%
+        display flex
+        justify-content space-between
+      .line-between-add
+        display flex
+        flex-wrap wrap
+        width 100%
+      .line-between-add >>> .el-form-item
+        width 50%
+    .block-end
+      background-color rgba(255,255,255,1)
+      box-shadow 0px 0px 11px 0px rgba(238,240,245,1)
+      border-radius 7px
+      width 78vw
+      margin-top 25px
+      padding 29px 50px
+      margin-bottom 22px
+      .font
+        font-size 18px
+        font-family PingFangSC
+        font-weight 500
+        color rgba(51,59,74,1)
+        line-height 35px
+      .submit
+        margin-top 40px
+        display flex
+        flex-direction row-reverse
+        .move-button
+          margin-right 20px
+</style>

+ 0 - 10
src/views/quality/qualityDefectProcess.vue

@@ -24,11 +24,6 @@
           label="bug名称"
           align="center"
         />
-        <el-table-column
-          prop="spaceKey"
-          label="项目空间"
-          align="center"
-        />
         <el-table-column
           prop="projectId"
           label="Qrcc项目ID"
@@ -50,11 +45,6 @@
           label="平台类型"
           align="center"
         />
-        <el-table-column
-          prop="bugStep"
-          label="所属阶段"
-          align="center"
-        />
         <el-table-column
           prop="bugCreateTime"
           label="创建时间"

+ 80 - 81
src/views/quality/qualityMeasurement.vue

@@ -5,6 +5,7 @@
       <el-menu :default-active="activeIndex" active-text-color="#409EFF" mode="horizontal" @select="handleSelect">
         <el-menu-item index="0">业务线数据</el-menu-item>
         <el-menu-item index="3">部门数据</el-menu-item>
+        <!-- <el-menu-item index="5">客户端数据</el-menu-item> -->
       </el-menu>
       <el-date-picker
         v-model="timeInterval"
@@ -18,7 +19,7 @@
     </el-header>
     <el-container style="height:calc(100vh - 140px);">
       <el-aside class="aside">
-        <el-tree ref="treeBox" :data="dealWithBusinessDate" node-key="id" highlight-current :props="defaultProps" style="margin-top:20px" @node-click="handleNodeClick" />
+        <el-tree ref="treeBox" accordion :data="dealWithBusinessDate" node-key="id" highlight-current :props="defaultProps" style="margin-top:20px" @node-click="handleNodeClick" />
       </el-aside>
       <el-main class="combine-table">
         <el-tabs v-model="activeIndexSecondary" @tab-click="handleClick">
@@ -133,7 +134,7 @@
               <el-table-column
                 label="回滚率"
                 align="center"
-                width="60"
+                width="65"
               >
                 <template slot-scope="scope">{{ scope.row.rollbackPercent | toPercent }}</template>
               </el-table-column>
@@ -310,91 +311,64 @@
                 <template slot-scope="scope"><a href="javascript:void(0)" style="color:#20a0ff" @click="toDefectView()">{{ scope.row.totalBugNum }}</a></template>
               </el-table-column>
               <el-table-column
-                label="缺陷分级"
+                prop="avgBugs"
+                label="人均bug数"
                 align="center"
-              >
-                <el-table-column
-                  label="P0"
-                  width="40"
-                  align="center"
-                >
-                  <template slot-scope="scope">{{ scope.row.totalP0 | toPercent }}</template>
-                </el-table-column>
-                <el-table-column
-                  prop="totalP1"
-                  label="P1"
-                  width="40"
-                  align="center"
-                />
-                <el-table-column
-                  prop="totalP2"
-                  label="P2"
-                  width="40"
-                  align="center"
-                />
-                <el-table-column
-                  prop="stepSmall"
-                  label="其他"
-                  width="50"
-                  align="center"
-                />
-              </el-table-column>
+              />
               <el-table-column
-                label="缺陷阶段"
+                prop="avgRepairTime"
+                label="bug平均修复时常"
+                width="120"
                 align="center"
-              >
-                <el-table-column
-                  prop="stepIn"
-                  label="准入"
-                  width="49"
-                  align="center"
-                />
-                <el-table-column
-                  prop="stepTest"
-                  label="测试"
-                  width="49"
-                  align="center"
-                />
-                <el-table-column
-                  prop="stepOut"
-                  label="准出"
-                  width="49"
-                  align="center"
-                />
-                <el-table-column
-                  prop="stepPre"
-                  label="预发"
-                  width="49"
-                  align="center"
-                />
-                <el-table-column
-                  prop="stepSmall"
-                  label="其他"
-                  width="49"
-                  align="center"
-                />
-                <el-table-column
-                  prop="stepAllTest"
-                  label="众测"
-                  width="49"
-                  align="center"
-                />
-              </el-table-column>
+              />
               <el-table-column
-                prop="date"
-                label="核心指标"
+                label="bug修复率"
                 align="center"
               >
-                <el-table-column
-                  prop="avgBugs"
-                  label="人均bug数"
-                  align="center"
-                  width="80"
-                />
+                <template slot-scope="scope">{{ scope.row.avgRepairTime | toPercent }}</template>
               </el-table-column>
               <el-table-column
-                prop="offlineRepairPresent"
-                label="bug修复率"
+                label="P0"
+                width="55"
+                align="center"
+              />
+              <el-table-column
+                prop="totalP1"
+                label="P1"
+                width="55"
+                align="center"
+              />
+              <el-table-column
+                prop="totalP2"
+                label="P2"
+                width="55"
+                align="center"
+              />
+              <el-table-column
+                prop="totalOthers"
+                label="其他分级"
+                align="center"
+              />
+              <el-table-column
+                prop="reopenNum"
+                label="reopen"
+                align="center"
+              />
+              <el-table-column
+                prop="checkInTest"
+                label="提测"
+                width="55"
+                align="center"
+              />
+              <el-table-column
+                prop="checkInRepulse"
+                label="提测打回"
+                align="center"
+              />
+              <el-table-column
+                prop="stepOut"
+                label="准出"
+                width="55"
                 align="center"
               />
             </el-table>
@@ -420,7 +394,7 @@
                 />
                 <el-table-column
                   prop="defectsVO.rejectPer"
-                  label="平均打回"
+                  label="提测打回"
                   align="center"
                 />
                 <el-table-column
@@ -543,6 +517,24 @@ export default {
       })
       this.deleteAfter()
     },
+    // 点击客户端数据导航栏显示默认数据
+    // async initClientTree() {
+    //   // this.loadingOnlineProcess = true
+    //   await getClientInfo().then(res => {
+    //     this.businessData = res.code === 0 ? res.data : ''
+    //     this.dealWithBusinessDate = this.businessData.map(each => ({
+    //       ...each,
+    //       child: each.details.map(detail => ({
+    //         ...detail,
+    //         name: detail.step
+    //       }))
+    //     }))
+    //     this.pauseTreeNode = this.dealWithBusinessDate[0] ? this.dealWithBusinessDate[0] : ''
+    //     this.pauseKey = 5
+    //     this.pauseId = this.pauseTreeNode.appKey ? this.pauseTreeNode.appKey : ''
+    //   })
+    //   this.clientAfter()
+    // },
     // 部门table数据不需要缺陷数据
     deleteAfter() {
       this.guild = this.treeGuide(this.dealWithBusinessDate, this.pauseTreeNode.id, this.pauseTreeNode.type).join('/')
@@ -604,6 +596,9 @@ export default {
       } else if (key === '3') {
         this.pauseKey = key
         this.initDepartmentTree()
+      } else if (key === '5') {
+        this.pauseKey = key
+        this.initClientTree()
       } else {
         this.errorFun('维度出错')
       }
@@ -704,8 +699,12 @@ export default {
       padding 0
     .header >>> .el-menu-item:nth-child(2)
       padding 15px 0 0 0
-      margin 0 0 30px 40px
+      margin 0 0 30px 30px
       width 55px
+    .header >>> .el-menu-item:nth-child(3)
+      padding 15px 0 0 0
+      margin 0 0 30px 30px
+      width 72px
     .aside
       width 12.9% !important
       margin 0 0 2% 1.5%