更新提测说明

src/assets/css/iconfont.css

@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-explain:before {
+  content: "\e6f6";
+}
+
 .icon-menu:before {
   content: "\e64e";
 }

src/assets/fonts/iconfont.css

+@font-face {
+  font-family: "iconfont"; /* Project id 2584881 */
+  src: url('iconfont.woff2?t=1637057512757') format('woff2'),
+       url('iconfont.woff?t=1637057512757') format('woff'),
+       url('iconfont.ttf?t=1637057512757') format('truetype');
+}
+
+.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-explain:before {
+  content: "\e6f6";
+}
+
+.icon-menu:before {
+  content: "\e64e";
+}
+
+.icon-confluence1:before {
+  content: "\eb6c";
+}
+
+.icon-addenvironment:before {
+  content: "\e607";
+}
+
+.icon-left-template:before {
+  content: "\e62b";
+}
+
+.icon-environment:before {
+  content: "\edac";
+}
+
+.icon-template:before {
+  content: "\e735";
+}
+
+.icon-jira1:before {
+  content: "\e672";
+}
+
+.icon-yinhang:before {
+  content: "\e64c";
+}
+
+.icon-confluence:before {
+  content: "\e603";
+}
+
+.icon-jenkins:before {
+  content: "\e604";
+}
+
+.icon-grafana:before {
+  content: "\ebb0";
+}
+
+.icon-kibana:before {
+  content: "\ebe6";
+}
+
+.icon-zhifeiji:before {
+  content: "\e6a0";
+}
+
+.icon-detail:before {
+  content: "\e793";
+}
+
+.icon-yonghupeizhi:before {
+  content: "\e71b";
+}
+
+.icon-daohang:before {
+  content: "\e634";
+}
+
+.icon-docker1:before {
+  content: "\e602";
+}
+
+.icon-Docker:before {
+  content: "\e9f3";
+}
+
+.icon-ceshi:before {
+  content: "\e648";
+}
+
+.icon-xinicon_huabanfuben:before {
+  content: "\e647";
+}
+
+.icon-peizhi:before {
+  content: "\e66c";
+}
+
+.icon-chaobiaoguanli-01:before {
+  content: "\e621";
+}
+
+.icon-quality:before {
+  content: "\e627";
+}
+
+.icon-process:before {
+  content: "\e718";
+}
+
+.icon-role:before {
+  content: "\e611";
+}
+
+.icon-Usergroup:before {
+  content: "\e605";
+}
+
+.icon-mg-role:before {
+  content: "\e60a";
+}
+
+.icon-rolejiaose:before {
+  content: "\e766";
+}
+
+.icon-password:before {
+  content: "\e609";
+}
+
+.icon-username:before {
+  content: "\e73f";
+}
+
+.icon-password1:before {
+  content: "\e606";
+}
+
+.icon-password2:before {
+  content: "\e610";
+}
+
+.icon-username1:before {
+  content: "\e601";
+}
+
+.icon-questionmarko:before {
+  content: "\e62a";
+}
+
+.icon-question-mark-circle:before {
+  content: "\e608";
+}
+
+.icon-question-mark:before {
+  content: "\e695";
+}
+
+.icon-question-mark-circle-outline:before {
+  content: "\e741";
+}
+
+.icon-question-mark-circle1:before {
+  content: "\e688";
+}
+
+.icon-sync:before {
+  content: "\e72a";
+}
+
+.icon-sync1:before {
+  content: "\e67e";
+}
+
+.icon-sync2:before {
+  content: "\e60f";
+}
+
+.icon-sync3:before {
+  content: "\e65d";
+}
+
+.icon-xiangmu1:before {
+  content: "\e61c";
+}
+
+.icon-money:before {
+  content: "\e66e";
+}
+
+.icon-hammock:before {
+  content: "\e70c";
+}
+
+.icon-report:before {
+  content: "\e626";
+}
+
+.icon-structure:before {
+  content: "\ec7e";
+}
+
+.icon-query:before {
+  content: "\e636";
+}
+
+.icon-shujujiemi:before {
+  content: "\e60c";
+}
+
+.icon-interface:before {
+  content: "\e60e";
+}
+
+.icon-notice:before {
+  content: "\e732";
+}
+
+.icon-money1:before {
+  content: "\e904";
+}
+
+.icon-case:before {
+  content: "\e600";
+}
+
+.icon-consumption-fill:before {
+  content: "\e79d";
+}
+
+.icon-scenes-fill:before {
+  content: "\e79e";
+}
+
+.icon-scenes:before {
+  content: "\e79f";
+}
+
+.icon-consumption:before {
+  content: "\e7a0";
+}
+
+.icon-memcacheyunshujukuMemcac:before {
+  content: "\e61f";
+}
+
+.icon-secure-payment-fill:before {
+  content: "\e8cd";
+}
+
+.icon-cached:before {
+  content: "\e860";
+}
+
+.icon-Icon_signin:before {
+  content: "\e61d";
+}
+
+.icon-modular:before {
+  content: "\e678";
+}
+
+.icon-money2:before {
+  content: "\e6db";
+}
+
+.icon-credits:before {
+  content: "\e8c1";
+}
+
+.icon-Memcached:before {
+  content: "\e66b";
+}
+
+.icon-jira:before {
+  content: "\e7bc";
+}
+
+.icon-icon_dpsz:before {
+  content: "\e618";
+}
+
+.icon-icon_ckbl_n:before {
+  content: "\e620";
+}
+
+.icon-icon_cs_n:before {
+  content: "\e622";
+}
+
+.icon-icon_yhq_n:before {
+  content: "\e623";
+}
+
+.icon-icon_yxtj_n:before {
+  content: "\e624";
+}
+
+.icon-icon_yydd_n:before {
+  content: "\e625";
+}
+

