From bbd4291df45794a49e3527f6ae76e4ce61a07d66 Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期四, 12 二月 2026 11:04:17 +0800
Subject: [PATCH] Merge branch 'dev_new' of http://114.132.189.42:9002/r/product-inventory-APP-before into dev_new

---
 src/pages.json |  127 ++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 122 insertions(+), 5 deletions(-)

diff --git a/src/pages.json b/src/pages.json
index a2a1a59..0772b2e 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -312,7 +312,7 @@
     {
       "path": "pages/cooperativeOffice/collaborativeApproval/index7",
       "style": {
-        "navigationBarTitleText": "鍑哄簱绠＄悊",
+        "navigationBarTitleText": "鍙戣揣瀹℃壒",
         "navigationStyle": "custom"
       }
     },
@@ -671,7 +671,7 @@
     {
       "path": "pages/safeProduction/safeQualifications/index",
       "style": {
-        "navigationBarTitleText": "瑙勭▼璧勮川",
+        "navigationBarTitleText": "瑙勭▼涓庤祫璐�",
         "navigationStyle": "custom"
       }
     },
@@ -707,6 +707,27 @@
       "path": "pages/safeProduction/hazardSourceLedger/view",
       "style": {
         "navigationBarTitleText": "鍗遍櫓婧愯鎯�",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/safeProduction/accidentReportingRecord/index",
+      "style": {
+        "navigationBarTitleText": "浜嬫晠鎶ュ憡璁板綍",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/safeProduction/accidentReportingRecord/detail",
+      "style": {
+        "navigationBarTitleText": "浜嬫晠鎶ュ憡璇︽儏",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/safeProduction/accidentReportingRecord/view",
+      "style": {
+        "navigationBarTitleText": "浜嬫晠鎶ュ憡璇︽儏",
         "navigationStyle": "custom"
       }
     },
@@ -762,7 +783,7 @@
     {
       "path": "pages/safeProduction/hazardousMaterialsControl/index",
       "style": {
-        "navigationBarTitleText": "鍗遍櫓鐗╂枡",
+        "navigationBarTitleText": "鍗遍櫓鐗╂枡绠℃帶",
         "navigationStyle": "custom"
       }
     },
@@ -774,12 +795,102 @@
       }
     },
     {
-      "path": "pages/safeProduction/hazardousMaterialsControl/view",
+      "path": "pages/safeProduction/emergencyPlanReview/index",
       "style": {
-        "navigationBarTitleText": "鍗遍櫓鐗╂枡璇︽儏",
+        "navigationBarTitleText": "搴旀�ラ妗堝鏍�",
         "navigationStyle": "custom"
       }
     },
+    {
+      "path": "pages/safeProduction/emergencyPlanReview/detail",
+      "style": {
+        "navigationBarTitleText": "搴旀�ラ妗堣鎯�",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/safeProduction/emergencyPlanReview/view",
+      "style": {
+        "navigationBarTitleText": "搴旀�ラ妗堣鎯�",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/safeProduction/safetyTrainingAssessment/index",
+      "style": {
+        "navigationBarTitleText": "瀹夊叏鍩硅鑰冩牳",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/safeProduction/safetyTrainingAssessment/detail",
+      "style": {
+        "navigationBarTitleText": "鍩硅璇︽儏",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/safeProduction/safetyTrainingAssessment/view",
+      "style": {
+        "navigationBarTitleText": "鍩硅璇︽儏",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/safeProduction/safetyTrainingAssessment/fileList",
+      "style": {
+        "navigationBarTitleText": "鍩硅闄勪欢",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/safeProduction/safetyTrainingAssessment/resultDetail",
+      "style": {
+        "navigationBarTitleText": "缁撴灉鏄庣粏",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/safeProduction/safetyTrainingAssessment/record",
+      "style": {
+        "navigationBarTitleText": "鍩硅璁板綍",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/humanResources/attendance/checkin",
+      "style": {
+        "navigationBarTitleText": "鎵撳崱绛惧埌",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "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/message",
+      "style": {
+        "navigationBarTitleText": "娑堟伅涓績"
+      }
+    }
   ],
   "subPackages": [
     {
@@ -991,6 +1102,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",

--
Gitblit v1.9.3