From 4a800a8fc83c6bd1f86a8e847b079a51a7532c09 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期三, 20 七月 2022 15:05:58 +0800
Subject: [PATCH] 修复国标配置的bug

---
 src/pages/settings/views/generalSettings.vue |   70 ++++++++++++++++-------------------
 1 files changed, 32 insertions(+), 38 deletions(-)

diff --git a/src/pages/settings/views/generalSettings.vue b/src/pages/settings/views/generalSettings.vue
index 4e668a0..2cd47a2 100644
--- a/src/pages/settings/views/generalSettings.vue
+++ b/src/pages/settings/views/generalSettings.vue
@@ -20,12 +20,12 @@
           <div class="min-dur">
             <div class="title">鎶撴媿鍓嶅綍鍍忔椂闀�</div>
             <div class="entity">
-              <div class="sec">{{ min_video_len }}s</div>
+              <div class="sec">0s</div>
               <div class="block">
                 <el-slider
                   v-model="fakeObj.min"
                   id="cut_min_duration"
-                  :min="5 / 1.2"
+                  :min="0"
                   :max="100"
                   :step="5 / 1.2"
                   @input="min_len = min_video_len"
@@ -35,38 +35,28 @@
                   :format-tooltip="formatTooltip"
                 ></el-slider>
               </div>
+              <div class="sec" style="margin: 0 20px">120s</div>
               <el-input-number
                 v-model="min_len"
                 @change="fakeObj.min = +(min_len / 1.2)"
-                :min="5"
+                :min="0"
                 :step="5"
                 :max="120"
                 step-strictly
                 size="small"
               ></el-input-number
-              >&nbsp;s -->
-
-              <el-input-number
-                v-model="min_len"
-                @change="fakeObj.min = +(min_len / 1.2)"
-                :min="5"
-                :step="5"
-                :max="120"
-                step-strictly
-                size="small"
-              ></el-input-number
-              >&nbsp;s
+              >s
             </div>
           </div>
           <div class="min-dur">
             <div class="title">鎶撴媿鍚庡綍鍍忔椂闀�</div>
             <div class="entity">
-              <div class="sec">{{ max_video_len }} s</div>
+              <div class="sec">0s</div>
               <div class="block">
                 <el-slider
                   v-model="fakeObj.max"
                   id="cut_max_duration"
-                  :min="5 / 1.2"
+                  :min="0"
                   @input="max_len = max_video_len"
                   :max="100"
                   :step="5 / 1.2"
@@ -75,10 +65,11 @@
                   :show-tooltip="true"
                 ></el-slider>
               </div>
+              <div class="sec" style="margin: 0 20px">120s</div>
               <el-input-number
                 v-model="max_len"
                 @change="fakeObj.max = +(max_len / 1.2)"
-                :min="5"
+                :min="0"
                 :step="5"
                 step-strictly
                 :max="120"
@@ -152,6 +143,7 @@
               action=""
               :http-request="uploadSound"
               :show-file-list="false"
+              style="bottom: -94px; left: calc(50% - 217px)"
             >
               <div class="info">
                 璇峰皢澹伴煶浜嬩欢鏂囦欢鎷栨嫿鍒版澶勶紝鎴�<span class="info-click"
@@ -346,13 +338,6 @@
   mounted() {
     this.getDeviceInfo();
     this.getSounds();
-    let _this = this;
-    this.eventAudio.addEventListener("ended", () => {
-      if (_this.curPlayingIndex !== null && _this.soundList.length) {
-        _this.soundList[_this.curPlayingIndex].isPlay = false;
-        _this.curPlayingIndex = null;
-      }
-    });
     const url = this.curUser.backgroundpic;
     this.activeIcons = this.curUser.useIconType - 1;
     this.universalColor = this.colorList.findIndex((x) => {
@@ -365,15 +350,13 @@
     } else {
       this.activeBg = 0;
     }
-    const e = this.$refs.curPage;
-    e.addEventListener("click", (e) => {
-      if (this.showUpload) {
-        this.showUpload = false;
-      }
-    });
+
+    this.eventAudio.addEventListener("ended", this.endedHandle, false);
+    this.$refs.curPage.addEventListener("click", this.clickHandle, false);
   },
   beforeDestroy() {
-    this.$refs.curPage.removeEventListener("click");
+    this.eventAudio.removeEventListener("ended", this.endedHandle, false);
+    this.$refs.curPage.removeEventListener("click", this.clickHandle, false);
   },
   computed: {
     min_video_len() {
@@ -387,6 +370,19 @@
     },
   },
   methods: {
+    endedHandle() {
+      let _this = this;
+      if (_this.curPlayingIndex !== null && _this.soundList.length) {
+        _this.soundList[_this.curPlayingIndex].isPlay = false;
+        _this.curPlayingIndex = null;
+      }
+    },
+    clickHandle() {
+      let _this = this;
+      if (this.showUpload) {
+        this.showUpload = false;
+      }
+    },
     formatTooltip(v) {
       return Math.round(v * 1.2);
     },
@@ -470,7 +466,7 @@
           this.getSounds();
         },
         (err) => {
-          this.$message.error("澹伴煶涓婁紶澶辫触");
+          this.$message.error(err.msg);
         }
       );
     },
@@ -773,13 +769,13 @@
         .sec {
           min-width: 30px;
           line-height: 80px;
-          margin-right: 10px;
+
           color: #333;
           font-size: 8px;
         }
         .block {
           flex: 1;
-          margin: 0 20px 0 6px;
+          margin: 0 0px 0 6px;
         }
         .el-input-number--small {
           width: 100px;
@@ -956,8 +952,6 @@
 }
 
 .upload-demo {
-  top: 452px;
-  left: 2px !important;
   width: 452px;
   height: 150px;
   background: #ffffff;
@@ -1140,4 +1134,4 @@
   /*  color: var(--colorCard); */
   color: #4e94ff;
 }
-</style>
+</style>
\ No newline at end of file

--
Gitblit v1.8.0