diff --git a/src/views/authority/role.vue b/src/views/authority/role.vue
index 4d5307b..f6e309c 100644
--- a/src/views/authority/role.vue
+++ b/src/views/authority/role.vue
@@ -1,380 +1,407 @@
 <template>
   <basic-container>
-    <avue-crud :option="option"
-               :table-loading="loading"
-               :data="data"
-               ref="crud"
-               v-model="form"
-               :permission="permissionList"
-               :before-open="beforeOpen"
-               @row-del="rowDel"
-               @row-update="rowUpdate"
-               @row-save="rowSave"
-               @search-change="searchChange"
-               @search-reset="searchReset"
-               @selection-change="selectionChange"
-               @current-change="currentChange"
-               @size-change="sizeChange"
-               @refresh-change="refreshChange"
-               @on-load="onLoad">
+    <avue-crud
+      :option="option"
+      :table-loading="loading"
+      :data="data"
+      ref="crud"
+      v-model="form"
+      :permission="permissionList"
+      :before-open="beforeOpen"
+      @row-del="rowDel"
+      @row-update="rowUpdate"
+      @row-save="rowSave"
+      @search-change="searchChange"
+      @search-reset="searchReset"
+      @selection-change="selectionChange"
+      @current-change="currentChange"
+      @size-change="sizeChange"
+      @refresh-change="refreshChange"
+      @on-load="onLoad"
+    >
       <template slot="menuLeft">
-        <el-button type="danger"
-                   size="small"
-                   icon="el-icon-delete"
-                   v-if="permission.role_delete"
-                   plain
-                   @click="handleDelete">删 除
+        <el-button
+          type="danger"
+          size="small"
+          icon="el-icon-delete"
+          v-if="permission.role_delete"
+          plain
+          @click="handleDelete"
+          >删 除
         </el-button>
-        <el-button size="small"
-                   icon="el-icon-setting"
-                   @click="handleRole"
-                   v-if="userInfo.role_name.includes('admin')"
-                   plain>权限设置
+        <!-- v-if="userInfo.role_name.includes('admin')" -->
+        <el-button size="small" icon="el-icon-setting" @click="handleRole" plain
+          >权限设置
         </el-button>
       </template>
     </avue-crud>
-    <el-dialog title="角色权限配置"
-               append-to-body
-               :visible.sync="box"
-               width="345px">
+    <el-dialog
+      title="角色权限配置"
+      append-to-body
+      :visible.sync="box"
+      width="345px"
+    >
       <el-tabs type="border-card">
         <el-tab-pane label="菜单权限">
-          <el-tree :data="menuGrantList"
-                   show-checkbox
-                   node-key="id"
-                   ref="treeMenu"
-                   :default-checked-keys="menuTreeObj"
-                   :props="props">
+          <el-tree
+            :data="menuGrantList"
+            show-checkbox
+            node-key="id"
+            ref="treeMenu"
+            :default-checked-keys="menuTreeObj"
+            :props="props"
+          >
           </el-tree>
         </el-tab-pane>
         <el-tab-pane label="数据权限">
-          <el-tree :data="dataScopeGrantList"
-                   show-checkbox
-                   node-key="id"
-                   ref="treeDataScope"
-                   :default-checked-keys="dataScopeTreeObj"
-                   :props="props">
+          <el-tree
+            :data="dataScopeGrantList"
+            show-checkbox
+            node-key="id"
+            ref="treeDataScope"
+            :default-checked-keys="dataScopeTreeObj"
+            :props="props"
+          >
           </el-tree>
         </el-tab-pane>
         <el-tab-pane label="接口权限">
-          <el-tree :data="apiScopeGrantList"
-                   show-checkbox
-                   node-key="id"
-                   ref="treeApiScope"
-                   :default-checked-keys="apiScopeTreeObj"
-                   :props="props">
+          <el-tree
+            :data="apiScopeGrantList"
+            show-checkbox
+            node-key="id"
+            ref="treeApiScope"
+            :default-checked-keys="apiScopeTreeObj"
+            :props="props"
+          >
           </el-tree>
         </el-tab-pane>
       </el-tabs>
 
