From 6ded2ee6a9d9097d45f8f79a7e6429cf55ed7cc3 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 07 三月 2025 16:59:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 screen/src/views/LogisticsCenter.vue |   26 +++++++++++++++++++++++++-
 1 files changed, 25 insertions(+), 1 deletions(-)

diff --git a/screen/src/views/LogisticsCenter.vue b/screen/src/views/LogisticsCenter.vue
index 917161d..b124849 100644
--- a/screen/src/views/LogisticsCenter.vue
+++ b/screen/src/views/LogisticsCenter.vue
@@ -816,6 +816,29 @@
         borderColor: '#fff'
       },
     },
+    dataZoom: [
+      {
+        type: 'slider', // 婊戝姩鏉$被鍨�
+        orient: 'vertical',
+        left: 'left',
+        start: 0,       // 璧峰浣嶇疆锛堢櫨鍒嗘瘮锛�
+        end: 40,        // 缁撴潫浣嶇疆锛堢櫨鍒嗘瘮锛夛紝鎺у埗鍒濆鏄剧ず鑼冨洿
+        width: 10,
+        // backgroundColor: '#04141e', // 婊戝姩鏉¤儗鏅壊
+        // fillerColor: 'rgba(0, 0, 0, 0.2)', // 閫変腑鍖哄煙棰滆壊锛屾棤闃村奖
+        borderColor: '#04141e', // 杈规棰滆壊
+        // showDetail: false, // 闅愯棌閫変腑鑼冨洿鐨勬枃瀛�
+      },
+      {
+        type: 'inside',     // 鐢ㄤ簬鐩戝惉婊氳疆浜嬩欢
+        orient: 'vertical',
+        start: 0,
+        end: 40,
+        zoomLock: true,     // 閿佸畾缂╂斁锛堜粎鍏佽骞崇Щ锛�
+        moveOnMouseWheel: true, // 鍚敤婊氳疆骞崇Щ
+        zoomOnMouseWheel: false // 绂佺敤婊氳疆缂╂斁
+      }
+    ],
     grid: {
       left: '3%',
       right: '4%',
@@ -1010,7 +1033,8 @@
   showModal.value = true
   kzorderInfo({ contractNumber: item.contractNumber }).then(res => {
     modalInfo.value = res.data
-    const apiKey = 'd9a554b1808ce10a12a932ed9b0db1d0'
+    // const apiKey = 'd9a554b1808ce10a12a932ed9b0db1d0'
+    const apiKey = '3916a7b434e7f13ae1a0af64e88ec0a3'
     if (modalInfo.value.gisList && modalInfo.value.gisList.length > 0) {
       const gisInfo = modalInfo.value.gisList[0]
       if (gisInfo && gisInfo.gisList && gisInfo.gisList.length > 0) {

--
Gitblit v1.9.3