From 964289356d0e793470a104219a19ca26bd148a3f Mon Sep 17 00:00:00 2001
From: luoyuehang <2830398107@qq.com>
Date: Sun, 4 Jan 2026 11:39:38 +0800
Subject: [PATCH] =?UTF-8?q?app1\2=20=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app2/src/views/StudentLoginPage.vue       |  6 +-
 .../zzz/src/views/InspectionPage.vue          |  1 -
 .../zzz/src/views/WaterMakerList.vue          | 48 +++++++++++++--
 .../zzz/src/views/WaterSupplierList.vue       | 58 +++++++++++++++++--
 4 files changed, 99 insertions(+), 14 deletions(-)

diff --git a/src/main/resources/app2/src/views/StudentLoginPage.vue b/src/main/resources/app2/src/views/StudentLoginPage.vue
index 664407e..a62eb9b 100644
--- a/src/main/resources/app2/src/views/StudentLoginPage.vue
+++ b/src/main/resources/app2/src/views/StudentLoginPage.vue
@@ -16,12 +16,12 @@
         </div>
 
         <div class="form-group">
-          <label for="studentId">学号</label>
+          <label for="studentId">姓名</label>
           <input
               type="text"
               id="studentId"
               v-model="loginForm.studentId"
-              placeholder="请输入学号"
+              placeholder="请输入姓名"
               @keyup.enter="handleLogin"
           />
         </div>
