From 0b737708e696c45720499759b5c31aced87fdbb6 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期三, 07 七月 2021 14:10:03 +0800
Subject: [PATCH] merge master

---
 src/pages/systemSettings/views/generalSettings.vue |  263 +++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 198 insertions(+), 65 deletions(-)

diff --git a/src/pages/systemSettings/views/generalSettings.vue b/src/pages/systemSettings/views/generalSettings.vue
index 787e192..b349f87 100644
--- a/src/pages/systemSettings/views/generalSettings.vue
+++ b/src/pages/systemSettings/views/generalSettings.vue
@@ -11,12 +11,51 @@
         <div class="menu-item" @click="openRight('sound')">
           <div>浜嬩欢澹伴煶</div>
         </div>
+        <div class="menu-item" @click="openRight('personalise')">
+          <div>涓�у寲璁剧疆</div>
+        </div>
       </div>
       <div class="cluster-right">
         <div class="lang" v-if="activePage == 'basic'">
-          <div class="bar" v-for="(item, i) in basioInfoList" :key="i">
-            <span class="name">{{ item.name }}</span>
-            <span class="desc">{{ item.desc }}</span>
+          <div class="bar">
+            <span class="name">璁惧ID</span>
+            <span class="desc">{{ deviceInfo.server_id }}</span>
+          </div>
+          <div class="bar">
+            <span class="name">璁惧鍨嬪彿</span>
+            <span class="desc">{{ deviceInfo.deviceModel }}</span>
+          </div>
+          <div class="bar">
+            <span class="name">璁惧绫诲瀷</span>
+            <span class="desc">{{ deviceInfo.deviceDesc }}</span>
+          </div>
+          <div class="bar">
+            <span class="name">閫氶亾涓暟</span>
+            <span class="desc">{{ deviceInfo.channelCount }}</span>
+          </div>
+          <div class="bar">
+            <span class="name">涓绘帶鐗堟湰</span>
+            <span class="desc">{{ deviceInfo.masterVersion }}</span>
+          </div>
+          <div class="bar">
+            <span class="name">web鐗堟湰</span>
+            <span class="desc">{{ deviceInfo.webVersion }}</span>
+          </div>
+          <div class="bar">
+            <span class="name">纭洏淇℃伅</span>
+            <span class="desc">{{ deviceInfo.disks }}</span>
+          </div>
+          <div class="bar">
+            <span class="name">CPU</span>
+            <span class="desc">{{ deviceInfo.cpu }}</span>
+          </div>
+          <div class="bar">
+            <span class="name">鍐呭瓨</span>
+            <span class="desc">{{ deviceInfo.memory }}</span>
+          </div>
+          <div class="bar">
+            <span class="name">杩愯鏃堕棿</span>
+            <span class="desc">{{ deviceInfo.runningTime }}</span>
           </div>
         </div>
         <div class="lang" v-if="activePage == 'video'">
@@ -82,7 +121,7 @@
             </div>
             <div class="btns">
               <span class="icon iconfont">&#xe646;</span>
-              <span class="icon iconfont">&#xe646;</span>
+              <span class="icon iconfont" @click="removeSound(item)">&#xe646;</span>
             </div>
           </div>
           <div class="add-group">
@@ -90,8 +129,9 @@
               class="upload-demo"
               drag
               action="https://jsonplaceholder.typicode.com/posts/"
-              multiple
+              :http-request="uploadSound"
               v-show="showUpload"
+              :show-file-list="false"
             >
               <i class="el-icon-upload"></i>
               <div class="el-upload__text">
@@ -102,7 +142,30 @@
             </el-upload>
             <div v-show="!showUpload"></div>
             <div class="add-btn">
