Merge branch 'master' of https://git.odliken.cn/odjbin/tunnel-cloud-web

src/views/debug/index.vue

@@ -9,7 +9,7 @@
       <el-button type="primary" @click="closeSocket">关闭连接</el-button>
       <el-button type="primary" @click="handleClear" style="float: right">清除</el-button>
       <div class="socket-box">
-        <div v-for="item in dataList" ref="child">
+        <div v-for="item in dataList" :key="item.cmdType" ref="child">
           <div v-if="item.cmdType == 3">
             <span style="color: #007bff">server send:</span>
             <div>{{ item.cmd }}</div>

src/views/device-manage/index.vue

@@ -77,7 +77,7 @@
                 </template>
               </el-table-column>
               <el-table-column prop="serialNumber" label="序列号" align="center" >
-                <template #default="scope">
+                <!-- <template #default="scope"> -->
                   <!--                  {{scope.row.serialNumberOption.filter(item => item.value == scope.row.serialNumber).map(item => item.label)[0]}}?-->
                   <!--                  <el-select placeholder="请选择" v-model="scope.row.serialNumber" popper-class="serialNumber-select"-->
                   <!--                               clearable class="serialNumber">-->
@@ -88,7 +88,7 @@
                   <!--                        :value="item.value"-->
                   <!--                    />-->
                   <!--                  </el-select>-->
-                </template>
+                <!-- </template> -->
               </el-table-column>
               <el-table-column prop="state" label="状态" align="center"  width="200">
                 <template #default="scope">
@@ -796,10 +796,6 @@ getList()
           background: #0f7da9;
         }
 
-        .wind-switch {
-          //margin-left: 26px;
-        }
-
         .switch {
           margin-top: 22px;
 

src/views/tunnel-manage/index.vue

@@ -608,9 +608,6 @@ const handleMoreDelete = debounce(() => {
 </script>
 
 <style scoped lang="scss">
-.serialNumber-name-overflow-hidden {
-
-}
 
 .showNull {
   margin-top: 150px;