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 |   66 +++++++++++++++++---------------
 1 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/src/views/dataPush/components/point.vue b/src/views/dataPush/components/point.vue
index 9eff25f..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,28 +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)"
-        >
-          <!-- active-text="鎬荤偣浣嶅紑"
-          inactive-text="鎬荤偣浣嶅叧" -->
-        </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>
@@ -49,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>
@@ -117,7 +104,7 @@
               :picker-options="{
                 start: '00:00',
                 step: '00:30',
-                end: ruleForm.EndTime ? ruleForm.EndTime : '23:30',
+                end: ruleForm.EndTime ? ruleForm.EndTime : '24:00',
                 maxTime: ruleForm.EndTime
               }"
             >
@@ -133,7 +120,7 @@
               :picker-options="{
                 start: ruleForm.StartTime ? ruleForm.StartTime : '00:00',
                 step: '00:30',
-                end: '23:30',
+                end: '24:00',
                 minTime: ruleForm.StartTime
               }"
             >
@@ -232,7 +219,7 @@
       dataList: [],
       tip: 1, // 鍖哄垎淇濆瓨杩樻槸缂栬緫 浣嗘槸鐜板湪娌℃湁缂栬緫
       rules: {
-        CameraName: [{ required: true, message: "璇烽�夋嫨璁惧鍚嶇О", trigger: "change" }],
+        CameraName: [{ required: true, message: "璇烽�夋嫨鐐逛綅鍚嶇О", trigger: "change" }],
         ChannelCode: [{ required: true, message: "璇疯緭鍏ユ姤璀﹂�氶亾缂栫爜", trigger: "blur" }],
         CompanyCode: [{ required: true, message: "璇疯緭鍏ヤ紒涓氱紪鐮�", trigger: "blur" }],
         Sceneslist: [{ type: "array", required: true, message: "璇烽�夋嫨鎺ㄩ�佸満鏅�", trigger: "change" }],
@@ -461,7 +448,6 @@
 }
 </script>
 
-<style scoped lang="scss"></style>
 <style scoped lang="scss">
 .sub-account {
   padding: 20px;
@@ -627,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;
@@ -657,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;
@@ -781,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