From 02b7ae5ba53199462a054f3936be4f73ba35b3fe Mon Sep 17 00:00:00 2001
From: kerwincui <164770707@qq.com>
Date: Thu, 1 Jul 2021 13:16:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF1.0=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue/src/api/system/category.js          | 10 +++
 vue/src/api/system/config.js            | 10 +++
 vue/src/api/system/device.js            | 10 +++
 vue/src/api/system/group.js             | 10 +++
 vue/src/api/system/set.js               | 10 +++
 vue/src/api/system/status.js            | 10 +++
 vue/src/settings.js                     |  2 +-
 vue/src/views/index.vue                 | 11 ++-
 vue/src/views/system/category/index.vue | 10 +++
 vue/src/views/system/config/index.vue   | 10 +++
 vue/src/views/system/device/index.vue   | 98 ++++++++++++++-----------
 vue/src/views/system/group/index.vue    | 10 +++
 vue/src/views/system/set/index.vue      | 10 +++
 vue/src/views/system/status/index.vue   | 10 +++
 14 files changed, 174 insertions(+), 47 deletions(-)

diff --git a/vue/src/api/system/category.js b/vue/src/api/system/category.js
index cc81934b..299ab5da 100644
--- a/vue/src/api/system/category.js
+++ b/vue/src/api/system/category.js
@@ -1,3 +1,13 @@
+/******************************************************************************
+ * 作者：kerwincui
+ * 时间：2021-06-08
+ * 邮箱：164770707@qq.com
+ * 源码地址：https://gitee.com/kerwincui/wumei-smart
+ * author: kerwincui
+ * create: 2021-06-08
+ * email：164770707@qq.com
+ * source:https://github.com/kerwincui/wumei-smart
+ ******************************************************************************/
 import request from '@/utils/request'
 
 // 查询设备分类列表
diff --git a/vue/src/api/system/config.js b/vue/src/api/system/config.js
index 93d11fcd..8f8a0a77 100644
--- a/vue/src/api/system/config.js
+++ b/vue/src/api/system/config.js
@@ -1,3 +1,13 @@
+/******************************************************************************
+ * 作者：kerwincui
+ * 时间：2021-06-08
+ * 邮箱：164770707@qq.com
+ * 源码地址：https://gitee.com/kerwincui/wumei-smart
+ * author: kerwincui
+ * create: 2021-06-08
+ * email：164770707@qq.com
+ * source:https://github.com/kerwincui/wumei-smart
+ ******************************************************************************/
 import request from '@/utils/request'
 
 // 查询参数列表
diff --git a/vue/src/api/system/device.js b/vue/src/api/system/device.js
index 8ed52eef..ea984a1e 100644
--- a/vue/src/api/system/device.js
+++ b/vue/src/api/system/device.js
@@ -1,3 +1,13 @@
+/******************************************************************************
+ * 作者：kerwincui
+ * 时间：2021-06-08
+ * 邮箱：164770707@qq.com
+ * 源码地址：https://gitee.com/kerwincui/wumei-smart
+ * author: kerwincui
+ * create: 2021-06-08
+ * email：164770707@qq.com
+ * source:https://github.com/kerwincui/wumei-smart
+ ******************************************************************************/
 import request from '@/utils/request'
 
 // 查询设备列表
diff --git a/vue/src/api/system/group.js b/vue/src/api/system/group.js
index 734a0c73..c006fedf 100644
--- a/vue/src/api/system/group.js
+++ b/vue/src/api/system/group.js
@@ -1,3 +1,13 @@
+/******************************************************************************
+ * 作者：kerwincui
+ * 时间：2021-06-08
+ * 邮箱：164770707@qq.com
+ * 源码地址：https://gitee.com/kerwincui/wumei-smart
+ * author: kerwincui
+ * create: 2021-06-08
+ * email：164770707@qq.com
+ * source:https://github.com/kerwincui/wumei-smart
+ ******************************************************************************/
 import request from '@/utils/request'
 
 // 查询分组列表
diff --git a/vue/src/api/system/set.js b/vue/src/api/system/set.js
index 1be515d1..6c4cabee 100644
--- a/vue/src/api/system/set.js
+++ b/vue/src/api/system/set.js
@@ -1,3 +1,13 @@
+/******************************************************************************
+ * 作者：kerwincui
+ * 时间：2021-06-08
+ * 邮箱：164770707@qq.com
+ * 源码地址：https://gitee.com/kerwincui/wumei-smart
+ * author: kerwincui
+ * create: 2021-06-08
+ * email：164770707@qq.com
+ * source:https://github.com/kerwincui/wumei-smart
+ ******************************************************************************/
 import request from '@/utils/request'
 
 // 查询设备配置列表
