From 32809e9e37e20cd4d42a5ed01337882cbf54a6b9 Mon Sep 17 00:00:00 2001
From: "peak.jiang" <26269261@qq.com>
Date: Sun, 12 Nov 2023 15:21:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=A1=E7=89=87=E5=9B=A0?=
 =?UTF-8?q?=E4=B8=BA=E6=95=B0=E6=8D=AE=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C?=
 =?UTF-8?q?=20=E9=AB=98=E5=BA=A6=E5=8F=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/chart/lineChart.vue  |  3 ++-
 src/components/target/typeChart.vue | 23 ++++++++++++++++++-----
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/components/chart/lineChart.vue b/src/components/chart/lineChart.vue
index d533e0f..77d90d9 100644
--- a/src/components/chart/lineChart.vue
+++ b/src/components/chart/lineChart.vue
@@ -96,6 +96,7 @@ export default {
 
     methods: {
         drawLine(newVal, title, timeMode) {
+            // console.log('newVal == ', newVal)
             let myChart = this.$echarts.getInstanceByDom(this.$refs.lineChart);
             if (myChart == null) {
                 myChart = this.$echarts.init(this.$refs.lineChart);
@@ -277,7 +278,7 @@ export default {
                         if (val.speed == -1) {
                             return '-';
                         }
-                        return val.speed;
+                        return Math.abs(val.speed);
                     });
                 } else if (title === '流量') {
                     this.name = '辆';
diff --git a/src/components/target/typeChart.vue b/src/components/target/typeChart.vue
index 4f98b68..5779d1d 100644
--- a/src/components/target/typeChart.vue
+++ b/src/components/target/typeChart.vue
@@ -52,7 +52,7 @@
                     </el-card>
                 </div>
             </div>
-            <el-card v-show="echartArr.includes('数值')" style="width: 150px; margin-bottom: 20px; text-align: center">
+            <el-card v-show="echartArr.includes('数值')" class="spacialCard">
                 <div v-if="cycleAccumulateDataArr && cycleAccumulateDataArr.length > 0">
                     <div v-if="title == '类型'">
                         <span style="font-size: 15px">类型数量总和</span><br />
@@ -154,12 +154,12 @@
                         <span style="font-size: 15px">速度</span><br />
 
                         <!-- <span style="font-size: 30px; font-weight: bold">{{ typeValue.speed }}</span> -->
-                        <div style="font-size: 30px; font-weight: bold">
+                        <span style="font-size: 30px; font-weight: bold">
                             <span v-if="(newDataArr[0].speed && newDataArr[0].speed != -1) || newDataArr[0].speed === 0">
                                 {{ Math.abs(newDataArr[0].speed) }}
                             </span>
                             <span v-else> - </span>
-                        </div>
+                        </span>
                         <span style="font-size: 20px; font-weight: 200">
                             <span v-if="(newDataArr[0].speed && newDataArr[0].speed != -1) || newDataArr[0].speed === 0">
                                 {{ newDataArr[0].speed > 0 || newDataArr[0].speed === 0 ? 'km/h' : 'pix/s' }}
@@ -208,8 +208,10 @@
                         <span style="font-size: 20px; font-weight: 200">秒</span>
                     </div>
                     <div>
-                        <div>
-                            {{ newDataArr[0].time ? newDataArr[0].time : '' }}
+                        <div v-if="newDataArr[0].time">
+                            <!-- {{ newDataArr[0].time ? newDataArr[0].time : '' }} -->
+                            <div>{{newDataArr[0].time.slice(0, 11)}}</div>
+                            <div>{{newDataArr[0].time.slice(11)}}</div>
                         </div>
                     </div>
                 </div>
@@ -521,6 +523,17 @@ export default {
 };
 </script>
 <style scoped>
+
+.spacialCard {
+    width: 150px; 
+    margin-bottom: 20px; 
+    text-align: center;
+}
+
+::v-deep.spacialCard .el-card__body{
+    padding: 10px;
+}
+
 .tableTitle {
     background: #f7f8fa;
     margin-bottom: 5px;