微调

frontend/src/views/authority/resource/index.vue

@@ -58,10 +58,10 @@
     width: 100,
     render: (scope) => {
     const typeMap: { [key: number]: { label: string; type: string } } = {
-      0: { label: '菜单', type: 'info' },
-      1: { label: '按钮', type: 'warning' },
-      2: { label: '公共资源', type: 'success' },
-      3: { label: '服务间调用资源', type: 'primary' },
+      0: { label: '菜单', type: 'primary' },
+      1: { label: '按钮', type: 'success' },
+      2: { label: '公共资源', type: 'info' },
+      3: { label: '服务间调用资源', type: 'warning' },
     };
     const typeInfo = typeMap[scope.row.type] || { label: '未知', type: 'danger' };
     return (
@@ -73,6 +73,7 @@
       prop: 'icon',
       label: '图标',
       minWidth: 100,
+      
     },
     {
       prop: 'path',
@@ -92,8 +93,8 @@
 
     {
       prop: 'state',
-      label: '权限资源状态',
-      minWidth: 100,
+      label: '状态',
+      minWidth: 70,
       render: scope => {
         return (
           <el-tag type={scope.row.state ? 'success' : 'danger'} > {scope.row.state ? '正常' : '禁用'} </el-tag>

frontend/src/views/machine/device/components/devicePopup.vue

@@ -346,6 +346,13 @@ const disabledDate = (time: Date) => {
   const save = () => {
     try {
         dialogFormRef.value?.validate(async (valid: boolean) => {
+
+            if (formContent.value.encryptionFlag === 1) {
+                handleEncryptionChange(1)
+            } else {
+                handleEncryptionChange(0)
+            }
+
         if (valid) {
           formContent.value.createDate = dayjs(formContent.value.createDate).format('YYYY-MM-DD');
           if (formContent.value.arrivedDate) 
@@ -375,6 +382,15 @@ const disabledDate = (time: Date) => {
 const open = (sign: string, data: Device.ResPqDev) => {
   titleType.value = sign
   dialogVisible.value = true
+
+    if(data.pattern ==='比对式'){
+        DevIsShow.value = false
+        MonIsShow.value = true
+    }else{
+        DevIsShow.value = true
+        MonIsShow.value = false
+    }
+
   if (data.encryptionFlag === 1) {
     handleEncryptionChange(1)
   } else {