diff --git a/src/assets/css/skincolor.scss b/src/assets/css/skincolor.scss
index 324dfe5..0603a8f 100644
--- a/src/assets/css/skincolor.scss
+++ b/src/assets/css/skincolor.scss
@@ -310,7 +310,7 @@
 
 .el-select-dropdown,
 .el-cascader-menu__list {
-  background-color: var(--selectlist) !important;
+  background-color: var(--shouselect) !important;
   border: 1px solid var(--selecthover) !important;
 }
 .el-select-dropdown__item.hover,

diff --git a/src/assets/css/skincolor.scss b/src/assets/css/skincolor.scss
index 324dfe5..0603a8f 100644
--- a/src/assets/css/skincolor.scss
+++ b/src/assets/css/skincolor.scss
@@ -310,7 +310,7 @@
 
 .el-select-dropdown,
 .el-cascader-menu__list {
-  background-color: var(--selectlist) !important;
+  background-color: var(--shouselect) !important;
   border: 1px solid var(--selecthover) !important;
 }
 .el-select-dropdown__item.hover,
diff --git a/src/components/ConfigManager/RtuConfig.vue b/src/components/ConfigManager/RtuConfig.vue
index 2ef7853..a323000 100644
--- a/src/components/ConfigManager/RtuConfig.vue
+++ b/src/components/ConfigManager/RtuConfig.vue
@@ -7,16 +7,34 @@
       v-if="formAll && formAllBody && formAllBody.length"
       class="filter-content"
     >
-      <el-select v-model="querySite" filterable @change="selectChange">
+      <span style="color:var(--white)!important;">
+        请先搜索站点名称或编号:
+      </span>
+      <!-- <el-autocomplete
+        v-model="site1"
+        :fetch-suggestions="querySearchAsync1"
+        placeholder="请输入内容"
+        @select="selectChange1"
+      ></el-autocomplete> -->
+      <!-- <el-button>
+        搜索
+      </el-button> -->
+      <el-cascader
+        v-model="querySite"
+        placeholder="请搜索站点名或者编号"
+        :options="querySiteList"
+        filterable
+        @change="selectChange"
+        ></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"
         >
-          <!-- <span style="float: left">{{ item }}</span> -->
         </el-option>
-      </el-select>
+      </el-select> -->
       <el-button type="primary" @click="echoClick">
         回显
       </el-button>
@@ -89,15 +107,15 @@
                   }}</el-col>
                   <el-col
                     :span="6"
-                    v-for="(item, index) in i.data"
-                    :key="index"
-                    style="position:relative"
+                    v-for="(item) in i.data"
+                    :key="item.fieldIdentifier"
+                    :class="{'el-col-class':true,'stop':item.hasOwnProperty('isShow') ? !item.isShow : false}"
                   >
                     <el-form-item
                       v-if="parseInt(item.fieldType) === 1"
                       :label="item.fieldName"
                       :prop="item.fieldIdentifier"
-                      :class="{'el-form-item-input':true,'stop':item.hasOwnProperty('isSHow') ? item.isSHow:false}"
+                      :class="{'el-form-item-input':true}"
                     >
                       <el-input
                         v-model="
@@ -111,7 +129,7 @@
                       v-if="parseInt(item.fieldType) === 2"
                       :label="item.fieldName"
                       :prop="item.fieldIdentifier"
-                      :class="{'el-form-item-input':true,'stop':item.hasOwnProperty('isSHow') ? item.isSHow:false}"
+                      :class="{'el-form-item-input':true}"
                     >
                       <el-select
                         v-model="
@@ -134,7 +152,7 @@
                       v-if="parseInt(item.fieldType) === 3"
                       :label="item.fieldName"
                       :prop="item.fieldIdentifier"
-                      :class="{'el-form-item-input':true,'form-switch':true,'stop':item.hasOwnProperty('isSHow') ? item.isSHow:false}"
+                      :class="{'el-form-item-input':true,'form-switch':true}"
                     >
                       <el-switch
                         v-model="
@@ -164,7 +182,7 @@
                       v-if="parseInt(item.fieldType) === 5"
                       :label="item.fieldName"
                       :prop="item.fieldIdentifier"
