Merge branch 'http_mock' of git.xiaojukeji.com:jacklijiajia/thoth-frontend into http_mock

src/icons/svg/测试.svg

@@ -1,3 +1,3 @@
 
-<?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 class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M996.291765 1.505882H86.919529C38.972235 1.505882 0 39.333647 0 85.835294V939.670588c0 46.561882 38.972235 84.329412 86.979765 84.329412H996.291765c48.007529 0 87.04-37.767529 87.04-84.329412V85.835294c0-46.501647-39.152941-84.329412-87.04-84.329412zM86.919529 62.343529H996.291765c13.372235 0 24.214588 10.541176 24.214588 23.491765v116.073412H62.765176V85.835294c0-12.950588 10.842353-23.491765 24.214589-23.491765zM996.291765 963.041882H86.979765a23.853176 23.853176 0 0 1-24.214589-23.491764V252.687059h957.741177v686.923294c0 12.950588-10.902588 23.491765-24.274824 23.491765z" fill="#565656" p-id="1096"></path><path d="M897.024 784.986353H668.009412c-17.950118 0-32.406588 13.010824-32.406588 29.153882s14.456471 29.153882 32.406588 29.153883h229.014588c18.010353 0 32.406588-13.010824 32.406588-29.153883s-14.456471-29.153882-32.406588-29.153882z m-599.943529-288.225882a34.876235 34.876235 0 0 0-45.778824-1.505883 27.105882 27.105882 0 0 0-1.566118 41.200941l140.830118 136.252236-139.625412 120.410353a27.045647 27.045647 0 0 0-0.963764 41.200941c6.384941 5.963294 14.878118 8.975059 23.371294 8.975059a33.852235 33.852235 0 0 0 22.407529-8.131765l162.635294-140.227765a27.166118 27.166118 0 0 0 1.325177-40.96l-162.635294-157.214117z" fill="#409EFF" p-id="1097"></path></svg>
+<?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 class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M1003.656533 1.501867H87.6544C39.253333 1.501867 0 39.3216 0 85.879467v853.8112C0 986.180267 39.253333 1024 87.6544 1024h916.002133c48.3328 0 87.586133-37.819733 87.586134-84.309333V85.879467c0-46.557867-39.389867-84.3776-87.586134-84.3776zM87.6544 62.395733h916.002133c13.448533 0 24.3712 10.513067 24.3712 23.483734v116.053333H63.2832v-116.053333c0-12.970667 10.922667-23.483733 24.3712-23.483734z m916.002133 900.573867H87.6544a23.9616 23.9616 0 0 1-24.3712-23.415467V252.586667h964.744533v686.967466c0 12.970667-10.922667 23.415467-24.3712 23.415467z" fill="#565656" p-id="1096"></path><path d="M903.714133 784.930133h-230.741333c-18.158933 0-32.699733 13.038933-32.699733 29.218134 0 16.110933 14.5408 29.149867 32.699733 29.149866h230.741333c18.090667 0 32.631467-12.970667 32.631467-29.149866s-14.5408-29.218133-32.631467-29.218134zM299.349333 496.708267a35.362133 35.362133 0 0 0-46.148266-1.4336 26.965333 26.965333 0 0 0-1.6384 41.233066l141.9264 136.192-140.629334 120.4224a26.897067 26.897067 0 0 0-1.024 41.1648c6.417067 5.9392 15.018667 9.0112 23.552 9.0112 8.192 0 16.384-2.730667 22.528-8.192l163.84-140.151466a27.0336 27.0336 0 0 0 1.365334-40.96l-163.84-157.2864z" fill="#409EFF" p-id="1097"></path></svg>
 		

src/router/index.js

