暂存

src/router/index.js

@@ -87,29 +87,16 @@ export const constantRoutes = [
       }
     ]
   },
-  // {
-  //   path: '/equData',
-  //   component: Layout,
-  //   redirect: 'noredirect',
-  //   children: [
-  //     {
-  //       path: 'index',
-  //       component: () => import('@/views/equBigData/index'),
-  //       name: 'Index',
-  //       meta: { title: '设备数据展示大屏', icon: 'dashboard'}
-  //     }
-  //   ]
-  // },
   {
-    path: '/bigData',
+    path: '/equData',
     component: Layout,
     redirect: 'noredirect',
     children: [
       {
         path: 'index',
-        component: () => import('@/views/test/index'),
+        component: () => import('@/views/equBigData/index'),
         name: 'Index',
-        meta: { title: '测试大屏', icon: 'dashboard'}
+        meta: { title: '设备数据展示大屏', icon: 'dashboard'}
       }
     ]
   },

src/views/test/LeftChart2.vue → src/views/equBigData/LeftChart2.vue

@@ -22,31 +22,6 @@ export default {
   data() {
     return {
       option: {
-        // series: [
-        //   {
-        //     type: "pie",
-        //     data: [
-        //       { name: "收费系统", value: 93 },
-        //       { name: "通信系统", value: 32 },
-        //       { name: "监控系统", value: 65 },
-        //       { name: "供配电系统", value: 44 },
-        //       { name: "其他", value: 52 },
-        //     ],
-        //     radius: ["45%", "65%"],
-        //     insideLabel: {
-        //       show: false,
-        //     },
-        //     outsideLabel: {
-        //       labelLineEndLength: 10,
-        //       formatter: "{percent}%\n{name}",
-        //       style: {
-        //         fontSize: 14,
-        //         fill: "#fff",
-        //       },
-        //     },
-        //   },
-        // ],
-        // color: ["#00baff", "#3de7c9", "#fff", "#ffc530", "#469f4b"],
         title: {
           show: false,
         },
@@ -56,7 +31,6 @@ export default {
         },
         xAxis: {
           name: "",
-          // data: ["周一","周二"],
           data: this.xlist,
           axisLine: {
             style: {
@@ -94,7 +68,6 @@ export default {
         },
         series: [
           {
-            // data: [2,6],
             data: this.ylist,
             type: "line",
             lineArea: {
@@ -114,8 +87,6 @@ export default {
       addDevice().then(res=>{
         let xlist=res.data.map(item=>item.month)
         let ylist=res.data.map(item=>item.count)
-        console.log(xlist,777);
-        console.log(ylist,888);
         this.option.xAxis.data=xlist
         this.option.series[0].data=ylist
       })

src/views/test/LeftChartUnder.vue → src/views/equBigData/LeftChartUnder.vue

@@ -1,7 +1,5 @@
 <template>
   <div class="left-chart-3">
-    <!-- <div class="lc3-header">王五收费站</div>
-    <div class="lc3-details">设备运行总数<span>245</span></div> -->
     <dv-capsule-chart class="lc3-chart" :config="config" />
   </div>
 </template>

src/views/test/Maps.vue → src/views/equBigData/Maps.vue

@@ -1,11 +1,3 @@
-<!--
- * @Author: gaojikai gaojikai@fehorizon.com
- * @Date: 2023-09-12 08:55:47
- * @LastEditors: gaojikai gaojikai@fehorizon.com
- * @LastEditTime: 2023-09-12 09:48:43
- * @FilePath: \electronic-file\src\components\datav\Maps.vue
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
--->
 <template>
   <div id="map" :style="{ width: mapWidth, height: mapHeight }"></div>
 </template>

src/views/test/MiddleChart.vue → src/views/equBigData/MiddleChart.vue

@@ -1,11 +1,3 @@
-<!--
- * @Author: gaojikai gaojikai@fehorizon.com
- * @Date: 2023-09-11 14:03:09
- * @LastEditors: gaojikai gaojikai@fehorizon.com
- * @LastEditTime: 2023-09-11 21:23:37
- * @FilePath: \electronic-file\src\components\datav\LeftChart2.vue
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
--->
 <template>
   <div class="left-chart-4">
     <dv-charts class="middle-chart" :option="option" />
@@ -30,8 +22,6 @@ export default {
     return {
       option: {
         xAxis: {
-          // name: "第一周",
-          // data: ["周一"],
           data: this.xlist,
           axisLabel: {
             style: {
@@ -46,7 +36,6 @@ export default {
           bottom: 20,
         },
         yAxis: {
-          // name: "销售额",
           data: "value",
           splitLine: {
             show: false,
@@ -54,7 +43,6 @@ export default {
         },
         series: [
           {
-            // data: [10],
             data: this.ylist,
             type: "bar",
             barWidth: 10,
@@ -64,7 +52,6 @@ export default {
     };
   },
   created() {
-    // this.initData();
     this.getAddUser()
   },
   methods: {
@@ -72,31 +59,10 @@ export default {
       addUser().then(res=>{
         let xlist=res.data.map(item=>item.month)
         let ylist=res.data.map(item=>item.count)
-        console.log(xlist,333);
-        console.log(ylist,555);
         this.option.xAxis.data=xlist
         this.option.series[0].data=ylist
       })
     }
-    // initData() {
-    //   const option1 = {
-    //     xAxis: {
-    //       name: "第一周",
-    //       data: ["周一", "周二", "周三", "周四", "周五", "周六", "周日"],
-    //     },
-    //     yAxis: {
-    //       name: "销售额",
-    //       data: "value",
-    //     },
-    //     series: [
-    //       {
-    //         data: [1200, 2230, 1900, 2100, 3500, 4200, 3985],
-    //         type: "bar",
-    //       },
-    //     ],
-    //   };
-    //   this.option = option1;
-    // },
   },
 };
 </script>

src/views/test/index.vue → src/views/equBigData/index.vue

@@ -6,11 +6,7 @@
         <div class="left-top">
           <dv-border-box-13>
             <Border-Item title="设备总览">
-              <aaa v-if="equDataFlag" :data="equTotalData" />
-              <!-- <Left-Chart-1 /> -->
-              <!-- <Left-Chart-1 />
-              <Left-Chart-1 />
-              <Left-Chart-1/> -->
+              <equTotal v-if="equDataFlag" :data="equTotalData" />
             </Border-Item>
           </dv-border-box-13>
         </div>
@@ -84,7 +80,7 @@ import LeftChartUnder from "./LeftChartUnder";
 import equMap from "./Maps";
 
 import BorderItem from "./BottomCharts";
-import aaa from "./aaa";
+import equTotal from "./equTotal";
 import bbb from "./bbb";
 
 import RightBottom from "./RightBottom";
@@ -110,7 +106,7 @@ export default {
     LeftChart2,
     BorderItem,
     equMap,
-    aaa,
+    equTotal,
     bbb,
     RightBottom,
     LeftChartUnder,
@@ -224,16 +220,17 @@ export default {
     },
     getAlarmStatusList() {
       alarmStatusList().then((res) => {
-        this.alarmList = res.data.map((item) => {
-          let hideName = "";
-          if (item.name.length >= 2) {
-            hideName = item.name[0] + "*" + item.name.substring(2);
-          }
-          return {
-            ...item,
-            name: hideName,
-          };
-        });
+        this.alarmList = res.data
+        // .map((item) => {
+        //   let hideName = "";
+        //   if (item.name.length >= 2) {
+        //     hideName = item.name[0] + "*" + item.name.substring(2);
+        //   }
+        //   return {
+        //     ...item,
+        //     name: hideName,
+        //   };
+        // });
         this.alarmListFlag = true;
       });
     },