diff --git a/jsconfig.json b/jsconfig.json
index 4c6b424..4d178d3 100644
--- a/jsconfig.json
+++ b/jsconfig.json
@@ -4,9 +4,10 @@
     "module": "commonjs",
     "allowSyntheticDefaultImports": true,
     "baseUrl": "./",
-    "paths": {
+    "paths": { 
       "@/*": ["src/*"]
     }
   },
   "exclude": ["node_modules", "*.ignore.*"]
 }
+                                                
\ No newline at end of file
diff --git a/package.json b/package.json
index ba9d63d..4de6213 100644
--- a/package.json
+++ b/package.json
@@ -37,6 +37,9 @@
     "@ckeditor/ckeditor5-vue": "^4.0.1",
     "@element-plus/icons": "^0.0.11",
     "@tinymce/tinymce-vue": "^5.0.0",
+    "@vue-office/docx": "^1.6.3",
+    "@vue-office/excel": "^1.7.14",
+    "@vue-office/pdf": "^2.0.10",
     "axios": "^0.21.1",
     "clipboard": "^2.0.8",
     "core-js": "^3.15.0",
@@ -51,6 +54,7 @@
     "lodash": "^4.17.21",
     "mockjs": "^1.1.0",
     "nprogress": "^0.2.0",
+    "qrcode": "^1.5.4",
     "qs": "^6.10.1",
     "quill-image-drop-module": "^1.0.3",
     "quill-image-resize-module": "^3.0.0",
@@ -63,6 +67,7 @@
     "vue-echarts": "^6.0.0-rc.6",
     "vue-quill-editor": "^3.0.6",
     "vue-router": "^4.0.0-rc.6",
+    "vue3-print-nb": "^0.1.4",
     "vuex": "^4.0.0-rc.2",
     "xlsx": "^0.18.5"
   },
diff --git a/src/api/knowledge.js b/src/api/knowledge.js
index b8ec6b3..714bdc9 100644
--- a/src/api/knowledge.js
+++ b/src/api/knowledge.js
@@ -45,3 +45,92 @@ export function getCategoryDict(data) {
     data,
   });
 }
+
+// 知识库分类树
+export function getTypeCategoryTree(data) {
+  return request({
+    url: '/knowledgeCategory/categoryTree',
+    method: 'get',
+    data,
+  });
+}
+
+// 知识库分类
+export function getTypeList(data) {
+  return request({
+    url: '/knowledgeCategory/list',
+    method: 'get',
+    data,
+  });
+}
+
+// 添加分类
+export function doTypeAdd(data) {
+  return request({
+    url: '/knowledgeCategory/add',
+    method: 'post',
+    data,
+  });
+}
+
+// 编辑分类
+export function doTypeEdit(data) {
+  return request({
+    url: '/knowledgeCategory/update',
+    method: 'post',
+    data,
+  });
+}
+
+// 删除分类
+export function doTypeDel(data) {
+  return request({
+    url: '/knowledgeCategory/delete?categoryId=' + data.categoryId,
+    method: 'post',
+    data,
+  });
+}
+
+// 知识库查询
+export function getKnowledgeList(data) {
+  let param = '?page=' + data.page + '&size=' + data.size;
+  if (data.title != undefined && data.title != '') {
+    param += '&title=' + data.title;
+  }
+  if (data.category != undefined && data.category != '') {
+    param += '&category=' + data.category;
+  }
+  return request({
+    url: '/knowledge/list' + param,
+    method: 'get',
+    data,
+  });
+}
+
+// 附件上传
+export function upload(data) {
+  return request({
+    url: '/file/upload',
+    method: 'post',
+    data,
+  });
+}
+
+// 附件删除
+export function fileDel(data) {
+  return request({
+    url: '/file/del',
+    method: 'post',
+    data,
+  });
+}
+
+// 类型字典查询
+export function getTypeDict(data) {
+  return request({
+    url: '/knowledge/typeDict',
+    method: 'get',
+    data,
+  });
+}
+
diff --git a/src/api/operation.js b/src/api/operation.js
new file mode 100644
index 0000000..9c99ca7
--- /dev/null
+++ b/src/api/operation.js
@@ -0,0 +1,54 @@
+import request from '@/utils/request';
+import { baseURL } from '@/config';
+// 获取故障信息
+export function getData(data) {
+  let param = '?page=' + data.page + '&size=' + data.size;
+  if (data.projectId != '') {
+    param += '&projectId=' + data.projectId;
+  }
+  if (data.deviceId != '') {
+    param += '&deviceId=' + data.deviceId;
+  }
+  if (data.start != '') {
+    param += '&start=' + data.start;
+  }
+  if (data.end != '') {
+    param += '&end=' + data.end;
+  }
+  return request({
+    url: '/faultAnalysis/getFaultInfo' + param,
+    method: 'get',
+    data,
+  });
+}
+
+// 获取层级项目站点
+export function getProjectDeviceTree(data) {
+  return request({
+    url: '/faultAnalysis/getProjectDeviceTree',
+    method: 'get',
+    data,
+  });
+}
+
+// 获取故障详情
+export function getFaultDetails(data) {
+  let param = '?page=' + data.page + '&size=' + data.size;
+  if (data.projectId != '') {
+    param += '&projectId=' + data.projectId;
+  }
+  if (data.deviceId != '') {
+    param += '&deviceId=' + data.deviceId;
+  }
+  if (data.start != '') {
+    param += '&start=' + data.start;
+  }
+  if (data.end != '') {
+    param += '&end=' + data.end;
+  }
+  return request({
+    url: '/faultAnalysis/getFaultDetails' + param,
+    method: 'get',
+    data,
+  });
+}
diff --git a/src/api/platform.js b/src/api/platform.js
new file mode 100644
index 0000000..946ba96
--- /dev/null
+++ b/src/api/platform.js
@@ -0,0 +1,63 @@
+import request from '@/utils/request';
+// 平台三级按钮列表
+export function getList(data) {
+  let param = '?page=' + data.page + '&size=' + data.size;
+  if (data.name !== '' && data.name !== undefined) {
+    param += '&name=' + data.name;
+  }
+  return request({
+    url: '/sysButton/list' + param,
+    method: 'get',
+    data,
+  });
+}
+
+// 平台按钮树桩列表
+export async function buttonTree(data) {
+  return request({
+    url: '/sysButton/buttonTree',
+    method: 'get',
+    data,
+  });
+}
+
+// 添加平台三级按钮
+export async function doAdd(data) {
+  return request({
+    url: '/sysButton/insert',
+    method: 'post',
+    data,
+  });
+}
+// 修改平台三级按钮
+export async function doEdit(data) {
+  return request({
+    url: '/sysButton/update',
+    method: 'post',
+    data,
+  });
+}
+// 分配平台三级按钮
+export async function assignButton(data) {
+  return request({
+    url: '/sysRole/assignButton',
+    method: 'post',
+    data,
+  });
+}
+// 查询角色已有按钮权限id
+export async function getButtonIds(data) {
+  return request({
+    url: '/sysRole/getButtonIds',
+    method: 'get',
+    params: data,
+  });
+}
+// 查询当前用户按钮权限标识
+export async function getButtonPerms(data) {
+  return request({
+    url: '/system/getButtonPerms',
+    method: 'get',
+    params: data,
+  });
+}
diff --git a/src/api/product.js b/src/api/product.js
new file mode 100644
index 0000000..e7b9d67
--- /dev/null
+++ b/src/api/product.js
@@ -0,0 +1,52 @@
+import request from '@/utils/request';
+//查询tuya设备列表
+export function getList(data) {
+  let param = '?page=' + data.page + '&size=' + data.size;
+  if (data.name != '' && data.name != undefined) {
+    param += '&name=' + data.name;
+  }
+  if (data.materialCode != '' && data.materialCode != undefined) {
+    param += '&materialCode=' + data.materialCode;
+  }
+  return request({
+    url: '/productCategory/list' + param,
+    method: 'get',
+    data,
+  });
+}
+//注册设备
+export function addData(data) {
+  return request({
+    url: '/productCategory/add',
+    method: 'post',
+    data,
+  });
+}
+//删除设备
+export function updateData(data) {
+  return request({
+    url: '/productCategory/update',
+    method: 'post',
+    data,
+  });
+}
+export function delectData(ids) {
+  return request({
+    url: '/productCategory/delete/' + ids,
+    method: 'post',
+  });
+}
+//配置产品参数
+export function addAttribute(data) {
+  return request({
+    url: '/productCategory/addAttribute',
+    method: 'post',
+    data,
+  });
+}
+export function getAttribute(id) {
+  return request({
+    url: '/productCategory/getAttribute/' + id,
+    method: 'get',
+  });
+}
diff --git a/src/api/program.js b/src/api/program.js
new file mode 100644
index 0000000..1ff53db
--- /dev/null
+++ b/src/api/program.js
@@ -0,0 +1,55 @@
+import request from '@/utils/request';
+// 小程序三级按钮列表
+export function getList(data) {
+  let param = '?page=' + data.page + '&size=' + data.size;
+  if (data.name !== '' && data.name !== undefined) {
+    param += '&name=' + data.name;
+  }
+  return request({
+    url: '/wechatButton/list' + param,
+    method: 'get',
+    data,
+  });
+}
+
+// 添加小程序三级按钮
+export async function doAdd(data) {
+  return request({
+    url: '/wechatButton/insert',
+    method: 'post',
+    data,
+  });
+}
+// 修改小程序三级按钮
+export async function doEdit(data) {
+  return request({
+    url: '/wechatButton/update',
+    method: 'post',
+    data,
+  });
+}
+// 分配小程序三级按钮
+export async function assignButton(data) {
+  return request({
+    url: '/miniRole/assignButton',
+    method: 'post',
+    data,
+  });
+}
+// 查询角色已有按钮权限id
+export async function getButtonIds(data) {
+  return request({
+    url: '/miniRole/getButtonIds',
+    method: 'get',
+    params: data,
+  });
+}
+
+// 树形列表
+export async function buttonTree(data) {
+  return request({
+    url: '/wechatButton/buttonTree',
+    method: 'get',
+    params: data,
+  });
+}
diff --git a/src/api/sys.js b/src/api/sys.js
index e878864..1a59233 100644
--- a/src/api/sys.js
+++ b/src/api/sys.js
@@ -23,3 +23,67 @@ export async function getData(data) {
     data,
   });
 }
