From eace8727da35a021125c78bcb8ea888f9fe05de9 Mon Sep 17 00:00:00 2001
From: xuhuajiao <13476289682@163.com>
Date: Thu, 21 Aug 2025 09:24:34 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/map/index.vue       |  2 +-
 src/views/mixins/index.js     |  8 ++++----
 src/views/pageFour/index.vue  |  4 +++-
 src/views/pageOne/index.vue   |  6 +-----
 src/views/pageThree/index.vue | 15 +++++++++++----
 5 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/src/views/map/index.vue b/src/views/map/index.vue
index 9b92da8..7114376 100644
--- a/src/views/map/index.vue
+++ b/src/views/map/index.vue
@@ -148,7 +148,7 @@ export default {
     }, { immediate: true })
   },
   activated() {
-    this.getLibBookTotal(this.activatedBaseSetting)
+    // this.getLibBookTotal(this.activatedBaseSetting)
     if (this.rankingData.length !== 0) {
       this.currentHover = -1
       this.rankInterval = setInterval(() => {
diff --git a/src/views/mixins/index.js b/src/views/mixins/index.js
index b36e129..7dac441 100644
--- a/src/views/mixins/index.js
+++ b/src/views/mixins/index.js
@@ -4,7 +4,7 @@ export const pageCrud = {
   // 组件共用属性
   data() {
     return {
-      headerTitle: '智慧大屏',
+      headerTitle: '数字智慧大屏',
       baseSetting: {},
       currentIndex: 0, // 当前显示的页面索引
       currentPage: null, // 当前显示的页面数据
@@ -74,9 +74,9 @@ export const pageCrud = {
     },
     getInitSetting() {
       // const linkSrc = process.env.NODE_ENV === 'production' ? window.g.ApiUrl : process.env.VUE_APP_BASE_API
-      // const doorCodes = this.$route.query.doorCodes
-      // console.log('doorCodes:', doorCodes)
-      FetchInitScreenData({ libcode: this.libcode }).then(res => {
+      const doorCodes = this.$route.query.doorCodes
+      console.log('doorCodes:', doorCodes)
+      FetchInitScreenData({ 'libcode': this.libcode, 'doorCodes': doorCodes || null }).then(res => {
         const result = res.data.settings
         this.baseSetting = res.data.settings
         this.welcomeData = res.data.screenWelcomePromotions
diff --git a/src/views/pageFour/index.vue b/src/views/pageFour/index.vue
index 8470f79..0024f4a 100644
--- a/src/views/pageFour/index.vue
+++ b/src/views/pageFour/index.vue
@@ -201,7 +201,9 @@ export default {
       // wecharQrCode 二维码 用/downloadFile/+wecharQrCode
       const linkSrc = process.env.NODE_ENV === 'production' ? window.g.ApiUrl : process.env.VUE_APP_BASE_API
       console.log('linkSrc', linkSrc)
-      FetchInitScreenData({ libcode: this.libcode }).then(res => {
+      const doorCodes = this.$route.query.doorCodes
+      console.log('doorCodes:', doorCodes)
+      FetchInitScreenData({ 'libcode': this.libcode, 'doorCodes': doorCodes || null }).then(res => {
         const result = res.data.settings
         // this.wecharQrCodeSrc = linkSrc + '/downloadFile' + result.wecharQrCode
         this.wecharQrCodeSrc = result.wechar_qr_code.context
diff --git a/src/views/pageOne/index.vue b/src/views/pageOne/index.vue
index 57be303..866fdf2 100644
--- a/src/views/pageOne/index.vue
+++ b/src/views/pageOne/index.vue
@@ -215,14 +215,11 @@ export default {
   watch: {
     baseSetting: {
       handler(result) {
-        // 首先检查result是否存在
         if (!result) return
 
-        // 检查每个属性是否存在，避免访问undefined的属性
         this.pageOneVisitBase = result.visit_base?.context || '0'
         this.wecharQrCodeSrc = result.wechar_qr_code?.context || ''
 
-        // 确保必要属性存在才执行初始化方法
         if (result.visit_base && result.wechar_qr_code) {
           this.initLeftPreview(result)
         }
@@ -273,8 +270,7 @@ export default {
       // iNotice 公告
       const linkSrc = process.env.NODE_ENV === 'production' ? window.g.ApiUrl : process.env.VUE_APP_BASE_API
       console.log('linkSrc', linkSrc)
-      // const doorCodes = this.$route.query.doorCodes
-      FetchInitScreenData({ libcode: this.libcode }).then(res => {
+      FetchInitScreenData({ 'libcode': this.libcode, 'doorCodes': doorCodes || null }).then(res => {
         const result = res.data.settings
         this.pageOneVisitBase = result.visit_base.context
         this.wecharQrCodeSrc = result.wechar_qr_code.context
diff --git a/src/views/pageThree/index.vue b/src/views/pageThree/index.vue
index 570adb8..8644d5e 100644
--- a/src/views/pageThree/index.vue
+++ b/src/views/pageThree/index.vue
@@ -193,7 +193,7 @@ export default {
   },
   activated() {
     // this.getLendingTotal(this.activatedBaseSetting)
-    this.getTodayJH()
+    // this.getTodayJH()
     this.isKeep = true
     // if (this.rankingYearWithPercentage.length !== 0) {
     //   this.currentHover = -1
@@ -271,12 +271,19 @@ export default {
     },
     // 分管显示内容
     getLibcodeDetails(data) {
-      FetchLibcodeDetails().then(res => {
-        const result = JSON.parse(res.data)
+      console.log('getLibcodeDetails:', data)
+      const params = {
+        'libcode': this.libcode
+      }
+      FetchLibcodeDetails(params).then(res => {
+        console.log('fff:', res)
+        // const result = JSON.parse(res.data)
+        const result = res.data
+        console.log('result:', result)
         if (result.length !== 0) {
           const newDataArray = []
           data.forEach(item => {
-            const foundItem = result.find(library => library.tcId === item.LIBCODE)
+            const foundItem = result.find(library => (library.branchType === 1 ? library.libcode : library.tcId) === item.LIBCODE)
 
             if (foundItem) {
               const yearValue = item.JCC_YEAR || 0