From eca3bc0ecb283d9e9402441c6ed3e3580621990f Mon Sep 17 00:00:00 2001
From: heyujie <516346543@qq.com>
Date: 星期四, 22 七月 2021 11:00:25 +0800
Subject: [PATCH] 桌面开始菜单

---
 src/pages/settings/views/generalSettings.vue |   69 ++++++++++++++++------------------
 1 files changed, 33 insertions(+), 36 deletions(-)

diff --git a/src/pages/settings/views/generalSettings.vue b/src/pages/settings/views/generalSettings.vue
index dcb849c..89689cf 100644
--- a/src/pages/settings/views/generalSettings.vue
+++ b/src/pages/settings/views/generalSettings.vue
@@ -60,27 +60,25 @@
           <div class="min-dur">
             <div class="title">鎶撴媿鍓嶅綍鍍忔椂闀�</div>
             <div class="entity">
-              <div class="sec">
-                {{min_video_len }}s
-              </div>
+              <div class="sec">{{ min_video_len }}s</div>
               <div class="block">
                 <el-slider
                   v-model="fakeObj.min"
                   id="cut_min_duration"
                   :min="5 / 1.2"
-                  :max="100"
-                  @input="min_len=min_video_len"
-                  :show-tooltip="false"
+                  :max="100" :step="5 / 1.2"
+                  @input="min_len = min_video_len"
+                  show-stops
+                  :show-tooltip="true"
+                  :format-tooltip="formatTooltip"
                 ></el-slider>
-                <!-- show-stops
-                  :step="5/1.2" -->
               </div>
               <el-input-number
                 v-model="min_len"
-                @change="fakeObj.min=+((min_len/1.2))"
+                @change="fakeObj.min = +(min_len / 1.2)"
                 controls-position="right"
-                :min="5"
-                :max="120"
+                :min="5" :step="5"
+                :max="120" step-strictly
                 size="small"
               ></el-input-number
               >&nbsp;s
@@ -89,22 +87,24 @@
           <div class="min-dur">
             <div class="title">鎶撴媿鍚庡綍鍍忔椂闀�</div>
             <div class="entity">
-              <div class="sec">  {{ max_video_len }} s</div>
+              <div class="sec">{{ max_video_len }} s</div>
               <div class="block">
                 <el-slider
                   v-model="fakeObj.max"
                   id="cut_max_duration"
                   :min="5 / 1.2"
-                  @input="max_len=max_video_len"
-                  :max="100"
-                  :show-tooltip="false"
+                  @input="max_len = max_video_len"
+                  :max="100" :step="5 / 1.2"
+                  show-stops
+                  :format-tooltip="formatTooltip"
+                  :show-tooltip="true"
                 ></el-slider>
               </div>
               <el-input-number
                 v-model="max_len"
-                @change="fakeObj.max=+((max_len/1.2))"
+                @change="fakeObj.max = +(max_len / 1.2)"
                 controls-position="right"
-                :min="5"
+                :min="5" :step="5" step-strictly
                 :max="120"
                 size="small"
               ></el-input-number
@@ -248,15 +248,11 @@
       curPlayingIndex: null,
       showUpload: false,
       activeIcons: 0,
-      // alarmConf: {
-      //   min_video_len: 10,
-      //   max_video_len: 15,
-      // },
-      min_len:10,
-      max_len:15,
-      fakeObj:{
-        min:10,
-        max:15
+      min_len: 0,
+      max_len: 0,
+      fakeObj: {
+        min: 0,
+        max: 0,
       },
       menuArr: [
         { name: "璁惧淇℃伅", icon: "\ue933" },
@@ -310,14 +306,17 @@
     });
   },
   computed: {
-    min_video_len(){
-      return +((this.fakeObj.min* 1.2).toFixed(0))
+    min_video_len() {
+      return Math.round(this.fakeObj.min * 1.2);
     },
-    max_video_len(){
-      return +((this.fakeObj.max* 1.2).toFixed(0))
+    max_video_len() {
+      return Math.round(this.fakeObj.max * 1.2);
     },
   },
   methods: {
+    formatTooltip(v) {
+      return Math.round(v * 1.2);
+    },
     pickBg(item, i) {
       this.activeBg = i;
       let message = "changeBackground?" + item.name;
@@ -361,9 +360,8 @@
         this.deviceInfo.disks = "( " + info.disk + ") ";
         this.deviceInfo.memory =
           (info.mem.total / 1024 / 1024 / 1024).toFixed(2) + "GB";
-        this.min_len = basic.min_video_len
-        this.fakeObj.min = +((basic.min_video_len/1.2).toFixed(0));
-        this.fakeObj.max = +((basic.max_video_len/1.2).toFixed(0));
+        this.fakeObj.min = basic.min_video_len / 1.2;
+        this.fakeObj.max = basic.max_video_len / 1.2;
       });
     },
     getSounds() {
@@ -435,13 +433,12 @@
         "rgba(233, 233, 233, 1)";
     },
     submitAlarm() {
-      debugger;
       saveAlarmConfig({
         min_video_len: this.min_video_len,
-        max_video_len:  this.max_video_len
+        max_video_len: this.max_video_len,
       }).then((res) => {
         if (res && res.success) {
-          this.getDeviceInfo()
+          this.getDeviceInfo();
           this.$notify({
             type: "success",
             message: "淇濆瓨鎴愬姛",

--
Gitblit v1.8.0