更新

src/api/bz/monitor.js

@@ -62,4 +62,12 @@ export function getTypeData(data) {
         method: 'get',
         params: data
     })
+}
+
+export function getTypeEchartsDate(data) {
+    return request({
+        url: '/openApi/xc/monitor/getTypeEchartsDate',
+        method: 'get',
+        params: data
+    })
 }

src/views/bz/integrate.vue

@@ -125,7 +125,7 @@
         <el-card class="card">
           <strong>酒店信息</strong>
           <div style="font-size: 35px; margin-bottom: 12px" align="center">
-            ￥{{hotelData.amount}}
+            ￥{{ hotelData.amount }}
           </div>
           <div class="" style="font-size: 16px; color: #999999" align="center">
             <img
@@ -136,7 +136,7 @@
           </div>
           <el-divider />
           <p style="font-size: 18px; text-align: right; color: #999999">
-            入住 {{hotelData.additionalParameter}}
+            入住 {{ hotelData.additionalParameter }}
           </p>
         </el-card>
       </el-col>
@@ -144,7 +144,7 @@
         <el-card class="card">
           <strong>涉旅信息</strong>
           <div style="font-size: 35px; margin-bottom: 12px" align="center">
-            ￥{{travelData.amount}}
+            ￥{{ travelData.amount }}
           </div>
           <div class="" style="font-size: 16px; color: #999999" align="center">
             <img
@@ -155,7 +155,7 @@
           </div>
           <el-divider />
           <p style="font-size: 18px; text-align: right; color: #999999">
-            文旅线路 {{travelData.additionalParameter}}
+            文旅线路 {{ travelData.additionalParameter }}
           </p>
         </el-card>
       </el-col>
@@ -227,7 +227,7 @@
 <script>
 import * as echarts from 'echarts'
 import { findDetail, qweatherGet, qweatherAir, ambitusRoadConditions } from '@/api/equipment/equipment_passenger'
-import { getHotelAndTravelDateNew, getTypeData } from '@/api/bz/monitor'
+import { getHotelAndTravelDateNew, getTypeData, getTypeEchartsDate } from '@/api/bz/monitor'
 
 export default {
   components: {},
@@ -257,6 +257,8 @@ export default {
       this.loadQweather();
     });
 
+
+
     getHotelAndTravelDateNew({ bigType: 1 }).then(data => {
       this.hotelData = data;
     })
@@ -265,27 +267,37 @@ export default {
     })
   },
   mounted() {
-    const xAxis = []
-    for (let i = 7; i > 0; i--) {
-      xAxis.push(this.addDays(new Date(), i * -1))
-    }
-    this.buildBar('chart1', xAxis, [{ name: '值班人数', type: 'line', stack: 'Total', data: [0, 0, 0, 0, 0, 0, 0] }])
-    this.buildBar('chart2', xAxis, [{ name: '客流量', type: 'line', stack: 'Total', data: [0, 0, 0, 0, 0, 0, 0] }])
-    this.buildBar('chart3', xAxis, [
-      { name: '航空', type: 'line', stack: 'Total', data: [0, 0, 0, 0, 0, 0, 0] },
-      { name: '高铁', type: 'line', stack: 'Total', data: [0, 0, 0, 0, 0, 0, 0] },
-      { name: '汽车', type: 'line', stack: 'Total', data: [0, 0, 0, 0, 0, 0, 0] }
-    ])
-    this.buildBar('chart4', xAxis, [{ name: '工单数', type: 'line', stack: 'Total', data: [0, 0, 0, 0, 0, 0, 0] }])
-    this.buildBar('chart5', xAxis, [
-      { name: '空气污染指数', type: 'line', stack: 'Total', data: [0, 0, 0, 0, 0, 0, 0] },
-      { name: '噪音污染指数', type: 'line', stack: 'Total', data: [0, 0, 0, 0, 0, 0, 0] }
-    ])
-    this.buildBar('chart6', xAxis, [
-      { name: '生物性污染指数', type: 'line', stack: 'Total', data: [0, 0, 0, 0, 0, 0, 0] },
-      { name: '物理性污染指数', type: 'line', stack: 'Total', data: [0, 0, 0, 0, 0, 0, 0] },
-      { name: '化学性污染指数', type: 'line', stack: 'Total', data: [0, 0, 0, 0, 0, 0, 0] }
-    ])
+    getTypeEchartsDate({ type: 6 }).then(data => {
+      this.buildBar('chart1', data.map(dt => dt.dateTime), [{ name: '值班人数', type: 'line', stack: 'Total', data: data.map(dt => dt.amount) }])
+    })
+    getTypeEchartsDate({ type: 2 }).then(data => {
+      this.buildBar('chart2', data.name, [{ name: '客流量', type: 'line', stack: 'Total', data: data.value }])
+    })
+    getTypeData({ bigType: 3 }).then(data => {
+      this.buildBar('chart3', data.map(dt => dt.dateTime), [
+        { name: '航空', type: 'line', stack: 'Total', data: data.map(dt => dt.type1) },
+        { name: '高铁', type: 'line', stack: 'Total', data: data.map(dt => dt.type2) },
+        { name: '汽车', type: 'line', stack: 'Total', data: data.map(dt => dt.type3) }
+      ])
+    })
+    getTypeData({ bigType: 4 }).then(data => {
+      this.buildBar('chart4', data.map(dt => dt.dateTime), [{ name: '工单数', type: 'line', stack: 'Total', data: data.map(dt => dt.type1) }])
+    })
+
+    getTypeData({ bigType: 5 }).then(data => {
+      this.buildBar('chart5', data.map(dt => dt.dateTime), [
+        { name: '空气污染指数', type: 'line', stack: 'Total', data: data.map(dt => dt.type1) },
+        { name: '噪音污染指数', type: 'line', stack: 'Total', data: data.map(dt => dt.type2) }
+      ])
+    })
+
+    getTypeData({ bigType: 6 }).then(data => {
+      this.buildBar('chart6', data.map(dt => dt.dateTime), [
+        { name: '生物性污染指数', type: 'line', stack: 'Total', data: data.map(dt => dt.type1) },
+        { name: '物理性污染指数', type: 'line', stack: 'Total', data: data.map(dt => dt.type2) },
+        { name: '化学性污染指数', type: 'line', stack: 'Total', data: data.map(dt => dt.type3) }
+      ])
+    })
   },
   methods: {
     goToTraffic() {