diff --git a/.env.dev b/.env.dev index d5229f26..7f31ab34 100644 --- a/.env.dev +++ b/.env.dev @@ -12,10 +12,10 @@ ENV = 'development' VUE_APP_TITLE = 智能监控分析系统 # 芋道管理系统/开发环境 -# VUE_APP_BASE_API = 'http://192.168.8.22:48080' -# VUE_APP_BASE_API = 'http://172.16.32.236:48080' + VUE_APP_BASE_API = 'http://192.168.0.31:48080' -# VUE_APP_BASE_API = 'http://100.64.0.32:48080' +# VUE_APP_BASE_API = 'http://172.16.32.76:48080' +# VUE_APP_BASE_API = 'http://line.kszny.picaiba.com' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/src/api/ssdl/product&recipe.js b/src/api/ssdl/product&recipe.js new file mode 100644 index 00000000..dfe0b5aa --- /dev/null +++ b/src/api/ssdl/product&recipe.js @@ -0,0 +1,154 @@ +/* + * @Author: zwq + * @Date: 2025-11-17 09:25:12 + * @LastEditors: zwq + * @LastEditTime: 2025-11-28 09:29:14 + * @Description: + */ +import request from '@/utils/request' + + +// 获得原料分页 +export function getProductPage(query) { + return request({ + url: '/wms/material/page', + method: 'get', + params: query + }) +} +// 获得原料 +export function getProduct(id) { + return request({ + url: '/wms/material/get?id=' + id, + method: 'get' + }) +} +// 删除原料 +export function deleteProduct(id) { + return request({ + url: '/wms/material/delete?id=' + id, + method: 'delete' + }) +} +// 更新 +export function updateProduct(data) { + return request({ + url: '/wms/material/update', + method: 'put', + data: data + }) +} + +// 创建 +export function createProduct(data) { + return request({ + url: '/wms/material/create', + method: 'post', + data: data + }) +} + + +// 获得工艺分页 +export function getProcessPage(query) { + return request({ + url: '/wms/process/page/group/by', + method: 'get', + params: query + }) +} +// 获得工艺点击展开表格 +export function getProcessDetailPage(query) { + return request({ + url: '/wms/process/page/group/by/detail', + method: 'get', + params: query + }) +} +// 删除工艺 +export function deleteProcess(id) { + return request({ + url: '/wms/process/delete?id=' + id, + method: 'delete' + }) +} +// 批量删除工艺 +export function deleteProcessList(ids) { + return request({ + url: '/wms/process/delete-list?ids=' + ids, + method: 'delete' + }) +} +// 更新 +export function updateProcess(data) { + return request({ + url: '/wms/process/update', + method: 'put', + data: data + }) +} + +// 创建 +export function createProcess(data) { + return request({ + url: '/wms/process/create', + method: 'post', + data: data + }) +} +// 获得工艺 +export function getProcess(id) { + return request({ + url: '/wms/process/get?id=' + id, + method: 'get' + }) +} +// 工艺设备原料分页 +export function getProcessMaterialPage(query) { + return request({ + url: '/wms/process-equipment-material/page', + method: 'get', + params: query + }) +} +// 删除工艺设备原料 +export function deleteProcessMaterial(id) { + return request({ + url: '/wms/process-equipment-material/delete?id=' + id, + method: 'delete' + }) +} + +// 更新 +export function updateProcessMaterial(data) { + return request({ + url: '/wms/process-equipment-material/update', + method: 'put', + data: data + }) +} + +// 创建 +export function createProcessMaterial(data) { + return request({ + url: '/wms/process-equipment-material/create', + method: 'post', + data: data + }) +} +// 获得工艺 +export function getProcessMaterial(id) { + return request({ + url: '/wms/process-equipment-material/get?id=' + id, + method: 'get' + }) +} + +// 获得设备分页 +export function getEquipmentPage(query) { + return request({ + url: '/wms/equipment/page', + method: 'get', + params: query + }) +} diff --git a/src/api/ssdl/taskList.js b/src/api/ssdl/taskList.js new file mode 100644 index 00000000..b1092fca --- /dev/null +++ b/src/api/ssdl/taskList.js @@ -0,0 +1,60 @@ +/* + * @Author: zwq + * @Date: 2025-11-17 09:25:12 + * @LastEditors: zwq + * @LastEditTime: 2025-11-18 15:42:19 + * @Description: + */ +import request from '@/utils/request' + + +// 获得任务分页 +export function getTaskPage(query) { + return request({ + url: '/wms/job-main-task/page', + method: 'get', + params: query + }) +} +// 获得任务 +export function getTask(id) { + return request({ + url: '/wms/job-main-task/get?id=' + id, + method: 'get' + }) +} + +// 获得任务日志分页 +export function getTaskLogPage(query) { + return request({ + url: '/wms/job-main-task-log/page', + method: 'get', + params: query + }) +} + +// 更新 +export function updateTask(data) { + return request({ + url: '/wms/job-main-task/update', + method: 'put', + data: data + }) +} + +// 根据区域id获取该区域下的库位信息 +export function getRegion(id) { + return request({ + url: '/wms/line-edge-library/get-by-region-id?regionId=' + id, + method: 'get' + }) +} + +// 创建 +export function createPCTask(data) { + return request({ + url: '/wms/job-main-task/pc-create-task', + method: 'post', + data: data + }) +} diff --git a/src/api/visualization/visualization.js b/src/api/visualization/visualization.js new file mode 100644 index 00000000..5e60a9f4 --- /dev/null +++ b/src/api/visualization/visualization.js @@ -0,0 +1,9 @@ +import request from '@/utils/request' + +export function getLineEdgeLibraryList(data) { + return request({ + url: '/wms/line-edge-library/list', + method: 'get', + params: data, + }); +} diff --git a/src/assets/img/ABN.png b/src/assets/img/ABN.png new file mode 100644 index 00000000..3c301d38 Binary files /dev/null and b/src/assets/img/ABN.png differ diff --git a/src/assets/img/ABNScale.png b/src/assets/img/ABNScale.png new file mode 100644 index 00000000..9085bb21 Binary files /dev/null and b/src/assets/img/ABNScale.png differ diff --git a/src/assets/img/DIS.png b/src/assets/img/DIS.png new file mode 100644 index 00000000..5a30bde7 Binary files /dev/null and b/src/assets/img/DIS.png differ diff --git a/src/assets/img/DISScale.png b/src/assets/img/DISScale.png new file mode 100644 index 00000000..10723829 Binary files /dev/null and b/src/assets/img/DISScale.png differ diff --git a/src/assets/img/EP.png b/src/assets/img/EP.png new file mode 100644 index 00000000..0da35eda Binary files /dev/null and b/src/assets/img/EP.png differ diff --git a/src/assets/img/EPScale.png b/src/assets/img/EPScale.png new file mode 100644 index 00000000..99f31a2c Binary files /dev/null and b/src/assets/img/EPScale.png differ diff --git a/src/assets/img/FP.png b/src/assets/img/FP.png new file mode 100644 index 00000000..32a091eb Binary files /dev/null and b/src/assets/img/FP.png differ diff --git a/src/assets/img/FPScale.png b/src/assets/img/FPScale.png new file mode 100644 index 00000000..7a884004 Binary files /dev/null and b/src/assets/img/FPScale.png differ diff --git a/src/assets/img/IDL.png b/src/assets/img/IDL.png new file mode 100644 index 00000000..f8a1e294 Binary files /dev/null and b/src/assets/img/IDL.png differ diff --git a/src/assets/img/IDLScale.png b/src/assets/img/IDLScale.png new file mode 100644 index 00000000..4d3c3bd0 Binary files /dev/null and b/src/assets/img/IDLScale.png differ diff --git a/src/assets/img/IT.png b/src/assets/img/IT.png new file mode 100644 index 00000000..e997fc1a Binary files /dev/null and b/src/assets/img/IT.png differ diff --git a/src/assets/img/ITScale.png b/src/assets/img/ITScale.png new file mode 100644 index 00000000..dda2fb13 Binary files /dev/null and b/src/assets/img/ITScale.png differ diff --git a/src/assets/img/LCK.png b/src/assets/img/LCK.png new file mode 100644 index 00000000..fa37e2fb Binary files /dev/null and b/src/assets/img/LCK.png differ diff --git a/src/assets/img/LCKScale.png b/src/assets/img/LCKScale.png new file mode 100644 index 00000000..9948c830 Binary files /dev/null and b/src/assets/img/LCKScale.png differ diff --git a/src/assets/img/OCC.png b/src/assets/img/OCC.png new file mode 100644 index 00000000..36f5b73e Binary files /dev/null and b/src/assets/img/OCC.png differ diff --git a/src/assets/img/OCCScale.png b/src/assets/img/OCCScale.png new file mode 100644 index 00000000..8a87a97d Binary files /dev/null and b/src/assets/img/OCCScale.png differ diff --git a/src/assets/img/RES.png b/src/assets/img/RES.png new file mode 100644 index 00000000..681a85bd Binary files /dev/null and b/src/assets/img/RES.png differ diff --git a/src/assets/img/RESScale.png b/src/assets/img/RESScale.png new file mode 100644 index 00000000..e9a84b38 Binary files /dev/null and b/src/assets/img/RESScale.png differ diff --git a/src/assets/img/Top1.png b/src/assets/img/Top1.png new file mode 100644 index 00000000..67ea47f4 Binary files /dev/null and b/src/assets/img/Top1.png differ diff --git a/src/assets/img/Top2.png b/src/assets/img/Top2.png new file mode 100644 index 00000000..9f37851a Binary files /dev/null and b/src/assets/img/Top2.png differ diff --git a/src/assets/img/Top3.png b/src/assets/img/Top3.png new file mode 100644 index 00000000..17f88b75 Binary files /dev/null and b/src/assets/img/Top3.png differ diff --git a/src/assets/img/Top4.png b/src/assets/img/Top4.png new file mode 100644 index 00000000..2b0d2fae Binary files /dev/null and b/src/assets/img/Top4.png differ diff --git a/src/assets/img/Top5.png b/src/assets/img/Top5.png new file mode 100644 index 00000000..2b114c32 Binary files /dev/null and b/src/assets/img/Top5.png differ diff --git a/src/assets/img/agvCar.png b/src/assets/img/agvCar.png new file mode 100644 index 00000000..9318c5f4 Binary files /dev/null and b/src/assets/img/agvCar.png differ diff --git a/src/assets/img/agvItemBg.png b/src/assets/img/agvItemBg.png new file mode 100644 index 00000000..3e78a9f7 Binary files /dev/null and b/src/assets/img/agvItemBg.png differ diff --git a/src/assets/img/alarmItemBg.png b/src/assets/img/alarmItemBg.png new file mode 100644 index 00000000..fa9f6cb2 Binary files /dev/null and b/src/assets/img/alarmItemBg.png differ diff --git a/src/assets/img/chargeBg.png b/src/assets/img/chargeBg.png new file mode 100644 index 00000000..c38aeb40 Binary files /dev/null and b/src/assets/img/chargeBg.png differ diff --git a/src/assets/img/chargeCircle.png b/src/assets/img/chargeCircle.png new file mode 100644 index 00000000..757b6eab Binary files /dev/null and b/src/assets/img/chargeCircle.png differ diff --git a/src/assets/img/leftTable.png b/src/assets/img/leftTable.png new file mode 100644 index 00000000..f68157fe Binary files /dev/null and b/src/assets/img/leftTable.png differ diff --git a/src/assets/img/recycle.png b/src/assets/img/recycle.png new file mode 100644 index 00000000..013caff6 Binary files /dev/null and b/src/assets/img/recycle.png differ diff --git a/src/assets/img/rightTable.png b/src/assets/img/rightTable.png new file mode 100644 index 00000000..36e76cdf Binary files /dev/null and b/src/assets/img/rightTable.png differ diff --git a/src/assets/img/runBg.png b/src/assets/img/runBg.png new file mode 100644 index 00000000..72f4ae2f Binary files /dev/null and b/src/assets/img/runBg.png differ diff --git a/src/assets/img/runCircle.png b/src/assets/img/runCircle.png new file mode 100644 index 00000000..b20f0b83 Binary files /dev/null and b/src/assets/img/runCircle.png differ diff --git a/src/assets/img/ssdlLeftTitle.png b/src/assets/img/ssdlLeftTitle.png new file mode 100644 index 00000000..e17e3ac1 Binary files /dev/null and b/src/assets/img/ssdlLeftTitle.png differ diff --git a/src/assets/img/ssdlTitle.png b/src/assets/img/ssdlTitle.png new file mode 100644 index 00000000..1acffba1 Binary files /dev/null and b/src/assets/img/ssdlTitle.png differ diff --git a/src/assets/img/standbyCircle.png b/src/assets/img/standbyCircle.png new file mode 100644 index 00000000..068a9ae3 Binary files /dev/null and b/src/assets/img/standbyCircle.png differ diff --git a/src/assets/img/threeDimensionalChartBg.png b/src/assets/img/threeDimensionalChartBg.png new file mode 100644 index 00000000..1db16755 Binary files /dev/null and b/src/assets/img/threeDimensionalChartBg.png differ diff --git a/src/mixins/basic-page.js b/src/mixins/basic-page.js index 549a15a6..1ac38a03 100644 --- a/src/mixins/basic-page.js +++ b/src/mixins/basic-page.js @@ -2,7 +2,7 @@ * @Author: zwq * @Date: 2022-08-24 11:19:43 * @LastEditors: zwq - * @LastEditTime: 2024-04-02 09:33:29 + * @LastEditTime: 2025-11-28 09:35:03 * @Description: */ export default { @@ -16,7 +16,7 @@ export default { }, tableData: [], //table数据 listQuery: { //分页 - pageSize: 10, + pageSize: 20, pageNo: 1, total: 1, }, @@ -69,7 +69,7 @@ export default { this.$refs.addOrUpdate.init(val.data.id); }); } else if (val.type === "delete") { - this.deleteHandle(val.data.id, val.data.name, val.data._pageIndex) + this.deleteHandle(val.data.id, val.data.name, val.data._pageIndex,val.data) } else { this.otherMethods(val) } diff --git a/src/permission.js b/src/permission.js index 339490e6..2c942eec 100644 --- a/src/permission.js +++ b/src/permission.js @@ -9,7 +9,7 @@ import { isRelogin } from '@/utils/request' NProgress.configure({ showSpinner: false }) // 增加三方登陆 update by 芋艿 -const whiteList = ['/login', '/social-login', '/auth-redirect', '/bind', '/register', '/oauthLogin/gitee'] +const whiteList = ['/login', '/social-login','screenbg', '/auth-redirect', '/bind', '/register', '/oauthLogin/gitee'] router.beforeEach((to, from, next) => { NProgress.start() diff --git a/src/router/index.js b/src/router/index.js index 77990373..602116c3 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -28,223 +28,277 @@ Vue.use(Router) // 公共路由 export const constantRoutes = [ - { - path: '/redirect', - component: Layout, - hidden: true, - children: [ - { - path: '/redirect/:path(.*)', - component: (resolve) => require(['@/views/redirect'], resolve) - } - ] - }, - { - path: '/login', - component: (resolve) => require(['@/views/login'], resolve), - hidden: true - }, - { - path: '/sso', - component: (resolve) => require(['@/views/sso'], resolve), - hidden: true - }, - { - path: '/social-login', - component: (resolve) => require(['@/views/socialLogin'], resolve), - hidden: true - }, - { - path: '/404', - component: (resolve) => require(['@/views/error/404'], resolve), - hidden: true - }, - { - path: '/401', - component: (resolve) => require(['@/views/error/401'], resolve), - hidden: true - }, - { - path: '/print-design', - component: (resolve) => require(['@/views/print/design'], resolve), - hidden: true - }, - { - path: "", - component: Layout, - redirect: "index", - children: [ - { - path: "index", - component: (resolve) => require(["@/views/home/index"], resolve), - name: "首页", - meta: { title: "首页", icon: "dashboard", affix: true }, - hidden: true - }, - ], - }, - { - path: '/user', - component: Layout, - hidden: true, - redirect: 'noredirect', - children: [{ - path: 'profile', - component: (resolve) => require(['@/views/system/user/profile/index'], resolve), - name: 'Profile', - meta: { title: '个人中心', icon: 'user' } - }, { - path: 'notify-message', - component: (resolve) => require(['@/views/system/notify/my/index'], resolve), - name: 'MyNotifyMessage', - meta: { title: '我的站内信', icon: 'message' }, - }] - }, - { - path: '/dict', - component: Layout, - hidden: true, - children: [{ - path: 'type/data/:dictId(\\d+)', - component: (resolve) => require(['@/views/system/dict/data'], resolve), - name: 'SystemDictData', - meta: { title: '字典数据', icon: '', activeMenu: '/system/dict' } - } - ] - }, - { - path: '/job', - component: Layout, - hidden: true, - children: [{ - path: 'log', - component: (resolve) => require(['@/views/infra/job/log'], resolve), - name: 'InfraJobLog', - meta: { title: '调度日志', activeMenu: '/infra/job' } - } - ] - }, { - path: '/codegen', - component: Layout, - hidden: true, - children: [{ - path: 'edit/:tableId(\\d+)', - component: (resolve) => require(['@/views/infra/codegen/editTable'], resolve), - name: 'InfraCodegenEditTable', - meta: { title: '修改生成配置', activeMenu: '/infra/codegen' } - } - ] - }, - { - path: '/bpm', - component: Layout, - hidden: true, - redirect: 'noredirect', - children: [{ - path: 'oa/leave/create', - component: (resolve) => require(['@/views/bpm/oa/leave/create'], resolve), - name: 'BpmOALeaveCreate', - meta: { title: '发起 OA 请假', icon: 'form', activeMenu: '/bpm/oa/leave' } - }, { - path: 'oa/leave/detail', - component: (resolve) => require(['@/views/bpm/oa/leave/detail'], resolve), - name: 'BpmOALeaveDetail', - meta: { title: '查看 OA 请假', icon: 'view', activeMenu: '/bpm/oa/leave' } - } - ] - }, - { - path: '/bpm', - component: Layout, - hidden: true, - children: [{ - path: 'manager/form/edit', - component: (resolve) => require(['@/views/bpm/form/formEditor'], resolve), - name: 'BpmFormEditor', - meta: { title: '流程表单-编辑', activeMenu: '/bpm/manager/form' } - }, { - path: 'manager/definition', - component: (resolve) => require(['@/views/bpm/definition/index'], resolve), - name: 'BpmProcessDefinition', - meta: { title: '流程定义', activeMenu: '/bpm/manager/model' } - }, { - path: 'manager/model/design', - component: (resolve) => require(['@/views/bpm/model/modelEditor'], resolve), - name: 'BpmModelEditor', - meta: { title: '设计流程', activeMenu: '/bpm/manager/model' } - }, { - path: 'process-instance/create', - component: (resolve) => require(['@/views/bpm/processInstance/create'], resolve), - name: 'BpmProcessInstanceCreate', - meta: { title: '发起流程', activeMenu: '/bpm/task/my' } - }, { - path: 'process-instance/detail', - component: (resolve) => require(['@/views/bpm/processInstance/detail'], resolve), - name: 'BpmProcessInstanceDetail', - meta: { title: '流程详情', activeMenu: '/bpm/task/my' } - } - ] - }, - { - path: '/property', - component: Layout, - hidden: true, - children: [{ - path: 'value/:propertyId(\\d+)', - component: (resolve) => require(['@/views/mall/product/property/value'], resolve), - name: 'ProductPropertyValue', - meta: { title: '商品属性值', icon: '', activeMenu: '/product/property' } - } - ] - }, - { - path: '/spu', - component: Layout, - hidden: true, - children: [{ - path: 'edit/:spuId(\\d+)', - component: (resolve) => require(['@/views/mall/product/spu/save'], resolve), - name: 'ProductSpuUpdate', - meta: { title: '修改商品', activeMenu: '/product/spu' } - }, - { - path: 'add', - component: (resolve) => require(['@/views/mall/product/spu/save'], resolve), - name: 'ProductSpuCreate', - meta: { title: '添加商品', activeMenu: '/product/spu' } - } - ] - }, - { - path: '/trade/order', - component: Layout, - hidden: true, - children: [ - { - path: 'detail', - name: 'TradeOrderDetail', - hidden: true, - meta: { title: '订单详情' }, - component: (resolve) => require(['@/views/mall/trade/order/detail'], resolve) - } - ] - }, - { - path: '/pay', - component: Layout, - hidden: true, - children: [{ - path: 'order/submit', - name: 'PayOrderSubmit', - hidden: true, - meta: { - title: '收银台', - noCache: true - }, - component: (resolve) => require(['@/views/pay/order/submit'], resolve) - }] - } -] + { + path: '/redirect', + component: Layout, + hidden: true, + children: [ + { + path: '/redirect/:path(.*)', + component: (resolve) => require(['@/views/redirect'], resolve), + }, + ], + }, + { + path: '/login', + component: (resolve) => require(['@/views/login'], resolve), + // hidden: true, + }, + + { + path: '/sso', + component: (resolve) => require(['@/views/sso'], resolve), + hidden: true, + }, + { + path: '/social-login', + component: (resolve) => require(['@/views/socialLogin'], resolve), + hidden: true, + }, + { + path: '/404', + component: (resolve) => require(['@/views/error/404'], resolve), + hidden: true, + }, + { + path: '/401', + component: (resolve) => require(['@/views/error/401'], resolve), + hidden: true, + }, + { + path: '/print-design', + component: (resolve) => require(['@/views/print/design'], resolve), + hidden: true, + }, + { + path: '', + component: Layout, + redirect: 'index', + children: [ + { + path: 'index', + component: (resolve) => require(['@/views/home/index'], resolve), + name: '首页', + meta: { title: '首页', icon: 'dashboard', affix: true }, + hidden: true, + }, + ], + }, + { + path: '/screenbg', + component: () => + import( + /* webpackChunkName: "about" */ '@/views/productionVisualization/equipmentBoard' + ), + name: 'screenbg', + meta: { title: '大屏', icon: 'chart' }, + }, + { + path: '/user', + component: Layout, + hidden: true, + redirect: 'noredirect', + children: [ + { + path: 'profile', + component: (resolve) => + require(['@/views/system/user/profile/index'], resolve), + name: 'Profile', + meta: { title: '个人中心', icon: 'user' }, + }, + { + path: 'notify-message', + component: (resolve) => + require(['@/views/system/notify/my/index'], resolve), + name: 'MyNotifyMessage', + meta: { title: '我的站内信', icon: 'message' }, + }, + ], + }, + { + path: '/dict', + component: Layout, + hidden: true, + children: [ + { + path: 'type/data/:dictId(\\d+)', + component: (resolve) => require(['@/views/system/dict/data'], resolve), + name: 'SystemDictData', + meta: { title: '字典数据', icon: '', activeMenu: '/system/dict' }, + }, + ], + }, + { + path: '/job', + component: Layout, + hidden: true, + children: [ + { + path: 'log', + component: (resolve) => require(['@/views/infra/job/log'], resolve), + name: 'InfraJobLog', + meta: { title: '调度日志', activeMenu: '/infra/job' }, + }, + ], + }, + { + path: '/codegen', + component: Layout, + hidden: true, + children: [ + { + path: 'edit/:tableId(\\d+)', + component: (resolve) => + require(['@/views/infra/codegen/editTable'], resolve), + name: 'InfraCodegenEditTable', + meta: { title: '修改生成配置', activeMenu: '/infra/codegen' }, + }, + ], + }, + { + path: '/bpm', + component: Layout, + hidden: true, + redirect: 'noredirect', + children: [ + { + path: 'oa/leave/create', + component: (resolve) => + require(['@/views/bpm/oa/leave/create'], resolve), + name: 'BpmOALeaveCreate', + meta: { + title: '发起 OA 请假', + icon: 'form', + activeMenu: '/bpm/oa/leave', + }, + }, + { + path: 'oa/leave/detail', + component: (resolve) => + require(['@/views/bpm/oa/leave/detail'], resolve), + name: 'BpmOALeaveDetail', + meta: { + title: '查看 OA 请假', + icon: 'view', + activeMenu: '/bpm/oa/leave', + }, + }, + ], + }, + { + path: '/bpm', + component: Layout, + hidden: true, + children: [ + { + path: 'manager/form/edit', + component: (resolve) => + require(['@/views/bpm/form/formEditor'], resolve), + name: 'BpmFormEditor', + meta: { title: '流程表单-编辑', activeMenu: '/bpm/manager/form' }, + }, + { + path: 'manager/definition', + component: (resolve) => + require(['@/views/bpm/definition/index'], resolve), + name: 'BpmProcessDefinition', + meta: { title: '流程定义', activeMenu: '/bpm/manager/model' }, + }, + { + path: 'manager/model/design', + component: (resolve) => + require(['@/views/bpm/model/modelEditor'], resolve), + name: 'BpmModelEditor', + meta: { title: '设计流程', activeMenu: '/bpm/manager/model' }, + }, + { + path: 'process-instance/create', + component: (resolve) => + require(['@/views/bpm/processInstance/create'], resolve), + name: 'BpmProcessInstanceCreate', + meta: { title: '发起流程', activeMenu: '/bpm/task/my' }, + }, + { + path: 'process-instance/detail', + component: (resolve) => + require(['@/views/bpm/processInstance/detail'], resolve), + name: 'BpmProcessInstanceDetail', + meta: { title: '流程详情', activeMenu: '/bpm/task/my' }, + }, + ], + }, + { + path: '/property', + component: Layout, + hidden: true, + children: [ + { + path: 'value/:propertyId(\\d+)', + component: (resolve) => + require(['@/views/mall/product/property/value'], resolve), + name: 'ProductPropertyValue', + meta: { + title: '商品属性值', + icon: '', + activeMenu: '/product/property', + }, + }, + ], + }, + { + path: '/spu', + component: Layout, + hidden: true, + children: [ + { + path: 'edit/:spuId(\\d+)', + component: (resolve) => + require(['@/views/mall/product/spu/save'], resolve), + name: 'ProductSpuUpdate', + meta: { title: '修改商品', activeMenu: '/product/spu' }, + }, + { + path: 'add', + component: (resolve) => + require(['@/views/mall/product/spu/save'], resolve), + name: 'ProductSpuCreate', + meta: { title: '添加商品', activeMenu: '/product/spu' }, + }, + ], + }, + { + path: '/trade/order', + component: Layout, + hidden: true, + children: [ + { + path: 'detail', + name: 'TradeOrderDetail', + hidden: true, + meta: { title: '订单详情' }, + component: (resolve) => + require(['@/views/mall/trade/order/detail'], resolve), + }, + ], + }, + { + path: '/pay', + component: Layout, + hidden: true, + children: [ + { + path: 'order/submit', + name: 'PayOrderSubmit', + hidden: true, + meta: { + title: '收银台', + noCache: true, + }, + component: (resolve) => require(['@/views/pay/order/submit'], resolve), + }, + ], + }, +]; // 防止连续点击多次路由报错 let routerPush = Router.prototype.push; diff --git a/src/views/cost/components/SmallTitle.vue b/src/views/cost/components/SmallTitle.vue new file mode 100644 index 00000000..8e04d268 --- /dev/null +++ b/src/views/cost/components/SmallTitle.vue @@ -0,0 +1,65 @@ + + + + + + diff --git a/src/views/cost/components/add-or-updata.vue b/src/views/cost/components/add-or-updata.vue index b61d383d..e0c75ee0 100644 --- a/src/views/cost/components/add-or-updata.vue +++ b/src/views/cost/components/add-or-updata.vue @@ -1,142 +1,442 @@ + + + + + + + diff --git a/src/views/cost/components/detailDrawer.vue b/src/views/cost/components/detailDrawer.vue new file mode 100644 index 00000000..f98e25a9 --- /dev/null +++ b/src/views/cost/components/detailDrawer.vue @@ -0,0 +1,273 @@ + + + + + diff --git a/src/views/cost/components/stopInStock.vue b/src/views/cost/components/stopInStock.vue new file mode 100644 index 00000000..46bafa01 --- /dev/null +++ b/src/views/cost/components/stopInStock.vue @@ -0,0 +1,65 @@ + + + + + + diff --git a/src/views/cost/components/subSpan1.vue b/src/views/cost/components/subSpan1.vue new file mode 100644 index 00000000..931ecb10 --- /dev/null +++ b/src/views/cost/components/subSpan1.vue @@ -0,0 +1,32 @@ + + + + diff --git a/src/views/cost/components/subSpan2.vue b/src/views/cost/components/subSpan2.vue new file mode 100644 index 00000000..6519543c --- /dev/null +++ b/src/views/cost/components/subSpan2.vue @@ -0,0 +1,32 @@ + + + + diff --git a/src/views/cost/components/subSpan3.vue b/src/views/cost/components/subSpan3.vue new file mode 100644 index 00000000..00322b68 --- /dev/null +++ b/src/views/cost/components/subSpan3.vue @@ -0,0 +1,57 @@ + + + + diff --git a/src/views/cost/components/subSpan4.vue b/src/views/cost/components/subSpan4.vue new file mode 100644 index 00000000..931ecb10 --- /dev/null +++ b/src/views/cost/components/subSpan4.vue @@ -0,0 +1,32 @@ + + + + diff --git a/src/views/product&recipe/product/changeStatus.vue b/src/views/cost/raw/costMaterial/changeStatus.vue similarity index 100% rename from src/views/product&recipe/product/changeStatus.vue rename to src/views/cost/raw/costMaterial/changeStatus.vue diff --git a/src/views/login.vue b/src/views/login.vue index c412f3c1..cbe54e4a 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -284,7 +284,7 @@ export default { mobile: '', mobileCode: '', rememberMe: false, - tenantName: '技术中心', + tenantName: '芋道源码', }, scene: 21, diff --git a/src/views/product&recipe/product/add-or-updata.vue b/src/views/product&recipe/product/add-or-updata.vue index 95abfaa7..eef8a936 100644 --- a/src/views/product&recipe/product/add-or-updata.vue +++ b/src/views/product&recipe/product/add-or-updata.vue @@ -2,7 +2,7 @@ * @Author: zwq * @Date: 2021-11-18 14:16:25 * @LastEditors: zwq - * @LastEditTime: 2025-11-12 15:35:21 + * @LastEditTime: 2025-11-28 14:38:31 * @Description: -->