From 585fb0bbd4a7bc7f8f333ecba7c5fecd2ee5cbc2 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 09:46:44 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop

---
 src/views/eam/modules/dailyInspectionStandard/EquipmentList.vue |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/views/eam/modules/dailyInspectionStandard/EquipmentList.vue b/src/views/eam/modules/dailyInspectionStandard/EquipmentList.vue
index 388740a..0c3a096 100644
--- a/src/views/eam/modules/dailyInspectionStandard/EquipmentList.vue
+++ b/src/views/eam/modules/dailyInspectionStandard/EquipmentList.vue
@@ -21,11 +21,11 @@
                 :md="6"
                 :sm="8"
               >
-                <a-form-item label="璁惧缂栧彿">
-                  <j-input
-                    placeholder="璇疯緭鍏ユ爣鍑嗙紪鍙锋绱�"
+                <a-form-item label="缁熶竴缂栫爜">
+                  <a-input
+                    placeholder="璇疯緭鍏ョ粺涓�缂栫爜妫�绱�"
                     v-model="queryParam.num"
-                  ></j-input>
+                  ></a-input>
                 </a-form-item>
               </a-col>
 
@@ -34,10 +34,10 @@
                 :sm="8"
               >
                 <a-form-item label="璁惧鍚嶇О">
-                  <j-input
+                  <a-input
                     placeholder="璇疯緭鍏ヨ澶囧悕绉版绱�"
                     v-model="queryParam.name"
-                  ></j-input>
+                  ></a-input>
                 </a-form-item>
               </a-col>
               <a-col
@@ -144,7 +144,7 @@
           }
         },
         {
-          title: '璁惧缂栫爜',
+          title: '缁熶竴缂栫爜',
           align: 'center',
           dataIndex: 'num',
         },
@@ -170,7 +170,7 @@
         },
       ],
       url: {
-        list: "/eam/equipment/getEquipmentList",
+        list: "/eam/equipment/showEquipmentList",
       },
     }
   },

--
Gitblit v1.9.3