-      <span slot="footer"
-            class="dialog-footer">
+      <span slot="footer" class="dialog-footer">
         <el-button @click="box = false">取 消</el-button>
-        <el-button type="primary"
-                   @click="submit">确 定</el-button>
+        <el-button type="primary" @click="submit">确 定</el-button>
       </span>
     </el-dialog>
   </basic-container>
 </template>
 
 <script>
-  import {add, getList, getRole, getRoleTreeById, grant, grantTree, remove, update} from "@/api/system/role";
-  import {mapGetters} from "vuex";
-  import website from '@/config/website';
+import {
+  add,
+  getList,
+  getRole,
+  getRoleTreeById,
+  grant,
+  grantTree,
+  remove,
+  update,
+} from "@/api/system/role";
+import { mapGetters } from "vuex";
+import website from "@/config/website";
 
-  export default {
-    data() {
-      return {
-        form: {},
-        box: false,
-        props: {
-          label: "title",
-          value: "key"
-        },
-        menuGrantList: [],
-        dataScopeGrantList: [],
-        apiScopeGrantList: [],
-        apiGrantList: [],
-        menuTreeObj: [],
-        dataScopeTreeObj: [],
-        apiScopeTreeObj: [],
-        selectionList: [],
-        query: {},
-        loading: true,
-        page: {
-          pageSize: 10,
-          currentPage: 1,
-          total: 0
-        },
-        option: {
-          tip: false,
-          simplePage: true,
-          searchShow: true,
-          searchMenuSpan: 6,
-          tree: true,
-          border: true,
-          index: true,
-          selection: true,
-          viewBtn: true,
-          dialogWidth: 900,
-          dialogClickModal: false,
-          column: [
-            {
-              label: "角色名称",
-              prop: "roleName",
-              search: true,
-              span: 24,
-              rules: [
-                {
-                  required: true,
-                  message: "请输入角色名称",
-                  trigger: "blur"
-                }
-              ]
-            },
-            {
-              label: "所属租户",
-              prop: "tenantId",
-              type: "tree",
-              dicUrl: "/api/iot-system/tenant/select",
-              addDisplay: false,
-              editDisplay: false,
-              viewDisplay: website.tenantMode,
-              span: 24,
-              props: {
-                label: "tenantName",
-                value: "tenantId"
+export default {
+  data() {
+    return {
+      form: {},
+      box: false,
+      props: {
+        label: "title",
+        value: "key",
+      },
+      menuGrantList: [],
+      dataScopeGrantList: [],
+      apiScopeGrantList: [],
+      apiGrantList: [],
+      menuTreeObj: [],
+      dataScopeTreeObj: [],
+      apiScopeTreeObj: [],
+      selectionList: [],
+      query: {},
+      loading: true,
+      page: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0,
+      },
+      option: {
+        tip: false,
+        simplePage: true,
+        searchShow: true,
+        searchMenuSpan: 6,
+        tree: true,
+        border: true,
+        index: true,
+        selection: true,
+        viewBtn: true,
+        dialogWidth: 900,
+        dialogClickModal: false,
+        column: [
+          {
+            label: "角色名称",
+            prop: "roleName",
+            search: true,
+            span: 24,
+            rules: [
+              {
+                required: true,
+                message: "请输入角色名称",
+                trigger: "blur",
               },
-              hide: !website.tenantMode,
-              search: website.tenantMode,
-              rules: [{
+            ],
+          },
+          {
+            label: "所属租户",
+            prop: "tenantId",
+            type: "tree",
+            dicUrl: "/api/iot-system/tenant/select",
+            addDisplay: false,
+            editDisplay: false,
+            viewDisplay: website.tenantMode,
+            span: 24,
+            props: {
+              label: "tenantName",
+              value: "tenantId",
+            },
+            hide: !website.tenantMode,
+            search: website.tenantMode,
+            rules: [
+              {
                 required: true,
                 message: "请输入所属租户",
-                trigger: "click"
-              }]
-            },
-            {
-              label: "角色别名",
-              prop: "roleAlias",
-              search: true,
-              span: 24,
-              rules: [
-                {
-                  required: true,
-                  message: "请输入角色别名",
-                  trigger: "blur"
-                }
-              ]
-            },
-            {
-              label: "上级角色",
-              prop: "parentId",
-              dicData: [],
-              type: "tree",
-              hide: true,
-              span: 24,
-              props: {
-                label: "title"
+                trigger: "click",
+              },
+            ],
+          },
+          {
+            label: "角色别名",
+            prop: "roleAlias",
+            search: true,
+            span: 24,
+            rules: [
+              {
+                required: true,
+                message: "请输入角色别名",
+                trigger: "blur",
               },
-              rules: [
-                {
-                  required: false,
-                  message: "请选择上级角色",
-                  trigger: "click"
-                }
-              ]
+            ],
+          },
+          {
+            label: "上级角色",
+            prop: "parentId",
+            dicData: [],
+            type: "tree",
+            hide: true,
+            span: 24,
+            props: {
+              label: "title",
             },
-            {
-              label: "角色排序",
-              prop: "sort",
-              type: "number",
-              span: 24,
-              rules: [
-                {
-                  required: true,
-                  message: "请输入角色排序",
-                  trigger: "blur"
-                }
-              ]
-            }
-          ]
-        },
-        data: []
+            rules: [
+              {
+                required: false,
+                message: "请选择上级角色",
+                trigger: "click",
+              },
+            ],
+          },
+          {
+            label: "角色排序",
+            prop: "sort",
+            type: "number",
+            span: 24,
+            rules: [
+              {
+                required: true,
+                message: "请输入角色排序",
+                trigger: "blur",
+              },
+            ],
+          },
+        ],
+      },
+      data: [],
+    };
+  },
+  computed: {
+    ...mapGetters(["userInfo", "permission"]),
+    permissionList() {
+      return {
+        addBtn: this.vaildData(this.permission.role_add, false),
+        viewBtn: this.vaildData(this.permission.role_view, false),
+        delBtn: this.vaildData(this.permission.role_delete, false),
+        editBtn: this.vaildData(this.permission.role_edit, false),
       };
     },
-    computed: {
-      ...mapGetters(["userInfo", "permission"]),
-      permissionList() {
-        return {
-          addBtn: this.vaildData(this.permission.role_add, false),
-          viewBtn: this.vaildData(this.permission.role_view, false),
-          delBtn: this.vaildData(this.permission.role_delete, false),
-          editBtn: this.vaildData(this.permission.role_edit, false)
-        };
-      },
-      ids() {
-        let ids = [];
-        this.selectionList.forEach(ele => {
-          ids.push(ele.id);
-
-        });
-        return ids.join(",");
-      },
-      idsArray() {
-        let ids = [];
-        this.selectionList.forEach(ele => {
-          ids.push(ele.id);
-        });
-        return ids;
-      }
+    ids() {
+      let ids = [];
+      this.selectionList.forEach((ele) => {
+        ids.push(ele.id);
+      });
+      return ids.join(",");
     },
-    methods: {
-      initData(roleId){
-        getRoleTreeById(roleId).then(res => {
-          const column = this.findObject(this.option.column, "parentId");
-          column.dicData = res.data.data;
-        });
-      },
-      submit() {
-        const menuList = this.$refs.treeMenu.getCheckedKeys();
-        const dataScopeList = this.$refs.treeDataScope.getCheckedKeys();
-        const apiScopeList = this.$refs.treeApiScope.getCheckedKeys();
-        grant(this.idsArray, menuList, dataScopeList, apiScopeList).then(() => {
-          this.box = false;
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-          this.onLoad(this.page);
+    idsArray() {
+      let ids = [];
+      this.selectionList.forEach((ele) => {
+        ids.push(ele.id);
+      });
+      return ids;
+    },
+  },
+  methods: {
+    initData(roleId) {
+      getRoleTreeById(roleId).then((res) => {
+        const column = this.findObject(this.option.column, "parentId");
+        column.dicData = res.data.data;
+      });
+    },
+    submit() {
+      const menuList = this.$refs.treeMenu.getCheckedKeys();
+      const dataScopeList = this.$refs.treeDataScope.getCheckedKeys();
+      const apiScopeList = this.$refs.treeApiScope.getCheckedKeys();
+      grant(this.idsArray, menuList, dataScopeList, apiScopeList).then(() => {
+        this.box = false;
+        this.$message({
+          type: "success",
+          message: "操作成功!",
         });
-      },
-      rowSave(row, done, loading) {
-        add(row).then(() => {
+        this.onLoad(this.page);
+      });
+    },
+    rowSave(row, done, loading) {
+      add(row).then(
+        () => {
           this.onLoad(this.page);
           this.$message({
             type: "success",
-            message: "操作成功!"
+            message: "操作成功!",
           });
           done();
-        }, error => {
+        },
+        (error) => {
           window.console.log(error);
           loading();
-        });
-      },
-      rowUpdate(row, index, done, loading) {
-        update(row).then(() => {
+        }
+      );
+    },
+    rowUpdate(row, index, done, loading) {
+      update(row).then(
+        () => {
           this.onLoad(this.page);
           this.$message({
             type: "success",
-            message: "操作成功!"
+            message: "操作成功!",
           });
           done();
-        }, error => {
+        },
+        (error) => {
           window.console.log(error);
           loading();
-        });
-      },
-      rowDel(row) {
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
+        }
+      );
+    },
+    rowDel(row) {
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          return remove(row.id);
         })
-          .then(() => {
-            return remove(row.id);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!",
           });
-      },
+        });
+    },
 
-      searchReset() {
-        this.query = {};
-        this.onLoad(this.page);
-      },
-      searchChange(params, done) {
-        this.query = params;
-        this.page.currentPage = 1;
-        this.onLoad(this.page, params);
-        done();
-      },
-      selectionChange(list) {
-        this.selectionList = list;
-      },
-      selectionClear() {
-        this.selectionList = [];
-        this.$refs.crud.toggleSelection();
-      },
-      beforeOpen(done, type) {
-        if (["add", "edit"].includes(type)) {
-          this.initData(this.form.id);
-        }
-        done();
-      },
-      handleRole() {
-        if (this.selectionList.length !== 1) {
-          this.$message.warning("只能选择一条数据");
-          return;
-        }
-        this.menuTreeObj = [];
-        this.dataScopeTreeObj = [];
-        this.apiScopeTreeObj = [];
-        grantTree()
-          .then(res => {
-            this.menuGrantList = res.data.data.menu;
-            this.dataScopeGrantList = res.data.data.dataScope;
-            this.apiScopeGrantList = res.data.data.apiScope;
-            getRole(this.ids).then(res => {
-              this.menuTreeObj = res.data.data.menu;
-              this.dataScopeTreeObj = res.data.data.dataScope;
-              this.apiScopeTreeObj = res.data.data.apiScope;
-              this.box = true;
-            });
-          });
-      },
-      handleDelete() {
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
-          return;
-        }
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
+    searchReset() {
+      this.query = {};
+      this.onLoad(this.page);
+    },
+    searchChange(params, done) {
+      this.query = params;
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    selectionChange(list) {
+      this.selectionList = list;
+    },
+    selectionClear() {
+      this.selectionList = [];
+      this.$refs.crud.toggleSelection();
+    },
+    beforeOpen(done, type) {
+      if (["add", "edit"].includes(type)) {
+        this.initData(this.form.id);
+      }
+      done();
+    },
+    handleRole() {
+      if (this.selectionList.length !== 1) {
+        this.$message.warning("只能选择一条数据");
+        return;
+      }
+      this.menuTreeObj = [];
+      this.dataScopeTreeObj = [];
+      this.apiScopeTreeObj = [];
+      grantTree().then((res) => {
+        this.menuGrantList = res.data.data.menu;
+        this.dataScopeGrantList = res.data.data.dataScope;
+        this.apiScopeGrantList = res.data.data.apiScope;
+        getRole(this.ids).then((res) => {
+          this.menuTreeObj = res.data.data.menu;
+          this.dataScopeTreeObj = res.data.data.dataScope;
+          this.apiScopeTreeObj = res.data.data.apiScope;
+          this.box = true;
+        });
+      });
+    },
+    handleDelete() {
+      if (this.selectionList.length === 0) {
+        this.$message.warning("请选择至少一条数据");
+        return;
+      }
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          return remove(this.ids);
         })
-          .then(() => {
-            return remove(this.ids);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-            this.$refs.crud.toggleSelection();
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!",
           });
-      },
-      currentChange(currentPage) {
-        this.page.currentPage = currentPage;
-      },
-      sizeChange(pageSize) {
-        this.page.pageSize = pageSize;
-      },
-      refreshChange() {
-        this.onLoad(this.page, this.query);
-      },
-      onLoad(page, params = {}) {
-        this.loading = true;
-        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-          this.data = res.data.data;
-          this.loading = false;
-          this.selectionClear();
+          this.$refs.crud.toggleSelection();
         });
-      }
-    }
-  };
+    },
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
+    },
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.query);
+    },
+    onLoad(page, params = {}) {
+      this.loading = true;
+      getList(
+        page.currentPage,
+        page.pageSize,
+        Object.assign(params, this.query)
+      ).then((res) => {
+        this.data = res.data.data;
+        this.loading = false;
+        this.selectionClear();
+      });
+    },
+  },
+};
 </script>
