From 79e97ce31b6826ce687809b0875d469b4cd379d9 Mon Sep 17 00:00:00 2001
From: zxy <zhouxy1921@11.com>
Date: Mon, 13 Apr 2026 17:23:14 +0800
Subject: [PATCH] =?UTF-8?q?fix(equipment):=20=E4=BF=AE=E5=A4=8D=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=92=8C=E5=8A=9F=E8=83=BD=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../model/equipment/EquipmentPagination.java  |  2 +-
 .../src/views/example/equipment/index.vue     | 37 ++++++++++---------
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/equipment/EquipmentPagination.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/equipment/EquipmentPagination.java
index cd5904e..3cfe2a4 100644
--- a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/equipment/EquipmentPagination.java
+++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/equipment/EquipmentPagination.java
@@ -32,7 +32,7 @@ public class EquipmentPagination extends Pagination {
     private String eqStatus;
 
     @Schema(description = "责任部门id")
-    private Integer deptId;
+    private String deptId;
 
     @Schema(description = "产线id")
     private Integer lineId;
diff --git a/jnpf-java-boot/jnpf-web/src/views/example/equipment/index.vue b/jnpf-java-boot/jnpf-web/src/views/example/equipment/index.vue
index 7ecbe8b..61163bb 100644
--- a/jnpf-java-boot/jnpf-web/src/views/example/equipment/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/example/equipment/index.vue
@@ -38,24 +38,24 @@
                 <el-option
                   v-for="item in deptList"
                   :key="item.id"
-                  :label="item.fullName"
-                  :value="item.id">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="所属产线">
-              <el-select v-model="query.lineId" placeholder="请选择产线" clearable>
-                <el-option
-                  v-for="item in lineList"
-                  :key="item.id"
                   :label="item.name"
                   :value="item.id">
                 </el-option>
               </el-select>
             </el-form-item>
           </el-col>
+<!--          <el-col :span="6">-->
+<!--            <el-form-item label="所属产线">-->
+<!--              <el-select v-model="query.lineId" placeholder="请选择产线" clearable>-->
+<!--                <el-option-->
+<!--                  v-for="item in lineList"-->
+<!--                  :key="item.id"-->
+<!--                  :label="item.name"-->
+<!--                  :value="item.id">-->
+<!--                </el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
           <el-col :span="6">
             <el-form-item class="btn">
               <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
@@ -77,6 +77,7 @@
           :data="list"
           @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="50" align="center"/>
+          <el-table-column prop="deptName" label="所属部门" align="center" min-width="100"/>
           <el-table-column prop="eqCode" label="设备编码" align="center" min-width="120"/>
           <el-table-column prop="eqName" label="设备名称" align="center" min-width="120"/>
           <el-table-column prop="eqType" label="设备类型" align="center" min-width="100">
@@ -87,7 +88,6 @@
           <el-table-column prop="mode" label="型号" align="center" min-width="100"/>
           <el-table-column prop="manufacturer" label="生产厂家" align="center" min-width="120"/>
           <el-table-column prop="supplier" label="供应商" align="center" min-width="120"/>
-          <el-table-column prop="deptName" label="所属部门" align="center" min-width="100"/>
           <el-table-column prop="userName" label="责任人" align="center" min-width="80"/>
           <el-table-column prop="lineName" label="所属产线" align="center" min-width="100"/>
           <el-table-column prop="buyDate" label="购买日期" align="center" min-width="100" :formatter="jnpf.tableDateFormat1"/>
@@ -122,6 +122,7 @@
 
 <script>
 import {customerOptions, deleteEquipment, getEquipmentList, getLabel, getLineList} from "./equipment";
+import {getDataInterfaceRes} from "@/api/systemData/dataInterface";
 import {mapGetters} from "vuex";
 import JNPFForm from "./form";
 import jnpf from "@/utils/jnpf";
@@ -206,10 +207,12 @@ export default {
       this.multipleSelection = val;
     },
     getDeptList() {
-      // TODO: 需要添加对应的 API 方法
-      // getDeptList().then(res => {
-      //   this.deptList = res.data || [];
-      // });
+      getDataInterfaceRes('811583643129479301').then(res => {
+        this.deptList = res.data || [];
+        console.log(this.deptList);
+      }).catch(() => {
+        this.deptList = [];
+      });
     },
     getLineList() {
       getLineList().then(res => {