From 0aafb0d04a4741dbc0e491fe49432c49cfb2b8b0 Mon Sep 17 00:00:00 2001
From: yangzhq68909 <993367776@qq.com>
Date: Tue, 27 May 2025 11:35:28 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=AE=A1=E6=89=B9=E8=A7=92=E6=A0=87=202.?=
=?UTF-8?q?=E8=AF=B7=E5=81=87=E5=AE=A1=E6=89=B9=E5=8E=86=E5=8F=B2=E6=9F=A5?=
=?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
env/.env.development | 2 +-
pages.config.ts | 14 +-
src/api/pages/file/index.ts | 2 +-
src/api/{produce => production}/index.ts | 0
src/pages-bpm/leaveApplication/index.vue | 124 +++++++-----------
src/pages-humanResource/absence/add.vue | 1 -
src/pages-humanResource/absence/detail.vue | 7 +-
src/pages-humanResource/absence/index.vue | 65 +++++----
src/pages-process/components/DynamicLink.vue | 1 -
src/pages-process/components/myTask.vue | 3 -
src/pages-process/components/taskDeal.vue | 1 -
src/pages-process/taskHandle.vue | 9 --
src/pages.json | 43 +++---
src/pages/index/index.vue | 118 ++++++++++++-----
src/pages/operation/index.vue | 16 +++
src/pages/{produce => production}/index.vue | 8 +-
.../ribaoshuju/rbsjLsxq.vue | 2 +-
.../ribaoshuju/trqRbsj.vue | 2 +-
.../ribaoshuju/yyRbsj.vue | 2 +-
.../shishishuju/aqbjSssj.vue | 0
.../shishishuju/gycsSssj.vue | 0
.../shishishuju/index.vue | 2 +-
.../shishishuju/nyxhSssj.vue | 0
.../shishishuju/trqSssj.vue | 2 +-
.../shishishuju/ysjSssj.vue | 0
src/static/tabbar/tabbar-operation-2.png | Bin 0 -> 3076 bytes
src/static/tabbar/tabbar-operation.png | Bin 0 -> 2983 bytes
src/static/tabbar/tabbar-produce-2.png | Bin 7769 -> 0 bytes
src/static/tabbar/tabbar-produce.png | Bin 12100 -> 0 bytes
src/static/tabbar/tabbar-production-2.png | Bin 0 -> 7727 bytes
src/static/tabbar/tabbar-production.png | Bin 0 -> 7506 bytes
src/types/uni-pages.d.ts | 23 ++--
.../cxc-szcx-stationJl-select.vue | 2 +-
33 files changed, 238 insertions(+), 211 deletions(-)
rename src/api/{produce => production}/index.ts (100%)
create mode 100644 src/pages/operation/index.vue
rename src/pages/{produce => production}/index.vue (95%)
rename src/pages/{produce => production}/ribaoshuju/rbsjLsxq.vue (99%)
rename src/pages/{produce => production}/ribaoshuju/trqRbsj.vue (99%)
rename src/pages/{produce => production}/ribaoshuju/yyRbsj.vue (99%)
rename src/pages/{produce => production}/shishishuju/aqbjSssj.vue (100%)
rename src/pages/{produce => production}/shishishuju/gycsSssj.vue (100%)
rename src/pages/{produce => production}/shishishuju/index.vue (91%)
rename src/pages/{produce => production}/shishishuju/nyxhSssj.vue (100%)
rename src/pages/{produce => production}/shishishuju/trqSssj.vue (99%)
rename src/pages/{produce => production}/shishishuju/ysjSssj.vue (100%)
create mode 100644 src/static/tabbar/tabbar-operation-2.png
create mode 100644 src/static/tabbar/tabbar-operation.png
delete mode 100644 src/static/tabbar/tabbar-produce-2.png
delete mode 100644 src/static/tabbar/tabbar-produce.png
create mode 100644 src/static/tabbar/tabbar-production-2.png
create mode 100644 src/static/tabbar/tabbar-production.png
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 @@
-
+
+
@@ -10,92 +11,55 @@
-
-
+
+
-