@@ -266,7 +266,7 @@ export const constantRoutes = [{
   component: Layout,
   name: '测试',
   redirect: '/Platform/useCase/test',
-  meta: { title: '测试', icon: '测试' },
+  meta: { title: '测试管理', icon: '测试' },
   children: [{
     path: 'useCasePage',
     name: '测试用例',

src/views/Platform/presentation/Templates/TestReport.vue

@@ -26,7 +26,7 @@
         <el-button size="small" type="primary" @click="NextStep()">下一步</el-button>
       </div>
     </div>
-    <el-dialog :visible.sync="showClient" width="80%" top="4vh" :close-on-click-modal="false" append-to-body :before-close="handleClose1">
+    <el-dialog :visible.sync="showClient" width="80%" top="4vh" :close-on-click-modal="false" append-to-body :before-close="handleClose1()">
       <div class="flex_start titFont">
         <div class="titIcon" />
         <span style="margin-left: 1%; width: 100px;">提测报告</span>
@@ -40,10 +40,10 @@
       </div>
       <div class="descr" style=" margin-bottom: 2%; height: 440px; overflow:scroll; overflow-x: hidden">
         <Present v-if="Present1" ref="Present" />
-        <presentation v-if="presentation1" ref="presentation" />
+        <presentation v-if="presentation1" ref="presentationRef" />
       </div>
       <div align="center">
-        <el-button size="small" type="primary" @click="handleClose1()">上一步</el-button>
+        <el-button size="small" type="primary" @click="PreviousStep()">上一步</el-button>
         <el-button size="small" type="primary" @click="created_out()">保存，下一步</el-button>
       </div>
       <el-dialog :visible.sync="showClientYL" width="80%" top="4vh" :close-on-click-modal="false" append-to-body :before-close="handleClose2">
@@ -112,10 +112,14 @@ export default {
     init(e, id) {
       this.dialogVisible1 = true
     },
-    handleClose1() {
+    handleClose1(e) {
       this.showClient = false
       this.dialogVisible1 = false
     },
+    PreviousStep() {
+      this.showClient = false
+      this.dialogVisible1 = true
+    },
     handleClose2() {
       this.showClientYL = false
       this.showClient = false
@@ -125,6 +129,7 @@ export default {
       this.showClientYL = false
     },
     created_out() {
+      this.$refs.presentationRef.parentHandleclick()
       this.showClientYL = true
       // this.$nextTick(() => {
       //   this.$refs.acceptthe.int()

src/views/Platform/presentation/presentationReport.vue

@@ -92,12 +92,8 @@
           <el-form-item label="其他"><el-input v-model="fromDev.others" style="padding-left: 25px; text-align: right; width: 85vw;" size="small" type="textarea" :rows="5" placeholder="请输入其他内容…" /></el-form-item>
         </el-col>
       </div>
-
-      <div class="double" align="center" style="margin: 5vw 0 3vw;">
-        <div><el-button @click="clickPreview(fromDev)"> 预 览 </el-button></div>
-        <div v-show="showButton"><el-button type="primary" @click="getCreateData(fromDev)"> 保 存 </el-button></div>
-        <div v-show="showButton1"><el-button type="primary" @click="getQueryData(fromDev)"> 更 新 </el-button></div>
-      </div>
+      <!-- <div v-show="showButton"><el-button type="primary" @click="getCreateData(fromDev)"> 保 存 </el-button></div> -->
+      <div v-show="showButton1"><el-button type="primary" @click="getQueryData(fromDev)"> 更 新 </el-button></div>
     </el-form>
   </div>
 </template>
@@ -136,7 +132,6 @@ export default {
       lateStatusBtn1: 'info',
       getInfoBtn: 'info',
       getInfoBtn1: 'info',
-      showButton: true,
       showButton1: false,
       userData: '',
       showDelay: false,
@@ -175,7 +170,6 @@ export default {
   },
   methods: {
     getRouterData() {
-      this.showButton = true
       this.showButton1 = false
       if (this.$route.query.task) { // 任务提测
         this.bizIdCode = this.$route.query.task.bizId
@@ -183,7 +177,6 @@ export default {
       }
       if (this.$route.query.data) {
         this.showButton1 = true
-        this.showButton = false
         launchTest({ id: this.$route.query.id }).then((res) => {
           this.fromDev = res.data
           if (this.fromDev.lateReason !== '') {
@@ -230,6 +223,9 @@ export default {
         }
       })
     },
+    parentHandleclick(e) {
+      this.getCreateData(this.fromDev)
+    },
     getCreateData(ele) {
       this.$refs['fromDev'].validate((valid) => {
         if (valid) {
@@ -284,10 +280,6 @@ export default {
         this.getInfoBtn = 'danger'
         this.showData = true
       }
-    },
-
-    clickPreview(ele) {
-      this.$router.push({ path: '/Platform/presentation/acceptTheReport', query: { id: this.$route.query.id }})
     }
   }
 }

src/views/ToConfigure/configure.vue

@@ -151,16 +151,17 @@
                 border
                 :tree-props="{children: 'childModules', hasChildren: 'hasChildren'}"
                 :row-class-name="tableRowhidden"
+                header-align="center"
               >
-                <el-table-column v-if="false" prop="id" label="ID" width="180" />
-                <el-table-column prop="moduleName" label="模块名称" width="280">
+                <el-table-column v-if="false" prop="id" label="ID" width="180" align="center" />
+                <el-table-column prop="moduleName" label="模块名称">
                   <template slot="header">
                     模块名称<i class="el-icon-circle-plus" @click="handlerModule('add')" />
                   </template>
                 </el-table-column>
-                <el-table-column prop="creator" label="创建人" width="120" />
-                <el-table-column prop="createTime" label="创建时间" />
-                <el-table-column label="操作">
+                <el-table-column prop="creator" label="创建人" width="120" align="center" />
+                <el-table-column prop="createTime" label="创建时间" width="180" align="center" />
+                <el-table-column label="操作" width="240" align="center">
                   <template slot-scope="scope">
                     <el-button
                       size="mini"
@@ -172,7 +173,6 @@
                     >编辑</el-button>
                     <el-button
                       size="mini"
-                      type="danger"
                       @click="handlerModule('delete', scope.row, scope.$index)"
                     >删除</el-button>
                   </template>
@@ -589,19 +589,21 @@ export default {
     handlerModule(type, data, index) { // 模块处理
       console.log(data)
       this.moduleDialog = true
-      this.moduleTitle = '新增模块'
       this.curcentModule = type
       this.moduleForm = { bizId: null, moduleNames: [null], parentId: -1, id: null }// 初始化
       this.curcentParent = '无'
       if (data && type === 'add') {
+        this.moduleTitle = '新增模块'
         this.curcentParent = data.moduleName
         this.moduleForm.parentId = data.id
       } else if (data && type === 'edit') {
+        this.moduleTitle = '编辑模块'
         this.moduleForm.id = data.id
         this.curcentParent = data.parentId === -1 ? '无' : data.parentModuleName
         this.moduleForm.parentId = data.parentId
         this.moduleForm.moduleNames[0] = data.moduleName
       } else if (data && type === 'delete') {
+        this.moduleTitle = '删除确认'
         this.moduleForm.id = data.id
         this.moduleForm.moduleNames[0] = data.moduleName
       }