From 15d3a8c049f61a56cd18bd6edd836e2a4ec18ba8 Mon Sep 17 00:00:00 2001
From: kerwincui <164770707@qq.com>
Date: Sun, 14 Aug 2022 01:16:41 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue/src/views/index.vue                    | 4 ++--
 vue/src/views/iot/device/device-user.vue   | 4 ++--
 vue/src/views/iot/product/product-edit.vue | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/vue/src/views/index.vue b/vue/src/views/index.vue
index 7b0e7e13..5b036df4 100644
--- a/vue/src/views/index.vue
+++ b/vue/src/views/index.vue
@@ -91,7 +91,7 @@
                     </el-col>
                 </el-row>
             </el-card>
-            <el-card shadow="none" style="margin-top:22px;">
+            <el-card shadow="none" style="margin-top:22px;height:302px;">
                 <h3 style="font-weight:bold;margin-bottom:10px;"><i class="el-icon-s-order"></i> 信息栏</h3>
                 <div style="cursor:pointer;display:table;width:100%;line-height:36px;" @click="openDetail(item.noticeId)" v-for="item in noticeList" :key="item.noticeId">
                     <div style="display:table-cell;padding-right:10px;">
@@ -419,7 +419,7 @@ export default {
                 pageSize: 6,
             };
             listNotice(queryParams).then(response => {
-                this.noticeList = response.rows;
+                this.noticeList = response.rows.splice(0, 6);
             });
         },
         // 打开信息详情
diff --git a/vue/src/views/iot/device/device-user.vue b/vue/src/views/iot/device/device-user.vue
index 2fe10e8f..d93eb740 100644
--- a/vue/src/views/iot/device/device-user.vue
+++ b/vue/src/views/iot/device/device-user.vue
@@ -15,8 +15,8 @@
         <el-table-column label="手机号码" align="center" prop="phonenumber" width="150" />
         <el-table-column label="用户类型" align="center" prop="isOwner" width="150">
             <template slot-scope="scope">
-                <el-tag type="primary" v-if="scope.row.isOwner">设备主人</el-tag>
-                <el-tag type="success" v-else>分享用户</el-tag>
+                <el-tag type="primary" v-if="scope.row.isOwner">主人</el-tag>
+                <el-tag type="success" v-else>分享</el-tag>
             </template>
         </el-table-column>
         <el-table-column label="分享时间" align="center" prop="createTime" width="150">
diff --git a/vue/src/views/iot/product/product-edit.vue b/vue/src/views/iot/product/product-edit.vue
index a12cd930..fe53df61 100644
--- a/vue/src/views/iot/product/product-edit.vue
+++ b/vue/src/views/iot/product/product-edit.vue
@@ -19,7 +19,7 @@
                                 <el-option v-for="dict in dict.type.iot_network_method" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)"></el-option>
                             </el-select>
                         </el-form-item>
-                        <el-form-item label="设备授权" prop="networkMethod">
+                        <el-form-item label="启用授权" prop="networkMethod">
                             <el-switch v-model="form.isAuthorize" @change="changeIsAuthorize(form.isAuthorize)" :active-value="1" :inactive-value="0" :disabled="form.status==2" />
                         </el-form-item>
                         <el-form-item label="备注信息" prop="remark">