Merge branch 'master' of https://gitee.com/tj-wang-yahui/AMS_HeatSys_Vue_V10

src/components/MyMenu.vue

 <template>
     <el-scrollbar>
     <div class="ams-el-menu">
-    <!-- <div class="menu-search">
+    <div class="menu-search">
        <el-select placement="bottom" v-model="searchValue" clearable filterable remote reserve-keyword
         :placeholder="'请输入关键字搜索...'" :remote-method="remoteMethod" @change="selectChange" :loading="loading">
         <template #prefix><i class="el-icon-search"></i></template>
-        <el-option v-for="item in menus" :key="item.menuId" :label="item.menuName" :value="item.menuName" />
+        <el-option v-for="item in menus.childs" :key="item.menuId" :label="item.menuName" :value="item.menuName" />
       </el-select>
-    </div>  -->
+    </div> 
     
     <el-menu unique-opened :collapse-transition='false' :collapse='$store.state.iscollapse' router :default-active="defaultActive" active-text-color="#409EFF" background-color="#32363f" text-color="#fff">
         <!-- 一级菜单 -->

src/views/PatrolPage/TodayPatrolPage.vue

@@ -146,7 +146,6 @@
 function getImgUrl(item) {
     item = item.replaceAll("N",'<img style="width: 20px; height: 20px" src="/imgs/status/status_off.png" />')
     item = item.replaceAll("N",'<img style="width: 20px; height: 20px" src="/imgs/status/status_run.png" />')
-    console.log(item)
     return item;
 }
 

src/views/RemotePage/ZdlmSelfTest.vue

 <template>
   <el-card class="card-contianer">
-    <el-form :model="form" label-width="auto" style="max-width: 600px;height: 100%">
+    <el-form class="card-form" :model="form" label-width="auto" :style="{minHeight:h+'px',maxWidth:400+'px'}">
       <el-form-item label="自检计划名称">
         <el-input v-model="form.name" />
       </el-form-item>
@@ -55,6 +55,9 @@ import { ElMessage } from 'element-plus'
 
 import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
 import http from '../../api/http'
+
+var h=window.innerHeight - 165;
+
 const form = reactive({
   planId: '',
   name: '',
@@ -141,13 +144,11 @@ function get() {
   height: 100%;
   overflow: hidden;
     
-
-
-
 }
 
 .card-form {
   width: 100%;
-  height: 300px;
+  // text-align: center;
+  padding-left: 35%;
 }
 </style>
\ No newline at end of file