微调

frontend/src/api/device/device/index.ts

@@ -1,5 +1,4 @@
-import type { Device } from './interface'
+import type { Device } from '@/api/device/interface/device'
-import { ADMIN as rePrefix } from '@/api/config/serviceName'
 import http from '@/api'
 
 /**

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<ErrorSystem.ErrorSystemList[]>([
       {

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;
+    }
+  }

frontend/src/api/device/monitor/index.ts

@@ -1,5 +1,4 @@
-import type { Monitor } from './interface'
+import type { Monitor } from '@/api/device/interface/monitor'
-import { ADMIN as rePrefix } from '@/api/config/serviceName'
 import http from '@/api'
 
 /**

frontend/src/api/device/testScript/index.ts

@@ -1,6 +1,5 @@
-import { ResPage } from '@/api/interface'
+import type { ResPage } from '@/api/interface'
-import { TestScript } from './interface'
+import type { TestScript } from '@/api/device/interface/testScript'
-import { ADMIN as rePrefix } from '@/api/config/serviceName'
 import http from '@/api'
 
 /**

frontend/src/api/device/testSource/index.ts

@@ -1,6 +1,5 @@
-import { ResPage } from '@/api/interface'
+import type { ResPage } from '@/api/interface'
-import { TestSource } from './interface'
+import type { TestSource } from '@/api/device/interface/testSource'
-import { ADMIN as rePrefix } from '@/api/config/serviceName'
 import http from '@/api'
 
 /**

frontend/src/api/function/functionExample.ts

@@ -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,
-                  }]
-      }, 
-]
-

frontend/src/api/role/roleData.ts

@@ -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

frontend/src/api/system/dictData.ts

@@ -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

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

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) => {

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<Sys_Log_Audit.Audit_LogList[]>([
       {

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/user/interface/function";
-import type { Function } from "@/api/function/interface";
 
 
 

frontend/src/api/user/login/index.ts

@@ -1,7 +1,7 @@
-import type { Login } from './interface'
+import type { Login } from '@/api/user/interface/user'
-import { ADMIN as rePrefix } from '@/api/config/serviceName'
+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 登录模块
  */

frontend/src/api/user/role/index.ts

