照明数据对接

src/views/system/lighting/index.vue

@@ -13,7 +13,7 @@
                 <div style="height: 100%;display: flex;flex-direction: column;overflow: hidden;">
                     <running :resultData="leftData" style="flex: 1;" />
                     <switchAll :resultData="leftData.RunAnalyse" style="flex: 1;" />
-                    <eventList :resultData="leftData.EventList" style="flex: 1;" />
+                    <eventList :resultData="leftData.EventList.alarm" style="flex: 1;" />
                 </div>
             </template>
         </layout>

src/views/system/lighting/modules/deviceList.vue

@@ -13,15 +13,14 @@
                                 <Opportunity />
                             </el-icon>
                         </el-icon>
-                        {{ item.DeviceName }}
+                        {{ item.devices_name }}
                     </el-text>
-                    <el-text class="w-150px mb-2" truncated :class="item.SwitchStatus == 0 ? 'blue_title' : 'red_title'"
-                        style="flex: .2;">
-                        {{ item.SwitchStatus == 0 ? '开启' : '关闭' }}
+                    <el-text class="w-150px mb-2" truncated style="flex: .2;color:#fff;">
+                        {{ item.room_name }}
                     </el-text>
-                    <el-text class="w-150px mb-2" truncated
-                        :class="item.OnlinePresence == 0 ? 'blue_title' : 'red_title'" style="flex: .2">
-                        {{ item.OnlinePresence == 0 ? '在线' : '离线' }}
+                    <el-text class="w-150px mb-2" truncated :class="item.on_line == 0 ? 'blue_title' : 'red_title'"
+                        style="flex: .2">
+                        {{ item.on_line == 0 ? '在线' : '离线' }}
                     </el-text>
                 </div>
             </div>

src/views/system/lighting/modules/eventList.vue

@@ -1,23 +1,6 @@
 <template>
     <div class="_eventList">
-        <HeadlineTag type="right" value="事件列表" style="flex-shrink: 0;"></HeadlineTag>
-        <!-- 绑定鼠标移入移出事件 -->
-        <!-- <div class="_eventList_mains" ref="mainsRef" @mouseenter="pauseCarousel" @mouseleave="resumeCarousel">
-            <div :style="{ transform: `translateY(${scrollY}px)` }">
-                <div class="_eventList_mains_item" v-for="(item, index) in eventList.concat(eventList)" :key="index">
-                    <div class="_eventList_mains_item_text">
-                        <div :class="item.DeviceStatus === 0 ? '_success' : '_warning'"
-                            class="_eventList_mains_item_text_flag"></div>
-                        <el-text class="w-150px mb-2" truncated style="color: white;margin-left: 10px;">
-                            {{ item.DeviceName }}
-                        </el-text>
-                    </div>
-                    <el-text class="w-150px mb-2" truncated style="color: white;">
-                        {{ item.EventDate }}
-                    </el-text>
-                </div>
-            </div>
-        </div> -->
+        <HeadlineTag type="right" value="报警记录" style="flex-shrink: 0;"></HeadlineTag>
         <div class="scroll-view" ref="scrollViewRef" @mouseenter="onMouseenter" @mouseleave="onMouseleave">
             <div ref="listRef" class="list" v-for="(p, n) in count" :key="n">
                 <div class="item" v-for="(item, index) in data" :key="index">
@@ -25,11 +8,11 @@
                         <div :class="item.DeviceStatus === 0 ? '_success' : '_warning'"
                             class="_eventList_mains_item_text_flag"></div>
                         <el-text class="w-150px mb-2" truncated style="color: white;margin-left: 10px;">
-                            {{ item.DeviceName }}
+                            {{ item.alarm_title	}}
                         </el-text>
                     </div>
                     <el-text class="w-150px mb-2" truncated style="color: white;">
-                        {{ item.EventDate }}
+                        {{ item.alarm_create_time }}
                     </el-text>
                 </div>
             </div>

src/views/system/lighting/modules/running.vue

@@ -30,15 +30,15 @@ const initAccess = () => {
             value: 0,
         },
         {
-            name: '开启数量',
+            name: '网关数量',
             value: 0,
         },
         {
-            name: '关闭数量',
+            name: '策略总量',
             value: 0,
         },
         {
-            name: '故障数量',
+            name: '报警数量',
             value: 0,
         },
     ];
