From 4b43bfb3f6f499f480712dd29bef52275466afd6 Mon Sep 17 00:00:00 2001
From: heyujie <516346543@qq.com>
Date: 星期五, 30 七月 2021 22:10:59 +0800
Subject: [PATCH] change all

---
 src/pages/settings/views/generalSettings.vue |   52 +++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/src/pages/settings/views/generalSettings.vue b/src/pages/settings/views/generalSettings.vue
index 89689cf..db17136 100644
--- a/src/pages/settings/views/generalSettings.vue
+++ b/src/pages/settings/views/generalSettings.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="all">
+  <div class="all" ref="curPage">
     <div class="general-set">
       <div class="general-center" ref="left">
         <div
@@ -9,7 +9,7 @@
           v-for="(item, i) in menuArr"
           :key="i"
         >
-          <span class="iconfont">{{ item.icon }}</span>
+          <span class="iconfont" :style="`font-size:${item.size}px;`">{{ item.icon }}</span>
           <span class="title">{{ item.name }}</span>
         </div>
       </div>
@@ -155,7 +155,7 @@
             drag
             action="https://jsonplaceholder.typicode.com/posts/"
             :http-request="uploadSound"
-            v-show="showUpload"
+            v-if="showUpload"
             :show-file-list="false"
           >
             <i class="el-icon-upload"></i>
@@ -167,7 +167,7 @@
           </el-upload>
           <div class="add-group">
             <div class="add-btn">
-              <span class="icon iconfont" @click="showUpload = !showUpload"
+              <span class="icon iconfont" @click.stop="showUpload = !showUpload"
                 >&#xe646;</span
               >
             </div>
@@ -240,7 +240,7 @@
 <script>
 import { saveAlarmConfig, getDevInfo } from "@/api/system";
 import { uploadSound, getSoundList, deleteSound } from "@/api/event";
-import config from "../../../../package.json";
+// import config from "../../../../package.json";
 
 export default {
   data() {
@@ -255,10 +255,10 @@
         max: 0,
       },
       menuArr: [
-        { name: "璁惧淇℃伅", icon: "\ue933" },
-        { name: "浜嬩欢褰曞儚鏃堕暱", icon: "\ue6f3" },
-        { name: "浜嬩欢澹伴煶", icon: "\ue6e1" },
-        { name: "涓�у寲璁剧疆", icon: "\ue756" },
+        { name: "璁惧淇℃伅", icon: "\ue933" ,size:18},
+        { name: "浜嬩欢褰曞儚鏃堕暱", icon: "\ue6f3" ,size:20},
+        { name: "浜嬩欢澹伴煶", icon: "\ue6e1" ,size:16},
+        { name: "涓�у寲璁剧疆", icon: "\ue756" ,size:18},
       ],
       soundList: [],
       activePage: 0,
@@ -304,6 +304,24 @@
         _this.curPlayingIndex = null;
       }
     });
+    const url = localStorage.getItem("backgroundPic")
+    if (url) {
+      const arr = url.split("/")
+      this.activeBg= this.tableBGList.findIndex((x) => {
+        return x.url.includes(arr[arr.length-1])
+      })
+    }else{
+      this.activeBg= 0
+    }
+    const e = this.$refs.curPage
+    e.addEventListener("click", (e) => {
+      if (this.showUpload) {
+        this.showUpload = false;
+      }
+    });
+  },
+  beforeDestroy() {
+    this.$refs.curPage.removeEventListener("click")
   },
   computed: {
     min_video_len() {
@@ -356,7 +374,7 @@
         this.deviceInfo.deviceDesc = basic.deviceDesc;
         this.deviceInfo.masterVersion = basic.masterVersion;
         this.deviceInfo.channelCount = basic.channelCount;
-        this.deviceInfo.webVersion = "V" + config.version;
+        this.deviceInfo.webVersion = "V2.0.0";
         this.deviceInfo.disks = "( " + info.disk + ") ";
         this.deviceInfo.memory =
           (info.mem.total / 1024 / 1024 / 1024).toFixed(2) + "GB";
@@ -387,6 +405,7 @@
       uploadSound(param).then(
         (res) => {
           this.$message.success("涓婁紶鎴愬姛");
+          this.showUpload = false
           this.getSounds();
         },
         (err) => {
@@ -482,10 +501,10 @@
       cursor: pointer;
       display: flex;
       .iconfont {
-        margin-right: 12px;
+        margin-right: 8px;
       }
       .title {
-        font-size: 16px;
+        font-size: 15px;
       }
     }
     .menu-item-active {
@@ -754,13 +773,12 @@
           .bg-img {
             margin-right: 12px;
             cursor: pointer;
-            width: 120px;
+            // width: 120px;
+                height: 80px;
             border: 2px solid transparent;
             img {
-              width: 120px;
-              border-radius: 5px;
-
-              height: 100%;
+             border-radius: 5px;
+    height: 100%;
             }
           }
           .bg-img:hover {

--
Gitblit v1.8.0