From f5ab83dfad01c87828232af8cd18c676e69fd917 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 21 五月 2025 09:14:11 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

---
 admin/src/views/index.vue |   70 +++++++++++++++++++++++++++++++----
 1 files changed, 62 insertions(+), 8 deletions(-)

diff --git a/admin/src/views/index.vue b/admin/src/views/index.vue
index 865605b..6ea8f86 100644
--- a/admin/src/views/index.vue
+++ b/admin/src/views/index.vue
@@ -102,8 +102,8 @@
               <div class="header">
 <!--                <div class="home_title">闀挎湡鐩稿叧鏂瑰垎甯�</div>-->
                 <el-radio-group v-model="tabPosition" @change="changeType">
-                  <el-radio-button label="top">闀挎湡鐩稿叧鏂瑰垎甯�</el-radio-button>
                   <el-radio-button label="right">鍐呴儴浜哄憳鍒嗗竷</el-radio-button>
+                  <el-radio-button label="top">闀挎湡鐩稿叧鏂瑰垎甯�</el-radio-button>
                 </el-radio-group>
                 <!-- <div class="df_ac more">
                   鏇村<i class="el-icon-arrow-right"></i>
@@ -230,7 +230,7 @@
   },
   data () {
     return {
-      tabPosition: 'top',
+      tabPosition: 'right',
       colors,
       nowDate: '',
       nowWeek: '',
@@ -246,7 +246,7 @@
         { name: '闅愭偅闅忔墜鎷�', path: '', url: require('@/assets/icons/home_func2.png'), path: '/operation/danger/record' },
         { name: '棰勭害浼氳瀹�', path: '', url: require('@/assets/icons/home_func3.png'), path: '/meeting/bookings' },
         { name: '鑰冨嫟宸ヤ綔鍙�', path: '', url: require('@/assets/icons/home_func4.png') },
-        { name: '椋熷爞娑堣垂鍏ュ彛', path: '', url: require('@/assets/icons/8.png') }
+        { name: '椋熷爞娑堣垂', path: '', url: require('@/assets/icons/8.png') }
       ],
       isShowDetail: false,
       isShowReport: false,
@@ -359,11 +359,13 @@
         getAppHeaderNav(4).then(res => {
           window.open(res, '_blank')
         })
+        return
       }
-      if (item.name == '椋熷爞娑堣垂鍏ュ彛') {
+      if (item.name == '椋熷爞娑堣垂') {
         getAppHeaderNav(6).then(res => {
           window.open(res, '_blank')
         })
+        return
       }
       this.$router.push(item.path)
     },
@@ -511,6 +513,34 @@
       const myChart = echarts.init(document.getElementById('echart2'))
       const that = this
       myChart.setOption({
+        dataZoom: [
+          {
+            type: 'slider', // 婊戝姩鏉＄被鍨�
+            orient: 'vertical',
+            left: 'left',
+            start: 0,       // 璧峰浣嶇疆锛堢櫨鍒嗘瘮锛�
+            end: 40,        // 缁撴潫浣嶇疆锛堢櫨鍒嗘瘮锛夛紝鎺у埗鍒濆鏄剧ず鑼冨洿
+            width: 4,
+            dataBackground: {
+              areaStyle: { opacity: 0 }, // 璁剧疆鑳屾櫙閫忔槑
+              lineStyle: { opacity: 0 } // 璁剧疆鑳屾櫙閫忔槑
+            },
+            moveOnMouseWheel: true,
+          },
+          {
+            type: 'inside',     // 鐢ㄤ簬鐩戝惉婊氳疆浜嬩欢
+            orient: 'vertical',
+            start: 0,
+            end: 40,
+            minSpan: 40,
+            dataBackground: {
+              areaStyle: { opacity: 0 } // 璁剧疆鑳屾櫙閫忔槑
+            },
+            maxSpan: 40,
+            zoomLock: true,     // 閿佸畾缂╂斁锛堜粎鍏佽骞崇Щ锛�
+            moveOnMouseWheel: true, // 鍚敤婊氳疆骞崇Щ
+          }
+        ],
         grid: {
           top: '4%',
           left: '2%',
@@ -533,7 +563,15 @@
               // 杩欓噷杈撳叆绾挎潯鐨勬牱寮�
               color: 'rgba(255,255,255,0.14)'
             }
-          }
+          },
+          axisLabel: {
+            formatter: function(value) {
+              const intValue = Math.round(value);
+              return intValue > 0 ? intValue : '';
+            }
+          },
+          minInterval: 1,
+          min: 1
         },
         yAxis: {
           type: 'category',
@@ -596,6 +634,14 @@
           nameTextStyle: {
             padding: [0, 0, 4, -30] // 鍥涗釜鏁板瓧鍒嗗埆涓轰笂鍙充笅宸︿笌鍘熶綅缃窛绂�
           },
+          axisLabel: {
+            formatter: function(value) {
+              const intValue = Math.round(value);
+              return intValue > 0 ? intValue : '';
+            }
+          },
+          minInterval: 1,
+          min: 1,
           splitLine: {
             show: true,
             lineStyle: {
@@ -678,7 +724,7 @@
             <div>${params[0].name}</div>
             <div style="display: flex;align-items: center;">
               <div style="width: 10px;height: 10px;border-radius: 50%;background-color: #6feef0;"></div>
-              <span style="margin-left: 6px;">${params[0].value}</span>
+              <span style="margin-left: 6px;">${params[0].value || 0}</span>
               <div>杈�</div>
             </div>
           </div>
@@ -702,7 +748,15 @@
               // 杩欓噷杈撳叆绾挎潯鐨勬牱寮�
               color: 'rgba(255,255,255,0.14)'
             }
-          }
+          },
+          axisLabel: {
+            formatter: function(value) {
+              const intValue = Math.round(value);
+              return intValue > 0 ? intValue : '';
+            }
+          },  
+          minInterval: 1,
+          min: 1
         },
         grid: {
           top: '16%',
@@ -1128,7 +1182,7 @@
   width: 100%;
   height: 100%;
   overflow: auto;
-  padding: 20px;
+  padding: 20px 20px 40px 20px;
   padding-top: 92px;
 
   .home_header {

--
Gitblit v1.9.3