@@ -280,7 +280,7 @@ const showConfirmPassword = ref(false)
 // 表单验证规则
 const validateLogin = () => {
   if (!loginForm.studentId.trim()) {
-    alert('请输入学号')
+    alert('请输入姓名')
     return false
   }
   if (!loginForm.password) {
diff --git a/src/main/resources/zzz/src/views/InspectionPage.vue b/src/main/resources/zzz/src/views/InspectionPage.vue
index cba85a3..f56afed 100644
--- a/src/main/resources/zzz/src/views/InspectionPage.vue
+++ b/src/main/resources/zzz/src/views/InspectionPage.vue
@@ -19,7 +19,6 @@
         <div class="area-card">
           <div class="area-info">
             <div class="area-name">岳麓片区</div>
-            <div class="area-details">5所学校 · 12台制水机</div>
           </div>
           <div class="area-divider"></div>
           <button class="view-btn" @click="viewYueluArea">查看</button>
diff --git a/src/main/resources/zzz/src/views/WaterMakerList.vue b/src/main/resources/zzz/src/views/WaterMakerList.vue
index 84ed641..8df0844 100644
--- a/src/main/resources/zzz/src/views/WaterMakerList.vue
+++ b/src/main/resources/zzz/src/views/WaterMakerList.vue
@@ -53,7 +53,7 @@
                 <button class="action-btn detail" @click="viewDeviceDetail(device.id)">
                   详情
                 </button>
-                <button class="action-btn inspect" @click="viewWaterSupplier(device.id)">
+                <button class="action-btn inspect" @click="viewRelatedWaterSuppliers(device)">
                   查看供水机
                 </button>
               </div>
@@ -77,6 +77,7 @@
 import { ref, onMounted, computed } from 'vue'
 import { useRouter } from 'vue-router'
 import { deviceService } from '@/services/deviceService'
+import api from '@/services/api'
 import { useAuthStore } from '@/stores/auth'
 
 const router = useRouter()
@@ -131,7 +132,44 @@ const fetchWaterMakers = async () => {
   }
 }
 
-// 导航函数（保持不变）
+// 新增：获取制水机关联的供水机
+const fetchRelatedWaterSuppliers = async (makerId) => {
+  try {
+    loading.value = true
+    // 调用后端接口获取制水机关联的供水机列表
+    const response = await api.get(`/api/web/device/maker/${makerId}/suppliers`)
+
+    if (response.data.code === 200) {
+      const relatedSuppliers = response.data.data || []
+
+      // 如果没有关联的供水机，显示提示
+      if (relatedSuppliers.length === 0) {
+        alert('该制水机暂未关联供水机')
+        return
+      }
+
+      // 如果有关联的供水机，跳转到供水机列表页面并传递关联的供水机ID数组
+      const supplierIds = relatedSuppliers.map(supplier => supplier.deviceId)
+      router.push({
+        path: '/inspection/water-supplier',
+        query: {
+          makerId: makerId,
+          relatedSuppliers: JSON.stringify(supplierIds),
+          fromMaker: true // 标记来自制水机页面
+        }
+      })
+    } else {
+      error.value = response.data.message
+    }
+  } catch (err) {
+    console.error('获取关联供水机失败:', err)
+    alert('获取关联供水机失败，请稍后重试')
+  } finally {
+    loading.value = false
+  }
+}
+
+// 导航函数
 const goBack = () => {
   router.back()
 }
@@ -156,9 +194,9 @@ const viewDeviceDetail = (deviceId) => {
   router.push(`/inspection/water-maker/${deviceId}`)
 }
 
-const viewWaterSupplier = (deviceId) => {
-  // 传递制水机ID参数
-  router.push(`/inspection/water-supplier?makerId=${deviceId}`)
+// 修改：查看制水机关联的供水机
+const viewRelatedWaterSuppliers = (device) => {
+  fetchRelatedWaterSuppliers(device.id)
 }
 
 // 组件挂载时获取数据
diff --git a/src/main/resources/zzz/src/views/WaterSupplierList.vue b/src/main/resources/zzz/src/views/WaterSupplierList.vue
index e488afe..2b8275f 100644
--- a/src/main/resources/zzz/src/views/WaterSupplierList.vue
+++ b/src/main/resources/zzz/src/views/WaterSupplierList.vue
@@ -1,11 +1,13 @@
 <template>
   <div class="water-supplier-list">
-    <!-- 顶部标题栏 -->
+    <!-- 顶部标题栏 - 添加返回按钮和制水机名称显示 -->
     <div class="header">
       <div class="header-left">
         <span class="back-btn" @click="goBack">返回</span>
       </div>
-      <div class="header-title">设备巡检</div>
+      <div class="header-title">
+        {{ fromMaker ? `制水机#${makerId}的供水机` : '设备巡检' }}
+      </div>
       <div class="header-right">
         <span class="nav-text">供水机</span>
       </div>
@@ -28,7 +30,9 @@
 
       <!-- 正常状态 -->
       <div v-else class="device-list">
-        <div v-for="device in deviceList" :key="device.id" class="device-item">
+
+
+        <div v-for="device in filteredDeviceList" :key="device.id" class="device-item">
           <div class="device-info">
             <div class="device-name">{{ device.name }}</div>
             <div class="device-location">{{ device.location }}</div>
@@ -48,6 +52,11 @@
             </button>
           </div>
         </div>
+
+        <!-- 没有供水机时的提示 -->
+        <div v-if="fromMaker && filteredDeviceList.length === 0" class="empty-tip">
+          该制水机暂未关联任何供水机
+        </div>
       </div>
     </div>
 
@@ -62,19 +71,26 @@
 </template>
 
 <script setup>
-import { ref, onMounted } from 'vue'
-import { useRouter } from 'vue-router'
+import { ref, onMounted, computed } from 'vue'
+import { useRouter, useRoute } from 'vue-router'
 import { deviceService } from '@/services/deviceService'
 import { useAuthStore } from '@/stores/auth'
 
 const router = useRouter()
+const route = useRoute()
 const authStore = useAuthStore()
 
 // 设备数据
 const deviceList = ref([])
+const filteredDeviceList = ref([])
 const loading = ref(true)
 const error = ref(null)
 
+// 路由参数
+const makerId = ref(route.query.makerId || '')
+const relatedSuppliers = ref([])
+const fromMaker = ref(route.query.fromMaker === 'true')
+
 // 获取供水机列表
 const fetchWaterSuppliers = async () => {
   try {
@@ -94,6 +110,21 @@ const fetchWaterSuppliers = async () => {
         storageCapacity: device.storageCapacity || 0,
         areaId: device.areaId
       }))
+
+      // 如果是从制水机页面跳转过来，过滤关联的供水机
+      if (fromMaker.value && route.query.relatedSuppliers) {
+        try {
+          relatedSuppliers.value = JSON.parse(route.query.relatedSuppliers)
+          filteredDeviceList.value = deviceList.value.filter(device =>
+            relatedSuppliers.value.includes(device.id)
+          )
+        } catch (e) {
+          console.error('解析关联供水机参数失败:', e)
+          filteredDeviceList.value = deviceList.value
+        }
+      } else {
+        filteredDeviceList.value = deviceList.value
+      }
     } else {
       error.value = response.message
     }
@@ -412,4 +443,21 @@ onMounted(() => {
   color: #999;
   margin-top: 4px;
 }
+
+.related-tip {
+  background: #e6f7ff;
+  border: 1px solid #91d5ff;
+  border-radius: 4px;
+  padding: 10px 16px;
+  margin-bottom: 16px;
+  color: #1890ff;
+  font-size: 14px;
+}
+
+.empty-tip {
+  text-align: center;
+  padding: 40px;
+  color: #999;
+  font-size: 16px;
+}
 </style>
-- 
2.34.1