From e987a2b603b24f0b79119ca154f3fed9fd1eaff7 Mon Sep 17 00:00:00 2001
From: wangchengming <15110151257@163.com>
Date: Sun, 20 Jul 2025 13:50:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/databaseLibary/components/card.vue       | 7 ++++---
 src/views/databaseLibary/components/libaryForm.vue | 4 ++--
 src/views/databaseLibary/components/list.vue       | 4 ++--
 src/views/databaseLibary/index.vue                 | 6 +++---
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/views/databaseLibary/components/card.vue b/src/views/databaseLibary/components/card.vue
index 295698d..b423067 100644
--- a/src/views/databaseLibary/components/card.vue
+++ b/src/views/databaseLibary/components/card.vue
@@ -46,10 +46,11 @@ import deleteIcon from '@/assets/images/deleteIcon.png'
 import { getBusEncyclopediaDatabasePage } from "@/api/databaseLibary"
 
 const router = useRouter()
+const { proxy } = getCurrentInstance()
 const baseUrl = import.meta.env.VITE_APP_BASE_API
 const queryParams = ref({
     pageIndex: 1,
-    pageSize: 10,
+    pageSize: 15,
     category: undefined,
     categoryTwo: undefined,
     keyword: undefined
@@ -62,8 +63,9 @@ const getBusEncyclopediaDatabasePageList = () => {
     getBusEncyclopediaDatabasePage(queryParams.value).then(res => {
         console.log('查询结果', res)
         if (res.code == 200) {
-            if (res.data.list.length > 0) tableData.value = tableData.value.concat(res.data.list)
+            if (res.data.list.length > 0) tableData.value = res.data.list
             else {
+                tableData.value = res.data.list
                 queryParams.value.pageIndex = queryParams.value.pageIndex - 1
                 proxy.$modal.msgSuccess("没有更多了")
             }
@@ -83,7 +85,6 @@ const handleDetele = (recordId) => {
     proxy.$modal.confirm('是否确认删除该项数据项？').then(function () {
         return deleteBusEncyclopediaDatabase(recordId)
     }).then(() => {
-        tableData.value = []
         queryParams.value.pageIndex = 1
         getBusEncyclopediaDatabasePageList();
         proxy.$modal.msgSuccess("删除成功")
diff --git a/src/views/databaseLibary/components/libaryForm.vue b/src/views/databaseLibary/components/libaryForm.vue
index 05f0cde..f130238 100644
--- a/src/views/databaseLibary/components/libaryForm.vue
+++ b/src/views/databaseLibary/components/libaryForm.vue
@@ -34,8 +34,8 @@
                                     :label="item.label" :value="item.value" @change="handleChangeTwoType(item.value)" />
                                 <!-- 组织架构图 -->
                                 <el-checkbox v-if="ruleForm.category == '组织架构'" v-for="item in busDependencyData"
-                                    :label="item.dependencyName" :value="item.dependencyName"
-                                    @change="handleChangeTwoType(item.dependencyName)" />
+                                    :label="item.dependencyName" :value="item.id"
+                                    @change="handleChangeTwoType(item.id)" />
                                 <!-- 高压培训材料 -->
                                 <el-checkbox v-if="ruleForm.category == '高压培训材料'" v-for="item in training_materials"
                                     :label="item.label" :value="item.value" @change="handleChangeTwoType(item.value)" />
diff --git a/src/views/databaseLibary/components/list.vue b/src/views/databaseLibary/components/list.vue
index 3a8332a..d5913ff 100644
--- a/src/views/databaseLibary/components/list.vue
+++ b/src/views/databaseLibary/components/list.vue
@@ -65,8 +65,9 @@ const getBusEncyclopediaDatabasePageList = () => {
     getBusEncyclopediaDatabasePage(queryParams.value).then(res => {
         console.log('查询结果', res)
         if (res.code == 200) {
-            if (res.data.list.length > 0) tableData.value = tableData.value.concat(res.data.list)
+            if (res.data.list.length > 0) tableData.value = res.data.list
             else {
+                tableData.value = res.data.list
                 queryParams.value.pageIndex = queryParams.value.pageIndex - 1
                 proxy.$modal.msgSuccess("没有更多了")
             }
@@ -86,7 +87,6 @@ const handleDetele = (recordId) => {
     proxy.$modal.confirm('是否确认删除该项数据项？').then(function () {
         return deleteBusEncyclopediaDatabase(recordId)
     }).then(() => {
-        tableData.value = []
         queryParams.value.pageIndex = 1
         getBusEncyclopediaDatabasePageList();
         proxy.$modal.msgSuccess("删除成功")
diff --git a/src/views/databaseLibary/index.vue b/src/views/databaseLibary/index.vue
index 517f780..4400ae9 100644
--- a/src/views/databaseLibary/index.vue
+++ b/src/views/databaseLibary/index.vue
@@ -31,9 +31,9 @@
                                     @click="handleChoseTwoType(dict.value)"> {{ dict.label }} </el-button>
                                 <!-- 组织架构类型 -->
                                 <el-button v-if="activeOne == '组织架构'"
-                                    :class="activeTwo === dict.dependencyName ? 'activeOption' : 'right-item'"
-                                    v-for="dict in busDependencyData" :key="dict.dependencyName" link
-                                    @click="handleChoseTwoType(dict.dependencyName)"> {{ dict.dependencyName }}
+                                    :class="activeTwo === dict.id ? 'activeOption' : 'right-item'"
+                                    v-for="dict in busDependencyData" :key="dict.id" link
+                                    @click="handleChoseTwoType(dict.id)"> {{ dict.dependencyName }}
                                 </el-button>
                                 <!-- 高压培训材料类型 -->
                                 <el-button v-if="activeOne == '高压培训材料'"