Merge branch 'master' of http://192.168.1.22:3000/Web/admin-sjzx

# Conflicts:
#	src/views/pqs/business/terminal/terminaCkeck/index.vue

src/views/pqs/business/terminal/terminaCkeck/index.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="default-main">
-        <TableHeader ref="TableHeaderRef" showCustomColumn>
+        <TableHeader ref="TableHeaderRef" showExport>
             <template #select>
                 <el-form-item label="地市">
                     <el-select v-model="tableStore.table.params.city" clearable placeholder="请选择地市">
@@ -12,21 +12,11 @@
                         ></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="变电站">
+                <el-form-item label="监测对象">
                     <el-input
                         style="width: 200px"
-                        placeholder="请输入变电站"
+                        placeholder="请输入监测对象名称"
-                        v-model="tableStore.table.params.substation"
+                        v-model="tableStore.table.params.searchValue"
-                        clearable
-                        maxlength="32"
-                        show-word-limit
-                    ></el-input>
-                </el-form-item>
-                <el-form-item label="终端名称">
-                    <el-input
-                        style="width: 200px"
-                        placeholder="请输入终端名称"
-                        v-model="tableStore.table.params.terminalName"
                         clearable
                         maxlength="32"
                         show-word-limit