From 0c2f59a0a7dbaff408f070ab942b5585dc567664 Mon Sep 17 00:00:00 2001 From: sjl <1716605279@qq.com> Date: Wed, 30 Oct 2024 15:19:47 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E5=8D=95=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/settings.json | 4 +- frontend/src/api/device/deviceData.ts | 80 +-- frontend/src/api/device/interface/index.ts | 62 +-- frontend/src/api/error/errorData.ts | 42 +- frontend/src/api/error/interface/index.ts | 37 +- frontend/src/api/log/interface/index.ts | 18 +- frontend/src/api/log/logData.ts | 104 ++-- frontend/src/api/resource/interface/index.ts | 21 +- frontend/src/api/resource/resourceData.ts | 475 +++++++++--------- frontend/src/api/system/dictData.ts | 24 +- frontend/src/utils/dict.ts | 7 +- .../resource/components/ResourceDialog.vue | 73 ++- .../src/views/authority/resource/index.vue | 125 ++--- frontend/src/views/log/index.vue | 57 ++- frontend/src/views/machine/device/index.vue | 2 +- .../components/ErrorStandardDialog.vue | 6 +- .../components/ErrorSystemDialog.vue | 80 ++- .../src/views/machine/errorSystem/index.vue | 50 +- .../plan/planList/components/PlanDialog.vue | 39 +- .../plan/planList/components/PlanOpen.vue | 20 +- frontend/src/views/plan/planList/index.vue | 13 +- 21 files changed, 736 insertions(+), 603 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 52d1be3..70cc437 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -6,9 +6,11 @@ "errordata", "errordetail", "logdata", + "Pids", "plandata", "resourcedata", "resourcename", - "rmark" + "rmark", + "showtest" ] } \ No newline at end of file diff --git a/frontend/src/api/device/deviceData.ts b/frontend/src/api/device/deviceData.ts index 3158f49..4eb1849 100644 --- a/frontend/src/api/device/deviceData.ts +++ b/frontend/src/api/device/deviceData.ts @@ -1,10 +1,10 @@ const data = [ { id: 'device1', - deviceName:"模拟装置1", + devicename:"模拟装置1", deviceType:"PQS882B4电能质量监测装置", deviceChannels:"4", - PlanName: "沧州220kV留古等4座变电站电能质量检测", + Planname: "沧州220kV留古等4座变电站电能质量检测", deviceUn: "57.74", deviceIn: "5", deviceCompany: "南京灿能电力自动化股份有限公司", @@ -12,10 +12,10 @@ const data = [ }, { id: 'device2', - deviceName:"模拟装置2", + devicename:"模拟装置2", deviceType:"PQS882A电能质量监测装置", deviceChannels:"1", - PlanName: "邯郸220kV团城站等4座站电能质量检测", + Planname: "邯郸220kV团城站等4座站电能质量检测", deviceUn: "57.74", deviceIn: "5", deviceCompany: "南京灿能电力自动化股份有限公司", @@ -23,10 +23,10 @@ const data = [ }, { id: 'device3', - deviceName:"模拟装置3", + devicename:"模拟装置3", deviceType:"PQS882A电能质量监测装置", deviceChannels:"1", - PlanName: "衡水冀州光伏电站配套出口工程", + Planname: "衡水冀州光伏电站配套出口工程", deviceUn: "57.74", deviceIn: "1", deviceCompany: "南京灿能电力自动化股份有限公司", @@ -34,10 +34,10 @@ const data = [ }, { id: 'device4', - deviceName:"模拟装置4", + devicename:"模拟装置4", deviceType:"PMC-680M-22-22-00-115ANBC电能质量监测装置", deviceChannels:"4", - PlanName: "深圳市中电软件有限公司委托送检", + Planname: "深圳市中电软件有限公司委托送检", deviceUn: "57.74", deviceIn: "5", deviceCompany: "深圳中电电力技术股份有限公司", @@ -48,47 +48,47 @@ const data = [ const plan_devicedata = [ { id: '1', //装置序号ID - Name: '设备1', //设备名称 - Dev_Type: 'PQS882A',//设备类型 - Dev_Chns: 1, //设备通道数 - Check_Result: '合格', //检测结果 - Report_State: '已生成', //报告状态 - Document_State: '归档', //归档状态 - Check_State:'检测完成',//检测状态 - ReCheck_Num: 0, //复检次数 + name: '设备1', //设备名称 + dev_Type: 'PQS882A',//设备类型 + dev_Chns: 1, //设备通道数 + check_Result: '合格', //检测结果 + report_State: '已生成', //报告状态 + document_State: '归档', //归档状态 + check_State:'检测完成',//检测状态 + reCheck_Num: 0, //复检次数 }, { id: '2', //装置序号ID - Name: '设备2', //设备名称 - Dev_Type: 'PQS882B4',//设备类型 - Dev_Chns: 4, //设备通道数 - Check_Result: '/', //检测结果 - Report_State: '未生成', //报告状态 - Document_State: '未归档', //归档状态 - Check_State:'未检',//检测状态 - ReCheck_Num: 0, //复检次数 + name: '设备2', //设备名称 + dev_Type: 'PQS882B4',//设备类型 + dev_Chns: 4, //设备通道数 + check_Result: '/', //检测结果 + report_State: '未生成', //报告状态 + document_State: '未归档', //归档状态 + check_State:'未检',//检测状态 + reCheck_Num: 0, //复检次数 }, { id: '3', //装置序号ID - Name: '设备3', //设备名称 - Dev_Type: 'PQS882B4',//设备类型 - Dev_Chns: 4, //设备通道数 - Check_Result: '/', //检测结果 - Report_State: '未生成', //报告状态 - Document_State: '未归档', //归档状态 - Check_State:'检测中',//检测状态 - ReCheck_Num: 0, //复检次数 + name: '设备3', //设备名称 + dev_Type: 'PQS882B4',//设备类型 + dev_Chns: 4, //设备通道数 + check_Result: '/', //检测结果 + report_State: '未生成', //报告状态 + document_State: '未归档', //归档状态 + check_State:'检测中',//检测状态 + reCheck_Num: 0, //复检次数 }, { id: '4', //装置序号ID - Name: '设备4', //设备名称 - Dev_Type: 'PQS882B4',//设备类型 - Dev_Chns: 4, //设备通道数 - Check_Result: '不合格', //检测结果 - Report_State: '未生成', //报告状态 - Document_State: '未归档', //归档状态 - Check_State:'检测完成',//检测状态 - ReCheck_Num: 1, //复检次数 + name: '设备4', //设备名称 + dev_Type: 'PQS882B4',//设备类型 + dev_Chns: 4, //设备通道数 + check_Result: '不合格', //检测结果 + report_State: '未生成', //报告状态 + document_State: '未归档', //归档状态 + check_State:'检测完成',//检测状态 + reCheck_Num: 1, //复检次数 }, ] diff --git a/frontend/src/api/device/interface/index.ts b/frontend/src/api/device/interface/index.ts index c7ab0a0..b7b8fab 100644 --- a/frontend/src/api/device/interface/index.ts +++ b/frontend/src/api/device/interface/index.ts @@ -32,37 +32,37 @@ export namespace Device { // 被检设备列表 export interface DeviceList { id: string; //装置序号ID - Name: string; //设备名称 - Pattern?: string; //设备模式 模拟 数字 比对 - Dev_Type: string;//设备类型 - Dev_Chns: number; //设备通道数 - Dev_Volt?: number; //额定电压（V） - Dev_Curr?: number; //额定电流（A） - Manufacturer?: string;//生产厂家 - CreateDate?: string; //生产日期 - CreateId?: string; //出厂编号 - Hardware_Version?: string; //固件版本 - Software_Version?: string; //软件版本 - IP?: string; //IP地址 - Port?: number; //端口号 - IsEncryption?: string; //装置是否为加密版本 - Series?: string; //装置识别码（3ds加密） - Dev_Key?: string; //装置秘钥（3ds加密） - SampleID?: string; //样品编号 - Arrived_Date?: string; //送样日期 - City_Name?: string; //所属地市名称 - GD_Name?: string; //所属供电公司名称 - Sub_Name?: string; //所属电站名称 - Check_State: string; //检测状态 - Check_Result: string; //检测结果 - Report_State: string; //报告状态 - Document_State: string; //归档状态 - ReCheck_Num: number; //复检次数 - State?: number; //状态 - Create_By?: string; //创建用户 - Create_Time?: string; //创建时间 - Update_By?: string; //更新用户 - Update_Time?: string; //更新时间 + name: string; //设备名称 + pattern?: string; //设备模式 模拟 数字 比对 + dev_Type: string;//设备类型 + dev_Chns: number; //设备通道数 + dev_Volt?: number; //额定电压（V） + dev_Curr?: number; //额定电流（A） + manufacturer?: string;//生产厂家 + createDate?: string; //生产日期 + createId?: string; //出厂编号 + hardware_Version?: string; //固件版本 + software_Version?: string; //软件版本 + iP?: string; //IP地址 + port?: number; //端口号 + isEncryption?: string; //装置是否为加密版本 + series?: string; //装置识别码（3ds加密） + dev_Key?: string; //装置秘钥（3ds加密） + sampleID?: string; //样品编号 + arrived_Date?: string; //送样日期 + city_Name?: string; //所属地市名称 + gD_Name?: string; //所属供电公司名称 + sub_Name?: string; //所属电站名称 + check_State: string; //检测状态 + check_Result: string; //检测结果 + report_State: string; //报告状态 + document_State: string; //归档状态 + reCheck_Num: number; //复检次数 + state?: number; //状态 + create_By?: string; //创建用户 + create_Time?: string; //创建时间 + update_By?: string; //更新用户 + update_Time?: string; //更新时间 } } \ No newline at end of file diff --git a/frontend/src/api/error/errorData.ts b/frontend/src/api/error/errorData.ts index 30e1dda..2995676 100644 --- a/frontend/src/api/error/errorData.ts +++ b/frontend/src/api/error/errorData.ts @@ -2,33 +2,35 @@ import type {ErrorSystem} from "./interface" const errordata = ref([ { - 'id': '1', - 'name': 'Q/GDW 1650.2- 2016', - 'publishTime':'', - 'year':'2016', - 'level':'A级', - 'state':'', + id: '1', + name: 'Q/GDW 1650.2- 2016', + standard_Name:'', + standard_Time:'2016', + dev_Level:'A级', + enable:1, + state:1, }, { - 'id': '2', - 'name': 'Q/GDW 10650.2 - 2021', - 'publishTime':'', - 'year':'2021', - 'level':'A级', - 'state':'', + id: '2', + name: 'Q/GDW 1650.2- 2021', + standard_Name:'', + standard_Time:'2021', + dev_Level:'A级', + enable:1, + state:1, }, { - 'id': '3', - 'name': 'GBT 19862 - 2016', - 'publishTime':'', - 'year':'2016', - 'level':'A级', - 'state':'', - + id: '3', + name: 'GBT 19862 - 2016', + standard_Name:'', + standard_Time:'2016', + dev_Level:'A级', + enable:1, + state:1, }, ]) - const errordetail = ref([ + const errordetail = ref([ { measured: '电压偏差', deviceLevel: 'A', diff --git a/frontend/src/api/error/interface/index.ts b/frontend/src/api/error/interface/index.ts index be6f9d2..d6a0d18 100644 --- a/frontend/src/api/error/interface/index.ts +++ b/frontend/src/api/error/interface/index.ts @@ -4,19 +4,38 @@ export namespace ErrorSystem { export interface ErrorSystemList { id: string;//误差体系表Id name: string;//误差体系名称 - publishTime:string;//发布时间 - year:string;//标准实施年份 - level:string;//使用设备等级 - state:string;//状态 + standard_Name:string;//参照标准名称 + standard_Time:string;//标准推行时间 + dev_Level:string;//使用设备等级 + enable:number;//状态：0-不启用 1-启用 + state:number;//0-删除 1-正常 + create_By?:string;//创建用户 + create_Time?:string;//创建时间 + update_By?:string;//修改用户 + update_Time?:string;//修改时间 } // 查看详细误差体系 export interface ErrorSystemDetail { - measured: string;//被测量 - deviceLevel: string;//检测装置级别 - measurementType: string;//测量类型 - condition: string;//测量条件 - maxErrorValue: string;//最大误差 + id:string;//误差体系子表ID + error_Sys_Id:string;//所属误差体系ID + type: string;//检测脚本类型,树形字典表（没有树形表则需要拆分字段） + JudgeConditionStart?:number;//误差判断起始值（误差范围） + IsContainStart?:number;//是否包含起始值 + JudgeConditionEnd?:number;//误差判断结束值（误差范围） + IsContainEnd?:number;//是否包含结束值 + JudgeConditionType?:string;//判断条件值类型（包括值类型，绝对值、相对值） + MaxErrorValue:number;//误差最大值 + ErrorValueType:string;//误差值类型（包括值类型，绝对值、相对值1、相对值2） } + + // 查看详细误差体系 + export interface Error_detail { + measured: string; + deviceLevel: string; + measurementType:string; + condition: string; + maxErrorValue: string; + } } \ No newline at end of file diff --git a/frontend/src/api/log/interface/index.ts b/frontend/src/api/log/interface/index.ts index 104e769..623da8d 100644 --- a/frontend/src/api/log/interface/index.ts +++ b/frontend/src/api/log/interface/index.ts @@ -1,13 +1,15 @@ -// 日志管理模块 -export namespace Log { +// 审计日志管理模块 +export namespace Sys_Log_Audit { // 日志列表 - export interface LogList { + export interface Audit_LogList { id: string;//日志表Id - content: string;//日志内容 - user:string;//操作用户 - record_Time:string;//记录时间 - type:string;//日志类型 - level:string;//日志等级 + operate_Type:string;//日志类型 + ip:string;//操作IP + result: string;//事件结果 + remark: string;//事件描述 + warn:number;//告警标志 + create_By:string;//创建用户 + create_Time:string;//创建时间 } } \ No newline at end of file diff --git a/frontend/src/api/log/logData.ts b/frontend/src/api/log/logData.ts index d4205d6..46cc0d9 100644 --- a/frontend/src/api/log/logData.ts +++ b/frontend/src/api/log/logData.ts @@ -1,61 +1,75 @@ -import type {Log} from "./interface" +import type {Sys_Log_Audit} from "./interface" -const logdata = ref([ - { - 'id': '1', - 'content': 'Admin用户09:35:47,790 登录系统', - 'user':'Admin', - 'record_Time':'2024-10-16 12:13:14', - 'type':'操作日志', - 'level':'/', +const logdata = ref([ + { + id: '1', + operate_Type:'操作日志', + ip:'192.168.1.139', + result: '登陆成功', + remark: 'Admin用户09:35:47,790 登录系统', + warn:0, + create_By:'Admin', + create_Time:'2024-10-16 12:13:14', }, { - 'id': '2', - 'content': 'Admin用户09:35:47,891 新建设备 “模拟式装置1”', - 'user':'Admin', - 'record_Time':'2024-10-16 12:13:14', - 'type':'操作日志', - 'level':'/', + id: '2', + operate_Type:'操作日志', + ip:'192.168.1.139', + result: '新建成功', + remark: 'Admin用户09:35:47,891 新建设备 “模拟式装置1”', + warn:0, + create_By:'Admin', + create_Time:'2024-10-16 12:13:14', }, { - 'id': '3', - 'content': 'User用户 09:35:56,391 新建设备 “模拟式装置2”', - 'user':'User', - 'record_Time':'2024-10-16 12:13:14', - 'type':'操作日志', - 'level':'/', + id: '3', + operate_Type:'操作日志', + ip:'192.168.1.139', + result: '新建成功', + remark: 'User用户 09:35:56,391 新建设备 “模拟式装置2”', + warn:0, + create_By:'User', + create_Time:'2024-10-16 12:13:14', }, { - 'id': '4', - 'content': 'Admin用户09:35:59,977 对 “模拟式装置1”开始进行自动检测', - 'user':'Admin', - 'record_Time':'2024-10-16 12:13:14', - 'type':'操作日志', - 'level':'/', + id: '4', + operate_Type:'操作日志', + ip:'192.168.1.139', + result: '操作成功', + remark: 'Admin用户09:35:59,977 对 “模拟式装置1”开始进行自动检测', + warn:0, + create_By:'Admin', + create_Time:'2024-10-16 12:13:14', }, { - 'id': '5', - 'content': 'User用户09:36:02,229 对 “模拟式装置2”开始进行自动检测', - 'user':'User', - 'record_Time':'2024-10-16 12:13:14', - 'type':'操作日志', - 'level':'/', + id: '5', + operate_Type:'操作日志', + ip:'192.168.1.139', + result: '操作成功', + remark: 'User用户09:36:02,229 对 “模拟式装置2”开始进行自动检测', + warn:0, + create_By:'User', + create_Time:'2024-10-16 12:13:14', }, { - 'id': '6', - 'content': 'DKLN源回复报文异常，已丢弃。报文长度为XX，内容为：“XXXXXXX”', - 'user':'Admin', - 'record_Time':'2024-10-16 12:13:14', - 'type':'告警日志', - 'level':'WARN（警告）', + id: '6', + operate_Type:'告警日志', + ip:'192.168.1.139', + result: 'warn（警告）', + remark: 'DKLN源回复报文异常，已丢弃。报文长度为XX，内容为：“XXXXXXX”', + warn:1, + create_By:'Admin', + create_Time:'2024-10-16 12:13:14', }, { - 'id': '7', - 'content': 'IP：192.168.1.205 的装置第1通道触发QVVR01报告失败', - 'user':'AA', - 'record_Time':'2024-10-16 12:13:14', - 'type':'告警日志', - 'level':'ERROR（一般错误）', + id: '7', + operate_Type:'告警日志', + ip:'192.168.1.205', + result: '报告触发失败', + remark: 'ip：192.168.1.205 的装置第1通道触发QVVR01报告失败', + warn:1, + create_By:'AA', + create_Time:'2024-10-16 12:13:14', }, ]) diff --git a/frontend/src/api/resource/interface/index.ts b/frontend/src/api/resource/interface/index.ts index 2adcf93..a4988fe 100644 --- a/frontend/src/api/resource/interface/index.ts +++ b/frontend/src/api/resource/interface/index.ts @@ -6,19 +6,22 @@ export namespace Resource { // 菜单列表 export interface ResResourceList { id: string;//资源表Id + pid:string;//节点（0为根节点） + pids?:string;//节点上层所有节点 name: string;//名称 + code:string;//资源标识 path:string;//路径 + icon?:string;//图标 sort:number;//排序 - type:string;//资源类型 - remark:string;//资源描述 - route_Name:string;//路由名称 - create_Time:string;//创建时间 - update_Time:string;//更新时间 + type:number;//资源类型0-菜单、1-按钮、2-公共资源、3-服务间调用资源 + remark?: string;//权限资源描述 + state:number;//权限资源状态 + create_By?:string;//创建人 + create_Time?:string;//创建时间 + update_By?:string;//更新人 + update_Time?:string;//更新时间 children?: ResResourceList[]; } - export interface ResType { - userLabel: string; - userValue: number; - } + } \ No newline at end of file diff --git a/frontend/src/api/resource/resourceData.ts b/frontend/src/api/resource/resourceData.ts index c6fe5b4..0b5e367 100644 --- a/frontend/src/api/resource/resourceData.ts +++ b/frontend/src/api/resource/resourceData.ts @@ -4,247 +4,264 @@ import type { Resource } from "./interface" const resourcedata = ref([ { 'id': '1', + 'pid':'0', + 'pids':'', 'name': '检测计划', + 'code':'', 'path':'/plan/planList/index', + 'icon':'', 'sort':100, - 'type':'菜单', - 'remark':'检测计划描述', - 'route_Name':'route', - 'create_Time': '2024-10-16 12:13:14', - 'update_Time':'2024-10-16 12:13:14', + 'type':0, + 'remark': '检测计划描述', + 'state':1, }, { - 'id': '2', - 'name': '台账管理', - 'path':'/plan/planList/index', - 'sort':100, - 'type':'菜单', - 'remark':'检测计划描述', - 'route_Name':'route', - 'create_Time': '2024-10-16 12:13:14', - 'update_Time':'2024-10-16 12:13:14', + id: '2', + pid:'0', + pids:'', + name: '台账管理', + code:'', + path:'/machine', + icon:'', + sort:100, + type:0, + remark: '台账管理描述', + state:1, + children:[{ + id: '21', + pid:'11', + pids:'', + name: '检测脚本', + code:'', + path:'/machine/testScript/index', + icon:'', + sort:100, + type:0, + remark: '检测脚本描述', + state:1, + }, + { + id: '22', + pid:'22', + pids:'', + name: '被检设备', + code:'', + path:'/plan/planList/index', + icon:'', + sort:100, + type:0, + remark: '被检设备描述', + state:1, + }, + { + id: '23', + pid:'23', + pids:'', + name: '误差体系', + code:'', + path:'/plan/planList/index', + icon:'', + sort:100, + type:0, + remark: '误差体系描述', + state:1, + }, + { + id: '24', + pid:'24', + pids:'', + name: '检测源', + code:'', + path:'/plan/planList/index', + icon:'', + sort:100, + type:0, + remark: '检测源描述', + state:1, + }] + }, + { + id: '3', + pid:'0', + pids:'', + name: '权限管理', + code:'', + path:'/plan/planList/index', + icon:'', + sort:100, + type:0, + remark: '权限管理描述', + state:1, children:[{ - 'id': '21', - 'name': '检测脚本', - - 'path':'/plan/planList/index', - 'sort':100, - 'type':'菜单', - 'remark':'检测计划描述', - 'route_Name':'route', - 'create_Time': '2024-10-16 12:13:14', - 'update_Time':'2024-10-16 12:13:14', - }, - { - 'id': '22', - 'name': '被检设备', - - 'path':'/plan/planList/index', - 'sort':100, - 'type':'菜单', - 'remark':'检测计划描述', - 'route_Name':'route', - 'create_Time': '2024-10-16 12:13:14', - 'update_Time':'2024-10-16 12:13:14', - }, - { - 'id': '23', - 'name': '误差体系', - - 'path':'/plan/planList/index', - 'sort':100, - 'type':'菜单', - 'remark':'检测计划描述', - 'route_Name':'route', - 'create_Time': '2024-10-16 12:13:14', - 'update_Time':'2024-10-16 12:13:14', - },{ - 'id': '24', - 'name': '检测源', - - 'path':'/plan/planList/index', - 'sort':100, - 'type':'菜单', - 'remark':'检测计划描述', - 'route_Name':'route', - 'create_Time': '2024-10-16 12:13:14', - 'update_Time':'2024-10-16 12:13:14', - } - - ] + id: '31', + pid:'1', + pids:'', + name: '用户管理', + code:'', + path:'/plan/planList/index', + icon:'', + sort:100, + type:0, + remark: '用户管理描述', + state:1, + }, + { + id: '32', + pid:'2', + pids:'', + name: '角色管理', + code:'', + path:'/plan/planList/index', + icon:'', + sort:100, + type:0, + remark: '角色管理描述', + state:1, + }, + { + id: '33', + pid:'3', + pids:'', + name: '菜单管理', + code:'', + path:'/plan/planList/index', + icon:'', + sort:100, + type:0, + remark: '菜单管理描述', + state:1, + }] }, { - 'id': '3', - 'name': '权限管理', - - 'path':'/plan/planList/index', - 'sort':100, - 'type':'菜单', - 'remark':'检测计划描述', - 'route_Name':'route', - 'create_Time': '2024-10-16 12:13:14', - 'update_Time':'2024-10-16 12:13:14', + id: '4', + pid:'0', + pids:'', + name: '系统配置', + code:'', + path:'/plan/planList/index', + icon:'', + sort:100, + type:0, + remark: '系统配置描述', + state:1, children:[{ - 'id': '31', - 'name': '用户管理', - - 'path':'/plan/planList/index', - 'sort':100, - 'type':'菜单', - 'remark':'检测计划描述', - 'route_Name':'route', - 'create_Time': '2024-10-16 12:13:14', - 'update_Time':'2024-10-16 12:13:14', - }, - { - 'id': '32', - 'name': '角色管理', - - 'path':'/plan/planList/index', - 'sort':100, - 'type':'菜单', - 'remark':'检测计划描述', - 'route_Name':'route', - 'create_Time': '2024-10-16 12:13:14', - 'update_Time':'2024-10-16 12:13:14', - }, - { - 'id': '33', - 'name': '菜单管理', - - 'path':'/plan/planList/index', - 'sort':100, - 'type':'菜单', - 'remark':'检测计划描述', - 'route_Name':'route', - 'create_Time': '2024-10-16 12:13:14', - 'update_Time':'2024-10-16 12:13:14', - } - ] + id: '41', + pid:'1', + pids:'', + name: '通用配置', + code:'', + path:'/plan/planList/index', + icon:'', + sort:100, + type:0, + remark: '通用配置描述', + state:1, + }, + { + id: '42', + pid:'2', + pids:'', + name: '数据字典', + code:'', + path:'/plan/planList/index', + icon:'', + sort:100, + type:0, + remark: '数据字典描述', + state:1, + }, + { + id: '43', + pid:'3', + pids:'', + name: '报告模版', + code:'', + path:'/plan/planList/index', + icon:'', + sort:100, + type:0, + remark: '报告模版描述', + state:1, + }, + { + id: '44', + pid:'4', + pids:'', + name: '版本注册', + code:'', + path:'/plan/planList/index', + icon:'', + sort:100, + type:0, + remark: '版本注册描述', + state:1, + },] }, { - 'id': '4', - 'name': '系统配置', - - 'path':'/plan/planList/index', - 'sort':100, - 'type':'菜单', - 'remark':'检测计划描述', - 'route_Name':'route', - 'create_Time': '2024-10-16 12:13:14', - 'update_Time':'2024-10-16 12:13:14', + id: '5', + pid:'0', + pids:'', + name: '日志管理', + code:'', + path:'/plan/planList/index', + icon:'', + sort:100, + type:0, + remark: '日志管理描述', + state:1, + }, + { + id: '6', + pid:'0', + pids:'', + name: '统计分析', + code:'', + path:'/plan/planList/index', + icon:'', + sort:100, + type:0, + remark: '统计分析描述', + state:1, + }, + { + id: '7', + pid:'0', + pids:'', + name: '示例', + code:'', + path:'/plan/planList/index', + icon:'', + sort:100, + type:0, + remark: '示例描述', + state:0, children:[{ - 'id': '41', - 'name': '通用配置', - - 'path':'/plan/planList/index', - 'sort':100, - 'type':'菜单', - 'remark':'检测计划描述', - 'route_Name':'route', - 'create_Time': '2024-10-16 12:13:14', - 'update_Time':'2024-10-16 12:13:14', - }, - { - 'id': '42', - 'name': '数据字典', - - 'path':'/plan/planList/index', - 'sort':100, - 'type':'菜单', - 'remark':'检测计划描述', - 'route_Name':'route', - 'create_Time': '2024-10-16 12:13:14', - 'update_Time':'2024-10-16 12:13:14', - }, - { - 'id': '43', - 'name': '报告模版', - - 'path':'/plan/planList/index', - 'sort':100, - 'type':'菜单', - 'remark':'检测计划描述', - 'route_Name':'route', - 'create_Time': '2024-10-16 12:13:14', - 'update_Time':'2024-10-16 12:13:14', - },{ - 'id': '44', - 'name': '版本注册', - - 'path':'/plan/planList/index', - 'sort':100, - 'type':'菜单', - 'remark':'检测计划描述', - 'route_Name':'route', - 'create_Time': '2024-10-16 12:13:14', - 'update_Time':'2024-10-16 12:13:14', - } - -] - }, - { - 'id': '5', - 'name': '日志管理', - - 'path':'/plan/planList/index', - 'sort':100, - 'type':'菜单', - 'remark':'检测计划描述', - 'route_Name':'route', - 'create_Time': '2024-10-16 12:13:14', - 'update_Time':'2024-10-16 12:13:14', - }, - { - 'id': '6', - 'name': '统计分析', - - 'path':'/plan/planList/index', - 'sort':100, - 'type':'菜单', - 'remark':'检测计划描述', - 'route_Name':'route', - 'create_Time': '2024-10-16 12:13:14', - 'update_Time':'2024-10-16 12:13:14', - }, - { - 'id': '7', - 'name': '示例', - - 'path':'/plan/planList/index', - 'sort':100, - 'type':'菜单', - 'remark':'检测计划描述', - 'route_Name':'route', - 'create_Time': '2024-10-16 12:13:14', - 'update_Time':'2024-10-16 12:13:14', - children:[{ - 'id': '71', - 'name': '普通表格', - - 'path':'/plan/planList/index', - 'sort':100, - 'type':'菜单', - 'remark':'检测计划描述', - 'route_Name':'route', - 'create_Time': '2024-10-16 12:13:14', - 'update_Time':'2024-10-16 12:13:14', - }, - { - 'id': '72', - 'name': '表格树', - - 'path':'/plan/planList/index', - 'sort':100, - 'type':'菜单', - 'remark':'检测计划描述', - 'route_Name':'route', - 'create_Time': '2024-10-16 12:13:14', - 'update_Time':'2024-10-16 12:13:14', - } - ] - }, - + id: '71', + pid:'1', + pids:'', + name: '普通表格', + code:'', + path:'/plan/planList/index', + icon:'', + sort:100, + type:0, + remark: '普通表格描述', + state:0, + }, + { + id: '71', + pid:'1', + pids:'', + name: '表格树', + code:'', + path:'/plan/planList/index', + icon:'', + sort:100, + type:0, + remark: '表格树描述', + state:0, + }] + }, ]) export default resourcedata \ No newline at end of file diff --git a/frontend/src/api/system/dictData.ts b/frontend/src/api/system/dictData.ts index fa2ca1d..6be2b1f 100644 --- a/frontend/src/api/system/dictData.ts +++ b/frontend/src/api/system/dictData.ts @@ -43,28 +43,6 @@ const dictData: Dict[] = [ }, ], }, - { - id: "3", - code: 'type', - label: '资源类型', - children: [ - { - id: "1", - label: '菜单', - code: 1, - }, - { - id: "2", - label: '按钮', - code: 2, - }, - { - id: "3", - label: '公共资源', - code: 3, - }, - ], - }, -] + export default dictData \ No newline at end of file diff --git a/frontend/src/utils/dict.ts b/frontend/src/utils/dict.ts index 6b86683..97f2d07 100644 --- a/frontend/src/utils/dict.ts +++ b/frontend/src/utils/dict.ts @@ -17,7 +17,8 @@ export const userStatus = [ ]; export const resourceType = [ - { label: "菜单", value: 1 }, - { label: "按钮", value: 2 }, - { label: "公共资源", value: 3 } + { label: "菜单", value: 0 }, + { label: "按钮", value: 1 }, + { label: "公共资源", value: 2 } + { label: "服务间调用资源", value: 3 } ]; diff --git a/frontend/src/views/authority/resource/components/ResourceDialog.vue b/frontend/src/views/authority/resource/components/ResourceDialog.vue index e86143c..11308b9 100644 --- a/frontend/src/views/authority/resource/components/ResourceDialog.vue +++ b/frontend/src/views/authority/resource/components/ResourceDialog.vue @@ -1,6 +1,6 @@