diff --git a/.env.development b/.env.development index dbd0449..6c81966 100644 --- a/.env.development +++ b/.env.development @@ -9,4 +9,4 @@ VITE_ROUTER_MODE = hash VITE_PUBLIC_PATH = './' # 请求路径 管理系统/开发环境 -VITE_APP_BASE_URL = 'http://192.168.2.110:10010' +VITE_APP_BASE_URL = 'http://192.168.2.92:10010' diff --git a/src/api/modules/productionManagement/index.ts b/src/api/modules/productionManagement/index.ts new file mode 100644 index 0000000..f838648 --- /dev/null +++ b/src/api/modules/productionManagement/index.ts @@ -0,0 +1,20 @@ +import axios from "@/api"; +import {} from "./types"; + +//分页查询中控基本信息 +export const getCentralControlBasicInfoByPageAPI = (params: any) => { + return axios({ + url: "/operations/ebikeEcuInfo/page", + method: "get", + params + }); +}; + +// 新增中控入库 +export const addCentralControlInfoAPI = (data: any) => { + return axios({ + url: "/operations/ebikeEcuInfo/save", + method: "post", + data + }); +}; diff --git a/src/api/modules/productionManagement/types.ts b/src/api/modules/productionManagement/types.ts new file mode 100644 index 0000000..62cb4ec --- /dev/null +++ b/src/api/modules/productionManagement/types.ts @@ -0,0 +1,18 @@ +interface ListType { + pageNum: number; + pageSize: number; +} + +// 运营商列表查询参数 +export interface OperatorListParams extends ListType { + operatorName?: string; +} + +// 新增中控入库参数 +export interface AddCentralControlInfoParams { + ecuId?: string; // 中控ID + operatorId: string; // 运营商ID + ecuCode: string; // 中控编码 + ecuSn: string; // 中控SN + ecuBrand: string; // 中控品牌 +} diff --git a/src/utils/index.ts b/src/utils/index.ts index 8eb7204..ca531e1 100644 --- a/src/utils/index.ts +++ b/src/utils/index.ts @@ -267,3 +267,17 @@ export function formatTreeData(treeData: any[]) { return treeData; } } + +/** + * 字典翻译 + * @param {Array} list - 字典列表 + * @param {string} key - 字典键 + * @param {string|number|boolean} value - 字典值 + * @param {string} valueKey - 需要返回的字典值对应的键,默认值为 "dicValueName" + * @returns {any} 值 + */ +export function dictTranslate(list: any[], key: string, value: string | number, valueKey: string = "dicValueName"): any { + if (!Array.isArray(list) || list.length === 0) return value; + let item = list.find(i => i[key] === value.toString()); + return item ? item[valueKey] : value; +} diff --git a/src/views/login/components/login-form.vue b/src/views/login/components/login-form.vue index 7ad2060..e6c19a4 100644 --- a/src/views/login/components/login-form.vue +++ b/src/views/login/components/login-form.vue @@ -85,7 +85,6 @@ const rules = ref({ ] }); const verifyCode = ref(""); -const verifyCodeChange = (code: string) => (verifyCode.value = code); // 提交表单 const onSubmit = async ({ errors }: any) => { @@ -113,14 +112,12 @@ const onLogin = async () => { // 跳转到当前用户拥有权限菜单第一个 let foundItem = null; - for (const item of routeStore.routeList) { if (item.meta.type === 2) { foundItem = item; break; // 找到后立即跳出循环 } } - router.replace(foundItem.path || "/"); // 设置字典 diff --git a/src/views/productionManagement/QRCodeManage/QRCodeManage.vue b/src/views/productionManagement/QRCodeManage/QRCodeManage.vue new file mode 100644 index 0000000..df72512 --- /dev/null +++ b/src/views/productionManagement/QRCodeManage/QRCodeManage.vue @@ -0,0 +1,9 @@ + + + + + diff --git a/src/views/productionManagement/centralizedControl/centralizedControl.vue b/src/views/productionManagement/centralizedControl/centralizedControl.vue new file mode 100644 index 0000000..33f74ab --- /dev/null +++ b/src/views/productionManagement/centralizedControl/centralizedControl.vue @@ -0,0 +1,223 @@ + + + + + diff --git a/src/views/productionManagement/moduleProduction/moduleProduction.vue b/src/views/productionManagement/moduleProduction/moduleProduction.vue new file mode 100644 index 0000000..8a99259 --- /dev/null +++ b/src/views/productionManagement/moduleProduction/moduleProduction.vue @@ -0,0 +1,98 @@ + + + + + diff --git a/src/views/system/role/role.vue b/src/views/system/role/role.vue index 6bfad23..9385312 100644 --- a/src/views/system/role/role.vue +++ b/src/views/system/role/role.vue @@ -112,13 +112,6 @@ - - - 父子关联 - - diff --git a/src/views/system/staffManagement/staffManagement.vue b/src/views/system/staffManagement/staffManagement.vue index 8614435..22c70bf 100644 --- a/src/views/system/staffManagement/staffManagement.vue +++ b/src/views/system/staffManagement/staffManagement.vue @@ -232,6 +232,7 @@ const onAdd = async () => { open.value = true; title.value = "新增员工"; }; + // 勾选 const select = (list: []) => { selectedKeys.value = list; @@ -249,13 +250,12 @@ const onUpdate = async (record: any) => { let res: any = await getStaffByIdAPI(record.staffId); if (res.code === 200) { console.log(filterIds(res.data.roles, "roleId")); - addForm.value = { staffId: res.data.staffId, username: res.data.username, contactPhone: res.data.contactPhone, password: "", - status: res.data.status, + status: res.data.status ? res.data.status.toString() : 1, roleIds: filterIds(res.data.roles, "roleId"), operatorId: res.data.operatorId };