From bf399dc65aa67c4355b0fdc516f8da5ca7234c82 Mon Sep 17 00:00:00 2001
From: mark <mark18340872469@163.com>
Date: 星期日, 09 十月 2022 16:34:22 +0800
Subject: [PATCH] Merge branch 'shandong' of http://192.168.5.5:10010/r/web/saas-web into shandong

---
 src/views/dataPush/components/point.vue |   58 ++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/src/views/dataPush/components/point.vue b/src/views/dataPush/components/point.vue
index 4614ced..9b9be52 100644
--- a/src/views/dataPush/components/point.vue
+++ b/src/views/dataPush/components/point.vue
@@ -3,7 +3,7 @@
     <div class="search">
       <div class="left">
         <div class="id">
-          鐐逛綅鍚嶇О
+          鐐逛綅鍚嶇О/浼佷笟缂栫爜/鍦烘櫙
           <el-input v-model="inputText" placeholder="璇疯緭鍏�" clearable></el-input>
         </div>
       </div>
@@ -17,26 +17,20 @@
         <span class="iconfont">&#xe614;</span>
         <span>娣诲姞鐐逛綅</span>
       </div>
-      <!-- <div class="switchBox">
-        鎬荤偣浣嶅紑鍏�
-        <el-switch
-          v-model="value1"
-          width="60"
-          active-color="#13ce66"
-          inactive-color="#f0f3f5"
-          @change="changeAll($event)"
-        >
-        </el-switch>
-      </div> -->
     </div>
-
+    <div class="switchBox">
+      寮�鍚笂鎶�
+      <el-table-column prop="Enable" label="寮�鍏�" width="70px" show-overflow-tooltip>
+        <el-switch v-model="value1" active-color="#0065ff" @change="changeAll($event)"> </el-switch>
+      </el-table-column>
+    </div>
     <div class="table-area">
       <el-table
         id="multipleTable"
         ref="multipleTable"
         :data="dataList"
         :fit="true"
-        :default-sort="{ prop: 'createTime', order: 'descending' }"
+        :default-sort="{ prop: 'companyCode', order: 'ascending' }"
       >
         <el-table-column prop="cameraName" label="鐐逛綅鍚嶇О" width="130px" show-overflow-tooltip></el-table-column>
         <el-table-column prop="channelCode" label="鎶ヨ閫氶亾缂栫爜" show-overflow-tooltip></el-table-column>
@@ -47,12 +41,7 @@
         </el-table-column>
         <el-table-column prop="Enable" label="寮�鍏�" width="70px" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-switch
-              v-model="scope.row.enable"
-              @change="changeSwitch($event, scope.row)"
-              active-color="#13ce66"
-              inactive-color="#f0f3f5"
-            >
+            <el-switch v-model="scope.row.enable" @change="changeSwitch($event, scope.row)" active-color="#0065ff">
             </el-switch>
           </template>
         </el-table-column>
@@ -459,7 +448,6 @@
 }
 </script>
 
-<style scoped lang="scss"></style>
 <style scoped lang="scss">
 .sub-account {
   padding: 20px;
@@ -625,10 +613,7 @@
     margin: 20px 0;
     text-align: center;
     justify-content: space-between;
-    .switchBox {
-      display: flex;
-      align-items: center;
-    }
+
     .add {
       margin-right: 20px;
       width: 126px;
@@ -655,7 +640,15 @@
       }
     }
   }
-
+  .switchBox {
+    display: flex;
+    align-items: center;
+    float: right;
+    position: absolute;
+    right: 20px;
+    top: 130px;
+    font-size: 14px;
+  }
   .el-table ::v-deep {
     background-color: rgb(233, 235, 238);
     padding: 1px;
@@ -779,4 +772,17 @@
   color: #0065ff;
   border-color: #0065ff;
 }
+
+/* .el-switch__core {
+  width: 40px !important;
+  height: 20px;
+}
+.el-switch__core::after {
+  width: 16px;
+  height: 16px;
+  margin-top: -1px;
+}
+.el-switch.is-checked .el-switch__core::after {
+  margin-left: -17px;
+} */
 </style>

--
Gitblit v1.8.0