单风机:调整显示逻辑

故障录波:修改无故障时刻时间数据不显示故障事件的问题

ui/dasadmin/src/views/backend/WindBlower/index.vue

@@ -60,6 +60,7 @@
                     </div>
 
                     <!--温度-->
+                    <el-tooltip content="点击打开温度管理">
                         <div class="temperatureList">
                             <div class="chartPart-item" @click="openTemperature">
                                 <div class="chartParm" ref="temperatureChartRef1"></div>
@@ -71,6 +72,7 @@
                                 <div class="chartParm" ref="temperatureChartRef3"></div>
                             </div>
                         </div>
+                    </el-tooltip>
                 </div>
             </el-col>
 
@@ -169,8 +171,10 @@
                                     <div class="summarize-panel-base">
                                         <div>
                                             <span class="content-number">{{ realTimeDataForSingle.ikwhthisday }}</span>
+                                            &nbsp;
+                                            <span class="content-number">{{ realTimeDataForSingleUnit.ikwhthisday }}</span>
                                         </div>
-                                        <div>{{ realTimeDataForSingleUnit.ikwhthisday }}</div>
+                                        <!-- <div>{{ realTimeDataForSingleUnit.ikwhthisday }}</div> -->
                                         <div>日发电量</div>
                                     </div>
                                 </div>
@@ -181,8 +185,10 @@
                                     <div class="summarize-panel-base">
                                         <div>
                                             <span class="content-number">{{ realTimeDataForSingle.monthprodenergy }}</span>
+                                            &nbsp;
+                                            <span class="content-number">{{ realTimeDataForSingleUnit.monthprodenergy }}</span>
                                         </div>
-                                        <div>{{ realTimeDataForSingleUnit.monthprodenergy }}</div>
+                                        <!-- <div>{{ realTimeDataForSingleUnit.monthprodenergy }}</div> -->
                                         <div>月发电量</div>
                                     </div>
                                 </div>
@@ -195,8 +201,10 @@
                                     <div class="summarize-panel-base">
                                         <div>
                                             <span class="content-number">{{ realTimeDataForSingle.yearprodenergy }}</span>
+                                            &nbsp;
+                                            <span class="content-number">{{ realTimeDataForSingleUnit.yearprodenergy }}</span>
                                         </div>
-                                        <div>{{ realTimeDataForSingleUnit.yearprodenergy }}</div>
+                                        <!-- <div>{{ realTimeDataForSingleUnit.yearprodenergy }}</div> -->
                                         <div>年发电量</div>
                                     </div>
                                 </div>
@@ -207,8 +215,10 @@
                                     <div class="summarize-panel-base">
                                         <div>
                                             <span class="content-number">{{ realTimeDataForSingle.ikwhoverall }}</span>
+                                            &nbsp;
+                                            <span class="content-number">{{ realTimeDataForSingleUnit.ikwhoverall }}</span>
                                         </div>
-                                        <div>{{ realTimeDataForSingleUnit.ikwhoverall }}</div>
+                                        <!-- <div>{{ realTimeDataForSingleUnit.ikwhoverall }}</div> -->
                                         <div>总发电量</div>
                                     </div>
                                 </div>
@@ -1935,7 +1945,7 @@ $labelHeight: 24px;
         // min-height: 920px;
         .summarize {
             width: 100%;
-            height: 40%;
+            height: 35%;
             @include cardDefaultStyle;
             @include cardlabel;
             .summarize-panel-list {
@@ -1979,6 +1989,9 @@ $labelHeight: 24px;
                                     color: #333333;
                                     font-size: 16px;
                                     font-weight: 600;
+                                    &:last-child{
+                                        font-size: 14px;
+                                    }
                                 }
                                 &:first-child {
                                     height: 40%;
@@ -1994,7 +2007,7 @@ $labelHeight: 24px;
             margin: 10px 0;
             width: 100%;
             // min-height: 350px;
-            height: calc(60% - 20px);
+            height: calc(65% - 20px);
             @include cardDefaultStyle;
             @include cardlabel;
         }

ui/dasadmin/src/views/backend/equipment/airBlower/index.vue

@@ -184,7 +184,12 @@
             </el-row>
         </el-dialog>
         <el-dialog v-model="selectPointVisible" title="选择测点" width="1000">
-            <SelectPoint ref="selectPointDialogRef" :defaultAttr="defaultAttr" :visible="selectPointVisible" :iot-model-id="selectPointModelId"></SelectPoint>
+            <SelectPoint
+                ref="selectPointDialogRef"
+                :defaultAttr="defaultAttr"
+                :visible="selectPointVisible"
+                :iot-model-id="selectPointModelId"
+            ></SelectPoint>
             <template #footer>
                 <div class="selectPointDialogFooter">
                     <el-button type="primary" @click="saveSelectPoint">保存</el-button>
@@ -226,7 +231,6 @@ import { getRealValueListReq } from '/@/api/backend/deviceModel/request'
 import SelectPoint from '/@/views/backend/equipment/airBlower/selectPoint.vue'
 import RealDataChart from '/@/views/backend/equipment/airBlower/realDataChart.vue'
 const router = useRouter()
-
 const { t } = useI18n()
 
 const airBlowerSelect = reactive<SelectTypeObjType>({
@@ -664,7 +668,7 @@ const openWindTurbine = (row: TableDataObjType) => {
             iotModelId: row.iotModelId,
             deviceCode: row.deviceCode,
             model: row.model,
-            name:row.name
+            name: row.name,
         },
     })
 }
