Merge branches 'master' and 'master' of git.xiaojukeji.com:jacklijiajia/thoth-frontend

src/views/online-quality/BlockServer/blockServer.vue

@@ -2,7 +2,7 @@
   <div>
     <el-header>
       <el-header>
-        <el-form inline label-position="right" label-width="60px">
+        <el-form inline label-position="right" label-width="80px">
           <el-form-item label="业务线:">
             <el-select v-model="searchForm.lineId" filterable placeholder="请选择业务线">
               <el-option
@@ -13,11 +13,11 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="服务名:">
+          <el-form-item label="模块名:">
             <el-input v-model="searchForm.serverName" />
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" icon="el-icon-search" @click="getNsServerCheckClick">查询</el-button>
+            <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
             <el-button type="primary" icon="el-icon-refresh" @click="reset">重置</el-button>
             <el-button type="primary" icon="el-icon-circle-plus-outline" @click="addBlockServerDialogVisible = true">新增</el-button>
           </el-form-item>
@@ -156,6 +156,10 @@ export default {
           this.total = res.data.number
         })
     },
+    search() {
+      this.searchForm.pageNum = 1
+      this.getNsServerCheckClick()
+    },
     deleteNsServerCheckClick(row) {
       this.$confirm('此操作将永久删除阻断服务项 是否继续?', '提示', {
         confirmButtonText: '确定',

src/views/online-quality/HistoryTask/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-header>
-      <el-form inline label-position="right" label-width="60px">
+      <el-form inline label-position="right" label-width="80px">
         <el-form-item label="业务线:">
           <el-select v-model="searchForm.lineId" filterable placeholder="请选择业务线">
             <el-option
@@ -12,11 +12,11 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="服务名:">
+        <el-form-item label="模块名:">
           <el-input v-model="searchForm.serverName" />
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" icon="el-icon-search" @click="getCheckResult">查询</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
           <el-button type="primary" icon="el-icon-refresh" @click="reset">重置</el-button>
         </el-form-item>
       </el-form>
@@ -31,7 +31,7 @@
       >
         <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="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">
@@ -116,6 +116,10 @@ export default {
           this.total = res.data.number
         })
     },
+    search() {
+      this.searchForm.pageNum = 1
+      this.getCheckResult()
+    },
     handleSizeChange: function(pageSize) {
       this.searchForm.pageSize = pageSize
       this.getCheckResult()