src/assets/fonts/iconfont.json

@@ -5,6 +5,13 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "7573251",
+      "name": "explain",
+      "font_class": "explain",
+      "unicode": "e6f6",
+      "unicode_decimal": 59126
+    },
     {
       "icon_id": "10485796",
       "name": "menu",

src/views/layout/leftAside/menu.json

@@ -251,18 +251,18 @@
       "id": 8,
       "title": "质量保证",
       "icon": "iconfont icon-quality",
-      "child": [
+      "child": [   
         {
           "id": 1,
-          "title": "测试流程",
-          "icon": "iconfont icon-process",
-          "path": "/qa/process"
+          "title": "提测说明",
+          "icon": "iconfont icon-explain",
+          "path": "/qa/testDescription"
         },
         {
           "id": 2,
-          "title": "提测说明",
+          "title": "测试流程",
           "icon": "iconfont icon-process",
-          "path": "/qa/testDescription"
+          "path": "/qa/process"
         }
       ]
     },

src/views/layout/rightMain/Header.vue

@@ -49,7 +49,7 @@ export default {
     ...mapGetters({
       getCollapseState: 'header/CollapseState',
       getCrumbs: 'header/Crumbs',
-      // 获取用户名称
+      // 获取用户名称(可当作全局变量使用)
       getUserName: 'user/chineseName'
     })
   },

src/views/qa/DetailTestDescription.vue

@@ -84,7 +84,7 @@
 </template>
 <script>
 import { detailTestDescription } from '@/api/TestDesciption'
-import bus from '@/utils/bus'
+
 export default {
   data() {
     return {
@@ -99,21 +99,22 @@ export default {
     }
   },
   created() {
-    bus.$on('msg', (row) => {
-      detailTestDescription({
-        projectName: row.projectName,
-        jiraProjectKey: row.jiraProjectKey
-      }).then((resp) => {
-        var data = resp.data.data
-        this.projectName = data.projectName
-        this.jiraProjectName = data.jiraProjectName
-        this.requirement = data.requirement
-        this.api = data.api
-        this.scope = data.scope
-        this.serviceAndBranch = JSON.parse(data.serviceAndBranch)
-        this.apollo = JSON.parse(data.apollo)
-        this.database = JSON.parse(data.database)
-      })
+    // console.log('this.$route.query', this.$route.query)
+    // 详情接口
+    detailTestDescription({
+      projectName: this.$route.query.projectName,
+      jiraProjectKey: this.$route.query.jiraProjectKey
+    }).then((resp) => {
+      var data = resp.data.data
+      console.log('rrr', data)
+      this.projectName = data.projectName
+      this.jiraProjectName = data.jiraProjectName
+      this.requirement = data.requirement
+      this.api = data.api
+      this.scope = data.scope
+      this.serviceAndBranch = JSON.parse(data.serviceAndBranch)
+      this.apollo = JSON.parse(data.apollo)
+      this.database = JSON.parse(data.database)
     })
   },
 

src/views/qa/Notify.vue

@@ -350,6 +350,7 @@ import {
   detailTestDescription,
   getTestProjectNameList
 } from '@/api/TestDesciption'
+
 export default {
   data() {
     return {
@@ -366,6 +367,10 @@ export default {
         {
           label: '已完成',
           value: 2
+        },
+        {
+          label: '已挂起',
+          value: 3
         }
       ],
       dingRobotList: [],
@@ -387,10 +392,10 @@ export default {
         dingRobot: {
           projectName: '',
           dingUrl: '',
-          // creator: '',
           jiraProjectKey: '',
           namespace: '',
-          status: 1
+          status: 1,
+          submitTestInstructionId: ''
         },
         pipelineList: []
       },
@@ -400,10 +405,10 @@ export default {
           id: '',
           projectName: '',
           dingUrl: '',
-          // creator: '',
           jiraProjectKey: '',
           namespace: '',
-          status: ''
+          status: '',
+          submitTestInstructionId: ''
         },
         pipelineList: [
           {
@@ -526,6 +531,7 @@ export default {
       this.pipelineFrom.pipelineList = []
       detailTestDescription(this.detailForm).then((resp) => {
         var data = resp.data.data
+        this.pipelineFrom.dingRobot.submitTestInstructionId = data.id
         var serviceForm = JSON.parse(data.serviceAndBranch)
         serviceForm.forEach((item) => {
           this.pipelineFrom.pipelineList.push({
@@ -553,6 +559,7 @@ export default {
       this.editPipelineForm.pipelineList = []
       detailTestDescription(this.detailEditForm).then((resp) => {
         var data = resp.data.data
+        this.editPipelineForm.dingRobot.submitTestInstructionId = data.id
         var serviceForm = JSON.parse(data.serviceAndBranch)
         serviceForm.forEach((item) => {
           this.editPipelineForm.pipelineList.push({
@@ -579,7 +586,6 @@ export default {
     getProjectRobotList() {
       getPipelineList(this.queryInfo).then((resp) => {
         this.dingRobotList = resp.data.data.list
-        console.log('mmm', this.dingRobotList)
         this.totalNum = resp.data.data.total
       })
     },

src/views/qa/TestDescription.vue

@@ -63,16 +63,16 @@
       </el-pagination>
     </el-card>
     <!-- 新增页面 -->
-    <el-dialog title="新增提测文档" :visible.sync="DialogAddVisible" width="70%">
+    <el-dialog title="新增提测文档" :visible.sync="DialogAddVisible" width="70%" @close="closeAddDialog">
       <el-form ref="addTestDescriptionRef" :rules="rules" :model="addTestDescriptionForm" label-width="90px">
-        <el-form-item label="jira项目:">
+        <el-form-item label="Jira项目:" prop="jiraProjectKey">
           <el-select v-model="addTestDescriptionForm.jiraProjectKey" placeholder="请选择Jira项目" filterable clearable>
             <el-option v-for="item in jiraProjectList" :key="item.key" :label="item.name" :value="item.key">
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="项目名称:" style="width:400px">
-          <el-input v-model="addTestDescriptionForm.projectName"></el-input>
+        <el-form-item label="项目名称:" style="width:400px" prop="projectName">
+          <el-input v-model="addTestDescriptionForm.projectName" placeholder="请输入项目名称"></el-input>
         </el-form-item>
         <!-- 服务及分支 -->
         <el-form-item label="服务及分支:" style="width:95%">
@@ -131,7 +131,6 @@
           </el-row>
           <el-button type="primary" size="mini" plain icon="el-icon-circle-plus-outline"
             @click="addServiceAndBranchRow()" class="btn-style">添加</el-button>
-
         </el-form-item>
         <!-- apollo变更 -->
         <el-form-item label="apollo变更:">
@@ -221,8 +220,15 @@ import {
   editTestDescription
 } from '@/api/TestDesciption'
 import { getDataBaseList } from '@/api/effect'
-import bus from '@/utils/bus'
+// import bus from '@/utils/bus'
+import { mapGetters } from 'vuex'
 export default {
+  computed: {
+    ...mapGetters({
+      // 获取用户名称(可当作全局变量使用)
+      getUserName: 'user/chineseName'
+    })
+  },
   data() {
     return {
       queryModuleInfo: {
@@ -247,10 +253,17 @@ export default {
         scope: ''
       },
       rules: {
+        jiraProjectKey: [
+          {
+            required: true,
+            message: '请选择项目名称',
+            trigger: 'blur'
+          }
+        ],
         projectName: [
           {
             required: true,
-            message: '项目名称不能为空！',
+            message: '请输入项目名称',
             trigger: 'blur'
           }
         ]
@@ -262,7 +275,7 @@ export default {
         {
           serviceName: '',
           branch: '',
-          developer: ''
+          developer: this.getUserName
         }
       ],
       apolloList: [],
@@ -286,6 +299,7 @@ export default {
     getTestDescriptionList() {
       getTestDescriptionList(this.queryModuleInfo).then((resp) => {
         this.testDescriptionList = resp.data.data.list
+        console.log('yyy', this.testDescriptionList)
         this.totalNum = resp.data.data.total
       })
     },
@@ -323,7 +337,7 @@ export default {
       this.serviceAndBranchList.push({
         serviceName: '',
         branch: '',
-        developer: ''
+        developer: this.getUserName
       })
     },
     // 删除服务及分支
@@ -372,7 +386,7 @@ export default {
       this.serviceAndBranchList.push({
         serviceName: '',
         branch: '',
-        developer: ''
+        developer: this.getUserName
       })
       this.apolloList = []
       this.databaseList = []
@@ -385,29 +399,35 @@ export default {
       )
       this.addTestDescriptionForm.apollo = JSON.stringify(this.apolloList)
       this.addTestDescriptionForm.database = JSON.stringify(this.databaseList)
-      // 编辑测试文档
-      if (this.addTestDescriptionForm.id) {
-        editTestDescription(this.addTestDescriptionForm).then((resp) => {
-          if (resp.data.businessCode === '0000') {
-            this.$message.success(resp.data.msg)
-            this.DialogAddVisible = false
-            this.getTestDescriptionList()
+      this.$refs.addTestDescriptionRef.validate((valid) => {
+        if (!valid) {
+          return false
+        } else {
+          // 编辑测试文档
+          if (this.addTestDescriptionForm.id) {
+            editTestDescription(this.addTestDescriptionForm).then((resp) => {
+              if (resp.data.businessCode === '0000') {
+                this.$message.success(resp.data.msg)
+                this.DialogAddVisible = false
+                this.getTestDescriptionList()
+              } else {
+                this.$message.error(resp.data.msg)
+              }
+            })
           } else {
-            this.$message.error(resp.data.msg)
+            // 添加测试文档
+            addTestDescription(this.addTestDescriptionForm).then((resp) => {
+              if (resp.data.businessCode === '0000') {
+                this.$message.success(resp.data.msg)
+                this.DialogAddVisible = false
+                this.getTestDescriptionList()
+              } else {
+                this.$message.error(resp.data.msg)
+              }
+            })
           }
-        })
-      } else {
-        // 添加测试文档
-        addTestDescription(this.addTestDescriptionForm).then((resp) => {
-          if (resp.data.businessCode === '0000') {
-            this.$message.success(resp.data.msg)
-            this.DialogAddVisible = false
-            this.getTestDescriptionList()
-          } else {
-            this.$message.error(resp.data.msg)
-          }
-        })
-      }
+        }
+      })
     },
     // 编辑对话框
     openEditDialog(row) {
@@ -455,11 +475,22 @@ export default {
     },
     // 详情按钮
     openPreviewDialog(row) {
-      this.$router.push('/qa/detailTestDescription')
-      this.$nextTick(function () {
-        // DOM 现在更新了
-        bus.$emit('msg', row)
+      // this.$router.push('/qa/detailTestDescription?')
+      // this.$nextTick(function () {
+      //   // DOM 现在更新了
+      //   bus.$emit('msg', row)
+      // })
+      this.$router.push({
+        path: `/qa/detailTestDescription`,
+        query: {
+          projectName: row.projectName,
+          jiraProjectKey: row.jiraProjectKey
+        }
       })
+    },
+    // 对话框关闭后清空文本框数据
+    closeAddDialog() {
+      this.$refs.addTestDescriptionRef.resetFields()
     }
   }
 }