Forráskód Böngészése

看板模块配置功能

tianyabing 2 éve
szülő
commit
2bb51d255d

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 448 - 552
package-lock.json


+ 2 - 2
package.json

@@ -23,7 +23,7 @@
     "@antfu/eslint-config": "^0.34.1",
     "@iconify-json/icon-park": "^1.1.10",
     "@iconify-json/icon-park-outline": "^1.1.9",
-    "@vitejs/plugin-legacy": "^3.0.1",
+    "@vitejs/plugin-legacy": "^2.3.1",
     "@vitejs/plugin-vue2": "^2.1.0",
     "eslint": "^8.5.0",
     "eslint-plugin-vue": "^9.0.0",
@@ -35,7 +35,7 @@
     "unplugin-auto-import": "^0.12.1",
     "unplugin-icons": "^0.15.1",
     "unplugin-vue-components": "^0.22.12",
-    "vite": "^4.0.4",
+    "vite": "^3.2.5",
     "vite-plugin-compression": "^0.5.1",
     "vite-plugin-mock": "^2.9.6",
     "vue-template-compiler": "^2.7.14",

+ 5 - 3
src/App.vue

@@ -10,9 +10,11 @@ export default {
 </script>
 
 <template>
-  <a-config-provider :locale="locale">
-    <router-view />
-  </a-config-provider>
+  <div id="app">
+    <a-config-provider :locale="locale">
+      <router-view />
+    </a-config-provider>
+  </div>
 </template>
 
 <style lang="less">

+ 0 - 16
src/components/dashboard/commonFuncManage/functionManage.vue

@@ -220,20 +220,4 @@ export default {
   }
 }
 
-.common-function-move, /* 对移动中的元素应用的过渡 */
-.common-function-enter-active,
-.common-function-leave-active {
-  transition: all 0.5s ease;
-}
-
-.common-function-enter-from,
-.common-function-leave-to {
-  opacity: 0;
-  transform: translateX(30px);
-}
-
-.common-function-leave-active {
-  position: absolute;
-}
-
 </style>

+ 3 - 10
src/components/dashboard/Dashboard.vue → src/components/dashboard/iocDashboard.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="ioc-dashboard">
-    <a-row>
+    <a-row :gutter="[12,12]">
       <a-col :span="18">
         <!--常用功能-->
         <div class="dashboard-popFunc">
@@ -24,8 +24,6 @@
           <DashboardMessageCard  ></DashboardMessageCard>
         </div>
       </a-col>
-    </a-row>
-    <a-row>
       <a-col :span="18">
         <div class="dashboard-summary">
           <DashboardPortrait ></DashboardPortrait>
@@ -47,7 +45,6 @@
 <script>
 import IocCard from "@/components/common/card.vue";
 import IocFunction from "@/components/dashboard/commonFuncManage/function.vue";
-import DataSituation from "@/components/dashboard/more/space/DataSituation.vue";
 import DashboardMessageCard from "@/components/dashboard/message/dashboardMessageCard.vue";
 import DashboardPortrait from "@/components/dashboard/portrait/dashboardPortrait.vue";
 import DashboardMore from "@/components/dashboard/more/dashboardMore.vue";