@@ -696,7 +700,7 @@ const defaultAttr = computed(() => {
         }
     })
 })
-const selectPointModelId = computed(()=>{
+const selectPointModelId = computed(() => {
     return tableData.value[0]?.iotModelId ?? ''
 })
 const openMeasure = () => {

ui/dasadmin/src/views/backend/malfunction/index.vue

@@ -374,8 +374,6 @@ const getListForAirBlower = () => {
         startTime: dayjs(searchData.date[0]).format('YYYY-MM-DD'),
         endTime: dayjs(searchData.date[1]).format('YYYY-MM-DD'),
     }
-    console.log('🚀 ~ getListForAirBlower ~ data:', data)
-
     if (activeName.value === 'malFunction') {
         getMalFunctionListReq(data).then((res) => {
             if (res.success) {
@@ -520,15 +518,27 @@ const readFile = (data: tableItemData) => {
     getFileKeyEnum().finally(() => {
         getFileData(data.path)
             .then((res) => {
-                warningInfo.value = res.data.faultTime ? dayjs(res.data.faultTime).format('YYYY-MM-DD HH:mm:ss.SSS') : ''
+                // warningInfo.value = res.data.faultTime ? dayjs(res.data.faultTime).format('YYYY-MM-DD HH:mm:ss.SSS') : ''
+
                 previewChartData = res.data.dataCurve
                 const attrName = Object.keys(res.data.dataCurve)
                 const data: any = []
+                let hasAddFaultTime = false
                 attrName.forEach((item) => {
                     if (item === 'TimeStamp') {
+                        let timeStamp: any = []
                         previewChartData.TimeStamp = previewChartData.TimeStamp.map((item: any) => {
-                            return dayjs(item).format('YYYY-MM-DD HH:mm:ss.SSS')
+                            const parseTime = dayjs(item).format('YYYY-MM-DD HH:mm:ss.SSS')
+                            if (!hasAddFaultTime && res.data?.faultTime && item > res.data.faultTime) {
+                                const parseFaultTime = dayjs(res.data.faultTime).format('YYYY-MM-DD HH:mm:ss.SSS')
+                                warningInfo.value = parseFaultTime
+                                timeStamp.push(parseFaultTime)
+                                hasAddFaultTime = true
+                            }
+                            timeStamp.push(parseTime)
+                            return parseTime
                         })
+                        warningChartData.TimeStamp = timeStamp
                     } else if (item === 'TimeStampUTC') {
                         previewChartData.TimeStamp = previewChartData.TimeStampUTC.map((item: any) => {
                             return dayjs(item).format('YYYY-MM-DD HH:mm:ss.SSS')
@@ -541,6 +551,7 @@ const readFile = (data: tableItemData) => {
                         })
                     }
                 })
+
                 previewTreeData.value = data
                 originPreviewTreeData = data
             })
@@ -636,6 +647,7 @@ const handleCheckChange = (data: any, state: { checkedKeys: string[] }) => {
 //     }
 // }
 let previewChartData: any = {}
+let warningChartData: any = {}
 let curSeries: any = []
 let previewChartInstance: any = null
 const previewChartRef = ref()
@@ -670,14 +682,7 @@ const createSeriresData = () => {
                 },
                 smooth: 0.6,
                 symbol: 'none',
-                markLine: {
+                xAxisIndex: 0,
-                    symbol: 'none',
-                    data: [
-                        {
-                            xAxis: warningInfo.value,
-                        },
-                    ],
-                },
                 data: previewChartData[item],
             }
             seriesData.push(data)
@@ -703,7 +708,8 @@ const initPreviewChart = () => {
                 type: 'line',
             },
         },
-        xAxis: {
+        xAxis: [
+            {
                 type: 'category',
                 axisLine: {
                     show: true,
@@ -732,6 +738,12 @@ const initPreviewChart = () => {
                 },
                 data: previewChartData['TimeStamp'],
             },
+            {
+                type: 'category',
+                show: false,
+                data: warningChartData.TimeStamp,
+            },
+        ],
         yAxis: [
             {
                 type: 'value',
@@ -779,7 +791,27 @@ const initPreviewChart = () => {
                 color: '#73767a',
             },
         },
-        series: series,
+        series: [
+            ...series,
+            {
+                type: 'line',
+                name: '报警值',
+                data: [],
+                xAxisIndex: 1,
+                tooltip: {
+                    show: false,
+                },
+                markLine: {
+                    symbol: 'none',
+                    data: [
+                        {
+                            xAxis: warningInfo.value,
+                        },
+                    ],
+                    animation: false,
+                },
+            },
+        ],
     }
     chart.setOption(option)
     previewChartInstance = chart