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

# Conflicts:
#	src/views/system/bpm/task/todo/index.vue

src/views/pqs/supervise/terminal/index.vue

@@ -43,8 +43,6 @@ watch(() => route.query.t, async (newValue, oldValue) => {
     let type = (route.query.type as string) || 'null'
     if (type == '1') {
       activeName.value = '1'
-    } else {
-      activeName.value = '4'
     }
     id.value = (route.query.id as string) || 'null'
     id.value = id.value + '@' + route.query.t

src/views/system/bpm/task/todo/index.vue

@@ -3,24 +3,13 @@
   <div>
     <TableHeader>
       <template v-slot:select>
-                <el-form-item label="搜索">
-                    <el-input v-model="tableStore.table.params.searchValue" placeholder="请输入搜索内容"></el-input>
+        <el-form-item label='任务名称'>
+          <el-input v-model='tableStore.table.params.searchValue' placeholder='请输入任务名称'></el-input>
         </el-form-item>
-
-                <!--        <el-form-item label='任务类型'>-->
-                <!--          <el-select v-model="tableStore.table.params.runF" clearable placeholder="请选择任务类型">-->
-                <!--            <el-option-->
-                <!--                v-for="item in runFlagList"-->
-                <!--                :key="item.id"-->
-                <!--                :label="item.name"-->
-                <!--                :value="item.id"-->
-                <!--            ></el-option>-->
-                <!--          </el-select>-->
-                <!--        </el-form-item>-->
       </template>
     </TableHeader>
     <!--表格-->
-        <Table ref="tableRef"></Table>
+    <Table ref='tableRef'></Table>
   </div>
 </template>