@@ -1,7 +1,5 @@
-import type { ResPage } from '@/api/interface'
+import type { Role } from '@/api/user/interface/role'
-import type { Role } from './interface'
+import type { Function } from '@/api/user/interface/function'
-import type { Function } from './../function/interface/index';
-import { ADMIN as rePrefix } from '@/api/config/serviceName'
 import http from '@/api'
 
 /**

frontend/src/api/user/user/index.ts

@@ -1,7 +1,5 @@
-import type { Role } from './../role/interface/index';
+import type { Role } from '@/api/user/interface/role'
-import type { ResPage } from '@/api/interface'
+import type { User } from '@/api/user/interface/user'
-import type { User} from './interface'
-import { ADMIN as rePrefix } from '@/api/config/serviceName'
 import http from '@/api'
 
 /**

frontend/src/api/user/userData.ts

@@ -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

frontend/src/views/authority/resource/components/resourcePopup.vue

@@ -57,14 +57,11 @@
   <script lang="ts" setup name="ResourceDialog">
   import { defineProps, defineEmits,watch,ref, type Ref, computed } from 'vue';
   import { dialogMiddle } from '@/utils/elementBind'
-  import { ElMessage, FormInstance, FormItemRule } from 'element-plus'
+  import { ElMessage, type FormInstance, type FormItemRule } from 'element-plus'
   import { useDictStore } from '@/stores/modules/dict'
-  import { type Function } from '@/api/function/interface'
+  import type { Function } from "@/api/user/interface/function"
-  import {addFunction,updateFunction,getFunctionListNoButton} from '@/api/function/index.ts'
+  import {addFunction,updateFunction,getFunctionListNoButton} from '@/api/user/function/index'
   import IconSelect from '@/components/SelectIcon/index.vue'
-  import { functionList } from '@/api/function/functionExample.ts'
-  import { min } from 'lodash';
-import { Console } from 'console';
   const value = ref()
   // 树形节点配置
   const defaultProps = {

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

@@ -26,13 +26,13 @@
   <script setup lang='tsx' name='useProTable'>
   import { ref ,reactive} from 'vue'
   import { useHandleData } from '@/hooks/useHandleData'
-  import { type Function } from '@/api/function/interface'
+    import type { Function } from "@/api/user/interface/function"
   import ProTable from '@/components/ProTable/index.vue'
   import {CirclePlus, Delete, EditPen,HomeFilled} from '@element-plus/icons-vue'
   import type { ColumnProps, ProTableInstance } from '@/components/ProTable/interface'
   import { useDictStore } from '@/stores/modules/dict'
   import ResourcePopup from './components/resourcePopup.vue'
-  import {deleteFunction,getFunctionList} from '@/api/function/index.ts'
+  import {deleteFunction,getFunctionList} from '@/api/user/function/index'
   const dictStore = useDictStore()
   const resourcePopup = ref()
   // ProTable 实例

frontend/src/views/authority/role/components/rolePopup.vue

@@ -42,10 +42,10 @@
   import{  ElMessage, type FormInstance,type FormItemRule } from 'element-plus'
   import type { ProTableInstance } from '@/components/ProTable/interface'
   import { ref,computed, Ref  } from 'vue'
-  import { type Role } from '@/api/role/interface'
+  import { type Role } from '@/api/user/interface/role'
   import {dialogSmall} from '@/utils/elementBind'
   import { useDictStore } from '@/stores/modules/dict'
-  import {addRole,editRole,} from '@/api/role/role'
+  import {addRole,editRole} from '@/api/user/role'
 
   const dictStore = useDictStore()
  // 定义弹出组件元信息

frontend/src/views/authority/role/components/roleResourcePopup.vue

@@ -32,11 +32,11 @@
   import{  ElMessage, ElTree, type FormInstance,type FormItemRule } from 'element-plus'
   import type { ProTableInstance } from '@/components/ProTable/interface'
   import { ref,computed, type Ref, nextTick  } from 'vue'
-  import { Role } from '@/api/role/interface'
+  import { Role } from '@/api/user/interface/role'
   import {dialogMiddle,dialogSmall} from '@/utils/elementBind'
   import { useDictStore } from '@/stores/modules/dict'
-  import { type Function } from '@/api/function/interface'
+  import { type Function } from '@/api/user/function/interface'
-  import {getRoleFunction,assignFunction} from '@/api/role/role'
+  import {getRoleFunction,assignFunction} from '@/api/user/role/index'
 
   // 保存数据
   const treeRef = ref<InstanceType<typeof ElTree>>()

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

@@ -28,18 +28,17 @@
 </template>
 
 <script setup lang='tsx' name='useRole'>
-import { type Role } from '@/api/role/interface'
+import { type Role } from '@/api/user/interface/role'
-import { type Function } from '@/api/function/interface'
+import { type Function } from '@/api/user/interface/function'
 import { useHandleData } from '@/hooks/useHandleData'
 import ProTable from '@/components/ProTable/index.vue'
 import type{  ProTableInstance, ColumnProps } from '@/components/ProTable/interface'
 import { CirclePlus, Delete, EditPen, Share, Download, Upload, View, Refresh } from '@element-plus/icons-vue'
-import {getRoleList,deleteRole,getFunctionList} from '@/api/role/role'
+import {getRoleList,deleteRole,getFunctionList} from '@/api/user/role/index'
 import RolePopup from './components/rolePopup.vue'
 import RoleResourcePopup from './components/roleResourcePopup.vue'
 import { onMounted, reactive, ref } from 'vue'
 import {useDictStore} from '@/stores/modules/dict'
-import { fa } from 'element-plus/es/locale/index.mjs'
 const rolePopup = ref()
 const roleResourcePopup = ref()
 const dictStore = useDictStore()

frontend/src/views/authority/user/components/passWordPopup.vue

@@ -36,7 +36,7 @@
   import {updatePassWord} from '@/api/user/user'
   // 使用 dayjs 库格式化
   import dayjs from 'dayjs';
-  import { type User } from '@/api/user/interface';
+  import { type User } from '@/api/user/interface/user';
 
   // 定义弹出组件元信息
   const dialogFormRef = ref()

frontend/src/views/authority/user/components/userPopup.vue

@@ -56,9 +56,9 @@
   } from '@/api/user/user'
   // 使用 dayjs 库格式化
   import dayjs from 'dayjs';
-  import { type User } from '@/api/user/interface';
+  import { type User } from '@/api/user/interface/user';
   import { useDictStore } from '@/stores/modules/dict'
-  import { type Role } from '@/api/role/interface';
+  import { type Role } from '@/api/user/interface/role';
   const dictStore = useDictStore()
   // 定义弹出组件元信息
   const dialogFormRef = ref()

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

@@ -31,7 +31,7 @@
 
   <script setup lang='tsx' name='useRole'>
   import TimeControl from '@/components/TimeControl/index.vue'
-  import { type User } from '@/api/user/interface'
+  import { type User } from '@/api/user/interface/user'
   import { useHandleData } from '@/hooks/useHandleData'
   import ProTable from '@/components/ProTable/index.vue'
   import UserPopup from './components/userPopup.vue'
@@ -42,7 +42,7 @@
   import { useDictStore } from '@/stores/modules/dict'
   import {getUserList, deleteUser,getRoleList} from '@/api/user/user'
   import { onMounted, reactive, ref } from 'vue'
-  import { type Role } from '@/api/role/interface'
+  import { type Role } from '@/api/user/interface/role'
   const roleList = ref<Role.RoleBO[]>([])
   const dictStore = useDictStore()
   const userPopup = ref()

frontend/src/views/home/components/changeErrSysPopup.vue

@@ -42,16 +42,14 @@
   </template>
   
   <script lang="ts" setup>
-  import { FormInstance,FormItemRule } from 'element-plus'
+  import type { FormInstance,FormItemRule } from 'element-plus'
-  import { ProTableInstance } from '@/components/ProTable/interface'
   import { ref,computed  } from 'vue'
-  import { Role } from '@/api/role/interface'
   import {dialogSmall} from '@/utils/elementBind'
   import { useDictStore } from '@/stores/modules/dict'
   import {
     addRole,
     editRole,
-  } from '@/api/role/role'
+  } from '@/api/user/role/index'
 
   const dictStore = useDictStore()
 

frontend/src/views/home/components/table.vue

@@ -151,7 +151,7 @@
 
 <script setup lang="tsx" name="useProTable">
 import { useRouter } from "vue-router";
-import type { Device } from '@/api/device/interface'
+import type { Device } from '@/api/device/interface/device'
 import { useHandleData } from "@/hooks/useHandleData";
 import { ElMessage, ElMessageBox, ElLoading} from "element-plus";
 import ProTable from "@/components/ProTable/index.vue";
@@ -160,9 +160,10 @@ import {
   Search,View,EditPen
 } from "@element-plus/icons-vue";
 import { getPlanList } from "@/api/plan/planList";
-import deviceDataList from '@/api/device/deviceData'
+import deviceDataList from '@/api/device/device/deviceData'
 import { log } from "console";
 import { isVisible } from "element-plus/es/utils";
+import { reactive, ref } from "vue";
 const router = useRouter();
 const value1 = ref("");
 const value2 = ref("");

frontend/src/views/log/index.vue

@@ -21,10 +21,10 @@
 <script setup lang='tsx' name='useProTable'>
 // 根据实际路径调整
 import TimeControl from '@/components/TimeControl/index.vue'
-import { type Sys_Log_Audit } from '@/api/log/interface'
+import { type Sys_Log_Audit } from '@/api/system/interface/log'
 import ProTable from '@/components/ProTable/index.vue'
 import { Upload ,DataAnalysis} from '@element-plus/icons-vue'
-import logDataList from '@/api/log/logData'
+import logDataList from '@/api/system/log/logData'
 import type { ColumnProps, ProTableInstance } from '@/components/ProTable/interface'
 import { reactive,ref,watch } from 'vue'
 import { useDictStore } from '@/stores/modules/dict'

frontend/src/views/login/components/LoginForm.vue

@@ -56,7 +56,8 @@
 import { useRouter } from 'vue-router'
 import { HOME_URL } from '@/config'
 import { getTimeState } from '@/utils'
-import { type Dict, Login } from '@/api/interface'
+import { type Dict } from '@/api/interface'
+import { type Login } from '@/api/user/interface/user'
 import { ElNotification } from 'element-plus'
 import { getDictList, loginApi } from '@/api/user/login'
 import { useUserStore } from '@/stores/modules/user'

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

@@ -230,17 +230,17 @@
 
 import IPAddress from '@/components/IpAddress/index.vue'
 import { dialogBig } from '@/utils/elementBind'
-import { type Device } from '@/api/device/interface'
+import { type Device } from '@/api/device/interface/device'
 import { ElMessage, type FormItemRule } from 'element-plus'
-import { addPqDev, updatePqDev } from '@/api/device/device.ts'
+import { addPqDev, updatePqDev } from '@/api/device/device'
 import { computed, reactive, type Ref, ref } from 'vue'
 import { useDictStore } from '@/stores/modules/dict'
 import { CirclePlus, Delete, EditPen } from '@element-plus/icons-vue'
 // 使用 dayjs 库格式化
 import dayjs from 'dayjs'
-import { getPqMonList } from '@/api/monitor/monitor.ts'
+import { getPqMonList } from '@/api/device/monitor'
 import { type ColumnProps } from '@/components/ProTable/interface'
-import { type Monitor } from '@/api/monitor/interface'
+import { type Monitor } from '@/api/device/interface/monitor'
 
 const MonIsShow = ref(false)
 const DevIsShow = ref(false)

frontend/src/views/machine/device/index.vue

@@ -30,7 +30,7 @@
 
 <script setup lang='tsx' name='useRole'>
 import TimeControl from '@/components/TimeControl/index.vue'
-import { type Device } from '@/api/device/interface'
+import { type Device } from '@/api/device/interface/device.ts'
 import { useHandleData } from '@/hooks/useHandleData'
 import { useDownload } from '@/hooks/useDownload'
 import ProTable from '@/components/ProTable/index.vue'
@@ -39,7 +39,7 @@ import { type ProTableInstance, type ColumnProps } from '@/components/ProTable/i
 import DevicePopup from '@/views/machine/device/components/devicePopup.vue'
 import { CirclePlus, Delete, EditPen, Download, Upload } from '@element-plus/icons-vue'
 import { useDictStore } from '@/stores/modules/dict'
-import { getPqDevList, deletePqDev, exportPqDev, downloadTemplate, importPqDev } from '@/api/device/device.ts'
+import { getPqDevList, deletePqDev, exportPqDev, downloadTemplate, importPqDev } from '@/api/device/device/index.ts'
 import { ElMessageBox } from 'element-plus'
 import { reactive, ref } from 'vue'
 

frontend/src/views/machine/errorSystem/components/ErrorStandardDialog.vue

@@ -14,8 +14,8 @@
  import { defineProps, defineEmits, reactive,watch,ref,computed } from 'vue';
  import { dialogBig} from '@/utils/elementBind'
  import type { ColumnProps } from '@/components/ProTable/interface'
- import type { ErrorSystem } from '@/api/error/interface'
+ import type { ErrorSystem } from '@/api/device/interface/error'
- import errorDataList from '@/api/error/errorData'
+ import errorDataList from '@/api/device/error/errorData'
  import type { TableColumnCtx } from 'element-plus'
 
  const errorData = errorDataList.errordetail

frontend/src/views/machine/errorSystem/index.vue

@@ -45,9 +45,9 @@
 import ProTable from '@/components/ProTable/index.vue'
 import type { ColumnProps } from '@/components/ProTable/interface'
 import { CirclePlus, Delete,EditPen,View} from '@element-plus/icons-vue'
-import errorDataList from '@/api/error/errorData'
+import errorDataList from '@/api/device/error/errorData'
 import { reactive,ref } from 'vue'
-import type { ErrorSystem } from '@/api/error/interface'
+import type { ErrorSystem } from '@/api/device/interface/error'
 import ErrorSystemDialog from "@/views/machine/errorSystem/components/ErrorSystemDialog.vue"; // 导入子组件
 import ErrorStandardDialog from "@/views/machine/errorSystem/components/ErrorStandardDialog.vue"; // 导入子组件
 import { useDictStore } from '@/stores/modules/dict'

frontend/src/views/machine/testScript/index.vue

@@ -29,7 +29,7 @@
 </template>
 
 <script setup lang='tsx' name='useRole'>
-import { TestScript } from '@/api/testScript/interface'
+import { TestScript } from '@/api/device/interface/testScript'
 import { useHandleData } from '@/hooks/useHandleData'
 import { useDownload } from '@/hooks/useDownload'
 import { useAuthButtons } from '@/hooks/useAuthButtons'
@@ -38,11 +38,11 @@ import ImportExcel from '@/components/ImportExcel/index.vue'
 import { ProTableInstance, ColumnProps } from '@/components/ProTable/interface'
 
 import { CirclePlus, Delete, EditPen, Share, Download, Upload, View, Refresh } from '@element-plus/icons-vue'
-import testScriptDataList from '@/api/testScript/testScriptData'
+import testScriptDataList from '@/api/device/testScript/testScriptData'
 import { useDictStore } from '@/stores/modules/dict'
  import {
   getTestScriptList,
-} from '@/api/testScript/testScript'
+} from '@/api/device/testScript/testScript'
 
 const dictStore = useDictStore()
 

frontend/src/views/machine/testSource/index.vue

@@ -29,7 +29,7 @@
   </template>
   
   <script setup lang='tsx' name='useRole'>
-  import { TestSource } from '@/api/testSource/interface'
+  import { TestSource } from '@/api/device/interface/testSource'
   import { useHandleData } from '@/hooks/useHandleData'
   import { useDownload } from '@/hooks/useDownload'
   import { useAuthButtons } from '@/hooks/useAuthButtons'
@@ -38,11 +38,11 @@
   import { ProTableInstance, ColumnProps } from '@/components/ProTable/interface'
   
   import { CirclePlus, Delete, EditPen, Share, Download, Upload, View, Refresh } from '@element-plus/icons-vue'
-  import testSourceDataList from '@/api/testSource/testSourceData'
+  import testSourceDataList from '@/api/device/testSource/testSourceData'
   import { useDictStore } from '@/stores/modules/dict'
    import {
     getTestSourceList,
-  } from '@/api/testSource/testSource'
+  } from '@/api/device/testSource/testSource'
   
   const dictStore = useDictStore()
   

frontend/src/views/plan/autoTest/components/ShowDataPopup.vue

@@ -54,7 +54,7 @@
   import {
     getRoleList,
     deleteRole,
-  } from '@/api/role/role'
+  } from '@/api/user/role/index'
   import { deleteUser } from '@/api/user/user'
   const dialogVisible = ref(false)
   

frontend/src/views/plan/planList/components/devPopup.vue

@@ -44,10 +44,10 @@
   <script setup lang='tsx'>
   import {  Delete, View ,Upload,Download} from '@element-plus/icons-vue'
   import { reactive,ref } from 'vue'
-  import type { Device } from '@/api/device/interface'
+  import type { Device } from '@/api/device/interface/device.ts'
   import ProTable from '@/components/ProTable/index.vue'
   import { type ProTableInstance, type ColumnProps } from '@/components/ProTable/interface'
-  import deviceDataList from '@/api/device/deviceData'
+  import deviceDataList from '@/api/device/device/deviceData.ts'
   import DeviceSelectOpen from '@/views/plan/planList/components/devSelectPopup.vue'
   import { useViewSize } from '@/hooks/useViewSize'
 

frontend/src/views/plan/planList/components/devSelectPopup.vue

@@ -25,7 +25,7 @@
   </template>
   
   <script setup lang='tsx' name='useRole'>
-  import { Device } from '@/api/device/interface'
+  import { Device } from '@/api/device/interface/device.ts';
   import { useHandleData } from '@/hooks/useHandleData'
   import { useDownload } from '@/hooks/useDownload'
   import { useAuthButtons } from '@/hooks/useAuthButtons'
@@ -34,11 +34,11 @@
   import { ProTableInstance, ColumnProps } from '@/components/ProTable/interface'
   
   import { CirclePlus, Delete, EditPen, Share, Download, Upload, View, Refresh } from '@element-plus/icons-vue'
-  import deviceDataList from '@/api/device/deviceData'
+  import deviceDataList from '@/api/device/device/deviceData'
   import { useDictStore } from '@/stores/modules/dict'
    import {
     getPqDevList,
-  } from '@/api/device/device'
+  } from '@/api/device/device/index.ts'
   
   const dictStore = useDictStore()
   

frontend/src/views/plan/planList/components/sourcePopup.vue

@@ -37,10 +37,10 @@
   <script setup lang='tsx'>
   import {  Delete, View ,Upload,Download} from '@element-plus/icons-vue'
   import { reactive,ref } from 'vue'
-  import type { TestSource } from '@/api/testSource/interface'
+  import type { TestSource } from '@/api/device/interface/testSource'
   import ProTable from '@/components/ProTable/index.vue'
   import { type ProTableInstance, type ColumnProps } from '@/components/ProTable/interface'
-  import sourceDataList from '@/api/testSource/testSourceData'
+  import sourceDataList from '@/api/device/testSource/testSourceData'
   import SourceSelectOpen from '@/views/plan/planList/components/sourceSelectPopup.vue'
  import { useDictStore } from '@/stores/modules/dict'
 

frontend/src/views/plan/planList/components/sourceSelectPopup.vue

@@ -25,7 +25,7 @@
   </template>
   
   <script setup lang='tsx' name='useRole'>
-  import { TestSource } from '@/api/testSource/interface'
+  import { TestSource } from '@/api/device/interface/testSource'
   import { useHandleData } from '@/hooks/useHandleData'
   import { useDownload } from '@/hooks/useDownload'
   import { useAuthButtons } from '@/hooks/useAuthButtons'
@@ -34,11 +34,11 @@
   import { ProTableInstance, ColumnProps } from '@/components/ProTable/interface'
   
   import { CirclePlus, Delete, EditPen, Share, Download, Upload, View, Refresh } from '@element-plus/icons-vue'
-  import testSourceDataList from '@/api/testSource/testSourceData'
+  import testSourceDataList from '@/api/device/testSource/testSourceData'
   import { useDictStore } from '@/stores/modules/dict'
    import {
     getTestSourceList,
-  } from '@/api/testSource/testSource'
+  } from '@/api/device/testSource/index'
   
   const dictStore = useDictStore()
   const dialogVisible = ref(false)