From 139e9b269b454e789a51ba8df0bdd0f822f826dc Mon Sep 17 00:00:00 2001
From: wlikett <2331964395@qq.com>
Date: Thu, 7 Dec 2023 17:49:10 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/AppMain.vue      | 7 ++++++-
 src/views/equip/detail.vue | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/views/AppMain.vue b/src/views/AppMain.vue
index f6b8538..fbbcd6e 100644
--- a/src/views/AppMain.vue
+++ b/src/views/AppMain.vue
@@ -2,6 +2,9 @@
     import FooterInfo from '../components/FooterInfo/index.vue'
     import {useRouter} from "vue-router";
     import $bus from "@/utils/bus"
+    import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
+    const locale = zhCn
+
     const route = useRoute()
     const router = useRouter()
     // 判断是否是个人中心页面 如果是则隐藏页脚
@@ -112,7 +115,9 @@
     </div>
 
     <div class="container">
-        <RouterView />
+        <el-config-provider :locale="locale">
+            <RouterView />
+        </el-config-provider>
     </div>
     <FooterInfo v-if="isMyInfoPage()" />
     <!-- <FooterInfo /> -->
diff --git a/src/views/equip/detail.vue b/src/views/equip/detail.vue
index 51f90f1..cc38e7d 100644
--- a/src/views/equip/detail.vue
+++ b/src/views/equip/detail.vue
@@ -181,7 +181,7 @@
                         <el-col :span="12">
                             <el-form-item label="发票类型" prop="invoiceType">
                                 <el-radio-group v-model="ruleForm.invoiceType">
-                                    <el-radio-button :label="0">
+                                    <el-radio-button label="">
                                         不需要
                                     </el-radio-button>
                                     <el-radio-button :label="1">

From 32fcf1b9a11336a0b60170ecaeb562466f16a745 Mon Sep 17 00:00:00 2001
From: wlikett <2331964395@qq.com>
Date: Thu, 7 Dec 2023 17:49:27 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/equip/list.vue | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/views/equip/list.vue b/src/views/equip/list.vue
index 5f6ced4..0c203b3 100644
--- a/src/views/equip/list.vue
+++ b/src/views/equip/list.vue
@@ -57,7 +57,7 @@
             </div>
         </div>
 
-        <div class="showList">
+        <div class="showList" v-if="pageData.total > 0">
             <equip-card
                 class="card"
                 v-for="(v,i) in equipList"
@@ -71,8 +71,11 @@
                 time-unit="月"
                 @on-click="toDetail"></equip-card>
         </div>
+        <div class="noData" v-else>
+            <el-empty :image-size="200" />
+        </div>
 
-        <div class="pagination">
+        <div class="pagination" v-if="pageData.total > 0">
             <el-pagination
                     v-model:current-page="pageData.pageNum"
                     :page-size="pageData.pageSize"
@@ -416,8 +419,24 @@ const getData = async (text = '') => {
     const params = {
         keyWord: text,
         pageSize:pageData.pageSize,
-        pageNum:pageData.pageNum
+        pageNum:pageData.pageNum,
+        updateTimeOrderBy:'',
+        monthLeasePriceOrderBy:'',
+        typeId:'',
+        monthLeasePriceMin:0,
+        monthLeasePriceMax:'',
+        ageMin:'',
+        ageMax:'',
+        workingHoursMin:'',
+        workingHoursMax:''
     }
+
+    if(optionActive.value == '1'){
+
+    }else if(optionActive.value == '2'){
+
+    }
+
     const res = await getList(params)
     pageData.total = res.total
     equipList.value = res.rows
@@ -507,7 +526,7 @@ init()
             cursor: pointer;
             color: #939393;
             font-size: 15px;
-
+            line-height: 25px;
             &:hover {
               color: red;
             }