alarmCt为预警，alarmWt为故障，alarmList里面的数据为圈选多少个就传多少个，wtId为风机，time为时间

src/views/powerGenerating/windAnalyse/combine/index.vue

@@ -346,6 +346,7 @@ const chartRef = ref(); //chart 的ref
 const seriesData = ref([]);
 const isChartArea = ref(false); // 用来控制图表是否区域划分
 const dataSet = ref("");
+const allpowerFittingData = ref([]);
 const funChartSelect = async (batch) => {
   const wDataArr = [];
   const yDataArr = [];
@@ -373,6 +374,14 @@ const funChartSelect = async (batch) => {
         wk: wDataArr.join(","),
         only: dataRadom.value,
       });
+      allpowerFittingData.value = [];
+      wtRes.data.forEach((it) => {
+        let obj = {
+          wtId: it.wtId,
+          time: it.time,
+        };
+        allpowerFittingData.value.push(obj);
+      });
       if (wtRes.code === 200) {
         let id = 1;
         const tempArr = []; //用于以风机id 聚合dataArr
@@ -532,7 +541,8 @@ const handleClick = (val) => {
 //故障数据
 const faultDataFn = async () => {
   let params = {
-    only: dataRadom.value,
+    // only: dataRadom.value,
+    alarmList: allpowerFittingData.value,
     table: "alarmWt",
   };
   const faultRes = await getWindFittingAlarms(params);
@@ -541,7 +551,8 @@ const faultDataFn = async () => {
 //预警数据
 const warnDataFn = async () => {
   let params = {
-    only: dataRadom.value,
+    // only: dataRadom.value,
+    alarmList: allpowerFittingData.value,
     table: "alarmCt",
   };
   const warnRes = await getWindFittingAlarms(params);
@@ -617,32 +628,32 @@ onActivated(() => {
         </el-tab-pane>
         <el-tab-pane label="故障" name="problem">
           <el-table :data="faultData" row-key="id" :max-height="550">
-            <el-table-column property="deviceId" align="center" label="风机" />
+            <el-table-column property="wtid" align="center" label="风机" />
             <el-table-column
-              property="ts"
+              property="time"
               sortable
               :width="160"
               align="center"
               label="时间"
             >
-              <template v-slot="scope">
+              <!-- <template v-slot="scope">
                 {{ new Date(scope.row.ts).formatDate("yyyy-MM-dd hh:mm:ss") }}
-              </template>
+              </template> -->
             </el-table-column>
             <el-table-column
-              property="characteristic"
+              property="tx"
               sortable
               align="center"
               label="特性"
             />
             <el-table-column
-              property="components"
+              property="bj"
               sortable
               align="center"
               label="部件"
             />
             <el-table-column
-              property="description"
+              property="alarmname"
               sortable
               align="center"
               label="描述"
@@ -651,32 +662,32 @@ onActivated(() => {
         </el-tab-pane>
         <el-tab-pane label="预警" name="warning">
           <el-table :data="warnData" row-key="id" :max-height="550">
-            <el-table-column property="deviceId" align="center" label="风机" />
+            <el-table-column property="wtid" align="center" label="风机" />
             <el-table-column
-              property="ts"
+              property="time"
               sortable
               :width="160"
               align="center"
               label="时间"
             >
-              <template v-slot="scope">
+              <!-- <template v-slot="scope">
                 {{ new Date(scope.row.ts).formatDate("yyyy-MM-dd hh:mm:ss") }}
-              </template>
+              </template> -->
             </el-table-column>
             <el-table-column
-              property="characteristic"
+              property="tx"
               sortable
               align="center"
               label="特性"
             />
             <el-table-column
-              property="components"
+              property="bj"
               sortable
               align="center"
               label="部件"
             />
             <el-table-column
-              property="description"
+              property="alarmname"
               sortable
               align="center"
               label="描述"