xujuanning 2 miesięcy temu
rodzic
commit
39e55b5557

+ 2 - 2
src/components/windDetail/index.vue

@@ -292,12 +292,12 @@
                   :key="ind"
                 >
                   <div>{{ item.name }}</div>
+                    <!-- : item.name == "总发电量"
+                    ? (item.value / 10000).toFixed(2) -->
                   <div class="table-value-ai">
                     {{
                       item.name.includes("状态")
                         ? item.value
-                        : item.name == "总发电量"
-                        ? (item.value / 10000).toFixed(2)
                         : Number(item.value).toFixed(2)
                     }}
                     <div v-if="item.valueUnit != 'NULL'" class="unit-ai">

+ 3 - 1
src/views/IntegratedAlarm/reliability/historyAnalyse/index.vue

@@ -798,11 +798,13 @@ const changeTableData = (res) => {
         let wtItem = data.find((tableItem) => {
           return wtId === tableItem.windturbineId;
         });
+          debugger
+
         !wtItem && (wtItem = { wtId });
         if (pEle[wtId].length > 0) {
           pEle[wtId].forEach((cEle) => {
             let someRes = tHeard.some((findEle) => {
-              return findEle.label == cEle.alertText;
+              return (findEle.label == cEle.alertText) && (findEle.code == cEle.alarmid);
             });
 
             if (!someRes) {