diff --git a/env/.env.development b/env/.env.development index 096ebec..44dd13a 100644 --- a/env/.env.development +++ b/env/.env.development @@ -4,5 +4,5 @@ NODE_ENV = 'development' VITE_DELETE_CONSOLE = false # 是否开启sourcemap VITE_SHOW_SOURCEMAP = true -VITE_SERVER_BASEURL = 'http://10.75.15.247:8080/jeecg-boot' +VITE_SERVER_BASEURL = 'http://10.75.15.249:8080/jeecg-boot' #VITE_SERVER_BASEURL = 'https://36.112.48.190/jeecg-boot' \ No newline at end of file diff --git a/pages.config.ts b/pages.config.ts index a73835e..0ca0e51 100644 --- a/pages.config.ts +++ b/pages.config.ts @@ -33,16 +33,16 @@ export default defineUniPages({ text: '首页', }, { - "iconPath": "static/tabbar/tabbar-produce.png", - "selectedIconPath": "static/tabbar/tabbar-produce-2.png", - "pagePath": "pages/produce/index", + "iconPath": "static/tabbar/tabbar-production.png", + "selectedIconPath": "static/tabbar/tabbar-production-2.png", + "pagePath": "pages/production/index", "text": "生产" }, { - iconPath: 'static/tabbar/tabbar-workHome-2.png', - selectedIconPath: 'static/tabbar/tabbar-workHome.png', - pagePath: 'pages/workHome/index', - text: '工作台', + iconPath: 'static/tabbar/tabbar-operation.png', + selectedIconPath: 'static/tabbar/tabbar-operation-2.png', + pagePath: 'pages/operation/index', + text: '经营', }, { iconPath: 'static/tabbar/tabbar-user-2.png', diff --git a/src/api/pages/file/index.ts b/src/api/pages/file/index.ts index ebf1571..568f019 100644 --- a/src/api/pages/file/index.ts +++ b/src/api/pages/file/index.ts @@ -26,7 +26,7 @@ export function querySuperiorSystemApi(config : Object) { // 上级制度 export function queryFactorySystemApi(config : Object) { // 厂级制度 return http({ - url: '/cxczd/cxcZdgl/list', + url: '/cxczd/cxcZdgl/zsList', method: 'GET', data: config }) diff --git a/src/api/produce/index.ts b/src/api/production/index.ts similarity index 100% rename from src/api/produce/index.ts rename to src/api/production/index.ts diff --git a/src/pages-bpm/leaveApplication/index.vue b/src/pages-bpm/leaveApplication/index.vue index 28debb5..888e098 100644 --- a/src/pages-bpm/leaveApplication/index.vue +++ b/src/pages-bpm/leaveApplication/index.vue @@ -1,5 +1,6 @@