diff --git a/vue/src/views/index.vue b/vue/src/views/index.vue
index 08ee4125..5d9d0960 100644
--- a/vue/src/views/index.vue
+++ b/vue/src/views/index.vue
@@ -147,15 +147,33 @@
         <h2><i class="el-icon-s-data"> 服务器状态</i></h2>
         <el-row :gutter="40">
             <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="6">
-                <el-card style="margin:-10px;height:218px;margin-bottom:30px;" shadow="hover">
-                    <el-descriptions :column="1">
-                        <el-descriptions-item label="服务器名称"><strong>{{server.sys.computerName}}</strong></el-descriptions-item>
-                        <el-descriptions-item label="服务器IP"><strong>{{server.sys.computerIp}}</strong></el-descriptions-item>
-                        <el-descriptions-item label="操作系统"><strong>{{server.sys.osName}}</strong></el-descriptions-item>
-                        <el-descriptions-item label="系统架构"><strong>{{server.sys.osArch}}</strong></el-descriptions-item>
-                        <el-descriptions-item label="CPU核心"><strong>{{server.cpu.cpuNum}}核</strong></el-descriptions-item>
-                        <el-descriptions-item label="总内存"><strong>{{server.mem.total}}G</strong></el-descriptions-item>
-                    </el-descriptions>
+                <el-card style="margin:-10px;height:218px;margin-bottom:150px;background-color:#fafafa;" shadow="hover">
+                    <table class="description">
+                        <tr>
+                            <td><strong>服务器名称： </strong></td>
+                            <td>{{server.sys.computerName}}</td>
+                        </tr>
+                        <tr>
+                            <td><strong>服务器IP： </strong></td>
+                            <td>{{server.sys.computerIp}}</td>
+                        </tr>
+                        <tr>
+                            <td><strong>操作系统： </strong></td>
+                            <td>{{server.sys.osName}}</td>
+                        </tr>
+                        <tr>
+                            <td><strong>系统架构： </strong></td>
+                            <td>{{server.sys.osArch}}</td>
+                        </tr>
+                        <tr>
+                            <td><strong>CPU核心： </strong></td>
+                            <td>{{server.cpu.cpuNum}}</td>
+                        </tr>
+                        <tr>
+                            <td><strong>总内存： </strong></td>
+                            <td>{{server.mem.total}}</td>
+                        </tr>
+                    </table>
                 </el-card>
             </el-col>
             <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4">
@@ -174,15 +192,33 @@
                 </el-card>
             </el-col>
             <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="6">
-                <el-card style="margin:-10px;height:218px;margin-bottom:30px;" shadow="hover">
-                    <el-descriptions :column="1">
-                        <el-descriptions-item label="Java名称"><strong>{{server.jvm.name}}</strong></el-descriptions-item>
-                        <el-descriptions-item label="启动时间"><strong>{{ server.jvm.startTime }}</strong></el-descriptions-item>
-                        <el-descriptions-item label="Java版本"><strong>{{ server.jvm.version }}</strong></el-descriptions-item>
-                        <el-descriptions-item label="运行时长"><strong>{{ server.jvm.runTime }}</strong></el-descriptions-item>
-                        <el-descriptions-item label="占用内存"><strong>{{server.jvm.used}}M</strong></el-descriptions-item>
-                        <el-descriptions-item label="JVM总内存"><strong>{{server.jvm.total}}M</strong></el-descriptions-item>
-                    </el-descriptions>
+                <el-card style="margin:-10px;height:218px;margin-bottom:30px;background-color:#fafafa;" shadow="hover">
+                    <table class="description">
+                        <tr>
+                            <td><strong>Java名称： </strong></td>
+                            <td>{{server.jvm.name}}</td>
+                        </tr>
+                        <tr>
+                            <td><strong>启动时间： </strong></td>
+                            <td>{{server.jvm.startTime}}</td>
+                        </tr>
+                        <tr>
+                            <td><strong>Java版本： </strong></td>
+                            <td>{{server.jvm.version}}</td>
+                        </tr>
+                        <tr>
+                            <td><strong>运行时长： </strong></td>
+                            <td>{{server.jvm.runTime}}</td>
+                        </tr>
+                        <tr>
+                            <td><strong>占用内存： </strong></td>
+                            <td>{{server.jvm.used}}</td>
+                        </tr>
+                        <tr>
+                            <td><strong>JVM总内存： </strong></td>
+                            <td>{{server.jvm.total}}</td>
+                        </tr>
+                    </table>
                 </el-card>
             </el-col>
         </el-row>
