设备增加权限

src/common/configs/buttonPermission.ts

@@ -68,6 +68,9 @@ const ButtonPermKeys = {
       maintenance: "device:maintenance",
     },
     BTNS: {
+      instance_add: "device:instance:add",
+      instance_del: "device:instance:del",
+      instance_edit: "device:instance:edit",
       maintenance_add: "device:maintenance:add",
       maintenance_handle: "device:maintenance:handle",
       maintenance_edit: "device:maintenance:edit",

src/directive/permission/index.ts

@@ -37,10 +37,7 @@ export function checkPerm(str: string) {
   if (roles.includes("ROOT")) {
     return true;
   }
-  const hasPerm = perms?.some((perm) => {
-    return str.includes(perm);
-  });
-  return hasPerm;
+  return perms.includes(str)
 }
 
 /**

src/views/device/instance/index.vue

@@ -10,6 +10,7 @@
       @row-save="createRow"
       @row-update="updateRow"
       @row-del="deleteRow"
+      :permission="permission"
       @search-change="searchChange"
       @search-reset="resetChange"
       @size-change="dataList"
@@ -31,7 +32,7 @@
       </template>-->
       <template #menu="{ size, row, index }">
         <el-button
-          v-hasPerm="[buttonPermission.DEVICE.BTNS.maintenance_edit]"
+          v-hasPerm="[buttonPermission.DEVICE.BTNS.instance_edit]"
           type="primary"
           link
           size="small"
@@ -48,6 +49,7 @@
           type="danger"
           icon="el-icon-delete"
           :size="size"
+          v-hasPerm="[buttonPermission.DEVICE.BTNS.instance_del]"
           @click="multipleDelete"
           >删除</el-button
         >
@@ -152,6 +154,7 @@ import { useCommonStoreHook } from "@/store";
 import ChoiceWorkshopPage from "../../plan/workOrder/components/choice-workshop-page.vue";
 import ChoiceStationPage from "./components/choice-station-page.vue";
 import dictDataUtil from "@/common/configs/dictDataUtil";
+import { checkPerm } from "@/directive/permission";
 const { isShowTable, tableType } = toRefs(useCommonStoreHook());
 const test = () => {
   isShowTable.value = true;
@@ -166,6 +169,12 @@ const addItem = () => {
     type: 1,
   });
 };
+const permission = reactive({
+  delBtn: checkPerm(buttonPermission.DEVICE.BTNS.instance_del),
+  addBtn: checkPerm(buttonPermission.DEVICE.BTNS.instance_add),
+  editBtn: checkPerm(buttonPermission.DEVICE.BTNS.instance_edit),
+  menu: true,
+});
 const minusItem = (row) => {
   pageData.value = pageData.value.filter(
     (item) => item.fieldCode !== row.fieldCode