diff --git a/vue/src/api/system/status.js b/vue/src/api/system/status.js
index 01ca203c..c641b114 100644
--- a/vue/src/api/system/status.js
+++ b/vue/src/api/system/status.js
@@ -1,3 +1,13 @@
+/******************************************************************************
+ * 作者：kerwincui
+ * 时间：2021-06-08
+ * 邮箱：164770707@qq.com
+ * 源码地址：https://gitee.com/kerwincui/wumei-smart
+ * author: kerwincui
+ * create: 2021-06-08
+ * email：164770707@qq.com
+ * source:https://github.com/kerwincui/wumei-smart
+ ******************************************************************************/
 import request from '@/utils/request'
 
 // 查询设备状态列表
diff --git a/vue/src/settings.js b/vue/src/settings.js
index 5f540fcb..3dd380c4 100644
--- a/vue/src/settings.js
+++ b/vue/src/settings.js
@@ -1,5 +1,5 @@
 module.exports = {
-  title: '物美智能设备',
+  title: '物美智能',
 
   /**
    * 侧边栏主题 深色主题theme-dark，浅色主题theme-light
diff --git a/vue/src/views/index.vue b/vue/src/views/index.vue
index f763a55a..b07aec10 100644
--- a/vue/src/views/index.vue
+++ b/vue/src/views/index.vue
@@ -60,14 +60,21 @@
                     <el-col :span="6">
             <h4>安卓端技术</h4>
             <ul>
-              <li>xui</li>
+              <li>Xui</li>
+              <li>Xpage</li>
+              <li>XHttp2</li>
+              <li>XAOP</li>
+              <li>XUtil</li>
+              <li>XUpdate</li>
               <li>...</li>
             </ul>
           </el-col>
                     <el-col :span="6">
             <h4>硬件端技术</h4>
             <ul>
-              <li>esp-idf</li>
+              <li>ESP-IDF</li>
+              <li>Arduino</li>
+              <li>FreeRTOS</li>
               <li>...</li>
             </ul>
           </el-col>
diff --git a/vue/src/views/system/category/index.vue b/vue/src/views/system/category/index.vue
index 93312be6..327eae84 100644
--- a/vue/src/views/system/category/index.vue
+++ b/vue/src/views/system/category/index.vue
@@ -1,3 +1,13 @@
+/******************************************************************************
+ * 作者：kerwincui
+ * 时间：2021-06-08
+ * 邮箱：164770707@qq.com
+ * 源码地址：https://gitee.com/kerwincui/wumei-smart
+ * author: kerwincui
+ * create: 2021-06-08
+ * email：164770707@qq.com
+ * source:https://github.com/kerwincui/wumei-smart
+ ******************************************************************************/
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
diff --git a/vue/src/views/system/config/index.vue b/vue/src/views/system/config/index.vue
index e26ed900..ee9043aa 100644
--- a/vue/src/views/system/config/index.vue
+++ b/vue/src/views/system/config/index.vue
@@ -1,3 +1,13 @@
+/******************************************************************************
+ * 作者：kerwincui
+ * 时间：2021-06-08
+ * 邮箱：164770707@qq.com
+ * 源码地址：https://gitee.com/kerwincui/wumei-smart
+ * author: kerwincui
+ * create: 2021-06-08
+ * email：164770707@qq.com
+ * source:https://github.com/kerwincui/wumei-smart
+ ******************************************************************************/
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
diff --git a/vue/src/views/system/device/index.vue b/vue/src/views/system/device/index.vue
index e59f9f45..75e27f93 100644
--- a/vue/src/views/system/device/index.vue
+++ b/vue/src/views/system/device/index.vue
@@ -1,3 +1,13 @@
+/******************************************************************************
+ * 作者：kerwincui
+ * 时间：2021-06-08
+ * 邮箱：164770707@qq.com
+ * 源码地址：https://gitee.com/kerwincui/wumei-smart
+ * author: kerwincui
+ * create: 2021-06-08
+ * email：164770707@qq.com
+ * source:https://github.com/kerwincui/wumei-smart
+ ******************************************************************************/
 <template>
   <div class="app-container">
     <el-form
@@ -222,7 +232,7 @@
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
-        width="80"
+        width="120"
       >
         <template slot-scope="scope">
           <el-button
@@ -249,6 +259,14 @@
             v-hasPermi="['system:device:edit']"
             >修改</el-button
           >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-cloudy"
+            disabled
+            v-hasPermi="['system:device:edit']"
+            >升级</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
@@ -304,7 +322,7 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>        
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -313,14 +331,14 @@
     <el-dialog
       :title="statusTitle"
       :visible.sync="statusOpen"
-      width="620px"
+      width="630px"
       append-to-body
     >
       <el-form
         ref="statusForm"
         :model="statusForm"
         :rules="rules"
-        label-width="100px"
+        label-width="120px"
       >
         <el-row>
           <el-col :span="24">
@@ -329,8 +347,7 @@
                 v-model="statusForm.relayStatus"
                 active-text="打开"
                 inactive-text="关闭"
-                active-value="1"
-                inactive-value="0">
+                :active-value=1 :inactive-value=0 active-color="#13ce66">
               </el-switch>
             </el-form-item>
           </el-col>
@@ -340,8 +357,7 @@
                 v-model="statusForm.lightStatus"
                 active-text="打开"
                 inactive-text="关闭"
-                active-value="1"
-                inactive-value="0">
+                :active-value=1 :inactive-value=0 active-color="#13ce66">
               </el-switch>
             </el-form-item>
           </el-col>
@@ -367,20 +383,20 @@
 
         <el-row>
           <el-col :span="24">
-            <el-form-item label="渐变间隔/毫秒" prop="lightInterval">
+            <el-form-item label="渐变间隔/ms" prop="lightInterval">
               <el-slider
                 v-model="statusForm.lightInterval"
-                :min=100
+                :min=0
                 :max=1500
                 show-input>
               </el-slider>
             </el-form-item>
           </el-col>
           <el-col :span="24" :offset="0">
-            <el-form-item label="渐变时间/毫秒" prop="fadeTime">
+            <el-form-item label="渐变时间/ms" prop="fadeTime">
               <el-slider
                 v-model="statusForm.fadeTime"
-                :min=100
+                :min=0
                 :max=1500
                 show-input>
               </el-slider>
@@ -446,7 +462,8 @@
 
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="statusSubmitForm">确 定</el-button>
+        <el-button type="primary" @click="statusSubmitForm(false)">确 定</el-button>
+        <el-button type="success" @click="statusSubmitForm(true)">应 用</el-button>
         <el-button @click="statusCancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -455,7 +472,7 @@
     <el-dialog
       :title="setTitle"
       :visible.sync="setOpen"
-      width="620px"
+      width="630px"
       append-to-body
     >
       <el-form ref="setForm" :model="setForm" :rules="rules" label-width="120px">
@@ -464,8 +481,7 @@
                 v-model="setForm.isRadar"
                 active-text="打开"
                 inactive-text="关闭"
-                active-value="1"
-                inactive-value="0">
+                :active-value=1 :inactive-value=0 >
               </el-switch>
         </el-form-item>
 
@@ -474,8 +490,7 @@
                 v-model="setForm.isAlarm"
                 active-text="打开"
                 inactive-text="关闭"
-                active-value="1"
-                inactive-value="0">
+                :active-value=1 :inactive-value=0 >
               </el-switch>
         </el-form-item>
 
@@ -494,8 +509,7 @@
                 v-model="setForm.isRfControl"
                 active-text="打开"
                 inactive-text="关闭"
-                active-value="1"
-                inactive-value="0">
+                :active-value=1 :inactive-value=0 >
               </el-switch>
         </el-form-item>
         <el-form-item label="遥控配对" prop="isRfLearn">
@@ -503,8 +517,7 @@
                 v-model="setForm.isRfLearn"
                 active-text="打开"
                 inactive-text="关闭"
-                active-value="1"
-                inactive-value="0">
+                :active-value=1 :inactive-value=0 >
               </el-switch>
         </el-form-item>
         <el-form-item label="遥控清码" prop="isRfClear">
@@ -512,8 +525,7 @@
                 v-model="setForm.isRfClear"
                 active-text="打开"
                 inactive-text="关闭"
-                active-value="1"
-                inactive-value="0">
+                :active-value=1 :inactive-value=0 >
               </el-switch>
         </el-form-item>
         <el-row>
@@ -573,8 +585,7 @@
                 v-model="setForm.isReset"
                 active-text="打开"
                 inactive-text="关闭"
-                active-value="1"
-                inactive-value="0">
+                :active-value=1 :inactive-value=0 active-color="#f56c6c">
               </el-switch>
         </el-form-item>
         <el-form-item label="打开AP" prop="isAp">
@@ -582,8 +593,7 @@
                 v-model="setForm.isAp"
                 active-text="打开"
                 inactive-text="关闭"
-                active-value="1"
-                inactive-value="0">
+                :active-value=1 :inactive-value=0 active-color="#f56c6c">
               </el-switch>
         </el-form-item>
 
@@ -600,7 +610,8 @@
 
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="setSubmitForm">确 定</el-button>
+        <el-button type="primary" @click="setSubmitForm(false)">确 定</el-button>
+        <el-button type="success" @click="setSubmitForm(true)">应 用</el-button>
         <el-button @click="setCancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -707,6 +718,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
+        groupId:0,
         deviceNum: null,
         categoryId: null,
         deviceName: null,
@@ -714,12 +726,6 @@ export default {
         ownerId: null,
         createTime: null
       },
-      // 查询分类参数
-      queryCategoryParams: {
-        pageNum: 1,
-        pageSize: 100,
-        categoryName: null
-      },
       // 表单参数
       form: {},
       statusForm: {},
@@ -961,29 +967,33 @@ export default {
         }
       });
     },