-                      :class="{'el-form-item-input':true,'stop':item.hasOwnProperty('isSHow') ? item.isSHow:false}"
+                      :class="{'el-form-item-input':true}"
                     >
                       <el-input
                         v-model="
@@ -408,7 +426,7 @@
                       v-if="parseInt(item.fieldType) === 6"
                       :label="item.fieldName"
                       :prop="item.fieldIdentifier"
-                      :class="{'el-form-item-input':true,'stop':item.hasOwnProperty('isSHow') ? item.isSHow:false}"
+                      :class="{'el-form-item-input':true}"
                     >
                       <el-select
                         v-model="
@@ -439,13 +457,18 @@
         </div>
       </div>
     </div>
+    <!-- <div v-if="!(formAll&&formAll[0].length)" style="height:56px">
+        请先选择站点
+    </div> -->
+    <!-- bottom -->
   </div>
 </template>
 <script>
+// import { float } from 'html2canvas/dist/types/css/property-descriptors/float';
 export default {
   data() {
     return {
-      querySite:'',
+      querySite:[],
       stCode:'',
       rtuHistoryId:'',
       hexRtuCode:'',
@@ -465,17 +488,18 @@
   //     return this.formAll[0].form1.rtuOutDtu;
   //   }
   // },
-  // watch:{
-  //   'rtuDtu':{
-  //     handler(newValue, oldValue) {
-  //       console.log('this.formAll[0].form1.rtuOutDtu')
-  //     },
-  //     deep:true
-  //   }
-  // },
+  watch:{
+    'querySite':{
+      handler(newValue, oldValue) {
+        console.log('this.formAll[0].form1.rtuOutDtu')
+      },
+      deep:true
+    }
+  },
   mounted() {
     // console.log(this.formAll,this.formAllBody,'this.formAll[0]')
     //// 第一个函数就是处理你要监听的属性，只要将其return出去就行
+    // 外置dtu开关
     this.$watch(
 			function () {
 				return this.formAll[0].form1.rtuOutDtu;
@@ -486,16 +510,9 @@
             arr[index].isShow =newVal;
           }
         })
-        // switch(newVal){
-        //   case false:
-        //     console.log(11);
-        //     break;
-        //   case true:
-        //     console.log(22);
-        //     break;
-        // }
 			}
     )
+    // GPRS，LORA开关
     this.$watch(
 			function () {
 				return this.formAll[0].form1.rtuInnerMode;
@@ -522,120 +539,197 @@
         })
 			}
     )
