From ec00255aab24865cd785e181704e502354b9c8f6 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期五, 13 三月 2026 13:52:49 +0800
Subject: [PATCH] Merge branch 'dev_KT' of http://114.132.189.42:9002/r/product-inventory-APP-before into dev_KT
---
src/pages.json | 75 ++++++++++++++++++++++++++++++++++---
1 files changed, 69 insertions(+), 6 deletions(-)
diff --git a/src/pages.json b/src/pages.json
index e88a800..a6d3cf9 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -541,6 +541,13 @@
}
},
{
+ "path": "pages/equipmentManagement/upkeep/detail",
+ "style": {
+ "navigationBarTitleText": "淇濆吇璇︽儏",
+ "navigationStyle": "custom"
+ }
+ },
+ {
"path": "pages/equipmentManagement/upkeep/add",
"style": {
"navigationBarTitleText": "鏂板淇濆吇璁″垝",
@@ -599,7 +606,16 @@
{
"path": "pages/inspectionUpload/index",
"style": {
- "navigationBarTitleText": "宸℃涓婁紶",
+ "navigationBarTitleText": "宸℃绠＄悊",
+ "navigationStyle": "custom",
+ "enablePullDownRefresh": true,
+ "backgroundColor": "#f8f8f8"
+ }
+ },
+ {
+ "path": "pages/inspectionManagement/index",
+ "style": {
+ "navigationBarTitleText": "宸℃浠诲姟绠＄悊",
"navigationStyle": "custom",
"enablePullDownRefresh": true,
"backgroundColor": "#f8f8f8"
@@ -671,7 +687,7 @@
{
"path": "pages/safeProduction/safeQualifications/index",
"style": {
- "navigationBarTitleText": "瑙勭▼璧勮川",
+ "navigationBarTitleText": "瑙勭▼涓庤祫璐�",
"navigationStyle": "custom"
}
},
@@ -783,7 +799,7 @@
{
"path": "pages/safeProduction/hazardousMaterialsControl/index",
"style": {
- "navigationBarTitleText": "鍗遍櫓鐗╂枡",
+ "navigationBarTitleText": "鍗遍櫓鐗╂枡绠℃帶",
"navigationStyle": "custom"
}
},
@@ -858,17 +874,58 @@
}
},
{
- "path": "pages/attendance/checkin",
+ "path": "pages/humanResources/attendance/checkin",
"style": {
"navigationBarTitleText": "鎵撳崱绛惧埌",
"navigationStyle": "custom"
}
},
{
- "path": "pages/attendance/report",
+ "path": "pages/humanResources/attendance/report",
"style": {
"navigationBarTitleText": "鑰冨嫟鏃ユ姤",
"navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/humanResources/monthlyStatistics/index",
+ "style": {
+ "navigationBarTitleText": "钖祫鍙拌处",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/humanResources/monthlyStatistics/detail",
+ "style": {
+ "navigationBarTitleText": "钖祫鍙拌处璇︽儏",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/humanResources/contractManagement/index",
+ "style": {
+ "navigationBarTitleText": "鍚堝悓绠＄悊",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/productionManagement/workOrder/index",
+ "style": {
+ "navigationBarTitleText": "鐢熶骇宸ュ崟",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/productionManagement/workOrder/fileList",
+ "style": {
+ "navigationBarTitleText": "鐢熶骇宸ュ崟闄勪欢",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/message",
+ "style": {
+ "navigationBarTitleText": "娑堟伅涓績"
}
}
],
@@ -1082,6 +1139,12 @@
"text": "棣栭〉"
},
{
+ "pagePath": "pages/message",
+ "iconPath": "static/images/tabbar/work.png",
+ "selectedIconPath": "static/images/tabbar/work_.png",
+ "text": "娑堟伅"
+ },
+ {
"pagePath": "pages/mine",
"iconPath": "static/images/tabbar/mine.png",
"selectedIconPath": "static/images/tabbar/mine_.png",
@@ -1094,4 +1157,4 @@
"navigationBarTitleText": "RuoYi",
"navigationBarBackgroundColor": "#FFFFFF"
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3