From b7b693b6d68fc51a34fd7d264dad9a8d69a1193d Mon Sep 17 00:00:00 2001
From: kerwincui <164770707@qq.com>
Date: Sun, 5 Jun 2022 00:18:42 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue/src/views/index.vue                       | 10 ++++---
 vue/src/views/iot/category/index.vue          |  7 +++--
 vue/src/views/iot/device/device-edit.vue      |  3 +-
 vue/src/views/iot/device/device-statistic.vue | 30 ++-----------------
 vue/src/views/iot/firmware/index.vue          |  1 -
 .../views/iot/product/product-authorize.vue   |  2 +-
 vue/src/views/iot/product/product-edit.vue    |  2 +-
 vue/src/views/iot/template/index.vue          |  5 ++--
 vue/src/views/system/role/index.vue           |  2 +-
 9 files changed, 20 insertions(+), 42 deletions(-)

diff --git a/vue/src/views/index.vue b/vue/src/views/index.vue
index 32424c2d..efc64b16 100644
--- a/vue/src/views/index.vue
+++ b/vue/src/views/index.vue
@@ -30,7 +30,7 @@
                     <div style="display:table;margin-bottom:10px;">
                         <div style="width:70px;font-weight: bold;display:table-cell;">联系作者</div>
                         <div style="display:table-cell;">
-                            <span>QQ164770707</span>
+                            <span>QQ 164770707</span>
                         </div>
                     </div>
                     <div style="display:table;margin-bottom:15px;">
@@ -341,6 +341,11 @@
         </div>
     </el-dialog>
 
+    <div style="width:100%;text-align:center;font-size:14px;color:#666;line-height:32px;margin-top:150px;">
+        <span>Copyright © 2021-2022 <a href="https://wumei.live/" target="_blank">Wumei Smart</a> | <a href="https://wumei.live/" target="_blank">物美智能</a> | Apache License</span><br />
+        <span>项目文档<a href="https://wumei.live/doc/" target="_blank"> https://wumei.live/doc/</a></span>
+    </div>
+
 </div>
 </template>
 
