SunZehao 2 vuotta sitten
vanhempi
commit
52d28d3b3e

+ 3 - 0
src/assets/styles/main.css

@@ -72,6 +72,9 @@ body,
   background-color: rgb(29,106,235) !important;
 }
 
+.el-loading-mask{
+    background-color: black !important;
+}
 
 .el-table--border:after,.el-table--group:after,.el-table:before {
   background-color: black;

+ 12 - 3
src/components/PvDetailPages.vue

@@ -1,9 +1,9 @@
 <template>
-    <el-dialog width="80%" @opened="opened()" @closed="closed()" :show-close="false" class="my-info-dialog">
+    <el-dialog width="80%" @opened="opened()" @closed="closed()" :show-close="false" custom-class="my-info-dialog">
         <template #title>
             <div style="margin-top: -10px; color: #ffffff">光伏详情</div>
         </template>
-        <div class="pvDetail">
+        <div class="pvDetail" v-loading="loading">
             <div class="pvLeftDetail">
                 <div class="commonSty titleFont">
                     <span>光伏板号:</span>
@@ -93,6 +93,7 @@ export default {
             pvTitle: [],
             startTimer: null,
             echartTimer: null,
+            loading: false
         };
     },
     computed: {
@@ -108,6 +109,7 @@ export default {
     methods: {
         opened() {
             this.getPvStationInfoData()
+            this.loading = true
         },
         // 获取光伏详情配置
         getPvStationInfoData() {
@@ -277,6 +279,7 @@ export default {
             dom.removeAttribute("_echarts_instance_")
             let myChart = echarts.init(dom, 'dark');
             myChart.setOption(option);
+            this.loading = false
             window.addEventListener("resize", function () {
                 myChart.resize()
             })
@@ -394,11 +397,17 @@ export default {
             }
             .pvRightBotEchart{
                 width: 100%;
-                height: calc(100% - 70px);
+                // height: calc(100% - 70px);
+                height: 380px;
             }
         }
     }
 }
 
 
+</style>
+<style lang="less">
+.my-info-dialog{
+    margin-top: 10vh !important;
+}
 </style>

+ 1 - 1
src/components/allMatrices.vue

@@ -2,7 +2,7 @@
   <el-dialog width="70%" @open="opened" @closed="closed" :fullscreen="true" :show-close="true" class="dialogs">
     <template #title>
       <div class="showTitles currentShowTitles">
-        <div class="titles">风机矩阵</div>
+        <div class="titles">矩阵</div>
       </div>
     </template>
     <div class="body" @contextmenu="contextmenu">

+ 1 - 3
src/components/focus/syzDetails.vue

@@ -110,7 +110,6 @@ import Xh from "../BoosterStation/xh.vue";
 import api from "api/index";
 
 import CurrentWarningCard from "./currentWarningCard.vue";
-import getSvgFromApi from "../BoosterStation/getSvgFromApi.vue";
 export default {
     props: {
         activeTabStation: {
@@ -130,8 +129,7 @@ export default {
         Pl2,
         Mch,
         Xh,
-        CurrentWarningCard,
-        getSvgFromApi
+        CurrentWarningCard
     },
     data() {
         return {