问题修改

src/App.vue

@@ -114,7 +114,7 @@
         <!-- :style="{ paddingLeft: isFixed && menuLength > 0 ? '52px' : 0 }" -->
         <router-view />
       </div>
-      <!-- <alarmBadge /> -->
+      <alarmBadge />
     </div>
 
     <div class="curTabsBox" v-if="switchTabShow()">
@@ -310,10 +310,10 @@ export default {
               index:
                 "/economicsOperation/benchmarkingManagement/performanceRankingList",
             },
-            {
-              name: "五项对标损失",
-              index: "/economicsOperation/benchmarkingManagement/loseRate",
-            },
+            // {
+            //   name: "五项对标损失",
+            //   index: "/economicsOperation/benchmarkingManagement/loseRate",
+            // },
             {
               name: "场内对标",
               index:

src/components/alarm-badge/index.vue

@@ -1,5 +1,6 @@
 <template>
-  <div
+<div></div>
+  <!-- <div
     draggable="true"
     @dragstart="startDrag"
     @dragend="stopDrag"
@@ -24,7 +25,6 @@
         <img src="@assets/imgs/wgj1.png" />
       </div>
     </el-badge>
-    <!-- :dialogList="warnList.slice(0, 12)" -->
     <deligo-alarm-list
       @setConfig="displaySetting = true"
       @confirmed="handleConfirm"
@@ -38,7 +38,7 @@
       @cancleConfig="displaySetting = false"
       :alarmConfigArray="alarmConfigArray"
     />
-  </div>
+  </div> -->
 </template>
 
 <script>
@@ -111,22 +111,22 @@ export default {
       key: false,
       //请求参数
       requestAlarmHistoryParams: [
-        {
-          alarmType: "booststation",
-          deviceType: "",
-        },
-        {
-          alarmType: "inverter",
-          deviceType: "",
-        },
-        {
-          alarmType: "windturbine",
-          deviceType: "",
-        },
-        {
-          alarmType: "custom",
-          deviceType: "inverter",
-        },
+        // {
+        //   alarmType: "booststation",
+        //   deviceType: "",
+        // },
+        // {
+        //   alarmType: "inverter",
+        //   deviceType: "",
+        // },
+        // {
+        //   alarmType: "windturbine",
+        //   deviceType: "",
+        // },
+        // {
+        //   alarmType: "custom",
+        //   deviceType: "inverter",
+        // },
         {
           alarmType: "custom",
           deviceType: "windturbine",
@@ -505,7 +505,7 @@ export default {
       }
 
       //    && alarmOption.deviceType != "custom"
-      this.playAudioEffect();
+    //   this.playAudioEffect();
     },
     getConfigItem(lv) {
       return (

src/views/IntegratedAlarm/DetailMatrix/index.vue

@@ -2587,7 +2587,7 @@ export default {
   flex-wrap: wrap;
 
   .jzItem {
-    width: 11%;
+    width: 13%;
     height: 100px;
     background: #506382;
     display: flex;
@@ -2610,7 +2610,7 @@ export default {
     }
 
     &:nth-child(1),
-    &:nth-child(8n + 1) {
+    &:nth-child(7n + 1) {
       margin-left: 0;
     }
 

src/views/IntegratedAlarm/safe/components/safecomponent.vue

@@ -504,8 +504,3 @@ export default {
   }
 }
 </style>
-<style lang="scss">
-.alarmDialog {
-  z-index: 1100 !important;
-}
-</style>

src/views/IntegratedAlarm/safe/realWarning/index.vue

@@ -23,30 +23,11 @@ import Safecom from "@/views/IntegratedAlarm/safe/components/safecomponent.vue";
 export default {
   data() {
     return {
-      isFullScreen: false,
     };
   },
   components: {
     Safecom,
   },
-  created() {
-    const clientHeight =
-      document.documentElement.clientHeight || document.body.clientHeight;
-    if (clientHeight === 1080) {
-      this.isFullScreen = true;
-    } else {
-      this.isFullScreen = false;
-    }
-  },
-  mounted() {
-    window.onresize = () => {
-      const clientHeight =
-        document.documentElement.clientHeight || document.body.clientHeight;
-      this.isFullScreen = window.screen.height == clientHeight;
-    };
-
-    console.log("isFullScreen=====>>>>", this.isFullScreen);
-  },
 };
 </script>
 

src/views/SandTable/SandTable.vue

@@ -90,10 +90,11 @@
           class="right-panel mg-t-16"
           :style="isFullScreen ? 'height: 19vh' : 'height: 22vh'"
           title="故障情况"
-          @click="clickTime('WT2000D121H85')"
+          
           style="cursor: pointer"
         >
           <template v-slot:tools>
+            <div style="position: absolute;left: -115px;top: -5px;width: 100px;height: 30px;" @click.stop="clickTime('WT2000D121H85')"></div>
             <div class="exchange">
               <span
                 :class="probSwitch === 'z' ? 'white' : 'gray'"
@@ -210,9 +211,9 @@
           class="right-panel mg-t-16"
           :style="isFullScreen ? 'height: 19vh' : 'height: 22vh'"
           title="故障情况"
-          @click="clickTime('UP2000-130')"
         >
           <template v-slot:tools>
+            <div style="position: absolute;left: -115px;top: -5px;width: 100px;height: 30px;cursor:pointer" @click.stop="clickTime('UP2000-130')"></div>
             <div class="exchange">
               <span
                 :class="probSwitch2 === 'z' ? 'white' : 'gray'"

src/views/SandTable/component/ThreeModel1.vue

@@ -195,7 +195,7 @@ export default {
           fanX: -260,
           fanY: -200,
           position: null,
-          name: "宁夏分公司",
+          name: "新能源分公司",
           clickName: function () {
             that.clickMapItem(
               [

src/views/economicsOperation/nxfHomePage/component/percent-card-2.vue

@@ -92,14 +92,19 @@ export default {
       type: String,
       default: "green",
     },
+    percent: {
+      type: Number,
+      String,
+      default: 0,
+    },
   },
 
   computed: {
-    percent() {
-      return this.TotalValue === 0 || this.ActualValue === 0
-        ? 0
-        : parseInt((this.TotalValue / this.ActualValue) * 100);
-    },
+    // percent() {
+    //   return this.TotalValue === 0 || this.ActualValue === 0
+    //     ? 0
+    //     : parseInt((this.TotalValue / this.ActualValue) * 100);
+    // },
   },
 };
 </script>

src/views/economicsOperation/nxfHomePage/component/power-plan.vue

@@ -4,17 +4,17 @@
             <Col :span="8">
             <percent-card-2 :title="''" TotalText="周实际" ActualText="周计划" PercentText="日历进度" PercentName="周完成"
                 :TotalValue="planData.zfdlsj" :ActualValue="planData.zfdljh" :PercentValue="planData.zjd"
-                :percent="planData.zwcl" :Datasv="planData" />
+                :percent="planData.zwcl*100" :Datasv="planData" />
             </Col>
             <Col :span="8">
             <percent-card-2 :title="''" TotalText="月实际" ActualText="月计划" PercentText="日历进度" PercentName="月完成"
                 :TotalValue="planData.yfdlsj" :ActualValue="planData.yfdljh" :PercentValue="planData.yjd"
-                :percent="planData.ywcl" />
+                :percent="planData.ywcl*100" />
             </Col>
             <Col :span="8">
             <percent-card-2 :title="''" TotalText="年实际" ActualText="年计划" PercentText="日历进度" PercentName="年完成"
                 :TotalValue="planData.nfdlsj" :ActualValue="planData.nfdljh" :PercentValue="planData.njd"
-                :percent="planData.nwcl" />
+                :percent="planData.nwcl*100" />
             </Col>
         </row>
     </div>

src/views/economicsOperation/nxfHomePage/index.vue

@@ -31,9 +31,10 @@
                       <span :style="{ top: it.top }">{{ it.name }}</span>
                       <span :style="{ top: it.top1 }">{{ it.value }}</span>
                       <span :style="{ top: it.top2 }">{{ it.bfb }}%</span>
-                      <span :style="{ top: it.top3 }"
-                        >理论发电量 {{ it.total }}</span
-                      >
+                      <span :style="{ top: it.top3 }" style="display: flex;justify-content: space-between;width:130px" >
+                    <span style="left: 10px">理论发电量</span> 
+                    <span style="display:block;width:80px;font-size: 16px;left: 75px">{{ it.total }}</span>
+                    </span>
                     </div>
                     <list-bar-chart-2 :list="ForecastPower" height="15vh" />
                   </com-panel>
@@ -174,9 +175,10 @@
                   <span :style="{ top: it.top }">{{ it.name }}</span>
                   <span :style="{ top: it.top1 }">{{ it.value }}</span>
                   <span :style="{ top: it.top2 }">{{ it.bfb }}%</span>
-                  <span :style="{ top: it.top3 }"
-                    >理论发电量 {{ it.total }}</span
-                  >
+                  <span :style="{ top: it.top3 }" style="display: flex;justify-content: space-between;width:130px" >
+                    <span style="left: 10px">理论发电量</span> 
+                    <span style="display:block;width:80px;font-size: 16px;left: 75px">{{ it.total }}</span>
+                    </span>
                 </div>
                 <list-bar-chart-2 :list="ForecastPower" height="15vh" />
               </com-panel>