Selaa lähdekoodia

test 合 bug_fix panxianiao

panxiandiao_i 5 vuotta sitten
vanhempi
sitoutus
b2c69c231d

+ 3 - 0
package.json

@@ -27,6 +27,7 @@
     "path-to-regexp": "2.4.0",
     "simditor": "^2.3.26",
     "swiper": "^4.5.0",
+    "v-jsoneditor": "^1.2.2",
     "vue": "2.6.10",
     "vue-router": "3.0.6",
     "vuex": "3.1.0",
@@ -52,6 +53,8 @@
     "html-webpack-plugin": "3.2.0",
     "mockjs": "1.0.1-beta3",
     "node-sass": "^4.9.0",
+    "stylus": "^0.54.7",
+    "stylus-loader": "^3.0.2",
     "runjs": "^4.3.2",
     "sass-loader": "^7.1.0",
     "script-ext-html-webpack-plugin": "2.1.3",

+ 11 - 0
src/App.vue

@@ -18,3 +18,14 @@ export default {
   }
 }
 </script>
+
+<style>
+/* el-table头部 */
+.tableHead{
+  color: rgba(0, 0, 0, 0.726);
+}
+/* 分页 */
+.el-pagination{
+  margin: 2% 0 2% 0;
+}
+</style>

+ 1 - 1
src/api/defectManage.js

@@ -47,7 +47,7 @@ export function bugCreate(data) {
 // 任务ID
 export function taskListCreate(data) {
   return request({
-    url: mockUrl + '/task/listAll',
+    url: mockUrl + '/task/listTask',
     method: 'post',
     data
   })

+ 12 - 0
src/api/env.js

@@ -0,0 +1,12 @@
+import request from '@/utils/request'
+
+const commonUrl = 'http://10.179.209.19:8899'
+
+export function getBusinessLine(data) {
+  return request({
+    url: commonUrl + '/api/business-lines',
+    method: 'get',
+    data
+  })
+}
+

+ 98 - 0
src/api/onlineQuality.js

@@ -0,0 +1,98 @@
+import request from '@/utils/request'
+
+const commonUrl = 'http://10.179.22.191:8083'
+
+export function addCheckTemplate(data) {
+  return request({
+    url: commonUrl + '/onlineQuality/checkList/insert',
+    method: 'post',
+    data
+  })
+}
+
+export function deleteCheckTemplate(data) {
+  return request({
+    url: commonUrl + '/onlineQuality/checkList/delete',
+    method: 'post',
+    data
+  })
+}
+
+export function updateCheckTemplate(data) {
+  return request({
+    url: commonUrl + '/onlineQuality/checkList/update',
+    method: 'post',
+    data
+  })
+}
+
+export function getCheckList(data) {
+  return request({
+    url: commonUrl + '/onlineQuality/checkList/select',
+    method: 'post',
+    data
+  })
+}
+
+export function getCheckResult(data) {
+  return request({
+    url: commonUrl + '/onlineQuality/checkResult/selectSpecificCheckResultByTaskId',
+    method: 'post',
+    data
+  })
+}
+
+export function getCheckResultList(data) {
+  return request({
+    url: commonUrl + '/onlineQuality/checkResult/selectAll',
+    method: 'get',
+    params: data
+  })
+}
+
+export function updateCheckResult(data) {
+  return request({
+    url: commonUrl + '/onlineQuality/checkResult/changeState',
+    method: 'post',
+    data
+  })
+}
+
+export function addNsServerCheck(data) {
+  return request({
+    url: commonUrl + '/onlineQuality/nsServerCheck/insert',
+    method: 'post',
+    data
+  })
+}
+export function deleteNsServerCheck(data) {
+  return request({
+    url: commonUrl + '/onlineQuality/nsServerCheck/delete',
+    method: 'post',
+    data
+  })
+}
+
+export function updateNsServerCheck(data) {
+  return request({
+    url: commonUrl + '/onlineQuality/nsServerCheck/update',
+    method: 'post',
+    data
+  })
+}
+
+export function getNsServerCheck(data) {
+  return request({
+    url: commonUrl + '/onlineQuality/nsServerCheck/selectAll',
+    method: 'post',
+    data
+  })
+}
+
+export function getBlockResult(data) {
+  return request({
+    url: commonUrl + '/onlineQuality/blockResult/selectAll',
+    method: 'post',
+    data
+  })
+}

+ 4 - 0
src/apiConfig/api.js

@@ -2,5 +2,9 @@
 export const mockUrl = 'http://10.179.24.176:8980' // 线下
 // export const mockUrl = 'http://10.179.24.123:8980' // 线上
 
+<<<<<<< HEAD
 // export const mockUrl = 'http://172.23.162.48:8980' // 美双姐本地
 
+=======
+// export const mockUrl = 'http://172.23.162.48:8980' // 美双姐本地
+>>>>>>> test

+ 1 - 0
src/icons/svg/上线质检.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1567668256021" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2187" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M399.36 536.84A55 55 0 0 0 460.61 626l70.6 72.72a55 55 0 1 0 34.24-36.52l-73.3-75.51a55.29 55.29 0 0 0 0.38-19.8l69.5-69.5a55 55 0 1 0-1.67-100l-69.34-70a55 55 0 1 0-34.76 36l73.67 74.42a54.91 54.91 0 0 0 0.39 20.64l-67.93 67.93a55 55 0 0 0-63.03 10.46z" p-id="2188"></path><path d="M891 164.57c-12.66-3.71-91.55-26.8-172.69-49.62C536.09 63.73 520.74 63.73 512.5 63.73h-1c-8.25 0-23.6 0-205.77 51.23-81.14 22.82-160 45.91-172.69 49.62a44.07 44.07 0 0 0-35.74 43.21v277.93c0 55.41 11.8 112.58 35.09 169.94a564.11 564.11 0 0 0 91.68 150.94C307 904.26 411.86 960.27 511.81 960.27v-64c-81.13 0-168.22-47.78-238.94-131.09C203 682.89 161.3 578.42 161.3 485.72V223.25c155.16-45.72 324.39-92.69 350.7-95.44 26.31 2.75 195.54 49.72 350.7 95.44v262.47c0 92.7-41.71 197.17-111.57 279.46-70.73 83.31-157.82 131.09-238.94 131.09v64c99.95 0 204.82-56 287.73-153.67a564.12 564.12 0 0 0 91.69-150.94c23.28-57.36 35.09-114.53 35.09-169.94V207.79a44.07 44.07 0 0 0-35.7-43.22z" p-id="2189"></path></svg>

+ 62 - 4
src/router/index.js

@@ -188,7 +188,7 @@ export const constantRoutes = [
           {
             path: 'defectManageQuery',
             name: '缺陷查看',
-            hidden: true,
+            // hidden: true,
             component: () => import('@/views/Platform/presentation/defectManageQuery'),
             meta: { title: '缺陷查看' }
           },
@@ -209,10 +209,33 @@ export const constantRoutes = [
         ]
       },
       {
-        path: 'defectManagement',
+        path: '/Platform/defectManagement',
         name: '缺陷管理',
         component: () => import('@/views/Platform/defectManagement'),
-        meta: { title: '缺陷管理' }
+        meta: { title: '缺陷管理' },
+        children: [
+          {
+            path: 'bugCreate',
+            name: '新建Bug',
+            hidden: true,
+            component: () => import('@/views/Platform/bugManage/bugCreate'),
+            meta: { title: '新建Bug' }
+          },
+          {
+            path: 'bugQuery',
+            name: '查看Bug',
+            hidden: true,
+            component: () => import('@/views/Platform/bugManage/bugQuery'),
+            meta: { title: '查看Bug' }
+          },
+          {
+            path: 'bugUpdate',
+            name: '更新Bug',
+            hidden: true,
+            component: () => import('@/views/Platform/bugManage/bugUpdate'),
+            meta: { title: '更新Bug' }
+          }
+        ]
       },
       {
         path: 'teamPage',
@@ -222,7 +245,6 @@ export const constantRoutes = [
         meta: { title: '团队管理' }
       }]
   },
-
   {
     path: '/env-platform',
     component: Layout,
@@ -340,6 +362,42 @@ export const constantRoutes = [
       }
     ]
   },
+  
+  {
+    path: '/online-quality',
+    component: Layout,
+    redirect: '/online-quality/check-list',
+    name: '上线质检',
+    meta: { title: '上线质检', icon: '上线质检' },
+    children: [
+      {
+        path: 'check-list',
+        name: '模板管理',
+        component: () => import('@/views/online-quality/CheckConfig/index.vue'),
+        meta: { title: '模板管理' }
+      },
+      {
+        path: 'history-task',
+        name: '历史任务',
+        component: () => import('@/views/online-quality/HistoryTask/index.vue'),
+        meta: { title: '历史任务' }
+      },
+      {
+        path: 'history-task-details/:taskId',
+        props: true,
+        name: '历史任务详情',
+        hidden: true,
+        component: () => import('@/views/online-quality/HistoryTask/taskDetails.vue'),
+        meta: { title: '历史任务详情' }
+      },
+      {
+        path: 'block-server',
+        name: '阻断服务',
+        component: () => import('@/views/online-quality/BlockServer/index.vue'),
+        meta: { title: '阻断服务' }
+      }
+    ]
+  },
 
   { path: '*', redirect: '/404', hidden: true },
 

+ 30 - 0
src/utils/dateUtil.js

@@ -0,0 +1,30 @@
+// function parseTime (time) {
+//   return time.substring(0, 10) + ' ' + time.substring(11, 19)
+// }
+
+// function parseTimeStamp (timeStamp) {
+//   let d = new Date(timeStamp)
+//   d.
+// }
+
+export function dateFmt(fmt, date) {
+  // author: meizz
+  var o = {
+    'M+': date.getMonth() + 1, // 月份
+    'd+': date.getDate(), // 日
+    'h+': date.getHours(), // 小时
+    'm+': date.getMinutes(), // 分
+    's+': date.getSeconds(), // 秒
+    'q+': Math.floor((date.getMonth() + 3) / 3), // 季度
+    'S': date.getMilliseconds() // 毫秒
+  }
+  if (/(y+)/.test(fmt)) { fmt = fmt.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length)) }
+  for (var k in o) {
+    if (new RegExp('(' + k + ')').test(fmt)) { fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? (o[k]) : (('00' + o[k]).substr(('' + o[k]).length))) }
+  }
+  return fmt
+}
+
+export default {
+  dateFmt
+}

+ 356 - 0
src/views/Platform/bugManage/bugCreate.vue

