添加测试流程查询功能以及菜单栏背景颜色

src/views/docker/EnvDetail.vue

@@ -401,10 +401,8 @@ export default {
     }
   },
   created() {
-    console.log('99999')
     this.getServiceList()
     bus.$on('refreshEnv', (name) => {
-      console.log('环境', name)
       this.namespace = name
       this.getServiceList()
     })
@@ -438,7 +436,6 @@ export default {
       const tLoading = this.$loading.service(this.loadingOptions)
       getServiceList({ namespace: this.namespace })
         .then((resp) => {
-          console.log('列表信息', resp.data.data)
           const serviceList = resp.data.data
           this.array2Object(serviceList)
           tLoading.close()

src/views/docker/TestEnv.vue

@@ -82,7 +82,6 @@ export default {
     },
     // 跳转到详情页面
     jumpToDetail(name) {
-      console.log('777', name)
       window.sessionStorage.setItem('env', name)
       // 向菜单栏中的下拉框传递环境名称
       bus.$emit('testEnv', name)

src/views/jira/Notify.vue

 <template>
   <div>
     <el-card>
-      <!-- 顶部搜索栏 -->
       <div class="top">
-        <el-button type="primary" icon="el-icon-circle-plus-outline" @click="addPipeline" v-permission="('qa:process:add')">新增</el-button>
+        JIRA项目:
+        <el-select v-model="queryInfo.jiraProjectKey" placeholder="请选择JIRA项目" clearable>
+          <el-option v-for="item in jiraProjectList" :key="item.key" :label="item.name" :value="item.key"></el-option>
+        </el-select>
+        环境名称:
+        <el-select v-model="queryInfo.namespace" placeholder="请选择模块" clearable>
+          <el-option v-for="item in namespaceList" :key="item.key" :label="item.desc" :value="item.key"></el-option>
+        </el-select>
+        <el-input v-model="queryInfo.projectName" clearable placeholder="请输入项目名称" style="width: 300px;">
+        </el-input>
+        <el-button type="primary" style="margin-left:10px" icon="el-icon-search" @click="queryData">查询</el-button>
+        <el-button type="primary" style="margin-left:10px" icon="el-icon-circle-plus-outline" @click="addPipeline"
+          v-permission="('qa:process:add')">新增</el-button>
       </div>
 
       <el-table :data="dingRobotList" border style="width: 100%">
@@ -13,7 +24,8 @@
         <!-- <el-table-column prop="dingUrl" label="钉钉url"></el-table-column> -->
         <el-table-column label="服务->分支" width="300px">
           <template slot-scope="scope">
-            <div v-for="item in scope.row.pipelineList" :key="item.id"><b>{{ item.serviceName }}</b> -> {{ item.serviceBranch }}</div>
+            <div v-for="item in scope.row.pipelineList" :key="item.id"><b>{{ item.serviceName }}</b> ->
+              {{ item.serviceBranch }}</div>
           </template>
         </el-table-column>
         <el-table-column prop="dingRobot.namespace" label="测试环境" width="100px"></el-table-column>
@@ -22,16 +34,22 @@
         <el-table-column prop="dingRobot.createTime" label="创建时间" width="180px"></el-table-column>
         <el-table-column label="操作">
           <slot slot-scope="scope">
-            <el-button type="primary" size="small" @click="openEditDialog(scope.row)" v-permission="('qa:process:edit')">编辑</el-button>
-            <el-button type="warning" size="small" @click="openSendSmokingDialog(scope.row)" v-permission="('qa:process:smoke')">冒烟测试</el-button>
-            <el-button type="success" size="small" @click="openSendDialog(scope.row)" v-permission="('qa:process:schedule')">发送进度</el-button>
-            <el-button type="danger" size="small" @click="delProjectRobot(scope.row.dingRobot.id)" v-permission="('qa:process:del')">删除</el-button>
+            <el-button type="primary" size="small" @click="openEditDialog(scope.row)"
+              v-permission="('qa:process:edit')">编辑</el-button>
+            <el-button type="warning" size="small" @click="openSendSmokingDialog(scope.row)"
+              v-permission="('qa:process:smoke')">冒烟测试</el-button>
+            <el-button type="success" size="small" @click="openSendDialog(scope.row)"
+              v-permission="('qa:process:schedule')">发送进度</el-button>
+            <el-button type="danger" size="small" @click="delProjectRobot(scope.row.dingRobot.id)"
+              v-permission="('qa:process:del')">删除</el-button>
           </slot>
         </el-table-column>
       </el-table>
     </el-card>
     <!-- 分页 -->
-    <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="queryInfo.pageNum" :page-size="queryInfo.pageSize" layout="total, prev, pager, next" :total="totalNum"></el-pagination>
+    <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange"
+      :current-page.sync="queryInfo.pageNum" :page-size="queryInfo.pageSize" layout="total, prev, pager, next"
+      :total="totalNum"></el-pagination>
     <!-- 新增对话框 -->
     <el-dialog title="新增robot" :visible.sync="addDialogVisible" width="60%" @close="closeAddDialog">
       <el-form ref="addRobotFormRef" :rules="formRules" :model="pipelineFrom" label-width="150px">
@@ -45,7 +63,8 @@
           <el-input v-model="pipelineFrom.dingRobot.projectName" placeholder="请输入项目名称"></el-input>
         </el-form-item>
         <el-form-item label="钉钉通知地址" prop="dingRobot.dingUrl">
-          <el-input v-model="pipelineFrom.dingRobot.dingUrl" placeholder="请输入钉钉通知地址" type="textarea" :rows="3"></el-input>
+          <el-input v-model="pipelineFrom.dingRobot.dingUrl" placeholder="请输入钉钉通知地址" type="textarea" :rows="3">
+          </el-input>
         </el-form-item>
         <el-form-item label="创建人" prop="dingRobot.creator">
           <el-input v-model="pipelineFrom.dingRobot.creator" placeholder="请输入创建人"></el-input>
@@ -83,21 +102,26 @@
           <el-row v-for="(item, index) in pipelineFrom.pipelineList" :key="index">
             <el-col :span="6">
               <div style="text-align: center;margin-top:5px">
-                <el-select v-model="item.serviceName" filterable placeholder="请选择服务" @change="selectServiceModel(item.serviceName)" clearable>
-                  <el-option v-for="item2 in serviceList" :key="item2.name" :label="item2.name" :value="item2.name"></el-option>
+                <el-select v-model="item.serviceName" filterable placeholder="请选择服务"
+                  @change="selectServiceModel(item.serviceName)" clearable>
+                  <el-option v-for="item2 in serviceList" :key="item2.name" :label="item2.name" :value="item2.name">
+                  </el-option>
                 </el-select>
               </div>
             </el-col>
             <el-col :span="6">
               <div style="text-align: center;margin-top:5px">
-                <el-select v-model="item.serviceBranch" filterable placeholder="请选择分支" clearable @focus="focusevent(item.serviceName)">
-                  <el-option v-for="item2 in serviceBranchList" :key="item2.name" :label="item2.name" :value="item2.name"></el-option>
+                <el-select v-model="item.serviceBranch" filterable placeholder="请选择分支" clearable
+                  @focus="focusevent(item.serviceName)">
+                  <el-option v-for="item2 in serviceBranchList" :key="item2.name" :label="item2.name"
+                    :value="item2.name"></el-option>
                 </el-select>
               </div>
             </el-col>
             <el-col :span="6">
               <div style="text-align: center;margin-top:5px">
-                <el-switch v-model="item.enable" active-color="#13ce66" inactive-color="#A9A9A9" active-text="是" inactive-text="否" :active-value="1" :inactive-value="0"></el-switch>
+                <el-switch v-model="item.enable" active-color="#13ce66" inactive-color="#A9A9A9" active-text="是"
+                  inactive-text="否" :active-value="1" :inactive-value="0"></el-switch>
               </div>
             </el-col>
             <el-col :span="6">
@@ -107,7 +131,8 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-button size="mini" type="primary" icon="el-icon-circle-plus-outline" @click="AddPipelineListRow()" class="btn-style">添加</el-button>
+            <el-button size="mini" type="primary" icon="el-icon-circle-plus-outline" @click="AddPipelineListRow()"
+              class="btn-style">添加</el-button>
           </el-row>
         </el-form-item>
       </el-form>
@@ -131,7 +156,8 @@
         </el-form-item>
         <el-tooltip content="钉钉机器人关键字设置为'测试'" placement="left-start" effect="light">
           <el-form-item label="钉钉通知地址" prop="dingRobot.dingUrl">
-            <el-input v-model="editPipelineForm.dingRobot.dingUrl" placeholder="请输入钉钉通知地址" type="textarea" :rows="3"></el-input>
+            <el-input v-model="editPipelineForm.dingRobot.dingUrl" placeholder="请输入钉钉通知地址" type="textarea" :rows="3">
+            </el-input>
           </el-form-item>
         </el-tooltip>
         <el-form-item label="创建人" prop="dingRobot.creator">
@@ -171,21 +197,26 @@
           <el-row v-for="(item, index) in editPipelineForm.pipelineList" :key="index">
             <el-col :span="6">
               <div style="text-align: center;margin-top:5px">
-                <el-select v-model="item.serviceName" filterable placeholder="请选择服务" @change="selectServiceModel(item.serviceName)" clearable>
-                  <el-option v-for="item2 in serviceList" :key="item2.name" :label="item2.name" :value="item2.name"></el-option>
+                <el-select v-model="item.serviceName" filterable placeholder="请选择服务"
+                  @change="selectServiceModel(item.serviceName)" clearable>
+                  <el-option v-for="item2 in serviceList" :key="item2.name" :label="item2.name" :value="item2.name">
+                  </el-option>
                 </el-select>
               </div>
             </el-col>
             <el-col :span="6">
               <div style="text-align: center;margin-top:5px">
-                <el-select v-model="item.serviceBranch" filterable placeholder="请选择分支" clearable @focus="focusevent(item.serviceName)">
-                  <el-option v-for="item2 in serviceBranchList" :key="item2.name" :label="item2.name" :value="item2.name"></el-option>
+                <el-select v-model="item.serviceBranch" filterable placeholder="请选择分支" clearable
+                  @focus="focusevent(item.serviceName)">
+                  <el-option v-for="item2 in serviceBranchList" :key="item2.name" :label="item2.name"
+                    :value="item2.name"></el-option>
                 </el-select>
               </div>
             </el-col>
             <el-col :span="6">
               <div style="text-align: center;margin-top:5px">
-                <el-switch v-model="item.enable" active-color="#13ce66" inactive-color="#A9A9A9" active-text="是" inactive-text="否" :active-value="1" :inactive-value="0"></el-switch>
+                <el-switch v-model="item.enable" active-color="#13ce66" inactive-color="#A9A9A9" active-text="是"
+                  inactive-text="否" :active-value="1" :inactive-value="0"></el-switch>
               </div>
             </el-col>
             <el-col :span="6">
@@ -194,7 +225,8 @@
               </div>
             </el-col>
           </el-row>
-          <el-button size="mini" type="primary" @click="EditPipelineListRow()" icon="el-icon-circle-plus-outline" class="btn-style">添加</el-button>
+          <el-button size="mini" type="primary" @click="EditPipelineListRow()" icon="el-icon-circle-plus-outline"
+            class="btn-style">添加</el-button>
         </el-form-item>
 
       </el-form>
@@ -290,7 +322,10 @@ export default {
       jiraProjectList: [],
       queryInfo: {
         pageNum: 1,
-        pageSize: 10
+        pageSize: 10,
+        jiraProjectKey: '',
+        projectName: '',
+        namespace: ''
       },
       totalNum: 0,
       addDialogVisible: false,
@@ -433,7 +468,6 @@ export default {
     focusevent(name) {
       getGitBranchList({ projectName: name }).then((resp) => {
         this.serviceBranchList = resp.data.data.data
-        console.log('集合为', this.serviceBranchList)
       })
     },
     // 选择服务下拉框触发事件
@@ -695,9 +729,14 @@ export default {
       // 获取服务列表
       this.getServiceList()
       this.getNamespaceList()
+    },
+    // 查询方法
+    queryData() {
+      this.getProjectRobotList()
     }
   },
   created() {
+    this.getNamespaceList()
     this.getJiraProjectList()
     this.getProjectRobotList()
   }
@@ -716,4 +755,7 @@ export default {
   margin-top: 10px;
   margin-left: 8px;
 }
+.el-select {
+  margin: 0 10px 0 5px;
+}
 </style>

src/views/layout/rightMain/AsideTitle.vue

@@ -292,5 +292,6 @@ export default {
   // border-bottom: 1px solid #e9eaf1;
   box-shadow: 0 .5px 1px 0 #d8d6d6;
   // box-shadow: 0 1px 3px rgb(0 0 0 / 8%);
+  background-color:#E8EAED;
 }
 </style>