-              <span class="icon iconfont" @click="showUpload=!showUpload">&#xe646;</span>
+              <span class="icon iconfont" @click="showUpload = !showUpload">&#xe646;</span>
+            </div>
+          </div>
+        </div>
+
+        <div class="lang" v-if="activePage == 'personalise'">
+          <div class="title">鍥炬爣涓婚</div>
+
+          <div class="min-dur" style="cursor:pointer;" @click="selectIcons(0)">
+            <div class="title">鎵佸钩鍐欏疄鍥炬爣</div>
+            <div class="entity">
+              <div class="entity-img" v-for="(item, i) in realIconList" :key="i"></div>
+            </div>
+          </div>
+          <div class="min-dur" style="cursor:pointer;" @click="selectIcons(1)">
+            <div class="title">鎵佸钩鍖栧浘鏍�</div>
+            <div class="entity">
+              <div class="entity-img" v-for="(item, i) in flatIconList" :key="i"></div>
+            </div>
+          </div>
+          <div class="title">妗岄潰鑳屾櫙涓婚</div>
+          <div class="min-dur" style="padding-top:25px;">
+            <div class="bg-list">
+              <div class="bg-img" v-for="(item, i) in tableBGList" :key="i"></div>
             </div>
           </div>
         </div>
@@ -112,82 +175,99 @@
 </template>
 
 <script>