@@ -65,7 +62,6 @@ export default {
   components: {
     IocCard,
     IocFunction,
-    DataSituation,
     DashboardMessageCard,
     DashboardPortrait,
     DashboardMore,
@@ -87,15 +83,13 @@ export default {
 .ioc-dashboard {
   width: 100%;
   height: 100%;
-  padding: 0 15px 15px;
+  padding: 12px;
   background-color: #f0f2f5;
   overflow-y: auto;
   div {
     border-radius: 4px;
   }
   .dashboard-popFunc {
-    margin-right: 15px;
-    margin-top: 12px;
     height: 220px;
     background-color: white;
   }
@@ -105,11 +99,10 @@ export default {
   }
   .dashboard-summary {
     background-color: white;
-    margin-right: 15px;
-    margin-top: 12px;
     height: 765px;
   }
   .dashboard-more {
+    background-color: white;
     height: 765px;
 
   }

+ 0 - 1
src/components/dashboard/message/dashboardMessageCard.vue

@@ -54,7 +54,6 @@ export default {
 <style lang="less" scoped>
 .ioc-dashboard-msg {
   padding-left: 5%;
-  margin-top: 12px;
   width: 100%;
   height: 100px;
 

+ 3 - 3
src/components/dashboard/more/carbonOverviewChart.vue

@@ -3,7 +3,7 @@ import Card from "@/components/common/card.vue";
 export default {
   data() {
     return {
-      height: 180
+      height: 200
     }
   },
   components: {
@@ -28,8 +28,8 @@ export default {
         grid: {
           left: '2%', //默认10%
           right: '2%', //默认10%
-          bottom: '0%', //默认60
-          top: '15%',
+          bottom: '2%', //默认60
+          top: '20%',
           containLabel: true
           //grid区域是否包含坐标轴的刻度标签
         },

+ 139 - 16
src/components/dashboard/more/dashboardMore.vue

@@ -4,10 +4,38 @@ import FloorOverview from "@/components/dashboard/more/floorOverview.vue";
 import SpaceOverview from "@/components/dashboard/more/spaceOverview.vue";
 import CarbonOverviewChart from "@/components/dashboard/more/carbonOverviewChart.vue";
 import PvPowerChart from "@/components/dashboard/more/pvPowerChart.vue";
+
 export default {
   data() {
     return {
-      showPv: false,
+      showPv: true,
+      showMoreConfig: false,
+      moduleConfig: {
+        'floor': {
+          id: 'floor',
+          name: '楼宇概览',
+          visible: true,
+          grid: 1,
+        },
+        'space': {
+          id: 'space',
+          name: '空间概览',
+          visible: true,
+          grid: 1,
+        },
+        'carbon': {
+          id: 'carbon',
+          name: '碳配额概览',
+          visible: true,
+          grid: 1,
+        },
+        'pv': {
+          id: 'pv',
+          name: '光伏发电概览',
+          visible: false,
+          grid: 2,
+        }
+      }
     }
   },
   components: {
@@ -20,55 +48,150 @@ export default {
   mounted() {
   },
   methods: {
-
+    toggleVisible(obj) {
+      if (obj.visible) {
+        obj.visible = false
+        return;
+      }
+      let num = 0;
+      for (let objKey in this.moduleConfig) {
+        if (this.moduleConfig[objKey].visible) {
+          num += this.moduleConfig[objKey].grid
+        }
+      }
+      if ((num+obj.grid) <= 3) {
+        obj.visible = true;
+      } else {
+        this.$message.warning('空间不足,请移除模块后添加')
+      }
+    }
   }
 }
 </script>
 
 <template>
-  <div class="dashboard-more">
+  <div class="ioc-dashboard-more">
+    <div class="ioc-dashboard-more-config">
+      <a-popover v-model="showMoreConfig" trigger="click" placement="leftTop">
+        <a-button type="link" style="color: #C6C8CC;font-size: 12px;height: 20px;">
+          <span style="line-height: 20px">模块配置</span>
+          <a-icon type="right"></a-icon>
+        </a-button>
+        <template #content>
+          <div>
+            <Card title="自定义模块">
+              <div class="ioc-dashboard-more-config-show" style="width: 450px">
+                <a-row :gutter="30" >
+                  <template v-for="obj in moduleConfig" >
+                    <a-col v-if="obj.visible" :key="obj.id" :span="8">
+                      <div class="ioc-dashboard-more-config-item">
+                        {{ obj.name }}
+                        <div class="module-btn-opr" @click="toggleVisible(obj)">
+                          <span class="anticon" >
+                            <svg width="20" height="20" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M24 44C35.0457 44 44 35.0457 44 24C44 12.9543 35.0457 4 24 4C12.9543 4 4 12.9543 4 24C4 35.0457 12.9543 44 24 44Z" fill="#cd2a2a" stroke="#cd2a2a" stroke-width="4" stroke-linejoin="round"/><path d="M16 24L32 24" stroke="#FFF" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/></svg>
+                          </span>
+                        </div>
+                      </div>
+                    </a-col>
+                  </template>
+
+                </a-row>
+              </div>
+              <div style="margin-top: 12px;padding-left: 20px;height: auto;width: 450px">
+                <a-row :gutter="30">
+                  <template v-for="obj in moduleConfig" >
+                    <a-col v-if="!obj.visible" :key="obj.id" :span="8">
+                      <div class="ioc-dashboard-more-config-item">
+                        {{ obj.name }}
+                        <div class="module-btn-opr" style="right: 14px" @click="toggleVisible(obj)">
+                           <span class="anticon" >
+                             <svg width="20" height="20" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M24 44C35.0457 44 44 35.0457 44 24C44 12.9543 35.0457 4 24 4C12.9543 4 4 12.9543 4 24C4 35.0457 12.9543 44 24 44Z" fill="#2ea8e6" stroke="#2ea8e6" stroke-width="4" stroke-linejoin="round"/><path d="M24 16V32" stroke="#FFF" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/><path d="M16 24L32 24" stroke="#FFF" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/></svg>
+                           </span>
+                        </div>
+                      </div>
+                    </a-col>
+                  </template>
+                </a-row>
+              </div>
+            </Card>
+          </div>
+        </template>
+      </a-popover>
+    </div>
     <!--楼层概览-->
-    <div class="dashboard-floorOverflow">
-      <FloorOverview :show-pv.sync="showPv" ></FloorOverview>
+    <div class="dashboard-floorOverflow" v-if="moduleConfig.floor.visible">
+      <FloorOverview></FloorOverview>
       <div style="width: 90%;margin: 0 auto;">
-        <a-divider style="margin: 10px 0 0;padding: 0;"></a-divider>
+        <a-divider style="margin: 10px 0 10px;padding: 0;"></a-divider>
       </div>
     </div>
     <!--空间概览-->
-    <div class="dashboard-spaceOverflow" v-if="!showPv">
-      <SpaceOverview></SpaceOverview>
+    <div class="dashboard-spaceOverflow" v-if="moduleConfig.space.visible">
+      <div style="padding-left: 12px">
+        <SpaceOverview></SpaceOverview>
+      </div>
+
       <div style="width: 90%;margin: 0 auto;">
         <a-divider style="margin: 10px 0 0;padding: 0;"></a-divider>
       </div>
     </div>
     <!--碳配额概览-->
-    <div class="dashboard-carbonOverflow" v-if="!showPv">
+    <div class="dashboard-carbonOverflow" v-if="moduleConfig.carbon.visible">
       <CarbonOverviewChart></CarbonOverviewChart>
     </div>
     <!--光伏发电概览-->
-    <div class="dashboard-lightOverflow" v-if="showPv">
+    <div class="dashboard-lightOverflow" v-if="moduleConfig.pv.visible">
       <PvPowerChart></PvPowerChart>
     </div>
   </div>
 </template>
 
 <style lang="less" scoped>
-.dashboard-more {
+.ioc-dashboard-more-config-show {
+  padding: 8px 20px;
+  border: 1px solid #ecedef;
+  border-radius: 1px;
+}
+.ioc-dashboard-more-config-item {
+  color: #333333;
+  width: 120px;
+  padding: 8px 0;
+  margin: 5px 0px;
+  background-color: #f2f2f2;
+  text-align: center;
+}
+.module-btn-opr {
+  position: absolute;
+  top: -3px;
+  right: 8px;
+  cursor: pointer;
+}
+
+.ioc-dashboard-more {
   background-color: white;
-  margin-top: 12px;
   height: 740px;
-  //padding: 0 8px;
+
+  .ioc-dashboard-more-config {
+    position: absolute;
+    right: 2px;
+    top: 17px;
+  }
+
   .dashboard-floorOverflow {
     width: 100%;
-    height: auto;
   }
+
   .dashboard-spaceOverflow {
     width: 100%;
-    height: auto;
   }
+
   .dashboard-carbonOverflow {
     width: 100%;
-    height: auto;
+  }
+
+  .dashboard-lightOverflow {
+    width: 100%;
+    height: 492px;
   }
 }
 </style>

+ 18 - 52
src/components/dashboard/more/floorOverview.vue

@@ -6,20 +6,6 @@ export default {
 
     }
   },
-  emits: ['update:showPv'],
-  setup(props, context) {
-    const methods = {
-      toggleShow() {
-        const val = !props.showPv
-        context.emit('update:showPv', val)
-      },
-    }
-    return methods
-  },
-  props: {
-    showPv: Boolean,
-    change: Function
-  },
   components: {
     Card
   }
@@ -32,29 +18,22 @@ export default {
       <template #title>
         <span>楼宇概览</span>
       </template>
-      <template #title-extra>
-        <a-button type="link" style="color: #C6C8CC;font-size: 12px;height: 20px;" @click="toggleShow">
-          <span style="line-height: 20px">切换</span>
-          <a-icon type="right"></a-icon>
-        </a-button>
-      </template>
-      <a-row>
-        <a-col :span="12">
-          <a-statistic class="overflowItem" title="建筑面积 (m²)" :value="112893" />
-        </a-col>
-        <a-col :span="12">
-          <a-statistic class="overflowItem" title="建筑层数" :value="112893" />
-        </a-col>
-      </a-row>
-
-      <a-row>
-        <a-col :span="12">
-          <a-statistic class="overflowItem" title="已使用年限" :value="112893" />
-        </a-col>
-        <a-col :span="12">
-          <a-statistic class="overflowItem" title="建筑年限" :value="112893" />
-        </a-col>
-      </a-row>
+      <div style="padding: 15px">
+        <a-row :gutter="[12,20]">
+          <a-col :span="12">
+            <a-statistic class="overflowItem" title="建筑面积 (m²)" :value="112893" />
+          </a-col>
+          <a-col :span="12">
+            <a-statistic class="overflowItem" title="建筑层数" :value="21" />
+          </a-col>
+          <a-col :span="12">
+            <a-statistic class="overflowItem" title="已使用年限" :value="60" />
+          </a-col>
+          <a-col :span="12">
+            <a-statistic class="overflowItem" title="建筑年限" :value="80" />
+          </a-col>
+        </a-row>
+      </div>
 
     </Card>
   </div>
@@ -66,21 +45,8 @@ export default {
     display: inline-block;
     width: 70%;
     padding: 2% 0;
-    text-align: center;
-    margin-left: 20%;
-  }
-}
-</style>
-
-<style lang="less">
-.dashboard-more {
-  .ioc-card {
-    margin-top: 0;
-    padding: 0;
-  }
-  .card_title {
-    margin-top: 0;
-    padding: 0;
+    text-align: left;
+    margin-left: 25%;
   }
 }
 </style>

+ 5 - 3
src/components/dashboard/more/pv/pvPowerSummaryChart.vue

@@ -10,7 +10,9 @@ export default {
   },
   mounted() {
     this.$nextTick(()=>{
-      this.initChart()
+      setTimeout(()=>{
+        this.initChart()
+      },50)
     })
   },
   methods: {
@@ -24,8 +26,8 @@ export default {
         },
         grid: {
           left: '0%', //默认10%
-          right: '0%', //默认10%
-          bottom: '20%', //默认60
+          right: '1%', //默认10%
+          bottom: '25%', //默认60
           top: '20%',
           containLabel: true
           //grid区域是否包含坐标轴的刻度标签

+ 8 - 3
src/components/dashboard/more/pvPowerChart.vue

@@ -17,13 +17,18 @@ export default {
 
 <template>
   <div class="dashboard-pvPower">
-    <Card title="光伏发电量">
-      <PvPowerSummaryChart :height="230"></PvPowerSummaryChart>
+    <Card title="光伏发电量" >
+      <div style="height: 200px">
+        <PvPowerSummaryChart :height="220"></PvPowerSummaryChart>
+      </div>
+      <div style="width: 90%;margin: 0 auto;">
+        <a-divider style="margin: 10px 0 0;padding: 0;"></a-divider>
+      </div>
     </Card>
 
     <Card title="光伏盈利">
       <div style="width: 90%;margin: 0 auto;padding: 15px">
-        <PvPowerProfitChart :height="230"></PvPowerProfitChart>
+        <PvPowerProfitChart :height="200"></PvPowerProfitChart>
       </div>
     </Card>
   </div>

+ 10 - 19
src/components/dashboard/more/space/DataSituation.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="dataSituation">
     <div class="dataSituation-title">{{ title }}</div>
-    <div class="dataSituation-canvas-border" :style="{height: circleHeight+'px'}">
-      <div class="dataSituation-canvas-circle" :style="{height: circleBgHeight+'px',backgroundImage:'url('+circleBg+')'}"></div>
+    <div class="dataSituation-canvas-border" style="height: auto">
+      <img class="dataSituation-canvas-circle" :src="circleBg" />
       <div ref="dataSituation-canvas" class="dataSituation-canvas" :style="{height: canvasHeight+'px'}"></div>
     </div>
     <div class="dataSituation-detail-label">{{ totalTitle }}</div>
@@ -27,8 +27,6 @@ export default {
   data() {
     return {
       circleBg: blueCircle,
-      circleHeight: 90,
-      circleBgHeight: 0,
       canvasHeight: 0,
       colors: {
         blue: {
@@ -87,12 +85,8 @@ export default {
   },
   mounted() {
     this.$nextTick(()=>{
-      let width = document.getElementsByClassName("dataSituation-canvas-border")[0].clientWidth;
-      this.circleHeight = Number(width);
       let canvasWidth = document.getElementsByClassName("dataSituation-canvas")[0].clientWidth;
       this.canvasHeight = Number(canvasWidth)
-      let circleWidth = document.getElementsByClassName("dataSituation-canvas-circle")[0].clientWidth;
-      this.circleBgHeight = Number(circleWidth)
       this.circleBg = this.colors[this.color].circle
       this.$forceUpdate()
       let app = this;
@@ -120,7 +114,7 @@ export default {
             show: true,
             color: primaryColor,
             insideColor: 'white',
-            fontSize: 14,
+            fontSize: '0.8rem',
             fontWeight: 'normal',
             align: 'center',
             baseline: 'middle',
@@ -149,14 +143,16 @@ export default {
 <style lang="less" scoped>
 .dataSituation {
   display: inline-block;
-  margin: 5px 10px;
+  margin: 0 10%;
   width: 80%;
   padding: 0 2%;
-  //min-width: 70px;
-  height: auto;
-  min-height: 120px;
+  height: 210px;
   background-color: #f7fcff;
   border: 1px solid #f8ffff;
+  @keyframes roate{
+    0%{ transform:rotateZ(360deg);-ms-transform:rotateZ(360deg);-moz-transform:rotateZ(360deg);-webkit-transform:rotateZ(360deg);-o-transform:rotateZ(360deg);}
+    100%{ transform:rotateZ(0);-ms-transform:rotateZ(0);-moz-transform:rotateZ(0);-webkit-transform:rotateZ(0);-o-transform:rotateZ(0); }
+  }
   .dataSituation-title {
     line-height: 36px;
     font-size: 14px;
@@ -165,7 +161,7 @@ export default {
   }
   .dataSituation-canvas-border {
     width: 60%;
-    margin: 5% auto;
+    margin: 0px auto 3px;
     position: relative;
     .dataSituation-canvas {
       margin: 0 auto;
@@ -175,7 +171,6 @@ export default {
       margin: 0 auto;
       position: absolute;
       border-radius: 50%;
-      background-size: 100% 100%;
       animation: roate 3s infinite linear;
     }
 
@@ -204,8 +199,4 @@ export default {
     }
   }
 }
-@keyframes roate{
-  0%{ transform:rotateZ(360deg);-ms-transform:rotateZ(360deg);-moz-transform:rotateZ(360deg);-webkit-transform:rotateZ(360deg);-o-transform:rotateZ(360deg);}
-  100%{ transform:rotateZ(0);-ms-transform:rotateZ(0);-moz-transform:rotateZ(0);-webkit-transform:rotateZ(0);-o-transform:rotateZ(0); }
-}
 </style>

+ 23 - 25
src/components/dashboard/more/spaceOverview.vue

@@ -34,32 +34,30 @@ export default {
 </script>
 
 <template>
-  <div class="dMore-spaceOverview">
-    <Card title="空间概览">
-      <a-row :gutter="10" style="padding: 0 5%">
-        <a-col :span="8">
-          <DataSituation :percent="meeting.percent" :total-num="meeting.total" :used-num="meeting.used"
-                         title="会议态势" color="blue" total-title="总会议室(间)" used-title="饱和会议室">
-          </DataSituation>
-        </a-col>
-        <a-col :span="8">
-          <DataSituation :percent="parking.percent" :total-num="parking.total" :used-num="parking.used"
-                         title="停车态势" color="green" total-title="总停车位(个)" used-title="已使用车位">
-          </DataSituation>
-        </a-col>
-        <a-col :span="8">
-          <DataSituation :percent="work.percent" :total-num="work.total" :used-num="work.used"
-                         title="工位态势" color="yellow" total-title="总工位(个)" used-title="已使用工位">
-          </DataSituation>
-        </a-col>
-      </a-row>
+  <Card title="空间概览">
+    <a-row >
+      <a-col :span="8">
+        <DataSituation :percent="meeting.percent" :total-num="meeting.total" :used-num="meeting.used"
+                       title="会议态势" color="blue" total-title="总会议室(间)" used-title="饱和会议室">
+        </DataSituation>
+      </a-col>
+      <a-col :span="8">
+        <DataSituation :percent="parking.percent" :total-num="parking.total" :used-num="parking.used"
+                       title="停车态势" color="green" total-title="总停车位(个)" used-title="已使用车位">
+        </DataSituation>
+      </a-col>
+      <a-col :span="8">
+        <DataSituation :percent="work.percent" :total-num="work.total" :used-num="work.used"
+                       title="工位态势" color="yellow" total-title="总工位(个)" used-title="已使用工位">
+        </DataSituation>
+      </a-col>
+    </a-row>
 
-    </Card>
-  </div>
+  </Card>
 </template>
 
-<style lang="less" scoped>
-.dMore-spaceOverview {
-  padding-right: 15px
+<style scoped>
+/deep/ .card_title {
+  padding: 5px 0px 5px 0px !important;
 }
-</style>
+</style>

+ 2 - 2
src/components/dashboard/portrait/dashboardPortrait.vue

@@ -50,7 +50,7 @@ export default {
 </script>
 
 <template>
-  <div class="dashboardPortrait">
+  <div class="ioc-dashboard-portrait">
     <Card title="统计画像">
       <div style="width: 97%;margin: 0 auto">
         <a-divider style="margin: 0 0 10px;padding: 0;"></a-divider>
@@ -96,7 +96,7 @@ export default {
 </template>
 
 <style lang="less" scoped>
-.dashboardPortrait {
+.ioc-dashboard-portrait {
   width: 100%;
   height: 100%;
   .dashboardPortrait-select {

+ 15 - 13
src/components/home/HomeAside.vue

@@ -78,7 +78,7 @@ export default {
 </script>
 
 <template>
-  <div class="aside">
+  <div class="ioc-aside">
     <a-menu
       class="menu"
       theme="dark"
@@ -115,21 +115,23 @@ export default {
 @menu-dark-color: #fff;
 @menu-dark-arrow-color: #fff;
 @menu-dark-highlight-color: #fff;
-.aside-collapse {
-  width: 100%;
-}
-.aside-collapse:hover {
-  span {
-    color: #2ba8e4;
-  }
-  i {
-    color: #2ba8e4;
-  }
-}
-.aside {
+
+.ioc-aside {
   //width: 100%;
   height: 100%;
 
+  .aside-collapse {
+    width: 100%;
+  }
+  .aside-collapse:hover {
+    span {
+      color: #2ba8e4;
+    }
+    i {
+      color: #2ba8e4;
+    }
+  }
+
   /*菜单样式*/
   /deep/ .ant-menu-sub {
     box-shadow: none !important;

+ 3 - 1
src/components/home/HomeLeft.vue

@@ -93,7 +93,9 @@ export default {
   .ioc-nav {
     display: inline-block;
     vertical-align: top;
-    width: 70%;
+    width: calc(100% - 200px);
+    height: 100%;
+    overflow-y: auto;
   }
 
   /deep/ .ant-menu-item-group-title {

+ 1 - 0
src/components/home/NavigationPage.vue

@@ -42,6 +42,7 @@ export default {
 
 <style lang="less" scoped>
 .left-dashboard {
+  width: 100%;
   .menu {
     display: inline-block;
     vertical-align: top;

+ 1 - 1
src/components/life/life.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="iot-life">
-    <ContainerAside></ContainerAside>
+    <!--<ContainerAside></ContainerAside>-->
     <div class="pageContainer-body">
       <Breadcrumb></Breadcrumb>
         <div class="pageContainer-content" >

+ 2 - 3
src/main.js

@@ -1,9 +1,7 @@
 import Vue from 'vue'
 
+import Antd from 'ant-design-vue'
 import App from './App.vue'
-import router from './router'
-
-import Antd from 'ant-design-vue' 
 
 import * as echarts from 'echarts';
 import 'animate.css/animate.min.css'
@@ -17,6 +15,7 @@ import constant from '@/utils/constant.js'
 // 时间插件
 import moment from '@/utils/moment_set.js'
 
+import router from '@/router'
 import Stores from "@/stores";
 Vue.prototype.$store = Stores;
 

+ 2 - 2
src/router/index.js

@@ -4,7 +4,7 @@ import HomeView from '../views/HomeView.vue'
 import LoginView from '@/views/LoginView.vue'
 import Notice from '@/components/notice/notice.vue'
 import Empty from '@/components/Empty.vue'
-import Dashboard from "@/components/dashboard/Dashboard.vue";
+import IocDashboard from "@/components/dashboard/iocDashboard.vue";
 
 Vue.use(VueRouter)
 
@@ -34,7 +34,7 @@ const router = new VueRouter({
           path: '/dashboard',
           name: 'dashboard',
           meta: {breadcrumb: '智能看板'},
-          component: Dashboard,
+          component: IocDashboard,
         },
         {
           path: '/life',

+ 4 - 4
vite.config.js

@@ -55,10 +55,10 @@ export default defineConfig(({ command }) => {
     },
     plugins: [
       vue2(),
-      legacy({
-        targets: ['ie >= 11'],
-        additionalLegacyPolyfills: ['regenerator-runtime/runtime'],
-      }),
+      //legacy({
+      //  targets: ['ie >= 11'],
+      //  additionalLegacyPolyfills: ['regenerator-runtime/runtime'],
+      //}),
       AutoImport({
         imports: [
           'vue',

Nem az összes módosított fájl került megjelenítésre, mert túl sok fájl változott