From 4795bfb6f68d4fe0b2b24d8d5e511c505039918f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B2=88=E9=B8=BF?= <shenhongkm@163.com>
Date: Tue, 17 Jun 2025 09:43:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B6=E5=AE=83=E6=8A=95=E5=85=A5=E5=93=81?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=88=86=E7=B1=BB=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main/.env.development                         |  6 ++---
 .../.env.development                          |  6 ++---
 .../material/others/index.vue                 | 26 ++++++++++++++++---
 3 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/main/.env.development b/main/.env.development
index 7729b29..e4c3565 100644
--- a/main/.env.development
+++ b/main/.env.development
@@ -13,9 +13,9 @@ VITE_APP_SUB_GSR = '//localhost:9530/new-digital-agriculture-screen/'
 VITE_APP_BASE_API = '/apis' 
 VITE_APP_UPLOAD_API = '/uploadApis'
 # 阿里云接口地址
-VITE_APP_BASE_URL = 'http://47.109.205.240:8080'
-VITE_APP_UPLOAD_URL = 'http://47.109.205.240:9300'
+# VITE_APP_BASE_URL = 'http://47.109.205.240:8080'
+# VITE_APP_UPLOAD_URL = 'http://47.109.205.240:9300'
 # 内网接口地址
-# VITE_APP_BASE_URL = 'http://192.168.18.99:8080'
+VITE_APP_BASE_URL = 'http://192.168.18.99:8080'
 # VITE_APP_UPLOAD_URL = 'http://192.168.18.99:8080'
 # VITE_APP_VIST_URL = 'http://192.168.18.99'
diff --git a/sub-government-affairs-service/.env.development b/sub-government-affairs-service/.env.development
index 7829228..93c9ebe 100644
--- a/sub-government-affairs-service/.env.development
+++ b/sub-government-affairs-service/.env.development
@@ -9,11 +9,11 @@ VITE_APP_BASE_API = '/apis'
 VITE_APP_UPLOAD_API = '/uploadApis'
 
 # 阿里云接口地址
-VITE_APP_BASE_URL = 'http://47.109.205.240:8080'
-VITE_APP_UPLOAD_URL = 'http://47.109.205.240:9204'
+# VITE_APP_BASE_URL = 'http://47.109.205.240:8080'
+# VITE_APP_UPLOAD_URL = 'http://47.109.205.240:9204'
 
 # 内网测试库接口地址
-# VITE_APP_BASE_URL = 'http://192.168.18.99:8080'
+VITE_APP_BASE_URL = 'http://192.168.18.99:8080'
 
 # 本地开发接口地址
 # VITE_APP_BASE_URL = 'http://192.168.18.74:8080'
diff --git a/sub-government-affairs-service/src/views/inputSuppliesManage/material/others/index.vue b/sub-government-affairs-service/src/views/inputSuppliesManage/material/others/index.vue
index fc5fb58..abe4eb5 100644
--- a/sub-government-affairs-service/src/views/inputSuppliesManage/material/others/index.vue
+++ b/sub-government-affairs-service/src/views/inputSuppliesManage/material/others/index.vue
@@ -9,6 +9,14 @@
           <el-button type="primary" @click="searchData">搜索</el-button>
           <el-button @click="resetSearch">重置</el-button>
         </div>
+        <div class="search-tabs">
+          <el-tabs v-model="activeTab" @tab-click="handleTabChange">
+            <el-tab-pane label="全部" name="all" />
+            <el-tab-pane label="地膜" name="地膜" />
+            <el-tab-pane label="滴灌带" name="滴灌带" />
+            <el-tab-pane label="防草布" name="防草布" />
+          </el-tabs>
+        </div>
       </template>
       <template #menu-left><el-button type="primary" icon="Plus" @click="openDialog">新增</el-button></template>
       <template #menu="scope">
@@ -34,8 +42,8 @@
       </el-form>
       <template #footer>
         <span class="dialog-footer custom-footer">
-          <el-button @click="dialogVisible = false" class="custom-button">取消</el-button>
-          <el-button type="primary" @click="submitForm" class="custom-button">确定</el-button>
+          <el-button class="custom-button" @click="dialogVisible = false">取消</el-button>
+          <el-button type="primary" class="custom-button" @click="submitForm">确定</el-button>
         </span>
       </template>
     </el-dialog>
@@ -93,6 +101,7 @@ const searchForm = reactive({
 
 // avue-crud 实例引用
 const crudRef = ref(null);
+const activeTab = ref('all');
 
 // 表格数据
 const tableData = ref([...initialTableData]);
@@ -142,7 +151,18 @@ const options = reactive({
     },
   ],
 });
-
+const handleTabChange = (tab) => {
+  if (tab.props.name === 'all') {
+    // 显示全部数据
+    tableData.value = [...initialTableData];
+  } else {
+    // 根据标签名称过滤数据
+    tableData.value = initialTableData.filter((item) => item.name.includes(tab.props.name) || item.remark.includes(tab.props.name));
+  }
+  // 重置分页
+  pagination.currentPage = 1;
+  pagination.total = tableData.value.length;
+};
 // 弹窗相关
 const dialogVisible = ref(false);
 const isEdit = ref(false);