解决冲突

src/views/IntegratedAlarm/reliability/customAnalyse/index.vue

@@ -340,6 +340,17 @@ const getCalcValue = (num) => {
     return Math.ceil(num);
   }
 };
+// :style="showSty(scope, '_count')"
+// :style="showSty(scope, '_time')"
+
+const showSty = (scope, type) => {
+  let str = "";
+  let num =
+    (Math.ceil(scope.row[`${item.code}${type}`]) /
+      Math.ceil(scope.column.realWidth)) *
+    100;
+  return (str = "width:" + num + "px");
+};
 
 const changeType = async (value) => {
   state.typeVal = value;

src/views/generatingCapacity/dataAnalysis/angleAnalysis/index.vue

@@ -52,7 +52,7 @@
             </div>
             <div v-show="activeTab === '1'" :style="{ height: tableHeight }">
               <!-- :height="`calc( ${tableHeight})`" -->
-              <p :style="!theme ? 'color: #fff' : 'color: #000'" style="width: 100%;text-align: center">变桨角度偏差率:{{angleData*100}}%</p>
+              <p :style="!theme ? 'color: #fff' : 'color: #000'" style="width: 100%;text-align: center">变桨角度偏差率:{{angleData ? angleData : 0}}%</p>
               <CurrentScatterChart
                 ref="chartRef"
                 width="100%"

src/views/generatingCapacity/yhjyReport/index.vue

@@ -357,6 +357,7 @@
                 theme: true,
                 loading: false,
                 reportParamDate: dayjs()
+                    .subtract(1, "month")
                     .startOf("month")
                     .format("YYYY-MM"),
             };

src/views/powerPrediction/homePageNoMap.vue

@@ -1304,8 +1304,9 @@
                     this.extremeWeather.forEach(it => {
                         if (item.name === it.terminalName) {
                             let obj = {
-                                alertTitle: it.alertTitle,
-                                alertMessage: it.alertMessage
+                                alertTitle: it.alertTitle ? it.alertTitle : item.data[0].name,
+                                alertMessage: it.alertMessage ? it.alertMessage : item.data[0]
+                                    .msg
                             }
                             item.alertObj = obj
                         }