+
+// 基础信息
+export async function baseInfo(data) {
+  let param = '';
+  if (data.month) {
+    param = '?month=' + data.month;
+  }
+  return request({
+    url: '/systemAnalysis/baseInfo' + param,
+    method: 'get',
+    data,
+  });
+}
+// 用户分析
+export async function user(data) {
+  let param = '';
+  if (data.month) {
+    param = '?month=' + data.month;
+  }
+  return request({
+    url: '/systemAnalysis/user' + param,
+    method: 'get',
+    data,
+  });
+}
+
+// 基础信息
+export async function dept(data) {
+  let param = '';
+  if (data.month) {
+    param = '?month=' + data.month;
+  }
+  return request({
+    url: '/systemAnalysis/dept' + param,
+    method: 'get',
+    data,
+  });
+}
+
+// 模块分析
+export async function module(data) {
+  let param = '';
+  if (data.month) {
+    param = '?month=' + data.month;
+  }
+  return request({
+    url: '/systemAnalysis/module' + param,
+    method: 'get',
+    data,
+  });
+}
+
+// 详情分析
+export async function details(data) {
+  let param = '';
+  if (data.month) {
+    param = '?month=' + data.month;
+  }
+  return request({
+    url: '/systemAnalysis/details' + param,
+    method: 'get',
+    data,
+  });
+}
diff --git a/src/api/tuya.js b/src/api/tuya.js
new file mode 100644
index 0000000..4fe12f2
--- /dev/null
+++ b/src/api/tuya.js
@@ -0,0 +1,31 @@
+import request from '@/utils/request';
+//查询tuya设备列表
+export function getList(data) {
+  let param = '?page=' + data.page + '&size=' + data.size;
+  if (data.ldDeviceSerial != '' && data.ldDeviceSerial != undefined) {
+    param += '&ldDeviceSerial=' + data.ldDeviceSerial;
+  }
+  if (data.tuyaDeviceId != '' && data.tuyaDeviceId != undefined) {
+    param += '&tuyaDeviceId=' + data.tuyaDeviceId;
+  }
+  return request({
+    url: '/tuya/devices/list' + param,
+    method: 'get',
+    data,
+  });
+}
+//注册设备
+export function register(data) {
+  return request({
+    url: '/tuya/devices/register',
+    method: 'post',
+    data,
+  });
+}
+//删除设备
+export function deleteDevice(tuyaDeviceId) {
+  return request({
+    url: '/tuya/devices/delete/' + tuyaDeviceId,
+    method: 'post',
+  });
+}
diff --git a/src/api/ywry.js b/src/api/ywry.js
new file mode 100644
index 0000000..3fd9444
--- /dev/null
+++ b/src/api/ywry.js
@@ -0,0 +1,32 @@
+import request from '@/utils/request';
+//查询tuya设备列表
+export function getList(data) {
+  let param =
+    '?startIndex=' + (data.page - 1) * data.size + '&pageSize=' + data.size;
+  // if (data.ldDeviceSerial != '' && data.ldDeviceSerial != undefined) {
+  param += '&OrderString=date';
+  param += '&orderType=desc';
+  // }
+  // if (data.tuyaDeviceId != '' && data.tuyaDeviceId != undefined) {
+  //   param += '&tuyaDeviceId=' + data.tuyaDeviceId;
+  // }
+  return request({
+    url: '/k3Cloud/salStock/list' + param,
+    method: 'get',
+    data,
+  });
+}
+//注册设备
+export function details(fid) {
+  return request({
+    url: '/k3Cloud/salStock/details?fid=' + fid,
+    method: 'get',
+  });
+}
+//删除设备
+export function productAttribute(materialCode) {
+  return request({
+    url: '/k3Cloud/salStock/productAttribute?materialCode=' + materialCode,
+    method: 'get',
+  });
+}
diff --git a/src/assets/mb.jpg b/src/assets/mb.jpg
new file mode 100644
index 0000000..9cf6c38
Binary files /dev/null and b/src/assets/mb.jpg differ
diff --git a/src/assets/mb.png b/src/assets/mb.png
new file mode 100644
index 0000000..00e93b3
Binary files /dev/null and b/src/assets/mb.png differ
diff --git a/src/common/times.js b/src/common/times.js
index 5c192da..80fa302 100644
--- a/src/common/times.js
+++ b/src/common/times.js
@@ -65,12 +65,14 @@ export function getPastTime(month) {
   const d = time.getDate(); //获取当前日(1-31)
   // 获取指定的过去时间
   const past = M - month;
-  const pastM = past < 0 ? past + 12 : past > 10 ? past : '0' + past;
+  const pastM = past <= 0 ? past + 12 : past > 10 ? past : '0' + past;
+  const startyy = past <= 0 ? yy - 1 : yy;
+
   // 小于9的，在前面加0
   const MM = M > 9 ? M : '0' + M;
   const dd = d > 9 ? d : '0' + d;
   // 指定的过去时间
-  const PastTime = yy + '-' + pastM + '-' + dd;
+  const PastTime = startyy + '-' + pastM + '-' + dd;
   // 当前时间
   const nowTime = yy + '-' + MM + '-' + dd;
   return [PastTime, nowTime];
diff --git a/src/config/net.config.js b/src/config/net.config.js
index e30bff6..5878032 100644
--- a/src/config/net.config.js
+++ b/src/config/net.config.js
@@ -5,7 +5,7 @@ module.exports = {
   // 默认的接口地址，开发环境和生产环境走/mock-server
   // 当然你也可以选择自己配置成需要的接口地址，如"https://api.xxx.com"
   // process.env.NODE_ENV === 'development' ? '/mock-server' : '/mock-server',
-  baseURL:'api',
+  baseURL: 'http://101.133.141.167:8081',
   // 配后端数据的接收方式application/json;charset=UTF-8 或 application/x-www-form-urlencoded;charset=UTF-8
   contentType: 'application/json;charset=UTF-8',
   // 最长请求时间
diff --git a/src/main.js b/src/main.js
index e569f38..fec9121 100644
--- a/src/main.js
+++ b/src/main.js
@@ -6,11 +6,15 @@ import { setupStore } from '@/store';
 import { setupRouter } from '@/router';
 import '@/vab/styles/tianditu.scss';
 import locale from 'element-plus/lib/locale/lang/zh-cn';
+import print from 'vue3-print-nb';
 import CKEditor from '@ckeditor/ckeditor5-vue';
-
 const app = createApp(App);
+import mixin from '@/mixin/index';
+
+app.mixin(mixin);
 app.use(ElementPlus, { locale });
 app.use(CKEditor);
+app.use(print);
 /**
  * @description 正式环境默认使用mock，正式项目记得注释后再打包
  */
diff --git a/src/mixin/index.js b/src/mixin/index.js
new file mode 100644
index 0000000..801f4f2
--- /dev/null
+++ b/src/mixin/index.js
@@ -0,0 +1,20 @@
+import store from '@/store';
+// 利用mixin(混入)来封装全局函数
+// 这里封装在methods中的所有函数，都自动会添加到
+// 每个vue文件中methods中
+// 封装判断按钮权限的函数
+export default {
+  methods: {
+    // 判断是否具有按钮权限的函数
+    // 判断需要有2个条件
+    // 1、需要有判断的标识符（到底要判断哪个按钮显示隐藏），这个标识符就是绑定函数时传递过来的值
+    // 2、按钮权限的数据集合，就是保存到vuex中的operation数组
+    isBtnPerm(key) {
+      const button = store.state.user.button;
+      if (button && button.length) {
+        return button.some(item => item === key);
+      }
+      return false;
+    },
+  },
+};
diff --git a/src/router/guard.js b/src/router/guard.js
index 1247a4c..86f0d5d 100644
--- a/src/router/guard.js
+++ b/src/router/guard.js
@@ -45,6 +45,7 @@ export function setupGuard(router) {
             if (loginInterception) await store.dispatch('user/getUserInfo');
             // settings.js loginInterception为false（关闭登录拦截时）时，创建虚拟角色
             else await store.dispatch('user/setVirtualRoles');
+            await store.dispatch('user/getButtonPerms');
             // 根据路由模式获取路由并根据权限过滤
             await store.dispatch('routes/setRoutes', authentication);
             next({ ...to, replace: true });
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 92f8841..ce9c7c4 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -1,5 +1,6 @@
 import { constantRoutes } from '@/router';
 import { getAuthMenu } from '@/api/user';
+import { getButtonPerms } from '@/api/platform';
 
 function filterAsyncRouter(asyncRouterMap) {
   // 遍历后台传来的路由字符串，转换为组件对象
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 37cd5c8..1085348 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -5,6 +5,7 @@ import { resetRouter, setRouterMenus, delRouterMenus } from '@/router';
 // import { isArray } from '@/utils/validate'
 import { title, tokenName } from '@/config';
 import { ElNotification, ElMessage } from 'element-plus';
+import { getButtonPerms } from '@/api/platform';
 
 const state = () => ({
   token: getToken(),
@@ -16,7 +17,7 @@ const getters = {
   username: state => state.username,
   avatar: state => state.avatar,
   roles: state => state.roles,
-  // menu: (state) => state.menu,
+  button: state => state.button,
 };
 const mutations = {
   setToken(state, token) {
@@ -32,6 +33,9 @@ const mutations = {
   SET_ROLES: (state, roles) => {
     state.roles = roles;
   },
+  setButton(state, button) {
+    state.button = button;
+  },
   // menu: (state, menu) => {
   //   state.menu = menu
   // },
@@ -106,6 +110,10 @@ const actions = {
       return Promise.reject();
     }
   },
+  async getButtonPerms({ commit }) {
+    const { data } = await getButtonPerms();
+    commit('setButton', data);
+  },
   async logout({ dispatch }) {
     delRouterMenus();
     await logout(state.token);
diff --git a/src/utils/button.js b/src/utils/button.js
new file mode 100644
index 0000000..d18605a
--- /dev/null
+++ b/src/utils/button.js
@@ -0,0 +1,6 @@
+import { getButtonPerms } from '@/api/platform';
+
+export default async function getButtonPermission(button) {
+  const { data } = await getButtonPerms();
+  return !!data.indexOf(button);
+}
diff --git a/src/vab/components/VabAvatar/index.vue b/src/vab/components/VabAvatar/index.vue
index 42e5454..5bc4359 100644
--- a/src/vab/components/VabAvatar/index.vue
+++ b/src/vab/components/VabAvatar/index.vue
@@ -6,7 +6,13 @@
     type="danger"
     @click="jumpAlarm"
   >
-    <el-link type="primary" :href="url" target="_blank" style="margin: 0 20px">
+    <el-link
+      type="primary"
+      :href="url"
+      :underline="false"
+      target="_blank"
+      style="margin: 0 20px"
+    >
       项目大屏
     </el-link>
     <i class="el-icon-message-solid"></i>
diff --git a/src/vab/components/VabLogo/index.vue b/src/vab/components/VabLogo/index.vue
index 95c1f4a..408ad89 100644
--- a/src/vab/components/VabLogo/index.vue
+++ b/src/vab/components/VabLogo/index.vue
@@ -2,16 +2,18 @@
   <div class="logo-container-vertical">
     <router-link to="/">
       <span class="logo">
-        <img :src="url" />
+        <img :src="data.logo1" />
       </span>
       <span class="title">
-        {{ title }}
+        {{ data.name }}
       </span>
     </router-link>
   </div>
 </template>
 <script>
 import { mapGetters } from 'vuex';
+import { getData } from '@/api/sys';
+import { baseURL } from '@/config/net.config';
 
 export default {
   name: 'VabLogo',
@@ -19,13 +21,29 @@ export default {
     const url = require('@/assets/logo.png');
     return {
       url: url,
+      data: [],
     };
   },
-  computed: {
-    ...mapGetters({
-      logo: 'settings/logo',
-      title: 'settings/title',
-    }),
+  // computed: {
+  //   // ...mapGetters({
+  //   //   logo: 'settings/logo',
+  //   //   title: 'settings/title',
+  //   // }),
+  //   this.getWebData();
+  // },
+  mounted() {
+    this.getWebData();
+  },
+  methods: {
+    async getWebData() {
+      const { data } = await getData();
+      if (data) {
+        if (data.logo) {
+          data.logo1 = baseURL + '/static/img/' + data.logo;
+        }
+        this.data = data;
+      }
+    },
   },
 };
 </script>
diff --git a/src/vab/components/VabNavBar/index.vue b/src/vab/components/VabNavBar/index.vue
index a4c3784..0d0f1a8 100644
--- a/src/vab/components/VabNavBar/index.vue
+++ b/src/vab/components/VabNavBar/index.vue
@@ -19,7 +19,14 @@
               :value="item.id"
             ></el-option>
           </el-select>
-          <el-link type="primary" :href="url" target="_blank">首页大屏</el-link>
+          <el-link
+            type="primary"
+            :href="url"
+            :underline="false"
+            target="_blank"
+          >
+            首页大屏
+          </el-link>
           <!--          <el-dropdown @command="onToggleProject">-->
           <!--            <span class="el-dropdown-link cursor">-->
           <!--              {{ activeProject.name }}-->
@@ -87,7 +94,6 @@ export default {
   watch: {
     $route: {
       handler(route) {
-        console.log(route, ',,,,,,');
         const firstMenu = route.matched[0].path || '/';
         // if (this.firstMenu !== firstMenu) {
         //   this.firstMenu = firstMenu;
diff --git a/src/views/analysis/dfunction/components/elecDay.vue b/src/views/analysis/dfunction/components/elecDay.vue
index 7efb210..e092d4a 100644
--- a/src/views/analysis/dfunction/components/elecDay.vue
+++ b/src/views/analysis/dfunction/components/elecDay.vue
@@ -26,7 +26,12 @@
       <div class="manage-button">
         <el-button size="small" @click="resetForm()">重置</el-button>
         <el-button type="primary" size="small" @click="search">查询</el-button>
-        <el-button type="primary" size="small" @click="exportData">
+        <el-button
+          v-if="isBtnPerm('/waterElec/elecDayExport')"
+          type="primary"
+          size="small"
+          @click="exportData"
+        >
           导出
         </el-button>
       </div>
@@ -50,7 +55,13 @@
       ></el-table-column>
       <el-table-column fixed="right" label="操作" align="center">
         <template #default="{ row }">
-          <el-button type="text" @click="graph(row)">曲线图</el-button>
+          <el-button
+            v-if="isBtnPerm('/waterElec/elecDay')"
+            type="text"
+            @click="graph(row)"
+          >
+            曲线图
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/analysis/dfunction/components/waterDay.vue b/src/views/analysis/dfunction/components/waterDay.vue
index e41c024..21e1886 100644
--- a/src/views/analysis/dfunction/components/waterDay.vue
+++ b/src/views/analysis/dfunction/components/waterDay.vue
@@ -26,7 +26,12 @@
       <div class="manage-button">
         <el-button size="small" @click="resetForm()">重置</el-button>
         <el-button type="primary" size="small" @click="search">查询</el-button>
-        <el-button type="primary" size="small" @click="exportData">
+        <el-button
+          v-if="isBtnPerm('/waterElec/waterDayExport')"
+          type="primary"
+          size="small"
+          @click="exportData"
+        >
           导出
         </el-button>
       </div>
@@ -50,7 +55,13 @@
       ></el-table-column>
       <el-table-column fixed="right" label="操作" align="center">
         <template #default="{ row }">
-          <el-button type="text" @click="graph(row)">曲线图</el-button>
+          <el-button
+            v-if="isBtnPerm('/waterElec/waterDay')"
+            type="text"
+            @click="graph(row)"
+          >
+            曲线图
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/analysis/factoryData/index.vue b/src/views/analysis/factoryData/index.vue
index af2a07d..e3f3d1c 100644
--- a/src/views/analysis/factoryData/index.vue
+++ b/src/views/analysis/factoryData/index.vue
@@ -30,7 +30,13 @@
         </el-checkbox>
       </el-checkbox-group>
     </div>
-    <el-button type="primary" @click="add">新增</el-button>
+    <el-button
+      v-if="isBtnPerm('/haian/add')"
+      type="primary"
+      @click="add"
+    >
+      新增
+    </el-button>
     <el-table
       :data="tableData"
       v-loading="listLoading"
@@ -84,8 +90,20 @@
 
       <el-table-column fixed="right" width="120" label="操作" align="center">
         <template #default="{ row }">
-          <el-button type="text" @click="handleClick(row)">编辑</el-button>
-          <el-button type="text" @click="handleDelete(row)">删除</el-button>
+          <el-button
+            v-if="isBtnPerm('/haian/update')"
+            type="text"
+            @click="handleClick(row)"
+          >
+            编辑
+          </el-button>
+          <el-button
+            v-if="isBtnPerm('/haian/remove')"
+            type="text"
+            @click="handleDelete(row)"
+          >
+            删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -355,11 +373,8 @@ export default {
           this.form[item.deviceId][val.name] = null;
         });
       });
-      console.log(this.form);
     },
     save() {
-      console.log(this.form);
-
       if (
         !(
           this.form.basic.date != null &&
diff --git a/src/views/analysis/mfunction/components/elecMonth.vue b/src/views/analysis/mfunction/components/elecMonth.vue
index ca1a320..691483a 100644
--- a/src/views/analysis/mfunction/components/elecMonth.vue
+++ b/src/views/analysis/mfunction/components/elecMonth.vue
@@ -26,7 +26,12 @@
       <div class="manage-button">
         <el-button size="small" @click="resetForm()">重置</el-button>
         <el-button type="primary" size="small" @click="search">查询</el-button>
-        <el-button type="primary" size="small" @click="exportData">
+        <el-button
+          v-if="isBtnPerm('/waterElec/elecMonthExport')"
+          type="primary"
+          size="small"
+          @click="exportData"
+        >
           导出
         </el-button>
       </div>
@@ -50,7 +55,13 @@
       ></el-table-column>
       <el-table-column fixed="right" label="操作" align="center">
         <template #default="{ row }">
-          <el-button type="text" @click="graph(row)">曲线图</el-button>
+          <el-button
+            v-if="isBtnPerm('/waterElec/elecMonth')"
+            type="text"
+            @click="graph(row)"
+          >
+            曲线图
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/analysis/mfunction/components/siteMonth.vue b/src/views/analysis/mfunction/components/siteMonth.vue
index 90075a4..2b83b67 100644
--- a/src/views/analysis/mfunction/components/siteMonth.vue
+++ b/src/views/analysis/mfunction/components/siteMonth.vue
@@ -19,7 +19,12 @@
       <div class="manage-button">
         <el-button size="small" @click="resetForm()">重置</el-button>
         <el-button type="primary" size="small" @click="search">查询</el-button>
-        <el-button type="primary" size="small" @click="exportData">
+        <el-button
+          v-if="isBtnPerm('/deviceReport/deviceMonth/export')"
+          type="primary"
+          size="small"
+          @click="exportData"
+        >
           导出
         </el-button>
       </div>
diff --git a/src/views/analysis/mfunction/components/waterMonth.vue b/src/views/analysis/mfunction/components/waterMonth.vue
index bab0d56..4842665 100644
--- a/src/views/analysis/mfunction/components/waterMonth.vue
+++ b/src/views/analysis/mfunction/components/waterMonth.vue
@@ -26,7 +26,12 @@
       <div class="manage-button">
         <el-button size="small" @click="resetForm()">重置</el-button>
         <el-button type="primary" size="small" @click="search">查询</el-button>
-        <el-button type="primary" size="small" @click="exportData">
+        <el-button
+          v-if="isBtnPerm('/waterElec/waterMonthExport')"
+          type="primary"
+          size="small"
+          @click="exportData"
+        >
           导出
         </el-button>
       </div>
@@ -50,7 +55,13 @@
       ></el-table-column>
       <el-table-column fixed="right" label="操作" align="center">
         <template #default="{ row }">
-          <el-button type="text" @click="graph(row)">曲线图</el-button>
+          <el-button
+            v-if="isBtnPerm('/waterElec/waterMonth')"
+            type="text"
+            @click="graph(row)"
+          >
+            曲线图
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/analysis/site/components/siteIndex.vue b/src/views/analysis/site/components/siteIndex.vue
index 4f87824..79429e4 100644
--- a/src/views/analysis/site/components/siteIndex.vue
+++ b/src/views/analysis/site/components/siteIndex.vue
@@ -79,7 +79,12 @@
       <div class="manage-button">
         <el-button size="small" @click="resetForm()">重置</el-button>
         <el-button type="primary" size="small" @click="search">查询</el-button>
-        <el-button type="primary" size="small" @click="exportData">
+        <el-button
+          v-if="isBtnPerm('/deviceReport/exportDevice')"
+          type="primary"
+          size="small"
+          @click="exportData"
+        >
           导出
         </el-button>
       </div>
@@ -286,6 +291,43 @@
         width="200"
         align="center"
       ></el-table-column>
+      <el-table-column
+        prop="boardImg"
+        label="公示牌"
+        width="200"
+        align="center"
+      >
+        <template #default="{ row }">
+          <el-image
+            style="width: 100px; height: 100px"
+            :src="fileUrl + row.boardImg"
+          ></el-image>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="warrantyPeriod"
+        label="设备保修到期时间"
+        width="200"
+        align="center"
+      ></el-table-column>
+      <el-table-column
+        prop="deviceVersion.dataValue"
+        label="设备版本"
+        width="200"
+        align="center"
+      ></el-table-column>
+      <el-table-column
+        prop="ownerName"
+        label="站点客户联系人"
+        width="200"
+        align="center"
+      ></el-table-column>
+      <el-table-column
+        prop="ownerPhone"
+        label="站点客户联系方式"
+        width="200"
+        align="center"
+      ></el-table-column>
       <el-table-column
         prop="offlineTime"
         label="离线时间"
@@ -322,6 +364,7 @@ import {
   exportDevice,
 } from '@/api/device';
 import ajax from '@/api/download';
+import { baseURL } from '@/config';
 // import deviceEdit from './deviceEdit';
 // import CopyDevice from './copyDevice';
 export default {
@@ -332,6 +375,7 @@ export default {
   },
   data() {
     return {
+      fileUrl: baseURL + '/static/img/',
       deviceData: [],
       lazy: true,
       activeName: 'first',
diff --git a/src/views/compoents/FileView/index.vue b/src/views/compoents/FileView/index.vue
new file mode 100644
index 0000000..fec5e21
--- /dev/null
+++ b/src/views/compoents/FileView/index.vue
@@ -0,0 +1,50 @@
+<template>
+  <div>
+    <vue-office-pdf
+      :src="pdfSrc"
+      style="width: 100%; height: 600px"
+      @rendered="onRendered"
+      @error="onError"
+    />
+  </div>
+</template>
+
+<script>
+import { ref } from 'vue';
+import VueOfficePdf from '@vue-office/pdf';
+
+export default {
+  components: {
+    VueOfficePdf,
+  },
+  setup() {
+    const pdfUrl = ref('');
+    const pdfSrc = ref(null);
+
+    const updatePdfSrc = () => {
+      // 可以在这里添加一些验证逻辑，确保输入的URL是有效的PDF文件地址
+      pdfSrc.value = pdfUrl.value;
+    };
+
+    const onRendered = () => {
+      console.log('PDF rendered successfully');
+    };
+
+    const onError = error => {
+      console.error('Error rendering PDF:', error);
+    };
+
+    return {
+      pdfUrl,
+      pdfSrc,
+      updatePdfSrc,
+      onRendered,
+      onError,
+    };
+  },
+};
+</script>
+
+<style scoped>
+/* 你可以在这里添加自定义样式 */
+</style>
diff --git a/src/views/department/list/index.vue b/src/views/department/list/index.vue
index c9643b5..8577cce 100644
--- a/src/views/department/list/index.vue
+++ b/src/views/department/list/index.vue
@@ -15,7 +15,12 @@
       </div>
       <div class="manage-button">
         <el-form-item width="100">
-          <el-button type="primary" size="small" @click="handleAdd">
+          <el-button
+            v-if="isBtnPerm('/sysDept/add')"
+            type="primary"
+            size="small"
+            @click="handleAdd"
+          >
             添加部门
           </el-button>
         </el-form-item>
@@ -76,8 +81,18 @@
               align="center"
             >
               <template #default="{ row }">
-                <el-button type="text" @click="handleEdit(row)">编辑</el-button>
-                <el-button type="text" @click="handleDelete(row)">
+                <el-button
+                  v-if="isBtnPerm('/sysDept/update')"
+                  type="text"
+                  @click="handleEdit(row)"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  v-if="isBtnPerm('/sysDept/delete')"
+                  type="text"
+                  @click="handleDelete(row)"
+                >
                   删除
                 </el-button>
               </template>
diff --git a/src/views/dev/alarm/components/current.vue b/src/views/dev/alarm/components/current.vue
index 0ce492b..aa2e74b 100644
--- a/src/views/dev/alarm/components/current.vue
+++ b/src/views/dev/alarm/components/current.vue
@@ -75,9 +75,15 @@
       ></el-table-column>
       <el-table-column fixed="right" label="操作" align="center">
         <template #default="{ row }">
-          <el-button type="text" @click="handleDelete(row)">删除</el-button>
           <el-button
-            v-if="row.status == '未派工'"
+            v-if="isBtnPerm('/alarmRecord/remove')"
+            type="text"
+            @click="handleDelete(row)"
+          >
+            删除
+          </el-button>
+          <el-button
+            v-if="row.status == '未派工' && isBtnPerm('/alarmRecord/toTask')"
             type="text"
             @click="handleTask(row)"
           >
diff --git a/src/views/dev/alarm/components/history.vue b/src/views/dev/alarm/components/history.vue
index 9259276..99fe278 100644
--- a/src/views/dev/alarm/components/history.vue
+++ b/src/views/dev/alarm/components/history.vue
@@ -82,8 +82,20 @@
     <div class="manage-button">
       <el-button size="small" @click="resetForm()">重置</el-button>
       <el-button type="primary" size="small" @click="search">查询</el-button>
-      <el-button type="primary" size="small" @click="save">添加</el-button>
-      <el-button type="primary" size="small" @click="exportData">
+      <el-button
+        v-if="isBtnPerm('/alarmRecord/insert')"
+        type="primary"
+        size="small"
+        @click="save"
+      >
+        添加
+      </el-button>
+      <el-button
+        v-if="isBtnPerm('/alarmRecordReport/export')"
+        type="primary"
+        size="small"
+        @click="exportData"
+      >
         导出
       </el-button>
     </div>
@@ -162,9 +174,15 @@
       ></el-table-column>
       <el-table-column fixed="right" label="操作" align="center">
         <template #default="{ row }">
-          <el-button type="text" @click="handleDelete(row)">删除</el-button>
           <el-button
-            v-if="row.status == '未派工'"
+            v-if="isBtnPerm('/alarmRecord/remove')"
+            type="text"
+            @click="handleDelete(row)"
+          >
+            删除
+          </el-button>
+          <el-button
+            v-if="row.status == '未派工' && isBtnPerm('/alarmRecord/toTask')"
             type="text"
             @click="handleTask(row)"
           >
diff --git a/src/views/dev/apply/components/apply.vue b/src/views/dev/apply/components/apply.vue
index 53f16cb..9d1c0fd 100644
--- a/src/views/dev/apply/components/apply.vue
+++ b/src/views/dev/apply/components/apply.vue
@@ -32,11 +32,28 @@
     <div class="manage-button">
       <el-button size="small" @click="resetForm()">重置</el-button>
       <el-button type="primary" size="small" @click="search">查询</el-button>
-      <el-button type="primary" size="small" @click="handleAdd">添加</el-button>
-      <el-button type="primary" size="small" @click="exportData">
+      <el-button
+        v-if="isBtnPerm('/waterApply/add')"
+        type="primary"
+        size="small"
+        @click="handleAdd"
+      >
+        添加
+      </el-button>
+      <el-button
+        v-if="isBtnPerm('/waterApplyReport/export')"
+        type="primary"
+        size="small"
+        @click="exportData"
+      >
         导出
       </el-button>
-      <el-button type="primary" size="small" @click="deletes">
+      <el-button
+        v-if="isBtnPerm('/waterApply/remove')"
+        type="primary"
+        size="small"
+        @click="deletes"
+      >
         批量删除
       </el-button>
     </div>
@@ -128,10 +145,22 @@
     ></el-table-column>
     <el-table-column prop="details" label="申请详情" align="center">
       <template #default="{ row }">
-        <el-button size="mini" type="primary" plain @click="handleEdit(row)">
+        <el-button
+          v-if="isBtnPerm('/waterApply/update')"
+          size="mini"
+          type="primary"
+          plain
+          @click="handleEdit(row)"
+        >
           编辑
         </el-button>
-        <el-button type="text" @click="handleDelete(row)">删除</el-button>
+        <el-button
+          v-if="isBtnPerm('/waterApply/remove')"
+          type="text"
+          @click="handleDelete(row)"
+        >
+          删除
+        </el-button>
       </template>
     </el-table-column>
   </el-table>
diff --git a/src/views/dev/apply/components/testing.vue b/src/views/dev/apply/components/testing.vue
index 3c85098..b0601c3 100644
--- a/src/views/dev/apply/components/testing.vue
+++ b/src/views/dev/apply/components/testing.vue
@@ -30,23 +30,40 @@
       </vab-query-form>
       <vab-query-form>
         <el-form-item width="100">
-          <el-button size="small" type="primary" plain @click="handleAdd">
+          <el-button
+            v-if="isBtnPerm('/waterDetection/add')"
+            size="small"
+            type="primary"
+            plain
+            @click="handleAdd"
+          >
             新建
           </el-button>
-          <el-button type="small" size="medium" @click="exportData">
+          <el-button
+            v-if="isBtnPerm('/waterDetectionReport/export')"
+            type="small"
+            size="medium"
+            @click="exportData"
+          >
             导出
           </el-button>
-          <el-button type="small" @click="deletes">批量删除</el-button>
-          <el-upload
-            class="upload-demo"
-            :action="action"
-            :headers="headers"
-            :on-preview="handlePreview"
-            :on-remove="handleRemove"
-            list-type="picture"
+          <el-button
+            v-if="isBtnPerm('/waterDetection/remove')"
+            type="small"
+            @click="deletes"
           >
-            <el-button size="small" type="primary">点击上传</el-button>
-          </el-upload>
+            批量删除
+          </el-button>
+          <!--          <el-upload-->
+          <!--            class="upload-demo"-->
+          <!--            :action="action"-->
+          <!--            :headers="headers"-->
+          <!--            :on-preview="handlePreview"-->
+          <!--            :on-remove="handleRemove"-->
+          <!--            list-type="picture"-->
+          <!--          >-->
+          <!--            <el-button size="small" type="primary">点击上传</el-button>-->
+          <!--          </el-upload>-->
         </el-form-item>
       </vab-query-form>
     </el-form>
@@ -211,7 +228,13 @@
     </el-table-column>
     <el-table-column label="操作" align="center" width="100">
       <template #default="{ row }">
-        <el-button type="text" @click="handleDelete(row)">删除</el-button>
+        <el-button
+          v-if="isBtnPerm('/waterDetection/remove')"
+          type="text"
+          @click="handleDelete(row)"
+        >
+          删除
+        </el-button>
       </template>
     </el-table-column>
   </el-table>
diff --git a/src/views/dev/apply/index.vue b/src/views/dev/apply/index.vue
index a2fd1f6..284685b 100644
--- a/src/views/dev/apply/index.vue
+++ b/src/views/dev/apply/index.vue
@@ -32,6 +32,9 @@ export default {
         this.$refs['testing'].testingIndex();
       }
     },
+    showData() {
+      this.$refs['apply'].applyIndex();
+    },
   },
 };
 </script>
diff --git a/src/views/dev/clock/index.vue b/src/views/dev/clock/index.vue
index 02ee841..48e861b 100644
--- a/src/views/dev/clock/index.vue
+++ b/src/views/dev/clock/index.vue
@@ -51,7 +51,12 @@
       <el-form-item width="100">
         <el-button size="small" @click="resetForm()">重置</el-button>
         <el-button type="primary" size="small" @click="search">查询</el-button>
-        <el-button type="primary" size="small" @click="exportData">
+        <el-button
+          v-if="isBtnPerm('/sign/export')"
+          type="primary"
+          size="small"
+          @click="exportData"
+        >
           导出
         </el-button>
       </el-form-item>
@@ -121,9 +126,27 @@
       </el-table-column>
       <el-table-column fixed="right" label="操作" align="center" width="150">
         <template #default="{ row }">
-          <el-button type="text" @click="trajectory(row)">轨迹</el-button>
-          <el-button type="text" @click="handleEdit(row)">编辑</el-button>
-          <el-button type="text" @click="handleDelete(row)">删除</el-button>
+          <el-button
+            v-if="isBtnPerm('/sign/trajectory')"
+            type="text"
+            @click="trajectory(row)"
+          >
+            轨迹
+          </el-button>
+          <el-button
+            v-if="isBtnPerm('/sign/updateLocation')"
+            type="text"
+            @click="handleEdit(row)"
+          >
+            编辑
+          </el-button>
+          <el-button
+            v-if="isBtnPerm('/sign/remove')"
+            type="text"
+            @click="handleDelete(row)"
+          >
+            删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -152,6 +175,9 @@ export default {
   },
   data() {
     return {
+      trajectoryButton: false,
+      updateButton: false,
+      delButton: false,
       tableData: [],
       lazy: true,
       layout: 'total, sizes, prev, pager, next, jumper',
@@ -198,6 +224,9 @@ export default {
     }, 1000);
   },
   methods: {
+    showData() {
+      this.created();
+    },
     changeTime() {
       this.queryForm.start = getDate(this.queryForm.time[0]);
       this.queryForm.end = getDate(this.queryForm.time[1]);
@@ -209,6 +238,7 @@ export default {
     },
     setDefaultTime() {
       this.queryForm.time = getPastTime(1);
+      console.log(12312312, this.queryForm.time);
       this.queryForm.start = getDate(this.queryForm.time[0]);
       this.queryForm.end = getDate(this.queryForm.time[1]);
     },
diff --git a/src/views/dev/filling/index.vue b/src/views/dev/filling/index.vue
index b36d9eb..4701bb5 100644
--- a/src/views/dev/filling/index.vue
+++ b/src/views/dev/filling/index.vue
@@ -31,10 +31,20 @@
     <div class="manage-button">
       <el-button size="small" @click="resetForm()">重置</el-button>
       <el-button type="primary" size="small" @click="search">查询</el-button>
-      <el-button type="primary" size="small" @click="exportData">
+      <el-button
+        v-if="isBtnPerm('/taskReport/export')"
+        type="primary"
+        size="small"
+        @click="exportData"
+      >
         导出
       </el-button>
-      <el-button type="primary" size="small" @click="deletes">
+      <el-button
+        v-if="isBtnPerm('/inspection/remove')"
+        type="primary"
+        size="small"
+        @click="deletes"
+      >
         批量删除
       </el-button>
     </div>
@@ -73,8 +83,20 @@
       ></el-table-column>
       <el-table-column label="操作" align="center">
         <template #default="{ row }">
-          <el-button type="text" @click="showDetail(row)">详情</el-button>
-          <el-button type="text" @click="handleDelete(row)">删除</el-button>
+          <el-button
+            v-if="isBtnPerm('/inspection/list')"
+            type="text"
+            @click="showDetail(row)"
+          >
+            详情
+          </el-button>
+          <el-button
+            v-if="isBtnPerm('/inspection/remove')"
+            type="text"
+            @click="handleDelete(row)"
+          >
+            删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -133,6 +155,9 @@ export default {
     search() {
       this.fetchData();
     },
+    showData() {
+      this.created();
+    },
     async fetchData() {
       this.listLoading = true;
       const { data } = await getList(this.queryForm);
diff --git a/src/views/dev/knowledge/components/knowledge/add.vue b/src/views/dev/knowledge/components/knowledge/add.vue
new file mode 100644
index 0000000..0face49
--- /dev/null
+++ b/src/views/dev/knowledge/components/knowledge/add.vue
@@ -0,0 +1,313 @@
+<template>
+  <el-dialog
+    v-model="dialogFormVisible"
+    :title="title"
+    width="800px"
+    @close="close"
+  >
+    <el-form
+      ref="form"
+      :model="form"
+      :rules="rules"
+      label-width="80px"
+      label-position="left"
+    >
+      <el-form-item label="标题" prop="title">
+        <el-input
+          v-model.trim="form.title"
+          size="small"
+          autocomplete="off"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="分类" prop="category">
+        <el-cascader
+          v-model="form.category"
+          :options="categoryData"
+          :props="props"
+          @change="handleChange"
+        ></el-cascader>
+      </el-form-item>
+      <el-form-item label="类型" prop="type">
+        <el-select
+          v-model="form.type"
+          size="small"
+          filterable
+          placeholder="请选择类型"
+        >
+          <el-option
+            v-for="item in typeData"
+            :key="item.dataCode"
+            :label="item.dataValue"
+            :value="item.dataCode"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item v-if="form.type === '0'" label="简介" prop="introduction">
+        <ckeditor
+          v-model="form.introduction"
+          size="small"
+          :editor="editor"
+          :config="editorConfig"
+        ></ckeditor>
+      </el-form-item>
+      <el-form-item v-if="form.type === '0'" label="详情" prop="detail">
+        <ckeditor
+          v-model="form.detail"
+          size="small"
+          :editor="editor"
+          :config="editorConfig"
+        ></ckeditor>
+      </el-form-item>
+      <el-form-item v-if="form.type === '1'" label="文档附件" prop="file">
+        <el-upload
+          v-loading="loading"
+          class="avatar-uploader"
+          :action="action"
+          :headers="headers"
+          name="file"
+          :show-file-list="false"
+          :on-success="handleAvatarSuccess"
+          :before-upload="beforeAvatarUpload"
+          :on-change="fileChange"
+        >
+          <i class="el-icon-plus avatar-uploader-icon"></i>
+        </el-upload>
+        <el-link
+          v-if="filePath"
+          type="primary"
+          :href="filePath"
+          target="_blank"
+        >
+          查看文档
+        </el-link>
+      </el-form-item>
+      <el-form-item v-if="form.type === '2'" label="视频附件" prop="file">
+        <el-upload
+          v-loading="loading"
+          class="avatar-uploader"
+          :action="action"
+          :headers="headers"
+          name="file"
+          :show-file-list="false"
+          :on-success="handleAvatarSuccess"
+          :before-upload="beforeAvatarUpload"
+          :on-change="fileChange"
+        >
+          <i class="el-icon-plus avatar-uploader-icon"></i>
+        </el-upload>
+        <video
+          v-if="videoPath"
+          width="300"
+          height="200"
+          :src="videoPath"
+          class="avatar"
+        />
+      </el-form-item>
+    </el-form>
+    <div class="dialog-footer">
+      <el-button type="primary" size="small" @click="save">确 定</el-button>
+      <el-button size="small" @click="close">取 消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import {
+  doAdd,
+  doEdit,
+  getTypeCategoryTree,
+  getTypeDict,
+  getTypeList,
+} from '@/api/knowledge';
+import ClassicEditor from '@/common/ckeditor/ckeditor';
+import '@/common/ckeditor/zh';
+import { knowledgeEditorConfig } from '@/common/ckeditor.config.js';
+import { baseURL } from '@/config/net.config';
+import store from '@/store';
+import Video from '@/views/server/siteDetails/video.vue';
+
+export default {
+  components: { Video },
+  data() {
+    return {
+      action: baseURL + '/file/upload',
+      headers: { token: store.getters['user/token'] },
+      filePath: '',
+      videoPath: '',
+      form: {
+        id: '',
+        title: '',
+        introduction: '',
+        detail: '',
+        category: '',
+      },
+      rules: {
+        title: [{ required: true, trigger: 'blur', message: '请输入标题' }],
+        category: [
+          { required: true, trigger: 'change', message: '请选择分类' },
+        ],
+        type: [{ required: true, trigger: 'change', message: '请选择类型' }],
+        introduction: [
+          { required: true, trigger: 'blur', message: '请输入简介' },
+        ],
+        detail: [{ required: true, trigger: 'blur', message: '请输入详情' }],
+      },
+      dictData: [],
+      roleData: [],
+      clearable: true,
+      roleId: '',
+      parentData: [],
+      title: '',
+      dialogFormVisible: false,
+      editor: ClassicEditor,
+      editorConfig: knowledgeEditorConfig,
+      typeData: [],
+      typeList: [],
+      categoryData: [],
+      props: {
+        value: 'id',
+        label: 'label',
+        children: 'children',
+      },
+      loading: false,
+    };
+  },
+  created() {},
+  methods: {
+    showEdit(row) {
+      this.getTypeDict();
+      this.getTypeCategoryTree();
+      this.getTypeList();
+      if (!row) {
+        this.title = '添加知识库';
+      } else {
+        this.title = '编辑知识库';
+        const data = Object.assign({}, row);
+        this.form.type = data.type.dataCode;
+        this.form.category = data.category.categoryId;
+        this.form.id = data.id;
+        this.form.title = data.title;
+        this.form.introduction = data.introduction;
+        this.form.detail = data.detail;
+        this.form.annex = data.annex;
+        if (this.form.type === '1') {
+          this.filePath = baseURL + '/static/img/' + data.annex;
+        }
+        if (this.form.type === '2') {
+          this.videoPath = baseURL + '/static/img/' + data.annex;
+        }
+      }
+      this.dialogFormVisible = true;
+    },
+    // 知识库类型
+    async getTypeDict() {
+      const { data } = await getTypeDict();
+      this.typeData = data;
+    },
+    // 知识库分类
+    async getTypeList() {
+      const { data } = await getTypeList();
+      this.typeList = data;
+    },
+    // 选择知识库分类
+    handleChange(e) {
+      this.form.category = e[e.length - 1];
+    },
+    // 上传文件成功
+    handleAvatarSuccess(res, file) {
+      if (res.code == 0) {
+        this.form.annex = res.data;
+        if (this.form.type === '1') {
+          this.filePath = baseURL + '/static/img/' + res.data;
+        } else {
+          this.videoPath = baseURL + '/static/img/' + res.data;
+        }
+      } else {
+        this.$message.error(res.msg);
+      }
+      console.log(111, res);
+    },
+    // 正在上传文件
+    beforeAvatarUpload(file) {
+      this.loading = true;
+      if (this.form.type === '1') {
+        const isLt10M = file.size / 1024 / 1024 < 200;
+        if (!isLt10M) {
+          this.$message.error('上传附件大小不能超过 200MB!');
+        }
+        return isLt10M;
+      } else {
+        const isLt10M = file.size / 1024 / 1024 < 500;
+        if (!isLt10M) {
+          this.$message.error('上传视频大小不能超过 500MB!');
+        }
+        return isLt10M;
+      }
+    },
+    fileChange() {
+      this.loading = false;
+    },
+    async getTypeCategoryTree() {
+      const { data } = await getTypeCategoryTree();
+      this.categoryData = data;
+    },
+    close() {
+      this.$refs['form'].resetFields();
+      this.form = this.$options.data().form;
+      this.dialogFormVisible = false;
+      this.$emit('fetch-data');
+    },
+    save() {
+      this.$refs['form'].validate(async valid => {
+        if (valid) {
+          if (this.form.id) {
+            const { msg } = await doEdit(this.form);
+            this.$notify({
+              title: msg,
+              type: 'success',
+            });
+          } else {
+            delete this.form.id;
+            const { msg } = await doAdd(this.form);
+            this.$notify({
+              title: msg,
+              type: 'success',
+            });
+          }
+          this.$refs['form'].resetFields();
+          this.$parent.getKnowledgeList();
+          this.dialogFormVisible = false;
+        } else {
+          return false;
+        }
+      });
+    },
+  },
+};
+</script>
+
+<style>
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+.avatar-uploader .el-upload:hover {
+  border-color: #409EFF;
+}
+.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  line-height: 178px;
+  text-align: center;
+}
+.avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>
diff --git a/src/views/dev/knowledge/components/knowledge/showFile.vue b/src/views/dev/knowledge/components/knowledge/showFile.vue
new file mode 100644
index 0000000..e56ba1f
--- /dev/null
+++ b/src/views/dev/knowledge/components/knowledge/showFile.vue
@@ -0,0 +1,23 @@
+<template>
+  <vue-office-docx :src="docx" @rendered="rendered" />
+</template>
+<script>
+//引入VueOfficeDocx组件;
+import VueOfficeDocx from '@vue-office/docx';
+
+export default {
+  components: {
+    VueOfficeDocx,
+  },
+  data() {
+    return {
+      docx: 'http://static.shanhuxueyuan.com/test6.docx', //设置文档地址
+    };
+  },
+  methods: {
+    rendered() {
+      console.log('渲染完成');
+    },
+  },
+};
+</script>
diff --git a/src/views/dev/knowledge/index.vue b/src/views/dev/knowledge/index.vue
index 85e880a..3687188 100644
--- a/src/views/dev/knowledge/index.vue
+++ b/src/views/dev/knowledge/index.vue
@@ -1,185 +1,243 @@
 <template>
   <div class="manage-container">
-    <div class="manage-input">
-      <el-form ref="queryForm" :model="queryForm" label-width="80px">
-        <vab-query-form>
-          <el-form-item width="100" prop="title" label="项目标题">
-            <el-input
-              v-model="queryForm.title"
-              size="small"
-              placeholder="请输入标题"
-            ></el-input>
-          </el-form-item>
-          <el-form-item width="100" prop="date" label="日期">
-            <el-date-picker
-              v-model="queryForm.date"
-              size="small"
-              type="date"
-              placeholder="选择日期"
-            ></el-date-picker>
-          </el-form-item>
-          <el-form-item width="100" prop="category" label="分类">
-            <el-select
-              v-model="queryForm.category"
-              size="small"
-              filterable
-              placeholder="请选择分类"
+    <div class="manage-wrap">
+      <div class="manage-button">
+        <el-form-item width="100">
+          <el-input
+            v-model="queryForm.title"
+            placeholder="请输入标题"
+          ></el-input>
+          <el-button type="primary" @click="search">查询</el-button>
+          <el-button
+            v-if="isBtnPerm('/knowledge/insert')"
+            type="primary"
+            size="small"
+            @click="handleKnowledgeAdd"
+          >
+            添加知识库
+          </el-button>
+          <el-button
+            v-if="isBtnPerm('/knowledge/remove')"
+            type="primary"
+            size="small"
+            @click="handleKnowledgeDels"
+          >
+            批量删除知识库
+          </el-button>
+        </el-form-item>
+      </div>
+    </div>
+    <el-row :gutter="20">
+      <el-col :span="4">
+        <div class="grid-content bg-purple">
+          <h1 style="margin-top: 0">知识库分类</h1>
+          <el-button type="text" @click="clockCheck">取消选择</el-button>
+          <el-tree
+            :data="typeData"
+            :props="defaultProps"
+            :default-expand-all="true"
+            :expand-on-click-node="false"
+            show-checkbox
+            check-strictly
+            accordion
+            node-key="id"
+            @check="handleCheckChange"
+            ref="tree"
+          ></el-tree>
+        </div>
+      </el-col>
+      <el-col :span="20">
+        <div class="grid-content bg-purple">
+          <el-table
+            :data="knowledgeData"
+            style="width: 100%; margin-bottom: 20px"
+            border
+            @selection-change="handleSelectionChange"
+          >
+            <el-table-column type="selection" width="40"></el-table-column>
+            <el-table-column
+              prop="title"
+              label="标题"
+              width="300"
+              align="center"
+            ></el-table-column>
+            <el-table-column prop="introduction" label="简介" align="center">
+              <template #default="{ row }">
+                <span v-html="row.introduction"></span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="category"
+              label="分类"
+              align="center"
+              width="100"
             >
-              <el-option
-                v-for="item in dictData"
-                :key="item.dataCode"
-                :label="item.dataValue"
-                :value="item.dataCode"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-        </vab-query-form>
-      </el-form>
-    </div>
-    <div class="manage-button">
-      <el-button size="small" @click="resetForm()">重置</el-button>
-      <el-button type="primary" size="small" @click="search">查询</el-button>
-      <el-button type="primary" size="small" @click="handleAdd()">
-        添加知识库
-      </el-button>
-      <el-button type="primary" size="small" @click="deletes">
-        批量删除
-      </el-button>
-    </div>
-    <el-table
-      :data="tableData"
-      stripe
-      border
-      style="width: 100%"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column
-        fixed
-        type="selection"
-        width="60"
-        align="center"
-      ></el-table-column>
-      <el-table-column
-        prop="id"
-        label="Id"
-        width="50"
-        align="center"
-      ></el-table-column>
-      <el-table-column
-        prop="addUser"
-        label="添加人"
-        width="250"
-        align="center"
-      ></el-table-column>
-      <el-table-column
-        prop="title"
-        label="标题"
-        width="250"
-        align="center"
-      ></el-table-column>
-      <el-table-column
-        prop="introduction"
-        label="简介"
-        width="150"
-        align="center"
-      >
-        <template #default="{ row }">
-          <p v-html="row.introduction"></p>
-        </template>
-      </el-table-column>
-      <el-table-column
-        prop="createTime"
-        label="创建时间"
-        width="150"
-        align="center"
-      ></el-table-column>
-      <el-table-column label="操作" align="center">
-        <template #default="{ row }">
-          <el-button type="text" @click="handleshow(row)">查看</el-button>
-          <el-button type="text" @click="handleEdit(row)">编辑</el-button>
-          <el-button type="text" @click="handleDelete(row)">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <el-pagination
-      :background="background"
-      :current-page="queryForm.page"
-      :layout="layout"
-      :page-size="queryForm.size"
-      :total="total"
-      style="text-align: right"
-      @current-change="handleCurrentChange"
-      @size-change="handleSizeChange"
-    ></el-pagination>
-    <knowledge-edit ref="edit"></knowledge-edit>
-    <detail ref="detail"></detail>
+              <template #default="{ row }">
+                <span>{{ row.category.categoryName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="type"
+              label="类型"
+              align="center"
+              width="100"
+            >
+              <template #default="{ row }">
+                <span>{{ row.type.dataValue }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              fixed="right"
+              label="操作"
+              width="280"
+              align="center"
+            >
+              <template #default="{ row }">
+                <el-button
+                  v-if="row.type.dataCode === '1'"
+                  type="text"
+                  @click="showWord(row)"
+                >
+                  查看
+                </el-button>
+                <el-button
+                  v-if="row.type.dataCode !== '0'"
+                  type="text"
+                  @click="download(row)"
+                >
+                  下载
+                </el-button>
+                <el-button
+                  v-if="isBtnPerm('/knowledge/update')"
+                  type="text"
+                  @click="handleKnowledgeEdit(row)"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  v-if="isBtnPerm('/knowledge/remove')"
+                  type="text"
+                  @click="handleKnowledgeDel(row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+          <el-pagination
+            :background="background"
+            :current-page="queryForm.page"
+            :layout="layout"
+            :page-size="queryForm.size"
+            :total="total"
+            style="text-align: right"
+            @current-change="handleCurrentChange"
+            @size-change="handleSizeChange"
+          ></el-pagination>
+        </div>
+      </el-col>
+    </el-row>
+    <add-knowledge ref="knowledge"></add-knowledge>
+    <show-file ref="file"></show-file>
   </div>
 </template>
 
 <script>
-import knowledgeEdit from './components/knowledgeEdit';
-import detail from './components/detail';
-import { getList, doDelete, getCategoryDict } from '@/api/knowledge';
+import {
+  doDelete,
+  doTypeDel,
+  getKnowledgeList,
+  getTypeCategoryTree,
+} from '@/api/knowledge';
+import addKnowledge from './components/knowledge/add';
+import { baseURL } from '@/config/net.config';
+import showFile from '@/views/dev/knowledge/components/knowledge/showFile.vue';
 export default {
   components: {
-    knowledgeEdit,
-    detail,
+    addKnowledge,
+    showFile,
   },
   data() {
     return {
-      tableData: [],
-      dialogTableVisible: false,
-      dialogFormVisible: false,
-      lazy: true,
+      typeData: [],
+      deptData: [],
+      defaultProps: {
+        children: 'children',
+        label: 'label',
+      },
+      currentNodeKey: '',
+      knowledgeData: [],
+      queryForm: {
+        category: '',
+        title: '',
+        page: 1,
+        size: 20,
+      },
+      background: true,
       layout: 'total, sizes, prev, pager, next, jumper',
       total: 0,
       ids: [],
-      dictData: [],
-      background: true,
-      listLoading: false,
-      elementLoadingText: '正在加载...',
-      queryForm: {
-        page: 1,
-        size: 20,
-        title: '',
-        date: '',
-        category: '',
-      },
     };
   },
   created() {
-    this.fetchData();
-    this.getCategoryDict();
+    this.getKnowledgeList();
+    this.getTypeCategoryTree();
   },
   methods: {
-    //搜索
+    showWord(row) {
+      var filePath = baseURL + '/static/img/' + row.annex;
+      var parts = filePath.split('.');
+      var extension = parts.pop().toLowerCase();
+      console.log(extension);
+      this.$refs.file.showFileView({
+        src: filePath,
+        type: extension,
+      });
+    },
+    download(row) {
+      window.open(baseURL + '/static/img/' + row.annex);
+    },
+    // 分类树
+    async getTypeCategoryTree() {
+      const { data } = await getTypeCategoryTree();
+      this.typeData = data;
+    },
+    // 单选
+    handleCheckChange(data, node, self) {
+      // 如果已经选中了一个节点，则取消选择
+      if (this.currentNodeKey?.label && this.$refs.tree) {
+        this.$refs.tree.setCheckedKeys([]);
+        // 更新当前选中节点的 key
+        this.$refs.tree.setCheckedNodes([data]);
+      }
+      // 更新当前选中节点的 key
+      this.currentNodeKey = data;
+      this.queryForm.category = data.id;
+      this.getKnowledgeList();
+    },
     search() {
-      this.fetchData();
+      this.getKnowledgeList();
     },
-    async getCategoryDict() {
-      const { data } = await getCategoryDict();
-      this.dictData = data;
+    // 取消选择
+    clockCheck() {
+      this.queryForm.category = '';
+      this.currentNodeKey = '';
+      this.$refs.tree.setCheckedKeys([]);
+      this.getKnowledgeList();
     },
-    async fetchData() {
-      this.listLoading = true;
-      const { data } = await getList(this.queryForm);
-      this.tableData = data.items;
+    // 知识库列表查询
+    async getKnowledgeList() {
+      const { data } = await getKnowledgeList(this.queryForm);
+      this.knowledgeData = data.items;
       this.total = data.total;
-      setTimeout(() => {
-        this.listLoading = false;
-      }, 500);
     },
-    resetForm() {
-      this.$refs.queryForm.resetFields();
+    // 添加知识库
+    handleKnowledgeAdd() {
+      this.$refs.knowledge.showEdit();
     },
-    handleAdd() {
-      this.$refs['edit'].showEdit();
-    },
-    handleEdit(row) {
-      this.$refs['edit'].showEdit(row);
-    },
-    handleshow(row) {
-      this.$refs['detail'].showData(row);
+    // 编辑知识库
+    handleKnowledgeEdit(row) {
+      this.$refs.knowledge.showEdit(row);
     },
     handleSelectionChange(val) {
       const ids = [];
@@ -188,33 +246,36 @@ export default {
       });
       this.ids = ids;
     },
-    deletes() {
-      const ids = this.ids;
-      if (ids.length == 0) {
+    // 批量删除知识库
+    handleKnowledgeDels() {
+      if (this.ids == '') {
         this.$message({
           type: 'info',
-          message: '没有选中任何项',
+          message: '请选择要删除的数据',
         });
-        return false;
+      } else {
+        this.knowledgeRemove(this.ids);
       }
-      this.deleteData(ids);
     },
-    //删除
-    deleteData(dis) {
-      const that = this;
+    // 删除知识库
+    handleKnowledgeDel(row) {
+      this.knowledgeRemove([row.id]);
+    },
+    knowledgeRemove(ids) {
       this.$confirm('你确定要删除当前项吗?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning',
       })
         .then(() => {
-          const { msg } = doDelete(dis);
+          const { msg } = doDelete(ids);
           this.$message({
             type: 'success',
             message: msg == undefined ? '删除成功' : msg,
           });
+          const that = this;
           setTimeout(function () {
-            that.fetchData();
+            that.getKnowledgeList();
           }, 1000);
         })
         .catch(() => {
@@ -224,76 +285,35 @@ export default {
           });
         });
     },
-    handleDelete(row) {
-      const that = this;
-      that.deletes([row.id]);
-    },
     handleQuery() {
       this.queryForm.page = 1;
-      this.fetchData();
+      this.getKnowledgeList();
     },
     handleSizeChange(val) {
       this.queryForm.size = val;
-      this.fetchData();
+      this.getKnowledgeList();
     },
     handleCurrentChange(val) {
       this.queryForm.page = val;
-      this.fetchData();
+      this.getKnowledgeList();
     },
   },
 };
 </script>
 
 <style lang="scss" scoped>
-.el-input {
-  width: 200px !important;
-}
-.el-select {
-  width: 200px !important;
-}
-.manage-button {
-  padding-left: 12px;
-  margin-bottom: 30px;
-}
-</style>
-
-<style lang="scss" scoped>
-.el-submenu__title:hover {
-  background-color: rgba(#1890ff, 0.085) !important;
-  color: hsla(208, 100%, 55%, 0.95) !important;
-}
-.el-dialog {
-  .el-dialog__header {
-    background-color: #1890ff !important;
-    padding: 15px 20px;
-    text-align: left !important;
-    .el-dialog__title {
-      color: #e8f4ff !important;
-    }
-    .el-dialog__headerbtn .el-dialog__close {
-      color: #e8f4ff !important;
-    }
+.manage-wrap {
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-start;
+  .el-input {
+    width: 200px !important;
   }
-  .el-dialog__body {
-    padding: 20px !important;
-    .el-form-item {
-      margin-bottom: 10px !important;
-      .el-input {
-        width: 100% !important;
-      }
-      .el-select {
-        width: 100% !important;
-      }
-      .el-cascader {
-        width: 100% !important;
-      }
-    }
-    .el-form-item:last-child {
-      margin-bottom: 20px !important;
-    }
+  .el-select {
+    width: 200px !important;
   }
-  .dialog-footer {
-    text-align: right;
+  .manage-button {
+    padding-left: 12px;
   }
 }
 </style>
diff --git a/src/views/dev/knowledge/type/components/add.vue b/src/views/dev/knowledge/type/components/add.vue
new file mode 100644
index 0000000..aaa45fc
--- /dev/null
+++ b/src/views/dev/knowledge/type/components/add.vue
@@ -0,0 +1,118 @@
+<template>
+  <el-dialog
+    v-model="dialogFormVisible"
+    :title="title"
+    width="500px"
+    @close="close"
+  >
+    <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form-item label="分类名称" prop="categoryName">
+        <el-input
+          v-model.trim="form.categoryName"
+          autocomplete="off"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="上级分类" prop="parentId">
+        <el-select v-model="form.parentId" placeholder="请选择上级分类">
+          <el-option
+            v-for="item in categoryData"
+            :key="item.categoryId"
+            :label="item.categoryName"
+            :value="item.categoryId"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="排序" prop="orderNum">
+        <el-input v-model.trim="form.orderNum" autocomplete="off"></el-input>
+      </el-form-item>
+    </el-form>
+    <div class="dialog-footer">
+      <el-button type="primary" size="small" @click="save">确 定</el-button>
+      <el-button size="small" @click="close">取 消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDeptList, doDeptAdd, doDeptEdit } from '@/api/dept';
+import { doTypeAdd, doTypeEdit, getTypeList } from '@/api/knowledge';
+
+export default {
+  data() {
+    return {
+      form: {
+        categoryId: '',
+        parentId: '',
+        categoryName: '',
+        orderNum: '',
+      },
+      rules: {
+        categoryName: [
+          { required: true, trigger: 'blur', message: '请输入分类名称' },
+        ],
+      },
+      clearable: true,
+      categoryData: [],
+      title: '',
+      dialogFormVisible: false,
+    };
+  },
+  created() {},
+  methods: {
+    async getTypeList() {
+      const { data } = await getTypeList();
+      data.push({ categoryId: 0, categoryName: '顶级分类' });
+      this.categoryData = data;
+    },
+    categoryEdit(row) {
+      this.getTypeList();
+      if (!row) {
+        this.title = '添加分类';
+      } else {
+        this.title = '编辑分类';
+        this.form.categoryId = row.id;
+        this.form.parentId = row.parentId;
+        this.form.categoryName = row.label;
+        this.form.orderNum = row.weight;
+      }
+      this.dialogFormVisible = true;
+    },
+    close() {
+      this.$refs['form'].resetFields();
+      this.form = this.$options.data().form;
+      this.dialogFormVisible = false;
+      this.$emit('fetch-data');
+    },
+    save() {
+      this.$refs['form'].validate(async valid => {
+        if (valid) {
+          if (this.form.categoryId) {
+            const { msg } = await doTypeEdit(this.form);
+            this.$notify({
+              title: msg,
+              type: 'success',
+            });
+          } else {
+            delete this.form.categoryId;
+            const { msg } = await doTypeAdd(this.form);
+            this.$notify({
+              title: msg,
+              type: 'success',
+            });
+          }
+          this.$refs['form'].resetFields();
+          this.dialogFormVisible = false;
+          this.$parent.fetchData();
+        } else {
+          return false;
+        }
+      });
+    },
+  },
+};
+</script>
+<style>
+.select {
+  width: 100%;
+}
+</style>
diff --git a/src/views/dev/knowledge/type/index.vue b/src/views/dev/knowledge/type/index.vue
new file mode 100644
index 0000000..c5c4775
--- /dev/null
+++ b/src/views/dev/knowledge/type/index.vue
@@ -0,0 +1,154 @@
+<template>
+  <div class="manage-container">
+    <vab-query-form>
+      <el-button
+        v-if="isBtnPerm('/knowledgeCategory/add')"
+        type="primary"
+        @click="handleAdd"
+      >
+        添加分类
+      </el-button>
+    </vab-query-form>
+    <el-table
+      v-loading="listLoading"
+      :data="typeData"
+      style="width: 100%; margin-bottom: 20px"
+      row-key="id"
+      border
+      default-expand-all
+      :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+    >
+      <el-table-column
+        prop="id"
+        label="ID"
+        sortable
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="label"
+        label="分类名称"
+        sortable
+        width="180"
+      ></el-table-column>
+      <el-table-column fixed="right" label="操作" align="center">
+        <template #default="{ row }">
+          <el-button
+            v-if="isBtnPerm('/knowledgeCategory/update')"
+            type="text"
+            @click="handleEdit(row)"
+          >
+            编辑
+          </el-button>
+          <el-button
+            v-if="isBtnPerm('/knowledgeCategory/delete')"
+            type="text"
+            @click="handleDelete(row)"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <add-type ref="type"></add-type>
+  </div>
+</template>
+<script>
+import addType from './components/add';
+import { doTypeDel, getTypeCategoryTree } from '@/api/knowledge';
+export default {
+  components: {
+    addType,
+  },
+  data() {
+    return {
+      typeData: [],
+      lazy: true,
+      listLoading: true,
+      elementLoadingText: '正在加载...',
+    };
+  },
+  computed: {
+    height() {
+      return 500;
+    },
+  },
+  created() {
+    this.fetchData();
+  },
+  methods: {
+    async fetchData() {
+      this.listLoading = true;
+      const { data } = await getTypeCategoryTree();
+      this.typeData = data;
+      this.listLoading = false;
+    },
+    handleAdd() {
+      this.$refs.type.categoryEdit();
+    },
+    handleEdit(row) {
+      this.$refs.type.categoryEdit(row);
+    },
+    handleDelete(row) {
+      const that = this;
+      if (row.id) {
+        this.$confirm('你确定要删除当前项吗?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+        })
+          .then(() => {
+            const { msg } = doTypeDel({ categoryId: row.id });
+            this.$message({
+              type: 'success',
+              message: msg == undefined ? '删除成功' : msg,
+            });
+            setTimeout(function () {
+              that.fetchData();
+            }, 1000);
+          })
+          .catch(() => {
+            this.$message({
+              type: 'info',
+              message: '已取消删除',
+            });
+          });
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+.el-submenu__title:hover {
+  background-color: rgba(#1890ff, 0.085) !important;
+  color: hsla(208, 100%, 55%, 0.95) !important;
+}
+.el-dialog {
+  .el-dialog__header {
+    background-color: #1890ff !important;
+    padding: 15px 20px;
+    text-align: left !important;
+    .el-dialog__title {
+      color: #e8f4ff !important;
+    }
+    .el-dialog__headerbtn .el-dialog__close {
+      color: #e8f4ff !important;
+    }
+  }
+  .el-dialog__body {
+    padding: 20px !important;
+    .el-form-item {
+      margin-bottom: 10px !important;
+      .el-input {
+        width: 100% !important;
+      }
+      .el-select {
+        width: 100% !important;
+      }
+    }
+    .el-form-item:last-child {
+      margin-bottom: 20px !important;
+    }
+  }
+}
+</style>
diff --git a/src/views/dev/maintenance/components/equipment.vue b/src/views/dev/maintenance/components/equipment.vue
index 6069108..689ed68 100644
--- a/src/views/dev/maintenance/components/equipment.vue
+++ b/src/views/dev/maintenance/components/equipment.vue
@@ -23,8 +23,20 @@
     <div class="manage-button">
       <el-button size="small" @click="resetForm()">重置</el-button>
       <el-button type="primary" size="small" @click="search">查询</el-button>
-      <el-button type="primary" size="small" @click="handleAdd">添加</el-button>
-      <el-button type="primary" size="small" @click="exportData">
+      <el-button
+        v-if="isBtnPerm('/equipment/add')"
+        type="primary"
+        size="small"
+        @click="handleAdd"
+      >
+        添加
+      </el-button>
+      <el-button
+        v-if="isBtnPerm('/equipment/export')"
+        type="primary"
+        size="small"
+        @click="exportData"
+      >
         导出
       </el-button>
     </div>
@@ -99,8 +111,20 @@
     ></el-table-column>
     <el-table-column fixed="right" label="操作" align="center" width="150">
       <template #default="{ row }">
-        <el-button type="text" @click="handleDelete(row)">删除</el-button>
-        <el-button type="text" @click="handleEdit(row)">编辑</el-button>
+        <el-button
+          v-if="isBtnPerm('/alarmRecord/remove')"
+          type="text"
+          @click="handleDelete(row)"
+        >
+          删除
+        </el-button>
+        <el-button
+          v-if="isBtnPerm('/equipment/update')"
+          type="text"
+          @click="handleEdit(row)"
+        >
+          编辑
+        </el-button>
       </template>
     </el-table-column>
   </el-table>
diff --git a/src/views/dev/maintenance/components/online.vue b/src/views/dev/maintenance/components/online.vue
index edeea83..5b93033 100644
--- a/src/views/dev/maintenance/components/online.vue
+++ b/src/views/dev/maintenance/components/online.vue
@@ -71,10 +71,20 @@
     <div class="manage-button">
       <el-button size="small" @click="resetForm()">重置</el-button>
       <el-button type="primary" size="small" @click="search">查询</el-button>
-      <el-button type="primary" size="small" @click="handleAdd()">
+      <el-button
+        v-if="isBtnPerm('/repair/add')"
+        type="primary"
+        size="small"
+        @click="handleAdd()"
+      >
         添加
       </el-button>
-      <el-button type="primary" size="small" @click="exportData">
+      <el-button
+        v-if="isBtnPerm('/repair/export')"
+        type="primary"
+        size="small"
+        @click="exportData"
+      >
         导出
       </el-button>
     </div>
@@ -163,9 +173,27 @@
       </el-table-column>
       <el-table-column fixed="right" label="操作" align="center">
         <template #default="{ row }">
-          <el-button type="text" @click="handleTask(row)">转任务</el-button>
-          <el-button type="text" @click="handleEdit(row)">编辑</el-button>
-          <el-button type="text" @click="handleDelete(row)">删除</el-button>
+          <el-button
+            v-if="isBtnPerm('/repair/toTask')"
+            type="text"
+            @click="handleTask(row)"
+          >
+            转任务
+          </el-button>
+          <el-button
+            v-if="isBtnPerm('/repair/update')"
+            type="text"
+            @click="handleEdit(row)"
+          >
+            编辑
+          </el-button>
+          <el-button
+            v-if="isBtnPerm('/repair/remove')"
+            type="text"
+            @click="handleDelete(row)"
+          >
+            删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/dev/maintenance/index.vue b/src/views/dev/maintenance/index.vue
index 550bd5d..36864c5 100644
--- a/src/views/dev/maintenance/index.vue
+++ b/src/views/dev/maintenance/index.vue
@@ -39,6 +39,9 @@ export default {
         this.$refs['equipment'].showData();
       }
     },
+    showData() {
+      this.$refs['online'].showData();
+    },
   },
 };
 </script>
diff --git a/src/views/dev/staff/index.vue b/src/views/dev/staff/index.vue
index be21ecf..6ddce0b 100644
--- a/src/views/dev/staff/index.vue
+++ b/src/views/dev/staff/index.vue
@@ -63,6 +63,9 @@ export default {
     this.fetchData();
   },
   methods: {
+    showData() {
+      this.created();
+    },
     async fetchData() {
       this.listLoading = true;
       const { data } = await getList(this.queryForm);
diff --git a/src/views/dev/task/components/alarm/index.vue b/src/views/dev/task/components/alarm/index.vue
index 400242f..722cde8 100644
--- a/src/views/dev/task/components/alarm/index.vue
+++ b/src/views/dev/task/components/alarm/index.vue
@@ -30,10 +30,20 @@
     <div class="manage-button">
       <el-button size="small" @click="resetForm()">重置</el-button>
       <el-button type="primary" size="small" @click="search">查询</el-button>
-      <el-button type="primary" size="small" @click="exportData">
+      <el-button
+        v-if="isBtnPerm('/taskReport/export')"
+        type="primary"
+        size="small"
+        @click="exportData"
+      >
         导出
       </el-button>
-      <el-button type="primary" size="small" @click="deletes">
+      <el-button
+        v-if="isBtnPerm('/task/remove')"
+        type="primary"
+        size="small"
+        @click="deletes"
+      >
         批量删除
       </el-button>
     </div>
@@ -118,9 +128,29 @@
     </el-table-column>
     <el-table-column fixed="right" label="操作" align="center" width="180">
       <template #default="{ row }">
-        <el-button type="text" plain @click="feedbackShow(row)">反馈</el-button>
-        <el-button type="text" plain @click="handleEdit(row)">编辑</el-button>
-        <el-button type="text" @click="handleDelete(row)">删除</el-button>
+        <el-button
+          v-if="isBtnPerm('/task/feedback')"
+          type="text"
+          plain
+          @click="feedbackShow(row)"
+        >
+          反馈
+        </el-button>
+        <el-button
+          v-if="isBtnPerm('/task/update')"
+          type="text"
+          plain
+          @click="handleEdit(row)"
+        >
+          编辑
+        </el-button>
+        <el-button
+          v-if="isBtnPerm('/task/remove')"
+          type="text"
+          @click="handleDelete(row)"
+        >
+          删除
+        </el-button>
       </template>
     </el-table-column>
   </el-table>
diff --git a/src/views/dev/task/components/main/index.vue b/src/views/dev/task/components/main/index.vue
index b943e3d..a238426 100644
--- a/src/views/dev/task/components/main/index.vue
+++ b/src/views/dev/task/components/main/index.vue
@@ -30,10 +30,20 @@
     <div class="manage-button">
       <el-button size="small" @click="resetForm()">重置</el-button>
       <el-button type="primary" size="small" @click="search">查询</el-button>
-      <el-button type="primary" size="small" @click="exportData">
+      <el-button
+        v-if="isBtnPerm('/taskReport/export')"
+        type="primary"
+        size="small"
+        @click="exportData"
+      >
         导出
       </el-button>
-      <el-button type="primary" size="small" @click="deletes">
+      <el-button
+        v-if="isBtnPerm('/task/remove')"
+        type="primary"
+        size="small"
+        @click="deletes"
+      >
         批量删除
       </el-button>
     </div>
@@ -112,13 +122,31 @@
     </el-table-column>
     <el-table-column label="操作" align="center" width="180">
       <template #default="{ row }">
-        <el-button size="mini" type="primary" plain @click="feedbackShow(row)">
+        <el-button
+          v-if="isBtnPerm('/task/feedback')"
+          size="mini"
+          type="primary"
+          plain
+          @click="feedbackShow(row)"
+        >
           反馈
         </el-button>
-        <el-button size="mini" type="primary" plain @click="handleEdit(row)">
+        <el-button
+          v-if="isBtnPerm('/task/update')"
+          size="mini"
+          type="primary"
+          plain
+          @click="handleEdit(row)"
+        >
           编辑
         </el-button>
-        <el-button type="text" @click="handleDelete(row)">删除</el-button>
+        <el-button
+          v-if="isBtnPerm('/task/remove')"
+          type="text"
+          @click="handleDelete(row)"
+        >
+          删除
+        </el-button>
       </template>
     </el-table-column>
   </el-table>
diff --git a/src/views/dev/task/components/other/index.vue b/src/views/dev/task/components/other/index.vue
index 544a291..a9e6bb0 100644
--- a/src/views/dev/task/components/other/index.vue
+++ b/src/views/dev/task/components/other/index.vue
@@ -29,14 +29,30 @@
     </div>
     <div class="manage-button">
       <el-button size="small" @click="resetForm()">重置</el-button>
-      <el-button type="primary" size="small" plain @click="handleAdd">
+      <el-button
+        v-if="isBtnPerm('/task/add')"
+        type="primary"
+        size="small"
+        plain
+        @click="handleAdd"
+      >
         新建
       </el-button>
       <el-button type="primary" size="small" @click="search">查询</el-button>
-      <el-button type="primary" size="small" @click="exportData">
+      <el-button
+        v-if="isBtnPerm('/taskReport/export')"
+        type="primary"
+        size="small"
+        @click="exportData"
+      >
         导出
       </el-button>
-      <el-button type="primary" size="small" @click="deletes">
+      <el-button
+        v-if="isBtnPerm('/task/remove')"
+        type="primary"
+        size="small"
+        @click="deletes"
+      >
         批量删除
       </el-button>
     </div>
@@ -121,9 +137,27 @@
     </el-table-column>
     <el-table-column label="操作" align="center" width="180">
       <template #default="{ row }">
-        <el-button type="text" @click="feedbackShow(row)">反馈</el-button>
-        <el-button type="text" @click="handleEdit(row)">编辑</el-button>
-        <el-button type="text" @click="handleDelete(row)">删除</el-button>
+        <el-button
+          v-if="isBtnPerm('/task/feedback')"
+          type="text"
+          @click="feedbackShow(row)"
+        >
+          反馈
+        </el-button>
+        <el-button
+          v-if="isBtnPerm('/task/update')"
+          type="text"
+          @click="handleEdit(row)"
+        >
+          编辑
+        </el-button>
+        <el-button
+          v-if="isBtnPerm('/task/remove')"
+          type="text"
+          @click="handleDelete(row)"
+        >
+          删除
+        </el-button>
       </template>
     </el-table-column>
   </el-table>
diff --git a/src/views/dev/task/index.vue b/src/views/dev/task/index.vue
index 6ce2cfa..bca5035 100644
--- a/src/views/dev/task/index.vue
+++ b/src/views/dev/task/index.vue
@@ -40,6 +40,9 @@ export default {
         this.$refs['other'].otherIndex();
       }
     },
+    showData() {
+      this.$refs['alarm'].alarmIndex();
+    },
   },
 };
 </script>
diff --git a/src/views/index/components/SiteDetail.vue b/src/views/index/components/SiteDetail.vue
index e278681..6d19ab5 100644
--- a/src/views/index/components/SiteDetail.vue
+++ b/src/views/index/components/SiteDetail.vue
@@ -3,7 +3,13 @@
     <div class="title">
       <el-image :src="require('@/assets/copy.png')" class="icon" />
       <span>{{ deviceInfo.name }}</span>
-      <!--      <span style="color: #3281fd">（{{ 20 }}）</span>-->
+      <a
+        href="javascript:;"
+        style="position: fixed; right: 20px"
+        @click="close()"
+      >
+        关闭
+      </a>
     </div>
     <div class="body">
       <div class="body-item">
@@ -106,6 +112,9 @@ export default {
     isDetailShow(status) {
       this.isShow = status;
     },
+    close() {
+      this.isShow = false;
+    },
   },
 };
 </script>
diff --git a/src/views/index/index1.vue b/src/views/index/index1.vue
index 00f3768..b8e5fef 100644
--- a/src/views/index/index1.vue
+++ b/src/views/index/index1.vue
@@ -201,11 +201,12 @@ export default {
             `#a${this.siteDetailOpenPoint.id}`
           );
           const {
-            top = 0,
-            left = 0,
+            top = 339,
+            left = 1286,
             width = 60,
           } = abc?.getBoundingClientRect?.() ?? {};
           const { top: t = 0, left: l = 0 } = this.markerContainRect;
+
           this.$refs?.de?.setPosition?.({
             top: top - t,
             left: left + width - l,
@@ -214,22 +215,16 @@ export default {
       }
     },
     detailShow(point) {
-      const infoWin = new DefinedMarkerInfoWindow(`a${point.id}`, {
-        placement: 'rightBottom',
-      });
-      this.siteDetailOpenPoint = null;
-      // infoWin.on('open', () => {
       this.$refs['detail'].isDetailShow(true);
+      this.markerSiteData = point;
       this.siteDetailOpenPoint = point;
       this.resizeSiteDetailPosition();
-      // });
     },
     onNodeClick(node) {
-      // this.$refs['detail'].isDetailShow(true);
       this.map.centerAndZoom(new T.LngLat(node.longitude, node.latitude), 18);
-      // this.siteDetailOpenPoint = node;
-      // this.detailShow(node);
-      console.log(node, 'node-click______-11111');
+      this.detailShow(node);
+      this.loading.close();
+      console.log(node.id, 'node-click______-11111');
     },
   },
 };
diff --git a/src/views/iot/alarmuser/index.vue b/src/views/iot/alarmuser/index.vue
index 98a938d..bac9c48 100644
--- a/src/views/iot/alarmuser/index.vue
+++ b/src/views/iot/alarmuser/index.vue
@@ -49,7 +49,13 @@
       ></el-table-column>
       <el-table-column fixed="right" label="操作" align="center">
         <template #default="{ row }">
-          <el-button type="text" @click="bindDevice(row)">绑定项目</el-button>
+          <el-button
+            v-if="isBtnPerm('/alarmUser/addProjects')"
+            type="text"
+            @click="bindDevice(row)"
+          >
+            绑定项目
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/iot/device/components/deviceEdit.vue b/src/views/iot/device/components/deviceEdit.vue
index 0a19f50..2b8cb93 100644
--- a/src/views/iot/device/components/deviceEdit.vue
+++ b/src/views/iot/device/components/deviceEdit.vue
@@ -53,12 +53,12 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="站点工艺" prop="technology">
+        <el-form-item label="设备工艺" prop="technology">
           <el-select
             v-model="form.technology"
             size="small"
             filterable
-            placeholder="请选择站点工艺"
+            placeholder="请选择设备工艺"
           >
             <el-option
               v-for="item in deviceTechnologyData"
@@ -68,12 +68,12 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="站点材质" prop="material">
+        <el-form-item label="设备材质" prop="material">
           <el-select
             v-model="form.material"
             size="small"
             filterable
-            placeholder="请选择站点材质"
+            placeholder="请选择设备材质"
           >
             <el-option
               v-for="item in deviceMaterialData"
@@ -149,7 +149,7 @@
             type="number"
           ></el-input>
         </el-form-item>
-        <el-form-item label="物联网卡" prop="simNum">
+        <el-form-item label="sim卡接入号码" prop="simNum">
           <el-input v-model="form.simNum" size="small" type="text"></el-input>
         </el-form-item>
         <!--        <el-form-item label="报警用户" prop="alarmUser">-->
diff --git a/src/views/iot/device/components/frameMap.vue b/src/views/iot/device/components/frameMap.vue
index 4193794..105ead8 100644
--- a/src/views/iot/device/components/frameMap.vue
+++ b/src/views/iot/device/components/frameMap.vue
@@ -12,7 +12,12 @@
       <el-button icon="el-icon-search" type="primary" @click="searchAddress">
         查询
       </el-button>
-       <el-button icon="el-icon-del" type="danger" @click="delAddress" style="float:right">
+      <el-button
+        icon="el-icon-del"
+        type="danger"
+        style="float: right"
+        @click="delAddress"
+      >
         清空
       </el-button>
       <bd-map
@@ -51,9 +56,9 @@ export default {
     searchAddress() {
       this.$refs['maps'].setPlace(this.keyWords);
     },
-    delAddress(){
-      this.keyWords = ''
-       this.$refs['maps'].removeMarker();
+    delAddress() {
+      this.keyWords = '';
+      this.$refs['maps'].removeMarker();
     },
     showMap(location) {
       this.dialogFormVisible = true;
diff --git a/src/views/iot/device/index.vue b/src/views/iot/device/index.vue
index 4cea350..b137efb 100644
--- a/src/views/iot/device/index.vue
+++ b/src/views/iot/device/index.vue
@@ -79,16 +79,36 @@
     <div class="manage-button">
       <el-button size="small" @click="resetForm()">重置</el-button>
       <el-button type="primary" size="small" @click="search">查询</el-button>
-      <el-button type="primary" size="small" @click="handleAdd">
+      <el-button
+        v-if="isBtnPerm('/iot/device/insert')"
+        type="primary"
+        size="small"
+        @click="handleAdd"
+      >
         添加站点
       </el-button>
-      <el-button type="primary" size="small" @click="deletes">
+      <el-button
+        v-if="isBtnPerm('/iot/device/remove')"
+        type="primary"
+        size="small"
+        @click="deletes"
+      >
         批量删除
       </el-button>
-      <el-button type="primary" size="small" @click="exportData">
+      <el-button
+        v-if="isBtnPerm('/iot/device/exportDevice')"
+        type="primary"
+        size="small"
+        @click="exportData"
+      >
         导出
       </el-button>
-      <el-button type="primary" size="small" @click="fboxSync">
+      <el-button
+        v-if="isBtnPerm('/fbox/sync')"
+        type="primary"
+        size="small"
+        @click="fboxSync"
+      >
         盒子同步
       </el-button>
     </div>
@@ -289,6 +309,43 @@
         width="200"
         align="center"
       ></el-table-column>
+      <el-table-column
+        prop="boardImg"
+        label="公示牌"
+        width="200"
+        align="center"
+      >
+        <template #default="{ row }">
+          <el-image
+            style="width: 100px; height: 100px"
+            :src="fileUrl + row.boardImg"
+          ></el-image>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="warrantyPeriod"
+        label="设备保修到期时间"
+        width="200"
+        align="center"
+      ></el-table-column>
+      <el-table-column
+        prop="deviceVersion.dataValue"
+        label="设备版本"
+        width="200"
+        align="center"
+      ></el-table-column>
+      <el-table-column
+        prop="ownerName"
+        label="站点客户联系人"
+        width="200"
+        align="center"
+      ></el-table-column>
+      <el-table-column
+        prop="ownerPhone"
+        label="站点客户联系方式"
+        width="200"
+        align="center"
+      ></el-table-column>
       <el-table-column
         prop="offlineTime"
         label="离线时间"
@@ -303,11 +360,41 @@
       ></el-table-column>
       <el-table-column fixed="right" label="操作" width="280" align="center">
         <template #default="{ row }">
-          <el-button type="text" @click="sensorData(row)">数据</el-button>
-          <el-button type="text" @click="sensorEdit(row)">传感器</el-button>
-          <el-button type="text" @click="copyDevice(row)">复制</el-button>
-          <el-button type="text" @click="handleEdit(row)">编辑</el-button>
-          <el-button type="text" @click="handleDelete(row)">删除</el-button>
+          <el-button
+            v-if="isBtnPerm('/iot/device/shuju')"
+            type="text"
+            @click="sensorData(row)"
+          >
+            数据
+          </el-button>
+          <el-button
+            v-if="isBtnPerm('/iot/device/chuanganqi')"
+            type="text"
+            @click="sensorEdit(row)"
+          >
+            传感器
+          </el-button>
+          <el-button
+            v-if="isBtnPerm('/iot/device/copy')"
+            type="text"
+            @click="copyDevice(row)"
+          >
+            复制
+          </el-button>
+          <el-button
+            v-if="isBtnPerm('/iot/device/update')"
+            type="text"
+            @click="handleEdit(row)"
+          >
+            编辑
+          </el-button>
+          <el-button
+            v-if="isBtnPerm('/iot/device/remove')"
+            type="text"
+            @click="handleDelete(row)"
+          >
+            删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -339,6 +426,7 @@ import ajax from '@/api/download';
 import deviceEdit from './components/deviceEdit';
 import CopyDevice from './components/copyDevice';
 import syncDevice from './components/sync';
+import { baseURL } from '@/config';
 export default {
   name: 'Index',
   components: {
@@ -348,6 +436,7 @@ export default {
   },
   data() {
     return {
+      fileUrl: baseURL + '/static/img/',
       deviceData: [],
       lazy: true,
       activeName: 'first',
diff --git a/src/views/iot/grouping/index.vue b/src/views/iot/grouping/index.vue
index 0251b02..542b122 100644
--- a/src/views/iot/grouping/index.vue
+++ b/src/views/iot/grouping/index.vue
@@ -17,10 +17,20 @@
       <div class="manage-button">
         <el-button size="small" @click="resetForm()">重置</el-button>
         <el-button type="primary" size="small" @click="search">查询</el-button>
-        <el-button type="primary" size="small" @click="deletes">
+        <el-button
+          v-if="isBtnPerm('/iot/project/group/remove')"
+          type="primary"
+          size="small"
+          @click="deletes"
+        >
           批量删除
         </el-button>
-        <el-button type="primary" size="small" @click="handleAdd">
+        <el-button
+          v-if="isBtnPerm('/iot/project/group/saveOrUpdate')"
+          type="primary"
+          size="small"
+          @click="handleAdd"
+        >
           添加项目组
         </el-button>
       </div>
@@ -60,9 +70,27 @@
       ></el-table-column>
       <el-table-column fixed="right" label="操作" align="center">
         <template #default="{ row }">
-          <el-button type="text" @click="handleEdit(row)">编辑</el-button>
-          <el-button type="text" @click="addProject(row)">项目</el-button>
-          <el-button type="text" @click="handleDelete(row)">删除</el-button>
+          <el-button
+            v-if="isBtnPerm('/iot/project/group/edit')"
+            type="text"
+            @click="handleEdit(row)"
+          >
+            编辑
+          </el-button>
+          <el-button
+            v-if="isBtnPerm('/iot/project/group/xiangmu')"
+            type="text"
+            @click="addProject(row)"
+          >
+            项目
+          </el-button>
+          <el-button
+            v-if="isBtnPerm('/iot/project/group/remove')"
+            type="text"
+            @click="handleDelete(row)"
+          >
+            删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/iot/product/attributeEdit.vue b/src/views/iot/product/attributeEdit.vue
new file mode 100644
index 0000000..51bb572
--- /dev/null
+++ b/src/views/iot/product/attributeEdit.vue
@@ -0,0 +1,216 @@
+<template>
+  <el-dialog
+    v-model="dialogFormVisible"
+    :title="title"
+    width="700px"
+    @close="close"
+  >
+    <el-button type="primary" size="small" @click="addAtt">
+      新增配置项
+    </el-button>
+    <div class="item-line" v-for="(item, index) in attribute" :key="index">
+      <div class="item-title">
+        <i
+          class="el-icon-remove"
+          style="color: red; margin-top: 26px; font-size: 23px"
+          size="26"
+          @click="delItem(index)"
+        ></i>
+        配置项{{ parseInt(index) + 1 }}
+      </div>
+      <el-row type="flex" class="row-bg">
+        <el-col :span="12" class="item-content">
+          <el-input
+            v-model.trim="item.attributeName"
+            size="small"
+            placeholder="配置参数"
+            autocomplete="off"
+          ></el-input>
+        </el-col>
+        <el-col :span="12" class="item-content">
+          <el-input
+            v-model.trim="item.attributeValue"
+            size="small"
+            placeholder="配置值"
+            autocomplete="off"
+          ></el-input>
+        </el-col>
+        <el-col :span="12" class="item-content">
+          <el-input
+            v-model.trim="item.attributeNameEn"
+            size="small"
+            placeholder="configuration parameter"
+            autocomplete="off"
+          ></el-input>
+        </el-col>
+        <el-col :span="12" class="item-content">
+          <el-input
+            v-model.trim="item.attributeValueEn"
+            size="small"
+            placeholder="Configuration value"
+            autocomplete="off"
+          ></el-input>
+        </el-col>
+      </el-row>
+      <div class="item-sort">
+        <i
+          class="el-icon-sort-up sort"
+          @click="sortData(index, -1)"
+          atl="上移"
+        ></i>
+        <i
+          class="el-icon-sort-down sort"
+          @click="sortData(index, 1)"
+          alt="上移"
+        ></i>
+      </div>
+    </div>
+
+    <div class="dialog-footer">
+      <el-button type="primary" size="small" @click="save">确 定</el-button>
+      <el-button size="small" @click="close">取 消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addData, updateData, addAttribute } from '@/api/product';
+export default {
+  name: 'GroupEdit',
+  data() {
+    return {
+      form: {
+        id: '',
+        name: '',
+      },
+      attribute: [],
+      categoryId: '',
+      rules: {
+        name: [{ required: true, trigger: 'blur', message: '请输入产品名称' }],
+        materialCode: [
+          { required: true, trigger: 'blur', message: '请输入物料编码' },
+        ],
+      },
+      roleData: [],
+      clearable: true,
+      roleId: '',
+      parentData: [],
+      title: '',
+      dialogFormVisible: false,
+    };
+  },
+  created() {},
+  methods: {
+    addAtt() {
+      this.attribute.push({
+        attributeName: '',
+        attributeValue: '',
+        attributeNameEn: '',
+        attributeValueEn: '',
+      });
+    },
+    showEdit(row, categoryId) {
+      this.categoryId = categoryId;
+      this.title = '配置参数';
+      this.attribute = Object.assign([], row);
+      this.dialogFormVisible = true;
+    },
+    delItem(index) {
+      this.$confirm('你确定删除?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          this.attribute.splice(index, 1);
+        })
+        .catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消删除',
+          });
+        });
+    },
+    sortData(index, type) {
+      let index1, index2;
+      if (
+        (index == 0 && type == -1) ||
+        (index == this.attribute.length - 1 && type == 1)
+      ) {
+        return;
+      }
+      if (type == -1) {
+        index1 = index;
+        index2 = index - 1;
+      } else {
+        index1 = index + 1;
+        index2 = index;
+      }
+      [this.attribute[index1], this.attribute[index2]] = [
+        this.attribute[index2],
+        this.attribute[index1],
+      ];
+    },
+    close() {
+      this.dialogFormVisible = false;
+      this.$emit('fetch-data');
+    },
+    save() {
+      console.log(this.attribute);
+      let attribute = this.attribute.map((item, index) => {
+        return {
+          ...item,
+          orderNum: index + 1,
+        };
+      });
+      addAttribute({ categoryId: this.categoryId, attribute }).then(res => {
+        this.$notify({
+          title: '操作成功',
+          type: 'success',
+        });
+        this.dialogFormVisible = false;
+      });
+    },
+  },
+};
+</script>
+<style lang="scss">
+.el-dialog {
+  .el-dialog__header {
+    border-bottom: 1px solid #e3e3e3 !important;
+    padding: 15px 20px;
+  }
+  .dialog-footer {
+    text-align: right;
+    .el button {
+      height: 36px !important;
+      min-height: 36px !important;
+      line-height: 366px !important;
+    }
+  }
+}
+.item-line {
+  width: 100%;
+  display: flex;
+  .item-title {
+    width: 140px;
+    display: flex;
+    line-height: 76px;
+  }
+}
+.item-content {
+  padding: 5px;
+}
+.item-sort {
+  width: 50px;
+  display: flex;
+  .sort {
+    font-size: 18px;
+    font-weight: bolder;
+    margin-top: 33px;
+    &:hover {
+      color: #409eff;
+    }
+  }
+}
+</style>
diff --git a/src/views/iot/product/groupEdit.vue b/src/views/iot/product/groupEdit.vue
new file mode 100644
index 0000000..95f2414
--- /dev/null
+++ b/src/views/iot/product/groupEdit.vue
@@ -0,0 +1,121 @@
+<template>
+  <el-dialog
+    v-model="dialogFormVisible"
+    :title="title"
+    width="500px"
+    @close="close"
+  >
+    <el-form
+      ref="form"
+      :model="form"
+      :rules="rules"
+      label-width="80px"
+      label-position="left"
+    >
+      <el-form-item label="产品名称" prop="name">
+        <el-input
+          v-model.trim="form.name"
+          size="small"
+          autocomplete="off"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="物料编码" prop="materialCode">
+        <el-input
+          v-model.trim="form.materialCode"
+          size="small"
+          autocomplete="off"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="备注">
+        <el-input
+          v-model.trim="form.remark"
+          size="small"
+          autocomplete="off"
+        ></el-input>
+      </el-form-item>
+    </el-form>
+    <div class="dialog-footer">
+      <el-button type="primary" size="small" @click="save">确 定</el-button>
+      <el-button size="small" @click="close">取 消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addData, updateData } from '@/api/product';
+export default {
+  name: 'GroupEdit',
+  data() {
+    return {
+      form: {
+        id: '',
+        name: '',
+      },
+      rules: {
+        name: [{ required: true, trigger: 'blur', message: '请输入产品名称' }],
+        materialCode: [
+          { required: true, trigger: 'blur', message: '请输入物料编码' },
+        ],
+      },
+      roleData: [],
+      clearable: true,
+      roleId: '',
+      parentData: [],
+      title: '',
+      dialogFormVisible: false,
+    };
+  },
+  created() {},
+  methods: {
+    showEdit(row) {
+      if (!row) {
+        this.title = '添加产品';
+      } else {
+        this.title = '编辑产品';
+        this.form = Object.assign({}, row);
+      }
+      this.dialogFormVisible = true;
+    },
+    close() {
+      this.$refs['form'].resetFields();
+      this.form = this.$options.data().form;
+      this.dialogFormVisible = false;
+      this.$emit('fetch-data');
+    },
+    save() {
+      this.$refs['form'].validate(async valid => {
+        if (valid) {
+          const { msg } = this.form.id
+            ? await updateData(this.form)
+            : await addData(this.form);
+          this.$notify({
+            title: msg,
+            type: 'success',
+          });
+          this.$refs['form'].resetFields();
+          this.dialogFormVisible = false;
+          this.$parent.fetchData();
+        } else {
+          return false;
+        }
+      });
+    },
+  },
+};
+</script>
+<style lang="scss">
+.el-dialog {
+  .el-dialog__header {
+    border-bottom: 1px solid #e3e3e3 !important;
+    padding: 15px 20px;
+  }
+  .dialog-footer {
+    text-align: right;
+    .el button {
+      height: 36px !important;
+      min-height: 36px !important;
+      line-height: 366px !important;
+    }
+  }
+}
+</style>
diff --git a/src/views/iot/product/index.vue b/src/views/iot/product/index.vue
new file mode 100644
index 0000000..c68eb48
--- /dev/null
+++ b/src/views/iot/product/index.vue
@@ -0,0 +1,283 @@
+<template>
+  <div class="manage-container">
+    <div class="manage-wrap">
+      <div class="manage-input">
+        <el-form ref="queryForm" :model="queryForm" label-width="80px">
+          <vab-query-form>
+            <el-form-item width="100" prop="name" label="产品名称">
+              <el-input
+                v-model="queryForm.name"
+                size="small"
+                placeholder="请输入产品名称"
+              ></el-input>
+            </el-form-item>
+          </vab-query-form>
+        </el-form>
+      </div>
+      <div class="manage-button">
+        <el-button size="small" @click="resetForm()">重置</el-button>
+        <el-button type="primary" size="small" @click="search">查询</el-button>
+        <el-button type="primary" size="small" @click="deletes">
+          批量删除
+        </el-button>
+        <el-button type="primary" size="small" @click="handleAdd">
+          添加产品
+        </el-button>
+      </div>
+    </div>
+    <el-table
+      v-loading="listLoading"
+      :data="groupData"
+      border
+      stripe
+      style="width: 100%"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55"></el-table-column>
+      <el-table-column
+        prop="id"
+        label="ID"
+        width="60"
+        align="center"
+      ></el-table-column>
+      <el-table-column
+        prop="name"
+        label="产品名称"
+        width="300"
+        align="center"
+      ></el-table-column>
+      <el-table-column
+        prop="materialCode"
+        label="金蝶物料编号"
+        width="250"
+        align="center"
+      ></el-table-column>
+      <el-table-column
+        prop="remark"
+        label="备注"
+        width="250"
+        align="center"
+      ></el-table-column>
+      <el-table-column fixed="right" label="操作" align="center">
+        <template #default="{ row }">
+          <el-button type="text" @click="handleEdit(row)">编辑</el-button>
+          <el-button type="text" @click="addProject(row)">产品参数</el-button>
+          <el-button type="text" @click="handleDelete(row)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      :background="background"
+      :current-page="queryForm.page"
+      :layout="layout"
+      :page-size="queryForm.size"
+      :total="total"
+      style="text-align: right"
+      @current-change="handleCurrentChange"
+      @size-change="handleSizeChange"
+    ></el-pagination>
+    <group-edit ref="edit"></group-edit>
+    <attribute-edit ref="attribute"></attribute-edit>
+  </div>
+</template>
+
+<script>
+import {
+  delectData,
+  getList,
+  addAttribute,
+  updateData,
+  getAttribute,
+} from '@/api/product';
+import groupEdit from './groupEdit';
+import attributeEdit from './attributeEdit';
+export default {
+  name: 'Index',
+  components: { groupEdit, attributeEdit },
+  data() {
+    return {
+      groupData: [],
+      lazy: true,
+      layout: 'total, sizes, prev, pager, next, jumper',
+      total: 0,
+      background: true,
+      listLoading: true,
+      elementLoadingText: '正在加载...',
+      ids: [],
+      queryForm: {
+        page: 1,
+        size: 20,
+        name: '',
+      },
+    };
+  },
+  computed: {
+    height() {
+      return 500;
+    },
+  },
+  created() {
+    this.fetchData();
+  },
+  methods: {
+    async fetchData() {
+      this.listLoading = true;
+      const { data } = await getList(this.queryForm);
+      this.groupData = data.items;
+      this.total = data.total;
+      setTimeout(() => {
+        this.listLoading = false;
+      }, 500);
+    },
+    search() {
+      this.fetchData();
+    },
+    addProject(row) {
+      getAttribute(row.id).then(res => {
+        let attribute = res.data;
+        attribute.sort((a, b) => a.orderNum - b.orderNum);
+        this.$refs['attribute'].showEdit(attribute, row.id);
+      });
+    },
+    handleAdd() {
+      this.$refs['edit'].showEdit();
+    },
+    handleEdit(row) {
+      this.$refs['edit'].showEdit(row);
+    },
+    resetForm() {
+      this.$refs.queryForm.resetFields();
+    },
+    handleQuery() {
+      this.queryForm.page = 1;
+      this.fetchData();
+    },
+    handleSizeChange(val) {
+      this.queryForm.size = val;
+      this.fetchData();
+    },
+    handleCurrentChange(val) {
+      this.queryForm.page = val;
+      this.fetchData();
+    },
+    deletes() {
+      const ids = this.ids;
+      const that = this;
+      if (ids.length == 0) {
+        this.$message({
+          type: 'info',
+          message: '没有选中任何项',
+        });
+        return false;
+      }
+      this.$confirm('你确定要删除吗?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          const { msg } = delectData(ids);
+          this.$message({
+            type: 'success',
+            message: msg == undefined ? '删除成功' : msg,
+          });
+          setTimeout(function () {
+            that.fetchData();
+          }, 1000);
+        })
+        .catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消删除',
+          });
+        });
+    },
+    handleSelectionChange(val) {
+      const ids = [];
+      val.forEach(row => {
+        ids.push(row.id);
+      });
+      this.ids = ids;
+    },
+    handleDelete(row) {
+      var that = this;
+      if (row.id) {
+        this.$confirm('你确定要删除当前项吗?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+        })
+          .then(() => {
+            const { msg } = delectData([row.id]);
+            this.$message({
+              type: 'success',
+              message: msg == undefined ? '删除成功' : msg,
+            });
+            setTimeout(function () {
+              that.fetchData();
+            }, 1000);
+          })
+          .catch(() => {
+            this.$message({
+              type: 'info',
+              message: '已取消删除',
+            });
+          });
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.manage-wrap {
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-start;
+  .el-input {
+    width: 200px !important;
+  }
+  .el-select {
+    width: 200px !important;
+  }
+  .manage-button {
+    padding-left: 12px;
+    margin-bottom: 30px;
+  }
+}
+</style>
+
+<style lang="scss">
+.el-submenu__title:hover {
+  background-color: rgba(#1890ff, 0.085) !important;
+  color: hsla(208, 100%, 55%, 0.95) !important;
+}
+.el-dialog {
+  .el-dialog__header {
+    background-color: #1890ff !important;
+    padding: 15px 20px;
+    text-align: left !important;
+    .el-dialog__title {
+      color: #e8f4ff !important;
+    }
+    .el-dialog__headerbtn .el-dialog__close {
+      color: #e8f4ff !important;
+    }
+  }
+  .el-dialog__body {
+    padding: 20px !important;
+    .el-form-item {
+      margin-bottom: 10px !important;
+      .el-input {
+        width: 100% !important;
+      }
+      .el-select {
+        width: 100% !important;
+      }
+    }
+    .el-form-item:last-child {
+      margin-bottom: 20px !important;
+    }
+  }
+}
+</style>
diff --git a/src/views/iot/project/index.vue b/src/views/iot/project/index.vue
index 82b4b49..4363e2f 100644
--- a/src/views/iot/project/index.vue
+++ b/src/views/iot/project/index.vue
@@ -51,13 +51,28 @@
     <div class="manage-button">
       <el-button size="small" @click="resetForm()">重置</el-button>
       <el-button type="primary" size="small" @click="search">查询</el-button>
-      <el-button type="primary" size="small" @click="handleAdd">
+      <el-button
+        v-if="isBtnPerm('/iot/project/insert')"
+        type="primary"
+        size="small"
+        @click="handleAdd"
+      >
         添加项目
       </el-button>
-      <el-button type="primary" size="small" @click="remove">
+      <el-button
+        v-if="isBtnPerm('/iot/project/remove')"
+        type="primary"
+        size="small"
+        @click="remove"
+      >
         批量删除
       </el-button>
-      <el-button type="primary" size="small" @click="exportData">
+      <el-button
+        v-if="isBtnPerm('/iot/project/export')"
+        type="primary"
+        size="small"
+        @click="exportData"
+      >
         导出
       </el-button>
     </div>
@@ -168,10 +183,34 @@
       ></el-table-column>
       <el-table-column fixed="right" label="操作" width="220" align="center">
         <template #default="{ row }">
-          <el-button type="text" @click="device(row)">站点</el-button>
-          <el-button type="text" @click="alarmUser(row)">报警用户</el-button>
-          <el-button type="text" @click="handleEdit(row)">编辑</el-button>
-          <el-button type="text" @click="handleDelete(row)">删除</el-button>
+          <el-button
+            v-if="isBtnPerm('/iot/project/zhandian')"
+            type="text"
+            @click="device(row)"
+          >
+            站点
+          </el-button>
+          <el-button
+            v-if="isBtnPerm('/iot/project/yonghu')"
+            type="text"
+            @click="alarmUser(row)"
+          >
+            报警用户
+          </el-button>
+          <el-button
+            v-if="isBtnPerm('/iot/project/update')"
+            type="text"
+            @click="handleEdit(row)"
+          >
+            编辑
+          </el-button>
+          <el-button
+            v-if="isBtnPerm('/iot/project/remove')"
+            type="text"
+            @click="handleDelete(row)"
+          >
+            删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/iot/sensor/index.vue b/src/views/iot/sensor/index.vue
index a043cc1..b83ee7f 100644
--- a/src/views/iot/sensor/index.vue
+++ b/src/views/iot/sensor/index.vue
@@ -24,7 +24,12 @@
       <div class="manage-button">
         <el-button size="small" @click="resetForm()">重置</el-button>
         <el-button type="primary" size="small" @click="search">查询</el-button>
-        <el-button type="primary" size="small" @click="handleAdd()">
+        <el-button
+          v-if="isBtnPerm('/iot/sensor/insert')"
+          type="primary"
+          size="small"
+          @click="handleAdd()"
+        >
           添加传感器
         </el-button>
       </div>
@@ -140,8 +145,20 @@
       ></el-table-column>
       <el-table-column fixed="right" label="操作" align="center">
         <template #default="{ row }">
-          <el-button type="text" @click="handleEdit(row)">编辑</el-button>
-          <el-button type="text" @click="handleDelete(row)">删除</el-button>
+          <el-button
+            v-if="isBtnPerm('/iot/sensor/update')"
+            type="text"
+            @click="handleEdit(row)"
+          >
+            编辑
+          </el-button>
+          <el-button
+            v-if="isBtnPerm('/iot/sensor/remove')"
+            type="text"
+            @click="handleDelete(row)"
+          >
+            删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/iot/sensordata/currentData.vue b/src/views/iot/sensordata/currentData.vue
index 4e74f47..729c36a 100644
--- a/src/views/iot/sensordata/currentData.vue
+++ b/src/views/iot/sensordata/currentData.vue
@@ -14,17 +14,32 @@
         </el-form-item>
         <el-form-item width="100">
           <el-button @click="resetForm()">重置</el-button>
-          <el-button type="primary" size="medium" @click="search">
+          <el-button
+            :disabled="disabled"
+            type="primary"
+            size="medium"
+            @click="search"
+          >
             查询
           </el-button>
-          <el-button type="primary" size="medium" @click="exportData">
+          <el-button
+            v-if="isBtnPerm('/iot/device/exportData')"
+            type="primary"
+            size="medium"
+            @click="exportData"
+          >
             导出
           </el-button>
         </el-form-item>
       </vab-query-form>
     </el-form>
     <el-card style="height: 380px">
-      <div id="main2" ref="echarts" style="height: 380px"></div>
+      <div
+        v-loading="cardLoading"
+        id="main2"
+        ref="echarts"
+        style="height: 380px"
+      ></div>
     </el-card>
     <el-table
       v-loading="listLoading"
@@ -85,6 +100,7 @@ export default {
   components: {},
   data() {
     return {
+      disabled: true,
       newTableData: [],
       data: [],
       deviceCode: '',
@@ -94,6 +110,7 @@ export default {
       total: 0,
       background: true,
       listLoading: true,
+      cardLoading: true,
       elementLoadingText: '正在加载...',
       deviceId: '',
       historyData: [],
@@ -135,6 +152,7 @@ export default {
         this.listLoading = false;
         this.getHistoryData();
       }, 500);
+      this.disabled = false;
     },
     async sensorInfo() {
       const { data } = await sensorInfo(this.queryForm);
@@ -147,10 +165,10 @@ export default {
     async getHistoryData() {
       var myChart = echarts.init(document.getElementById('main2'));
       var option;
-      const { data } = await getReportHistoryData(this.queryForm);
+      // const { data } = await getReportHistoryData(this.queryForm);
       var yData = [];
-      for (let i = 0; i < data.length; i++) {
-        yData.push(data[i][1]);
+      for (let i = 0; i < this.data.length; i++) {
+        yData.push(this.data[i][1]);
       }
       var min = Math.min.apply(null, yData);
       var max = Math.max.apply(null, yData);
@@ -196,11 +214,13 @@ export default {
             smooth: true,
             symbol: 'none',
             areaStyle: {},
-            data: data,
+            data: this.data,
           },
         ],
       };
       option && myChart.setOption(option);
+      this.disabled = false;
+      this.cardLoading = false;
     },
     setDefaultTime() {
       this.queryForm.end = getFMdate(0);
@@ -213,6 +233,8 @@ export default {
       ajax.downloadFile(url, { fileName: '站点最新数据.xls' });
     },
     search() {
+      this.cardLoading = true;
+      this.disabled = true;
       this.sensorInfo();
       this.fetchData();
     },
diff --git a/src/views/iot/sensordata/historyData.vue b/src/views/iot/sensordata/historyData.vue
index 7db66d4..ec446c3 100644
--- a/src/views/iot/sensordata/historyData.vue
+++ b/src/views/iot/sensordata/historyData.vue
@@ -23,14 +23,24 @@
           </el-select>
         </el-form-item>
         <el-form-item width="100">
-          <el-button type="primary" size="medium" @click="search">
+          <el-button
+            :disabled="disabled"
+            type="primary"
+            size="medium"
+            @click="search"
+          >
             查询
           </el-button>
         </el-form-item>
       </vab-query-form>
     </el-form>
     <el-card style="height: 380px">
-      <div id="main3" ref="echarts" style="height: 380px"></div>
+      <div
+        v-loading="cardLoading"
+        id="main3"
+        ref="echarts"
+        style="height: 380px"
+      ></div>
     </el-card>
     <el-table
       v-loading="listLoading"
@@ -96,8 +106,10 @@ export default {
       lazy: true,
       layout: 'total, sizes, prev, pager, next, jumper',
       total: 0,
+      disabled: true,
       background: true,
       listLoading: true,
+      cardLoading: true,
       elementLoadingText: '正在加载...',
       deviceId: '',
       historyData: [],
@@ -129,10 +141,9 @@ export default {
       setTimeout(() => {
         this.listLoading = false;
         this.getReportHistory();
-        console.log(123);
       }, 500);
+      this.disabled = false;
     },
-    async getReportHistoryData() {},
     async getSensorsData() {
       const { data } = await sensors(this.queryForm);
       this.sensorsData = data;
@@ -155,8 +166,8 @@ export default {
       if (this.startDate && this.startDate.length > 0) {
         const timestampBegin = +new Date(this.startDate[0]);
         const timestampEnd = +new Date(this.startDate[1]);
-        if (timestampEnd > timestampBegin + 3600 * 1000 * 24 * 30) {
-          this.$alert('日期的起止时间跨度不能超过30天', '提示', {
+        if (timestampEnd > timestampBegin + 3600 * 1000 * 24 * 7) {
+          this.$alert('日期的起止时间跨度不能超过7天', '提示', {
             confirmButtonText: '确定',
             type: 'warning',
           })
@@ -171,10 +182,10 @@ export default {
     async getReportHistory() {
       var myChart = echarts.init(document.getElementById('main3'));
       var option;
-      const { data } = await getReportHistoryData(this.queryForm);
+      // const { data } = await getReportHistoryData(this.queryForm);
       var yData = [];
-      for (let i = 0; i < data.length; i++) {
-        yData.push(data[i][1]);
+      for (let i = 0; i < this.data.length; i++) {
+        yData.push(this.data[i][1]);
       }
       var min = Math.min.apply(null, yData);
       var max = Math.max.apply(null, yData);
@@ -226,13 +237,17 @@ export default {
             smooth: true,
             symbol: 'none',
             areaStyle: {},
-            data: data,
+            data: this.data,
           },
         ],
       };
       option && myChart.setOption(option);
+      this.disabled = false;
+      this.cardLoading = false;
     },
     search() {
+      this.disabled = true;
+      this.cardLoading = true;
       this.sensorInfo();
       this.fetchData();
     },
diff --git a/src/views/iot/sensordata/index.vue b/src/views/iot/sensordata/index.vue
index fa7cbcc..8b17b1d 100644
--- a/src/views/iot/sensordata/index.vue
+++ b/src/views/iot/sensordata/index.vue
@@ -49,7 +49,13 @@
       </el-table-column>
       <el-table-column fixed="right" label="操作" align="center">
         <template #default="{ row }">
-          <el-button type="text" @click="historical(row)">历史数据</el-button>
+<!--          v-if="isBtnPerm('/iot/sensordata/historydata')"-->
+          <el-button
+            type="text"
+            @click="historical(row)"
+          >
+            历史数据
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/iot/trigger/rule.vue b/src/views/iot/trigger/rule.vue
index a72e1b2..3f33fb4 100644
--- a/src/views/iot/trigger/rule.vue
+++ b/src/views/iot/trigger/rule.vue
@@ -24,13 +24,28 @@
       <div class="manage-input">
         <el-button size="small" @click="resetForm()">重置</el-button>
         <el-button type="primary" size="small" @click="search">查询</el-button>
-        <el-button type="primary" size="small" @click="handleAdd()">
+        <el-button
+          v-if="isBtnPerm('/triggerRule/add')"
+          type="primary"
+          size="small"
+          @click="handleAdd()"
+        >
           添加触发器规则
         </el-button>
-        <el-button type="primary" size="small" @click="deletes">
+        <el-button
+          v-if="isBtnPerm('/triggerRule/remove')"
+          type="primary"
+          size="small"
+          @click="deletes"
+        >
           批量删除
         </el-button>
-        <el-button type="primary" size="small" @click="triggerRuleUse">
+        <el-button
+          v-if="isBtnPerm('/triggerRule/use')"
+          type="primary"
+          size="small"
+          @click="triggerRuleUse"
+        >
           批量应用
         </el-button>
       </div>
@@ -115,8 +130,20 @@
       ></el-table-column>
       <el-table-column fixed="right" label="操作" align="center">
         <template #default="{ row }">
-          <el-button type="text" @click="handleEdit(row)">编辑</el-button>
-          <el-button type="text" @click="handleDelete(row)">删除</el-button>
+          <el-button
+            v-if="isBtnPerm('/triggerRule/update')"
+            type="text"
+            @click="handleEdit(row)"
+          >
+            编辑
+          </el-button>
+          <el-button
+            v-if="isBtnPerm('/triggerRule/remove')"
+            type="text"
+            @click="handleDelete(row)"
+          >
+            删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/iot/trigger/trigger.vue b/src/views/iot/trigger/trigger.vue
index ede26af..b052ddd 100644
--- a/src/views/iot/trigger/trigger.vue
+++ b/src/views/iot/trigger/trigger.vue
@@ -24,7 +24,12 @@
       <div class="manage-button">
         <el-button size="small" @click="resetForm()">重置</el-button>
         <el-button type="primary" size="small" @click="search">查询</el-button>
-        <el-button type="primary" size="small" @click="handleAdd">
+        <el-button
+          v-if="isBtnPerm('/iot/trigger/insert')"
+          type="primary"
+          size="small"
+          @click="handleAdd"
+        >
           添加触发器
         </el-button>
       </div>
@@ -91,8 +96,20 @@
       ></el-table-column>
       <el-table-column fixed="right" label="操作" width="160" align="center">
         <template #default="{ row }">
-          <el-button type="text" @click="handleEdit(row)">编辑</el-button>
-          <el-button type="text" @click="handleDelete(row)">删除</el-button>
+          <el-button
+            v-if="isBtnPerm('/iot/trigger/update')"
+            type="text"
+            @click="handleEdit(row)"
+          >
+            编辑
+          </el-button>
+          <el-button
+            v-if="isBtnPerm('/iot/trigger/remove')"
+            type="text"
+            @click="handleDelete(row)"
+          >
+            删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/iot/vehicle/index.vue b/src/views/iot/vehicle/index.vue
index e06559b..d9169e2 100644
--- a/src/views/iot/vehicle/index.vue
+++ b/src/views/iot/vehicle/index.vue
@@ -149,7 +149,13 @@
       ></el-table-column>
       <el-table-column fixed="right" label="操作" width="120" align="center">
         <template #default="{ row }">
-          <el-button type="text" @click="bindProject(row)">绑定项目</el-button>
+          <el-button
+            v-if="isBtnPerm('/tq/api/bindProject')"
+            type="text"
+            @click="bindProject(row)"
+          >
+            绑定项目
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/iot/ywry/index.vue b/src/views/iot/ywry/index.vue
new file mode 100644
index 0000000..c7943fa
--- /dev/null
+++ b/src/views/iot/ywry/index.vue
@@ -0,0 +1,389 @@
+<template>
+  <div class="manage-container">
+    <div class="manage-wrap">
+      <div class="manage-input">
+        <el-form ref="queryForm" :model="queryForm" label-width="80px">
+          <vab-query-form>
+            <el-form-item width="100" prop="name" label="单据编号">
+              <el-input
+                v-model="queryForm.name"
+                size="small"
+                placeholder="请输入单据编号"
+              ></el-input>
+            </el-form-item>
+          </vab-query-form>
+        </el-form>
+      </div>
+      <div class="manage-button">
+        <el-button size="small" @click="resetForm()">重置</el-button>
+        <el-button type="primary" size="small" @click="search">查询</el-button>
+        <el-button type="primary" size="small" @click="deletes">
+          批量删除
+        </el-button>
+      </div>
+    </div>
+    <el-table
+      v-loading="listLoading"
+      :data="groupData"
+      border
+      stripe
+      style="width: 100%"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55"></el-table-column>
+      <el-table-column
+        prop="fid"
+        label="ID"
+        width="80"
+        align="center"
+      ></el-table-column>
+      <el-table-column
+        prop="billNo"
+        label="单据编号"
+        width="160"
+        align="center"
+      ></el-table-column>
+      <el-table-column
+        prop="customerName"
+        label="客户名称"
+        width="240"
+        align="center"
+      ></el-table-column>
+
+      <el-table-column
+        prop="materialCode"
+        label="物料编码"
+        align="center"
+      ></el-table-column>
+      <el-table-column
+        prop="materialName"
+        label="物料名称"
+        align="center"
+      ></el-table-column>
+      <el-table-column prop="realQty" label="数量/单位" align="center">
+        <template #default="{ row }">
+          {{ row.realQty }} /{{ row.unitName }}
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="stockName"
+        label="仓库"
+        align="center"
+      ></el-table-column>
+      <el-table-column prop="" label="时间" align="center">
+        <template #default="{ row }">
+          {{ getFormatData(row.date) }}
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="documentStatus"
+        label="状态"
+        align="center"
+      ></el-table-column>
+      <el-table-column fixed="right" label="操作" align="center">
+        <template #default="{ row }">
+          <el-button type="text" @click="handleEdit(row)">出库详情</el-button>
+          <el-button type="text" @click="qrProject(row)">二维码</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      :background="background"
+      :current-page="queryForm.page"
+      layout="prev, pager, next, jumper"
+      :page-size="queryForm.size"
+      style="text-align: right"
+      @current-change="handleCurrentChange"
+      @size-change="handleSizeChange"
+    ></el-pagination>
+  </div>
+
+  <el-dialog
+    v-model="dialogFormVisible"
+    :title="title"
+    width="50%"
+    @close="close"
+  >
+    <el-tabs>
+      <el-tab-pane label="基本信息" v-if="dialogFormVisible">
+        <info :data="data.basicInfo" keyName="basicInfo"></info>
+      </el-tab-pane>
+      <el-tab-pane label="客户信息" name="second">
+        <info :data="data.customerInfo" keyName="customerInfo"></info>
+      </el-tab-pane>
+      <el-tab-pane label="财务信息" name="third">
+        <info :data="data.financialInfo" keyName="financialInfo"></info>
+      </el-tab-pane>
+      <el-tab-pane label="物流信息" name="fourth">暂无物流信息</el-tab-pane>
+    </el-tabs>
+    <div class="dialog-footer"></div>
+  </el-dialog>
+  <el-dialog
+    v-model="dialogqrcodeVisible"
+    title="二维码信息"
+    width="50%"
+    @close="close"
+  >
+    <qcode :url="codeUrl"></qcode>
+
+    <el-descriptions :column="3" border>
+      <el-descriptions-item
+        :label="item.attributeName"
+        v-for="(item, index) in qrinfoData"
+      >
+        {{ item.attributeValue }}
+      </el-descriptions-item>
+    </el-descriptions>
+
+    <div class="dialog-footer"></div>
+  </el-dialog>
+</template>
+
+<script>
+import { getList, details, productAttribute } from '@/api/ywry';
+import qcode from './qcode';
+
+import info from './info';
+import { getDate } from '@/common/times';
+import QRCode from 'qrcode';
+export default {
+  name: 'Index',
+  components: {
+    info,
+    qcode,
+  },
+  data() {
+    return {
+      groupData: [],
+      lazy: true,
+
+      layout: 'total, sizes, prev, pager, next, jumper',
+      total: 0,
+      background: true,
+      listLoading: true,
+      dialogFormVisible: false,
+      dialogqrcodeVisible: false,
+      title: '详情',
+      elementLoadingText: '正在加载...',
+      ids: [],
+      queryForm: {
+        page: 1,
+        size: 10,
+        name: '',
+      },
+      codeUrl: '',
+      data: {},
+      qrinfoData: {},
+      printObj: {
+        id: 'printMe', // 这里是要打印元素的ID
+        // url:'https://www.baidu.com/',
+        popTitle: '打印表单', // 打印的标题
+        // extraCss: "https://cdn.bootcdn.net/ajax/libs/animate.css/4.1.1/animate.compat.css, https://cdn.bootcdn.net/ajax/libs/hover.css/2.3.1/css/hover-min.css", // 打印可引入外部的一个 css 文件
+        // extraHead: '<meta http-equiv="Content-Language"content="zh-cn"/>', // 打印头部文字
+        // preview: true, // 是否启动预览模式，默认是false
+        previewTitle: '打印客户账单', // 打印预览的标题
+        previewPrintBtnLabel: '预览结束，开始打印', // 打印预览的标题下方的按钮文本，点击可进入打印
+        zIndex: 20003, // 预览窗口的z-index，默认是20002，最好比默认值更高
+        previewBeforeOpenCallback() {
+          console.log('正在加载预览窗口！');
+        }, // 预览窗口打开之前的callback
+        previewOpenCallback() {
+          console.log('已经加载完预览窗口，预览打开了！');
+        }, // 预览窗口打开时的callback
+        beforeOpenCallback(vue) {
+          vue.printLoading = true;
+          console.log('开始打印之前！');
+        }, // 开始打印之前的callback
+        openCallback(vue) {
+          vue.printLoading = false;
+          console.log('监听到了打印窗户弹起了！');
+        }, // 调用打印时的callback
+        closeCallback() {
+          console.log('关闭了打印工具！');
+        }, // 关闭打印的callback(点击弹窗的取消和打印按钮都会触发)
+        clickMounted() {
+          console.log('点击v-print绑定的按钮了！');
+        },
+      },
+    };
+  },
+  computed: {
+    height() {
+      return 500;
+    },
+  },
+  created() {
+    this.fetchData();
+  },
+  methods: {
+    async fetchData() {
+      this.listLoading = true;
+
+      const { data } = await getList(this.queryForm);
+      this.groupData = data;
+      this.total = data.total;
+      setTimeout(() => {
+        this.listLoading = false;
+      }, 500);
+    },
+    getFormatData(time) {
+      return getDate(time);
+    },
+    search() {
+      this.fetchData();
+    },
+    qrProject(row) {
+      let code = 'C0200053'; // row.materialCode
+      productAttribute(code).then(res => {
+        this.dialogqrcodeVisible = true;
+        this.codeUrl = 'http://sm.lidinghb.com?materialCode=' + code;
+        this.qrinfoData = res.data;
+      });
+    },
+    handleAdd() {
+      this.$refs['edit'].showEdit();
+    },
+    handleEdit(row) {
+      details(row.fid).then(res => {
+        this.data = res.data;
+        this.dialogFormVisible = true;
+      });
+    },
+    resetForm() {
+      this.$refs.queryForm.resetFields();
+    },
+    handleQuery() {
+      this.queryForm.page = 1;
+      this.fetchData();
+    },
+    handleSizeChange(val) {
+      this.queryForm.size = val;
+      this.fetchData();
+    },
+    handleCurrentChange(val) {
+      if (val) {
+        this.queryForm.page = val;
+        this.fetchData();
+      }
+    },
+    deletes() {
+      const ids = this.ids;
+      const that = this;
+      if (ids.length == 0) {
+        this.$message({
+          type: 'info',
+          message: '没有选中任何项',
+        });
+        return false;
+      }
+      this.$confirm('你确定要删除吗?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          const { msg } = remove(ids);
+          this.$message({
+            type: 'success',
+            message: msg == undefined ? '删除成功' : msg,
+          });
+          setTimeout(function () {
+            that.fetchData();
+          }, 1000);
+        })
+        .catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消删除',
+          });
+        });
+    },
+    handleSelectionChange(val) {
+      const ids = [];
+      val.forEach(row => {
+        ids.push(row.id);
+      });
+      this.ids = ids;
+    },
+    handleDelete(row) {
+      var that = this;
+      if (row.id) {
+        this.$confirm('你确定要删除当前项吗?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+        })
+          .then(() => {
+            const { msg } = doDelete([row.id]);
+            this.$message({
+              type: 'success',
+              message: msg == undefined ? '删除成功' : msg,
+            });
+            setTimeout(function () {
+              that.fetchData();
+            }, 1000);
+          })
+          .catch(() => {
+            this.$message({
+              type: 'info',
+              message: '已取消删除',
+            });
+          });
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.manage-wrap {
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-start;
+  .el-input {
+    width: 200px !important;
+  }
+  .el-select {
+    width: 200px !important;
+  }
+  .manage-button {
+    padding-left: 12px;
+    margin-bottom: 30px;
+  }
+}
+</style>
+
+<style lang="scss">
+.el-submenu__title:hover {
+  background-color: rgba(#1890ff, 0.085) !important;
+  color: hsla(208, 100%, 55%, 0.95) !important;
+}
+.el-dialog {
+  .el-dialog__header {
+    background-color: #1890ff !important;
+    padding: 15px 20px;
+    text-align: left !important;
+    .el-dialog__title {
+      color: #e8f4ff !important;
+    }
+    .el-dialog__headerbtn .el-dialog__close {
+      color: #e8f4ff !important;
+    }
+  }
+  .el-dialog__body {
+    padding: 20px !important;
+    .el-form-item {
+      margin-bottom: 10px !important;
+      .el-input {
+        width: 100% !important;
+      }
+      .el-select {
+        width: 100% !important;
+      }
+    }
+    .el-form-item:last-child {
+      margin-bottom: 20px !important;
+    }
+  }
+}
+</style>
diff --git a/src/views/iot/ywry/info.vue b/src/views/iot/ywry/info.vue
new file mode 100644
index 0000000..c817b58
--- /dev/null
+++ b/src/views/iot/ywry/info.vue
@@ -0,0 +1,177 @@
+<template>
+ <el-descriptions  :column="4" border>
+  <el-descriptions-item :label="item.label" v-for="(item, index) in projectData">{{item.value}}</el-descriptions-item>
+暂无信息
+</el-descriptions>
+</template>
+
+<script >
+
+export default {
+  data() {
+    return {
+      basicInfo:{
+
+    billNo: '单据编号',
+    /**
+     * 单据类型
+     */
+    billTypeName: '单据类型',
+    /**
+     * 运输单号
+     */
+    carriageNO: '运输单号',
+    /**
+     * 承运商
+     */
+    carrierName: '承运商',
+    /**
+     * 客户
+     */
+    customerName: '客户',
+    /**
+     * 日期
+     */
+    date: '日期',
+    /**
+     * 发货部门
+     */
+    deliveryDeptName: '发货部门',
+    /**
+     * 单据状态
+     */
+    documentStatus: '单据状态',
+    /**
+     * 交货地点
+     */
+    headLocationName: '交货地点',
+    /**
+     * 销售部门
+     */
+    saleDeptName: '销售部门',
+    /**
+     * 销售组织
+     */
+    saleOrgName: '销售组织',
+    /**
+     * 销售组
+     */
+    salesGroupName: '销售组',
+    /**
+     * 销售员
+     */
+    salesManName: '销售员',
+    /**
+     * 结算币种
+     */
+    settleCurrName: '结算币种',
+    /**
+     * 库存组
+     */
+    stockerGroupName: '库存组',
+    /**
+     * 仓管员
+     */
+    stockerName: '仓管员',
+    /**
+     * 发货组织
+     */
+    stockOrgName: '发货组织',
+
+      },
+      customerInfo:{
+         /**
+     * 收货人姓名
+     */
+    linkMan: '收货人姓名',
+    /**
+     * 联系电
+     */
+    linkPhone: '联系电话',
+    /**
+     * 结算方
+     */
+    payerName: '结算方',
+    /**
+     * 收货方地址
+     */
+    receiveAddress: '收货方地址',
+    /**
+     * 收货方联系人
+     */
+    receiverContactName: '收货方联系人',
+    /**
+     * 收货方
+     */
+    receiverName: '收货方',
+    /**
+     * 结算方
+     */
+    settleName: '结算方',
+      },
+      financialInfo:{
+     /**
+     * 整单折扣额
+     */
+    allDisCount: '整单折扣额',
+    /**
+     * 汇率
+     */
+    exchangeRate: '汇率',
+    /**
+     * 汇率类型
+     */
+    exchangeTypeName: '汇率类型',
+    /**
+     * 本位币
+     */
+    localCurrName: '本位币',
+    /**
+     * 收款条件
+     */
+    receiptConditionName: '收款条件',
+    /**
+     * 结算币种
+     */
+    settleCurrName: '结算币种',
+    /**
+     * 结算组织
+     */
+    settleOrgName: '结算组织',
+    /**
+     * 结算方式
+     */
+    settleTypeName: '结算方式',
+    },
+    projectData:[],
+    };
+
+  },
+  props:['data','keyName'],
+  created() {
+    this.formatData(this.data)
+  },
+  methods: {
+    formatData(data){
+      if(data){
+        for(var key in data){
+
+          if(this[this.keyName][key]){
+            this.projectData.push({
+              label:this[this.keyName][key],
+              value:data[key]||'/'
+            })
+          }
+        }
+      }
+
+    }
+
+  },
+};
+</script>
+<style>
+.select {
+  width: 100%;
+}
+</style>
diff --git a/src/views/iot/ywry/qcode.vue b/src/views/iot/ywry/qcode.vue
new file mode 100644
index 0000000..f4a52cf
--- /dev/null
+++ b/src/views/iot/ywry/qcode.vue
@@ -0,0 +1,269 @@
+<template>
+  <el-button
+    type="primary"
+    style="display: block; margin-left: 40px"
+    ref="printButton"
+    v-print="'#printCanvas'"
+  >
+    打印
+  </el-button>
+
+  <div id="printCanvas" class="container">
+    <img src="@/assets/mb.jpg" />
+    <div class="equipment">HS CODE 8421219990</div>
+    <div class="date">2023-02-17</div>
+    <img :src="qcodeImg" class="qrcodeimg" ass />
+    <!--
+    <div class="containerTable">
+      <div class="flexCss">
+        <div class="flexleft">
+          <p>Li Ding</p>
+          <p>Environmenta</p>
+        </div>
+        <div>
+          <p>力鼎清道夫</p>
+          <p>LD Household Sewage Treatment Plant (STP)</p>
+        </div>
+      </div>
+      <div class="item">出厂日期(Date):</div>
+      <div class="item">
+        产地(Place of production): 江苏 南通 Nantong City, China
+      </div>
+      <div class="item">设备编码(Equipment code):</div>
+      <div class="footer">
+        <div class="footerLeft">
+          <p>江苏力鼎环保装备有限公司</p>
+          <p class="smallsize">
+            Jiangsu LiDing Environmental Protection Equipment Co., Ltd.
+          </p>
+          <p>E-mail:liding@lidinghb.com Tel: +86 4006-828-666</p>
+        </div>
+        <div></div>
+      </div>
+
+    </div>
+    -->
+  </div>
+</template>
+<script setup>
+import QRCode from 'qrcode';
+import { ref, onMounted } from 'vue';
+
+const canvasref = ref(null);
+
+const qcodeImg = ref();
+
+const props = defineProps(['url']);
+console.log(props.url);
+const printButton = ref(null);
+const printObj = ref({
+  id: 'printMe', // 这里是要打印元素的ID
+  // url:'https://www.baidu.com/',
+  popTitle: '打印表单', // 打印的标题
+  // extraCss: "https://cdn.bootcdn.net/ajax/libs/animate.css/4.1.1/animate.compat.css, https://cdn.bootcdn.net/ajax/libs/hover.css/2.3.1/css/hover-min.css", // 打印可引入外部的一个 css 文件
+  // extraHead: '<meta http-equiv="Content-Language"content="zh-cn"/>', // 打印头部文字
+  // preview: true, // 是否启动预览模式，默认是false
+  previewTitle: '打印客户账单', // 打印预览的标题
+  previewPrintBtnLabel: '预览结束，开始打印', // 打印预览的标题下方的按钮文本，点击可进入打印
+  zIndex: 20003, // 预览窗口的z-index，默认是20002，最好比默认值更高
+  previewBeforeOpenCallback() {
+    console.log('正在加载预览窗口！');
+  }, // 预览窗口打开之前的callback
+  previewOpenCallback() {
+    console.log('已经加载完预览窗口，预览打开了！');
+  }, // 预览窗口打开时的callback
+  beforeOpenCallback(vue) {
+    vue.printLoading = true;
+    console.log('开始打印之前！');
+  }, // 开始打印之前的callback
+  openCallback(vue) {
+    vue.printLoading = false;
+    console.log('监听到了打印窗户弹起了！');
+  }, // 调用打印时的callback
+  closeCallback() {
+    console.log('关闭了打印工具！');
+  }, // 关闭打印的callback(点击弹窗的取消和打印按钮都会触发)
+  clickMounted() {
+    console.log('点击v-print绑定的按钮了！');
+  },
+});
+
+function printCanvas() {
+  debugger;
+
+  const img = canvasref.value.toDataURL('image/png');
+
+  // 创建一个新的Image对象
+  const printImage = new Image();
+
+  // 等待图片加载完成后再进行打印
+  printImage.onload = () => {};
+
+  // 设置图片源为canvas转换的DataURL
+  printImage.src = img;
+}
+
+onMounted(() => {
+  QRCode.toDataURL(props.url, (error, url) => {
+    debugger;
+    if (url) {
+      qcodeImg.value = url;
+    }
+    if (error) console.error(error);
+  });
+});
+</script>
+<style second>
+.container {
+  width: 600px;
+  height: 400px;
+  position: relative;
+  img {
+    width: 100%;
+  }
+  .qrcodeimg {
+    width: 80px;
+    height: 80px;
+    position: absolute;
+    bottom: 49px;
+    right: 49px;
+  }
+  .equipment {
+    position: absolute;
+    top: 231px;
+    left: 281px;
+    font-size: 20px;
+    font-weight: 500;
+    color: #000;
+  }
+  .date {
+    position: absolute;
+    top: 121px;
+    left: 180px;
+
+    font-size: 20px;
+    font-weight: 500;
+    color: #000;
+  }
+}
+.containerTable {
+  width: 500px;
+  border: 1px solid #000;
+  background: #ccc;
+  color: #000;
+  position: relative;
+  .item {
+    border-top: 1px solid #000;
+    padding-left: 10px;
+    height: 50px;
+    line-height: 50px;
+  }
+
+  .flexCss {
+    text-align: center;
+    display: flex;
+    .flexleft {
+      width: 30%;
+      border-right: 1px solid #000;
+    }
+  }
+  .footer {
+    border-top: 1px solid #000;
+    display: flex;
+    .footerLeft {
+      width: 70%;
+      text-align: center;
+      .smallsize {
+        font-size: 12px;
+      }
+    }
+  }
+}
+</style>
+<style scoped>
+@media print {
+  @page {
+    size: 60mm 40mm;
+    margin: 0;
+    padding: 0;
+  }
+  body {
+    font-family: 'Arial', sans-serif;
+    font-size: 12pt;
+    color: #333;
+    margin: 0;
+    padding: 0;
+  }
+  img {
+    width: 61mm;
+    height: 39mm;
+  }
+
+  .container {
+    width: 60mm;
+    height: 40mm;
+    position: relative;
+    .equipment {
+      position: absolute;
+      top: 24mm;
+      left: 28mm;
+      font-size: 6pt;
+      font-weight: 500;
+      color: #000;
+    }
+    .date {
+      position: absolute;
+      top: 47px;
+      left: 18mm;
+
+      font-size: 6pt;
+      font-weight: 500;
+      color: #000;
+    }
+    img {
+      width: 61mm;
+      height: 39mm;
+    }
+
+    .qrcodeimg {
+      width: 8mm;
+      height: 8mm;
+      position: absolute;
+      bottom: 14px;
+      right: 4mm;
+    }
+  }
+  .containerTable {
+    width: 60mm;
+    border: 1px solid #000;
+    background: #ccc;
+    font-size: 12pt;
+    color: #000;
+    .item {
+      border-top: 1px solid #000;
+      padding-left: 10px;
+      height: 5mm;
+      line-height: 5mm;
+    }
+    .flexCss {
+      text-align: center;
+      display: flex;
+      .flexleft {
+        width: 30%;
+        border-right: 1px solid #000;
+      }
+    }
+    .footer {
+      border-top: 1px solid #000;
+      display: flex;
+      .footerLeft {
+        width: 70%;
+        text-align: center;
+        .smallsize {
+          font-size: 2pt;
+        }
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/log/action/index.vue b/src/views/log/action/index.vue
index f1cd896..cb31d36 100644
--- a/src/views/log/action/index.vue
+++ b/src/views/log/action/index.vue
@@ -62,7 +62,12 @@
     <div class="manage-button">
       <el-button size="small" @click="resetForm()">重置</el-button>
       <el-button type="primary" size="small" @click="search">查询</el-button>
-      <el-button type="primary" size="small" @click="exportData">
+      <el-button
+        v-if="isBtnPerm('/operLog/export')"
+        type="primary"
+        size="small"
+        @click="exportData"
+      >
         导出
       </el-button>
     </div>
@@ -170,7 +175,13 @@
         align="center"
       >
         <template #default="{ row }">
-          <el-button type="text" @click="handleDelete(row)">删除</el-button>
+          <el-button
+            v-if="isBtnPerm('/operLog/remove')"
+            type="text"
+            @click="handleDelete(row)"
+          >
+            删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/log/login/index.vue b/src/views/log/login/index.vue
index e4799f2..1196e1d 100644
--- a/src/views/log/login/index.vue
+++ b/src/views/log/login/index.vue
@@ -28,7 +28,12 @@
       <div class="manage-button">
         <el-button size="small" @click="resetForm()">重置</el-button>
         <el-button type="primary" size="small" @click="search">查询</el-button>
-        <el-button type="primary" size="small" @click="exportData">
+        <el-button
+          v-if="isBtnPerm('/loginLog/export')"
+          type="primary"
+          size="small"
+          @click="exportData"
+        >
           导出
         </el-button>
       </div>
@@ -90,7 +95,13 @@
       ></el-table-column>
       <el-table-column fixed="right" prop="details" label="操作" align="center">
         <template #default="{ row }">
-          <el-button type="text" @click="handleDelete(row)">删除</el-button>
+          <el-button
+            v-if="isBtnPerm('/loginLog/remove')"
+            type="text"
+            @click="handleDelete(row)"
+          >
+            删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/login/trialAdd.vue b/src/views/login/trialAdd.vue
index 4e8d1f4..1c3cf3c 100644
--- a/src/views/login/trialAdd.vue
+++ b/src/views/login/trialAdd.vue
@@ -96,6 +96,7 @@ export default {
           });
           this.$refs['form'].resetFields();
           this.dialogFormVisible = false;
+          this.$router.go(-1);
         } else {
           return false;
         }
diff --git a/src/views/operation/list/details.vue b/src/views/operation/list/details.vue
new file mode 100644
index 0000000..bb58269
--- /dev/null
+++ b/src/views/operation/list/details.vue
@@ -0,0 +1,177 @@
+<template>
+  <div class="manage-container">
+    <div class="manage-input">
+      <el-form ref="queryForm" :model="queryForm" label-width="80px">
+        <vab-query-form>
+          <el-form-item width="330" prop="type" label="站点">
+            <el-cascader
+              v-model="queryForm.device"
+              :options="deviceData"
+              :props="{
+                value: 'id',
+                label: 'name',
+                children: 'deviceList',
+              }"
+              clearable
+              filterable
+              @change="changeDevice"
+            ></el-cascader>
+          </el-form-item>
+          <el-form-item width="100" prop="time" label="日期">
+            <el-date-picker
+              v-model="queryForm.time"
+              size="small"
+              type="daterange"
+              align="right"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+              @change="changeTime"
+            ></el-date-picker>
+          </el-form-item>
+        </vab-query-form>
+      </el-form>
+    </div>
+    <div class="manage-button">
+      <el-form-item width="100">
+        <el-button size="small" @click="resetForm()">重置</el-button>
+        <el-button type="primary" size="small" @click="search">查询</el-button>
+      </el-form-item>
+    </div>
+    <el-table
+      id="table"
+      v-loading="listLoading"
+      :data="tableData"
+      border
+      stripe
+      style="width: 100%"
+    >
+      <el-table-column
+        prop="name"
+        label="站点"
+        align="center"
+      ></el-table-column>
+      <el-table-column
+        prop="风机指示灯-故障"
+        label="风机指示灯-故障"
+        align="center"
+        sortable
+      ></el-table-column>
+      <el-table-column
+        prop="电磁阀指示灯-故障"
+        label="电磁阀指示灯-故障"
+        align="center"
+        sortable
+      ></el-table-column>
+      <el-table-column
+        prop="水泵指示灯-故障"
+        label="水泵指示灯-故障"
+        align="center"
+        sortable
+      ></el-table-column>
+      <el-table-column
+        prop="抽水泵状态-故障"
+        label="抽水泵状态-故障"
+        align="center"
+        sortable
+      ></el-table-column>
+      <el-table-column
+        prop="站点离线"
+        label="站点离线"
+        align="center"
+        sortable
+      ></el-table-column>
+      <el-table-column
+        prop="风机状态-故障"
+        label="风机状态-故障"
+        align="center"
+        sortable
+      ></el-table-column>
+      <el-table-column
+        prop="加药泵指示灯-故障"
+        label="加药泵指示灯-故障"
+        align="center"
+        sortable
+      ></el-table-column>
+      <el-table-column
+        prop="水泵状态-故障"
+        label="水泵状态-故障"
+        align="center"
+        sortable
+      ></el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+import { getFaultDetails, getProjectDeviceTree } from '@/api/operation';
+import { getDate, getPastTime } from '@/common/times';
+export default {
+  data() {
+    return {
+      listLoading: true,
+      title: '故障详情',
+      tableData: [],
+      deviceData: [],
+      queryForm: {
+        page: 1,
+        size: 20,
+        start: '',
+        end: '',
+        projectId: '',
+        deviceId: '',
+      },
+    };
+  },
+  created() {
+    this.getProjectDeviceTree();
+    this.queryForm.start = this.$route.query.start;
+    this.queryForm.end = this.$route.query.end;
+    this.queryForm.projectId = this.$route.query.projectId;
+    this.queryForm.deviceId = this.$route.query.deviceId;
+    this.getFaultDetails();
+  },
+  methods: {
+    // loadScript() {
+    //   const row = this.$route.query.row;
+    //   this.dialogFormVisible = true;
+    //   this.queryForm.start = row.start;
+    //   this.queryForm.end = row.end;
+    //   this.queryForm.projectId = row.projectId;
+    //   this.queryForm.deviceId = row.deviceId;
+    //   this.getFaultDetails();
+    // },
+    changeTime() {
+      this.queryForm.start = getDate(this.queryForm.time[0]);
+      this.queryForm.end = getDate(this.queryForm.time[1]);
+    },
+    // 层级显示站点
+    async getProjectDeviceTree() {
+      const { data } = await getProjectDeviceTree();
+      this.deviceData = data;
+    },
+    //搜索
+    search() {
+      this.getFaultDetails(this.queryForm);
+    },
+    resetForm() {
+      this.$refs.queryForm.resetFields();
+    },
+    changeDevice(e) {
+      this.queryForm.projectId = e[0];
+      this.queryForm.deviceId = e[1];
+    },
+    async getFaultDetails() {
+      const { data } = await getFaultDetails(this.queryForm);
+      this.listLoading = false;
+      this.tableData = data;
+    },
+  },
+};
+</script>
+
+<style>
+#mapContainer {
+  width: 100%;
+  height: 400px;
+}
+</style>
diff --git a/src/views/operation/list/index.vue b/src/views/operation/list/index.vue
new file mode 100644
index 0000000..ff676dd
--- /dev/null
+++ b/src/views/operation/list/index.vue
@@ -0,0 +1,163 @@
+<template>
+  <div class="manage-container">
+    <div class="manage-input">
+      <el-form ref="queryForm" :model="queryForm" label-width="80px">
+        <vab-query-form>
+          <el-form-item width="330" prop="type" label="站点">
+            <el-cascader
+              v-model="queryForm.device"
+              :options="deviceData"
+              :props="{
+                value: 'id',
+                label: 'name',
+                children: 'deviceList',
+              }"
+              @change="changeDevice"
+              clearable
+              filterable
+            ></el-cascader>
+          </el-form-item>
+          <el-form-item width="100" prop="time" label="日期">
+            <el-date-picker
+              v-model="queryForm.time"
+              size="small"
+              type="daterange"
+              align="right"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+              @change="changeTime"
+            ></el-date-picker>
+          </el-form-item>
+        </vab-query-form>
+      </el-form>
+    </div>
+    <div class="manage-button">
+      <el-form-item width="100">
+        <el-button size="small" @click="resetForm()">重置</el-button>
+        <el-button type="primary" size="small" @click="search">查询</el-button>
+      </el-form-item>
+    </div>
+    <el-table
+      id="table"
+      v-loading="listLoading"
+      :data="tableData"
+      border
+      stripe
+      style="width: 100%"
+    >
+      <el-table-column
+        fixed
+        prop="count"
+        label="故障次数"
+        align="center"
+      ></el-table-column>
+      <el-table-column
+        prop="fault"
+        label="故障"
+        align="center"
+      ></el-table-column>
+      <el-table-column fixed="right" label="操作" align="center">
+        <template #default="{ row }">
+          <el-button type="text" @click="details(row)">详情</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+import { getDate, getPastTime } from '@/common/times';
+import { getData, getProjectDeviceTree } from '@/api/operation';
+export default {
+  data() {
+    return {
+      tableData: [],
+      lazy: true,
+      layout: 'total, sizes, prev, pager, next, jumper',
+      total: 0,
+      background: true,
+      listLoading: false,
+      elementLoadingText: '正在加载...',
+      queryForm: {
+        page: 1,
+        size: 20,
+        deviceId: '',
+        start: '',
+        end: '',
+        time: '',
+        projectId: '',
+      },
+      deviceData: [],
+      form: {
+        id: '',
+        location: '',
+      },
+    };
+  },
+  created() {
+    this.fetchData();
+    this.getProjectDeviceTree();
+  },
+  methods: {
+    changeTime() {
+      this.queryForm.start = getDate(this.queryForm.time[0]);
+      this.queryForm.end = getDate(this.queryForm.time[1]);
+    },
+    // 层级显示站点
+    async getProjectDeviceTree() {
+      const { data } = await getProjectDeviceTree();
+      this.deviceData = data;
+    },
+    // 选择站点
+    changeDevice(e) {
+      this.queryForm.projectId = e[0];
+      this.queryForm.deviceId = e[1];
+    },
+    // 轨迹
+    details(row) {
+      this.$router.push({
+        name: '故障详情',
+        path: '/operationData',
+        query: {
+          deviceId: this.queryForm.deviceId,
+          projectId: this.queryForm.projectId,
+          start: this.queryForm.start,
+          end: this.queryForm.end,
+        },
+      });
+      // this.$refs['details'].loadScript(this.queryForm);
+    },
+    // 获取数据
+    async fetchData() {
+      const { data } = await getData(this.queryForm);
+      this.tableData = data;
+    },
+    //搜索
+    search() {
+      this.fetchData(this.queryForm);
+    },
+    resetForm() {
+      this.$refs.queryForm.resetFields();
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.el-input {
+  width: 200px !important;
+}
+.el-select {
+  width: 200px !important;
+}
+.manage-button {
+  padding-left: 12px;
+}
+</style>
+
+<style lang="scss">
+.el-submenu__title:hover {
+  background-color: rgba(#1890ff, 0.085) !important;
+  color: hsla(208, 100%, 55%, 0.95) !important;
+}
+</style>
diff --git a/src/views/operation/sys/analysis/deptAnalysis.vue b/src/views/operation/sys/analysis/deptAnalysis.vue
new file mode 100644
index 0000000..a1a8b96
--- /dev/null
+++ b/src/views/operation/sys/analysis/deptAnalysis.vue
@@ -0,0 +1,98 @@
+<template>
+  <div
+    id="deptAnalysis"
+    v-loading="Loading"
+    style="width: 100%; height: 300px"
+  ></div>
+</template>
+
+<script>
+import * as echarts from 'echarts';
+import { dept } from '@/api/sys';
+export default {
+  props: {
+    time: {
+      type: String,
+    },
+  },
+  data() {
+    return {
+      chartPie: null,
+      Loading: true,
+      data: [],
+      month: '',
+    };
+  },
+  watch: {
+    time(value) {
+      this.month = value;
+      this.getUserAnalysis();
+      setTimeout(() => {
+        this.drawPieChart();
+      }, 2000);
+    },
+  },
+
+  mounted: function () {},
+  methods: {
+    async getUserAnalysis() {
+      const { data } = await dept({ month: this.month });
+      var list = [];
+      data.forEach(function (v, k) {
+        list.push({ name: v.dept, value: v.count });
+      });
+      this.data = list;
+    },
+    drawPieChart() {
+      this.chartPie = echarts.init(document.getElementById('deptAnalysis'));
+      this.chartPie.setOption({
+        tooltip: {
+          trigger: 'item',
+          axisPointer: {
+            type: 'shadow',
+          },
+        },
+        legend: {
+          top: '15%',
+          left: 'center',
+        },
+        title: {
+          left: 'center',
+          text: '部门分析',
+        },
+        series: {
+          type: 'pie',
+          top: 65,
+          radius: [60, 100],
+          left: 'center',
+          itemStyle: {
+            borderColor: '#fff',
+            borderWidth: 1,
+          },
+          label: {
+            alignTo: 'edge',
+            minMargin: 5,
+            edgeDistance: 10,
+            lineHeight: 15,
+            rich: {
+              time: {
+                fontSize: 10,
+                color: '#999',
+              },
+            },
+          },
+          labelLine: {
+            length: 15,
+            length2: 0,
+            maxSurfaceAngle: 80,
+          },
+          data: this.data,
+        },
+      });
+      this.Loading = false;
+    },
+  },
+};
+</script>
+
+<style scoped></style>
diff --git a/src/views/operation/sys/analysis/detailsAnalysis.vue b/src/views/operation/sys/analysis/detailsAnalysis.vue
new file mode 100644
index 0000000..ff57482
--- /dev/null
+++ b/src/views/operation/sys/analysis/detailsAnalysis.vue
@@ -0,0 +1,102 @@
+<template>
+  <div
+    id="details"
+    style="width: 100%; height: 300px"
+    v-loading="Loading"
+  ></div>
+</template>
+
+<script>
+import * as echarts from 'echarts';
+import { details } from '@/api/sys';
+export default {
+  props: {
+    time: {
+      type: String,
+    },
+  },
+  data() {
+    return {
+      chartPie: null,
+      Loading: true,
+      yData: [],
+      xData: [],
+      month: '',
+    };
+  },
+  watch: {
+    time(value) {
+      this.month = value;
+      this.getUserAnalysis();
+      setTimeout(() => {
+        this.drawCharts();
+      }, 2000);
+    },
+  },
+
+  mounted: function () {},
+  methods: {
+    async getUserAnalysis() {
+      const { data } = await details({ month: this.month });
+      var xData = [];
+      var yData = [];
+      data.forEach(function (v, k) {
+        xData.push(v.date);
+        yData.push(v.count);
+      });
+      this.xData = xData;
+      this.yData = yData;
+    },
+    drawPieChart() {
+      this.chartPie = echarts.init(document.getElementById('details'));
+      this.chartPie.setOption({
+        tooltip: {
+          trigger: 'item',
+          axisPointer: {
+            type: 'shadow',
+          },
+        },
+        title: {
+          left: 'center',
+          text: '详情分析',
+        },
+        grid: {
+          left: '3%',
+          right: '4%',
+          bottom: '3%',
+          containLabel: true,
+        },
+        xAxis: [
+          {
+            type: 'category',
+            axisLabel: { interval: 0, rotate: 270 },
+            data: this.xData,
+            axisTick: {
+              alignWithLabel: true,
+            },
+          },
+        ],
+        yAxis: [
+          {
+            type: 'value',
+          },
+        ],
+        series: [
+          {
+            name: '数量',
+            type: 'line',
+            barWidth: '60%',
+            data: this.yData,
+          },
+        ],
+      });
+      this.Loading = false;
+    },
+    drawCharts() {
+      this.drawPieChart();
+    },
+  },
+};
+</script>
+
+<style scoped></style>
diff --git a/src/views/operation/sys/analysis/moduleAnalysis.vue b/src/views/operation/sys/analysis/moduleAnalysis.vue
new file mode 100644
index 0000000..8747e4c
--- /dev/null
+++ b/src/views/operation/sys/analysis/moduleAnalysis.vue
@@ -0,0 +1,98 @@
+<template>
+  <div id="module" style="width: 100%; height: 300px" v-loading="Loading"></div>
+</template>
+
+<script>
+import * as echarts from 'echarts';
+import { module } from '@/api/sys';
+export default {
+  props: {
+    time: {
+      type: String,
+    },
+  },
+  data() {
+    return {
+      chartPie: null,
+      Loading: true,
+      yData: [],
+      xData: [],
+      month: '',
+    };
+  },
+  watch: {
+    time(value) {
+      this.month = value;
+      this.getUserAnalysis();
+      setTimeout(() => {
+        this.drawCharts();
+      }, 2000);
+    },
+  },
+
+  mounted: function () {},
+  methods: {
+    async getUserAnalysis() {
+      const { data } = await module({ month: this.month });
+      var xData = [];
+      var yData = [];
+      data.forEach(function (v, k) {
+        xData.push(v.module);
+        yData.push(v.count);
+      });
+      this.xData = xData;
+      this.yData = yData;
+    },
+    drawPieChart() {
+      this.chartPie = echarts.init(document.getElementById('module'));
+      this.chartPie.setOption({
+        tooltip: {
+          trigger: 'item',
+          axisPointer: {
+            type: 'shadow',
+          },
+        },
+        title: {
+          left: '部门分析',
+        },
+        grid: {
+          left: '3%',
+          right: '4%',
+          bottom: '3%',
+          containLabel: true,
+        },
+        xAxis: [
+          {
+            type: 'category',
+            axisLabel: { interval: 0, rotate: 270 },
+            data: this.xData,
+            axisTick: {
+              alignWithLabel: true,
+            },
+          },
+        ],
+        yAxis: [
+          {
+            title: '111',
+            type: 'value',
+          },
+        ],
+        series: [
+          {
+            name: '数量',
+            type: 'bar',
+            barWidth: '60%',
+            data: this.yData,
+          },
+        ],
+      });
+      this.Loading = false;
+    },
+    drawCharts() {
+      this.drawPieChart();
+    },
+  },
+};
+</script>
+
+<style scoped></style>
diff --git a/src/views/operation/sys/analysis/userAnalysis.vue b/src/views/operation/sys/analysis/userAnalysis.vue
new file mode 100644
index 0000000..24ae200
--- /dev/null
+++ b/src/views/operation/sys/analysis/userAnalysis.vue
@@ -0,0 +1,102 @@
+<template>
+  <div
+    id="personnel"
+    style="width: 100%; height: 300px"
+    v-loading="Loading"
+  ></div>
+</template>
+
+<script>
+import * as echarts from 'echarts';
+import { user } from '@/api/sys';
+export default {
+  props: {
+    time: {
+      type: String,
+    },
+  },
+  data() {
+    return {
+      chartPie: null,
+      Loading: true,
+      yData: [],
+      xData: [],
+      month: '',
+    };
+  },
+  watch: {
+    time(value) {
+      this.month = value;
+      this.getUserAnalysis();
+      setTimeout(() => {
+        this.drawCharts();
+      }, 2000);
+    },
+  },
+
+  mounted: function () {},
+  methods: {
+    async getUserAnalysis() {
+      const { data } = await user({ month: this.month });
+      var xData = [];
+      var yData = [];
+      data.forEach(function (v, k) {
+        xData.push(v.user);
+        yData.push(v.count);
+      });
+      this.xData = xData;
+      this.yData = yData;
+    },
+    drawPieChart() {
+      this.chartPie = echarts.init(document.getElementById('personnel'));
+      this.chartPie.setOption({
+        tooltip: {
+          trigger: 'item',
+          axisPointer: {
+            type: 'shadow',
+          },
+        },
+        title: {
+          left: 'center',
+          text: '用户分析',
+        },
+        grid: {
+          left: '3%',
+          right: '4%',
+          bottom: '3%',
+          containLabel: true,
+        },
+        xAxis: [
+          {
+            type: 'category',
+            axisLabel: { interval: 0, rotate: 270 },
+            data: this.xData,
+            axisTick: {
+              alignWithLabel: true,
+            },
+          },
+        ],
+        yAxis: [
+          {
+            type: 'value',
+          },
+        ],
+        series: [
+          {
+            name: '数量',
+            type: 'bar',
+            barWidth: '60%',
+            data: this.yData,
+          },
+        ],
+      });
+      this.Loading = false;
+    },
+    drawCharts() {
+      this.drawPieChart();
+    },
+  },
+};
+</script>
+
+<style scoped></style>
diff --git a/src/views/operation/sys/index.vue b/src/views/operation/sys/index.vue
new file mode 100644
index 0000000..b8dc988
--- /dev/null
+++ b/src/views/operation/sys/index.vue
@@ -0,0 +1,252 @@
+<template>
+  <div class="container">
+    <div class="echart-wrap">
+      <div class="echart-item" style="width: 100%">
+        <div class="echart-head">
+          <h1 class="echart-title">时间选择</h1>
+          <el-date-picker
+            v-model="queryForm.month"
+            type="month"
+            size="small"
+            format="YYYY-MM"
+            placeholder="选择日期"
+            @change="changeMonth"
+          />
+        </div>
+      </div>
+    </div>
+    <el-statistic
+      :value="basicData.loginCount"
+      title="用户登录次数"
+    ></el-statistic>
+    <div class="echart-wrap" v-loading="Loading">
+      <div class="echart-item" style="width: 100%">
+        <div class="echart-head">
+          <h1 class="echart-title">基础信息</h1>
+        </div>
+        <div class="wrap-content">
+          <div class="wrap-content-item">
+            <p>用户登录次数</p>
+            <p>{{ basicData.loginCount }}</p>
+          </div>
+          <div class="wrap-content-item">
+            <p>访问次数</p>
+            <p>{{ basicData.visitsCount }}</p>
+          </div>
+          <div class="wrap-content-item">
+            <p>总访问次数</p>
+            <p>{{ basicData.totalVisitsCount }}</p>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <div class="echart-wrap">
+      <div class="echart-item" style="width: 100%">
+        <div class="echart-head">
+          <h1 class="echart-title">使用情况分析</h1>
+        </div>
+        <div class="echart-list">
+          <div class="personnel-content-item">
+            <user-analysis :time="month"></user-analysis>
+          </div>
+          <div class="personnel-content-item">
+            <dept-analysis :time="month"></dept-analysis>
+          </div>
+        </div>
+        <div class="echart-list">
+          <div class="personnel-content-item">
+            <module-analysis :time="month"></module-analysis>
+          </div>
+          <div class="personnel-content-item">
+            <details-analysis :time="month"></details-analysis>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import userAnalysis from '@/views/operation/sys/analysis/userAnalysis';
+import deptAnalysis from '@/views/operation/sys/analysis/deptAnalysis.vue';
+import moduleAnalysis from '@/views/operation/sys/analysis/moduleAnalysis.vue';
+import detailsAnalysis from '@/views/operation/sys/analysis/detailsAnalysis.vue';
+import { getDate1 } from '@/common/times';
+import { baseInfo } from '@/api/sys';
+export default {
+  components: {
+    userAnalysis,
+    deptAnalysis,
+    moduleAnalysis,
+    detailsAnalysis,
+  },
+  data() {
+    return {
+      basicData: [],
+      Loading: true,
+      month: '',
+      queryForm: {
+        month: '',
+      },
+    };
+  },
+  created() {
+    setTimeout(() => {
+      this.defaultTime();
+      this.baseInfo();
+    }, 100);
+  },
+  methods: {
+    async baseInfo() {
+      const { data } = await baseInfo(this.queryForm);
+      this.basicData = data;
+      this.Loading = false;
+    },
+    defaultTime() {
+      this.queryForm.month = this.month = getDate1();
+    },
+    changeMonth() {
+      this.month = getDate1(this.queryForm.month);
+    },
+  },
+};
+</script>
+<style lang="scss">
+.container {
+  background-color: rgba(0, 0, 0, 0.038);
+  position: relative;
+
+  .echart-wrap {
+    display: flex;
+    justify-content: space-between;
+    align-items: flex-start;
+    margin-bottom: 20px;
+
+    .echart-item {
+      background-color: white;
+      border-radius: 6px;
+
+      .echart-head {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        padding: 15px;
+        border-bottom: 1px solid rgba(0, 0, 0, 0.08);
+
+        .echart-title {
+          font-size: 16px;
+          font-weight: 500;
+          margin: 0;
+          line-height: 40px;
+        }
+      }
+    }
+
+    .wrap-content {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      padding: 15px;
+
+      .wrap-content-item {
+        width: 32%;
+        text-align: center;
+        border-radius: 6px;
+
+        .wrap-content-item-h1 {
+          font-size: 30px;
+        }
+
+        .wrap-content-item-h2 {
+          font-size: 28px;
+        }
+      }
+    }
+
+    .wrap-content-second {
+      padding: 0 15px;
+      display: flex;
+      justify-content: space-between;
+      align-items: flex-start;
+
+      .wrap-content-L {
+        width: 70%;
+        display: flex;
+        justify-content: flex-start;
+        align-items: center;
+        flex-wrap: wrap;
+        .wrap-content-top {
+          display: flex;
+          justify-content: flex-start;
+          align-items: center;
+          width: 100%;
+          .wrap-content-item {
+            display: flex;
+            justify-content: flex-start;
+            align-items: center;
+            width: 30%;
+            margin-top: 20px;
+            .wrap-content-img {
+            }
+            .wrap-content-font {
+              .wrap-content-size {
+                font-size: 16px;
+                font-weight: 500;
+                margin: 0;
+                margin-left: 10px;
+              }
+            }
+          }
+        }
+        .wrap-content-bottom {
+          display: flex;
+          justify-content: flex-start;
+          align-items: center;
+          width: 100%;
+          .wrap-content-item {
+            display: flex;
+            justify-content: flex-start;
+            align-items: center;
+            width: 30%;
+            margin: 20px 0;
+            .wrap-content-img {
+            }
+            .wrap-content-font {
+              .wrap-content-size {
+                font-size: 16px;
+                font-weight: 500;
+                margin: 0;
+                margin-left: 10px;
+              }
+            }
+          }
+        }
+      }
+      .wrap-content-R {
+        width: 30%;
+      }
+    }
+
+    .echart-list {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      padding: 15px;
+
+      .personnel-content-item {
+        width: 45%;
+        .echart-title {
+          margin: 15px 0 20px;
+          text-align: center;
+        }
+      }
+
+      .echart-line {
+        background-color: rgba(0, 0, 0, 0.04);
+        width: 1px;
+        height: 200px;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/party/flow/index.vue b/src/views/party/flow/index.vue
index 59d9877..d4736fd 100644
--- a/src/views/party/flow/index.vue
+++ b/src/views/party/flow/index.vue
@@ -135,8 +135,20 @@
       </el-table-column>
       <el-table-column fixed="right" label="操作" align="center">
         <template #default="{ row }">
-          <el-button type="text" @click="bindDevice(row)">绑定设备</el-button>
-          <el-button type="text" @click="ShowDetail(row)">详情</el-button>
+          <el-button
+            v-if="isBtnPerm('/telcom/api/simBindDevice')"
+            type="text"
+            @click="bindDevice(row)"
+          >
+            绑定设备
+          </el-button>
+          <el-button
+            v-if="isBtnPerm('/telcom/api/xiangqing')"
+            type="text"
+            @click="ShowDetail(row)"
+          >
+            详情
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/party/fluorite/index.vue b/src/views/party/fluorite/index.vue
index 3ba5cf1..113895c 100644
--- a/src/views/party/fluorite/index.vue
+++ b/src/views/party/fluorite/index.vue
@@ -1,7 +1,12 @@
 <template>
   <div class="manage-container">
     <div class="manage-button">
-      <el-button type="primary" size="small" @click="handleAdd()">
+      <el-button
+        v-if="isBtnPerm('/ys/author/insert')"
+        type="primary"
+        size="small"
+        @click="handleAdd()"
+      >
         添加萤石云
       </el-button>
     </div>
@@ -66,9 +71,27 @@
       ></el-table-column>
       <el-table-column fixed="right" label="操作" width="180" align="center">
         <template #default="{ row }">
-          <el-button type="text" @click="sensorData(row)">设备</el-button>
-          <el-button type="text" @click="handleEdit(row)">编辑</el-button>
-          <el-button type="text" @click="handleDelete(row)">删除</el-button>
+          <el-button
+            v-if="isBtnPerm('/ys/author/shebei')"
+            type="text"
+            @click="sensorData(row)"
+          >
+            设备
+          </el-button>
+          <el-button
+            v-if="isBtnPerm('/ys/author/update')"
+            type="text"
+            @click="handleEdit(row)"
+          >
+            编辑
+          </el-button>
+          <el-button
+            v-if="isBtnPerm('/ys/author/delete')"
+            type="text"
+            @click="handleDelete(row)"
+          >
+            删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/party/fluorite/videoData.vue b/src/views/party/fluorite/videoData.vue
index ab33318..f555744 100644
--- a/src/views/party/fluorite/videoData.vue
+++ b/src/views/party/fluorite/videoData.vue
@@ -106,8 +106,20 @@
       ></el-table-column>
       <el-table-column fixed="right" label="操作" width="180" align="center">
         <template #default="{ row }">
-          <el-button type="text" @click="bindDevice(row)">绑定站点</el-button>
-          <el-button type="text" @click="videoData(row)">播放</el-button>
+          <el-button
+            v-if="isBtnPerm('/ys/api/ysBindDevice')"
+            type="text"
+            @click="bindDevice(row)"
+          >
+            绑定站点
+          </el-button>
+          <el-button
+            v-if="isBtnPerm('/ys/api/bofang')"
+            type="text"
+            @click="videoData(row)"
+          >
+            播放
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/party/tuya/bindDevice.vue b/src/views/party/tuya/bindDevice.vue
new file mode 100644
index 0000000..9c19fe0
--- /dev/null
+++ b/src/views/party/tuya/bindDevice.vue
@@ -0,0 +1,95 @@
+<template>
+  <el-dialog
+    v-model="dialogFormVisible"
+    :title="title"
+    width="500px"
+    @close="close"
+  >
+    <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+      <el-form-item width="100" prop="name" label="设备名称">
+        <el-input
+          v-model="form.name"
+          size="small"
+          placeholder="请输入涂鸦平台设备名称"
+        ></el-input>
+      </el-form-item>
+      <el-form-item width="100" prop="serial" label="序列号">
+        <el-input
+          v-model="form.serial"
+          size="small"
+          placeholder="请输入运维平台站点序列号"
+        ></el-input>
+      </el-form-item>
+    </el-form>
+    <div class="dialog-footer">
+      <el-button @click="close">取 消</el-button>
+      <el-button type="primary" @click="save">确 定</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { register } from '@/api/tuya';
+export default {
+  name: 'BindDevice',
+  data() {
+    return {
+      form: {
+        name: '',
+        serial: '',
+      },
+      rules: {
+        name: [{ required: true, trigger: 'blur', message: '请输入设备名称' }],
+        serial: [{ required: true, trigger: 'blur', message: '请输入序列号' }],
+      },
+      projectId: '',
+      deviceData: [],
+      title: '',
+      dialogFormVisible: false,
+    };
+  },
+  created() {},
+  methods: {
+    handleCountryChange(value) {
+      if (value) {
+        const len = value.length - 1;
+        this.form.parentId = value[len];
+      } else {
+        this.form.parentId = 0;
+      }
+    },
+
+    showDetail(accNumber) {
+      this.title = '注册设备';
+      this.dialogFormVisible = true;
+    },
+    close() {
+      this.$refs['form'].resetFields();
+      this.form = this.$options.data().form;
+      this.dialogFormVisible = false;
+      this.$emit('fetch-data');
+    },
+    save() {
+      this.$refs['form'].validate(async valid => {
+        if (valid) {
+          const { msg } = await register(this.form);
+          this.$notify({
+            title: msg,
+            type: 'success',
+          });
+          this.$refs['form'].resetFields();
+          this.dialogFormVisible = false;
+          this.$parent.fetchData();
+        } else {
+          return false;
+        }
+      });
+    },
+  },
+};
+</script>
+<style>
+.select {
+  width: 100%;
+}
+</style>
diff --git a/src/views/party/tuya/index.vue b/src/views/party/tuya/index.vue
new file mode 100644
index 0000000..53bb955
--- /dev/null
+++ b/src/views/party/tuya/index.vue
@@ -0,0 +1,199 @@
+<template>
+  <div class="manage-container">
+    <div class="manage-wrap">
+      <div class="manage-input">
+        <el-form ref="queryForm" :model="queryForm" label-width="120px">
+          <vab-query-form>
+            <el-form-item width="100" prop="ldDeviceSerial" label="力鼎序列号">
+              <el-input
+                v-model="queryForm.ldDeviceSerial"
+                size="small"
+                placeholder="请输入力鼎序列号"
+              ></el-input>
+            </el-form-item>
+            <el-form-item width="100" prop="tuyaDeviceId" label="涂鸦设备ID">
+              <el-input
+                v-model="queryForm.tuyaDeviceId"
+                size="small"
+                placeholder="请输入力鼎序列号"
+              ></el-input>
+            </el-form-item>
+          </vab-query-form>
+        </el-form>
+      </div>
+      <div class="manage-button">
+        <el-button size="small" @click="resetForm()">重置</el-button>
+        <el-button type="primary" size="small" @click="search">查询</el-button>
+      </div>
+    </div>
+    <div class="manage-button">
+      <el-button type="primary" size="small" @click="registerDevice()">
+        注册设备
+      </el-button>
+    </div>
+    <el-table
+      v-loading="listLoading"
+      :data="flowData"
+      border
+      stripe
+      style="width: 100%"
+    >
+      <el-table-column
+        prop="tuyaDeviceName"
+        label="涂鸦平台设备名称"
+        align="center"
+      ></el-table-column>
+      <el-table-column
+        prop="ldDeviceSerial"
+        label="站点序列号"
+        align="center"
+      ></el-table-column>
+      <el-table-column
+        prop="tuyaDeviceId"
+        label="涂鸦设备id"
+        align="center"
+      ></el-table-column>
+
+      <el-table-column fixed="right" label="操作" align="center">
+        <template #default="{ row }">
+          <el-button type="text" @click="handleDelete(row)">删除设备</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      :background="background"
+      :current-page="queryForm.pageIndex"
+      :layout="layout"
+      :page-size="queryForm.size"
+      :total="total"
+      style="text-align: right"
+      @current-change="handleCurrentChange"
+      @size-change="handleSizeChange"
+    ></el-pagination>
+
+    <bind-device ref="device"></bind-device>
+  </div>
+</template>
+<script>
+import { getList, deleteDevice } from '@/api/tuya';
+
+import bindDevice from './bindDevice';
+export default {
+  name: 'Index',
+  components: {
+    bindDevice,
+  },
+  data() {
+    return {
+      flowData: [],
+      layout: 'total, sizes, prev, pager, next, jumper',
+      total: 0,
+      background: true,
+      listLoading: true,
+      elementLoadingText: '正在加载...',
+      statusData: [],
+      queryForm: {
+        page: 1,
+        size: 20,
+        tuyaDeviceId: '',
+        ldDeviceSerial: '',
+      },
+    };
+  },
+  computed: {
+    height() {
+      return 500;
+    },
+  },
+  created() {
+    this.fetchData();
+  },
+  methods: {
+    async fetchData() {
+      this.listLoading = true;
+      const { data } = await getList(this.queryForm);
+      this.flowData = data.items;
+      this.total = data.total;
+      setTimeout(() => {
+        this.listLoading = false;
+      }, 500);
+    },
+    search() {
+      this.fetchData();
+    },
+    resetForm() {
+      this.$refs.queryForm.resetFields();
+    },
+    registerDevice(row) {
+      this.$refs['device'].showDetail();
+    },
+    ShowDetail(row) {
+      this.$refs['details'].showDetail(row.accNumber);
+    },
+    handleQuery() {
+      this.queryForm.page = 1;
+      this.fetchData();
+    },
+    handleSizeChange(val) {
+      this.queryForm.size = val;
+      this.fetchData();
+    },
+    handleCurrentChange(val) {
+      this.queryForm.page = val;
+      this.fetchData();
+    },
+    handleDelete(row) {
+      let that = this;
+      if (row.tuyaDeviceId) {
+        this.$confirm('你确定要删除当前项吗?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+        })
+          .then(async () => {
+            const { msg } = await deleteDevice(row.tuyaDeviceId);
+            this.$message({
+              type: 'success',
+              message: msg == undefined ? '删除成功' : msg,
+            });
+            setTimeout(function () {
+              that.fetchData();
+            }, 1000);
+          })
+          .catch(e => {
+            console.log(e);
+            this.$message({
+              type: 'info',
+              message: '已取消删除',
+            });
+          });
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.manage-wrap {
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-start;
+  .el-input {
+    width: 200px !important;
+  }
+  .el-select {
+    width: 200px !important;
+  }
+}
+.manage-button {
+  padding-left: 12px;
+  margin-bottom: 10px;
+}
+</style>
+
+<style lang="scss">
+.el-submenu__title:hover {
+  background-color: rgba(#1890ff, 0.085) !important;
+  color: hsla(208, 100%, 55%, 0.95) !important;
+}
+</style>
diff --git a/src/views/server/assets/components/device/index.vue b/src/views/server/assets/components/device/index.vue
index aae276d..6d2b07f 100644
--- a/src/views/server/assets/components/device/index.vue
+++ b/src/views/server/assets/components/device/index.vue
@@ -79,16 +79,16 @@
     <div class="manage-button">
       <el-button size="small" @click="resetForm()">重置</el-button>
       <el-button type="primary" size="small" @click="search">查询</el-button>
-      <el-button type="primary" size="small" @click="handleAdd">
+      <el-button v-if="isBtnPerm('/iot/device/insert')" type="primary" size="small" @click="handleAdd">
         添加站点
       </el-button>
-      <el-button type="primary" size="small" @click="deletes">
+      <el-button v-if="isBtnPerm('/iot/device/remove')" type="primary" size="small" @click="deletes">
         批量删除
       </el-button>
-      <el-button type="primary" size="small" @click="exportData">
+      <el-button v-if="isBtnPerm('/iot/device/exportDevice')" type="primary" size="small" @click="exportData">
         导出
       </el-button>
-      <el-button type="primary" size="small" @click="fboxSync">
+      <el-button v-if="isBtnPerm('/fbox/sync')" type="primary" size="small" @click="fboxSync">
         盒子同步
       </el-button>
     </div>
@@ -297,11 +297,11 @@
       ></el-table-column>
       <el-table-column fixed="right" label="操作" width="250" align="center">
         <template #default="{ row }">
-          <el-button type="text" @click="sensorData(row)">数据</el-button>
-          <el-button type="text" @click="sensorEdit(row)">传感器</el-button>
-          <el-button type="text" @click="copyDevice(row)">复制</el-button>
-          <el-button type="text" @click="handleEdit(row)">编辑</el-button>
-          <el-button type="text" @click="handleDelete(row)">删除</el-button>
+          <el-button v-if="isBtnPerm('/iot/device/shuju')" type="text" @click="sensorData(row)">数据</el-button>
+          <el-button v-if="isBtnPerm('/iot/device/chuanganqi')" type="text" @click="sensorEdit(row)">传感器</el-button>
+          <el-button v-if="isBtnPerm('/iot/device/copy')" type="text" @click="copyDevice(row)">复制</el-button>
+          <el-button v-if="isBtnPerm('/iot/device/update')" type="text" @click="handleEdit(row)">编辑</el-button>
+          <el-button v-if="isBtnPerm('/iot/device/remove')" type="text" @click="handleDelete(row)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/server/assets/components/police/index.vue b/src/views/server/assets/components/police/index.vue
index eaaf01f..e3307f0 100644
--- a/src/views/server/assets/components/police/index.vue
+++ b/src/views/server/assets/components/police/index.vue
@@ -48,7 +48,13 @@
       ></el-table-column>
       <el-table-column fixed="right" label="操作" width="200" align="center">
         <template #default="{ row }">
-          <el-button type="text" @click="bindDevice(row)">绑定站点</el-button>
+          <el-button
+            v-if="isBtnPerm('/alarmUser/addProjects')"
+            type="text"
+            @click="bindDevice(row)"
+          >
+            绑定项目
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/server/assets/components/project/index.vue b/src/views/server/assets/components/project/index.vue
index b34aeae..6b69b13 100644
--- a/src/views/server/assets/components/project/index.vue
+++ b/src/views/server/assets/components/project/index.vue
@@ -51,13 +51,28 @@
     <div class="manage-button">
       <el-button size="small" @click="resetForm()">重置</el-button>
       <el-button type="primary" size="small" @click="search">查询</el-button>
-      <el-button type="primary" size="small" @click="handleAdd">
+      <el-button
+        v-if="isBtnPerm('/iot/project/insert')"
+        type="primary"
+        size="small"
+        @click="handleAdd"
+      >
         添加项目
       </el-button>
-      <el-button type="primary" size="small" @click="remove">
+      <el-button
+        v-if="isBtnPerm('/iot/project/remove')"
+        type="primary"
+        size="small"
+        @click="remove"
+      >
         批量删除
       </el-button>
-      <el-button type="primary" size="small" @click="exportData">
+      <el-button
+        v-if="isBtnPerm('/iot/project/export')"
+        type="primary"
+        size="small"
+        @click="exportData"
+      >
         导出
       </el-button>
     </div>
@@ -168,9 +183,27 @@
       ></el-table-column>
       <el-table-column fixed="right" label="操作" width="160" align="center">
         <template #default="{ row }">
-          <el-button type="text" @click="device(row)">站点</el-button>
-          <el-button type="text" @click="handleEdit(row)">编辑</el-button>
-          <el-button type="text" @click="handleDelete(row)">删除</el-button>
+          <el-button
+            v-if="isBtnPerm('/iot/project/zhandian')"
+            type="text"
+            @click="device(row)"
+          >
+            站点
+          </el-button>
+          <el-button
+            v-if="isBtnPerm('/iot/project/update')"
+            type="text"
+            @click="handleEdit(row)"
+          >
+            编辑
+          </el-button>
+          <el-button
+            v-if="isBtnPerm('/iot/project/remove')"
+            type="text"
+            @click="handleDelete(row)"
+          >
+            删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/server/assets/components/run/index.vue b/src/views/server/assets/components/run/index.vue
index 3f41387..aba1776 100644
--- a/src/views/server/assets/components/run/index.vue
+++ b/src/views/server/assets/components/run/index.vue
@@ -26,7 +26,12 @@
       <div class="manage-button">
         <el-button size="small" @click="resetForm()">重置</el-button>
         <el-button type="primary" size="small" @click="search">查询</el-button>
-        <el-button type="primary" size="small" @click="exportData">
+        <el-button
+          v-if="isBtnPerm('/deviceReport/deviceMonth/export')"
+          type="primary"
+          size="small"
+          @click="exportData"
+        >
           导出
         </el-button>
       </div>
diff --git a/src/views/server/assets/components/vehicle/index.vue b/src/views/server/assets/components/vehicle/index.vue
index 3f6906f..61ae72f 100644
--- a/src/views/server/assets/components/vehicle/index.vue
+++ b/src/views/server/assets/components/vehicle/index.vue
@@ -102,7 +102,13 @@
       ></el-table-column>
       <el-table-column fixed="right" label="操作" width="120" align="center">
         <template #default="{ row }">
-          <el-button type="text" @click="bindProject(row)">绑定项目</el-button>
+          <el-button
+            v-if="isBtnPerm('/tq/api/bindProject')"
+            type="text"
+            @click="bindProject(row)"
+          >
+            绑定项目
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/server/assets/index.vue b/src/views/server/assets/index.vue
index e94f808..957c5c1 100644
--- a/src/views/server/assets/index.vue
+++ b/src/views/server/assets/index.vue
@@ -19,6 +19,24 @@
       <el-tab-pane label="告警管理" name="six">
         <alarm-index ref="alarm"></alarm-index>
       </el-tab-pane>
+      <el-tab-pane label="打卡纪录" name="seven">
+        <clock-index ref="clock"></clock-index>
+      </el-tab-pane>
+      <el-tab-pane label="水质管理" name="eight">
+        <apply-index ref="apply"></apply-index>
+      </el-tab-pane>
+      <el-tab-pane label="巡检填报" name="nine">
+        <filling-index ref="filling"></filling-index>
+      </el-tab-pane>
+      <el-tab-pane label="设备维保" name="ten">
+        <maintenance-index ref="maintenance"></maintenance-index>
+      </el-tab-pane>
+      <el-tab-pane label="人员管理" name="eleven">
+        <staff-index ref="staff"></staff-index>
+      </el-tab-pane>
+      <el-tab-pane label="任务管理" name="twelve">
+        <task-index ref="task"></task-index>
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
@@ -29,7 +47,13 @@ import deviceIndex from './components/device/index';
 import vehicleIndex from './components/vehicle/index';
 import policeIndex from './components/police/index';
 import runIndex from './components/run/index';
-import alarmIndex from './components/alarm/index';
+import alarmIndex from '../../dev/alarm/index';
+import clockIndex from '../../dev/clock/index';
+import applyIndex from '../../dev/apply/index';
+import fillingIndex from '../../dev/filling/index';
+import maintenanceIndex from '../../dev/maintenance/index';
+import staffIndex from '../../dev/staff/index';
+import taskIndex from '../../dev/task/index';
 export default {
   components: {
     projectIndex,
@@ -38,6 +62,12 @@ export default {
     policeIndex,
     runIndex,
     alarmIndex,
+    clockIndex,
+    applyIndex,
+    fillingIndex,
+    maintenanceIndex,
+    staffIndex,
+    taskIndex,
   },
   data() {
     return {
@@ -70,6 +100,18 @@ export default {
         this.$refs['run'].showData();
       } else if (tab.paneName == 'six') {
         this.$refs['alarm'].showData();
+      } else if (tab.paneName == 'seven') {
+        this.$refs['clock'].showData();
+      } else if (tab.paneName == 'eight') {
+        this.$refs['apply'].showData();
+      } else if (tab.paneName == 'nine') {
+        this.$refs['filling'].showData();
+      } else if (tab.paneName == 'ten') {
+        this.$refs['maintenance'].showData();
+      } else if (tab.paneName == 'eleven') {
+        this.$refs['staff'].showData();
+      } else if (tab.paneName == 'twelve') {
+        this.$refs['task'].showData();
       }
     },
   },
diff --git a/src/views/server/dataEnquiry/index.vue b/src/views/server/dataEnquiry/index.vue
index cc29c00..08c7735 100644
--- a/src/views/server/dataEnquiry/index.vue
+++ b/src/views/server/dataEnquiry/index.vue
@@ -270,6 +270,43 @@
         width="180"
         align="center"
       ></el-table-column>
+      <el-table-column
+        prop="boardImg"
+        label="公示牌"
+        width="200"
+        align="center"
+      >
+        <template #default="{ row }">
+          <el-image
+            style="width: 100px; height: 100px"
+            :src="fileUrl + row.boardImg"
+          ></el-image>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="warrantyPeriod"
+        label="设备保修到期时间"
+        width="200"
+        align="center"
+      ></el-table-column>
+      <el-table-column
+        prop="deviceVersion.dataValue"
+        label="设备版本"
+        width="200"
+        align="center"
+      ></el-table-column>
+      <el-table-column
+        prop="ownerName"
+        label="站点客户联系人"
+        width="200"
+        align="center"
+      ></el-table-column>
+      <el-table-column
+        prop="ownerPhone"
+        label="站点客户联系方式"
+        width="200"
+        align="center"
+      ></el-table-column>
       <el-table-column
         prop="offlineTime"
         label="离线时间"
@@ -284,8 +321,20 @@
       ></el-table-column>
       <el-table-column fixed="right" label="操作" width="150" align="center">
         <template #default="{ row }">
-          <el-button type="text" @click="sensorEdit(row)">传感器</el-button>
-          <el-button type="text" @click="sensorData(row)">数据</el-button>
+          <el-button
+            v-if="isBtnPerm('/iot/sensor/select')"
+            type="text"
+            @click="sensorEdit(row)"
+          >
+            传感器
+          </el-button>
+          <el-button
+            v-if="isBtnPerm('/deviceData/latestData')"
+            type="text"
+            @click="sensorData(row)"
+          >
+            数据
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -308,9 +357,11 @@ import {
   getDictData,
   doEdit,
 } from '@/api/device';
+import { baseURL } from '@/config';
 export default {
   data() {
     return {
+      fileUrl: baseURL + '/static/img/',
       deviceData: [],
       lazy: true,
       activeName: 'first',
diff --git a/src/views/server/monitorVideo/index.vue b/src/views/server/monitorVideo/index.vue
index da9d428..c3cf5ef 100644
--- a/src/views/server/monitorVideo/index.vue
+++ b/src/views/server/monitorVideo/index.vue
@@ -72,7 +72,13 @@
       </el-table-column>
       <el-table-column fixed="right" label="操作" width="100" align="center">
         <template #default="{ row }">
-          <el-button type="text" @click="handleLive(row)">播放</el-button>
+          <el-button
+            v-if="isBtnPerm('/ys/api/getLiveAddr')"
+            type="text"
+            @click="handleLive(row)"
+          >
+            播放
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/server/siteDetails/only.vue b/src/views/server/siteDetails/only.vue
index 01d161a..5c4c462 100644
--- a/src/views/server/siteDetails/only.vue
+++ b/src/views/server/siteDetails/only.vue
@@ -25,7 +25,7 @@
     <el-table-column label="操作" align="center">
       <template #default="{ row }">
         <el-button
-          v-if="row.readWrite == '只写'"
+          v-if="row.readWrite == '只写' && isBtnPerm('/deviceSensor/write')"
           type="text"
           @click="distribute(row)"
         >
diff --git a/src/views/server/siteDetails/readable.vue b/src/views/server/siteDetails/readable.vue
index b5d692d..b0f7a30 100644
--- a/src/views/server/siteDetails/readable.vue
+++ b/src/views/server/siteDetails/readable.vue
@@ -25,7 +25,7 @@
     <el-table-column label="操作" align="center">
       <template #default="{ row }">
         <el-button
-          v-if="row.readWrite == '读写'"
+          v-if="row.readWrite == '读写' && isBtnPerm('/deviceSensor/write')"
           type="text"
           @click="distribute(row)"
         >
diff --git a/src/views/set/develop/dict/index.vue b/src/views/set/develop/dict/index.vue
index 7cbbb19..7ea381a 100644
--- a/src/views/set/develop/dict/index.vue
+++ b/src/views/set/develop/dict/index.vue
@@ -1,7 +1,12 @@
 <template>
   <div class="manage-container">
     <div class="manage-button">
-      <el-button type="primary" size="small" @click="handleAdd">
+      <el-button
+        v-if="isBtnPerm('/sysDict/insertDictType')"
+        type="primary"
+        size="small"
+        @click="handleAdd"
+      >
         添加字典
       </el-button>
     </div>
@@ -26,9 +31,27 @@
       ></el-table-column>
       <el-table-column fixed="right" label="操作" align="center">
         <template #default="{ row }">
-          <el-button type="text" @click="dictDatas(row)">数据</el-button>
-          <el-button type="text" @click="handleEdit(row)">编辑</el-button>
-          <el-button type="text" @click="handleDelete(row)">删除</el-button>
+          <el-button
+            v-if="isBtnPerm('/sysDict/shuju')"
+            type="text"
+            @click="dictDatas(row)"
+          >
+            数据
+          </el-button>
+          <el-button
+            v-if="isBtnPerm('/sysDict/updateDictType')"
+            type="text"
+            @click="handleEdit(row)"
+          >
+            编辑
+          </el-button>
+          <el-button
+            v-if="isBtnPerm('/sysDict/removeDictType')"
+            type="text"
+            @click="handleDelete(row)"
+          >
+            删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/set/develop/dictdata/index.vue b/src/views/set/develop/dictdata/index.vue
index 88ba02e..ab547c0 100644
--- a/src/views/set/develop/dictdata/index.vue
+++ b/src/views/set/develop/dictdata/index.vue
@@ -1,7 +1,12 @@
 <template>
   <div class="manage-container">
     <vab-query-form>
-      <el-button type="primary" size="small" @click="handleAdd()">
+      <el-button
+        v-if="isBtnPerm('/sysDict/insertDictData')"
+        type="primary"
+        size="small"
+        @click="handleAdd()"
+      >
         添加数据
       </el-button>
     </vab-query-form>
@@ -26,8 +31,20 @@
       ></el-table-column>
       <el-table-column fixed="right" label="操作" align="center">
         <template #default="{ row }">
-          <el-button type="text" @click="handleEdit(row)">编辑</el-button>
-          <el-button type="text" @click="handleDelete(row)">删除</el-button>
+          <el-button
+            v-if="isBtnPerm('/sysDict/updateDictData')"
+            type="text"
+            @click="handleEdit(row)"
+          >
+            编辑
+          </el-button>
+          <el-button
+            v-if="isBtnPerm('/sysDict/removeDictData')"
+            type="text"
+            @click="handleDelete(row)"
+          >
+            删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/set/develop/index.vue b/src/views/set/develop/index.vue
index dc4cd98..bd955ea 100644
--- a/src/views/set/develop/index.vue
+++ b/src/views/set/develop/index.vue
@@ -4,283 +4,283 @@
       <el-tab-pane label="数据字典" name="first">
         <dict-index ref="dict"></dict-index>
       </el-tab-pane>
-      <el-tab-pane label="LPM管理" name="second">
-        <div class="manage-wrap">
-          <div class="manage-input">
-            <el-input
-              v-model="input"
-              size="small"
-              placeholder="名称查询"
-            ></el-input>
-          </div>
-          <div class="manage-button">
-            <el-button type="primary" size="small">查询</el-button>
-            <el-button
-              type="primary"
-              size="small"
-              @click="dialogEditLPM = true"
-            >
-              添加LPM
-            </el-button>
-            <el-dialog v-model="dialogEditLPM" title="添加数据字典">
-              <el-form :model="form">
-                <el-form-item label="名称" :label-width="formLabelWidth">
-                  <el-input v-model="form.name" autocomplete="off"></el-input>
-                </el-form-item>
-                <el-form-item label="IP" :label-width="formLabelWidth">
-                  <el-input v-model="form.name" autocomplete="off"></el-input>
-                </el-form-item>
-                <el-form-item label="PORT" :label-width="formLabelWidth">
-                  <el-input v-model="form.name" autocomplete="off"></el-input>
-                </el-form-item>
-                <el-form-item label="LPM-KEY" :label-width="formLabelWidth">
-                  <el-input v-model="form.name" autocomplete="off"></el-input>
-                </el-form-item>
-              </el-form>
-              <div class="dialog-footer">
-                <el-button type="primary" @click="dialogEditLPM = false">
-                  保存
-                </el-button>
-                <el-button @click="dialogEditLPM = false">取 消</el-button>
-              </div>
-            </el-dialog>
-          </div>
-        </div>
-        <el-table :data="tableData2" border stripe style="width: 100%">
-          <el-table-column
-            prop="id"
-            label="序号"
-            width="80"
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="name"
-            label="名称"
-            width="180"
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="ip"
-            label="IP"
-            width="180"
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="port"
-            label="PORT"
-            width="120"
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="key"
-            label="LPM-KEY"
-            width="380"
-            align="center"
-          ></el-table-column>
-          <el-table-column fixed="right" label="操作" align="center">
-            <el-button type="text" size="small" @click="dialogFormLPM = true">
-              编辑
-            </el-button>
-            <el-dialog v-model="dialogFormLPM" title="添加数据字典">
-              <el-form :model="form">
-                <el-form-item label="名称" :label-width="formLabelWidth">
-                  <el-input v-model="form.name" autocomplete="off"></el-input>
-                </el-form-item>
-                <el-form-item label="IP" :label-width="formLabelWidth">
-                  <el-input v-model="form.name" autocomplete="off"></el-input>
-                </el-form-item>
-                <el-form-item label="PORT" :label-width="formLabelWidth">
-                  <el-input v-model="form.name" autocomplete="off"></el-input>
-                </el-form-item>
-                <el-form-item label="LPM-KEY" :label-width="formLabelWidth">
-                  <el-input v-model="form.name" autocomplete="off"></el-input>
-                </el-form-item>
-              </el-form>
-              <div class="dialog-footer">
-                <el-button type="primary" @click="dialogFormLPM = false">
-                  保存
-                </el-button>
-                <el-button @click="dialogFormLPM = false">取 消</el-button>
-              </div>
-            </el-dialog>
-            <el-button type="text" size="small">删除</el-button>
-          </el-table-column>
-        </el-table>
-        <el-pagination
-          :current-page="currentPage4"
-          :page-sizes="[100, 200, 300, 400]"
-          :page-size="100"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="400"
-          style="text-align: right"
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-        ></el-pagination>
-      </el-tab-pane>
-      <el-tab-pane label="系统参数" name="third">
-        <div class="manage-wrap">
-          <div class="manage-input">
-            <el-input
-              v-model="input"
-              size="small"
-              placeholder="名称查询"
-            ></el-input>
-          </div>
-          <div class="manage-button">
-            <el-button type="primary" size="small">查询</el-button>
-          </div>
-        </div>
-        <el-table :data="tableData3" border stripe style="width: 100%">
-          <el-table-column
-            prop="id"
-            label="序号"
-            width="80"
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="key"
-            label="名称KEY"
-            width="180"
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="price"
-            label="值"
-            width="180"
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="remarks"
-            label="备注"
-            width="380"
-            align="center"
-          ></el-table-column>
-          <el-table-column fixed="right" label="操作" align="center">
-            <el-button type="text" size="small" @click="dialogFormIn = true">
-              编辑
-            </el-button>
-            <el-dialog v-model="dialogFormIn" title="编辑信息">
-              <el-form :model="form">
-                <el-form-item label="名称" :label-width="formLabelWidth">
-                  <el-input v-model="form.name" autocomplete="off"></el-input>
-                </el-form-item>
-                <el-form-item label="数值" :label-width="formLabelWidth">
-                  <el-input v-model="form.name" autocomplete="off"></el-input>
-                </el-form-item>
-                <el-form-item label="备注" :label-width="formLabelWidth">
-                  <el-input v-model="form.name" autocomplete="off"></el-input>
-                </el-form-item>
-              </el-form>
-              <div class="dialog-footer">
-                <el-button type="primary" @click="dialogFormIn = false">
-                  保存
-                </el-button>
-                <el-button @click="dialogFormIn = false">取 消</el-button>
-              </div>
-            </el-dialog>
-            <el-button type="text" size="small">删除</el-button>
-          </el-table-column>
-        </el-table>
-        <el-pagination
-          :current-page="currentPage4"
-          :page-sizes="[100, 200, 300, 400]"
-          :page-size="100"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="400"
-          style="text-align: right"
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-        ></el-pagination>
-      </el-tab-pane>
-      <el-tab-pane label="日志管理" name="fourth">
-        <div class="manage-wrap">
-          <div class="manage-input">
-            <el-form ref="queryForm" :model="queryForm" label-width="80px">
-              <vab-query-form>
-                <el-form-item width="100" prop="deviceName" label="数据选择">
-                  <el-select v-model="value1" size="small" placeholder="请选择">
-                    <el-option
-                      v-for="item in options"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    ></el-option>
-                  </el-select>
-                </el-form-item>
-                <el-form-item width="100" prop="deviceName" label="日期选择">
-                  <el-date-picker
-                    v-model="value1"
-                    size="small"
-                    type="date"
-                    placeholder="选择日期"
-                  ></el-date-picker>
-                </el-form-item>
-              </vab-query-form>
-            </el-form>
-          </div>
-          <div class="manage-button">
-            <el-button type="primary" size="small">查询</el-button>
-          </div>
-        </div>
-        <el-table :data="tableData4" border stripe style="width: 100%">
-          <el-table-column
-            prop="ip"
-            label="IP"
-            width="140"
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="id"
-            label="用户ID"
-            width="140"
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="date"
-            label="操作时间"
-            width="200"
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="source"
-            label="请求来源"
-            width="140"
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="module"
-            label="所属模块"
-            width="140"
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="name"
-            label="名称"
-            width="140"
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="remarks"
-            label="备注"
-            align="center"
-          ></el-table-column>
-        </el-table>
-        <vab-query-form>
-          <vab-query-form-left-panel></vab-query-form-left-panel>
-          <vab-query-form-right-panel>
-            <el-pagination
-              :current-page="currentPage4"
-              :page-sizes="[100, 200, 300, 400]"
-              :page-size="100"
-              layout="total, sizes, prev, pager, next, jumper"
-              :total="400"
-              @size-change="handleSizeChange"
-              @current-change="handleCurrentChange"
-            ></el-pagination>
-          </vab-query-form-right-panel>
-        </vab-query-form>
-      </el-tab-pane>
-      <el-tab-pane label="系统备份" name="fifth">角色管理</el-tab-pane>
+<!--      <el-tab-pane label="LPM管理" name="second">-->
+<!--        <div class="manage-wrap">-->
+<!--          <div class="manage-input">-->
+<!--            <el-input-->
+<!--              v-model="input"-->
+<!--              size="small"-->
+<!--              placeholder="名称查询"-->
+<!--            ></el-input>-->
+<!--          </div>-->
+<!--          <div class="manage-button">-->
+<!--            <el-button type="primary" size="small">查询</el-button>-->
+<!--            <el-button-->
+<!--              type="primary"-->
+<!--              size="small"-->
+<!--              @click="dialogEditLPM = true"-->
+<!--            >-->
+<!--              添加LPM-->
+<!--            </el-button>-->
+<!--            <el-dialog v-model="dialogEditLPM" title="添加数据字典">-->
+<!--              <el-form :model="form">-->
+<!--                <el-form-item label="名称" :label-width="formLabelWidth">-->
+<!--                  <el-input v-model="form.name" autocomplete="off"></el-input>-->
+<!--                </el-form-item>-->
+<!--                <el-form-item label="IP" :label-width="formLabelWidth">-->
+<!--                  <el-input v-model="form.name" autocomplete="off"></el-input>-->
+<!--                </el-form-item>-->
+<!--                <el-form-item label="PORT" :label-width="formLabelWidth">-->
+<!--                  <el-input v-model="form.name" autocomplete="off"></el-input>-->
+<!--                </el-form-item>-->
+<!--                <el-form-item label="LPM-KEY" :label-width="formLabelWidth">-->
+<!--                  <el-input v-model="form.name" autocomplete="off"></el-input>-->
+<!--                </el-form-item>-->
+<!--              </el-form>-->
+<!--              <div class="dialog-footer">-->
+<!--                <el-button type="primary" @click="dialogEditLPM = false">-->
+<!--                  保存-->
+<!--                </el-button>-->
+<!--                <el-button @click="dialogEditLPM = false">取 消</el-button>-->
+<!--              </div>-->
+<!--            </el-dialog>-->
+<!--          </div>-->
+<!--        </div>-->
+<!--        <el-table :data="tableData2" border stripe style="width: 100%">-->
+<!--          <el-table-column-->
+<!--            prop="id"-->
+<!--            label="序号"-->
+<!--            width="80"-->
+<!--            align="center"-->
+<!--          ></el-table-column>-->
+<!--          <el-table-column-->
+<!--            prop="name"-->
+<!--            label="名称"-->
+<!--            width="180"-->
+<!--            align="center"-->
+<!--          ></el-table-column>-->
+<!--          <el-table-column-->
+<!--            prop="ip"-->
+<!--            label="IP"-->
+<!--            width="180"-->
+<!--            align="center"-->
+<!--          ></el-table-column>-->
+<!--          <el-table-column-->
+<!--            prop="port"-->
+<!--            label="PORT"-->
+<!--            width="120"-->
+<!--            align="center"-->
+<!--          ></el-table-column>-->
+<!--          <el-table-column-->
+<!--            prop="key"-->
+<!--            label="LPM-KEY"-->
+<!--            width="380"-->
+<!--            align="center"-->
+<!--          ></el-table-column>-->
+<!--          <el-table-column fixed="right" label="操作" align="center">-->
+<!--            <el-button type="text" size="small" @click="dialogFormLPM = true">-->
+<!--              编辑-->
+<!--            </el-button>-->
+<!--            <el-dialog v-model="dialogFormLPM" title="添加数据字典">-->
+<!--              <el-form :model="form">-->
+<!--                <el-form-item label="名称" :label-width="formLabelWidth">-->
+<!--                  <el-input v-model="form.name" autocomplete="off"></el-input>-->
+<!--                </el-form-item>-->
+<!--                <el-form-item label="IP" :label-width="formLabelWidth">-->
+<!--                  <el-input v-model="form.name" autocomplete="off"></el-input>-->
+<!--                </el-form-item>-->
+<!--                <el-form-item label="PORT" :label-width="formLabelWidth">-->
+<!--                  <el-input v-model="form.name" autocomplete="off"></el-input>-->
+<!--                </el-form-item>-->
+<!--                <el-form-item label="LPM-KEY" :label-width="formLabelWidth">-->
+<!--                  <el-input v-model="form.name" autocomplete="off"></el-input>-->
+<!--                </el-form-item>-->
+<!--              </el-form>-->
+<!--              <div class="dialog-footer">-->
+<!--                <el-button type="primary" @click="dialogFormLPM = false">-->
+<!--                  保存-->
+<!--                </el-button>-->
+<!--                <el-button @click="dialogFormLPM = false">取 消</el-button>-->
+<!--              </div>-->
+<!--            </el-dialog>-->
+<!--            <el-button type="text" size="small">删除</el-button>-->
+<!--          </el-table-column>-->
+<!--        </el-table>-->
+<!--        <el-pagination-->
+<!--          :current-page="currentPage4"-->
+<!--          :page-sizes="[100, 200, 300, 400]"-->
+<!--          :page-size="100"-->
+<!--          layout="total, sizes, prev, pager, next, jumper"-->
+<!--          :total="400"-->
+<!--          style="text-align: right"-->
+<!--          @size-change="handleSizeChange"-->
+<!--          @current-change="handleCurrentChange"-->
+<!--        ></el-pagination>-->
+<!--      </el-tab-pane>-->
+<!--      <el-tab-pane label="系统参数" name="third">-->
+<!--        <div class="manage-wrap">-->
+<!--          <div class="manage-input">-->
+<!--            <el-input-->
+<!--              v-model="input"-->
+<!--              size="small"-->
+<!--              placeholder="名称查询"-->
+<!--            ></el-input>-->
+<!--          </div>-->
+<!--          <div class="manage-button">-->
+<!--            <el-button type="primary" size="small">查询</el-button>-->
+<!--          </div>-->
+<!--        </div>-->
+<!--        <el-table :data="tableData3" border stripe style="width: 100%">-->
+<!--          <el-table-column-->
+<!--            prop="id"-->
+<!--            label="序号"-->
+<!--            width="80"-->
+<!--            align="center"-->
+<!--          ></el-table-column>-->
+<!--          <el-table-column-->
+<!--            prop="key"-->
+<!--            label="名称KEY"-->
+<!--            width="180"-->
+<!--            align="center"-->
+<!--          ></el-table-column>-->
+<!--          <el-table-column-->
+<!--            prop="price"-->
+<!--            label="值"-->
+<!--            width="180"-->
+<!--            align="center"-->
+<!--          ></el-table-column>-->
+<!--          <el-table-column-->
+<!--            prop="remarks"-->
+<!--            label="备注"-->
+<!--            width="380"-->
+<!--            align="center"-->
+<!--          ></el-table-column>-->
+<!--          <el-table-column fixed="right" label="操作" align="center">-->
+<!--            <el-button type="text" size="small" @click="dialogFormIn = true">-->
+<!--              编辑-->
+<!--            </el-button>-->
+<!--            <el-dialog v-model="dialogFormIn" title="编辑信息">-->
+<!--              <el-form :model="form">-->
+<!--                <el-form-item label="名称" :label-width="formLabelWidth">-->
+<!--                  <el-input v-model="form.name" autocomplete="off"></el-input>-->
+<!--                </el-form-item>-->
+<!--                <el-form-item label="数值" :label-width="formLabelWidth">-->
+<!--                  <el-input v-model="form.name" autocomplete="off"></el-input>-->
+<!--                </el-form-item>-->
+<!--                <el-form-item label="备注" :label-width="formLabelWidth">-->
+<!--                  <el-input v-model="form.name" autocomplete="off"></el-input>-->
+<!--                </el-form-item>-->
+<!--              </el-form>-->
+<!--              <div class="dialog-footer">-->
+<!--                <el-button type="primary" @click="dialogFormIn = false">-->
+<!--                  保存-->
+<!--                </el-button>-->
+<!--                <el-button @click="dialogFormIn = false">取 消</el-button>-->
+<!--              </div>-->
+<!--            </el-dialog>-->
+<!--            <el-button type="text" size="small">删除</el-button>-->
+<!--          </el-table-column>-->
+<!--        </el-table>-->
+<!--        <el-pagination-->
+<!--          :current-page="currentPage4"-->
+<!--          :page-sizes="[100, 200, 300, 400]"-->
+<!--          :page-size="100"-->
+<!--          layout="total, sizes, prev, pager, next, jumper"-->
+<!--          :total="400"-->
+<!--          style="text-align: right"-->
+<!--          @size-change="handleSizeChange"-->
+<!--          @current-change="handleCurrentChange"-->
+<!--        ></el-pagination>-->
+<!--      </el-tab-pane>-->
+<!--      <el-tab-pane label="日志管理" name="fourth">-->
+<!--        <div class="manage-wrap">-->
+<!--          <div class="manage-input">-->
+<!--            <el-form ref="queryForm" :model="queryForm" label-width="80px">-->
+<!--              <vab-query-form>-->
+<!--                <el-form-item width="100" prop="deviceName" label="数据选择">-->
+<!--                  <el-select v-model="value1" size="small" placeholder="请选择">-->
+<!--                    <el-option-->
+<!--                      v-for="item in options"-->
+<!--                      :key="item.value"-->
+<!--                      :label="item.label"-->
+<!--                      :value="item.value"-->
+<!--                    ></el-option>-->
+<!--                  </el-select>-->
+<!--                </el-form-item>-->
+<!--                <el-form-item width="100" prop="deviceName" label="日期选择">-->
+<!--                  <el-date-picker-->
+<!--                    v-model="value1"-->
+<!--                    size="small"-->
+<!--                    type="date"-->
+<!--                    placeholder="选择日期"-->
+<!--                  ></el-date-picker>-->
+<!--                </el-form-item>-->
+<!--              </vab-query-form>-->
+<!--            </el-form>-->
+<!--          </div>-->
+<!--          <div class="manage-button">-->
+<!--            <el-button type="primary" size="small">查询</el-button>-->
+<!--          </div>-->
+<!--        </div>-->
+<!--        <el-table :data="tableData4" border stripe style="width: 100%">-->
+<!--          <el-table-column-->
+<!--            prop="ip"-->
+<!--            label="IP"-->
+<!--            width="140"-->
+<!--            align="center"-->
+<!--          ></el-table-column>-->
+<!--          <el-table-column-->
+<!--            prop="id"-->
+<!--            label="用户ID"-->
+<!--            width="140"-->
+<!--            align="center"-->
+<!--          ></el-table-column>-->
+<!--          <el-table-column-->
+<!--            prop="date"-->
+<!--            label="操作时间"-->
+<!--            width="200"-->
+<!--            align="center"-->
+<!--          ></el-table-column>-->
+<!--          <el-table-column-->
+<!--            prop="source"-->
+<!--            label="请求来源"-->
+<!--            width="140"-->
+<!--            align="center"-->
+<!--          ></el-table-column>-->
+<!--          <el-table-column-->
+<!--            prop="module"-->
+<!--            label="所属模块"-->
+<!--            width="140"-->
+<!--            align="center"-->
+<!--          ></el-table-column>-->
+<!--          <el-table-column-->
+<!--            prop="name"-->
+<!--            label="名称"-->
+<!--            width="140"-->
+<!--            align="center"-->
+<!--          ></el-table-column>-->
+<!--          <el-table-column-->
+<!--            prop="remarks"-->
+<!--            label="备注"-->
+<!--            align="center"-->
+<!--          ></el-table-column>-->
+<!--        </el-table>-->
+<!--        <vab-query-form>-->
+<!--          <vab-query-form-left-panel></vab-query-form-left-panel>-->
+<!--          <vab-query-form-right-panel>-->
+<!--            <el-pagination-->
+<!--              :current-page="currentPage4"-->
+<!--              :page-sizes="[100, 200, 300, 400]"-->
+<!--              :page-size="100"-->
+<!--              layout="total, sizes, prev, pager, next, jumper"-->
+<!--              :total="400"-->
+<!--              @size-change="handleSizeChange"-->
+<!--              @current-change="handleCurrentChange"-->
+<!--            ></el-pagination>-->
+<!--          </vab-query-form-right-panel>-->
+<!--        </vab-query-form>-->
+<!--      </el-tab-pane>-->
+<!--      <el-tab-pane label="系统备份" name="fifth">角色管理</el-tab-pane>-->
     </el-tabs>
   </div>
 </template>
diff --git a/src/views/set/global/index.vue b/src/views/set/global/index.vue
index 381538e..fa6a9ad 100644
--- a/src/views/set/global/index.vue
+++ b/src/views/set/global/index.vue
@@ -6,6 +6,7 @@
           <vab-query-form-left-panel></vab-query-form-left-panel>
           <vab-query-form-right-panel>
             <el-button
+              v-if="isBtnPerm('/miniMenu/update')"
               type="primary"
               size="small"
               @click="dialogFormVisible = true"
@@ -136,120 +137,120 @@
           </vab-query-form-right-panel>
         </vab-query-form>
       </el-tab-pane>
-      <el-tab-pane label="邮箱配置" name="second">
-        <el-form
-          ref="form"
-          :model="form"
-          label-position="left"
-          label-width="120px"
-        >
-          <el-form-item label="邮箱地址">
-            <el-input
-              v-model="input"
-              size="small"
-              placeholder="请输入内容"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="邮箱授权码">
-            <el-input
-              v-model="input"
-              size="small"
-              placeholder="请输入内容"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="邮箱服务器地址">
-            <el-input
-              v-model="input"
-              size="small"
-              placeholder="请输入内容"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="协议">
-            <el-input
-              v-model="input"
-              size="small"
-              placeholder="请输入内容"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="端口">
-            <el-input
-              v-model="input"
-              size="small"
-              placeholder="请输入内容"
-            ></el-input>
-          </el-form-item>
-        </el-form>
-        <div>
-          <span>
-            QQ邮箱：http://jingyan.baidu.com/article/fedf032148ajkas8978ea.html
-          </span>
-          <el-link
-            href="https://element.eleme.io"
-            target="_blank"
-            type="primary"
-          >
-            复制链接
-          </el-link>
-        </div>
-        <div>
-          <span>
-            163邮箱：http://jingyan.baidu.com/article/fedf032148ajkas8978ea.html
-          </span>
-          <el-link
-            href="https://element.eleme.io"
-            target="_blank"
-            type="primary"
-          >
-            复制链接
-          </el-link>
-        </div>
-        <div>
-          <span>
-            腾讯企业邮箱：http://jingyan.baidu.com/article/fedf032148ajkas8978ea.html
-          </span>
-          <el-link
-            href="https://element.eleme.io"
-            target="_blank"
-            type="primary"
-          >
-            复制链接
-          </el-link>
-        </div>
-        <el-button type="primary" size="small">保存</el-button>
-        <el-button type="primary" size="small" plain>返回</el-button>
-      </el-tab-pane>
-      <el-tab-pane label="微信平台配置" name="third">
-        <el-form
-          ref="form"
-          :model="form"
-          label-position="left"
-          label-width="140px"
-        >
-          <el-form-item label="微信appid">
-            <el-input
-              v-model="input"
-              size="small"
-              placeholder="请输入内容"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="微信appSecret">
-            <el-input
-              v-model="input"
-              size="small"
-              placeholder="请输入内容"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="公众号唯一标识参数">
-            <el-input
-              v-model="input"
-              size="small"
-              placeholder="请输入内容"
-            ></el-input>
-          </el-form-item>
-        </el-form>
-        <el-button type="primary" size="small">保存</el-button>
-        <el-button type="primary" plain size="small">返回</el-button>
-      </el-tab-pane>
+<!--      <el-tab-pane label="邮箱配置" name="second">-->
+<!--        <el-form-->
+<!--          ref="form"-->
+<!--          :model="form"-->
+<!--          label-position="left"-->
+<!--          label-width="120px"-->
+<!--        >-->
+<!--          <el-form-item label="邮箱地址">-->
+<!--            <el-input-->
+<!--              v-model="input"-->
+<!--              size="small"-->
+<!--              placeholder="请输入内容"-->
+<!--            ></el-input>-->
+<!--          </el-form-item>-->
+<!--          <el-form-item label="邮箱授权码">-->
+<!--            <el-input-->
+<!--              v-model="input"-->
+<!--              size="small"-->
+<!--              placeholder="请输入内容"-->
+<!--            ></el-input>-->
+<!--          </el-form-item>-->
+<!--          <el-form-item label="邮箱服务器地址">-->
+<!--            <el-input-->
+<!--              v-model="input"-->
+<!--              size="small"-->
+<!--              placeholder="请输入内容"-->
+<!--            ></el-input>-->
+<!--          </el-form-item>-->
+<!--          <el-form-item label="协议">-->
+<!--            <el-input-->
+<!--              v-model="input"-->
+<!--              size="small"-->
+<!--              placeholder="请输入内容"-->
+<!--            ></el-input>-->
+<!--          </el-form-item>-->
+<!--          <el-form-item label="端口">-->
+<!--            <el-input-->
+<!--              v-model="input"-->
+<!--              size="small"-->
+<!--              placeholder="请输入内容"-->
+<!--            ></el-input>-->
+<!--          </el-form-item>-->
+<!--        </el-form>-->
+<!--&lt;!&ndash;        <div>&ndash;&gt;-->
+<!--&lt;!&ndash;          <span>&ndash;&gt;-->
+<!--&lt;!&ndash;            QQ邮箱：http://jingyan.baidu.com/article/fedf032148ajkas8978ea.html&ndash;&gt;-->
+<!--&lt;!&ndash;          </span>&ndash;&gt;-->
+<!--&lt;!&ndash;          <el-link&ndash;&gt;-->
+<!--&lt;!&ndash;            href="https://element.eleme.io"&ndash;&gt;-->
+<!--&lt;!&ndash;            target="_blank"&ndash;&gt;-->
+<!--&lt;!&ndash;            type="primary"&ndash;&gt;-->
+<!--&lt;!&ndash;          >&ndash;&gt;-->
+<!--&lt;!&ndash;            复制链接&ndash;&gt;-->
+<!--&lt;!&ndash;          </el-link>&ndash;&gt;-->
+<!--&lt;!&ndash;        </div>&ndash;&gt;-->
+<!--&lt;!&ndash;        <div>&ndash;&gt;-->
+<!--&lt;!&ndash;          <span>&ndash;&gt;-->
+<!--&lt;!&ndash;            163邮箱：http://jingyan.baidu.com/article/fedf032148ajkas8978ea.html&ndash;&gt;-->
+<!--&lt;!&ndash;          </span>&ndash;&gt;-->
+<!--&lt;!&ndash;          <el-link&ndash;&gt;-->
+<!--&lt;!&ndash;            href="https://element.eleme.io"&ndash;&gt;-->
+<!--&lt;!&ndash;            target="_blank"&ndash;&gt;-->
+<!--&lt;!&ndash;            type="primary"&ndash;&gt;-->
+<!--&lt;!&ndash;          >&ndash;&gt;-->
+<!--&lt;!&ndash;            复制链接&ndash;&gt;-->
+<!--&lt;!&ndash;          </el-link>&ndash;&gt;-->
+<!--&lt;!&ndash;        </div>&ndash;&gt;-->
+<!--&lt;!&ndash;        <div>&ndash;&gt;-->
+<!--&lt;!&ndash;          <span>&ndash;&gt;-->
+<!--&lt;!&ndash;            腾讯企业邮箱：http://jingyan.baidu.com/article/fedf032148ajkas8978ea.html&ndash;&gt;-->
+<!--&lt;!&ndash;          </span>&ndash;&gt;-->
+<!--&lt;!&ndash;          <el-link&ndash;&gt;-->
+<!--&lt;!&ndash;            href="https://element.eleme.io"&ndash;&gt;-->
+<!--&lt;!&ndash;            target="_blank"&ndash;&gt;-->
+<!--&lt;!&ndash;            type="primary"&ndash;&gt;-->
+<!--&lt;!&ndash;          >&ndash;&gt;-->
+<!--&lt;!&ndash;            复制链接&ndash;&gt;-->
+<!--&lt;!&ndash;          </el-link>&ndash;&gt;-->
+<!--&lt;!&ndash;        </div>&ndash;&gt;-->
+<!--        <el-button type="primary" size="small">保存</el-button>-->
+<!--        <el-button type="primary" size="small" plain>返回</el-button>-->
+<!--      </el-tab-pane>-->
+<!--      <el-tab-pane label="微信平台配置" name="third">-->
+<!--        <el-form-->
+<!--          ref="form"-->
+<!--          :model="form"-->
+<!--          label-position="left"-->
+<!--          label-width="140px"-->
+<!--        >-->
+<!--          <el-form-item label="微信appid">-->
+<!--            <el-input-->
+<!--              v-model="input"-->
+<!--              size="small"-->
+<!--              placeholder="请输入内容"-->
+<!--            ></el-input>-->
+<!--          </el-form-item>-->
+<!--          <el-form-item label="微信appSecret">-->
+<!--            <el-input-->
+<!--              v-model="input"-->
+<!--              size="small"-->
+<!--              placeholder="请输入内容"-->
+<!--            ></el-input>-->
+<!--          </el-form-item>-->
+<!--          <el-form-item label="公众号唯一标识参数">-->
+<!--            <el-input-->
+<!--              v-model="input"-->
+<!--              size="small"-->
+<!--              placeholder="请输入内容"-->
+<!--            ></el-input>-->
+<!--          </el-form-item>-->
+<!--        </el-form>-->
+<!--        <el-button type="primary" size="small">保存</el-button>-->
+<!--        <el-button type="primary" plain size="small">返回</el-button>-->
+<!--      </el-tab-pane>-->
     </el-tabs>
   </div>
 </template>
diff --git a/src/views/set/intention/index.vue b/src/views/set/intention/index.vue
index 385cae1..24a386f 100644
--- a/src/views/set/intention/index.vue
+++ b/src/views/set/intention/index.vue
@@ -1,8 +1,20 @@
 <template>
   <div class="manage-container">
     <div class="manage-button">
-      <el-button type="primary" size="small" @click="addData">添加</el-button>
-      <el-button type="primary" size="small" @click="exportData">
+      <el-button
+        v-if="isBtnPerm('/intentionCustomer/insert')"
+        type="primary"
+        size="small"
+        @click="addData"
+      >
+        添加
+      </el-button>
+      <el-button
+        v-if="isBtnPerm('/intentionCustomer/export')"
+        type="primary"
+        size="small"
+        @click="exportData"
+      >
         导出
       </el-button>
     </div>
@@ -51,8 +63,20 @@
       ></el-table-column>
       <el-table-column fixed="right" label="操作" align="center">
         <template #default="{ row }">
-          <el-button type="text" @click="editData(row)">编辑</el-button>
-          <el-button type="text" @click="handleDelete(row)">删除</el-button>
+          <el-button
+            v-if="isBtnPerm('/intentionCustomer/update')"
+            type="text"
+            @click="editData(row)"
+          >
+            编辑
+          </el-button>
+          <el-button
+            v-if="isBtnPerm('/intentionCustomer/remove')"
+            type="text"
+            @click="handleDelete(row)"
+          >
+            删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/set/manage/components/applets/appletsIndex.vue b/src/views/set/manage/components/applets/appletsIndex.vue
index fc39d73..6e4d9ce 100644
--- a/src/views/set/manage/components/applets/appletsIndex.vue
+++ b/src/views/set/manage/components/applets/appletsIndex.vue
@@ -1,7 +1,12 @@
 <template>
   <div class="manage-container">
     <div class="manage-button">
-      <el-button type="primary" size="small" @click="handleAdd">
+      <el-button
+        v-if="isBtnPerm('/miniRole/insert')"
+        type="primary"
+        size="small"
+        @click="handleAdd"
+      >
         添加角色
       </el-button>
     </div>
@@ -48,11 +53,34 @@
       ></el-table-column>
       <el-table-column fixed="right" label="操作" align="center">
         <template #default="{ row }">
-          <el-button type="text" @click="handleEdit(row)">编辑</el-button>
-          <el-button type="text" @click="handleDelete(row)">删除</el-button>
-          <el-button type="text" @click="handleauthorization(row)">
+          <el-button
+            v-if="isBtnPerm('/miniRole/update')"
+            type="text"
+            @click="handleEdit(row)"
+          >
+            编辑
+          </el-button>
+          <el-button
+            v-if="isBtnPerm('/miniRole/remove')"
+            type="text"
+            @click="handleDelete(row)"
+          >
+            删除
+          </el-button>
+          <el-button
+            v-if="isBtnPerm('/miniRole/assignMenu')"
+            type="text"
+            @click="handleauthorization(row)"
+          >
             角色授权
           </el-button>
+          <el-button
+            v-if="isBtnPerm('/miniRole/assignButton')"
+            type="text"
+            @click="handleAssignButton(row)"
+          >
+            分配按钮
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -68,6 +96,7 @@
     ></el-pagination>
     <role-edit ref="edit"></role-edit>
     <role-grant ref="grant"></role-grant>
+    <role-button ref="button"></role-button>
   </div>
 </template>
 
@@ -75,11 +104,13 @@
 import { miniRoleRemove, miniRoleUpdate, miniRoleSelect } from '@/api/role';
 import roleGrant from './appletsGrant';
 import roleEdit from './appletsEdit';
+import roleButton from './button';
 export default {
   name: 'RoleIndex',
   components: {
     roleGrant,
     roleEdit,
+    roleButton,
   },
   data() {
     return {
@@ -143,6 +174,10 @@ export default {
     handleauthorization(row) {
       this.$refs['grant'].roleGrant(row);
     },
+    // 按钮分配
+    handleAssignButton(row) {
+      this.$refs['button'].roleButton(row.id);
+    },
     handleQuery() {
       this.queryForm.page = 1;
       this.fetchData();
diff --git a/src/views/set/manage/components/applets/button.vue b/src/views/set/manage/components/applets/button.vue
new file mode 100644
index 0000000..a875ce5
--- /dev/null
+++ b/src/views/set/manage/components/applets/button.vue
@@ -0,0 +1,107 @@
+<template>
+  <el-dialog
+    v-model="dialogFormVisible"
+    :title="title"
+    width="500px"
+    @close="close"
+  >
+    <el-form
+      ref="form"
+      :model="form"
+      :rules="rules"
+      label-width="80px"
+      label-position="left"
+    >
+      <el-form-item label="分配按钮" prop="buttonIds">
+        <el-select
+          v-model="form.buttonIds"
+          size="small"
+          filterable
+          multiple
+          placeholder="选择按钮"
+        >
+          <el-option
+            v-for="item in buttonData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+    </el-form>
+    <div class="dialog-footer">
+      <el-button type="primary" size="small" @click="save">确 定</el-button>
+      <el-button size="small" @click="close">取 消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getButtonIds, assignButton, getList } from '@/api/program';
+export default {
+  data() {
+    return {
+      form: {
+        roleId: '',
+        buttonIds: '',
+      },
+      buttonData: [],
+      rules: {
+        buttonIds: [{ required: true, trigger: 'blur', message: '请选择按钮' }],
+      },
+      title: '',
+      dialogFormVisible: false,
+    };
+  },
+  created() {},
+  methods: {
+    handleCountryChange(value) {
+      if (value) {
+        const len = value.length - 1;
+        this.form.parentId = value[len];
+      } else {
+        this.form.parentId = 0;
+      }
+    },
+    async getButtonData() {
+      const { data } = await getList({ page: 1, size: 1000 });
+      this.buttonData = data.items;
+      await this.queryRoleButton();
+    },
+    // 查询角色现有按钮
+    async queryRoleButton() {
+      const { data } = await getButtonIds({ roleId: this.form.roleId });
+      this.form.buttonIds = data;
+    },
+    roleButton(roleId) {
+      this.title = '绑定按钮';
+      this.form.roleId = roleId;
+      this.dialogFormVisible = true;
+      this.getButtonData();
+    },
+    close() {
+      this.$refs['form'].resetFields();
+      this.form = this.$options.data().form;
+      this.dialogFormVisible = false;
+      this.$emit('fetch-data');
+    },
+    save() {
+      this.$refs['form'].validate(async valid => {
+        if (valid) {
+          this.form.name = this.form.title;
+          const { msg } = await assignButton(this.form);
+          this.$notify({
+            title: msg,
+            type: 'success',
+          });
+          this.$refs['form'].resetFields();
+          this.dialogFormVisible = false;
+          this.$parent.fetchData();
+        } else {
+          return false;
+        }
+      });
+    },
+  },
+};
+</script>
diff --git a/src/views/set/manage/components/role/button.vue b/src/views/set/manage/components/role/button.vue
new file mode 100644
index 0000000..f805e46
--- /dev/null
+++ b/src/views/set/manage/components/role/button.vue
@@ -0,0 +1,109 @@
+<template>
+  <el-dialog
+    v-model="dialogFormVisible"
+    :title="title"
+    width="500px"
+    @close="close"
+  >
+    <el-form
+      ref="form"
+      :model="form"
+      :rules="rules"
+      label-width="80px"
+      label-position="left"
+    >
+      <el-form-item label="分配按钮" prop="buttonIds">
+        <el-select
+          v-model="form.buttonIds"
+          size="small"
+          filterable
+          multiple
+          placeholder="选择按钮"
+        >
+          <el-option
+            v-for="item in buttonData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+    </el-form>
+    <div class="dialog-footer">
+      <el-button type="primary" size="small" @click="save">确 定</el-button>
+      <el-button size="small" @click="close">取 消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getButtonIds, assignButton, getList } from '@/api/platform';
+export default {
+  data() {
+    return {
+      form: {
+        roleId: '',
+        buttonIds: '',
+      },
+      buttonData: [],
+      rules: {
+        buttonIds: [
+          { required: true, trigger: 'blur', message: '请选择按钮' },
+        ],
+      },
+      title: '',
+      dialogFormVisible: false,
+    };
+  },
+  created() {},
+  methods: {
+    handleCountryChange(value) {
+      if (value) {
+        const len = value.length - 1;
+        this.form.parentId = value[len];
+      } else {
+        this.form.parentId = 0;
+      }
+    },
+    async getButtonData() {
+      const { data } = await getList({ page: 1, size: 1000 });
+      this.buttonData = data.items;
+      await this.queryRoleButton();
+    },
+    // 查询角色现有按钮
+    async queryRoleButton() {
+      const { data } = await getButtonIds({ roleId: this.form.roleId });
+      this.form.buttonIds = data;
+    },
+    roleButton(roleId) {
+      this.title = '绑定按钮';
+      this.form.roleId = roleId;
+      this.dialogFormVisible = true;
+      this.getButtonData();
+    },
+    close() {
+      this.$refs['form'].resetFields();
+      this.form = this.$options.data().form;
+      this.dialogFormVisible = false;
+      this.$emit('fetch-data');
+    },
+    save() {
+      this.$refs['form'].validate(async valid => {
+        if (valid) {
+          this.form.name = this.form.title;
+          const { msg } = await assignButton(this.form);
+          this.$notify({
+            title: msg,
+            type: 'success',
+          });
+          this.$refs['form'].resetFields();
+          this.dialogFormVisible = false;
+          this.$parent.fetchData();
+        } else {
+          return false;
+        }
+      });
+    },
+  },
+};
+</script>
diff --git a/src/views/set/manage/components/role/roleIndex.vue b/src/views/set/manage/components/role/roleIndex.vue
index e5d50ca..21ce2aa 100644
--- a/src/views/set/manage/components/role/roleIndex.vue
+++ b/src/views/set/manage/components/role/roleIndex.vue
@@ -1,7 +1,12 @@
 <template>
   <div class="manage-container">
     <div class="manage-button">
-      <el-button type="primary" size="small" @click="handleAdd">
+      <el-button
+        v-if="isBtnPerm('/sysRole/insert')"
+        type="primary"
+        size="small"
+        @click="handleAdd"
+      >
         添加角色
       </el-button>
     </div>
@@ -48,11 +53,34 @@
       ></el-table-column>
       <el-table-column fixed="right" label="操作" align="center">
         <template #default="{ row }">
-          <el-button type="text" @click="handleEdit(row)">编辑</el-button>
-          <el-button type="text" @click="handleDelete(row)">删除</el-button>
-          <el-button type="text" @click="handleauthorization(row)">
+          <el-button
+            v-if="isBtnPerm('/sysRole/update')"
+            type="text"
+            @click="handleEdit(row)"
+          >
+            编辑
+          </el-button>
+          <el-button
+            v-if="isBtnPerm('/wechatButton/update')"
+            type="text"
+            @click="handleDelete(row)"
+          >
+            删除
+          </el-button>
+          <el-button
+            v-if="isBtnPerm('/sysRole/assignMenu')"
+            type="text"
+            @click="handleauthorization(row)"
+          >
             角色授权
           </el-button>
+          <el-button
+            v-if="isBtnPerm('/sysRole/assignButton')"
+            type="text"
+            @click="handleAssignButton(row)"
+          >
+            分配按钮
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -68,6 +96,7 @@
     ></el-pagination>
     <role-edit ref="edit"></role-edit>
     <role-grant ref="grant"></role-grant>
+    <role-button ref="button"></role-button>
   </div>
 </template>
 
@@ -75,11 +104,13 @@
 import { doDelete, doEdit, getList } from '@/api/role';
 import roleGrant from './roleGrant';
 import roleEdit from './roleEdit';
+import roleButton from './button';
 export default {
   name: 'RoleIndex',
   components: {
     roleGrant,
     roleEdit,
+    roleButton,
   },
   data() {
     return {
@@ -145,6 +176,10 @@ export default {
     handleauthorization(row) {
       this.$refs['grant'].roleGrant(row);
     },
+    // 按钮分配
+    handleAssignButton(row) {
+      this.$refs['button'].roleButton(row.id);
+    },
     handleQuery() {
       this.queryForm.page = 1;
       this.fetchData();
diff --git a/src/views/set/manage/components/user/manageProduct.vue b/src/views/set/manage/components/user/manageProduct.vue
index 26db5b9..f1505f4 100644
--- a/src/views/set/manage/components/user/manageProduct.vue
+++ b/src/views/set/manage/components/user/manageProduct.vue
@@ -12,6 +12,7 @@
           size="small"
           multiple
           placeholder="请选择"
+          filterable
         >
           <el-option
             v-for="item in projectData"
diff --git a/src/views/set/manage/index.vue b/src/views/set/manage/index.vue
index 2227dc9..336300f 100644
--- a/src/views/set/manage/index.vue
+++ b/src/views/set/manage/index.vue
@@ -52,10 +52,20 @@
     <div class="manage-button">
       <el-button size="small" @click="resetForm()">重置</el-button>
       <el-button type="primary" size="small" @click="search">查询</el-button>
-      <el-button type="primary" size="small" @click="handleAdd">
+      <el-button
+        v-if="isBtnPerm('/sysUser/insert')"
+        type="primary"
+        size="small"
+        @click="handleAdd"
+      >
         添加用户
       </el-button>
-      <el-button type="primary" size="small" @click="deletes">
+      <el-button
+        v-if="isBtnPerm('/sysUser/remove')"
+        type="primary"
+        size="small"
+        @click="deletes"
+      >
         批量删除
       </el-button>
     </div>
@@ -67,46 +77,35 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55"></el-table-column>
-      <el-table-column
-        prop="id"
-        label="ID"
-        width="60"
-        align="center"
-      ></el-table-column>
+      <el-table-column prop="id" label="ID" align="center"></el-table-column>
       <el-table-column
         prop="userName"
         label="用户名"
-        width="120"
         align="center"
       ></el-table-column>
       <el-table-column
         prop="dept.deptName"
         label="部门"
-        width="120"
         align="center"
       ></el-table-column>
       <el-table-column
         prop="nickName"
         label="名字"
-        width="120"
         align="center"
       ></el-table-column>
       <el-table-column
         prop="phone"
         label="手机"
-        width="120"
         align="center"
       ></el-table-column>
       <el-table-column
         prop="email"
         label="邮箱"
-        width="120"
         align="center"
       ></el-table-column>
       <el-table-column
         prop="wechat"
         label="微信"
-        width="120"
         align="center"
       ></el-table-column>
       <el-table-column prop="status" label="状态" align="center" width="60">
@@ -122,24 +121,48 @@
       <el-table-column
         prop="createTime"
         label="创建时间"
-        width="200"
         align="center"
       ></el-table-column>
       <el-table-column
         prop="updateTime"
         label="更新时间"
-        width="200"
         align="center"
       ></el-table-column>
       <el-table-column fixed="right" label="操作" width="350" align="center">
         <template #default="{ row }">
-          <el-button type="text" @click="handleEdit(row)">编辑</el-button>
-          <el-button type="text" @click="handleDelete(row)">删除</el-button>
-          <el-button type="text" @click="assignRole(row)">平台角色</el-button>
-          <el-button type="text" @click="assignMiniRole(row)">
+          <el-button
+            v-if="isBtnPerm('/sysUser/update')"
+            type="text"
+            @click="handleEdit(row)"
+          >
+            编辑
+          </el-button>
+          <el-button
+            v-if="isBtnPerm('/sysUser/remove')"
+            type="text"
+            @click="handleDelete(row)"
+          >
+            删除
+          </el-button>
+          <el-button
+            v-if="isBtnPerm('/sysUser/assignRole')"
+            type="text"
+            @click="assignRole(row)"
+          >
+            平台角色
+          </el-button>
+          <el-button
+            v-if="isBtnPerm('/sysUser/assignMiniRole')"
+            type="text"
+            @click="assignMiniRole(row)"
+          >
             小程序角色
           </el-button>
-          <el-button type="text" @click="assignProduct(row)">
+          <el-button
+            v-if="isBtnPerm('/sysUser/assignProject')"
+            type="text"
+            @click="assignProduct(row)"
+          >
             分配项目
           </el-button>
         </template>
diff --git a/src/views/set/material/index.vue b/src/views/set/material/index.vue
index a17aea9..21737eb 100644
--- a/src/views/set/material/index.vue
+++ b/src/views/set/material/index.vue
@@ -1,6 +1,11 @@
 <template>
   <div class="manage-container">
-    <el-button type="primary" size="small" @click="handleAdd">
+    <el-button
+      v-if="isBtnPerm('/material/icon/insert')"
+      type="primary"
+      size="small"
+      @click="handleAdd"
+    >
       添加图片
     </el-button>
     <el-container direction="horizontal">
@@ -33,7 +38,13 @@
     </el-container>
     <vab-query-form v-if="fileData.length > 0">
       <vab-query-form-left-panel>
-        <el-button type="primary" @click="deletes">批量删除</el-button>
+        <el-button
+          v-if="isBtnPerm('/material/icon/remove')"
+          type="primary"
+          @click="deletes"
+        >
+          批量删除
+        </el-button>
       </vab-query-form-left-panel>
       <vab-query-form-right-panel>
         <el-pagination
diff --git a/src/views/set/permission/index.vue b/src/views/set/permission/index.vue
new file mode 100644
index 0000000..7ab5087
--- /dev/null
+++ b/src/views/set/permission/index.vue
@@ -0,0 +1,59 @@
+<template>
+  <div class="manage-container">
+    <el-tabs v-model="activeName" @tab-click="handleClick">
+      <el-tab-pane label="平台三级按钮" name="first">
+        <platform-index ref="platform"></platform-index>
+      </el-tab-pane>
+      <el-tab-pane label="小程序三级按钮" name="second">
+        <program-index ref="program"></program-index>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+import platformIndex from './platform/index';
+import programIndex from './program/index';
+export default {
+  components: {
+    platformIndex,
+    programIndex,
+  },
+  data() {
+    return {
+      activeName: 'first',
+    };
+  },
+  methods: {
+    handleClick(tab, event) {
+      if (tab.paneName == 'first') {
+        this.$refs['platform'].fetchData();
+      } else if (tab.paneName == 'second') {
+        this.$refs['program'].fetchData();
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+.el-submenu__title:hover {
+  background-color: rgba(#1890ff, 0.085) !important;
+  color: hsla(208, 100%, 55%, 0.95) !important;
+}
+</style>
+
+<style lang="scss" scoped>
+.el-form-item {
+  margin-bottom: 10px !important;
+  .el-input {
+    width: 360px !important;
+  }
+  .el-select {
+    width: 360px !important;
+  }
+  .el-cascader {
+    width: 360px !important;
+  }
+}
+</style>
diff --git a/src/views/set/permission/platform/edit.vue b/src/views/set/permission/platform/edit.vue
new file mode 100644
index 0000000..a93a38c
--- /dev/null
+++ b/src/views/set/permission/platform/edit.vue
@@ -0,0 +1,135 @@
+<template>
+  <el-dialog
+    v-model="dialogFormVisible"
+    :title="title"
+    width="500px"
+    @close="close"
+  >
+    <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form-item label="按钮名称" prop="pid">
+        <el-cascader
+          v-model="form.pid"
+          :options="buttonData"
+          :props="{
+            value: 'id',
+            label: 'label',
+          }"
+          @change="handleChange"
+        ></el-cascader>
+      </el-form-item>
+      <el-form-item label="按钮名称" prop="name">
+        <el-input
+          v-model.trim="form.name"
+          size="small"
+          autocomplete="off"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="权限标识" prop="perms">
+        <el-input
+          v-model.trim="form.perms"
+          size="small"
+          autocomplete="off"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input
+          v-model.trim="form.remark"
+          size="small"
+          autocomplete="off"
+        ></el-input>
+      </el-form-item>
+    </el-form>
+    <div class="dialog-footer">
+      <el-button type="primary" size="small" @click="save">确 定</el-button>
+      <el-button size="small" @click="close">取 消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { doEdit, doAdd, buttonTree } from '@/api/platform';
+import { getTypeCategoryTree } from '@/api/knowledge';
+export default {
+  data() {
+    return {
+      form: {
+        pid: 0,
+        id: '',
+        name: '',
+        perms: '',
+        remark: '',
+      },
+      buttonData: [],
+      rules: {
+        name: [{ required: true, trigger: 'blur', message: '请输入按钮名称' }],
+        perms: [{ required: true, trigger: 'blur', message: '请输入权限标识' }],
+      },
+      title: '',
+      dialogFormVisible: false,
+    };
+  },
+  created() {},
+  methods: {
+    handleCountryChange(value) {
+      if (value) {
+        const len = value.length - 1;
+        this.form.parentId = value[len];
+      } else {
+        this.form.parentId = 0;
+      }
+    },
+    showEdit(row) {
+      if (!row) {
+        this.title = '添加按钮';
+      } else {
+        this.title = '编辑按钮';
+        this.form = Object.assign({}, row);
+      }
+      this.dialogFormVisible = true;
+      this.buttonTree();
+    },
+    async buttonTree() {
+      const { data } = await buttonTree();
+      this.buttonData = data;
+    },
+    handleChange() {
+      this.form.pid = this.form.pid[this.form.pid.length - 1];
+    },
+    close() {
+      this.$refs['form'].resetFields();
+      this.form = this.$options.data().form;
+      this.dialogFormVisible = false;
+      this.$emit('fetch-data');
+    },
+    save() {
+      this.$refs['form'].validate(async valid => {
+        if (valid) {
+          if (this.form.id) {
+            const { msg } = await doEdit(this.form);
+            this.$notify({
+              title: msg,
+              type: 'success',
+            });
+          } else {
+            const { msg } = await doAdd(this.form);
+            this.$notify({
+              title: msg,
+              type: 'success',
+            });
+          }
+          this.$refs['form'].resetFields();
+          this.dialogFormVisible = false;
+          this.$parent.fetchData();
+        } else {
+          return false;
+        }
+      });
+    },
+  },
+};
+</script>
+<style>
+.select {
+  width: 100%;
+}
+</style>
diff --git a/src/views/set/permission/platform/index.vue b/src/views/set/permission/platform/index.vue
new file mode 100644
index 0000000..4ad3d14
--- /dev/null
+++ b/src/views/set/permission/platform/index.vue
@@ -0,0 +1,194 @@
+<template>
+  <div class="manage-container">
+    <div class="manage-input">
+      <el-form ref="queryForm" :model="queryForm" label-width="80px">
+        <vab-query-form>
+          <el-form-item width="100" prop="name" label="按钮名称">
+            <el-input
+              v-model="queryForm.name"
+              size="small"
+              placeholder="请输入按钮名称"
+            ></el-input>
+          </el-form-item>
+        </vab-query-form>
+      </el-form>
+    </div>
+    <div class="manage-button">
+      <el-button size="small" @click="resetForm()">重置</el-button>
+      <el-button type="primary" size="small" @click="search">查询</el-button>
+      <el-button
+        v-if="isBtnPerm('/sysButton/insert')"
+        type="primary"
+        size="small"
+        @click="handleAdd"
+      >
+        添加按钮
+      </el-button>
+    </div>
+    <el-table :data="roleData" border stripe style="width: 100%">
+      <el-table-column
+        prop="id"
+        label="ID"
+        width="60"
+        align="center"
+      ></el-table-column>
+      <el-table-column
+        prop="name"
+        label="按钮名"
+        width="150"
+        align="center"
+      ></el-table-column>
+      <el-table-column
+        prop="perms"
+        label="权限标识"
+        width="150"
+        align="center"
+      ></el-table-column>
+      <el-table-column
+        prop="remark"
+        label="备注"
+        align="center"
+        width="120"
+      ></el-table-column>
+      <el-table-column
+        prop="createTime"
+        label="创建时间"
+        width="220"
+        align="center"
+      ></el-table-column>
+      <el-table-column
+        prop="updateTime"
+        label="更新时间"
+        width="220"
+        align="center"
+      ></el-table-column>
+      <el-table-column fixed="right" label="操作" align="center">
+        <template #default="{ row }">
+          <el-button
+            v-if="isBtnPerm('/sysButton/update')"
+            type="text"
+            @click="handleEdit(row)"
+          >
+            编辑
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      :background="background"
+      :current-page="queryForm.page"
+      :layout="layout"
+      :page-size="queryForm.size"
+      :total="total"
+      style="text-align: right"
+      @current-change="handleCurrentChange"
+      @size-change="handleSizeChange"
+    ></el-pagination>
+    <platform-edit ref="edit"></platform-edit>
+  </div>
+</template>
+
+<script>
+import { getList } from '@/api/platform';
+import platformEdit from './edit';
+export default {
+  components: {
+    platformEdit,
+  },
+  data() {
+    return {
+      roleData: [],
+      lazy: true,
+      activeName: 'first',
+      layout: 'total, sizes, prev, pager, next, jumper',
+      total: 0,
+      input: '',
+      textarea: '',
+      list: [],
+      background: true,
+      listLoading: true,
+      elementLoadingText: '正在加载...',
+      queryForm: {
+        page: 1,
+        size: 20,
+        name: '',
+      },
+    };
+  },
+  computed: {
+    height() {
+      return 500;
+    },
+  },
+  created() {
+    this.fetchData();
+  },
+  methods: {
+    async fetchData() {
+      this.listLoading = true;
+      const { data } = await getList(this.queryForm);
+      this.roleData = data.items;
+      this.total = data.total;
+      setTimeout(() => {
+        this.listLoading = false;
+      }, 500);
+    },
+    handleAdd() {
+      this.$refs['edit'].showEdit();
+    },
+    handleEdit(row) {
+      this.$refs['edit'].showEdit(row);
+    },
+    search() {
+      this.fetchData();
+    },
+    resetForm() {
+      this.$refs.queryForm.resetFields();
+    },
+    handleQuery() {
+      this.queryForm.page = 1;
+      this.fetchData();
+    },
+    handleSizeChange(val) {
+      this.queryForm.size = val;
+      this.fetchData();
+    },
+    handleCurrentChange(val) {
+      this.queryForm.page = val;
+      this.fetchData();
+    },
+    // handleDelete(row) {
+    //   const that = this;
+    //   if (row.id) {
+    //     this.$confirm('你确定要删除当前项吗?', '提示', {
+    //       confirmButtonText: '确定',
+    //       cancelButtonText: '取消',
+    //       type: 'warning',
+    //     })
+    //       .then(() => {
+    //         const { msg } = doDelete({ roleId: row.id });
+    //         this.$message({
+    //           type: 'success',
+    //           message: msg == undefined ? '删除成功' : msg,
+    //         });
+    //         setTimeout(function () {
+    //           that.fetchData();
+    //         }, 1000);
+    //       })
+    //       .catch(() => {
+    //         this.$message({
+    //           type: 'info',
+    //           message: '已取消删除',
+    //         });
+    //       });
+    //   }
+    // },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.manage-button {
+  margin-bottom: 30px;
+}
+</style>
diff --git a/src/views/set/permission/program.vue b/src/views/set/permission/program.vue
new file mode 100644
index 0000000..762e8b7
--- /dev/null
+++ b/src/views/set/permission/program.vue
@@ -0,0 +1,11 @@
+<script setup>
+
+</script>
+
+<template>
+
+</template>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/src/views/set/permission/program/edit.vue b/src/views/set/permission/program/edit.vue
new file mode 100644
index 0000000..55d6144
--- /dev/null
+++ b/src/views/set/permission/program/edit.vue
@@ -0,0 +1,135 @@
+<template>
+  <el-dialog
+    v-model="dialogFormVisible"
+    :title="title"
+    width="500px"
+    @close="close"
+  >
+    <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form-item label="按钮名称" prop="pid">
+        <el-cascader
+          v-model="form.pid"
+          :options="buttonData"
+          :props="{
+            value: 'id',
+            label: 'label',
+          }"
+          @change="handleChange"
+        ></el-cascader>
+      </el-form-item>
+      <el-form-item label="按钮名称" prop="name">
+        <el-input
+          v-model.trim="form.name"
+          size="small"
+          autocomplete="off"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="权限标识" prop="perms">
+        <el-input
+          v-model.trim="form.perms"
+          size="small"
+          autocomplete="off"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input
+          v-model.trim="form.remark"
+          size="small"
+          autocomplete="off"
+        ></el-input>
+      </el-form-item>
+    </el-form>
+    <div class="dialog-footer">
+      <el-button type="primary" size="small" @click="save">确 定</el-button>
+      <el-button size="small" @click="close">取 消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { doEdit, doAdd, buttonTree } from '@/api/program';
+import { getTypeCategoryTree } from '@/api/knowledge';
+export default {
+  data() {
+    return {
+      form: {
+        pid: 0,
+        id: '',
+        name: '',
+        perms: '',
+        remark: '',
+      },
+      buttonData: [],
+      rules: {
+        name: [{ required: true, trigger: 'blur', message: '请输入按钮名称' }],
+        perms: [{ required: true, trigger: 'blur', message: '请输入权限标识' }],
+      },
+      title: '',
+      dialogFormVisible: false,
+    };
+  },
+  created() {},
+  methods: {
+    handleCountryChange(value) {
+      if (value) {
+        const len = value.length - 1;
+        this.form.parentId = value[len];
+      } else {
+        this.form.parentId = 0;
+      }
+    },
+    showEdit(row) {
+      if (!row) {
+        this.title = '添加按钮';
+      } else {
+        this.title = '编辑按钮';
+        this.form = Object.assign({}, row);
+      }
+      this.dialogFormVisible = true;
+      this.buttonTree();
+    },
+    async buttonTree() {
+      const { data } = await buttonTree();
+      this.buttonData = data;
+    },
+    handleChange() {
+      this.form.pid = this.form.pid[this.form.pid.length - 1];
+    },
+    close() {
+      this.$refs['form'].resetFields();
+      this.form = this.$options.data().form;
+      this.dialogFormVisible = false;
+      this.$emit('fetch-data');
+    },
+    save() {
+      this.$refs['form'].validate(async valid => {
+        if (valid) {
+          if (this.form.id) {
+            const { msg } = await doEdit(this.form);
+            this.$notify({
+              title: msg,
+              type: 'success',
+            });
+          } else {
+            const { msg } = await doAdd(this.form);
+            this.$notify({
+              title: msg,
+              type: 'success',
+            });
+          }
+          this.$refs['form'].resetFields();
+          this.dialogFormVisible = false;
+          this.$parent.fetchData();
+        } else {
+          return false;
+        }
+      });
+    },
+  },
+};
+</script>
+<style>
+.select {
+  width: 100%;
+}
+</style>
diff --git a/src/views/set/permission/program/index.vue b/src/views/set/permission/program/index.vue
new file mode 100644
index 0000000..44dbc05
--- /dev/null
+++ b/src/views/set/permission/program/index.vue
@@ -0,0 +1,194 @@
+<template>
+  <div class="manage-container">
+    <div class="manage-input">
+      <el-form ref="queryForm" :model="queryForm" label-width="80px">
+        <vab-query-form>
+          <el-form-item width="100" prop="name" label="按钮名称">
+            <el-input
+              v-model="queryForm.name"
+              size="small"
+              placeholder="请输入按钮名称"
+            ></el-input>
+          </el-form-item>
+        </vab-query-form>
+      </el-form>
+    </div>
+    <div class="manage-button">
+      <el-button size="small" @click="resetForm()">重置</el-button>
+      <el-button type="primary" size="small" @click="search">查询</el-button>
+      <el-button
+        v-if="isBtnPerm('/wechatButton/insert')"
+        type="primary"
+        size="small"
+        @click="handleAdd"
+      >
+        添加按钮
+      </el-button>
+    </div>
+    <el-table :data="roleData" border stripe style="width: 100%">
+      <el-table-column
+        prop="id"
+        label="ID"
+        width="60"
+        align="center"
+      ></el-table-column>
+      <el-table-column
+        prop="name"
+        label="按钮名"
+        width="150"
+        align="center"
+      ></el-table-column>
+      <el-table-column
+        prop="perms"
+        label="权限标识"
+        width="150"
+        align="center"
+      ></el-table-column>
+      <el-table-column
+        prop="remark"
+        label="备注"
+        align="center"
+        width="120"
+      ></el-table-column>
+      <el-table-column
+        prop="createTime"
+        label="创建时间"
+        width="220"
+        align="center"
+      ></el-table-column>
+      <el-table-column
+        prop="updateTime"
+        label="更新时间"
+        width="220"
+        align="center"
+      ></el-table-column>
+      <el-table-column fixed="right" label="操作" align="center">
+        <template #default="{ row }">
+          <el-button
+            v-if="isBtnPerm('/wechatButton/update')"
+            type="text"
+            @click="handleEdit(row)"
+          >
+            编辑
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      :background="background"
+      :current-page="queryForm.page"
+      :layout="layout"
+      :page-size="queryForm.size"
+      :total="total"
+      style="text-align: right"
+      @current-change="handleCurrentChange"
+      @size-change="handleSizeChange"
+    ></el-pagination>
+    <platform-edit ref="edit"></platform-edit>
+  </div>
+</template>
+
+<script>
+import { getList } from '@/api/program';
+import platformEdit from './edit';
+export default {
+  components: {
+    platformEdit,
+  },
+  data() {
+    return {
+      roleData: [],
+      lazy: true,
+      activeName: 'first',
+      layout: 'total, sizes, prev, pager, next, jumper',
+      total: 0,
+      input: '',
+      textarea: '',
+      list: [],
+      background: true,
+      listLoading: true,
+      elementLoadingText: '正在加载...',
+      queryForm: {
+        page: 1,
+        size: 20,
+        name: '',
+      },
+    };
+  },
+  computed: {
+    height() {
+      return 500;
+    },
+  },
+  created() {
+    this.fetchData();
+  },
+  methods: {
+    async fetchData() {
+      this.listLoading = true;
+      const { data } = await getList(this.queryForm);
+      this.roleData = data.items;
+      this.total = data.total;
+      setTimeout(() => {
+        this.listLoading = false;
+      }, 500);
+    },
+    handleAdd() {
+      this.$refs['edit'].showEdit();
+    },
+    handleEdit(row) {
+      this.$refs['edit'].showEdit(row);
+    },
+    search() {
+      this.fetchData();
+    },
+    resetForm() {
+      this.$refs.queryForm.resetFields();
+    },
+    handleQuery() {
+      this.queryForm.page = 1;
+      this.fetchData();
+    },
+    handleSizeChange(val) {
+      this.queryForm.size = val;
+      this.fetchData();
+    },
+    handleCurrentChange(val) {
+      this.queryForm.page = val;
+      this.fetchData();
+    },
+    // handleDelete(row) {
+    //   const that = this;
+    //   if (row.id) {
+    //     this.$confirm('你确定要删除当前项吗?', '提示', {
+    //       confirmButtonText: '确定',
+    //       cancelButtonText: '取消',
+    //       type: 'warning',
+    //     })
+    //       .then(() => {
+    //         const { msg } = doDelete({ roleId: row.id });
+    //         this.$message({
+    //           type: 'success',
+    //           message: msg == undefined ? '删除成功' : msg,
+    //         });
+    //         setTimeout(function () {
+    //           that.fetchData();
+    //         }, 1000);
+    //       })
+    //       .catch(() => {
+    //         this.$message({
+    //           type: 'info',
+    //           message: '已取消删除',
+    //         });
+    //       });
+    //   }
+    // },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.manage-button {
+  margin-bottom: 30px;
+}
+</style>
diff --git a/src/views/set/set/components/applets/appletsIndex.vue b/src/views/set/set/components/applets/appletsIndex.vue
index 53338cb..a3c8c74 100644
--- a/src/views/set/set/components/applets/appletsIndex.vue
+++ b/src/views/set/set/components/applets/appletsIndex.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="manage-button">
     <el-button
+      v-if="isBtnPerm('/miniMenu/insert')"
       icon="el-icon-plus"
       type="primary"
       size="small"
@@ -62,8 +63,20 @@
     ></el-table-column>
     <el-table-column label="操作" align="center">
       <template #default="{ row }">
-        <el-button type="text" @click="handleEdit(row)">编辑</el-button>
-        <el-button type="text" @click="handleDelete(row)">删除</el-button>
+        <el-button
+          v-if="isBtnPerm('/miniMenu/update')"
+          type="text"
+          @click="handleEdit(row)"
+        >
+          编辑
+        </el-button>
+        <el-button
+          v-if="isBtnPerm('/miniMenu/remove')"
+          type="text"
+          @click="handleDelete(row)"
+        >
+          删除
+        </el-button>
       </template>
     </el-table-column>
   </el-table>
diff --git a/src/views/set/set/components/config/sysConfig.vue b/src/views/set/set/components/config/sysConfig.vue
index f8d0436..f3cea44 100644
--- a/src/views/set/set/components/config/sysConfig.vue
+++ b/src/views/set/set/components/config/sysConfig.vue
@@ -61,7 +61,14 @@
         ></el-input>
       </el-form-item>
     </el-form>
-    <el-button type="primary" size="small" @click="save">保存</el-button>
+    <el-button
+      v-if="isBtnPerm('/webInfo/saveOrUpdate')"
+      type="primary"
+      size="small"
+      @click="save"
+    >
+      保存
+    </el-button>
   </div>
 </template>
 
@@ -108,7 +115,7 @@ export default {
       const { data } = await getData();
       if (data) {
         if (data.logo) {
-          this.form.logo1 = baseURL + '/static/img/' + data.logo;
+          data.logo1 = baseURL + '/static/img/' + data.logo;
         }
         this.form = data;
       }
diff --git a/src/views/set/set/components/menuIndex.vue b/src/views/set/set/components/menuIndex.vue
index 5494e80..dfc1945 100644
--- a/src/views/set/set/components/menuIndex.vue
+++ b/src/views/set/set/components/menuIndex.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="manage-button">
     <el-button
+      v-if="isBtnPerm('/sysMenu/insert')"
       icon="el-icon-plus"
       type="primary"
       size="small"
@@ -62,8 +63,20 @@
     ></el-table-column>
     <el-table-column label="操作" align="center">
       <template #default="{ row }">
-        <el-button type="text" @click="handleEdit(row)">编辑</el-button>
-        <el-button type="text" @click="handleDelete(row)">删除</el-button>
+        <el-button
+          v-if="isBtnPerm('/sysMenu/update')"
+          type="text"
+          @click="handleEdit(row)"
+        >
+          编辑
+        </el-button>
+        <el-button
+          v-if="isBtnPerm('/sysMenu/remove')"
+          type="text"
+          @click="handleDelete(row)"
+        >
+          删除
+        </el-button>
       </template>
     </el-table-column>
   </el-table>
diff --git a/src/views/set/user/components/basic.vue b/src/views/set/user/components/basic.vue
index efb5617..e5ca5bf 100644
--- a/src/views/set/user/components/basic.vue
+++ b/src/views/set/user/components/basic.vue
@@ -20,7 +20,14 @@
       <el-input v-model="form.email" size="small"></el-input>
     </el-form-item>
   </el-form>
-  <el-button type="primary" size="small" @click="save">保存</el-button>
+  <el-button
+    v-if="isBtnPerm('/sysProfile/updateInfo')"
+    type="primary"
+    size="small"
+    @click="save"
+  >
+    保存
+  </el-button>
   <el-button type="primary" size="small" plain>返回</el-button>
 </template>
 
diff --git a/src/views/set/user/components/resetting.vue b/src/views/set/user/components/resetting.vue
index 7394f36..c8751ff 100644
--- a/src/views/set/user/components/resetting.vue
+++ b/src/views/set/user/components/resetting.vue
@@ -23,7 +23,14 @@
         ></el-input>
       </el-form-item>
     </el-form>
-    <el-button type="primary" size="small" @click="save">保存</el-button>
+    <el-button
+      v-if="isBtnPerm('/sysProfile/updatePwd')"
+      type="primary"
+      size="small"
+      @click="save"
+    >
+      保存
+    </el-button>
   </div>
 </template>
 
diff --git a/src/views/wechat/menu/index.vue b/src/views/wechat/menu/index.vue
index 4ad124d..3fcc934 100644
--- a/src/views/wechat/menu/index.vue
+++ b/src/views/wechat/menu/index.vue
@@ -1,13 +1,13 @@
 <template>
   <div class="manage-container">
     <div class="manage-button">
-      <el-button type="primary" size="small" @click="handleAdd()">
+      <el-button v-if="isBtnPerm('/wechatMp/menu/pub')" type="primary" size="small" @click="handleAdd()">
         添加
       </el-button>
-      <el-button type="primary" size="small" @click="handleRelease()">
+      <el-button v-if="isBtnPerm('/wechatMp/menu/fabu')" type="primary" size="small" @click="handleRelease()">
         发布
       </el-button>
-      <el-button type="primary" size="small" @click="allDel()">
+      <el-button v-if="isBtnPerm('/wechatMp/menu/remove')" type="primary" size="small" @click="allDel()">
         全部删除
       </el-button>
     </div>
@@ -88,12 +88,13 @@
               <el-table-column label="操作" align="center">
                 <template #default="scope">
                   <el-button
+                    v-if="isBtnPerm('/wechatMp/menu/ejupdate')"
                     type="text"
                     @click.stop="handleEdit(scope.row, row.name)"
                   >
                     {{ scope.row.isEdit ? '完成' : '编辑' }}
                   </el-button>
-                  <el-button type="text" @click="handleDelete(scope.row.name)">
+                  <el-button v-if="isBtnPerm('/wechatMp/menu/ejdel')" type="text" @click="handleDelete(scope.row.name)">
                     删除
                   </el-button>
                 </template>
@@ -111,13 +112,13 @@
         </el-table-column>
         <el-table-column prop="details" label="操作" align="center">
           <template #default="{ row }">
-            <el-button type="text" @click.stop="handleEdit(row, '')">
+            <el-button v-if="isBtnPerm('/wechatMp/menu/yjupdate')" type="text" @click.stop="handleEdit(row, '')">
               {{ row.isEdit ? '完成' : '编辑' }}
             </el-button>
-            <el-button type="text" @click="handleDelete(row.name, 1)">
+            <el-button v-if="isBtnPerm('/wechatMp/menu/yjdel')" type="text" @click="handleDelete(row.name, 1)">
               删除
             </el-button>
-            <el-button type="text" @click="handleTwoAdd(row.name, 1)">
+            <el-button v-if="isBtnPerm('/wechatMp/menu/yjadd')" type="text" @click="handleTwoAdd(row.name, 1)">
               添加
             </el-button>
           </template>
diff --git a/src/views/wechat/reply/default/index.vue b/src/views/wechat/reply/default/index.vue
index a9df761..0eeea23 100644
--- a/src/views/wechat/reply/default/index.vue
+++ b/src/views/wechat/reply/default/index.vue
@@ -47,7 +47,14 @@
       </el-form-item>
     </el-form>
     <div class="dialog-footer">
-      <el-button type="primary" size="small" @click="save">确 定</el-button>
+      <el-button
+        v-if="isBtnPerm('/wechatMp/defaultReply/saveOrUpdate')"
+        type="primary"
+        size="small"
+        @click="save"
+      >
+        确 定
+      </el-button>
     </div>
     <select-data ref="select" @getMaterialId="getMaterialId"></select-data>
   </div>
diff --git a/src/views/wechat/reply/follow/index.vue b/src/views/wechat/reply/follow/index.vue
index 978a9ea..7e4d6f1 100644
--- a/src/views/wechat/reply/follow/index.vue
+++ b/src/views/wechat/reply/follow/index.vue
@@ -48,7 +48,14 @@
       </el-form-item>
     </el-form>
     <div class="dialog-footer" style="text-align: right">
-      <el-button type="primary" size="small" @click="save">确 定</el-button>
+      <el-button
+        v-if="isBtnPerm('/wechatMp/subscribeReply/saveOrUpdate')"
+        type="primary"
+        size="small"
+        @click="save"
+      >
+        确 定
+      </el-button>
     </div>
     <select-data ref="select" @getMaterialId="getMaterialId"></select-data>
   </div>
@@ -145,7 +152,7 @@ export default {
           delete this.form.video;
           delete this.form.news;
           // this.form.textContent = delHtmlTag(this.form.textContent);
-              this.form.textContent =
+          this.form.textContent =
             '面对全球普遍存在乡村、景区、民宿、营地、服务区等分散性场景，每天产生大量污水随意排放，受限厂网建设投资大和运营成本高等诸多现实因素，难以收集到集中式污水厂处理的严峻挑战。力鼎深知，污水问题不仅影响水环境的改善，更关乎人类的卫生需求和健康保障。我们有志成为全球领先的分散式场景污水处理解决方案服务商，通过科技创新和技术升级，为各类分散场景实现污水高效解决方案，为人类创造一个更加清洁、健康、宜居的生活环境。同时，我们也将积极履行社会责任，与各方携手合作，共同推动分散式污水处理行业的健康发展，为构建美好世界贡献力量。' +
             '\n' +
             '清道夫：https://mp.weixin.qq.com/s/Xdgzc05iGKKIoIo7uXcHSg' +
diff --git a/src/views/wechat/reply/keywords/index.vue b/src/views/wechat/reply/keywords/index.vue
index 580ef1a..6036997 100644
--- a/src/views/wechat/reply/keywords/index.vue
+++ b/src/views/wechat/reply/keywords/index.vue
@@ -1,10 +1,20 @@
 <template>
   <div class="manage-container">
     <div class="manage-button">
-      <el-button type="primary" size="small" @click="handleAdd()">
+      <el-button
+        v-if="isBtnPerm('/wechatMp/keywordReply/insert')"
+        type="primary"
+        size="small"
+        @click="handleAdd()"
+      >
         添加
       </el-button>
-      <el-button type="primary" size="small" @click="deletes">
+      <el-button
+        v-if="isBtnPerm('/wechatMp/keywordReply/remove')"
+        type="primary"
+        size="small"
+        @click="deletes"
+      >
         批量删除
       </el-button>
     </div>
@@ -56,8 +66,20 @@
       ></el-table-column>
       <el-table-column fixed="right" label="操作" width="120" align="center">
         <template #default="{ row }">
-          <el-button type="text" @click="handleEdit(row)">编辑</el-button>
-          <el-button type="text" @click="handleDelete(row)">删除</el-button>
+          <el-button
+            v-if="isBtnPerm('/wechatMp/keywordReply/update')"
+            type="text"
+            @click="handleEdit(row)"
+          >
+            编辑
+          </el-button>
+          <el-button
+            v-if="isBtnPerm('/wechatMp/keywordReply/remove')"
+            type="text"
+            @click="handleDelete(row)"
+          >
+            删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
diff --git a/vue.config.js b/vue.config.js
index 0e08b80..373268f 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -156,6 +156,7 @@ module.exports = {
         },
       },
     },
+
     sourceMap: true,
     loaderOptions: {
       scss: {