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

---
 src/pages/index.vue |   84 +++++++++++++++++++++++++++++++-----------
 1 files changed, 62 insertions(+), 22 deletions(-)

diff --git a/src/pages/index.vue b/src/pages/index.vue
index 8a6647f..dcda116 100644
--- a/src/pages/index.vue
+++ b/src/pages/index.vue
@@ -1,24 +1,24 @@
 <template>
   <view class="content">
-    <view class="header-section">
-      <view class="currentFactory">
-        <up-text type="primary"
-                 :text="userStore.currentFactoryName"
-                 @click="show = true"
-                 size="18"
-                 class="factoryName"
-                 suffixIcon="arrow-right"
-                 :iconStyle="iconStyle"></up-text>
-      </view>
-      <up-picker :show="show"
-                 :columns="factoryList"
-                 @confirm="changeFactory"
-                 @cancel="show = false"></up-picker>
-    </view>
+<!--    <view class="header-section">-->
+<!--      <view class="currentFactory">-->
+<!--        <up-text type="primary"-->
+<!--                 :text="userStore.currentFactoryName"-->
+<!--                 @click="show = true"-->
+<!--                 size="18"-->
+<!--                 class="factoryName"-->
+<!--                 suffixIcon="arrow-right"-->
+<!--                 :iconStyle="iconStyle"></up-text>-->
+<!--      </view>-->
+<!--      <up-picker :show="show"-->
+<!--                 :columns="factoryList"-->
+<!--                 @confirm="changeFactory"-->
+<!--                 @cancel="show = false"></up-picker>-->
+<!--    </view>-->
     <view class="hero-section">
       <view class="bg-img">
         <view class="hero-content">
-          <text class="hero-title">鍐涙嘲浼熶笟</text>
+<!--          <text class="hero-title">鍐涙嘲浼熶笟</text>-->
         </view>
         <view class="hero-wave"></view>
       </view>
@@ -96,6 +96,30 @@
         <up-grid :border="false"
                  col="4">
           <up-grid-item v-for="(item, index) in collaborationItems"
+                        :key="index"
+                        @click="handleCommonItemClick(item)">
+            <view class="icon-container"
+                  :style="{ background: item.bgColor }">
+              <up-icon :name="item.icon"
+                       :size="58"
+                       color="#ffffff"></up-icon>
+            </view>
+            <text class="item-label">{{item.label}}</text>
+          </up-grid-item>
+        </up-grid>
+      </view>
+    </view>
+    <!-- 瀹夊叏鐢熶骇妯″潡 -->
+    <view class="common-module collaboration-module">
+      <view class="module-header">
+        <view class="module-title-container">
+          <text class="module-title">瀹夊叏鐢熶骇</text>
+        </view>
+      </view>
+      <view class="module-content">
+        <up-grid :border="false"
+                 col="4">
+          <up-grid-item v-for="(item, index) in safetyItems"
                         :key="index"
                         @click="handleCommonItemClick(item)">
             <view class="icon-container"
@@ -196,8 +220,7 @@
   import modal from "@/plugins/modal";
   import useUserStore from "@/store/modules/user";
 
-  const userStore = useUserStore();
-  const factoryId = ref("");
+  const userStore = useUserStore();;
   const show = ref(false);
   const factoryList = ref([]);
   const factoryListTem = ref([]);
@@ -275,7 +298,16 @@
       label: "渚涘簲鍟嗗線鏉�",
     },
   ]);
-
+  const safetyItems = reactive([
+    {
+      icon: "/static/images/icon/caigoutaizhang@2x.png",
+      label: "瑙勭▼璧勮川",
+    },
+    {
+      icon: "/static/images/icon/caigoutaizhang@2x.png",
+      label: "鍗遍櫓婧愮鐞�",
+    },
+  ]);
   // 鍗忓悓鍔炲叕鍔熻兘鏁版嵁
   const collaborationItems = reactive([
     {
@@ -637,6 +669,16 @@
           url: "/pages/equipmentManagement/verification/index",
         });
         break;
+      case "瑙勭▼璧勮川":
+        uni.navigateTo({
+          url: "/pages/safeProduction/safeQualifications/index",
+        });
+        break;
+      case "鍗遍櫓婧愮鐞�":
+        uni.navigateTo({
+          url: "/pages/safeProduction/hazardSourceLedger/index",
+        });
+        break;
       default:
         uni.showToast({
           title: `鐐瑰嚮浜�${item.label}`,
@@ -657,8 +699,7 @@
           factoryListTem.value = res.data;
           res.data.forEach(item => {
             factoryList.value[0].push(item.deptName);
-          });
-          factoryId.value = userStore.currentDeptId;
+          })
         } else {
           // 濡傛灉res.data涓嶆槸鏁扮粍锛岃缃负绌烘暟缁�
           factoryList.value = [];
@@ -761,7 +802,6 @@
     const loginForm = {
       username: userStore.name,
       password: uni.getStorageSync("remembered_password"),
-      factoryId: factoryId,
     };
     modal.loading("鍒锋柊涓紝璇疯�愬績绛夊緟...");
     userStore

--
Gitblit v1.9.3