-    // this.$watch(
-		// 	function () {
-		// 		return this.formAll[0].form1.rtuother_dtu_type;
-		// 	},
-		// 	function (newVal, oldVal) {
-    //     let targetArr = [[true,true,true,false,false],[true,true,false,false,false],[false,false,false,false,true],[false,false,false,false,false]]
-    //     // let select= ['JoinEUI','频率格式','上行频率','下行频率','电信NB服务ID']
-    //     let strArr= ['JoinEUI','频率格式','上行频率','下行频率','电信NB服务ID']
-    //     let _this = this
-    //     let caseFun = function(newValIndex,strArr,targetArr){
-    //       console.log(_this.formAllBody['1'],88888)
-    //       _this.formAllBody['0'].form1.forEach((item,index,arr)=>{
-    //         if(item.name === '外置DTU设置'){
-    //           item.data.forEach((item,index,arr)=>{
-    //             for(let i = 0;i<strArr.length;i++){
-    //               if(arr[index].fieldName===strArr){
-    //                 arr[index]['isShow'] = targetArr[i][0]
-    //               }
-    //             }
-
-    //           })
-    //         }
-    //       })
-    //     }
-    //     if(newVal==='LoRa-利尔达CN470') caseFun(0,strArr,targetArr)
-    //     if(newVal==='ManThink-门思科技') caseFun(1,strArr,targetArr)
-    //     if(newVal==='BC28电信管理平台NB') caseFun(2,strArr,targetArr)
-    //     if(newVal==='M5311移动平台NB') caseFun(3,strArr,targetArr)
-    //     // function change(select,targetArr){
-    //       // let strArr= ['rtuother_join','rtuother_geshi','rtuother_shangxing','rtuother_xiaxing','rtuOutDtuServiceID']
-    //       // let strArr= ['JoinEUI','频率格式','上行频率','下行频率','电信NB服务ID']
-    //       // let select1= ['JoinEUI','频率格式','上行频率','下行频率','电信NB服务ID']
-    //       // switch(newVal){
-    //       //   case 'LoRa-利尔达CN470':
-    //       //     // console.log(this,88888)
-    //       //     caseFun(this,0,strArr,targetArr)
-    //       //     // this.formAllBody['0'].forEach((item,index,arr)=>{
-    //       //     //   if(item.name && item.name === '外置DTU设置'){
-    //       //     //     item.data.forEach((item,index,arr)=>{
-    //       //     //       for(let i = 0;i<strArr.length;i++){
-    //       //     //         if(arr[index].fieldName===strArr){
-    //       //     //           arr[index]['isShow'] = targetArr[i][0]
-    //       //     //         }
-    //       //     //       }
-
-    //       //     //     })
-    //       //     //   }
-    //       //     // })
-    //       //     break;
-    //       //   case 'ManThink-门思科技':
-    //       //     caseFun(this,1,strArr,targetArr)
-    //       //     break;
-    //       //   case 'BC28电信管理平台NB':
-    //       //     caseFun(this,2,strArr,targetArr)
-    //       //     break;
-    //       //   case 'M5311移动平台NB':
-    //       //     caseFun(this,3,strArr,targetArr)
-    //       //     break;
-    //       // }
-    //     // }
-    //     // this.formAllBody['0'].forEach((item,index,arr)=>{
-    //     //   if(item.name === '内置LoRa相关配置'){
-    //     //     arr[index].isShow = newVal === 'LORA' ? true : false;
-    //     //   }
-    //     // })
-		// 	}
-    // )
+    // 水位计雷达
+    this.$watch(
+			function () {
+				return this.formAll[2].form3.rtucgq_shuiwei1;
+			},
+			function (newVal, oldVal) {
+        if(!(newVal==='NF-WGX-5小雷达水位计' | newVal=== 'NF-WGX-6大雷达水位计')){
+          this.formAllBody['9'][2].isShow = false
+        }else{
+          this.formAllBody['9'][2].isShow = true
+        }
+			}
+    )
+    this.$watch(
+			function () {
+				return this.formAll[2].form3.rtucgq_shuiwei2;
+			},
+			function (newVal, oldVal) {
+        if(!(newVal==='NF-WGX-5小雷达水位计' | newVal=== 'NF-WGX-6大雷达水位计')){
+          this.formAllBody['9'][2].isShow = false
+        }else{
+          this.formAllBody['9'][4].isShow = true
+        }
+			}
+    )
+    //  流量计水鬼
+    this.$watch(
+			function () {
+				return this.formAll[2].form3.rtucgq_liuliang1;
+			},
+			function (newVal, oldVal) {
+        var targetNameArr = ['直接流量输出','安装高度','流量校正','淤积深度','无效参数','无效参数','无效参数','堰槽截面表高度分辨率']
+        var targetStatusArr = [false,true,true,true,false,false,false,false]
+        // let select= ['直接流量输出','三角堰','矩形堰','梯形堰','圆管','自定义截面','直角三角堰明渠','巴歇尔槽明渠'] // 下拉框值，
+        let strArr= ['rtull_ll1_jiemian','rtull_ll1_gaodu','rtull_ll1_jiaozheng','rtull_ll1_shendu','rtull_ll1_shangdikuandu','rtull_ll1_yancaogaodu','rtull_ll1_xiadikuandu','rtull_ll1_fenbian']
+        this.formAllBody['11'][1].data.forEach((item,index,arr)=>{
+          for(let i = 0;i<strArr.length;i++){
+            if(arr[index].fieldIdentifier===strArr[i]){
+              arr[index].isShow = targetStatusArr[select.indexOf(newVal)][i]
+              arr[index].fieldName = targetNameArr[select.indexOf(newVal)][i]
+            }
+          }
+        })
+			}
+    )
+    this.$watch(
+			function () {
+				return this.formAll[2].form3.rtucgq_liuliang2;
+			},
+			function (newVal, oldVal) {
+        if(!(newVal==='NF_LZX_2水龟')){
+          this.formAllBody['11'][6].isShow = false
+        }else{
+          this.formAllBody['11'][6].isShow = true
+        }
+			}
+    )
+    // 遥测站 采集标志 开关， 存储周期 rtuSaveCircle
+    this.$watch(
+			function () {
+				return this.formAll[0].form1.rtucjFlagTrans;
+			},
+			function (newVal, oldVal) {
+        this.formAllBody['1'][0].data[3].isShow = !newVal
+			}
+    )
+    // 外置dtu设置，下拉框
+    this.$watch(
+			function () {
+				return this.formAll[0].form1.rtuother_dtu_type;
+			},
+			function (newVal, oldVal) {
+        var targetArr = [[true,true,true,true,false],[true,true,false,false,false],[false,false,false,false,true],[false,false,false,false,false]]
+        let select= ['LoRa-利尔达CN470','ManThink-门思科技','BC28电信管理平台NB','M5311移动平台NB'] // 下拉框值，对应targetArr其他5个控件显示的4状态
+        let strArr= ['JoinEUI','频率格式','上行频率','下行频率','电信NB服务ID']
+        this.formAllBody['1'][2].data.forEach((item,index,arr)=>{
+          for(let i = 0;i<strArr.length;i++){
+            if(arr[index].fieldName===strArr[i]){
+              arr[index].isShow = targetArr[select.indexOf(newVal)][i]
+            }
+          }
+        })
+        // console.log(this.formAllBody['1'][2].data, select.indexOf(newVal),'_this.formAllBody[]')
+			}
+    )
+    // 从机1 ，2设置
+    this.$watch(
+			function () {
+				return this.formAll[2].form3.rtucgq_congji1;
+			},
+			function (newVal, oldVal) {
+        var targetNameArr = [['无效参数','无效参数','无效参数'],['抽水周期','抽水超时','排水超时'],['无效参数','无效参数','无效参数'],['采集周期','通道延时','演示递增'],['采集周期','通道延时','无效参数'],['查询周期','抽水超时','排水超时']]
+        var targetStatusArr = [[false,false,false],[true,true,true],[false,false,false],[true,true,true],[true,true,false],[true,true,true]]
+        let select= ['默认从机','电机驱动板（水质监测柜）','VGUS屏幕（水质监测柜）','二供（净水器）','二供（水箱）','主控板（5/9参数水质监测柜）'] // 下拉框值，对应targetArr其他5个控件显示的4状态
+        let strArr= ['rtucj1_canshu1','rtucj1_canshu2','rtucj1_canshu3']
+        this.formAllBody['7'][1].data.forEach((item,index,arr)=>{
+          for(let i = 0;i<strArr.length;i++){
+            if(arr[index].fieldIdentifier===strArr[i]){
+              arr[index].isShow = targetStatusArr[select.indexOf(newVal)][i]
+              arr[index].fieldName = targetNameArr[select.indexOf(newVal)][i]
+            }
+          }
+        })
+        // console.log(this.formAllBody['1'][2].data, select.indexOf(newVal),'_this.formAllBody[]')
+			}
+    )
+    this.$watch(
+			function () {
+				return this.formAll[2].form3.rtucgq_congji2;
+			},
+			function (newVal, oldVal) {
+        var targetNameArr = [['无效参数','无效参数','无效参数'],['抽水周期','抽水超时','排水超时'],['无效参数','无效参数','无效参数'],['采集周期','通道延时','演示递增'],['采集周期','通道延时','无效参数'],['查询周期','抽水超时','排水超时']]
+        var targetStatusArr = [[false,false,false],[true,true,true],[false,false,false],[true,true,true],[true,true,false],[true,true,true]]
+        let select= ['默认从机','电机驱动板（水质监测柜）','VGUS屏幕（水质监测柜）','二供（净水器）','二供（水箱）','主控板（5/9参数水质监测柜）'] // 下拉框值，对应targetArr其他5个控件显示的4状态
+        let strArr= ['rtucj2_canshu1','rtucj2_canshu2','rtucj2_canshu3']
+        this.formAllBody['7'][3].data.forEach((item,index,arr)=>{
+          for(let i = 0;i<strArr.length;i++){
+            if(arr[index].fieldIdentifier===strArr[i]){
+              arr[index].isShow = targetStatusArr[select.indexOf(newVal)][i]
+              arr[index].fieldName = targetNameArr[select.indexOf(newVal)][i]
+            }
+          }
+        })
+        // console.log(this.formAllBody['1'][2].data, select.indexOf(newVal),'_this.formAllBody[]')
+			}
+    )
+    // 流量计 流量槽
+    this.$watch(
+			function () {
+				return this.formAll[10].form11.rtull_ll1_jiemian;
+			},
+			function (newVal, oldVal) {
+        var targetNameArr = [['安装高度','流量校正','淤积深度','无效参数','无效参数','无效参数','堰槽截面表高度分辨率'],['安装高度','流量校正','淤积深度','上地宽度','堰槽高度','无效参数','堰槽截面表高度分辨率'],['安装高度','流量校正','淤积深度','上地宽度','堰槽高度','无效参数','堰槽截面表高度分辨率'],['安装高度','流量校正','淤积深度','窄底宽度','堰槽高度','宽底宽度','堰槽截面表高度分辨率'],['安装高度','流量校正','淤积深度','无效参数','槽堰直径','无效参数','堰槽截面表高度分辨率'],['安装高度','流量校正','淤积深度','无效参数','无效参数','无效参数','堰槽截面表高度分辨率'],['溢流高度','流量校正','淤积深度','无效参数','槽堰高度','无效参数','堰槽截面表高度分辨率'],['溢流高度','流量校正','淤积深度','槽堰高度','槽序号','无效参数','堰槽截面表高度分辨率']]
+        var targetStatusArr = [[true,true,true,false,false,false,false],[true,true,true,true,true,false,false],[true,true,true,true,true,false,false],[true,true,true,true,true,true,false],[true,true,true,false,true,false,false],[true,true,true,false,false,false,true],[true,true,true,false,true,false,false],[true,true,true,true,true,false,false]]
+        let select= ['直接流量输出','三角堰','矩形堰','梯形堰','圆管','自定义截面','直角三角堰明渠','巴歇尔槽明渠'] // 下拉框值，
+        let strArr= ['rtull_ll1_gaodu','rtull_ll1_jiaozheng','rtull_ll1_shendu','rtull_ll1_shangdikuandu','rtull_ll1_yancaogaodu','rtull_ll1_xiadikuandu','rtull_ll1_fenbian']
+        this.formAllBody['11'][1].data.forEach((item,index,arr)=>{
+          for(let i = 0;i<strArr.length;i++){
+            if(arr[index].fieldIdentifier===strArr[i]){
+              arr[index].isShow = targetStatusArr[select.indexOf(newVal)][i]
+              arr[index].fieldName = targetNameArr[select.indexOf(newVal)][i]
+            }
+          }
+        })
+        // console.log(this.formAllBody['1'][2].data, select.indexOf(newVal),'_this.formAllBody[]')
+			}
+    )
+    // 蒸发皿
+    this.$watch(
+			function () {
+				return this.formAll[2].form3.rtucgq_zfly;
+			},
+			function (newVal, oldVal) {
+        var targetNameArr = [['安装高度','量程','最小加水量'],['无效参数','无效参数','最小加水量'],['无效参数','无效参数','最小加水量']]
+        var targetStatusArr = [[true,true,true],[false,false,true],[false,false,true]]
+        let select= ['独立蒸发皿','水位值1','水位值2'] // 下拉框值，对应targetArr其他5个控件显示的4状态
+        let strArr= ['rtuzf_gaodu','rtuzf_liangcheng','rtuzf_zuixiao']
+        this.formAllBody['12'][0].data.forEach((item,index,arr)=>{
+          for(let i = 0;i<strArr.length;i++){
+            if(arr[index].fieldIdentifier===strArr[i]){
+              arr[index].isShow = targetStatusArr[select.indexOf(newVal)][i]
+              arr[index].fieldName = targetNameArr[select.indexOf(newVal)][i]
+            }
+          }
+        })
+        // console.log(this.formAllBody['1'][2].data, select.indexOf(newVal),'_this.formAllBody[]')
+			}
+    )
+    // 4am， 存储周期 rtuSaveCircle
+    this.$watch(
+			function () {
+				return this.formAll[2].form3.rtucgq_liuliang1;
+			},
+			function (newVal, oldVal) {
+        var targetNameArr = [['安装高度','流量校正','淤积深度','无效参数','无效参数','无效参数','堰槽截面表高度分辨率']]
+        var targetStatusArr = [[true,true,true,false,false,false,false]]
+        let select= ['独立蒸发皿','水位值1','水位值2'] // 下拉框值，对应targetArr其他5个控件显示的4状态
+        let strArr= ['rtuzf_gaodu','rtuzf_liangcheng','rtuzf_zuixiao']
+        this.formAllBody['11'][1].data.forEach((item,index,arr)=>{
+          for(let i = 0;i<strArr.length;i++){
+            if(arr[index].fieldIdentifier===strArr[i]){
+              arr[index].isShow = targetStatusArr[select.indexOf(newVal)][i]
+              arr[index].fieldName = targetNameArr[select.indexOf(newVal)][i]
+            }
+          }
+        })
+        // console.log(this.formAllBody['1'][2].data, select.indexOf(newVal),'_this.formAllBody[]')
+			}
+    )
     // bottom
   },