@@ -0,0 +1,356 @@
+<template>
+  <div class="set-background">
+    <el-form ref="form" :model="form" :rules="serviceDataRules">
+      <div class="block">
+        <el-form-item prop="bugName" label="标题" :label-width="formLabelWidth"><el-input v-model="form.bugName" autocomplete="off" placeholder="普惠质量产品工具平台..." style="width:77.2%;" /></el-form-item>
+        <div style="display:flex;">
+          <el-form-item style="flex-grow:1" prop="bizId" label="业务线" :label-width="formLabelWidth1">
+            <el-select v-model="form.bizId" placeholder="业务线" style="width:54.5%;" @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 style="flex-grow:1" label="平台类型" prop="platformType" :label-width="formLabelWidth1">
+            <el-select ref="clearPlatform" v-model="form.platformType" placeholder="平台类型" style="width:54.5%;" @change="clickChangeBusiness(form.platformType)">
+              <el-option v-for="item in platformTypeStr" :key="item.name" :label="item.name" :value="item.name" />
+            </el-select>
+          </el-form-item>
+        </div>
+        <div style="display:flex;">
+          <el-form-item style="flex-grow:1" prop="taskId" label="任务" :label-width="formLabelWidth1">
+            <el-select v-model="form.taskId" filterable placeholder="任务" style="width:54.5%;">
+              <el-option v-for="item in taskIdStr" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </el-form-item>
+          <el-form-item style="flex-grow:1" label="业务模块" :label-width="formLabelWidth1">
+            <el-select ref="clearBusiness" v-model="form.businessType" placeholder="业务模块" style="width:54.5%;">
+              <el-option v-for="item in businessTypeStr" :key="item.name" :label="item.name" :value="item.name" />
+            </el-select>
+          </el-form-item>
+        </div>
+        <div style="display:flex;">
+          <el-form-item style="flex-grow:1" label="类型" prop="bugType" :label-width="formLabelWidth1">
+            <el-select v-model="form.bugType" style="width:54.5%;" placeholder="类型">
+              <el-option v-for="item in bugTypeStr" :key="item.name" :label="item.name" :value="item.name" />
+            </el-select>
+          </el-form-item>
+          <el-form-item style="flex-grow:1" label="发现方式" prop="discoveryMethod" :label-width="formLabelWidth1">
+            <el-select v-model="form.discoveryMethod" style="width:54.5%;" placeholder="发现方式">
+              <el-option v-for="item in discoveryMethodStr" :key="item.name" :label="item.name" :value="item.name" />
+            </el-select>
+          </el-form-item>
+        </div>
+        <div style="display:flex;">
+          <el-form-item style="flex-grow:1" label="级别" prop="priority" :label-width="formLabelWidth1">
+            <el-select v-model="form.priority" style="width:54.5%;" placeholder="级别">
+              <el-option v-for="item in bugLevelStr" :key="item.name" :label="item.name" :value="item.name" />
+            </el-select>
+          </el-form-item>
+          <el-form-item style="flex-grow:1" label="问题原因" prop="reason" :label-width="formLabelWidth1">
+            <el-select v-model="form.reason" style="width:54.5%;" placeholder="问题原因">
+              <el-option v-for="item in reasonStr" :key="item.name" :label="item.name" :value="item.name" />
+            </el-select>
+          </el-form-item>
+        </div>
+        <div style="display:flex;">
+          <el-form-item style="flex-grow:1" label="状态" prop="status" :label-width="formLabelWidth1">
+            <el-select v-model="form.status" placeholder="状态" style="width:54.5%;">
+              <el-option v-for="item in bugStatusStr" :key="item.name" :label="item.name" :value="item.name" />
+            </el-select>
+          </el-form-item>
+          <el-form-item style="flex-grow:1" label="所处阶段" prop="stage" :label-width="formLabelWidth1">
+            <el-select v-model="form.stage" placeholder="所处阶段" style="width:54.5%;">
+              <el-option v-for="item in stageStr" :key="item.name" :label="item.name" :value="item.name" />
+            </el-select>
+          </el-form-item>
+        </div>
+        <el-form-item label="bug描述" prop="bugDescribe" :label-width="formLabelWidth"><el-input v-model="form.bugDescribe" type="textarea" placeholder="bug描述" rows="2" style="width:77.2%;" /></el-form-item>
+      </div>
+      <div class="block">
+        <div style="display:flex;">
+          <el-form-item style="flex-grow:1" label="创建人" label-width="21%"><el-input v-model="form.creator" autocomplete="off" class="cancel-border" style="width:54.5%;" /></el-form-item>
+          <el-form-item style="flex-grow:1" label="bug责任人" prop="assigner" :label-width="formLabelWidth1"><el-input v-model="form.assigner" autocomplete="off" style="width:54.5%;" /></el-form-item>
+        </div>
+        <div style="display:flex;">
+          <el-form-item style="flex-grow:1" label="当前处理人" prop="currentHandler" :label-width="formLabelWidth1"><el-input v-model="form.currentHandler" autocomplete="off" style="width:55%;" /></el-form-item>
+          <el-form-item style="flex-grow:1" label="开始开发时间" label-width="24.5%">    <el-date-picker
+            v-model="form.startDevTime"
+            type="datetime"
+            placeholder="选择时间"
+            style="width:53%;"
+          /></el-form-item>
+        </div>
+        <div style="display:flex;">
+          <el-form-item style="flex-grow:1;" label="reopen次数" prop="reopenTimes" label-width="22.6%;"><el-input v-model="form.reopenTimes" autocomplete="off" style="width:56%;" /></el-form-item>
+          <el-form-item style="flex-grow:1;padding-right:15px;" label="提交测试时间" label-width="26.5%">    <el-date-picker
+            v-model="form.waitTestTime"
+            type="datetime"
+            placeholder="选择时间"
+            style="width:54%;"
+          /></el-form-item>
+        </div>
+      </div>
+      <div class="block">
+        <div style="display:flex;">
+          <el-form-item style="flex-grow:1" label="机型" :label-width="formLabelWidth1"><el-input v-model="form.model" autocomplete="off" style="width:54.5%;" /></el-form-item>
+          <el-form-item style="flex-grow:1" label="地图类型" :label-width="formLabelWidth1"><el-input v-model="form.mapType" autocomplete="off" style="width:54.5%;" /></el-form-item>
+        </div>
+        <div style="display:flex;">
+          <el-form-item style="flex-grow:1" label="OS类型" :label-width="formLabelWidth1"><el-input v-model="form.osType" autocomplete="off" style="width:54.5%;" /></el-form-item>
+          <el-form-item style="flex-grow:1" label="地图版本号" :label-width="formLabelWidth1"><el-input v-model="form.mapVersion" autocomplete="off" style="width:54.5%;" /></el-form-item>
+        </div>
+        <div style="display:flex;">
+          <el-form-item style="flex-grow:1" label="网络类型" :label-width="formLabelWidth1"><el-input v-model="form.networkType" autocomplete="off" style="width:54.5%;" /></el-form-item>
+          <el-form-item style="flex-grow:1" label="SDK版本" :label-width="formLabelWidth1"><el-input v-model="form.sdkVersion" autocomplete="off" style="width:54.5%;" /></el-form-item>
+        </div>
+        <div style="width:100%;">
+          <el-form-item label="app版本号" label-width="11%"><el-input v-model="form.appVersion" autocomplete="off" style="width:27.2%;" /></el-form-item>
+        </div>
+      </div>
+      <div class="block-end">
+        <div class="head">
+          <div class="font">备注</div>
+          <div>
+            <el-upload
+              class="upload-demo"
+              multiple
+              capture
+              accept="image/jpeg, image/png, image/gif, audio/mp4, video/mp4, audio/mpeg, application/vnd.ms-excel"
+              :on-change="handleChange"
+              :file-list="fileList"
+              action="http://page-daily.kuaidadi.com/upload/img.node"
+            >
+              <!-- 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" type="primary">点击上传</el-button>
+            </el-upload>
+          </div>
+        </div>
+        <el-input type="textarea" rows="5" />
+        <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 slot="footer" class="dialog-footer">
+    </div> -->
+  </div>
+</template>
+
+<script>
+import { bugGetEnum, taskListCreate, bugCreate } from '@/api/defectManage'
+import { projectGetTypeMap } from '@/api/projectPage'
+import { getTaskData } from '@/api/projectPage.js'
+
+export default {
+  data() {
+    return {
+      form: {
+        id: '',
+        bizId: '',
+        taskId: '',
+        platformType: '',
+        businessType: ''
+      },
+      businessTypeStr: [],
+      taskIdStr: '',
+      taskStatus: '',
+      platformTypeStr: [],
+      bugTypeStr: [],
+      discoveryMethodStr: [],
+      reasonStr: [],
+      bugStatusStr: [],
+      stageStr: [],
+      fileList: [],
+      serviceTypeEnumList: [],
+      clientTypeEnumList: [],
+      bugLevelStr: [{ name: 'p0', value: 0 }, { name: 'p1', value: 1 }, { name: 'p2', value: 2 }, { name: 'p3', value: 3 }],
+      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' }],
+        // 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: 'change' }],
+        currentHandler: [{ required: true, message: 'bug处理人不能为空', trigger: 'change' }],
+        bugDescribe: [{ required: true, message: 'bug描述不能为空', trigger: 'change' }]
+        // businessType: [{ required: true, message: '业务模块不能为空', trigger: 'change' }]
+      },
+      formLabelWidth: '11%',
+      formLabelWidth1: '22%',
+      userData: '',
+      userInformation: localStorage.getItem('username'),
+      userNames: localStorage.getItem('realname')
+    }
+  },
+  created() {
+    this.bugListSelect()
+    this.forkDown()
+    this.taskListGet()
+  },
+  methods: {
+    handleChange(file, fileList) {
+      this.fileList = fileList.slice(-3)
+      console.log(this.fileList)
+    },
+    async bugListSelect() {
+      await bugGetEnum().then(res => {
+        this.bugStatusStr = 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
+      })
+      if (this.$route.query.id) {
+        getTaskData(this.$route.query.id).then(res => {
+          this.taskStatus = res.data.status
+          this.$set(this.form, 'taskId', res.data.name)
+          this.$set(this.form, 'bizId', res.data.bizIdString)
+          this.$set(this.form, 'platformType', res.data.typeString)
+          this.$set(this.form, 'businessType', res.data.clientType)
+          this.platformTypeStr = this.bizOptions.filter(value => value.code === res.data.bizId)[0].child
+          if (this.form.businessType) {
+            this.businessTypeStr = this.platformTypeStr.filter(value => value.name === res.data.typeString)[0].child
+          }
+        })
+        this.taskListGet()
+      } else {
+        this.taskListGet()
+      }
+    },
+    forkDown() {
+      projectGetTypeMap().then(res => {
+        if (res.code === 200) {
+          this.bizOptions = res.data
+        } else {
+          this.errorFun()
+        }
+      })
+    },
+    taskListGet() {
+      taskListCreate({ statusList: [6, 7] }).then(res => { // 获取任务数据 (后期用this.taskStatus)
+        this.taskIdStr = res.data
+      })
+    },
+    // 业务线取子数据
+    clickChangePlatform(e) {
+      this.platformTypeStr = this.bizOptions.filter(value => value.code === e)[0].child
+      this.$set(this.form, 'platformType', '')
+      this.$set(this.form, 'businessType', '')
+    },
+    // 业务线取子数据
+    clickChangeBusiness(e) {
+      if (this.platformTypeStr.filter(value => value.name === e)[0].child) {
+        this.businessTypeStr = this.platformTypeStr.filter(value => value.name === e)[0].child
+      }
+      this.$set(this.form, 'businessType', '')
+    },
+    // 提交表单并且返回刷新
+    createFormData(form) {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          if (this.$route.query.id && typeof this.form.bizId === 'string') {
+            form.bizId = this.bizOptions.filter(value => value.name === form.bizId)[0].code
+          }
+          if (this.$route.query.id) {
+            form.taskId = this.taskIdStr.filter(value => value.name === form.taskId)[0].id
+          }
+          // form.bizId = this.bizJson
+          this.userData = { id: '', ename: this.userInformation, name: this.userNames }
+          this.objData = { bugBaseInfo: form, user: this.userData }
+          bugCreate(this.objData).then(res => {
+            res.code === 200 ? this.successFun() : this.errorFun()
+            this.$router.go(-1)
+          })
+        }
+      })
+    },
+    successFun() {
+      this.$notify({ title: 'Success', message: 'Created Successfully', type: 'success', duration: 2000 })
+    },
+    errorFun() {
+      this.$notify({ title: 'Failed', message: 'Created Failed', type: 'error', duration: 2000 })
+    }
+  }
+}
+</script>
+
+<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 1000px
+      margin-top 25px
+      padding 29px 50px
+      .cancel-border >>> .el-input__inner
+        border 1px solid #fff
+    .block-end
+      background-color rgba(255,255,255,1)
+      box-shadow 0px 0px 11px 0px rgba(238,240,245,1)
+      border-radius 7px
+      width 1000px
+      margin-top 25px
+      padding 29px 50px
+      margin-bottom 22px
+      .head
+        display flex
+        justify-content space-between
+        margin-bottom 16px
+        .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>

+ 240 - 0
src/views/Platform/bugManage/bugQuery.vue