@@ -397,7 +433,7 @@ export default {
                                 featureType: 'land',
                                 elementType: 'all',
                                 stylers: {
-                                    color: '#f0f0f0' // ##fffeee 黄色
+                                    color: '#fffff8'
                                 }
                             },
                             {
@@ -750,6 +786,14 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.description {
+    font-size: 14px;
+
+    tr {
+        line-height: 26px;
+    }
+}
+
 .panel-group {
     .card-panel-col {
         margin-bottom: 10px;
@@ -761,8 +805,8 @@ export default {
         position: relative;
         overflow: hidden;
         color: #666;
-        border:1px solid #eee;
-        border-radius:5px;
+        border: 1px solid #eee;
+        border-radius: 5px;
         box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.08);
 
         &:hover {
diff --git a/vue/src/views/iot/emqx/client.vue b/vue/src/views/iot/emqx/client.vue
index 2de9e049..b6c5200d 100644
--- a/vue/src/views/iot/emqx/client.vue
+++ b/vue/src/views/iot/emqx/client.vue
@@ -43,7 +43,7 @@
             <el-table-column label="会话创建时间" align="center" prop="created_at" />
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150">
                 <template slot-scope="scope">
-                    <el-button size="small" type="danger" v-if="scope.row.connected" style="padding: 5px" v-hasPermi="['iot:product:remove']" @click="handleDelete(scope.row)">
+                    <el-button size="small" type="danger" v-if="scope.row.connected" style="padding: 5px" v-hasPermi="['iot:emqx:remove']" @click="handleDelete(scope.row)">
                         <svg-icon icon-class="disconnect" /> 断开连接
                     </el-button>
                 </template>
@@ -102,10 +102,10 @@
                     <span slot="label">订阅列表</span>
                     <el-row :gutter="10" class="mb8">
                         <el-col :span="1.5">
-                            <el-button type="primary" plain icon="el-icon-refresh" size="mini" @click="handleRefresh" v-hasPermi="['monitor:subscribe:refresh']">刷新</el-button>
+                            <el-button type="primary" plain icon="el-icon-refresh" size="mini" @click="handleRefresh" v-hasPermi="['iot:emqx:query']">刷新</el-button>
                         </el-col>
                         <el-col :span="1.5">
-                            <el-button type="success" plain icon="el-icon-plus" size="mini" :disabled="single" @click="handleAdd" v-hasPermi="['monitor:subscribe:add']">添加订阅</el-button>
+                            <el-button type="success" plain icon="el-icon-plus" size="mini" :disabled="single" @click="handleAdd" v-hasPermi="['iot:emqx:add']">添加订阅</el-button>
                         </el-col>
                     </el-row>
                     <el-table v-loading="loadSubscribeing" :data="subscribeList">
@@ -113,7 +113,7 @@
                         <el-table-column label="QoS" align="center" prop="qos" />
                         <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150">
                             <template slot-scope="scope">
-                                <el-button size="small" type="danger" style="padding: 5px" v-hasPermi="['monitor:subscribe:delete']" @click="handleUnsubscribe(scope.row)">
+                                <el-button size="small" type="danger" style="padding: 5px" v-hasPermi="['iot:emqx:remove']" @click="handleUnsubscribe(scope.row)">
                                     <svg-icon icon-class="disconnect" /> 取消订阅
                                 </el-button>
                             </template>
diff --git a/vue/src/views/iot/emqx/plugin.vue b/vue/src/views/iot/emqx/plugin.vue
index 2473cdbc..314d0821 100644
--- a/vue/src/views/iot/emqx/plugin.vue
+++ b/vue/src/views/iot/emqx/plugin.vue
@@ -14,11 +14,11 @@
             <el-table-column label="描述" align="left" prop="description" />
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150">
                 <template slot-scope="scope">
-                    <el-button size="small" type="success" style="padding:5px;" @click="loadMqttPlugin(scope.row.name)" v-if="!scope.row.active" v-hasPermi="['iot:product:remove']">
-                    <svg-icon icon-class="start" /> 启动
+                    <el-button size="small" type="success" style="padding:5px;" @click="loadMqttPlugin(scope.row.name)" v-if="!scope.row.active" v-hasPermi="['iot:emqx:edit']">
+                        <svg-icon icon-class="start" /> 启动
                     </el-button>
-                    <el-button size="small" type="danger" style="padding:5px;" @click="unloadMqttPlugin(scope.row.name)" v-else v-hasPermi="['iot:product:remove']">
-                    <svg-icon icon-class="stop" /> 停止
+                    <el-button size="small" type="danger" style="padding:5px;" @click="unloadMqttPlugin(scope.row.name)" v-hasPermi="['iot:emqx:edit']" v-if="scope.row.active && scope.row.name!='emqx_auth_http' && scope.row.name!='emqx_web_hook'  && scope.row.name!='emqx_rule_engine' && scope.row.name!='emqx_management' ">
+                        <svg-icon icon-class="stop" /> 停止
                     </el-button>
                 </template>
             </el-table-column>
diff --git a/vue/src/views/iot/emqx/resource.vue b/vue/src/views/iot/emqx/resource.vue
index 2a37f635..925b59a9 100644
--- a/vue/src/views/iot/emqx/resource.vue
+++ b/vue/src/views/iot/emqx/resource.vue
@@ -3,10 +3,10 @@
     <el-card style="padding-bottom: 100px">
         <el-row :gutter="10" class="mb8">
             <el-col :span="1.5">
-                <el-button type="success" plain icon="el-icon-refresh" size="mini" @click="getList" v-hasPermi="['monitor:resource:refresh']">刷新</el-button>
+                <el-button type="success" plain icon="el-icon-refresh" size="mini" @click="getList" v-hasPermi="['iot:emqx:query']">刷新</el-button>
             </el-col>
             <el-col :span="1.5">
-                <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="addResource" v-hasPermi="['monitor:resource:add']">新增</el-button>
+                <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="addResource" v-hasPermi="['iot:emqx:add']">新增</el-button>
             </el-col>
         </el-row>
         <el-table v-loading="loading" :data="resourceList">
@@ -19,9 +19,9 @@
             <el-table-column label="备注" align="center" prop="description" />
             <el-table-column label="操作" align="center" width="200">
                 <template slot-scope="scope">
-                    <el-button size="small" type="text" icon="el-icon-connection" style="padding: 5px" v-hasPermi="['monitor:resource:checkStatus']" @click="checkStatus(scope.row)">状态
+                    <el-button size="small" type="text" icon="el-icon-connection" style="padding: 5px" v-hasPermi="['iot:emqx:edit']" @click="checkStatus(scope.row)">状态
                     </el-button>
-                    <el-button size="small" type="text" icon="el-icon-delete" style="padding: 5px" v-hasPermi="['iot:product:remove']" @click="handleDelete(scope.row)">删除
+                    <el-button size="small" type="text" icon="el-icon-delete" style="padding: 5px" v-hasPermi="['iot:emqx:remove']" @click="handleDelete(scope.row)">删除
                     </el-button>
                 </template>
             </el-table-column>
@@ -98,7 +98,7 @@
             {{ statusForm.status[0].node }}
             <el-tag type="success" v-if="statusForm.status[0].is_alive == true" style="margin-left: 10px">可用</el-tag>
             <el-tag type="danger" v-if="statusForm.status[0].is_alive == false" style="margin-left: 10px">不可用</el-tag>
-            <el-button size="small" type="primary" icon="el-icon-connection" style="padding: 5px; margin-left: 10px" v-hasPermi="['monitor:resource:connect']" @click="checkNode(statusForm.id)">重新连接
+            <el-button size="small" type="primary" icon="el-icon-connection" style="padding: 5px; margin-left: 10px" v-hasPermi="['iot:emqx:edit']" @click="checkNode(statusForm.id)">重新连接
             </el-button>
         </el-form>
     </el-dialog>
diff --git a/vue/src/views/iot/emqx/rule.vue b/vue/src/views/iot/emqx/rule.vue
index 468c48cf..87584da3 100644
--- a/vue/src/views/iot/emqx/rule.vue
+++ b/vue/src/views/iot/emqx/rule.vue
@@ -3,10 +3,10 @@
     <el-card style="padding-bottom: 100px">
         <el-row :gutter="10" class="mb8">
             <el-col :span="1.5">
-                <el-button type="success" plain icon="el-icon-refresh" size="mini" @click="getList" v-hasPermi="['monitor:rules:refresh']">刷新</el-button>
+                <el-button type="success" plain icon="el-icon-refresh" size="mini" @click="getList" v-hasPermi="['iot:emqx:query']">刷新</el-button>
             </el-col>
             <el-col :span="1.5">
-                <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="getAddRules" v-hasPermi="['monitor:rules:add']">新增</el-button>
+                <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="getAddRules" v-hasPermi="['iot:emqx:add']">新增</el-button>
             </el-col>
         </el-row>
         <el-table v-loading="loading" :data="rulesList">
@@ -37,7 +37,7 @@
             </el-table-column>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
                 <template slot-scope="scope">
-                    <el-button size="small" type="danger" icon="el-icon-delete" style="padding: 5px" v-hasPermi="['iot:product:remove']" @click="handleDelete(scope.row)">删除
+                    <el-button size="small" type="danger" icon="el-icon-delete" style="padding: 5px" v-hasPermi="['iot:emqx:remove']" @click="handleDelete(scope.row)">删除
                     </el-button>
                 </template>
             </el-table-column>