Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/tunnel/index.vue

src/views/tunnel/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="box-top">
-      <manage-btn v-model="selectIndex" @select="manageSelect"/>
+      <manage-btn v-model="selectIndex" @select="manageSelect" />
       <div class="tunnel-title"></div>
       <div class="top-right">
         <div class="current-site">
@@ -15,26 +15,19 @@
         </div>
       </div>
     </div>
-    <tunnel-scene id="tunnel-box"/>
+    <tunnel-scene id="tunnel-box" />
     <div class="left">
-      <el-drawer
-          v-model="drawerLeft"
-          direction="ltr"
-          modal-class="modal-box"
-          :modal="false"
-          :show-close="false"
-          :close-on-click-modal="false"
-          :close-on-press-escape="false"
-      >
-        <fan-info v-if="showFan" :list="socketData.frequencyState"/>
-        <transducer-list :list="socketData.currentVoltage" :feedback="socketData.frequencyFeedback"/>
-        <used-ele :list="socketData.electricityConsumption"/>
+      <el-drawer v-model="drawerLeft" direction="ltr" modal-class="modal-box" :modal="false" :show-close="false"
+        :close-on-click-modal="false" :close-on-press-escape="false">
+        <fan-info v-if="showFan" :list="socketData.frequencyState" />
+        <transducer-list :list="socketData.currentVoltage" :feedback="socketData.frequencyFeedback" />
+        <used-ele :list="socketData.electricityConsumption" />
       </el-drawer>
       <div v-if="drawerLeft" class="left-arrow" @click="closeLeft"></div>
       <div v-else class="shrink-left" @click="closeLeft"></div>
     </div>
     <div class="right">
-      <el-drawer
+       <el-drawer
           v-model="drawerRight"
           direction="rtl"
           modal-class="modal-box"
@@ -49,18 +42,20 @@
       </el-drawer>
       <div v-if="drawerRight" class="right-arrow" @click="closeRight"></div>
       <div v-else class="shrink-right" @click="closeRight"></div>
-    </div>
+      </div>
     <div class="switch-btn">
       <div class="arrow" @click="previousBtn"></div>
       <el-carousel height="150px" type="card" ref="tunnelBtn" :autoplay="false">
         <div class="btn">
-          <el-carousel-item v-for="(item,index) in tunnelList" :key="item.value">
+          <el-carousel-item v-for="(item, index) in tunnelList" :key="item.value">
             {{ item.name }}
           </el-carousel-item>
         </div>
       </el-carousel>
       <div class="arrow right" @click="nextBtn"></div>
     </div>
+
+
   </div>
 </template>
 
@@ -127,6 +122,7 @@ const socketData = reactive({
   windPressure: [],
   sensor: [],
 })
+
 onMounted(() => {
   nextTick(() => {
     showFan.value = true
@@ -142,12 +138,11 @@ const getScreenInfo = async () => {
   })
 }
 const manageSelect = (index) => {
-  console.log('首页点击-',index)
-  if(index===0){
+  console.log('首页点击-', index)
+  if (index === 0) {
+    console.log('站点管理=====-----')
     router.push('/site')
   }
-
-  // getInfo();
 };
 const closeLeft = () => {
   drawerLeft.value = !drawerLeft.value
@@ -202,7 +197,7 @@ const initWebSocket = () => {
           console.log('风压风压')
           socketData.windPressure = data
         }else if (item.typeKey === 'sensor') {
-          console.log('传感器')
+          console.log('传感器==========?')
           socketData.sensor = data
         }
       })
@@ -223,6 +218,4 @@ const closeSocket = () => {
 initWebSocket()
 </script>
 
-<style lang="scss" scoped>
-
-</style>
+<style lang="scss" scoped></style>