@@ -940,9 +945,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.app-container {
-    padding-bottom: 200px;
-}
 
 .description {
     font-size: 14px;
diff --git a/vue/src/views/iot/category/index.vue b/vue/src/views/iot/category/index.vue
index 9110360d..5244b5fe 100644
--- a/vue/src/views/iot/category/index.vue
+++ b/vue/src/views/iot/category/index.vue
@@ -32,8 +32,9 @@
             </el-table-column>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150">
                 <template slot-scope="scope">
-                    <el-button size="small" type="primary" style="padding:5px;" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['iot:category:edit']" v-if="scope.row.isSys == '1'  && isTenant!=true">修改</el-button>
-                    <el-button size="small" type="danger" style="padding:5px;" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['iot:category:remove']" v-if="scope.row.isSys == '1'  && isTenant!=true">删除</el-button>
+                    <el-button size="small" type="primary" style="padding:5px;" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['iot:category:edit']" v-if="scope.row.isSys == '0'? true:!isTenant">修改</el-button>
+                    <el-button size="small" type="danger" style="padding:5px;" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['iot:category:remove']" v-if="scope.row.isSys == '0'? true:!isTenant">删除</el-button>
+                     <span style="font-size:10px;color:#999;" v-if="scope.row.isSys == '1' && isTenant">系统定义，不能修改</span>
                 </template>
             </el-table-column>
         </el-table>
@@ -100,7 +101,7 @@ export default {
             // 查询参数
             queryParams: {
                 pageNum: 1,
-                pageSize: 10,
+                pageSize: 20,
                 categoryName: null,
                 isSys: null,
             },
diff --git a/vue/src/views/iot/device/device-edit.vue b/vue/src/views/iot/device/device-edit.vue
index 0e2302b3..de598c65 100644
--- a/vue/src/views/iot/device/device-edit.vue
+++ b/vue/src/views/iot/device/device-edit.vue
@@ -194,6 +194,7 @@ export default {
                 productId: 0,
                 status: 1,
                 isCustomLocation: 1,
+                firmwareVersion: 1.0,
             },
             // 图片地址
             imageUrl: require('@/assets/images/product.jpg'),
@@ -297,7 +298,7 @@ export default {
                 tenantId: null,
                 tenantName: null,
                 serialNumber: null,
-                firmwareVersion: null,
+                firmwareVersion: 1.0,
                 status: 1,
                 rssi: null,
                 networkAddress: null,
diff --git a/vue/src/views/iot/device/device-statistic.vue b/vue/src/views/iot/device/device-statistic.vue
index 46891543..5cacac66 100644
--- a/vue/src/views/iot/device/device-statistic.vue
+++ b/vue/src/views/iot/device/device-statistic.vue
@@ -119,8 +119,7 @@ export default {
             }
         },
         /**监测统计数据 */
-        getStatistic() {
-            
+        getStatistic() {            
             let color = ['#1890FF', '#91CB74', '#FAC858', '#EE6666', '#73C0DE', '#3CA272', '#FC8452', '#9A60B4', '#ea7ccc'];
             for (let i = 0; i < this.monitorThings.length; i++) {
                 // 设置宽度
@@ -141,7 +140,7 @@ export default {
                     grid: {
                         top: '80px',
                         left: '40px',
-                        right: '80px',
+                        right: '20px',
                         bottom: '60px',
                         containLabel: true
                     },
@@ -156,23 +155,9 @@ export default {
                     },
                     xAxis: {
                         type: 'time',
-                        boundaryGap: false,
-                        name: "时间", //坐标名字
-                        nameLocation: "end", //坐标位置，支持start,end，middle
-                        nameTextStyle: { //字体样式            
-                            fontSize: 16, //字体大小            
-                            padding: 20 //距离坐标位置的距离    
-                        },
                     },
                     yAxis: {
                         type: 'value',
-                        boundaryGap: [0, '100%'],
-                        name: this.monitorThings[i].name, //坐标名字
-                        nameLocation: "end", //坐标位置，支持start,end，middle
-                        nameTextStyle: { //字体样式            
-                            fontSize: 16, //字体大小            
-                            padding: 10 //距离坐标位置的距离    
-                        },
                     },
                     dataZoom: [{
                             type: 'inside',
@@ -192,17 +177,6 @@ export default {
                         itemStyle: {
                             color: i>9? color[0]:color[i]
                         },
-                        areaStyle: {
-                            // color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-                            //         offset: 0,
-                            //         color: 'rgb(64, 158, 255)'
-                            //     },
-                            //     {
-                            //         offset: 1,
-                            //         color: 'rgb(255, 255, 255)'
-                            //     }
-                            // ])
-                        },
                         data: []
                     }]
                 };
diff --git a/vue/src/views/iot/firmware/index.vue b/vue/src/views/iot/firmware/index.vue
index eeb90753..69e6f1fd 100644
--- a/vue/src/views/iot/firmware/index.vue
+++ b/vue/src/views/iot/firmware/index.vue
@@ -22,7 +22,6 @@
         <el-table v-loading="loading" :data="firmwareList" @selection-change="handleSelectionChange">
             <el-table-column label="固件名称" align="center" prop="firmwareName" />
             <el-table-column label="产品名称" align="center" prop="productName" />
-            <el-table-column label="租户名称" align="center" prop="tenantName" />
             <el-table-column label="固件版本" align="center" prop="version">
                 <template slot-scope="scope">
                     <span>Version </span> {{scope.row.version}}
diff --git a/vue/src/views/iot/product/product-authorize.vue b/vue/src/views/iot/product/product-authorize.vue
index ae7db8af..609bc4c6 100644
--- a/vue/src/views/iot/product/product-authorize.vue
+++ b/vue/src/views/iot/product/product-authorize.vue
@@ -41,7 +41,7 @@
                 <el-tag type="info" v-else>未使用</el-tag>
             </template>
         </el-table-column>
-        <el-table-column label="授权码" width="300" align="center" prop="authorizeCode" />
+        <el-table-column label="授权码" width="310" align="center" prop="authorizeCode" />
         <el-table-column label="设备ID" width="75" align="center" prop="deviceId" />
         <el-table-column label="设备编号" width="150" align="center" prop="serialNumber" />
         <el-table-column label="用户ID" width="75" align="center" prop="userId" />
diff --git a/vue/src/views/iot/product/product-edit.vue b/vue/src/views/iot/product/product-edit.vue
index ae8a4376..c2d54972 100644
--- a/vue/src/views/iot/product/product-edit.vue
+++ b/vue/src/views/iot/product/product-edit.vue
@@ -33,7 +33,7 @@
                             </el-select>
                         </el-form-item>
                         <el-form-item label="设备认证" prop="vertificateMethod">
-                            <el-select v-model="form.vertificateMethod" placeholder="请选择认证方式" disabled style="width:100%">
+                            <el-select v-model="form.vertificateMethod" placeholder="请选择认证方式" style="width:100%">
                                 <el-option v-for="dict in dict.type.iot_vertificate_method" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)"></el-option>
                             </el-select>
                         </el-form-item>
diff --git a/vue/src/views/iot/template/index.vue b/vue/src/views/iot/template/index.vue
index ef789c30..95dbdfda 100644
--- a/vue/src/views/iot/template/index.vue
+++ b/vue/src/views/iot/template/index.vue
@@ -61,8 +61,9 @@
             </el-table-column>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150">
                 <template slot-scope="scope">
-                    <el-button size="small" type="primary" style="padding:5px;" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['iot:template:edit']" v-if="scope.row.isSys == '1'  && isTenant!=true" >修改</el-button>
-                    <el-button size="small" type="danger" style="padding:5px;" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['iot:template:remove']" v-if="scope.row.isSys == '1'  && isTenant!=true">删除</el-button>
+                    <el-button size="small" type="primary" style="padding:5px;" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['iot:template:edit']" v-if="scope.row.isSys == '0'? true:!isTenant" >修改</el-button>
+                    <el-button size="small" type="danger" style="padding:5px;" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['iot:template:remove']" v-if="scope.row.isSys == '0'? true:!isTenant">删除</el-button>
+                    <span style="font-size:10px;color:#999;" v-if="scope.row.isSys == '1' && isTenant">系统定义，不能修改</span>
                 </template>
             </el-table-column>
         </el-table>
diff --git a/vue/src/views/system/role/index.vue b/vue/src/views/system/role/index.vue
index 44d2a855..c17bfb4a 100644
--- a/vue/src/views/system/role/index.vue
+++ b/vue/src/views/system/role/index.vue
@@ -123,7 +123,7 @@
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope" v-if="scope.row.roleId !== 1 && scope.row.roleId !== 2 && scope.row.roleId !== 3">
+        <template slot-scope="scope" v-if="scope.row.roleId !== 1 && scope.row.roleId !== 1 && scope.row.roleId !== 1">
           <el-button
             size="mini"
             type="text"