Merge branch '20231109' of http://git.umayle.com:2023/lixiaobang/TransFlow into 20231109

2. 修改因为数据长度变化导致卡片高度变化

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 = '辆';

src/components/sensorFusion/meanValue.vue

@@ -79,10 +79,35 @@ export default {
         this.dataList = this.dataList.slice(-10);
       }
       for (let i = 0; i < this.dataList.length; i++) {
-        this.max.push(this.dataList[i].max);
+        if(this.dataList[i].max) {
-        this.min.push(this.dataList[i].min);
+          this.max.push(Math.abs(this.dataList[i].max.toFixed(2)));
-        this.med.push(this.dataList[i].med);
+        }else {
-        this.avg.push(this.dataList[i].avg);
+          this.max.push(0);
+        }
+
+        if(this.dataList[i].min) {
+          this.min.push(Math.abs(this.dataList[i].min.toFixed(2)));
+        }else {
+          this.min.push(0);
+        }
+
+        if(this.dataList[i].med) {
+          this.med.push(Math.abs(this.dataList[i].med.toFixed(2)));
+        }else {
+          this.med.push(0);
+        }
+
+        if(this.dataList[i].avg) {
+          this.avg.push(Math.abs(this.dataList[i].avg.toFixed(2)));
+        }else {
+          this.avg.push(0);
+        }
+
+
+        // this.max.push(Math.abs(this.dataList[i].max.toFixed(2)));
+        // this.min.push(Math.abs(this.dataList[i].min.toFixed(2)));
+        // this.med.push(Math.abs(this.dataList[i].med.toFixed(2)));
+        // this.avg.push(Math.abs(this.dataList[i].avg.toFixed(2)));
       }
       let maxData = "";
       let minData = "";

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 />
@@ -208,8 +208,10 @@
                         <span style="font-size: 20px; font-weight: 200">秒</span>
                     </div>
                     <div>
-                        <div>
+                        <div v-if="newDataArr[0].time">
-                            {{ newDataArr[0].time ? 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;

src/views/StateOperation.vue

@@ -115,12 +115,12 @@ export default {
         totalVirtualMemory: '',
       },
       mountingPointTable: [
-        {
+        // {
-          mountingPoint: '2016-05-02',
+        //   mountingPoint: '2016-05-02',
-          equipmentName: '王小虎',
+        //   equipmentName: '王小虎',
-          occupancy: '上海市普陀区金沙江路 1518 弄',
+        //   occupancy: '上海市普陀区金沙江路 1518 弄',
-          total: '上海市普陀区金沙江路 1518 弄',
+        //   total: '上海市普陀区金沙江路 1518 弄',
-        },
+        // },
       ],
       networkStatus: {
         internetAccess: '',
@@ -131,14 +131,14 @@ export default {
         serverVPNOpen: '',
       },
       networkStatus: [
-        {
+        // {
-          connect: '2016-05-02',
+        //   connect: '2016-05-02',
-          IP: '王小虎',
+        //   IP: '王小虎',
-          acceptor: '上海市普陀区金沙江路 1518 弄',
+        //   acceptor: '上海市普陀区金沙江路 1518 弄',
-          totalReceived: '上海市普陀区金沙江路 1518 弄',
+        //   totalReceived: '上海市普陀区金沙江路 1518 弄',
-          transmission: '上海市普陀区金沙江路 1518 弄',
+        //   transmission: '上海市普陀区金沙江路 1518 弄',
-          transmissionTotal: '上海市普陀区金沙江路 1518 弄',
+        //   transmissionTotal: '上海市普陀区金沙江路 1518 弄',
-        },
+        // },
       ]
     }
   },

src/views/sensorFusion/index.vue

@@ -783,8 +783,8 @@
                                 <span v-if="scope.row.type == 'Non_Motor|Person'">非机动车|行人</span>
                               </template> -->
                                                         </el-table-column>
-                                                        <el-table-column align="center" prop="n_stay" label="存车数"></el-table-column>
+                                                        <el-table-column align="center" prop="ave_stay" label="存车数"></el-table-column>
-                                                        <el-table-column align="center" prop="n_queue" label="排队数"></el-table-column>
+                                                        <el-table-column align="center" prop="ave_queue" label="排队数"></el-table-column>
                                                         <el-table-column align="center" prop="occ" label="占用状态">
                                                             <template slot-scope="scope">
                                                                 <span v-if="scope.row.occ == '1'">占用</span>
@@ -3355,8 +3355,8 @@ export default {
                                         min: msgN[j].min,
                                         name: msgN[j].name,
                                         type: msgN[j].type,
-                                        n_stay: msgN[j].ave_stay,
+                                        ave_stay: msgN[j].ave_stay,
-                                        n_queue: msgN[j].ave_queue,
+                                        ave_queue: msgN[j].ave_queue,
                                         occ: msgN[j].occ,
                                         speed: newSpeed,
                                         originalSpeed: msgN[j].speed