合并develop最新代码

src/views/ems/dzjk/tjbb/dcdqx/index.vue

@@ -125,9 +125,12 @@ export default {
       })
       this.chart.setOption({
         color:['#FFBD00','#3C81FF'],
+        grid: {
+          containLabel: true
+        },
         legend: {
           left: 'center',
-          bottom: '10',
+          bottom: '15',
         },
         tooltip: {
           trigger: 'axis',

src/views/ems/dzjk/tjbb/dcwd/index.vue

@@ -171,7 +171,7 @@ export default {
     },
     async getClusterList(){
       this.clusterloading =true
-      await getClusterNameList(this.search.stackId).then(response => {
+      await getClusterNameList({stackDeviceId: this.search.stackId, siteId: this.siteId}).then(response => {
         const data = JSON.parse(JSON.stringify(response?.data || []))
         this.clusterOptions = data
         this.search.clusterId = data.length > 0 ? data[0].id : ''

src/views/ems/dzjk/tjbb/glqx/index.vue

@@ -121,9 +121,12 @@ export default {
       })
       this.chart.setOption({
         color:['#FFBD00','#3C81FF'],
+        grid: {
+          containLabel: true
+        },
         legend: {
           left: 'center',
-          bottom: '10',
+          bottom: '15',
         },
         tooltip: {
           trigger: 'axis',

src/views/ems/dzjk/tjbb/gltj/Dlzb.vue

@@ -31,7 +31,7 @@
         <div>总放电量:<span class="point">{{totalDisChargedCap | formatNumber}}kWh</span></div>
         <div>综合效率:<span class="point">{{efficiency | formatNumber}}%</span></div>
       </div>
-      <div id="dlzbChart" style="height: 310px"></div>
+      <div id="dlzbChart" style="height: 310px;"></div>
     </div>
   </el-card>
 </template>
@@ -73,16 +73,21 @@ export default {
       })
       this.chart.setOption({
         color:['#FFBD00','#3C81FF','#05AEA3'],
-        // legend: {
-        //   left: 'right',
-        //   bottom: '10',
-        // },
-        tooltip: {},
-        xAxis: {
-          type: 'category',
-          name:unit,
-          nameLocation:'center'
+        legend: {
+          left: 'center',
+          bottom: '15',
         },
+        grid: {
+          top:40,
+          containLabel: true
+        },
+        tooltip: {},
+        xAxis: [{
+          type: 'category',
+          name:`单位：${unit}`,
+          nameLocation:'center',
+          nameGap:30
+        }],
         yAxis: [{
           type: 'value',
           name:'充电量/放电量kWh',
@@ -102,7 +107,6 @@ export default {
             onZero:false
           }
         }],
-        grid:{top:40},
         dataset:{
           source
         },
@@ -163,7 +167,7 @@ export default {
   line-height: 18px;
   color: #333333;
   font-size: 16px;
-  padding:10px 0;
+  padding:20px 0;
   >div{
     display: inline-block;
     margin-right: 20px;

src/views/ems/dzjk/tjbb/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="ems-dashboard-editor-container ems-content-container-padding tjbb-ems-dashboard-editor-container">
+  <div class="ems-dashboard-editor-container ems-third-menu-container">
     <el-menu
       class="ems-third-menu"
       :default-active="$route.name"
@@ -7,51 +7,55 @@
       text-color="#666666"
       active-text-color="#ffffff"
     >
-      <el-menu-item :index="item.name" v-for="(item,index) in childrenRoute" :key="index+'tjbbChildrenRoute'">
-        <router-link  style="height: 100%;width: 100%;display: block;" :to="{path:item.path,query:$route.query}">
-          {{item.meta.title}}
+      <el-menu-item
+        :index="item.name"
+        v-for="(item, index) in childrenRoute"
+        :key="index + 'tjbbChildrenRoute'"
+      >
+        <router-link
+          style="height: 100%; width: 100%; display: block"
+          :to="{ path: item.path, query: $route.query }"
+        >
+          {{ item.meta.title }}
         </router-link>
       </el-menu-item>
     </el-menu>
 
-    <div class="ems-content-container ems-content-container-padding tjbb-ems-content-container">
+    <div
+      class="ems-content-container ems-content-container-padding tjbb-ems-content-container"
+    >
       <keep-alive>
         <router-view></router-view>
       </keep-alive>
     </div>
   </div>
-
 </template>
 
 <script>
-import { dzjk } from '@/router/ems'
-const childrenRoute =  dzjk[0].children.find(item=> item.name==='DzjkTjbb').children//获取到统计报表下面的字路由
-console.log('设备监控子路由',childrenRoute)
+import { dzjk } from "@/router/ems";
+const childrenRoute = dzjk[0].children.find(
+  (item) => item.name === "DzjkTjbb"
+).children; //获取到统计报表下面的字路由
+console.log("设备监控子路由", childrenRoute);
 export default {
-  name:'DzjkTjbb',
-  data(){
+  name: "DzjkTjbb",
+  data() {
     return {
       childrenRoute,
-      activeMenu:''
-    }
+      activeMenu: "",
+    };
   },
   mounted() {
-    console.log('当前统计报表页面路由',this.$route)
-  }
-
-}
+    console.log("当前统计报表页面路由", this.$route);
+  },
+};
 </script>
 
 <style scoped lang="scss">
-.tjbb-ems-dashboard-editor-container{
-  display: flex;
-  background: #FFFFFF;
-}
-.tjbb-ems-content-container{
-  margin-top:0;
-  padding-top:0;
+.tjbb-ems-content-container {
+  margin-top: 0;
+  padding-top: 0;
   padding-right: 0;
   flex: 1;
 }
 </style>
-

src/views/ems/dzjk/tjbb/pcsqx/index.vue

@@ -128,9 +128,12 @@ export default {
       })
       this.chart.setOption({
         color:['#FFBD00','#3C81FF','#91cc74'],
+        grid: {
+          containLabel: true
+        },
         legend: {
           left: 'center',
-          bottom: '10',
+          bottom: '15',
         },
         tooltip: {
           trigger: 'axis',