@@ -266,16 +266,16 @@ watch(() => props.resultData, (newVal) => {
                 value: newVal.DeviceCount,
             },
             {
-                name: '开启数量',
-                value: newVal.OpenCount,
+                name: '网关数量',
+                value: newVal.GatewayCount,
             },
             {
-                name: '关闭数量',
+                name: '策略总量',
                 value: newVal.OffCount,
             },
             {
-                name: '故障数量',
-                value: newVal.FaultCount,
+                name: '报警数量',
+                value: newVal.AlarmCount,
             },
         ];
         let arrName = getArrayValue(data, 'name');

src/views/system/lighting/modules/switchAll.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="_switchAll">
-        <HeadlineTag type="right" value="运行分析(周)"></HeadlineTag>
+        <HeadlineTag type="right" value="报警统计(月)"></HeadlineTag>
         <div class="_switchAll_mains">
             <div ref="chartRef" style="width: 100%; height: 100%;"></div>
         </div>
@@ -27,7 +27,7 @@ const generateRandomData = (length, max) => {
     }
     return randomData;
 };
- const handleResize = () => {
+const handleResize = () => {
     if (chart) {
         chart.resize();
     }
@@ -79,7 +79,7 @@ onMounted(() => {
             },
             series: [
                 {
-                    name: '开启数量',
+                    name: '报警次数',
                     type: 'line',
                     smooth: true,
                     // data: generateRandomData(7, 50),
@@ -109,68 +109,6 @@ onMounted(() => {
                         shadowBlur: 10,
                     }
                 },
-                {
-                    name: '关闭数量',
-                    type: 'line',
-                    smooth: true,
-                    // data: generateRandomData(9, 60),
-                    data: [],
-                    showSymbol: false,
-                    lineStyle: {
-                        color: 'rgb(255,193,7)',
-                    },
-                    areaStyle: {
-                        color: new echarts.graphic.LinearGradient(
-                            0,
-                            0,
-                            0,
-                            1,
-                            [{
-                                offset: 0,
-                                color: 'rgba(255,193,7, 0.6)',
-                            },
-                            {
-                                offset: 0.8,
-                                color: 'rgba(255,193,7,0.2)',
-                            },
-                            ],
-                            false
-                        ),
-                        shadowColor: 'rgba(0, 0, 0, 0.1)',
-                        shadowBlur: 10,
-                    }
-                },
-                {
-                    name: '故障数量',
-                    type: 'line',
-                    smooth: true,
-                    // data: generateRandomData(9, 60),
-                    data: [],
-                    showSymbol: false,
-                    lineStyle: {
-                        color: 'rgb(244,67,54)'
-                    },
-                    areaStyle: {
-                        color: new echarts.graphic.LinearGradient(
-                            0,
-                            0,
-                            0,
-                            1,
-                            [{
-                                offset: 0,
-                                color: 'rgba(244,67,54,0.6)',
-                            },
-                            {
-                                offset: 0.8,
-                                color: 'rgba(244,67,54,0.2)',
-                            },
-                            ],
-                            false
-                        ),
-                        shadowColor: 'rgba(0, 0, 0, 0.1)',
-                        shadowBlur: 10,
-                    }
-                }
             ]
         };
 
@@ -181,29 +119,20 @@ onMounted(() => {
 
 watch(() => props.resultData, (newVal) => {
     if (chart) {
-        let arrData = Object.keys(newVal)
+        let arrData = newVal
         let arr1 = []
         let arr2 = []
-        let arr3 = []
         arrData.forEach((item) => {
-            let data = Object.entries(newVal[item])
-            arr1.push(data[0][1])
-            arr2.push(data[1][1])
-            arr3.push(data[2][1])
+            arr1.push(item.count)
+            arr2.push(item.time)
         })
         chart.setOption({
             xAxis: {
-                data: Object.keys(newVal),
+                data: arr2,
             },
             series: [{
-                name: '开启数量',
+                name: '报警次数',
                 data: arr1,
-            }, {
-                name: '关闭数量',
-                data: arr2,
-            }, {
-                name: '故障数量',
-                data: arr3,
             }],
         })
     }

vite.config.js

@@ -32,7 +32,8 @@ export default defineConfig(({ mode, command }) => {
           rewrite: (p) => p.replace(/^\/dev-api/, '')
         },
         '/APP': {
-          target: 'http://182.43.247.65:8000',
+          // target: 'http://182.43.247.65:8000',
+          target: 'http://192.168.0.196:8000',
           changeOrigin: true,
           rewrite: (path) => path.replace(/^\/APP/, '')
         }