微调

frontend/.env.development

@@ -19,6 +19,6 @@ VITE_API_URL=/api
 
 # 开发环境跨域代理，支持配置多个
 
-VITE_PROXY=[["/api","http://192.168.1.125:18092/"]]
+VITE_PROXY=[["/api","http://192.168.1.124:18092/"]]
 # VITE_PROXY=[["/api","http://192.168.1.125:18092/"]]
 # VITE_PROXY=[["/api","http://192.168.1.138:8080/"]]张文

frontend/src/api/device/device.ts

@@ -18,7 +18,7 @@ export const addPqDev = (params: Device.ResPqDev) => {
 
 //编辑被检设备
 export const updatePqDev = (params: Device.ResPqDev) => {
-  return http.put(`/pqDev/update`, params)
+  return http.post(`/pqDev/update`, params)
 }
 
 //删除被检设备

frontend/src/api/function/index.ts

@@ -28,7 +28,7 @@ export const getFunctionListNoButton = () => {
   
   //编辑菜单列表
   export const updateFunction = (params: Function.ResFunction) => {
-    return http.put(`/sysFunction/update`, params);
+    return http.post(`/sysFunction/update`, params);
   };
   
   

frontend/src/api/monitor/monitor.ts

@@ -18,7 +18,7 @@ export const addPqMon = (params: Monitor.ResPqMon) => {
 
 //编辑被检设备
 export const updatePqMon = (params: Monitor.ResPqMon) => {
-  return http.put(`/pqMon/update`, params)
+  return http.post(`/pqMon/update`, params)
 }
 
 //删除被检设备

frontend/src/api/role/role.ts

@@ -22,7 +22,7 @@ export const addRole = (params: Role.RoleBO) => {
 
 // 编辑角色
 export const editRole = (params: Role.RoleBO) => {
-  return http.put(`/sysRole/update`, params)
+  return http.post(`/sysRole/update`, params)
 }
 
 // 删除角色
@@ -44,5 +44,5 @@ export const getRoleFunction = (params:Role.RoleBO) => {
 
 //角色分配菜单
 export const assignFunction = (params:Role.RoleBO,param:Role.RoleFunctionId) => {
-  return http.put(`/sysFunction/assignFunctionByRoleId`,{ roleId: params.id,functionIds:param.id })
+  return http.post(`/sysFunction/assignFunctionByRoleId`,{ roleId: params.id,functionIds:param.id })
 }

frontend/src/api/system/dictionary/dictData/index.ts

@@ -14,7 +14,7 @@ export const addDictData = (params: Dict.ResDictData) => {
 
 //编辑字典数据
 export const updateDictData = (params: Dict.ResDictData) => {
-    return http.put(`/dictData/update`, params)
+    return http.post(`/dictData/update`, params)
 }
 
 //删除字典数据

frontend/src/api/system/dictionary/dictPq/index.ts

@@ -13,7 +13,7 @@ export const addDictPq = (params: Dict.ResDictPq) => {
 
 //编辑字典类型
 export const updateDictPq = (params: Dict.ResDictPq) => {
-    return http.put(`/dictPq/update`, params)
+    return http.post(`/dictPq/update`, params)
 }
 
 //删除字典类型

frontend/src/api/system/dictionary/dictTree/index.ts

@@ -13,7 +13,7 @@ export const addDictTree = (params: Dict.ResDictTree) => {
 
 //编辑字典类型
 export const updateDictTree = (params: Dict.ResDictTree) => {
-    return http.put(`/dictTree/update`, params)
+    return http.post(`/dictTree/update`, params)
 }
 
 //删除字典类型

frontend/src/api/system/dictionary/dictType/index.ts

@@ -13,7 +13,7 @@ export const addDictType = (params: Dict.ResDictType) => {
 
 //编辑字典类型
 export const updateDictType = (params: Dict.ResDictType) => {
-    return http.put(`/dictType/update`, params)
+    return http.post(`/dictType/update`, params)
 }
 
 //删除字典类型

frontend/src/api/user/user.ts

@@ -20,7 +20,7 @@ export const addUser = (params: User.ResUser) => {
 
 // 编辑用户
 export const updateUser = (params: User.ResUser) => {
-  return http.put(`/sysUser/update`, params)
+  return http.post(`/sysUser/update`, params)
 }
 
 // 删除用户
@@ -36,6 +36,6 @@ export const getRoleList = () => {
 
 //修改密码
 export const updatePassWord = (params: User.ResPassWordUser) => {
-  return http.put(`/sysUser/updatePassword`,params)
+  return http.post(`/sysUser/updatePassword`,params)
 }
 

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' },
+      0: { label: '菜单', type: 'primary' },
-      1: { label: '按钮', type: 'warning' },
+      1: { label: '按钮', type: 'success' },
-      2: { label: '公共资源', type: 'success' },
+      2: { label: '公共资源', type: 'info' },
-      3: { label: '服务间调用资源', type: 'primary' },
+      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: '权限资源状态',
+      label: '状态',
-      minWidth: 100,
+      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 {