-    /** 提交按钮 */
-    statusSubmitForm() {
+    /** 状态提交按钮 */
+    statusSubmitForm(isApply) {
       this.$refs["statusForm"].validate(valid => {
         if (valid) {
           if (this.statusForm.deviceStatusId != null) {
             updateStatus(this.statusForm).then(response => {
               this.msgSuccess("更新成功");
-              this.statusOpen = false;
-              this.getList();
+              if(!isApply){
+                this.statusOpen = false;
+                this.getList();
+              }              
             });
           }
         }
       });
     },
-    /** 提交按钮 */
-    setSubmitForm() {
+    /** 设置提交按钮 */
+    setSubmitForm(isApply) {
       this.$refs["setForm"].validate(valid => {
         if (valid) {
           if (this.setForm.deviceSetId != null) {
             updateSet(this.setForm).then(response => {
-              this.msgSuccess("修改成功");
-              this.setOpen = false;
-              this.getList();
+              this.msgSuccess("更新成功");
+              if(!isApply){
+                this.setOpen = false;
+                this.getList();
+              }              
             });
           }
         }
diff --git a/vue/src/views/system/group/index.vue b/vue/src/views/system/group/index.vue
index d02e7d86..9cef66f0 100644
--- a/vue/src/views/system/group/index.vue
+++ b/vue/src/views/system/group/index.vue
@@ -1,3 +1,13 @@
+/******************************************************************************
+ * 作者：kerwincui
+ * 时间：2021-06-08
+ * 邮箱：164770707@qq.com
+ * 源码地址：https://gitee.com/kerwincui/wumei-smart
+ * author: kerwincui
+ * create: 2021-06-08
+ * email：164770707@qq.com
+ * source:https://github.com/kerwincui/wumei-smart
+ ******************************************************************************/
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
diff --git a/vue/src/views/system/set/index.vue b/vue/src/views/system/set/index.vue
index df348ef6..157cc383 100644
--- a/vue/src/views/system/set/index.vue
+++ b/vue/src/views/system/set/index.vue
@@ -1,3 +1,13 @@
+/******************************************************************************
+ * 作者：kerwincui
+ * 时间：2021-06-08
+ * 邮箱：164770707@qq.com
+ * 源码地址：https://gitee.com/kerwincui/wumei-smart
+ * author: kerwincui
+ * create: 2021-06-08
+ * email：164770707@qq.com
+ * source:https://github.com/kerwincui/wumei-smart
+ ******************************************************************************/
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
diff --git a/vue/src/views/system/status/index.vue b/vue/src/views/system/status/index.vue
index 59a5ee98..f5e7f03d 100644
--- a/vue/src/views/system/status/index.vue
+++ b/vue/src/views/system/status/index.vue
@@ -1,3 +1,13 @@
+/******************************************************************************
+ * 作者：kerwincui
+ * 时间：2021-06-08
+ * 邮箱：164770707@qq.com
+ * 源码地址：https://gitee.com/kerwincui/wumei-smart
+ * author: kerwincui
+ * create: 2021-06-08
+ * email：164770707@qq.com
+ * source:https://github.com/kerwincui/wumei-smart
+ ******************************************************************************/
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">