diff --git a/frontend/src/api/device/deviceData.ts b/frontend/src/api/device/device/deviceData.ts similarity index 100% rename from frontend/src/api/device/deviceData.ts rename to frontend/src/api/device/device/deviceData.ts diff --git a/frontend/src/api/device/device.ts b/frontend/src/api/device/device/index.ts similarity index 89% rename from frontend/src/api/device/device.ts rename to frontend/src/api/device/device/index.ts index 3ce3b6b..9deebd8 100644 --- a/frontend/src/api/device/device.ts +++ b/frontend/src/api/device/device/index.ts @@ -1,5 +1,4 @@ -import type { Device } from './interface' -import { ADMIN as rePrefix } from '@/api/config/serviceName' +import type { Device } from '@/api/device/interface/device' import http from '@/api' /** diff --git a/frontend/src/api/error/errorData.ts b/frontend/src/api/device/error/errorData.ts similarity index 98% rename from frontend/src/api/error/errorData.ts rename to frontend/src/api/device/error/errorData.ts index 3e97c22..e78e39f 100644 --- a/frontend/src/api/error/errorData.ts +++ b/frontend/src/api/device/error/errorData.ts @@ -1,4 +1,4 @@ -import type {ErrorSystem} from "./interface" +import type {ErrorSystem} from "@/api/device/interface/error" const errordata = ref([ { diff --git a/frontend/src/api/error/interface/index.ts b/frontend/src/api/device/error/index.ts similarity index 100% rename from frontend/src/api/error/interface/index.ts rename to frontend/src/api/device/error/index.ts diff --git a/frontend/src/api/device/interface/index.ts b/frontend/src/api/device/interface/device.ts similarity index 100% rename from frontend/src/api/device/interface/index.ts rename to frontend/src/api/device/interface/device.ts diff --git a/frontend/src/api/device/interface/error.ts b/frontend/src/api/device/interface/error.ts new file mode 100644 index 0000000..b68b6a6 --- /dev/null +++ b/frontend/src/api/device/interface/error.ts @@ -0,0 +1,41 @@ +// 误差体系模块 +export namespace ErrorSystem { + // 误差体系列表 + export interface ErrorSystemList { + id: string;//误差体系表Id + name: 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 { + 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/monitor/interface/index.ts b/frontend/src/api/device/interface/monitor.ts similarity index 100% rename from frontend/src/api/monitor/interface/index.ts rename to frontend/src/api/device/interface/monitor.ts diff --git a/frontend/src/api/testScript/interface/index.ts b/frontend/src/api/device/interface/testScript.ts similarity index 100% rename from frontend/src/api/testScript/interface/index.ts rename to frontend/src/api/device/interface/testScript.ts diff --git a/frontend/src/api/testSource/interface/index.ts b/frontend/src/api/device/interface/testSource.ts similarity index 100% rename from frontend/src/api/testSource/interface/index.ts rename to frontend/src/api/device/interface/testSource.ts diff --git a/frontend/src/api/monitor/monitor.ts b/frontend/src/api/device/monitor/index.ts similarity index 84% rename from frontend/src/api/monitor/monitor.ts rename to frontend/src/api/device/monitor/index.ts index 5157452..241fa49 100644 --- a/frontend/src/api/monitor/monitor.ts +++ b/frontend/src/api/device/monitor/index.ts @@ -1,5 +1,4 @@ -import type { Monitor } from './interface' -import { ADMIN as rePrefix } from '@/api/config/serviceName' +import type { Monitor } from '@/api/device/interface/monitor' import http from '@/api' /** diff --git a/frontend/src/api/testScript/testScript.ts b/frontend/src/api/device/testScript/index.ts similarity index 70% rename from frontend/src/api/testScript/testScript.ts rename to frontend/src/api/device/testScript/index.ts index 94df7a6..a0d2fbc 100644 --- a/frontend/src/api/testScript/testScript.ts +++ b/frontend/src/api/device/testScript/index.ts @@ -1,6 +1,5 @@ -import { ResPage } from '@/api/interface' -import { TestScript } from './interface' -import { ADMIN as rePrefix } from '@/api/config/serviceName' +import type { ResPage } from '@/api/interface' +import type { TestScript } from '@/api/device/interface/testScript' import http from '@/api' /** diff --git a/frontend/src/api/testScript/testScriptData.ts b/frontend/src/api/device/testScript/testScriptData.ts similarity index 100% rename from frontend/src/api/testScript/testScriptData.ts rename to frontend/src/api/device/testScript/testScriptData.ts diff --git a/frontend/src/api/testSource/testSource.ts b/frontend/src/api/device/testSource/index.ts similarity index 70% rename from frontend/src/api/testSource/testSource.ts rename to frontend/src/api/device/testSource/index.ts index 23506db..1bcf3d2 100644 --- a/frontend/src/api/testSource/testSource.ts +++ b/frontend/src/api/device/testSource/index.ts @@ -1,6 +1,5 @@ -import { ResPage } from '@/api/interface' -import { TestSource } from './interface' -import { ADMIN as rePrefix } from '@/api/config/serviceName' +import type { ResPage } from '@/api/interface' +import type { TestSource } from '@/api/device/interface/testSource' import http from '@/api' /** diff --git a/frontend/src/api/testSource/testSourceData.ts b/frontend/src/api/device/testSource/testSourceData.ts similarity index 100% rename from frontend/src/api/testSource/testSourceData.ts rename to frontend/src/api/device/testSource/testSourceData.ts diff --git a/frontend/src/api/function/functionExample.ts b/frontend/src/api/function/functionExample.ts deleted file mode 100644 index 83ff875..0000000 --- a/frontend/src/api/function/functionExample.ts +++ /dev/null @@ -1,285 +0,0 @@ -import type { Function } from "./interface" - -export const functionList : Function.ResFunction[] = [ - { - 'id': '1', - 'pid':'0', - 'pids':'', - 'name': '检测计划', - 'code':'route', - 'path':'/plan/planList/index', - 'component':'planList', - 'icon':'', - 'sort':100, - 'type':0, - 'remark': '检测计划描述', - 'state':1, - }, - { - id: '2', - pid:'0', - pids:'', - name: '台账管理', - code:'route', - path:'/machine', - 'component':'planList', - icon:'', - sort:100, - type:0, - remark: '台账管理描述', - state:1, - children:[{ - id: '21', - pid:'11', - pids:'', - name: '检测脚本', - code:'route', - path:'/machine/testScript/index', - 'component':'planList', - icon:'', - sort:100, - type:1, - remark: '检测脚本描述', - state:1, - }, - { - id: '22', - pid:'22', - pids:'', - name: '被检设备', - code:'route', - path:'/plan/planList/index', - 'component':'planList', - icon:'', - sort:100, - type:1, - remark: '被检设备描述', - state:1, - }, - { - id: '23', - pid:'23', - pids:'', - name: '误差体系', - code:'route', - path:'/plan/planList/index', - 'component':'planList', - icon:'', - sort:100, - type:1, - remark: '误差体系描述', - state:1, - }, - { - id: '24', - pid:'24', - pids:'', - name: '检测源', - code:'route', - path:'/plan/planList/index', - 'component':'planList', - icon:'', - sort:100, - type:1, - remark: '检测源描述', - state:1, - }] - }, - { - id: '3', - pid:'0', - pids:'', - name: '权限管理', - code:'route', - path:'/plan/planList/index', - 'component':'planList', - icon:'', - sort:100, - type:0, - remark: '权限管理描述', - state:1, - children:[{ - id: '31', - pid:'1', - pids:'', - name: '用户管理', - code:'route', - path:'/plan/planList/index', - 'component':'planList', - icon:'', - sort:100, - type:0, - remark: '用户管理描述', - state:1, - }, - { - id: '32', - pid:'2', - pids:'', - name: '角色管理', - code:'route', - path:'/plan/planList/index', - 'component':'planList', - icon:'', - sort:100, - type:0, - remark: '角色管理描述', - state:1, - }, - { - id: '33', - pid:'3', - pids:'', - name: '菜单管理', - code:'route', - path:'/plan/planList/index', - 'component':'planList', - icon:'', - sort:100, - type:0, - remark: '菜单管理描述', - state:1, - }] - }, - { - id: '4', - pid:'0', - pids:'', - name: '系统配置', - code:'route', - path:'/plan/planList/index', - 'component':'planList', - icon:'', - sort:100, - type:0, - remark: '系统配置描述', - state:1, - children:[{ - id: '41', - pid:'1', - pids:'', - name: '通用配置', - code:'route', - path:'/plan/planList/index', - 'component':'planList', - icon:'', - sort:100, - type:0, - remark: '通用配置描述', - state:1, - }, - { - id: '42', - pid:'2', - pids:'', - name: '数据字典', - code:'route', - path:'/plan/planList/index', - 'component':'planList', - icon:'', - sort:100, - type:0, - remark: '数据字典描述', - state:1, - }, - { - id: '43', - pid:'3', - pids:'', - name: '报告模版', - code:'route', - path:'/plan/planList/index', - 'component':'planList', - icon:'', - sort:100, - type:0, - remark: '报告模版描述', - state:1, - }, - { - id: '44', - pid:'4', - pids:'', - name: '版本注册', - code:'route', - path:'/plan/planList/index', - 'component':'planList', - icon:'', - sort:100, - type:0, - remark: '版本注册描述', - state:1, - },] - }, - { - id: '5', - pid:'0', - pids:'', - name: '日志管理', - code:'route', - path:'/plan/planList/index', - 'component':'planList', - icon:'', - sort:100, - type:0, - remark: '日志管理描述', - state:1, - }, - { - id: '6', - pid:'0', - pids:'', - name: '统计分析', - code:'route', - path:'/plan/planList/index', - 'component':'planList', - icon:'', - sort:100, - type:0, - remark: '统计分析描述', - state:1, - }, - { - id: '7', - pid:'0', - pids:'', - name: '示例', - code:'route', - path:'/plan/planList/index', - 'component':'planList', - icon:'', - sort:100, - type:0, - remark: '示例描述', - state:0, - children:[{ - id: '71', - pid:'1', - pids:'', - name: '普通表格', - code:'route', - path:'/plan/planList/index', - 'component':'planList', - icon:'', - sort:100, - type:0, - remark: '普通表格描述', - state:0, - }, - { - id: '71', - pid:'1', - pids:'', - name: '表格树', - code:'route', - path:'/plan/planList/index', - 'component':'planList', - icon:'', - sort:100, - type:0, - remark: '表格树描述', - state:0, - }] - }, -] - diff --git a/frontend/src/api/role/roleData.ts b/frontend/src/api/role/roleData.ts deleted file mode 100644 index 308b613..0000000 --- a/frontend/src/api/role/roleData.ts +++ /dev/null @@ -1,70 +0,0 @@ -const data = [ - { - rolename:"操作员1", - id: 'operator_role', - status:1, - describe:"可以对待检设备的台账进行操作并执行检测功能", - permissionList: [ - { - label: "台账管理", - key: "dataManager", - disable: false, - }, - { - label: "系统配置", - key: "sysManager", - disable: false, - }, - { - label: "设备检测", - key: "devTest", - disable: true, - }, - ]}, - { - rolename:"管理员2", - id: 'manager_role', - status:1, - describe:"可以设置检测脚本、误差体系、新增操作人员", - permissionList: [ - { - label: "台账管理", - key: "dataManager", - disable: true, - }, - { - label: "系统配置", - key: "sysManager", - disable: false, - }, - { - label: "设备检测", - key: "devTest", - disable: true, - }, - ]}, - { - rolename:"超级管理员3", - id: 'superManager_role', - status:0, - describe:"可以修改程序的底层配置,例如检测指标的具体类型", - permissionList: [ - { - label: "台账管理", - key: "dataManager", - disable: true, - }, - { - label: "系统配置", - key: "sysManager", - disable: true, - }, - { - label: "设备检测", - key: "devTest", - disable: true, - }, - ]}, - ] - - export default data \ No newline at end of file diff --git a/frontend/src/api/config/serviceName.ts b/frontend/src/api/system/config/serviceName.ts similarity index 100% rename from frontend/src/api/config/serviceName.ts rename to frontend/src/api/system/config/serviceName.ts diff --git a/frontend/src/api/system/dictData.ts b/frontend/src/api/system/dictData.ts deleted file mode 100644 index 18ac6c1..0000000 --- a/frontend/src/api/system/dictData.ts +++ /dev/null @@ -1,264 +0,0 @@ - -/** - * 模拟字典静态数据,有后端接口后,需要删除 todo... - */ -/** - * 模拟字典静态数据,有后端接口后,需要删除 todo... - */ -import type { Dict } from '@/api/interface' - -const dictData: Dict[] = [ - { - id: "1", - code: 'sex', - label: '性别', - children: [ - { - id: "1", - label: '男', - code: 1, - }, - { - id: "2", - label: '女', - code: 2, - }, - { - id: "3", - label: '未知', - code: 3, - }, - ], - }, - { - id: "2", - code: 'status', - label: '状态', - children: [ - { - id: "123456789", - label: '启用', - code: 1, - }, - { - id: "987654321", - label: '禁用', - code: 0, - }, - ], - }, - { - id: "3", - code: 'resourceType', - label: '资源类型', - children: [ - { - id: "0", - label: '菜单', - code: 0, - }, - { - id: "1", - label: '按钮', - code: 1, - }, - { - id: "2", - label: '公共资源', - code: 2, - }, - { - id: "3", - label: '服务间调用资源', - code: 3, - }, - ], - }, - { - id: "4", - code: 'roleType', - label: '角色类型', - children: [ - { - id: "0", - label: '超级管理员', - code: 0, - }, - { - id: "1", - label: '管理员', - code: 1, - }, - { - id: "2", - label: '普通角色', - code: 2, - }, - ], - }, - { - id: "5", - code: 'planTestState', - label: '检测状态', - children: [ - { - id: "0", - label: '未检', - code: '未检', - }, - { - id: "1", - label: '检测中', - code: '检测中', - }, - { - id: "2", - label: '检测完成', - code: '检测完成', - }, - ], - }, - { - id: "6", - code: 'errorLevel', - label: '适用设备等级', - children: [ - { - id: "0", - label: 'A级', - code: "A级", - }, - { - id: "1", - label: 'S级', - code: 'S级', - }, - ], - }, - { - id: "7", - code: 'planReportState', - label: '报告生成状态', - children: [ - { - id: "0", - label: '未生成', - code: "未生成", - }, - { - id: "1", - label: '部分生成', - code: '部分生成', - }, - { - id: "2", - label: '全部生成', - code: '全部生成', - }, - ], - }, - { - id: "8", - code: 'planResult', - label: '检测结果', - children: [ - { - id: "0", - label: '符合', - code: "符合", - }, - { - id: "1", - label: '不符合', - code: '不符合', - }, - ], - }, - - { - id: "9", - code: 'testScriptValueType', - label: '检测脚本值类型', - children: [ - { - id: "0", - label: '相对值', - code: 0, - }, - { - id: "1", - label: '绝对值', - code: 1, - }, - ], - }, - { - id: "10", - code: 'testScriptType', - label: '检测脚本模板类型', - children: [ - { - id: "0", - label: '脚本', - code: 0, - }, - { - id: "1", - label: '模板', - code: 1, - }, - ], - }, - { - id: "11", - code: 'testSourceDevType', - label: '检测源设备类型', - children: [ - { - id: "0", - label: 'FLUKE6100A电能功率标准源', - code: 0, - }, - { - id: "1", - label: 'ANGLI-FP2高性能数字信号源', - code: 1, - }, - { - id: "2", - label: 'DKLN-1电能质量测试分析仪智能检定装置', - code: 2, - }, - { - id: "3", - label: 'PQC600A高精度电能功率标准源', - code: 3, - }, - { - id: "4", - label: 'PQV-520电能质量检测装置', - code: 4, - }, - ], - }, - { - id: "12", - code: 'testSourceType', - label: '检测源类型', - children: [ - { - id: "0", - label: '标准源', - code: 0, - }, - { - id: "1", - label: '高精度设备', - code: 1, - }, - ], - }, -] - - -export default dictData \ No newline at end of file diff --git a/frontend/src/api/system/dictionary/dictData.ts b/frontend/src/api/system/dictionary/dictData.ts new file mode 100644 index 0000000..893e3c3 --- /dev/null +++ b/frontend/src/api/system/dictionary/dictData.ts @@ -0,0 +1,264 @@ + +// /** +// * 模拟字典静态数据,有后端接口后,需要删除 todo... +// */ +// /** +// * 模拟字典静态数据,有后端接口后,需要删除 todo... +// */ +// import type { Dict } from '@/api/interface' + +// const dictData: Dict[] = [ +// { +// id: "1", +// code: 'sex', +// label: '性别', +// children: [ +// { +// id: "1", +// label: '男', +// code: '1', +// }, +// { +// id: "2", +// label: '女', +// code: 2, +// }, +// { +// id: "3", +// label: '未知', +// code: 3, +// }, +// ], +// }, +// { +// id: "2", +// code: 'status', +// label: '状态', +// children: [ +// { +// id: "123456789", +// label: '启用', +// code: 1, +// }, +// { +// id: "987654321", +// label: '禁用', +// code: 0, +// }, +// ], +// }, +// { +// id: "3", +// code: 'resourceType', +// label: '资源类型', +// children: [ +// { +// id: "0", +// label: '菜单', +// code: 0, +// }, +// { +// id: "1", +// label: '按钮', +// code: 1, +// }, +// { +// id: "2", +// label: '公共资源', +// code: 2, +// }, +// { +// id: "3", +// label: '服务间调用资源', +// code: 3, +// }, +// ], +// }, +// { +// id: "4", +// code: 'roleType', +// label: '角色类型', +// children: [ +// { +// id: "0", +// label: '超级管理员', +// code: 0, +// }, +// { +// id: "1", +// label: '管理员', +// code: 1, +// }, +// { +// id: "2", +// label: '普通角色', +// code: 2, +// }, +// ], +// }, +// { +// id: "5", +// code: 'planTestState', +// label: '检测状态', +// children: [ +// { +// id: "0", +// label: '未检', +// code: '未检', +// }, +// { +// id: "1", +// label: '检测中', +// code: '检测中', +// }, +// { +// id: "2", +// label: '检测完成', +// code: '检测完成', +// }, +// ], +// }, +// { +// id: "6", +// code: 'errorLevel', +// label: '适用设备等级', +// children: [ +// { +// id: "0", +// label: 'A级', +// code: "A级", +// }, +// { +// id: "1", +// label: 'S级', +// code: 'S级', +// }, +// ], +// }, +// { +// id: "7", +// code: 'planReportState', +// label: '报告生成状态', +// children: [ +// { +// id: "0", +// label: '未生成', +// code: "未生成", +// }, +// { +// id: "1", +// label: '部分生成', +// code: '部分生成', +// }, +// { +// id: "2", +// label: '全部生成', +// code: '全部生成', +// }, +// ], +// }, +// { +// id: "8", +// code: 'planResult', +// label: '检测结果', +// children: [ +// { +// id: "0", +// label: '符合', +// code: "符合", +// }, +// { +// id: "1", +// label: '不符合', +// code: '不符合', +// }, +// ], +// }, + +// { +// id: "9", +// code: 'testScriptValueType', +// label: '检测脚本值类型', +// children: [ +// { +// id: "0", +// label: '相对值', +// code: 0, +// }, +// { +// id: "1", +// label: '绝对值', +// code: 1, +// }, +// ], +// }, +// { +// id: "10", +// code: 'testScriptType', +// label: '检测脚本模板类型', +// children: [ +// { +// id: "0", +// label: '脚本', +// code: 0, +// }, +// { +// id: "1", +// label: '模板', +// code: 1, +// }, +// ], +// }, +// { +// id: "11", +// code: 'testSourceDevType', +// label: '检测源设备类型', +// children: [ +// { +// id: "0", +// label: 'FLUKE6100A电能功率标准源', +// code: 0, +// }, +// { +// id: "1", +// label: 'ANGLI-FP2高性能数字信号源', +// code: 1, +// }, +// { +// id: "2", +// label: 'DKLN-1电能质量测试分析仪智能检定装置', +// code: 2, +// }, +// { +// id: "3", +// label: 'PQC600A高精度电能功率标准源', +// code: 3, +// }, +// { +// id: "4", +// label: 'PQV-520电能质量检测装置', +// code: 4, +// }, +// ], +// }, +// { +// id: "12", +// code: 'testSourceType', +// label: '检测源类型', +// children: [ +// { +// id: "0", +// label: '标准源', +// code: 0, +// }, +// { +// id: "1", +// label: '高精度设备', +// code: 1, +// }, +// ], +// }, +// ] + + +// export default dictData \ No newline at end of file diff --git a/frontend/src/api/system/dictionary/dictData/index.ts b/frontend/src/api/system/dictionary/dictData/index.ts index f33754f..adcbda9 100644 --- a/frontend/src/api/system/dictionary/dictData/index.ts +++ b/frontend/src/api/system/dictionary/dictData/index.ts @@ -1,6 +1,5 @@ import http from '@/api' import {type Dict} from '@/api/system/dictionary/interface' -import type {ResultData} from "@/api/interface"; //获取字典数据 export const getDictDataListByTypeId = (params: Dict.ReqDictDataParams) => { diff --git a/frontend/src/api/system/log/index.ts b/frontend/src/api/system/log/index.ts new file mode 100644 index 0000000..e69de29 diff --git a/frontend/src/api/log/interface/index.ts b/frontend/src/api/system/log/interface/log.ts similarity index 100% rename from frontend/src/api/log/interface/index.ts rename to frontend/src/api/system/log/interface/log.ts diff --git a/frontend/src/api/log/logData.ts b/frontend/src/api/system/log/logData.ts similarity index 97% rename from frontend/src/api/log/logData.ts rename to frontend/src/api/system/log/logData.ts index 46cc0d9..1e7d102 100644 --- a/frontend/src/api/log/logData.ts +++ b/frontend/src/api/system/log/logData.ts @@ -1,4 +1,4 @@ -import type {Sys_Log_Audit} from "./interface" +import type {Sys_Log_Audit} from "./interface/log" const logdata = ref([ { diff --git a/frontend/src/api/function/index.ts b/frontend/src/api/user/function/index.ts similarity index 86% rename from frontend/src/api/function/index.ts rename to frontend/src/api/user/function/index.ts index b0ff851..c9b83a3 100644 --- a/frontend/src/api/function/index.ts +++ b/frontend/src/api/user/function/index.ts @@ -1,6 +1,5 @@ import http from "@/api"; -import { ADMIN as rePrefix } from "@/api/config/serviceName"; -import type { Function } from "@/api/function/interface"; +import type { Function } from "@/api/user/interface/function"; diff --git a/frontend/src/api/function/interface/index.ts b/frontend/src/api/user/interface/function.ts similarity index 100% rename from frontend/src/api/function/interface/index.ts rename to frontend/src/api/user/interface/function.ts diff --git a/frontend/src/api/role/interface/index.ts b/frontend/src/api/user/interface/role.ts similarity index 100% rename from frontend/src/api/role/interface/index.ts rename to frontend/src/api/user/interface/role.ts diff --git a/frontend/src/api/user/interface/index.ts b/frontend/src/api/user/interface/user.ts similarity index 100% rename from frontend/src/api/user/interface/index.ts rename to frontend/src/api/user/interface/user.ts diff --git a/frontend/src/api/user/login.ts b/frontend/src/api/user/login/index.ts similarity index 85% rename from frontend/src/api/user/login.ts rename to frontend/src/api/user/login/index.ts index 1f8da44..4f9ef65 100644 --- a/frontend/src/api/user/login.ts +++ b/frontend/src/api/user/login/index.ts @@ -1,7 +1,7 @@ -import type { Login } from './interface' -import { ADMIN as rePrefix } from '@/api/config/serviceName' +import type { Login } from '@/api/user/interface/user' +import { ADMIN as rePrefix } from '@/api/system/config/serviceName' import http from '@/api' -import type { Dict } from '../interface' +import type { Dict } from '@/api/interface' /** * @name 登录模块 */ diff --git a/frontend/src/api/role/role.ts b/frontend/src/api/user/role/index.ts similarity index 85% rename from frontend/src/api/role/role.ts rename to frontend/src/api/user/role/index.ts index d142d8e..877e760 100644 --- a/frontend/src/api/role/role.ts +++ b/frontend/src/api/user/role/index.ts @@ -1,7 +1,5 @@ -import type { ResPage } from '@/api/interface' -import type { Role } from './interface' -import type { Function } from './../function/interface/index'; -import { ADMIN as rePrefix } from '@/api/config/serviceName' +import type { Role } from '@/api/user/interface/role' +import type { Function } from '@/api/user/interface/function' import http from '@/api' /** diff --git a/frontend/src/api/user/user.ts b/frontend/src/api/user/user/index.ts similarity index 79% rename from frontend/src/api/user/user.ts rename to frontend/src/api/user/user/index.ts index 588dd09..6baa9d6 100644 --- a/frontend/src/api/user/user.ts +++ b/frontend/src/api/user/user/index.ts @@ -1,7 +1,5 @@ -import type { Role } from './../role/interface/index'; -import type { ResPage } from '@/api/interface' -import type { User} from './interface' -import { ADMIN as rePrefix } from '@/api/config/serviceName' +import type { Role } from '@/api/user/interface/role' +import type { User } from '@/api/user/interface/user' import http from '@/api' /** diff --git a/frontend/src/api/user/userData.ts b/frontend/src/api/user/userData.ts deleted file mode 100644 index 3c777ac..0000000 --- a/frontend/src/api/user/userData.ts +++ /dev/null @@ -1,133 +0,0 @@ -const data = [ - { - 'id': '623689732233728549', - 'username': 'admin_A', - 'password': '12345678', - 'realname': '薛霞', - 'status': 0, - 'rolename': '管理员', - }, - { - 'id': '621003764863621316', - 'username': 'admin_B', - 'password': '12345678', - 'realname': '冯敏', - 'status': 1, - 'rolename': '管理员', - }, - // { - // 'id': '652286556713195552', - // 'username': 'operator_A', - // 'password': '12345678', - // 'realname': '潘霞', - // 'status': 1, - // 'rolename': '操作员', - // }, - // { - // 'id': '373930342176416776', - // 'username': 'operator_B', - // 'password': '12345678', - // 'realname': '郝秀英', - // 'status': 0, - // 'rolename': '操作员', - // }, - // { - // 'id': '429621442453555775', - // 'username': 'operator_C', - // 'password': '12345678', - // 'realname': '吕洋', - // 'status': 1, - // 'rolename': '操作员', - // }, - // { - // 'id': '387231964476618937', - // 'username': 'operator_D', - // 'password': '12345678', - // 'realname': '江磊', - // 'status': 0, - // 'rolename': '操作员', - // }, - // { - // 'id': '604013348875476647', - // 'username': 'operator_E', - // 'password': '12345678', - // 'realname': '姚静', - // 'status': 0, - // 'rolename': '操作员', - // }, - // { - // 'id': '028222596330483467', - // 'username': 'operator_F', - // 'password': '12345678', - // 'realname': '龙艳', - // 'status': 1, - // 'rolename': '操作员', - // }, - // { - // 'id': '739427478368274267', - // 'username': 'operator_G', - // 'password': '12345678', - // 'realname': '武涛', - // 'status': 1, - // 'rolename': '操作员', - // }, - // { - // 'id': '448686878612127243', - // 'username': 'operator_H', - // 'password': '12345678', - // 'realname': '孙芳', - // 'status': 0, - // 'rolename': '操作员', - // }, - // { - // 'id': '448686878612127244', - // 'username': 'operator_I', - // 'password': '12345678', - // 'realname': '孙芳1', - // 'status': 0, - // 'rolename': '操作员', - // }, - // { - // 'id': '448686878612127245', - // 'username': 'operator_J', - // 'password': '12345678', - // 'realname': '孙芳2', - // 'status': 1, - // 'rolename': '操作员', - // }, - // { - // 'id': '448686878612127245', - // 'username': 'operator_J', - // 'password': '12345678', - // 'realname': '孙芳2', - // 'status': 1, - // 'rolename': '操作员', - // }, - // { - // 'id': '448686878612127245', - // 'username': 'operator_J', - // 'password': '12345678', - // 'realname': '孙芳2', - // 'status': 1, - // 'rolename': '操作员', - // }, - // { - // 'id': '448686878612127245', - // 'username': 'operator_J', - // 'password': '12345678', - // 'realname': '孙芳2', - // 'status': 1, - // 'rolename': '操作员', - // }, - // { - // 'id': '448686878612127245', - // 'username': 'operator_J', - // 'password': '12345678', - // 'realname': '孙芳2', - // 'status': 1, - // 'rolename': '操作员', - // } - -] - -export default data \ No newline at end of file diff --git a/frontend/src/views/authority/resource/components/resourcePopup.vue b/frontend/src/views/authority/resource/components/resourcePopup.vue index 963f942..886184d 100644 --- a/frontend/src/views/authority/resource/components/resourcePopup.vue +++ b/frontend/src/views/authority/resource/components/resourcePopup.vue @@ -57,14 +57,11 @@