-import { saveAlarmConfig } from "@/api/system";
+import { saveAlarmConfig, getDevInfo } from "@/api/system";
+import { uploadSound, getSoundList, deleteSound } from "@/api/event";
+import config from "../../../../package.json";
+
 import { isIPv4 } from "@/scripts/validate";
 
 export default {
   data() {
-    const checkPwd = (rule, value, callback) => {
-      if (!value) {
-        return callback(new Error("瀵嗙爜涓嶈兘涓虹┖"));
-      }
-      setTimeout(() => {
-        if (value.length != 6) {
-          callback(new Error("瀵嗙爜搴斾负6浣�!"));
-        } else {
-          callback();
-        }
-      }, 1000);
-    };
     return {
       isHighClass: false,
-
-      ruleForm: {
-        deviceName: "",
-        port: "",
-      },
-      wifiForm: {
-        name: "",
-        password: "",
-      },
-      wireArr: [{ name: "鏈夌嚎缃戠粶1" }, { name: "鏈夌嚎缃戠粶2" }],
       inWifiDetail: false,
-      wifiList: [{ name: "鏃犵嚎缃戠粶1" }, { name: "鏃犵嚎缃戠粶2" }],
-      isOpenWifi: false,
       inWireDetail: false,
-      wireForm: {},
       showUpload: false,
       alarmConf: {
-        min_video_len: 0,
-        max_video_len: 0,
+        min_video_len: 10,
+        max_video_len: 15,
       },
-      basioInfoList: [
-        { name: "绠�浣撲腑鏂�", desc: "fesF" },
-        { name: "鑻辨枃", desc: "fesF" },
-        { name: "绻佷綋涓枃锛堥娓級", desc: "fesF" },
-      ],
-      soundList: [{ name: "2.mp3" }, { name: "3.mp3" }],
-
-      wireFormRules: {},
+      soundList: [],
       activePage: "basic",
-      rules: {
-        deviceName: [
-          { required: true, message: "璇疯緭鍏ヨ澶囧悕绉�", trigger: "change" },
-        ],
+      deviceInfo: {
+        cpu: "",
+        runningTime: "",
+        server_id: "",
+        deviceModel: "",
+        deviceDesc: "",
+        masterVersion: "",
+        channelCount: "",
+        webVersion: "",
+        disks: "",
+        memory: "",
       },
-      ipv4Form: {},
-      ipv6Form: {},
-      ipv4FormRules: {},
-      ipv6FormRules: {},
-      options: [
-        {
-          value: "閫夐」1",
-          label: "鎵嬪姩",
-        },
-        {
-          value: "閫夐」2",
-          label: "鑷姩",
-        },
-      ],
-      value: "",
+      realIconList: [{}, {}, {}],
+      flatIconList: [{}, {}, {}],
+      tableBGList: [{}, {}, {}],
     };
   },
-  mounted() { },
+  mounted() {
+    this.getDeviceInfo();
+    this.getSounds();
+
+  },
   beforeDestroy() { },
   props: ["barName"],
   methods: {
+    getDeviceInfo() {
+      getDevInfo().then((res) => {
+        let info = res.data.deviceInfo;
+        let basic = res.data;
+        this.deviceInfo.cpu = info.cpu[0].modelName;
+        this.deviceInfo.runningTime = this.secondsFormat(info.host.uptime);
+        this.deviceInfo.server_id = basic.server_id;
+        this.deviceInfo.deviceModel = basic.deviceModel;
+        this.deviceInfo.deviceDesc = basic.deviceDesc;
+        this.deviceInfo.masterVersion = basic.masterVersion;
+        this.deviceInfo.channelCount = basic.channelCount;
+        this.deviceInfo.webVersion = "V" + config.version;
+        this.deviceInfo.disks = "( " + info.disk + ") ";
+        this.deviceInfo.memory =
+          (info.mem.total / 1024 / 1024 / 1024).toFixed(2) + "GB";
+        this.alarmConf.min_video_len = basic.min_video_len
+        this.alarmConf.max_video_len = basic.max_video_len
+      });
+    },
+
+    getSounds() {
+      getSoundList()
+        .then((res) => {
+          if (res.success) {
+            this.soundList = res.data;
+          }
+        })
+        .catch((e) => console.log(e));
+    },
+    secondsFormat(s) {
+      var day = (s / (24 * 3600)) | 0;
+      var hour = ((s - day * 24 * 3600) / 3600) | 0;
+      var minute = ((s - day * 24 * 3600 - hour * 3600) / 60) | 0;
+      var second = s - day * 24 * 3600 - hour * 3600 - minute * 60;
+      return day + "澶� " + hour + "灏忔椂 " + minute + "鍒� " + second + "绉�";
+    },
+    uploadSound(params) {
+      let param = new FormData();
+      param.append("file", params.file);
+      uploadSound(param).then((res) => {
+        console.log(res.data);
+        this.getSounds();
+      });
+    },
     openRight(typ) {
       this.activePage = typ;
+      // if (typ == "sound") {
+      //   this.getSounds();
+      // }
     },
     wifiControl(val) { },
     checkWifi() {
@@ -195,6 +275,32 @@
     },
     checkWire(item) {
       this.inWireDetail = true;
+    },
+    selectIcons(typ) {
+
+    },
+    removeSound(item) {
+      debugger
+      this.$confirm('鎮ㄦ槸鍚︾‘璁ゅ垹闄や簨浠跺0闊�', '鍒犻櫎浜嬩欢澹伴煶', {
+        confirmButtonText: '纭畾',
+        cancelButtonText: '鍙栨秷',
+        type: 'warning'
+      }).then(() => {
+        deleteSound({
+          id: item.id
+        }).then((res) => {
+          if (res.success) {
+            this.getSounds()
+            this.$message({
+              type: 'success',
+              message: '鍒犻櫎鎴愬姛!'
+            });
+            this.showUpload = false
+          }
+        }, err => {
+          this.$message.error(err.msg)
+        })
+      })
     },
     clickSound(item, i) {
       this.$refs["soundBar"].forEach((x) => {
@@ -335,8 +441,7 @@
         background-color: rgba(233, 233, 233, 1);
       }
       .add-group {
-        margin-top: 170px;
-        height: 235px;
+        margin-top: 50px;
         display: flex;
         flex-direction: column;
         justify-content: space-between;
@@ -359,7 +464,7 @@
         box-sizing: border-box;
         padding: 0 20px;
         background-color: rgba(248, 248, 248, 1);
-        height: 95px;
+        height: 105px;
         margin-bottom: 20px;
         border-radius: 15px;
         .title {
@@ -371,6 +476,10 @@
           padding: 0 6px;
           font-size: 14px;
         }
+      }
+
+      .min-dur:hover {
+        background-color: rgba(233, 233, 233, 1);
       }
 
       .entity {
@@ -437,5 +546,29 @@
       margin-top: 20px;
     }
   }
+
+  .lang {
+    .min-dur {
+      .bg-list {
+        display: flex;
+        .bg-img {
+          background-color: aquamarine;
+          width: 100px;
+          height: 60px;
+          margin-right: 10px;
+        }
+      }
+      .entity {
+        display: flex;
+
+        .entity-img {
+          background-color: aquamarine;
+          width: 50px;
+          height: 50px;
+          margin-right: 10px;
+        }
+      }
+    }
+  }
 }
 </style>

--
Gitblit v1.8.0