From 831cfa4c439c6d073d706a82d2a439f8b1818498 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 18 十一月 2025 16:59:50 +0800
Subject: [PATCH] Merge branch 'new' of http://www.beijingsoft.cn:9090/r/smart-web into new

---
 src/views/mdc/components/process-charts.vue |   20 +++++++++-----------
 1 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/views/mdc/components/process-charts.vue b/src/views/mdc/components/process-charts.vue
index 145050a..535daa5 100644
--- a/src/views/mdc/components/process-charts.vue
+++ b/src/views/mdc/components/process-charts.vue
@@ -1,11 +1,11 @@
 <!--
  * @Date: 2024-04-18 21:52:18
- * @LastEditors: Sneed
- * @LastEditTime: 2024-06-20 23:37:09
+ * @LastEditors: lzhe lzhe@example.com
+ * @LastEditTime: 2024-12-20 14:56:14
  * @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/components/TimeAlarm.vue
 -->
 <template>
-    <div ref="processCharts" style="width: 100%;height:40px;" id="record"></div>
+    <div ref="processCharts" style="width: 100%;height:80px;" id="record"></div>
 </template>
 
 <script>
@@ -17,11 +17,11 @@
         return {
             option: {
                 tooltip: {
-                    position: ['50%','50%']
-                    // trigger: 'axis',
-                    // axisPointer: {
-                    //     type: 'shadow'
-                    // }
+                    trigger: 'axis',
+                    position: 'bottom',
+                    axisPointer: {
+                        type: 'shadow'
+                    }
                 },
                 grid: {
                     left: 0,
@@ -69,7 +69,6 @@
                 if (res.code === 200) {
                     if(res.data.length == 0) return;
                     var timeRange = {};
-                    console.log(res.data,1111111)
                     timeRange.startTime = res.data[0].startTime;
                     timeRange.endTime = res.data[res.data.length - 1].endTime;
                     var total = Math.abs(moment(timeRange.startTime).diff(moment(timeRange.endTime)));
@@ -87,10 +86,9 @@
                             item.color = "#fdff85";
                         }
                         var obj = {name: item.deviceStatusName,type: 'bar',stack: 'total',barWidth: "20px",data: [current / total],itemStyle: {color: item.color},"tooltip": {
-                                "show": true,
                                 "trigger": "item",
                                 formatter: (value, ticket) => {
-                                    return `${item.deviceStatusName}: ${item.startTime} - ${item.endTime}`
+                                    return `${item.deviceStatusName}: ${item.startTime} - ${item.endTime}<br />绋嬪簭鍚嶇О: ${item.progName}`;
                                 }
                         }};
                         arr.push(obj);

--
Gitblit v1.9.3