diff --git a/src/components/ConfigManager/RtuConfig.vue b/src/components/ConfigManager/RtuConfig.vue
index a3ac3f7..264bbba 100644
--- a/src/components/ConfigManager/RtuConfig.vue
+++ b/src/components/ConfigManager/RtuConfig.vue
@@ -7,9 +7,9 @@
       v-if="formAll && formAllBody && formAllBody.length"
       class="filter-content"
     >
-      <span style="color:var(--white)!important;">
+      <!-- <span style="color:var(--white)!important;">
         请先搜索站点名称或编号:
-      </span>
+      </span> -->
       <!-- <el-autocomplete
         v-model="site1"
         :fetch-suggestions="querySearchAsync1"
@@ -19,36 +19,49 @@
       <!-- <el-button>
         搜索
       </el-button> -->
+      <el-input v-model="searchCode" placeholder="请输入站点名或编号" style="display:inline-block;width:200px" clearable>
+
+      </el-input>
+      <el-button type="primary" @click="search">
+        搜索
+      </el-button>
       <el-cascader
         v-model="querySite"
-        placeholder="请搜索站点名或者编号"
+        placeholder="请选择"
         :options="querySiteList"
         filterable
+        :show-all-levels="false"
+        clearable
+        :props="{
+          expandTrigger:'hover'
+        }"
         @change="selectChange"
-        ></el-cascader>
+        >
+      </el-cascader>
+
       <!-- <el-select v-model="querySite" filterable @change="selectChange">
         <el-option
           v-for="(item,index) in querySiteList"
           :key="index"
           :label="`${item.rtuStationCode}   ${item.rtuStationName}`"
           :value="item.rtuStationCode"
-        >
+        >:disabled="!(querySite.length&&(querySite[0].length===0))"
         </el-option>
       </el-select> -->
-      <el-button type="primary" @click="echoClick">
+      <el-button type="primary" @click="echoClick" :disabled="querySite.length !==2">
         回显
       </el-button>
-      <el-button type="primary" @click="temStorage">
+      <el-button type="primary" @click="temStorage" :disabled="querySite.length !==2">
         暂存
       </el-button>
-      <el-button type="primary" @click="temStorageEcho">
+      <el-button type="primary" @click="temStorageEcho" :disabled="querySite.length !==2">
         暂存回显
       </el-button>
-      <el-button type="primary" @click="sunmitAll">
+      <el-button type="primary" @click="sunmitAll" :disabled="querySite.length !==2">
         提交
       </el-button>
       <div class="rtu-history-box">
-        <el-select v-model="rtuHistoryId" filterable @change="selectRtuHistoryId">
+        <el-select v-model="rtuHistoryId" filterable @change="selectRtuHistoryId" :disabled="querySite.length !==2">
           <el-option
             v-for="(item,index) in rtuHistoryList"
             :key="index"
@@ -57,7 +70,7 @@
           >
           </el-option>
         </el-select>
-        <el-button type="primary" @click="echoRtuHistory">
+        <el-button type="primary" @click="echoRtuHistory" :disabled="querySite.length !==2">
           回显历史记录
         </el-button>
 
@@ -480,7 +493,9 @@
       // siteNameList:[],
       formAllBody: [], //所有字段控件 结构从1开始取，每个item有name（标题名），data数组包含控件对象
       activeIndex: "0",//
-      rules: {} //
+      rules: {}, //
+      searchCode: '',
+      loading:false
     };
   },
   // computed:{
@@ -783,6 +798,12 @@
     // bottom
   },
   methods: {
+    search(){
+      this.formAll = [];
+      this.querySite=  []
+      // console.log(this.querySite,'querySite')
+      this.getSiteList(this.searchCode)
+    },
     switchChange(val){
       // console.log(val,this.formAll[0].form1,'change')
     },
@@ -822,7 +843,7 @@
     },
     temStorageEcho() {
       // this.activeIndex = '0'
-      if(localStorage.getItem(name)){
+      if(localStorage.getItem(this.querySite[1])){
         this.formAll = JSON.parse(localStorage.getItem(name));
         this.$message({ message: '暂存回显成功', type: "success" });
       } else{
@@ -832,8 +853,8 @@
     },
     temStorage() {
       try {
-        localStorage.setItem(name, JSON.stringify(this.formAll));
-        this.$message({ message: `保存成功`, type: "success" });
+        localStorage.setItem(this.querySite[1], JSON.stringify(this.formAll));
+        this.$message({ message: `${this.querySite[1]}保存成功`, type: "success" });
       } catch (err) {
         this.$message({ message: err, type: "warning" });
       }
@@ -1002,8 +1023,9 @@
     },
     selectChange(val) {
       // this.querySite = []
-      this.rtuHistoryId='',
+      this.rtuHistoryId=''
       // console.log(val,'val')
+      // if(this.querySite.length!==2) return;
       this.echoClick(val);
       this.getRtuHistoryList()
     },
@@ -1017,6 +1039,7 @@
       // this.echoClick(val);
     },
     async initPage(site) {
+      this.loading = true
       // 切换站点后去请求历史下拉框
       // this.getRtuHistoryList()
       // 回显接口请求数据 将水文传感里面3处特殊的控件需要的值，用请求数据遍历生成表单需要的字段，因为这3处的动态表单使用的是死的字段，其他的对应的表单数据赋值给对应表单就能回显了、
@@ -1124,6 +1147,7 @@
         this.formAll.push(obj);
         // console.log(this.formAll,this.stCode,'this.formAll')
       }
+        this.loading = false
     },
     async initPage2(rtuCode) {
       // 回显接口请求数据 将水文传感里面3处特殊的控件需要的值，用请求数据遍历生成表单需要的字段，因为这3处的动态表单使用的是死的字段，其他的对应的表单数据赋值给对应表单就能回显了、
@@ -1372,12 +1396,17 @@
         console.log(this.formAllBody,'999')
       });
     },
-    async getSiteList() {
+    async getSiteList(val='') {
+        // ,{stCode:this.querySite}
       await this.$http
-        .post(this.nozzle.rTUSettingServiceQueryList)
+        .post(`${this.nozzle.rTUSettingServiceQueryList}?stCode=${val}`)
         .then(res => {
           // console.log(res.data.data,'resss')
           this.querySiteList = res.data.data;
+          // this.querySiteList.push({
+          //   label:2001,
+          //   value:2001
+          // });
           // this.querySite[0] = this.querySiteList[0].children[0].label;
         });
     },
@@ -1444,6 +1473,7 @@
     }
     .filter-content{
       text-align:left;padding:10px;position:relative;
+      // display: flex;
       .rtu-history-box{
         padding: 10px 0 0 0;
         position: absolute;
@@ -1459,6 +1489,7 @@
       // color: white !important;
 
       padding: 2% 0 0 0;
+      height: calc(100% - 120px);
       /deep/ .el-form{
           .el-col{
             height: 51px!important;