diff --git a/src/views/iot/components/ProductDetail/Server.vue b/src/views/iot/components/ProductDetail/Server.vue
index 592b1c3..46d6a33 100644
--- a/src/views/iot/components/ProductDetail/Server.vue
+++ b/src/views/iot/components/ProductDetail/Server.vue
@@ -1,26 +1,30 @@
 <template>
   <div>
-    <avue-crud
-      :option='option'
-      :data='data'
-      :table-loading='loading'
-      @on-load='onLoad'
+    <avue-
+      :option="option"
+      :data="data"
+      :table-loading="loading"
+      @on-load="onLoad"
     >
       <template #menuLeft>
-        <el-button type='primary' size='small' @click='$router.push("/iot/server/subscribe")'>
+        <el-button
+          type="primary"
+          size="small"
+          @click="$router.push('/iot/server/subscribe')"
+        >
           管理订阅
         </el-button>
       </template>
-    </avue-crud>
+    </avue->
   </div>
 </template>
 
 <script>
-import { getServerSubscribeList } from '@/api/iot/device/product';
-import {isEmptyObject} from '@/util/util';
+import { getServerSubscribeList } from "@/api/iot/device/product";
+import { isEmptyObject } from "@/util/util";
 
 export default {
-  name: 'Server',
+  name: "Server",
   props: {
     detail: {
       type: Object,
@@ -37,26 +41,27 @@ export default {
         border: true,
         columnBtn: false,
         refreshBtn: false,
-        size: 'small',
+        size: "small",
         column: [
           {
-            label: '订阅类型',
-            prop: 'type',
+            label: "订阅类型",
+            prop: "type",
           },
           {
-            label: '订阅消息',
-            dicUrl: '/api/iot-system/dict/dictionary?code=subscribe_message_type',
+            label: "订阅消息",
+            dicUrl:
+              "/api/iot-system/dict/dictionary?code=subscribe_message_type",
             props: {
-              label: 'dictValue',
-              value: 'dictKey'
+              label: "dictValue",
+              value: "dictKey",
             },
-            prop: 'messageType',
-            dataType: 'number',
-            type: 'tree',
+            prop: "messageType",
+            dataType: "number",
+            type: "tree",
           },
           {
-            label: '创建时间',
-            prop: 'createTime',
+            label: "创建时间",
+            prop: "createTime",
           },
         ],
       },
@@ -68,7 +73,9 @@ export default {
       this.loading = true;
       getServerSubscribeList(this.detail.id).then((res) => {
         // type 类型写死
-        this.data = !isEmptyObject(res.data.data) ? [{...res.data.data, type: 'mqtt'}] : [];
+        this.data = !isEmptyObject(res.data.data)
+          ? [{ ...res.data.data, type: "mqtt" }]
+          : [];
         this.loading = false;
       });
     },