@@ -0,0 +1,240 @@
+<template>
+  <div class="set-background">
+    <el-form :model="form">
+      <div class="block">
+        <el-form-item label="标题" :label-width="formLabelWidth">{{ form.bugName }}</el-form-item>
+        <div style="display:flex;">
+          <el-form-item label="级别" prop="priority" style="display:flex;" :label-width="twoLable">
+            <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.name" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="状态" prop="status" style="display:flex;" :label-width="twoLable">
+            <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.name" />
+            </el-select>
+          </el-form-item>
+          <el-button type="primary" style="height:40px" @click="enterUpdate">编 辑</el-button>
+        </div>
+        <el-form-item label="描述" prop="bugDescribe" :label-width="formLabelWidth">{{ form.bugDescribe }}</el-form-item>
+        <div class="wrap">
+          <el-form-item label="任务" label-width="18.5%" style="margin-right: 30px;">{{ form.projectName }}</el-form-item>
+          <el-form-item label="业务线" label-width="27%" style="margin-right: 30px;">{{ bizId }}</el-form-item>
+          <el-form-item label="平台类型" label-width="32%" style="margin-right: 30px;">{{ form.platformType }}</el-form-item>
+          <el-form-item label="类型" label-width="18.5%" style="margin-right: 30px;">{{ bugType }}</el-form-item>
+          <el-form-item label="业务模块" label-width="32%" style="margin-right: 30px;">{{ form.businessType }}</el-form-item>
+          <el-form-item label="所处阶段" label-width="32%" style="margin-right: 30px;">{{ form.stage }}</el-form-item>
+          <el-form-item label="发现方式" label-width="29.5%" style="margin-right: 30px;">{{ form.discoveryMethod }}</el-form-item>
+          <el-form-item label="问题原因" label-width="32%" style="margin-right: 30px;">{{ form.reason }}</el-form-item>
+        </div>
+      </div>
+      <div class="block-end">
+        <div class="wrap">
+          <el-form-item label="创建人 :" label-width="27%">{{ form.creator }}</el-form-item>
+          <el-form-item label="bug责任人 :" label-width="36%">{{ form.assigner }}</el-form-item>
+          <el-form-item label="当前处理人 :" label-width="36%">{{ currentHandler }}</el-form-item>
+          <el-form-item label="开始开发时间 :" label-width="42%">{{ form.startDevTime }}</el-form-item>
+          <el-form-item label="创建时间 :" label-width="32%">{{ form.gmtCreate }}</el-form-item>
+          <el-form-item label="提交测试时间 :" label-width="42%">{{ form.waitTestTime }}</el-form-item>
+          <el-form-item label="reopen次数 :" label-width="41%">{{ form.reopenTimes }}</el-form-item>
+        </div>
+      </div>
+    </el-form>
+    <el-dialog :visible.sync="dialogInDevelopment" width="40%">
+      <el-form ref="refeshDevelopmentDialog" :model="pauseData" :rules="serviceDataRules">
+        <el-form-item label="当前处理人" prop="pauseCurrentHandler" label-width="30%"><el-input v-model="pauseData.pauseCurrentHandler" autocomplete="off" style="width:55%;" /></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%">
+      <el-form ref="refeshWaitTestDialog" :model="pauseData" :rules="serviceDataRules">
+        <el-form-item label="当前处理人" prop="pauseCurrentHandler" label-width="30%"><el-input v-model="pauseData.pauseCurrentHandler" autocomplete="off" style="width:55%;" /></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:55%;">
+            <el-option v-for="item in reasonStr" :key="item.name" :label="item.name" :value="item.name" />
+          </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:55%;">
+            <el-option v-for="item in bugTypeStr" :key="item.name" :label="item.name" :value="item.name" />
+          </el-select>
+        </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>
+  </div>
+</template>
+
+<script>
+import { bugGetEnum, bugUpdate, bugGet } from '@/api/defectManage'
+
+export default {
+  data() {
+    return {
+      form: {
+        id: ''
+      },
+      pauseData: {
+        reasonPause: '',
+        bugTypePause: '',
+        pauseCurrentHandler: ''
+      },
+      serviceDataRules: {
+        pauseCurrentHandler: [{ required: true, message: '处理人不能为空', trigger: 'change' }],
+        reasonPause: [{ required: true, message: '问题原因不能为空', trigger: 'change' }],
+        bugTypePause: [{ required: true, message: 'bug类型不能为空', trigger: 'change' }]
+      },
+      bizId: '',
+      currentHandler: '',
+      formLabelWidth: '5.1%',
+      twoLable: '20%',
+      bugLevelStr: [],
+      bugStatusStr: [],
+      userData: '',
+      bugTypeStr: [],
+      reasonStr: [],
+      reason: [],
+      bugType: [],
+      bizIdEnumList: [],
+      userInformation: localStorage.getItem('username'),
+      userNames: localStorage.getItem('realname'),
+      dialogInDevelopment: false,
+      dialogWaitTest: false
+    }
+  },
+  created() {
+    this._initBegin()
+  },
+  methods: {
+    // 先后获取
+    async _initBegin() {
+      await bugGetEnum().then(res => {
+        this.bugStatusStr = res.data.bugEnumList
+        this.bugLevelStr = res.data.priorityEnumList
+        this.bizIdEnumList = res.data.bizIdEnumList
+        this.bugTypeStr = res.data.bugTypeEnumList
+        this.reasonStr = res.data.reasonEnumList
+      })
+      bugGet(this.$route.query.id).then(res => {
+        this.form = res.data
+        console.log(this.form)
+        for (const a of this.bizIdEnumList) {
+          if (this.form.bizId === a.code) {
+            this.bizId = a.name
+            this.currentHandler = this.form.currentHandler
+            this.reason = this.form.reason
+            this.bugType = this.form.bugType
+            return
+          } else {
+            this.bizId = ''
+          }
+        }
+        // this.bizId = this.form.bizId
+      })
+    },
+    priorityChange() {
+      this.queryFormData()
+    },
+    statusChange(e) {
+      if (e === '开发中') {
+        this.dialogInDevelopment = true
+      } else if (e === '待测试') {
+        this.dialogWaitTest = true
+      } else {
+        this.queryFormData()
+      }
+    },
+    queryFormData() {
+      // this.form.bizId = this.$route.params.pauseBizId
+      if (this.dialogWaitTest || this.dialogInDevelopment) {
+        this.form.currentHandler = this.pauseData.pauseCurrentHandler
+      }
+      this.userData = { id: '', ename: this.userInformation, name: this.userNames }
+      this.objData = { bugBaseInfo: this.form, 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()
+          }
+          this.$refs.refeshDevelopmentDialog.resetFields()
+        } else {
+          this.errorFun()
+        }
+        this.dialogInDevelopment = false
+      })
+    },
+    queryFormDataTest() {
+      if (this.dialogWaitTest || this.dialogInDevelopment) {
+        this.form.currentHandler = this.pauseData.pauseCurrentHandler
+        this.form.reason = this.pauseData.reasonPause
+        this.form.bugType = this.pauseData.bugTypePause
+      }
+      this.userData = { id: '', ename: this.userInformation, name: this.userNames }
+      this.objData = { bugBaseInfo: this.form, user: this.userData }
+      bugUpdate(this.objData).then(res => {
+        if (res.code === 200) {
+          this.successFun()
+          this.currentHandler = this.form.currentHandler
+          this.reason = this.form.reason
+          this.bugType = this.form.bugType
+          if (this.$refs.refeshWaitTestDialog !== undefined) {
+            this.$refs.refeshWaitTestDialog.resetFields()
+          }
+        } else {
+          this.errorFun()
+        }
+        this.dialogWaitTest = false
+      })
+    },
+    enterUpdate() {
+      this.$router.push({ name: '更新Bug', 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 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 1000px
+      margin-top 25px
+      padding 29px 50px
+      .wrap
+        display flex
+        flex-wrap wrap
+      .wrap >>> .el-form-item__content
+        width 250px
+    .block-end
+      background-color rgba(255,255,255,1)
+      box-shadow 0px 0px 11px 0px rgba(238,240,245,1)
+      border-radius 7px
+      width 1000px
+      margin-top 25px
+      padding 29px 50px
+      margin-bottom 22px
+      .wrap
+        display flex
+        flex-wrap wrap
+      .wrap >>> .el-form-item__content
+        width 250px
+</style>

+ 350 - 0
src/views/Platform/bugManage/bugUpdate.vue

@@ -0,0 +1,350 @@
+<template>
+  <div class="set-background">
+    <el-form ref="form" :model="form" :rules="serviceDataRules">
+      <div class="block">
+        <el-form-item label="标题" prop="bugName" :label-width="formLabelWidth"><el-input v-model="form.bugName" autocomplete="off" placeholder="普惠质量产品工具平台..." style="width:77.2%;" /></el-form-item>
+        <div style="display:flex;">
+          <el-form-item style="flex-grow:1" prop="bizId" label="业务线" :label-width="formLabelWidth1">
+            <el-select v-model="form.bizId" placeholder="业务线" style="width:54.5%;" @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 style="flex-grow:1" label="平台类型" prop="platformType" :label-width="formLabelWidth1">
+            <el-select ref="clearPlatform" v-model="form.platformType" placeholder="平台类型" style="width:54.5%;" @change="clickChangeBusiness(form.platformType)">
+              <el-option v-for="item in platformTypeStr" :key="item.name" :label="item.name" :value="item.name" />
+            </el-select>
+          </el-form-item>
+        </div>
+        <div style="display:flex;">
+          <el-form-item style="flex-grow:1" prop="taskId" label="任务" :label-width="formLabelWidth1">
+            <el-select v-model="form.taskId" filterable placeholder="任务" style="width:54.5%;">
+              <el-option v-for="item in taskIdStr" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </el-form-item>
+          <el-form-item style="flex-grow:1" label="业务模块" :label-width="formLabelWidth1">
+            <el-select ref="clearBusiness" v-model="form.businessType" placeholder="业务模块" style="width:54.5%;">
+              <el-option v-for="item in businessTypeStr" :key="item.name" :label="item.name" :value="item.name" />
+            </el-select>
+          </el-form-item>
+        </div>
+        <div style="display:flex;">
+          <el-form-item style="flex-grow:1" label="类型" prop="bugType" :label-width="formLabelWidth1">
+            <el-select v-model="form.bugType" style="width:54.5%;" placeholder="类型">
+              <el-option v-for="item in bugTypeStr" :key="item.name" :label="item.name" :value="item.name" />
+            </el-select>
+          </el-form-item>
+          <el-form-item style="flex-grow:1" label="发现方式" prop="discoveryMethod" :label-width="formLabelWidth1">
+            <el-select v-model="form.discoveryMethod" style="width:54.5%;" placeholder="发现方式">
+              <el-option v-for="item in discoveryMethodStr" :key="item.name" :label="item.name" :value="item.name" />
+            </el-select>
+          </el-form-item>
+        </div>
+        <div style="display:flex;">
+          <el-form-item style="flex-grow:1" label="级别" prop="priority" :label-width="formLabelWidth1">
+            <el-select v-model="form.priority" style="width:54.5%;" placeholder="级别">
+              <el-option v-for="item in bugLevelStr" :key="item.name" :label="item.name" :value="item.name" />
+            </el-select>
+          </el-form-item>
+          <el-form-item style="flex-grow:1" label="问题原因" prop="reason" :label-width="formLabelWidth1">
+            <el-select v-model="form.reason" style="width:54.5%;" placeholder="问题原因">
+              <el-option v-for="item in reasonStr" :key="item.name" :label="item.name" :value="item.name" />
+            </el-select>
+          </el-form-item>
+        </div>
+        <div style="display:flex;">
+          <el-form-item style="flex-grow:1" label="状态" prop="status" :label-width="formLabelWidth1">
+            <el-select v-model="form.status" placeholder="状态" style="width:54.5%;">
+              <el-option v-for="item in bugStatusStr" :key="item.name" :label="item.name" :value="item.name" />
+            </el-select>
+          </el-form-item>
+          <el-form-item style="flex-grow:1" label="所处阶段" prop="stage" :label-width="formLabelWidth1">
+            <el-select v-model="form.stage" placeholder="所处阶段" style="width:54.5%;">
+              <el-option v-for="item in stageStr" :key="item.name" :label="item.name" :value="item.name" />
+            </el-select>
+          </el-form-item>
+        </div>
+        <el-form-item label="bug描述" prop="bugDescribe" :label-width="formLabelWidth"><el-input v-model="form.bugDescribe" type="textarea" placeholder="bug描述" rows="2" style="width:77.2%;" /></el-form-item>
+      </div>
+      <div class="block">
+        <div style="display:flex;">
+          <el-form-item style="flex-grow:1" label="创建人" label-width="21%"><el-input v-model="form.creator" autocomplete="off" class="cancel-border" style="width:54.5%;" /></el-form-item>
+          <el-form-item style="flex-grow:1" label="bug责任人" prop="assigner" :label-width="formLabelWidth1"><el-input v-model="form.assigner" autocomplete="off" style="width:54.5%;" /></el-form-item>
+        </div>
+        <div style="display:flex;">
+          <el-form-item style="flex-grow:1" label="当前处理人" prop="currentHandler" :label-width="formLabelWidth1"><el-input v-model="form.currentHandler" autocomplete="off" style="width:55%;" /></el-form-item>
+          <el-form-item style="flex-grow:1" label="开始开发时间" label-width="24.5%">    <el-date-picker
+            v-model="form.startDevTime"
+            type="datetime"
+            placeholder="选择时间"
+            style="width:53%;"
+          /></el-form-item>
+        </div>
+        <div style="display:flex;">
+          <el-form-item style="flex-grow:1;" label="reopen次数" prop="reopenTimes" label-width="22.6%;"><el-input v-model="form.reopenTimes" autocomplete="off" style="width:56%;" /></el-form-item>
+          <el-form-item style="flex-grow:1;padding-right:15px;" label="提交测试时间" label-width="26.5%">    <el-date-picker
+            v-model="form.waitTestTime"
+            type="datetime"
+            placeholder="选择时间"
+            style="width:54%;"
+          /></el-form-item>
+        </div>
+      </div>
+      <div class="block">
+        <div style="display:flex;">
+          <el-form-item style="flex-grow:1" label="机型" :label-width="formLabelWidth1"><el-input v-model="form.model" autocomplete="off" style="width:54.5%;" /></el-form-item>
+          <el-form-item style="flex-grow:1" label="地图类型" :label-width="formLabelWidth1"><el-input v-model="form.mapType" autocomplete="off" style="width:54.5%;" /></el-form-item>
+        </div>
+        <div style="display:flex;">
+          <el-form-item style="flex-grow:1" label="OS类型" :label-width="formLabelWidth1"><el-input v-model="form.osType" autocomplete="off" style="width:54.5%;" /></el-form-item>
+          <el-form-item style="flex-grow:1" label="地图版本号" :label-width="formLabelWidth1"><el-input v-model="form.mapVersion" autocomplete="off" style="width:54.5%;" /></el-form-item>
+        </div>
+        <div style="display:flex;">
+          <el-form-item style="flex-grow:1" label="网络类型" :label-width="formLabelWidth1"><el-input v-model="form.networkType" autocomplete="off" style="width:54.5%;" /></el-form-item>
+          <el-form-item style="flex-grow:1" label="SDK版本" :label-width="formLabelWidth1"><el-input v-model="form.sdkVersion" autocomplete="off" style="width:54.5%;" /></el-form-item>
+        </div>
+        <div style="width:100%;">
+          <el-form-item label="app版本号" label-width="11%"><el-input v-model="form.appVersion" autocomplete="off" style="width:27.2%;" /></el-form-item>
+        </div>
+      </div>
+      <div class="block-end">
+        <div class="head">
+          <div class="font">备注</div>
+          <div>
+            <el-upload
+              class="upload-demo"
+              multiple
+              capture
+              accept="image/jpeg, image/png, image/gif, audio/mp4, video/mp4, audio/mpeg, application/vnd.ms-excel"
+              :on-change="handleChange"
+              :file-list="fileList"
+              action="http://star.xiaojukeji.com/upload/img.node"
+            >
+              <!-- 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" type="primary">点击上传</el-button>
+            </el-upload>
+          </div>
+        </div>
+        <el-input type="textarea" rows="5" />
+        <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 slot="footer" class="dialog-footer">
+    </div> -->
+  </div>
+</template>
+
+<script>
+import { bugGetEnum, taskListCreate, bugUpdate, bugGet } from '@/api/defectManage'
+import { projectGetTypeMap } from '@/api/projectPage'
+
+export default {
+  data() {
+    return {
+      form: {
+        id: '',
+        platformType: '',
+        businessType: ''
+      },
+      businessTypeStr: [],
+      taskIdStr: '',
+      platformTypeStr: [],
+      bugTypeStr: [],
+      discoveryMethodStr: [],
+      reasonStr: [],
+      bugStatusStr: [],
+      stageStr: [],
+      fileList: [],
+      serviceTypeEnumList: [],
+      clientTypeEnumList: [],
+      bugLevelStr: [{ name: 'p0', value: 0 }, { name: 'p1', value: 1 }, { name: 'p2', value: 2 }, { name: 'p3', value: 3 }],
+      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' }],
+        // 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: 'change' }],
+        currentHandler: [{ required: true, message: 'bug处理人不能为空', trigger: 'change' }],
+        bugDescribe: [{ required: true, message: 'bug描述不能为空', trigger: 'change' }]
+        // businessType: [{ required: true, message: '业务模块不能为空', trigger: 'change' }]
+      },
+      formLabelWidth: '11%',
+      formLabelWidth1: '22%',
+      userData: '',
+      userInformation: localStorage.getItem('username'),
+      userNames: localStorage.getItem('realname')
+    }
+  },
+  created() {
+    this._initBegin()
+    this.forkDown()
+    this.taskIdGet()
+  },
+  methods: {
+    handleChange(file, fileList) {
+      this.fileList = fileList.slice(-3)
+      console.log(this.fileList)
+    },
+    async _initBegin() {
+      await bugGetEnum().then(res => {
+        this.bugStatusStr = 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
+      })
+      bugGet(this.$route.query.id).then(res => {
+        this.form = res.data
+        this.platformTypeStr = this.bizOptions.filter(value => value.code === this.form.bizId)[0].child
+        if (this.form.businessType) {
+          this.businessTypeStr = this.platformTypeStr.filter(value => value.name === this.form.platformType)[0].child
+        }
+        // for (const a of this.bizIdEnumList) {
+        //   if (this.form.bizId === a.code) {
+        //     this.bizId = a.name
+        //     this.currentHandler = this.form.currentHandler
+        //     this.reason = this.form.reason
+        //     this.bugType = this.form.bugType
+        //     return
+        //   } else {
+        //     this.bizId = ''
+        //   }
+        // }
+        // this.bizId = this.form.bizId
+      })
+    },
+    forkDown() {
+      projectGetTypeMap().then(res => {
+        if (res.code === 200) {
+          this.bizOptions = res.data
+        } else {
+          this.errorFun()
+        }
+      })
+    },
+    // 获取任务数据
+    taskIdGet() {
+      taskListCreate({ statusList: [6, 7] }).then(res => {
+        this.taskIdStr = res.data
+      })
+    },
+    // 业务线取子数据
+    clickChangePlatform(e) {
+      this.platformTypeStr = this.bizOptions.filter(value => value.code === e)[0].child
+      this.$set(this.form, 'platformType', '')
+      this.$set(this.form, 'businessType', '')
+    },
+    // 业务线取子数据
+    clickChangeBusiness(e) {
+      if (this.platformTypeStr.filter(value => value.name === e)[0].child) {
+        this.businessTypeStr = this.platformTypeStr.filter(value => value.name === e)[0].child
+      }
+      this.$set(this.form, 'businessType', '')
+    },
+    // 提交表单并且返回刷新
+    createFormData(form) {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          // form.bizId = this.bizJson
+          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 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 1000px
+      margin-top 25px
+      padding 29px 50px
+      .cancel-border >>> .el-input__inner
+        border 1px solid #fff
+    .block-end
+      background-color rgba(255,255,255,1)
+      box-shadow 0px 0px 11px 0px rgba(238,240,245,1)
+      border-radius 7px
+      width 1000px
+      margin-top 25px
+      padding 29px 50px
+      margin-bottom 22px
+      .head
+        display flex
+        justify-content space-between
+        margin-bottom 16px
+        .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>

+ 235 - 210
src/views/Platform/defectManagement.vue

@@ -1,122 +1,132 @@
 <template>
-  <div>
+  <div style="position:relative">
+    <router-view />
     <!--缺陷管理-->
-    <div style="margin: 2% 0;">
-      <el-form :model="queryCode">
-        <el-select v-model="queryCode.taskId" clearable placeholder="任务" style="width:10%;margin:0 5px;">
-          <el-option v-for="item in taskIdStr" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
-        <el-select v-model="queryCode.status" clearable placeholder="bug状态" style="width:10%;margin-right:5px;">
-          <el-option v-for="item in bugStatusStr" :key="item.code" :label="item.name" :value="item.code" />
-        </el-select>
-        <el-input v-model="queryCode.currentHandler" clearable filterable placeholder="经办人" style="width:12%;margin-right:5px;" />
-        <el-input v-model="queryCode.creator" clearable filterable placeholder="创建人" style="width:12%;margin-right:5px;" />
-        <el-date-picker v-model="queryCode.gmtCreateBegin" style="width:12%;margin-right:5px;" type="datetime" placeholder="创建时间" /> -
-        <el-date-picker v-model="queryCode.gmtCreateEnd" style="width:12%;margin-right:5px;" type="datetime" placeholder="截止时间" />
-        <el-input v-model="queryCode.bugName" clearable filterable placeholder="主题" style="width:12%;margin-right:5px;" />
-        <el-button type="primary" @click="dataQuery(queryCode)">查询</el-button>
-        <el-button type="primary" style="margin: 1% 5px;" @click="createdCode()">新建bug</el-button>
-      </el-form>
-    </div>
+    <div style="position: absolute;width: 100%;">
+      <div style="margin: 2% 0;">
+        <el-form :model="queryCode">
+          <el-select v-model="queryCode.taskId" clearable placeholder="任务" style="width:10%;margin:0 5px;">
+            <el-option v-for="item in taskIdStr" :key="item.id" :label="item.name" :value="item.id" />
+          </el-select>
+          <el-select v-model="queryCode.status" clearable placeholder="bug状态" style="width:10%;margin-right:5px;">
+            <el-option v-for="item in bugStatusStr" :key="item.code" :label="item.name" :value="item.code" />
+          </el-select>
+          <el-input v-model="queryCode.currentHandler" clearable filterable placeholder="经办人" style="width:12%;margin-right:5px;" />
+          <el-input v-model="queryCode.creator" clearable filterable placeholder="创建人" style="width:12%;margin-right:5px;" />
+          <el-date-picker v-model="queryCode.gmtCreateBegin" style="width:12%;margin-right:5px;" type="datetime" placeholder="创建时间" /> -
+          <el-date-picker v-model="queryCode.gmtCreateEnd" style="width:12%;margin-right:5px;" type="datetime" placeholder="截止时间" />
+          <el-input v-model="queryCode.bugName" clearable filterable placeholder="主题" style="width:12%;margin-right:5px;" />
+          <el-button type="primary" @click="dataQuery(queryCode)">查询</el-button>
+          <el-button type="primary" style="margin: 1% 5px;" @click="createdCode()">新建bug</el-button>
+        </el-form>
+      </div>
 
-    <el-table :data="tableData" fit style="width: 950%">
-      <el-table-column label="ID" width="120" align="center">
-        <template slot-scope="scope"><span>{{ scope.row.id }}</span></template>
-      </el-table-column>
-      <el-table-column label="主题" width="230" align="center">
-        <template slot-scope="scope"><a href="javascript:void(0)" style="color:#20a0ff" @click="toReportView(scope.row.id)">{{ scope.row.bugName }}</a></template>
-      </el-table-column>
-      <el-table-column label="处理人" width="150" align="center">
-        <template slot-scope="scope"><span>{{ scope.row.currentHandler }}</span></template>
-      </el-table-column>
-      <el-table-column label="创建日期" width="250" align="center">
-        <template slot-scope="scope">
-          <span>{{ scope.row.gmtCreate }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="级别" width="150" align="center">
-        <template slot-scope="scope"><span>{{ scope.row.priority }}</span></template>
-      </el-table-column>
-      <el-table-column label="状态" width="150" align="center">
-        <template slot-scope="scope"><span>{{ scope.row.status }}</span></template>
-      </el-table-column>
-      <el-table-column fixed="right" label="操作" width="150" align="center">
-        <template slot-scope="scope">
-          <el-button size="mini" type="primary" @click="queryPresentation(scope.row)">更新</el-button>
-          <el-button size="mini" type="primary" @click="delePresentation(scope.row.id)">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
+      <el-table :data="tableData" fit style="width: 950%">
+        <el-table-column label="ID" width="120" align="center">
+          <template slot-scope="scope"><span>{{ scope.row.id }}</span></template>
+        </el-table-column>
+        <el-table-column label="主题" width="230" align="center">
+          <template slot-scope="scope"><a href="javascript:void(0)" style="color:#20a0ff" @click="toReportView(scope.row.id)">{{ scope.row.bugName }}</a></template>
+        </el-table-column>
+        <el-table-column label="处理人" width="150" align="center">
+          <template slot-scope="scope"><span>{{ scope.row.currentHandler }}</span></template>
+        </el-table-column>
+        <el-table-column label="创建日期" width="250" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.gmtCreate }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="级别" width="150" align="center">
+          <template slot-scope="scope"><span>{{ scope.row.priority }}</span></template>
+        </el-table-column>
+        <el-table-column label="状态" width="150" align="center">
+          <template slot-scope="scope"><span>{{ scope.row.status }}</span></template>
+        </el-table-column>
+        <el-table-column fixed="right" label="操作" width="150" align="center">
+          <template slot-scope="scope">
+            <el-button size="mini" type="primary" @click="queryPresentation(scope.row)">更新</el-button>
+            <el-button size="mini" type="primary" @click="delePresentation(scope.row.id)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
 
-    <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" />
+      <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" />
 
-    <el-dialog :title="titName" :visible.sync="dialogFormVisible" width="60%">
-      <el-form ref="form" :model="form" :rules="serviceDataRules">
-        <div style="display:flex;">
-          <el-form-item style="flex:1" label="任务" :label-width="formLabelWidth">
-            <el-select v-model="form.taskId" placeholder="任务" style="width:67%;">
-              <el-option v-for="item in taskIdStr" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-          <el-form-item style="flex:1" label="业务线" :label-width="formLabelWidth">
-            <el-select v-model="form.bizId" placeholder="业务线" style="width:67%;">
-              <el-option v-for="item in bizOptions" :key="item.value" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </div>
-        <el-form-item label="主题" prop="bugName" :label-width="formLabelWidth"><el-input v-model="form.bugName" autocomplete="off" style="width:86%;" /></el-form-item>
-        <el-form-item label="bug描述" prop="bugDescribe" :label-width="formLabelWidth"><el-input v-model="form.bugDescribe" type="textarea" placeholder="bug描述" rows="4" style="width:86%;" /></el-form-item>
-        <div style="display:flex;">
-          <div style="flex:1">
-            <el-form-item label="bug类型" prop="bugType" :label-width="formLabelWidth">
-              <el-select v-model="form.bugType" placeholder="bug类型">
-                <el-option v-for="item in bugTypeStr" :key="item.name" :label="item.name" :value="item.name" />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="级别" prop="priority" :label-width="formLabelWidth">
-              <el-select v-model="form.priority" placeholder="级别">
-                <el-option v-for="item in bugLevelStr" :key="item.name" :label="item.name" :value="item.name" />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="状态" prop="status" :label-width="formLabelWidth">
-              <el-select v-model="form.status" placeholder="状态" @change="buildShow(form.status)">
-                <el-option v-for="item in bugStatusStr" :key="item.name" :label="item.name" :value="item.name" />
-              </el-select>
-            </el-form-item>
+      <el-dialog class="adjustHeight" :title="titName" :visible.sync="dialogFormVisible" width="70%">
+        <el-form ref="form" :model="form" :rules="serviceDataRules">
+          <div class="set-background">
+            <el-form-item label="标题" :label-width="formLabelWidth"><el-input v-model="form.bugName" autocomplete="off" placeholder="普惠质量产品工具平台..." style="width:77.2%;" /></el-form-item>
+            <div style="display:flex;">
+              <el-form-item style="flex-grow:1" prop="bizId" label="业务线" :label-width="formLabelWidth1">
+                <el-select v-model="form.bizId" placeholder="业务线" style="width:54.5%;">
+                  <el-option v-for="item in bizOptions" :key="item.value" :label="item.name" :value="item.value" />
+                </el-select>
+              </el-form-item>
+              <el-form-item style="flex-grow:1" label="业务模块" prop="businessType" :label-width="formLabelWidth1">
+                <el-select v-model="form.businessType" placeholder="业务模块" style="width:54.5%;">
+                  <el-option v-for="item in businessTypeStr" :key="item.name" :label="item.name" :value="item.name" />
+                </el-select>
+              </el-form-item>
+            </div>
+            <div style="display:flex;">
+              <el-form-item style="flex-grow:1" prop="taskId" label="任务" :label-width="formLabelWidth1">
+                <el-select v-model="form.taskId" placeholder="任务" style="width:54.5%;">
+                  <el-option v-for="item in taskIdStr" :key="item.id" :label="item.name" :value="item.id" />
+                </el-select>
+              </el-form-item>
+              <el-form-item style="flex-grow:1" label="平台类型" prop="platformType" :label-width="formLabelWidth1">
+                <el-select v-model="form.platformType" placeholder="平台类型" style="width:54.5%;" @change="clickChangeType(form.platformType)">
+                  <el-option v-for="item in platformTypeStr" :key="item.name" :label="item.name" :value="item.name" />
+                </el-select>
+              </el-form-item>
+            </div>
+            <div style="display:flex;">
+              <el-form-item style="flex-grow:1" label="类型" prop="bugType" :label-width="formLabelWidth1">
+                <el-select v-model="form.bugType" style="width:54.5%;" placeholder="类型">
+                  <el-option v-for="item in bugTypeStr" :key="item.name" :label="item.name" :value="item.name" />
+                </el-select>
+              </el-form-item>
+              <el-form-item style="flex-grow:1" label="发现方式" prop="discoveryMethod" :label-width="formLabelWidth1">
+                <el-select v-model="form.discoveryMethod" style="width:54.5%;" placeholder="发现方式">
+                  <el-option v-for="item in discoveryMethodStr" :key="item.name" :label="item.name" :value="item.name" />
+                </el-select>
+              </el-form-item>
+            </div>
+            <div style="display:flex;">
+              <el-form-item style="flex-grow:1" label="级别" prop="priority" :label-width="formLabelWidth1">
+                <el-select v-model="form.priority" style="width:54.5%;" placeholder="级别">
+                  <el-option v-for="item in bugLevelStr" :key="item.name" :label="item.name" :value="item.name" />
+                </el-select>
+              </el-form-item>
+              <el-form-item style="flex-grow:1" label="问题原因" prop="reason" :label-width="formLabelWidth1">
+                <el-select v-model="form.reason" style="width:54.5%;" placeholder="问题原因">
+                  <el-option v-for="item in reasonStr" :key="item.name" :label="item.name" :value="item.name" />
+                </el-select>
+              </el-form-item>
+            </div>
+            <div style="display:flex;">
+              <el-form-item style="flex-grow:1" label="状态" prop="status" :label-width="formLabelWidth1">
+                <el-select v-model="form.status" placeholder="状态" style="width:54.5%;" @change="buildShow(form.status)">
+                  <el-option v-for="item in bugStatusStr" :key="item.name" :label="item.name" :value="item.name" />
+                </el-select>
+              </el-form-item>
+              <el-form-item style="flex-grow:1" label="所处阶段" prop="stage" :label-width="formLabelWidth1">
+                <el-select v-model="form.stage" placeholder="所处阶段" style="width:54.5%;">
+                  <el-option v-for="item in stageStr" :key="item.name" :label="item.name" :value="item.name" />
+                </el-select>
+              </el-form-item>
+            </div>
+            <el-form-item label="bug描述" prop="bugDescribe" :label-width="formLabelWidth"><el-input v-model="form.bugDescribe" type="textarea" placeholder="bug描述" rows="2" style="width:77.2%;" /></el-form-item>
+          </div>
+          <div style="display:flex;">
+            <el-form-item label="创建人" :label-width="formLabelWidth"><el-input v-model="form.creator" autocomplete="off" style="width:67%;" /></el-form-item>
             <el-form-item label="bug责任人" prop="assigner" :label-width="formLabelWidth"><el-input v-model="form.assigner" autocomplete="off" style="width:67%;" /></el-form-item>
-            <el-form-item label="发现方法" :label-width="formLabelWidth">
-              <el-select v-model="form.discoveryMethod" placeholder="发现方法">
-                <el-option v-for="item in discoveryMethodStr" :key="item.name" :label="item.name" :value="item.name" />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="os类型" :label-width="formLabelWidth"><el-input v-model="form.osType" autocomplete="off" style="width:67%;" /></el-form-item>
-            <el-form-item label="机型" :label-width="formLabelWidth"><el-input v-model="form.model" autocomplete="off" style="width:67%;" /></el-form-item>
-            <el-form-item label="网络类型" :label-width="formLabelWidth"><el-input v-model="form.networkType" autocomplete="off" style="width:67%;" /></el-form-item>
-
-            <el-form-item v-show="statusShow" label="问题原因和修复方法" :label-width="formLabelWidth"><el-input v-model="form.reasonsAndSolutionForTheProblem" type="textarea" placeholder="问题原因和修复方法" rows="4" style="width:67%;" /></el-form-item>
           </div>
           <div style="flex:1">
-            <el-form-item label="平台类型" prop="platformType" :label-width="formLabelWidth">
-              <el-select v-model="form.platformType" placeholder="平台类型" @change="clickChangeType(form.platformType)">
-                <el-option v-for="item in platformTypeStr" :key="item.name" :label="item.name" :value="item.name" />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="业务模块" prop="businessType" :label-width="formLabelWidth">
-              <el-select v-model="form.businessType" placeholder="业务模块">
-                <el-option v-for="item in businessTypeStr" :key="item.name" :label="item.name" :value="item.name" />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="所处阶段" prop="stage" :label-width="formLabelWidth">
-              <el-select v-model="form.stage" placeholder="所处阶段">
-                <el-option v-for="item in stageStr" :key="item.name" :label="item.name" :value="item.name" />
-              </el-select>
-            </el-form-item>
+            <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 label="bug处理人" prop="currentHandler" :label-width="formLabelWidth"><el-input v-model="form.currentHandler" autocomplete="off" style="width:67%;" /></el-form-item>
-            <el-form-item label="问题原因" :label-width="formLabelWidth">
-              <el-select v-model="form.reason" placeholder="问题原因">
-                <el-option v-for="item in reasonStr" :key="item.name" :label="item.name" :value="item.name" />
-              </el-select>
-            </el-form-item>
             <el-form-item label="app版本号" :label-width="formLabelWidth"><el-input v-model="form.appVersion" autocomplete="off" style="width:67%;" /></el-form-item>
             <el-form-item label="地图类型" :label-width="formLabelWidth"><el-input v-model="form.mapType" autocomplete="off" style="width:67%;" /></el-form-item>
             <el-form-item label="地图版本号" :label-width="formLabelWidth"><el-input v-model="form.mapVersion" autocomplete="off" style="width:67%;" /></el-form-item>
@@ -127,99 +137,99 @@
               </el-select>
             </el-form-item>
           </div>
-        </div>
-        <el-form-item label="附件" :label-width="formLabelWidth">
-          <el-upload
-            class="upload-demo"
-            multiple
-            capture
-            accept="image/jpeg, image/png, image/gif, audio/mp4, video/mp4, audio/mpeg, application/vnd.ms-excel"
-            :on-change="handleChange"
-            :file-list="fileList"
-            action="http://star.xiaojukeji.com/upload/img.node"
-          >
-            <!-- 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" type="primary">点击上传</el-button>
-          </el-upload>
-        </el-form-item>
+          <el-form-item label="附件" :label-width="formLabelWidth">
+            <el-upload
+              class="upload-demo"
+              multiple
+              capture
+              accept="image/jpeg, image/png, image/gif, audio/mp4, video/mp4, audio/mpeg, application/vnd.ms-excel"
+              :on-change="handleChange"
+              :file-list="fileList"
+              action="http://page-daily.kuaidadi.com/upload/img.node"
+            >
+              <!-- 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" type="primary">点击上传</el-button>
+            </el-upload>
+          </el-form-item>
 
-        <!-- <el-form-item label="逻辑删" :label-width="formLabelWidth">
+          <!-- <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 slot="footer" class="dialog-footer">
-        <el-button @click="dialogFormVisible = false">取 消</el-button>
-        <el-button type="primary" @click="titName === '新建' ? createFormData(form) : queryFormData(form)">确 定</el-button>
-      </div>
-    </el-dialog>
+          <!-- <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 slot="footer" class="dialog-footer">
+          <el-button @click="dialogFormVisible = false">取 消</el-button>
+          <el-button type="primary" @click="titName === '新建' ? createFormData(form) : queryFormData(form)">确 定</el-button>
+        </div>
+      </el-dialog>
 
-    <el-dialog :visible.sync="dialogFormQuery" :fullscreen="true">
-      <el-form :model="form" size="mini">
-        <el-form-item :label-width="formLabelWidth" style="margin-bottom:-10px;"><span style="font-weight:bold;font-size:20px;margin-left:-60px;">主题 : </span>{{ form.bugName }}</el-form-item><hr>
-        <div style="display:flex;">
-          <div style="flex:1">
-            <el-form-item label="任务 : " class="styline" :label-width="formLabelWidth1">{{ form.projectName }}</el-form-item>
-            <el-form-item label="级别 : " :label-width="formLabelWidth1">{{ form.priority }}</el-form-item>
-            <el-form-item label="reopen的次数 : " :label-width="formLabelWidth1">{{ form.reopenTimes }}</el-form-item>
-            <el-form-item label="bug状态 : " :label-width="formLabelWidth1">{{ form.status }}</el-form-item>
-            <el-form-item label="bug类型 : " :label-width="formLabelWidth1">{{ form.bugType }}</el-form-item>
-            <el-form-item label="bug描述 : " :label-width="formLabelWidth1">{{ form.bugDescribe }}</el-form-item>
-            <el-form-item v-show="statusShow" label="问题原因和修复方法" :label-width="formLabelWidth">{{ form.reasonsAndSolutionForTheProblem }}</el-form-item>
-            <el-form-item label="问题原因 : " :label-width="formLabelWidth1">{{ form.reason }}</el-form-item>
-            <el-form-item label="平台类型 : " :label-width="formLabelWidth1">{{ form.platformType }}</el-form-item>
-            <el-form-item label="业务模块 : " :label-width="formLabelWidth1">{{ form.businessType }}</el-form-item>
-            <el-form-item label="所处阶段 : " :label-width="formLabelWidth1">{{ form.stage }}</el-form-item>
-            <el-form-item label="发现方法 : " :label-width="formLabelWidth1">{{ form.discoveryMethod }}</el-form-item>
-            <el-form-item v-show="repairShow" label="修复结果 : " :label-width="formLabelWidth1">{{ form.repairResult }}</el-form-item>
-            <el-form-item label="os类型 : " :label-width="formLabelWidth1">{{ form.osType }}</el-form-item>
-            <el-form-item label="机型 : " :label-width="formLabelWidth1">{{ form.model }}</el-form-item>
-            <el-form-item label="网络类型 : " :label-width="formLabelWidth1">{{ form.networkType }}</el-form-item>
-            <el-form-item label="SDK版本 : " :label-width="formLabelWidth1">{{ form.sdkVersion }}</el-form-item>
-            <el-form-item label="app版本号 : " :label-width="formLabelWidth1">{{ form.appVersion }}</el-form-item>
-            <el-form-item label="地图类型 : " :label-width="formLabelWidth1">{{ form.mapType }}</el-form-item>
-            <el-form-item label="地图版本号 : " :label-width="formLabelWidth1">{{ form.mapVersion }}</el-form-item>
-            <el-form-item label="附件 : " :label-width="formLabelWidth1">{{ form.accessory }}</el-form-item>
+      <el-dialog :visible.sync="dialogFormQuery" width="70%">
+        <el-form :model="form" size="mini">
+          <el-form-item :label-width="formLabelWidth" style="margin-bottom:-10px;"><span style="font-weight:bold;font-size:20px;margin-left:-60px;">主题 : </span>{{ form.bugName }}</el-form-item><hr>
+          <div style="display:flex;">
+            <div style="flex:1">
+              <el-form-item label="任务 : " class="styline" :label-width="formLabelWidth1">{{ form.projectName }}</el-form-item>
+              <el-form-item label="级别 : " :label-width="formLabelWidth1">{{ form.priority }}</el-form-item>
+              <el-form-item label="reopen的次数 : " :label-width="formLabelWidth1">{{ form.reopenTimes }}</el-form-item>
+              <el-form-item label="bug状态 : " :label-width="formLabelWidth1">{{ form.status }}</el-form-item>
+              <el-form-item label="bug类型 : " :label-width="formLabelWidth1">{{ form.bugType }}</el-form-item>
+              <el-form-item label="bug描述 : " :label-width="formLabelWidth1">{{ form.bugDescribe }}</el-form-item>
+              <el-form-item v-show="statusShow" label="问题原因和修复方法" :label-width="formLabelWidth">{{ form.reasonsAndSolutionForTheProblem }}</el-form-item>
+              <el-form-item label="问题原因 : " :label-width="formLabelWidth1">{{ form.reason }}</el-form-item>
+              <el-form-item label="平台类型 : " :label-width="formLabelWidth1">{{ form.platformType }}</el-form-item>
+              <el-form-item label="业务模块 : " :label-width="formLabelWidth1">{{ form.businessType }}</el-form-item>
+              <el-form-item label="所处阶段 : " :label-width="formLabelWidth1">{{ form.stage }}</el-form-item>
+              <el-form-item label="发现方法 : " :label-width="formLabelWidth1">{{ form.discoveryMethod }}</el-form-item>
+              <el-form-item v-show="repairShow" label="修复结果 : " :label-width="formLabelWidth1">{{ form.repairResult }}</el-form-item>
+              <el-form-item label="os类型 : " :label-width="formLabelWidth1">{{ form.osType }}</el-form-item>
+              <el-form-item label="机型 : " :label-width="formLabelWidth1">{{ form.model }}</el-form-item>
+              <el-form-item label="网络类型 : " :label-width="formLabelWidth1">{{ form.networkType }}</el-form-item>
+              <el-form-item label="SDK版本 : " :label-width="formLabelWidth1">{{ form.sdkVersion }}</el-form-item>
+              <el-form-item label="app版本号 : " :label-width="formLabelWidth1">{{ form.appVersion }}</el-form-item>
+              <el-form-item label="地图类型 : " :label-width="formLabelWidth1">{{ form.mapType }}</el-form-item>
+              <el-form-item label="地图版本号 : " :label-width="formLabelWidth1">{{ form.mapVersion }}</el-form-item>
+              <el-form-item label="附件 : " :label-width="formLabelWidth1">{{ form.accessory }}</el-form-item>
+            </div>
+            <div style="flex:1; margin-left:30px;">
+              <el-form-item label="业务线 : " :label-width="formLabelWidth1">{{ form.bizId }}</el-form-item>
+              <el-form-item label="bug责任人 : " :label-width="formLabelWidth1">{{ form.assigner }}</el-form-item>
+              <el-form-item label="bug创建人 : " :label-width="formLabelWidth1">{{ form.creator }}</el-form-item>
+              <el-form-item label="bug处理人 : " :label-width="formLabelWidth1">{{ form.currentHandler }}</el-form-item>
+              <el-form-item label="开始开发时间 : " :label-width="formLabelWidth1">{{ form.startDevTime }}</el-form-item>
+              <el-form-item label="开始等待测试时间 : " :label-width="formLabelWidth1">{{ form.waitTestTime }}</el-form-item>
+              <el-form-item label="创建时间 : " :label-width="formLabelWidth1">{{ form.gmtCreate }}</el-form-item>
+            </div>
           </div>
-          <div style="flex:1; margin-left:30px;">
-            <el-form-item label="业务线 : " :label-width="formLabelWidth1">{{ form.bizId }}</el-form-item>
-            <el-form-item label="bug责任人 : " :label-width="formLabelWidth1">{{ form.assigner }}</el-form-item>
-            <el-form-item label="bug创建人 : " :label-width="formLabelWidth1">{{ form.creator }}</el-form-item>
-            <el-form-item label="bug处理人 : " :label-width="formLabelWidth1">{{ form.currentHandler }}</el-form-item>
-            <el-form-item label="开始开发时间 : " :label-width="formLabelWidth1">{{ form.startDevTime }}</el-form-item>
-            <el-form-item label="开始等待测试时间 : " :label-width="formLabelWidth1">{{ form.waitTestTime }}</el-form-item>
-            <el-form-item label="创建时间 : " :label-width="formLabelWidth1">{{ form.gmtCreate }}</el-form-item>
-          </div>
-        </div>
-        <!-- <el-form-item label="caseID" :label-width="formLabelWidth">{{ form.caseId }}</el-form-item> -->
-        <!-- <el-form-item label="项目名" :label-width="formLabelWidth">{{ form.projectName }}</el-form-item> -->
-        <!-- <el-form-item label="项目ID" :label-width="formLabelWidth">{{ form.projectId }}</el-form-item> -->
-        <!-- <el-form-item label="测试计划ID" :label-width="formLabelWidth">{{ form.planId }}</el-form-item> -->
-        <!-- <el-form-item label="逻辑删" :label-width="formLabelWidth">{{ form.isDelete }}</el-form-item> -->
-        <!-- <el-form-item label="业务线" :label-width="formLabelWidth">{{ form.bizId }}</el-form-item> -->
-        <!-- <el-form-item label="模块ID" :label-width="formLabelWidth">{{ form.moduleId }}</el-form-item> -->
-        <!-- <el-form-item label="修改时间" :label-width="formLabelWidth">{{ form.gmtModify }}</el-form-item> -->
+          <!-- <el-form-item label="caseID" :label-width="formLabelWidth">{{ form.caseId }}</el-form-item> -->
+          <!-- <el-form-item label="项目名" :label-width="formLabelWidth">{{ form.projectName }}</el-form-item> -->
+          <!-- <el-form-item label="项目ID" :label-width="formLabelWidth">{{ form.projectId }}</el-form-item> -->
+          <!-- <el-form-item label="测试计划ID" :label-width="formLabelWidth">{{ form.planId }}</el-form-item> -->
+          <!-- <el-form-item label="逻辑删" :label-width="formLabelWidth">{{ form.isDelete }}</el-form-item> -->
+          <!-- <el-form-item label="业务线" :label-width="formLabelWidth">{{ form.bizId }}</el-form-item> -->
+          <!-- <el-form-item label="模块ID" :label-width="formLabelWidth">{{ form.moduleId }}</el-form-item> -->
+          <!-- <el-form-item label="修改时间" :label-width="formLabelWidth">{{ form.gmtModify }}</el-form-item> -->
 
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="dialogFormQuery = false">关 闭</el-button>
-      </div>
-    </el-dialog>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="dialogFormQuery = false">关 闭</el-button>
+        </div>
+      </el-dialog>
+    </div>
   </div>
 </template>
 
@@ -242,10 +252,13 @@ export default {
       repairResultStr: [],
       isDeleteStr: [{ name: '保留', value: 0 }, { name: '删除', value: 1 }],
       serviceDataRules: {
-        bugName: [{ required: true, message: '主题不能为空', trigger: 'change' }],
-        // taskId: [{ required: true, message: '任务不能为空', trigger: 'change' }],
+        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' }],
         priority: [{ required: true, message: '级别不能为空', trigger: 'change' }],
         status: [{ required: true, message: '状态不能为空', trigger: 'change' }],
         platformType: [{ required: true, message: '平台类型不能为空', trigger: 'change' }],
@@ -271,8 +284,8 @@ export default {
       repairShow: false,
       dialogFormVisible: false,
       dialogFormQuery: false,
-      formLabelWidth: '120px',
-      formLabelWidth1: '140px',
+      formLabelWidth: '11%',
+      formLabelWidth1: '22%',
       serviceTypeEnumList: [],
       clientTypeEnumList: [],
       bizIdEnumList: [],
@@ -366,7 +379,8 @@ export default {
       // this.bizId = ele.bizId
       this.form.taskId = ele.taskId
       this.buildShow(ele)
-      this.dialogFormVisible = true
+      this.$router.push({ name: '更新Bug', params: { formData: this.form }, query: { id: this.form.id }})
+      // this.dialogFormVisible = true
     },
     buildShow(ele) {
       if (ele.status === '待回归' || ele === 2) {
@@ -401,13 +415,14 @@ export default {
       this.getList()
     },
     createdCode() {
-      this.titName = '新建'
-      this.dialogFormVisible = true
+      // this.titName = '新建'
+      // this.dialogFormVisible = true
       this.form = {}
-      this.$route.query.code === 4 ? this.form.taskId = this.$route.query.id : ''
-      if (this.$refs['form'] !== undefined) {
-        this.$refs['form'].resetFields()
-      }
+      // this.$route.query.code === 4 ? this.form.taskId = this.$route.query.id : ''
+      // if (this.$refs['form'] !== undefined) {
+      //   this.$refs['form'].resetFields()
+      // }
+      this.$router.push({ name: '新建Bug' })
     },
     createFormData(form) {
       this.$refs['form'].validate((valid) => {
@@ -424,13 +439,14 @@ export default {
       })
     },
     toReportView(e) {
-      this.dialogFormQuery = true
-      this.buildShow(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 }})
       })
     },
 
@@ -449,6 +465,15 @@ export default {
 }
 </script>
 
-<style scoped>
-
+<style lang="stylus" scoped>
+  .adjustHeight >>> .el-dialog
+    background-color white
+    margin-top 5vh !important
+  .adjustHeight >>> .el-dialog__body
+    padding 30px 30px
+    .set-background
+      background-color white
+      border-radius 10px
+  .set-background >>> .el-form-item__content
+    margin-left 0px !important
 </style>

+ 8 - 0
src/views/Platform/projectQuery/taskQuery.vue

@@ -505,7 +505,11 @@ export default {
             this.$router.push({ path: '/Platform/presentation/ClientAcceptance', query: { task: ele }}) // 客户端准出
             break
           case 4:
+<<<<<<< HEAD
             this.$router.push({ path: '/Platform/defectManagement', query: { id: ele.id, code: 4 }}) // 缺陷报告
+=======
+            this.$router.push({ path: '/Platform/defectManagement/bugCreate', query: { id: ele.id }}) // 缺陷报告
+>>>>>>> test
             break
         }
       } else {
@@ -520,7 +524,11 @@ export default {
             this.$router.push({ path: '/Platform/presentation/Acceptance', query: { task: ele }}) // 服务端准出
             break
           case 4:
+<<<<<<< HEAD
             this.$router.push({ path: '/Platform/defectManagement', query: { id: ele.id, code: 4 }}) // 缺陷报告
+=======
+            this.$router.push({ path: '/Platform/defectManagement/bugCreate', query: { id: ele.id }}) // 缺陷报告
+>>>>>>> test
             break
         }
       }

+ 108 - 0
src/views/online-quality/BlockServer/addBlockServer.vue

@@ -0,0 +1,108 @@
+<template>
+  <div>
+    <el-dialog title="新增阻断服务" :rules="rules" :visible.sync="isVisible" width="40%">
+      <el-form :model="addForm" :rules="rules" label-position="right" label-width="150px">
+        <el-form-item label="业务线" prop="lineId">
+          <el-select v-model="addForm.lineId" filterable placeholder="请选择业务线" style="width: 80%">
+            <el-option
+              v-for="item in businessLines"
+              :key="item.lineId"
+              :label="item.lineName"
+              :value="item.lineId"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="模块名" prop="moduleName">
+          <el-input v-model="addForm.moduleName" placeholder="请输入检查项名称" style="width: 80%" />
+        </el-form-item>
+        <el-form-item label="NS节点" prop="ns">
+          <el-input v-model="addForm.ns" placeholder="请输入子检查项" style="width: 80%" />
+        </el-form-item>
+        <el-form-item label="阻断">
+          <el-switch
+            v-model="addForm.isCheck"
+            active-value="1"
+            inactive-value="0"
+            active-text="阻断"
+            inactive-text="未阻断"
+          />
+        </el-form-item>
+      </el-form>
+      <template v-slot:footer>
+        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="confirm">确 定</el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { addNsServerCheck } from '@/api/onlineQuality'
+
+export default {
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    businessLines: {
+      type: Array,
+      default() {
+        return []
+      }
+    }
+  },
+  data() {
+    return {
+      isVisible: false,
+      addForm: {
+        lineId: null,
+        moduleName: null,
+        ns: null
+      },
+      rules: {
+        lineId: [
+          { required: true, message: '请选择业务线', trigger: 'change' }
+        ],
+        moduleName: [
+          { required: true, message: '模块名不能为空', trigger: 'blur' }
+        ],
+        ns: [
+          { required: true, message: '节点不能为空', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  watch: {
+    visible: function(newVisible, oldVisible) {
+      this.isVisible = newVisible
+    },
+    isVisible: function(newIsVisible, oldIsVisible) {
+      if (newIsVisible === false) {
+        this.$emit('cancel', false)
+      }
+    }
+  },
+  methods: {
+    cancel: function() {
+      this.$emit('cancel', false)
+    },
+    confirm: function() {
+      for (var i in this.addForm) {
+        if (this.addForm[i] === null || this.addForm === '') {
+          this.$message.warning('必填参数不能为空')
+          return
+        }
+      }
+      addNsServerCheck(this.addForm)
+        .then(res => {
+          if (res.code === 200) {
+            this.$emit('confirm', false)
+          } else {
+            this.$message.error(res.msg)
+          }
+        })
+    }
+  }
+}
+</script>

+ 31 - 0
src/views/online-quality/BlockServer/blockResult.vue

@@ -0,0 +1,31 @@
+<template>
+  <div>
+    <el-table
+      :data="tableData"
+      stripe
+      highlight-current-row
+      header-row-class-name="tableHead"
+      style="width: 100%"
+    >
+      <el-table-column prop="id" label="ID" sortable min-width="7%" />
+    </el-table>
+  </div>
+</template>
+
+<script>
+import { getBlockResult } from '@/api/onlineQuality'
+
+export default {
+  data() {
+    return {
+      tableData: null
+    }
+  },
+  mounted() {
+    getBlockResult()
+      .then(res => {
+        this.tableData = res.data
+      })
+  }
+}
+</script>

+ 140 - 0
src/views/online-quality/BlockServer/blockServer.vue

@@ -0,0 +1,140 @@
+<template>
+  <div>
+    <el-header>
+      <el-button type="primary" icon="el-icon-circle-plus-outline" @click="addBlockServerDialogVisible = true">新增</el-button>
+    </el-header>
+    <el-table
+      :data="tableData"
+      stripe
+      highlight-current-row
+      header-row-class-name="tableHead"
+      style="width: 100%"
+    >
+      <el-table-column prop="id" label="ID" sortable min-width="7%" />
+      <el-table-column prop="ns" label="NS节点" sortable min-width="15%" />
+      <el-table-column prop="lineName" label="业务线" sortable min-width="10%" />
+      <el-table-column prop="moduleName" label="模块名" sortable min-width="15%" />
+      <el-table-column prop="check" label="是否阻断" sortable min-width="15%">
+        <template v-slot="scope">
+          <el-tag :type="scope.row.check? 'success':'warning'">{{ scope.row.check? '阻断':'未阻断' }}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column prop="gmtCreate" label="创建时间" sortable min-width="20%">
+        <template v-slot="scope">
+          {{ dateFomatter(scope.row.gmtCreate) }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="gmtModify" label="更新时间" sortable min-width="20%">
+        <template v-slot="scope">
+          {{ dateFomatter(scope.row.gmtModify) }}
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" min-width="15%">
+        <template v-slot="scope">
+          <el-button type="text" size="medium" @click="blockServer = scope.row;updateBlockServerDialogVisible = true">编辑</el-button>
+          <el-button type="text" size="medium" @click="deleteNsServerCheckClick(scope.row)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <add-block-server
+      :visible="addBlockServerDialogVisible"
+      :business-lines="businessLines"
+      @cancel="addBlockServerDialogVisible = false"
+      @confirm="addBlockServerDialogVisible = false;getNsServerCheckClick()"
+    />
+    <update-block-server
+      :visible="updateBlockServerDialogVisible"
+      :business-lines="businessLines"
+      :block-server="blockServer"
+      @cancel="updateBlockServerDialogVisible = false"
+      @confirm="updateBlockServerDialogVisible = false;getNsServerCheckClick()"
+    />
+  </div>
+</template>
+
+<script>
+import { getNsServerCheck, deleteNsServerCheck } from '@/api/onlineQuality'
+import AddBlockServer from './addBlockServer'
+import UpdateBlockServer from './updateBlockServer'
+
+export default {
+  components: {
+    AddBlockServer,
+    UpdateBlockServer
+  },
+  data() {
+    return {
+      addBlockServerDialogVisible: false,
+      updateBlockServerDialogVisible: false,
+      tableData: null,
+      blockServer: null,
+      businessLines: [{
+        lineName: '代驾',
+        lineId: 1
+      }, {
+        lineName: '黑马',
+        lineId: 2
+      }, {
+        lineName: '海棠',
+        lineId: 3
+      }, {
+        lineName: 'carbo',
+        lineId: 4
+      }, {
+        lineName: 'prado',
+        lineId: 5
+      }
+      ]
+    }
+  },
+  mounted() {
+    this.getNsServerCheckClick()
+  },
+  methods: {
+    dateFomatter(date) {
+      if (date === null) return
+      return date.substring(0, 10) + ' ' + date.substring(11, 19)
+    },
+    getNsServerCheckClick() {
+      getNsServerCheck()
+        .then(res => {
+          this.tableData = res.data
+        })
+    },
+    deleteNsServerCheckClick(row) {
+      this.$confirm('此操作将永久删除阻断服务项 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        deleteNsServerCheck({ id: row.id })
+          .then(res => {
+            if (res.code === 200) {
+              this.getNsServerCheckClick()
+            } else {
+              this.$message.error(res.msg)
+            }
+          })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.div {
+  background-color: rgba(243, 240, 240, 0.247);
+}
+.el-header {
+  margin: 0 0 1% 0;
+  padding: 1%;
+}
+.el-main {
+  padding: 0;
+}
+</style>

+ 37 - 0
src/views/online-quality/BlockServer/index.vue

@@ -0,0 +1,37 @@
+<template>
+  <div>
+    <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
+      <el-tab-pane label="阻断服务" name="first">
+        <block-server />
+      </el-tab-pane>
+      <el-tab-pane label="阻断结果" name="second">
+        <block-result v-if="blockResultShow" />
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+import BlockServer from './blockServer'
+import BlockResult from './blockResult'
+
+export default {
+  components: {
+    BlockServer,
+    BlockResult
+  },
+  data() {
+    return {
+      activeName: 'first',
+      blockResultShow: false
+    }
+  },
+  methods: {
+    handleClick(tab, event) {
+      if (tab.name === 'second') {
+        this.blockResultShow = true
+      }
+    }
+  }
+}
+</script>

+ 119 - 0
src/views/online-quality/BlockServer/updateBlockServer.vue

@@ -0,0 +1,119 @@
+<template>
+  <div>
+    <el-dialog title="更新阻断服务" :rules="rules" :visible.sync="isVisible" width="40%">
+      <el-form :model="addForm" :rules="rules" label-position="right" label-width="150px">
+        <el-form-item label="业务线" prop="lineId">
+          <el-select v-model="addForm.lineId" filterable placeholder="请选择业务线" style="width: 80%" disabled>
+            <el-option
+              v-for="item in businessLines"
+              :key="item.lineId"
+              :label="item.lineName"
+              :value="item.lineId"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="模块名" prop="moduleName">
+          <el-input v-model="addForm.moduleName" placeholder="请输入检查项名称" style="width: 80%" disabled />
+        </el-form-item>
+        <el-form-item label="NS节点" prop="ns">
+          <el-input v-model="addForm.ns" placeholder="请输入子检查项" style="width: 80%" disabled />
+        </el-form-item>
+        <el-form-item label="是否阻断">
+          <el-switch
+            v-model="addForm.isCheck"
+            active-text="阻断"
+            inactive-text="未阻断"
+          />
+        </el-form-item>
+      </el-form>
+      <template v-slot:footer>
+        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="confirm">确 定</el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { updateNsServerCheck } from '@/api/onlineQuality'
+
+export default {
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    businessLines: {
+      type: Array,
+      default() {
+        return []
+      }
+    },
+    blockServer: {
+      type: Object,
+      default: null
+    }
+  },
+  data() {
+    return {
+      isVisible: false,
+      addForm: {
+        id: null,
+        lineId: null,
+        moduleName: null,
+        ns: null,
+        isCheck: true
+      },
+      rules: {
+        lineId: [
+          { required: true, message: '请选择业务线', trigger: 'change' }
+        ],
+        moduleName: [
+          { required: true, message: '模块名不能为空', trigger: 'blur' }
+        ],
+        ns: [
+          { required: true, message: '节点不能为空', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  watch: {
+    visible: function(newVisible, oldVisible) {
+      this.isVisible = newVisible
+      if (this.isVisible) {
+        this.addForm.id = this.blockServer.id
+        this.addForm.lineId = this.blockServer.lineId
+        this.addForm.moduleName = this.blockServer.moduleName
+        this.addForm.ns = this.blockServer.ns
+        this.addForm.isCheck = this.blockServer.check
+      }
+    },
+    isVisible: function(newIsVisible, oldIsVisible) {
+      if (newIsVisible === false) {
+        this.$emit('cancel', false)
+      }
+    }
+  },
+  methods: {
+    cancel: function() {
+      this.$emit('cancel', false)
+    },
+    confirm: function() {
+      for (var i in this.addForm) {
+        if (this.addForm[i] === null || this.addForm === '') {
+          this.$message.warning('必填参数不能为空')
+          return
+        }
+      }
+      updateNsServerCheck({ id: this.addForm.id, isCheck: this.addForm.isCheck })
+        .then(res => {
+          if (res.code === 200) {
+            this.$emit('confirm', false)
+          } else {
+            this.$message.error(res.msg)
+          }
+        })
+    }
+  }
+}
+</script>

+ 146 - 0
src/views/online-quality/CheckConfig/addConfig.vue

@@ -0,0 +1,146 @@
+<template>
+  <div>
+    <el-dialog title="新增子检查项" :visible.sync="isVisible" width="40%">
+      <el-form :model="addConfigForm" label-position="right" label-width="150px">
+        <el-form-item label="业务线" prop="lineId" :rules="rules.lineId">
+          <el-select v-model="addConfigForm.lineId" filterable placeholder="请选择业务线" style="width: 80%" @change="changeLine(addConfigForm.lineId)">
+            <el-option
+              v-for="item in businessLines"
+              :key="item.lineId"
+              :label="item.lineName"
+              :value="item.lineId"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="检查项" prop="checkName" :rules="rules.checkName">
+          <el-input v-model="addConfigForm.checkName" placeholder="请输入检查项名称" style="width: 80%" />
+        </el-form-item>
+        <li v-for="(subitem,index) in addConfigForm.subitems" :key="subitem.key">
+          <el-form-item label="子检查项" :prop="`subitems.${index}.subitemsCheckName`" :rules="rules.subitemsCheckName">
+            <el-input v-model="subitem.subitemsCheckName" placeholder="请输入子检查项" style="width: 80%" />
+          </el-form-item>
+          <el-form-item label="备注" :prop="`subitems.${index}.description`" :rules="rules.description">
+            <el-input v-model="subitem.description" placeholder="请输入备注" style="width: 80%" />
+          </el-form-item>
+          <el-form-item>
+            <el-col :offset="6">
+              <el-button type="danger" plain @click="removeConfig(subitem)">删除</el-button>
+            </el-col>
+          </el-form-item>
+        </li>
+      </el-form>
+      <el-button plain @click="increaseConfig">添加更多模块</el-button>
+      <template v-slot:footer>
+        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="confirm">确 定</el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { addCheckTemplate } from '@/api/onlineQuality'
+
+export default {
+  name: 'AddConfig',
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    businessLines: {
+      type: Array,
+      default() {
+        return []
+      }
+    }
+  },
+  data() {
+    return {
+      isVisible: false,
+      key: 1,
+      addConfigForm: {
+        lineId: null,
+        checkName: null,
+        subitems: [{
+          key: 1,
+          subitemsCheckName: null,
+          description: null
+        }
+        ]
+      },
+      rules: {
+        lineId:
+          { required: true, message: '业务线不能为空', trigger: 'change' },
+        checkName:
+          { required: true, message: '检查项名称不能为空', trigger: 'blur' },
+        subitemsCheckName:
+          { required: true, message: '子检查项名称不能为空', trigger: 'blur' },
+        description:
+          { required: true, message: '备注不能为空', trigger: 'blur' }
+
+      }
+    }
+  },
+  watch: {
+    visible: function(newVisible, oldVisible) {
+      this.isVisible = newVisible
+    },
+    isVisible: function(newIsVisible, oldIsVisible) {
+      if (newIsVisible === false) {
+        this.$emit('cancel', false)
+      }
+    }
+  },
+  methods: {
+    cancel: function() {
+      this.$emit('cancel', false)
+    },
+    confirm: function() {
+      for (const i in this.addConfigForm) {
+        if (this.addConfigForm[i] === null || this.addConfigForm === '') {
+          this.$message.warning('必填参数不能为空')
+          return
+        }
+      }
+      for (const i in this.addConfigForm.subitems) {
+        if (!(this.addConfigForm.subitems[i].subitemsCheckName && this.addConfigForm.subitems[i].description)) {
+          this.$message.warning('必填参数不能为空')
+          return
+        }
+      }
+      addCheckTemplate(this.addConfigForm)
+        .then(res => {
+          if (res.code === 200) {
+            this.$emit('confirm', false)
+          } else {
+            this.$message.error(res.msg)
+          }
+        })
+    },
+    removeConfig(item) {
+      var index = this.addConfigForm.subitems.indexOf(item)
+      if (index !== -1) {
+        this.addConfigForm.subitems.splice(index, 1)
+      }
+      this.key--
+    },
+    increaseConfig() {
+      const item = {
+        key: ++this.key,
+        subitemsCheckName: null,
+        description: null
+      }
+      this.addConfigForm.subitems.push(item)
+    },
+    changeLine(id) {
+      for (var i in this.businessLines) {
+        if (this.businessLines[i].lineId === this.addConfigForm.lineId) {
+          this.addConfigForm.lineName = this.businessLines[i].lineName
+          this.addConfigForm.checkName = this.businessLines[i].lineName + '上线前checkList'
+        }
+      }
+    }
+  }
+}
+</script>

+ 158 - 0
src/views/online-quality/CheckConfig/index.vue

@@ -0,0 +1,158 @@
+<template>
+  <el-container>
+    <el-header>
+      <el-form inline :model="searchForm" label-position="right" label-width="60px">
+        <el-form-item label="业务线:">
+          <el-select v-model="searchForm.lineId" filterable placeholder="请选择业务线">
+            <el-option
+              v-for="item in businessLines"
+              :key="item.lineId"
+              :label="item.lineName"
+              :value="item.lineId"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-circle-plus-outline" @click="addConfigDialogVisible = true">新增</el-button>
+        </el-form-item>
+      </el-form>
+    </el-header>
+    <el-main>
+      <el-table
+        :data="tableData"
+        stripe
+        highlight-current-row
+        style="width: 100%"
+        header-row-class-name="tableHead"
+      >
+        <el-table-column prop="checkName" label="检查项" sortable min-width="15%" />
+        <el-table-column prop="lineName" label="业务线" sortable min-width="15%" />
+        <el-table-column prop="subitemsCheckName" label="子检查项" sortable min-width="15%" />
+        <el-table-column prop="description" label="备注" sortable min-width="15%" />
+        <el-table-column prop="gmtCreate" label="创建时间" sortable min-width="15%">
+          <template v-slot="scope">
+            {{ dateFomatter(scope.row.gmtCreate) }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="gmtModify" label="更新时间" sortable min-width="15%">
+          <template v-slot="scope">
+            {{ dateFomatter(scope.row.gmtModify) }}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" min-width="15%">
+          <template v-slot="scope">
+            <el-button type="text" size="medium" @click="updateCheckList(scope.row)">编辑</el-button>
+            <el-button type="text" size="medium" @click="deleteCheckList(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-main>
+    <update-config
+      :visible="updateConfigDialogVisible"
+      :check-config="checkConfig"
+      :business-lines="businessLines"
+      @cancel="updateConfigDialogVisible = false"
+      @confirm="updateConfigDialogVisible = false;search()"
+    />
+    <add-config
+      :visible="addConfigDialogVisible"
+      :business-lines="businessLines"
+      @cancel="addConfigDialogVisible = false"
+      @confirm="addConfigDialogVisible = false;search()"
+    />
+  </el-container>
+</template>
+
+<style scoped>
+.div {
+  background-color: rgba(243, 240, 240, 0.247);
+}
+.el-header {
+  margin: 0 0 1% 0;
+  padding: 1%;
+}
+.el-main {
+  padding: 0;
+}
+</style>
+
+<script>
+import { getCheckList, deleteCheckTemplate } from '@/api/onlineQuality'
+import UpdateConfig from './updateConfig'
+import AddConfig from './addConfig'
+export default {
+  components: {
+    UpdateConfig,
+    AddConfig
+  },
+  data() {
+    return {
+      updateConfigDialogVisible: false,
+      addConfigDialogVisible: false,
+      tableData: null,
+      checkConfig: null,
+      businessLines: [{
+        lineName: '代驾',
+        lineId: 1
+      }, {
+        lineName: '黑马',
+        lineId: 2
+      }, {
+        lineName: '海棠',
+        lineId: 3
+      }, {
+        lineName: 'carbo',
+        lineId: 4
+      }, {
+        lineName: 'prado',
+        lineId: 5
+      }
+      ],
+      searchForm: {
+        lineId: 1
+      }
+    }
+  },
+  mounted() {
+    getCheckList({ lineId: 1 })
+      .then(res => {
+        this.tableData = res.data
+      })
+  },
+  methods: {
+    updateCheckList(row) {
+      this.checkConfig = row
+      this.updateConfigDialogVisible = true
+    },
+    deleteCheckList(row) {
+      this.$confirm('此操作将永久删除子检查项 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        deleteCheckTemplate({ id: row.id, lineId: row.lineId })
+          .then(res => {
+            this.search()
+          })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    search() {
+      getCheckList({ lineId: this.searchForm.lineId })
+        .then(res => {
+          this.tableData = res.data
+        })
+    },
+    dateFomatter(date) {
+      return date.substring(0, 10) + ' ' + date.substring(11, 19)
+    }
+  }
+}
+</script>

+ 132 - 0
src/views/online-quality/CheckConfig/updateConfig.vue

@@ -0,0 +1,132 @@
+<template>
+  <div>
+    <el-dialog title="更新子检查项" :rules="rules" :visible.sync="isVisible" width="40%">
+      <el-form :model="updateConfigForm" :rules="rules" label-position="right" label-width="150px">
+        <el-form-item label="业务线" prop="line">
+          <el-select v-model="updateConfigForm.lineId" filterable placeholder="请选择业务线" disabled style="width: 80%" @change="changeLine(updateConfigForm.lineId)">
+            <el-option
+              v-for="item in businessLines"
+              :key="item.lineId"
+              :label="item.lineName"
+              :value="item.lineId"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="检查项" prop="checkName">
+          <el-input v-model="updateConfigForm.checkName" placeholder="请输入检查项名称" disabled style="width: 80%" />
+        </el-form-item>
+        <el-form-item label="子检查项" prop="subitemsCheckName">
+          <el-input v-model="updateConfigForm.subitemsCheckName" placeholder="请输入子检查项" style="width: 80%" />
+        </el-form-item>
+        <el-form-item label="备注" prop="description">
+          <el-input v-model="updateConfigForm.description" placeholder="请输入备注" style="width: 80%" />
+        </el-form-item>
+      </el-form>
+      <template v-slot:footer>
+        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="confirm">确 定</el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { updateCheckTemplate } from '@/api/onlineQuality'
+
+export default {
+  name: 'UpdateConfig',
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    businessLines: {
+      type: Array,
+      default() {
+        return []
+      }
+    },
+    checkConfig: {
+      type: Object,
+      default: null
+    }
+  },
+  data() {
+    return {
+      isVisible: false,
+      updateConfigForm: {
+        lineId: null,
+        checkName: null,
+        subitemsCheckName: null,
+        description: null
+      },
+      rules: {
+        lineId: [
+          { required: true, message: '业务线不能为空', trigger: 'change' }
+        ],
+        checkName: [
+          { required: true, message: '检查项名称不能为空', trigger: 'blur' }
+        ],
+        subitemsCheckName: [
+          { required: true, message: '子检查项名称不能为空', trigger: 'blur' }
+        ],
+        description: [
+          { required: true, message: '备注不能为空', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  watch: {
+    visible: function(newVisible, oldVisible) {
+      this.isVisible = newVisible
+      if (this.isVisible) {
+        this.updateConfigForm = this.checkConfig
+      }
+    },
+    isVisible: function(newIsVisible, oldIsVisible) {
+      if (newIsVisible === false) {
+        this.$emit('cancel', false)
+      }
+    }
+  },
+  methods: {
+    cancel: function() {
+      this.$emit('cancel', false)
+    },
+    confirm: function() {
+      for (var i in this.updateConfigForm) {
+        if (this.updateConfigForm[i] == null || this.updateConfigForm[i] === '') {
+          this.$message.warning('必填参数不能为空')
+          return
+        }
+      }
+      var data = {
+        checkName: this.updateConfigForm.checkName,
+        lineName: this.updateConfigForm.lineName,
+        lineId: this.updateConfigForm.lineId,
+        subitems: [{
+          id: this.updateConfigForm.id,
+          subitemsCheckName: this.updateConfigForm.subitemsCheckName,
+          description: this.updateConfigForm.description
+        }]
+      }
+      updateCheckTemplate(data)
+        .then(res => {
+          if (res.code === 200) {
+            this.$emit('confirm', false)
+          } else {
+            this.$message.error(res.msg)
+          }
+        })
+    },
+    changeLine(id) {
+      for (var i in this.businessLines) {
+        if (this.businessLines[i].lineId === this.addConfigForm.lineId) {
+          this.updateConfigForm.lineName = this.businessLines[i].lineName
+          this.updateConfigForm.checkName = this.businessLines[i].lineName + '上线前checkList'
+        }
+      }
+    }
+  }
+}
+</script>

+ 105 - 0
src/views/online-quality/HistoryTask/index.vue

@@ -0,0 +1,105 @@
+<template>
+  <div>
+    <el-main>
+      <el-table
+        :data="tableData"
+        stripe
+        highlight-current-row
+        style="width: 100%"
+        header-row-class-name="tableHead"
+      >
+        <el-table-column prop="taskId" label="任务ID" sortable min-width="10%" />
+        <el-table-column prop="ns" label="NS节点" sortable min-width="15%" />
+        <el-table-column prop="serverName" label="服务名" sortable min-width="15%" />
+        <el-table-column prop="line" label="业务线" sortable min-width="12%" />
+        <el-table-column prop="state" label="质检" sortable min-width="12%">
+          <template v-slot="scope">
+            <el-tag :type="scope.row.state ===1? 'success':'warning'">{{ scope.row.state ===1? '通过':'未通过' }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column v-if="false" prop="checkResultJson" label="检查项" sortable min-width="15%" />
+        <el-table-column v-if="false" prop="diffResultJson" label="自动diff检查项" sortable min-width="15%" />
+        <el-table-column prop="gmtCreate" label="创建时间" sortable min-width="20%">
+          <template v-slot="scope">
+            {{ dateFomatter(scope.row.gmtCreate) }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="gmtModify" label="更新时间" sortable min-width="20%">
+          <template v-slot="scope">
+            {{ dateFomatter(scope.row.gmtModify) }}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" min-width="15%">
+          <template v-slot="scope">
+            <el-button type="text" size="medium" @click="viewDetails(scope.row.taskId)">详情</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        background
+        layout="total, sizes, ->, prev, pager, next, jumper"
+        :current-page="currentPage"
+        :page-size="pageSize"
+        :page-sizes="[10,30,50,total]"
+        :total="total"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </el-main>
+  </div>
+</template>
+
+<script>
+import { getCheckResultList } from '@/api/onlineQuality'
+export default {
+  data() {
+    return {
+      tableData: null,
+      total: 0,
+      pageSize: 10,
+      currentPage: 1
+    }
+  },
+  mounted() {
+    this.getCheckResult()
+  },
+  methods: {
+    getCheckResult() {
+      getCheckResultList({ pageNum: this.currentPage, pageSize: this.pageSize })
+        .then(res => {
+          this.tableData = res.data.checkResultDO
+          this.total = res.data.number
+        })
+    },
+    handleSizeChange: function(pageSize) {
+      this.pageSize = pageSize
+      this.getCheckResult()
+    },
+    handleCurrentChange: function(currentPage) {
+      this.currentPage = currentPage
+      this.getCheckResult()
+    },
+    dateFomatter(date) {
+      return date.substring(0, 10) + ' ' + date.substring(11, 19)
+    },
+    viewDetails(taskId) {
+      this.$router.push({ name: '历史任务详情', params: { taskId: taskId + '' }})
+    }
+  }
+}
+</script>
+
+<style scoped>
+.div {
+  background-color: rgba(243, 240, 240, 0.247);
+}
+.el-header {
+  background-color: #fff;
+  margin: 0 0 1% 0;
+  padding: 1%;
+}
+.el-main {
+  background-color: #fff;
+  padding: 0;
+}
+</style>

+ 146 - 0
src/views/online-quality/HistoryTask/taskDetails.vue

@@ -0,0 +1,146 @@
+<template>
+  <div>
+    <el-card>
+      <div slot="header" class="clearfix">
+        <span>任务单详情</span>
+      </div>
+      <el-form label-position="right" inline label-width="100px">
+        <el-form-item label="任务ID">
+          {{ task.taskId }}
+        </el-form-item>
+        <el-form-item label="NS节点">
+          {{ task.ns }}
+        </el-form-item>
+        <el-form-item label="服务名">
+          {{ task.serverName }}
+        </el-form-item>
+        <el-form-item label="业务线">
+          {{ task.line }}
+        </el-form-item>
+        <el-form-item label="质检">
+          {{ task.state===1?'通过':'未通过' }}
+        </el-form-item>
+      </el-form>
+    </el-card>
+    <el-card v-if="isShow">
+      <div slot="header" class="clearfix">
+        <span>{{ task.checkResultJson.lineName }}</span>
+        <el-button style="float: right; padding: 3px 0" type="text" @click="updateCheckResultJson">提交</el-button>
+      </div>
+      <el-table
+        :data="tableData"
+        stripe
+        highlight-current-row
+        style="width: 100%"
+        header-row-class-name="tableHead"
+      >
+        <el-table-column prop="subitemsCheckName" label="子检查项" sortable min-width="15%" />
+        <el-table-column prop="description" label="备注" sortable min-width="15%" />
+        <el-table-column prop="diffResult" label="自动检查结果" sortable min-width="30%" />
+        <el-table-column label="手动检查" sortable min-width="15%">
+          <template v-slot="scope">
+            <el-button :type="selectButtonType(scope.row)" size="medium" :disabled="isDisabled(scope.row)" plain @click="passCheck(scope.row)">{{ scope.row | getTextResult }}</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div style="text-align: center;margin-top: 20px">
+        <el-button @click="getTableData">重置</el-button>
+        <el-button type="primary" @click="updateCheckResultJson">提交</el-button>
+      </div>
+    </el-card>
+    <el-card v-if="false">
+      <v-jsoneditor v-model="task.checkResultJson" :plus="false" height="400px" @error="onError" />
+      <v-jsoneditor v-model="task.diffResultJson" :plus="false" height="400px" @error="onError" />
+    </el-card>
+  </div>
+</template>
+
+<script>
+import { getCheckResult, updateCheckResult } from '@/api/onlineQuality'
+import VJsoneditor from 'v-jsoneditor'
+
+export default {
+  components: {
+    VJsoneditor
+  },
+  filters: {
+    getTextResult(row) {
+      if (row.status == null || row.status === 0) {
+        return '通过'
+      } else {
+        return '已通过'
+      }
+    }
+  },
+  props: {
+    taskId: {
+      type: String,
+      default: null
+    }
+  },
+  data() {
+    return {
+      task: {},
+      tableData: null,
+      isShow: false
+    }
+  },
+  mounted() {
+    this.getTableData()
+  },
+  methods: {
+    onError() {
+      console.log('error')
+    },
+    updateCheckResultJson() {
+      updateCheckResult(this.task)
+        .then(res => {
+          if (res.code === 200) {
+            this.$message.success(res.msg)
+          } else {
+            this.$message.error(res.msg)
+          }
+        })
+    },
+    passCheck(row) {
+      if (row.status == null || row.status === 0) {
+        row.status = 1
+      } else {
+        row.status = 0
+      }
+    },
+    isDisabled(row) {
+      if (row.status == null || row.status === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
+    selectButtonType(row) {
+      if (row.status == null || row.status === 0) {
+        return 'primary'
+      } else {
+        return 'success'
+      }
+    },
+    getTableData() {
+      getCheckResult({ taskId: this.taskId })
+        .then(res => {
+          this.task = res.data
+          if (this.task.checkResultJson) { this.task.checkResultJson = JSON.parse(this.task.checkResultJson) }
+          if (this.task.diffResultJson) { this.task.diffResultJson = JSON.parse(this.task.diffResultJson) }
+          if (this.task.checkResultJson.lineName) {
+            this.tableData = this.task.checkResultJson.subitems
+            this.isShow = true
+          }
+        })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.el-card {
+  margin: 2%
+}
+</style>