-  // watch:{
-  //   // 'formAll[0].form1.rtuOutDtu':{
-  //   //   handler(){
-  //   //     console.log(888)
-  //   //   },
-  //   //   deep:true
-  //   // },
-  //   // 'formAll': {
-  //   //   handler(newValue, oldValue) {
-  //   //     console.log(newValue,this.formAllBody,'obj.a changed');
-  //   //     if(newValue[0].form1.rtuOutDtu ===true){
-  //   //       // rtuStationType
-  //   //       // console.log(this.formAllBody['1'][0].data,555)
-  //   //       this.formAllBody['1'][0].data.forEach((item,index,arr)=>{
-  //   //         if(item.fieldIdentifier === 'rtuStationType'){
-  //   //           // console.log(555)
-  //   //           arr[index].selectOption='降水,河道,水库（湖泊）,闸坝,泵站,潮汐,墒情,地下水,水质,取水口,排水口'
-  //   //         }
-  //   //       })
-  //   //       this.formAllBody['1'].forEach((item,index,arr)=>{
-  //   //         if(item.name === '外置DTU设置'){
-  //   //           // console.log(555)
-  //   //           arr[index].isBlock= newValue[0].form1.rtuOutDtu;
-  //   //         }
-  //   //       })
-  //   //     }else if(newValue[0].form1.rtuOutDtu === false){
-  //   //       this.formAllBody['1'][0].data.forEach((item,index,arr)=>{
-  //   //         if(item.fieldIdentifier === 'rtuStationType'){
-  //   //           // console.log(555)
-  //   //           arr[index].selectOption='水质,取水口,排水口'
-  //   //         }
-  //   //       })
-  //   //       this.formAllBody['1'].forEach((item,index,arr)=>{
-  //   //         if(item.name === '外置DTU设置'){
-  //   //           // console.log(555)
-  //   //           arr[index].isBlock= newValue[0].form1.rtuOutDtu;
-  //   //         }
-  //   //       })
-  //   //       // arr[index].selectOption='降水,河道,水库（湖泊）,闸坝,泵站,潮汐,墒情,地下水,水质,取水口,排水口'
-  //   //       // console.log(666)
-  //   //     }
-  //   //   },
-  //   //   deep: true
-  //   // }
-  // },
   methods: {
     switchChange(val){
       // console.log(val,this.formAll[0].form1,'change')
@@ -644,19 +738,33 @@
       console.log(val,'click')
     },
     echoClick() {
+      let rtuCode = ''
+      if(this.querySite.length===1){
+        rtuCode = this.querySite[0]
+      }else{
+        rtuCode = this.querySite[1]
+      }
       // 根据站点回显
+      console.log(this.querySite,'this.querySite')
       this.formAll = [];
       this.activeIndex = "0";
-      this.getSiteList();
-      this.initPage(this.querySite);
+      // this.getSiteList();
+      this.initPage(rtuCode);
+      this.getRtuHistoryList()
       // this.handleSelect(0)
       // console.log(this.activeIndex)
     },
     echoRtuHistory() {
+      let rtuCode = ''
+      if(this.querySite.length===1){
+        rtuCode = this.querySite[0]
+      }else{
+        rtuCode = this.querySite[1]
+      }
       // 根据站点和历史id，回显
       this.formAll = [];
       this.activeIndex = "0";
-      this.initPage2();
+      this.initPage2(rtuCode);
       // this.handleSelect(0)
       // console.log(this.activeIndex)
     },
@@ -713,8 +821,8 @@
       // 组装数据需要的属性，暂时是死值，也可以循环出来
       const parmas = {
         data: {
-          stCode: this.stCode,
-          hexRtuCode: this.hexRtuCode,
+          rtuCode: this.rtuCode,
+          hexRtuCode : this.hexRtuCode,
           rtuTelemeteringStationSetting: this.formAll[0].form1,
           rtuCentreSetting: this.formAll[1].form2,
           rtuSenseTypeSetting: this.formAll[2].form3,
@@ -838,21 +946,31 @@
       }
     },
     selectChange(val) {
+      // this.querySite = []
+      this.rtuHistoryId='',
       // console.log(val,'val')
       this.echoClick(val);
       this.getRtuHistoryList()
     },
+    selectChange1(val) {
+      // console.log(val,'val') input搜索
+      this.echoClick(val);
+      this.getRtuHistoryList()
+    },
     selectRtuHistoryId(val) {
       console.log(val,'selectRtuHistoryId')
       // this.echoClick(val);
     },
     async initPage(site) {
       // 切换站点后去请求历史下拉框
-      this.getRtuHistoryList()
+      // this.getRtuHistoryList()
       // 回显接口请求数据 将水文传感里面3处特殊的控件需要的值，用请求数据遍历生成表单需要的字段，因为这3处的动态表单使用的是死的字段，其他的对应的表单数据赋值给对应表单就能回显了、
       let resFirst = await this.$http.post(
-        `${this.nozzle.rTUSettingServiceQueryById}?stCode=${site}`
+        `${this.nozzle.rTUSettingServiceQueryById}?rtuCode=${site}`
       );
+      if(resFirst.data.msg ===507){
+        this.$message('请更新')
+      }
       let resData = resFirst.data.data;
       let formArr = [
         "rtuTelemeteringStationSetting",
@@ -873,8 +991,9 @@
       ];
       // console.log(this.formAll,resData,'ressssss')
       // this.formAll={}
-      this.stCode = resData.stCode;
+      this.rtuCode = resData.rtuCode;
       this.hexRtuCode = resData.hexRtuCode;
+
       for (let i = 1; i <= 15; i++) {
         let obj = {};
         // 水文传感里是第6个表单
@@ -951,10 +1070,10 @@
         // console.log(this.formAll,this.stCode,'this.formAll')
       }
     },
-    async initPage2() {
+    async initPage2(rtuCode) {
       // 回显接口请求数据 将水文传感里面3处特殊的控件需要的值，用请求数据遍历生成表单需要的字段，因为这3处的动态表单使用的是死的字段，其他的对应的表单数据赋值给对应表单就能回显了、
       let resFirst = await this.$http.post(
-        `${this.nozzle.RTUVersionRevert}?stCode=${this.querySite}&id=${this.rtuHistoryId}`
+        `${this.nozzle.RTUVersionRevert}?rtuCode=${rtuCode}&id=${this.rtuHistoryId}`
       );
       let resData = resFirst.data.data;
       let formArr = [
@@ -976,7 +1095,7 @@
       ];
       console.log(this.formAll,resData,'ressssss')
       // this.formAll={}
-      this.stCode = resData.stCode;
+      this.rtuCode = resData.rtuCode;
       this.hexRtuCode = resData.hexRtuCode;
       for (let i = 1; i <= 15; i++) {
         let obj = {};
@@ -1175,6 +1294,7 @@
             uniq(sub_titleList).forEach(item => {
               var obj = { name: item, data: [], isShow:true, isBlock:true };
               var data = dataRes[i].forEach(l => {
+                l.isShow = true
                 if (
                   l.subTitle === item &&
                   l.subTitle !== "" &&
@@ -1201,15 +1321,21 @@
       await this.$http
         .post(this.nozzle.rTUSettingServiceQueryList)
         .then(res => {
-          // console.log(res.data.data,'resss')
+          console.log(res.data.data,'resss')
           this.querySiteList = res.data.data;
-          this.querySite = this.querySiteList[0].rtuStationCode;
+          // this.querySite[0] = this.querySiteList[0].children[0].label;
         });
     },
     async getRtuHistoryList() {
+      let rtuCode = ''
+      if(this.querySite.length===1){
+        rtuCode = this.querySite[0]
+      }else{
+        rtuCode = this.querySite[1]
+      }
       await this.$http
       //`${this.nozzle.queryRTUSettingHistory}?stCode=${this.querySite}`
-        .post(`${this.nozzle.queryRTUSettingHistory}?stCode=${this.querySite}`)
+        .post(`${this.nozzle.queryRTUSettingHistory}?rtuCode=${rtuCode}`)
         .then(res => {
           // console.log(res.data,'resss')
           this.rtuHistoryList = res.data.data;
@@ -1239,6 +1365,14 @@
 };
 </script>
 <style lang="scss" scoped>
+// /deep/.el-cascader__dropdown{
+//   // background-color: black;
+//   .el-scrollbar{
+//     .el-cascader-menu__list{
+//       background-color: black!important;
+//     }
+//   }
+// }
 .content{
     width: 100% !important;
     height: 100% !important;
@@ -1361,49 +1495,52 @@
             }
 
           }
+          .rowClass{
+            .el-col-class{
+              position:relative
+            }
+
+          }
           .rowClass:nth-child(2n+1){
-            background-color: rgba(	245,222,179,0.3);
+            // background-color: rgba(	245,222,179,0.3);
             box-shadow: rgba(144,147,153, 0.32) 0px 2px 4px 0px;
+            margin: 10px 0 0 0 ;
+            border-radius: 10px;
           }
           .rowClass:nth-child(2n){
             background-color: rgba(144,147,153,0.3);
             box-shadow: rgba(144,147,153, 0.32) 0px 2px 4px 0px;
+            margin: 10px 0 0 0 ;
+            border-radius: 10px;
           }
           .rowClass.control-show{
               // background-color: #fff;
               // cursor: pointer;
-              background-color: #ccc;
-              pointer-events: none;
+              background-color: #ccc!important;
+              pointer-events: none !important;
               border: 1px solid pink;
               box-sizing: border-box;
+              .el-input__inner{
+                border:1px solid #DCDFE6;
+              }
             // .control-show{
             // }
           }
           .stop {
               background-color: #ccc;
               pointer-events: none;
+              border-radius: 10px;
+              .el-input__inner{
+                border:1px solid #DCDFE6;
+              }
+              // box-shadow: pink 10px 10px 10px ;
               .el-input__suffix-inner{
                 pointer-events: none;
               }
           }
 
       }
-      // .row-box{
-      //   height: 80vh;
-      //   display: flex;
-      //   justify-content: flex-start;
 
-      //   flex-direction: column;
-      //   flex-wrap: wrap;
-      //   .rowClass{
-      //     display: flex;
-      //     justify-content: flex-start;
-
-      //     flex-direction: column;
-      //     flex-wrap: wrap;
-      //   }
-
-      // }
 
 
     }