新增气象页面

src/api/factoryMonitor/index.js

@@ -144,7 +144,7 @@ export function GetMatrixalarmtype(data) {
 export function GetMatrixalarmtypeTable(data) {
     return request({
       baseURL: process.env.VUE_APP_API,
-      url: `matrix/alarm?type=BJXT&wtid=NX_FGS_HA_F_WT_0039_EQ`,
+      url: `matrix/alarm?type=${data.type}&wtid=${data.wtid}`,
       method: "get",
     });
 }

src/api/zhbj/index.js

@@ -27,6 +27,14 @@ export function GetTableData(data) {
     method: "get",
   });
 }
+export function GetTableDataXo(data) {
+    return request({
+      baseURL: process.env.VUE_APP_ALARM,
+      url: `/alarm/history/selectByWtIsNotClose`,
+      params: data,
+      method: "get",
+    });
+  }
 //查询历史报警记录
 export const alarm_history = (params, timeout = 9000) => {
   return request({
@@ -1055,4 +1063,12 @@ export function apiGetwinddirection(params) {
         url: `winddirecton/machine?wpid=${params.wpid}`,
         method: 'get'
     })
+}
+
+export function apiGetweatherMachine(params) {
+    return request({
+        baseURL: process.env.VUE_APP_API,
+        url: `winddirecton/weatherMachine?wpid=${params.wpid}`,
+        method: 'get'
+    })
 }

src/components/windDetail/index.vue

@@ -169,7 +169,7 @@
             液压
           </div>
           <div
-            class="title-item"
+            class="title-item part-right"
             :class="{ active: current === 'jc' }"
             @click="handleClick('jc')"
           >
@@ -182,13 +182,13 @@
           >
             其他
           </div> -->
-          <div
+          <!-- <div
             class="title-item part-right"
             :class="{ active: current === 'zz' }"
             @click="handleClick('zz')"
           >
             主轴
-          </div>
+          </div> -->
         </div>
         <div class="part-imgs" v-if="otherInfo?.model == 'XE100-2000'">
           <img
@@ -246,6 +246,7 @@
         <div
           class="part-body"
           style="max-height: 25vh"
+          v-if="partDInfos.length>0"
         >
           <div class="monitoring-item">
             <div class="point point-left bottom"></div>
@@ -272,6 +273,7 @@
         <div
           class="part-body"
           style="max-height: 25vh"
+          v-if="partAInfos.length>0"
         >
           <div class="monitoring-item">
             <div class="point point-left bottom"></div>
@@ -311,14 +313,14 @@
             <div class="point point-left bottom"></div>
             <div class="point point-right bottom"></div>
             <span style="font-size: 16px;position: relative;top: -5px;">故障分类</span>
-            <div class="problemSeach">
+            <!-- <div class="problemSeach">
                 <el-input v-model="inputcv" clearable placeholder="请输入" />
                 <div class="seachBtn">
                     <el-icon :size="18" :color="color">
                         <Search />
                     </el-icon>
                 </div>
-            </div>
+            </div> -->
         </div>
         <div class="problemMain">
             <div class="problemWarn">
@@ -333,31 +335,31 @@
                             <img src="@/assets/imgs/danger.png" alt="">
                         </div>
                         <div class="warnComNum">
-                            <div class="numTop">42</div>
+                            <div class="numTop">{{warnTypeData.total}}</div>
                             <div class="numBot">总故障</div>
                         </div>
                     </div>
-                    <div class="warnItems" v-for="(it, index) in 7" :key="index">
-                        <div class="warnItemLeft">20</div>
-                        <div class="warnItemRight">防雷保护类</div>
+                    <div class="warnItems" v-for="(it, index) in warnTypeData.dataColumn1" :key="index" @click="getwarnTableData(it)">
+                        <div class="warnItemLeft">{{it.count}}</div>
+                        <div class="warnItemRight">{{it.name}}</div>
                     </div>
                 </div>
-                <div class="warn" v-for="(it, index) in 2" :key="index">
-                    <div class="warnItems" v-for="(it, index) in 10" :key="index">
-                        <div class="warnItemLeft" :class="isRed(index)">20</div>
-                        <div class="warnItemRight" :class="isRed(index)">防雷保护类</div>
+                <div class="warn" v-for="(it, index) in warnTypeData.dataColumnOther" :key="index">
+                    <div class="warnItems" v-for="(itv, index) in it" :key="index" @click="getwarnTableData(itv)">
+                        <div class="warnItemLeft" :class="isRed(index)">{{itv.count}}</div>
+                        <div class="warnItemRight" :class="isRed(index)">{{itv.name}}</div>
                     </div>
                 </div>
             </div>
             <div class="warnTable">
                 <el-table
                     size="mini"
-                    :data="tableData"
+                    :data="warnTypeData.tableData"
                     style="width: 100%; height: calc(100% - 310px)"
-                    max-height="520px"
+                    max-height="580px"
                     stripe>
                     <el-table-column
-                        v-for="item in tableHeader"
+                        v-for="item in warnTypeData.tableHeader"
                         :label="item.name"
                         :prop="item.code"
                         :key="item.code"
@@ -367,8 +369,8 @@
                         align="center"
                     >
                     <template #default="scope">
-                        <span v-if="item.code == 'status'">
-                            <span :style="scope.row.status === 0 ? 'color: red' : ''">{{scope.row.status === 0 ? "异常" : "正常"}}</span>
+                        <span v-if="item.code == 'isClose'">
+                            <span :style="scope.row.isClose ? 'color: red' : 'color: green'">{{scope.row.isClose ? "未解除" : "已解除"}}</span>
                         </span>
                         <span v-else>
                             {{
@@ -587,28 +589,34 @@ export default {
         },
 
       ],
-      tableHeader: [
+      
+      warnTypeData: {
+        total: "",
+        typeData: [],
+        tableData: [],
+        dataColumn1: [],
+        dataColumnOther: [],
+        tableHeader: [
         {
-            code: "code",
+            code: "alarmId",
             name: "报警编号"
         },
         {
-            code: "name",
+            code: "id",
             name: "PCL变量名"
         },
         {
-            code: "message",
+            code: "tagid",
             name: "报警文字信息"
         },
         {
-            code: "status",
+            code: "isClose",
             name: "报警状态"
         },
       ],
-      warnTypeData: {
-        typeData: [],
-        tableData: []
-      }
+      },
+        windObj: {}
+
     };
   },
   components: { svgIcon, alarmDialog, powerAndSpeed,  },
@@ -659,6 +667,7 @@ export default {
       oIframe.style.width = deviceWidth + "px";
       oIframe.style.height = deviceHeight + "px";
     }
+
   },
 
   unmounted() {
@@ -671,7 +680,8 @@ export default {
     wind: {
       handler() {
         if (Object.keys(this.wind).length) {
-          this.start(this.wind);
+            this.start(this.wind);
+            this.getwarnTypeData(this.wind.wtid)
         }
       },
     },
@@ -689,30 +699,46 @@ export default {
     },
   },
   methods: {
-    getwarnTypeData() {
+    getwarnTypeData(id) {
         let that = this
         let params = {
-            wtid: "NX_FGS_HA_F_WT_0039_EQ"
-            // wtid: that.wind.wtid
+            // wtid: "NX_FGS_HA_F_WT_0039_EQ"
+            wtid: id
         }
         GetMatrixalarmtype(params).then(res =>{
-            if (res && res.data) {
-                that.warnTypeData.typeData = res.data
-                that.getwarnTableData(res.data[0])
+            if (res && res.data && res.data.data.data.length>0) {
+                for(let i =0; i<res.data.data.data.length; i++) {
+                    let item = res.data.data.data[i]
+                    for(let k in res.data.data.count) {
+                        if (item.nemCode === k) {
+                            item.count = res.data.data.count[k]
+                        }
+                    }
+                }
+                that.warnTypeData.total = res.data.data.count.zs
+                that.warnTypeData.typeData = res.data.data.data
+                that.warnTypeData.dataColumn1 = that.warnTypeData.typeData.slice(0, 5)
+                that.warnTypeData.dataColumnOther[0] = that.warnTypeData.typeData.slice(5, 13)
+                that.warnTypeData.dataColumnOther[1] = that.warnTypeData.typeData.slice(13, 21)
+                console.log("typeData===>>>", that.warnTypeData.typeData)
+                that.getwarnTableData(that.warnTypeData.typeData[0], id)
             }
         })
     },
-    getwarnTableData(data) {
+    getwarnTableData(data, id) {
         let that = this
         let params = {
-            type: "BJXT",
-            wtid: "NX_FGS_HA_F_WT_0039_EQ"
-            // type: data.nemCode,
-            // wtid: that.wind.wtid
+            // type: "BJXT",
+            // wtid: "NX_FGS_HA_F_WT_0039_EQ",
+            type: data.nemCode,
+            wtid: id
         }
         GetMatrixalarmtypeTable(params).then(res =>{
             if (res && res.data) {
-                that.warnTypeData.tableData = res.data
+                res.data.data.forEach(it =>{
+                    it.isClose = it.closeTime ? true : it.endts ? true : false
+                })
+                that.warnTypeData.tableData = res.data.data
             }
         })
     },
@@ -781,6 +807,8 @@ export default {
     // 查看各部位编码
     handleClick(val) {
       this.current = val;
+      this.partAInfos = [];
+      this.partDInfos = [];
       if (this.wtid) {
         this.getPartInfo();
       }
@@ -804,11 +832,21 @@ export default {
               ? this.partAInfo.map((item) => item.uniformCode)
               : [];
             // 获取测点数据
-            this.getPointsIds();
+            // if (this.uniformcodesA.length>0 && this.uniformcodesD.length>0) {
+            //     this.getPointsIds();
+            // } else {
+                if (this.uniformcodesA.length>0) {
+                    this.getPointsIdOne('AI', this.uniformcodesA);
+                } 
+                if(this.uniformcodesD.length>0) {
+                    this.getPointsIdOne('DI', this.uniformcodesD);
+                }
+            // }
           });
         }
       }
     },
+    //查询数据AI和DI同时存在
     getPointsIds() {
       let pointsIdsA = new Promise((resolve, reject) => {
         GetWtPoints({
@@ -851,28 +889,32 @@ export default {
     },
     getPointsData(pointsA, pointsD) {
       let pointsDataA = new Promise((resolve, reject) => {
-        GetPointsData({
-          pointIds: pointsA,
-        })
-          .then(({ data }) => {
-            resolve(data);
-          })
-          .catch((e) => {
-            // 标记失败后给定某个数据
-            reject("发生错误");
-          });
+        if (pointsA.length>0) {
+            GetPointsData({
+              pointIds: pointsA,
+            })
+              .then(({ data }) => {
+                resolve(data);
+              })
+              .catch((e) => {
+                // 标记失败后给定某个数据
+                reject("发生错误");
+              });
+        }
       });
       let pointsDataD = new Promise((resolve, reject) => {
-        GetPointsData({
-          pointIds: pointsD,
-        })
-          .then(({ data }) => {
-            resolve(data);
-          })
-          .catch((e) => {
-            // 标记失败后给定某个数据
-            reject("发生错误");
-          });
+        if (pointsD.length>0) {
+            GetPointsData({
+              pointIds: pointsD,
+            })
+              .then(({ data }) => {
+                resolve(data);
+              })
+              .catch((e) => {
+                // 标记失败后给定某个数据
+                reject("发生错误");
+              });
+        }
       });
       Promise.all([pointsDataA, pointsDataD])
         .then((results) => {
@@ -909,6 +951,72 @@ export default {
           console.log("error", e);
         });
     },
+    //查询数据只有AI点或者只有DI点
+    getPointsIdOne(type, uniformcodesXo) {
+        GetWtPoints({
+          wtid: this.wtid,
+          uniformcodes: uniformcodesXo,
+        }).then(({ data }) => {
+            if (type === "AI") {
+                this.resA = data.data.length
+                ? data.data.map((item) => (item != null ? item.nemCode : ""))
+                : [];
+                
+                if (this.resA.length>0) {
+                    this.getPointsDataOne(type, this.resA);
+                }
+            } else {
+                this.resD = data.data.length
+                  ? data.data.map((item) => (item != null ? item.nemCode : ""))
+                  : [];
+                if (this.resD.length>0) {
+                    this.getPointsDataOne(type, this.resD);
+                }
+            }
+        }).catch((e) => {
+            console.log("发生错误");
+        });
+    },
+    getPointsDataOne(type, pointsData) {
+        GetPointsData({
+            pointIds: pointsData,
+        }).then(({ data }) => {
+            let pointsInfo = data.data.length ? data.data : [];
+            let partAInfo = [];
+            let partDInfo = [];
+            let chunk = 4;
+            if (type === "AI") {
+                this.partAInfo.forEach((item, index) => {
+                    pointsInfo.forEach((i, ind) => {
+                    if (index == ind) {
+                        item.value = i.pointValueInDouble;
+                    }
+                    });
+                });
+                for (let i = 0, j = this.partAInfo.length; i < j; i += chunk) {
+                    partAInfo.push(this.partAInfo.slice(i, i + chunk));
+                }
+                this.partAInfos = partAInfo;
+            } else {
+                this.partDInfo.forEach((item, index) => {
+                    pointsInfo.forEach((i, ind) => {
+                    if (index == ind) {
+                        item.value = i.pointValueInDouble;
+                    }
+                    });
+                });
+                for (let m = 0, n = this.partDInfo.length; m < n; m += chunk) {
+                    partDInfo.push(this.partDInfo.slice(m, m + chunk));
+                }
+                this.partDInfos = partDInfo;
+            }
+            console.log("partAInfos===>>>", this.partAInfos)
+            console.log("partDInfos===>>>", this.partDInfos)
+        }).catch((e) => {
+            // 标记失败后给定某个数据
+            console.log("发生错误");
+        });
+    },
     //打开报警页面
     handleAlarm(id) {
       this.$refs.alarmDialog &&
@@ -1462,6 +1570,7 @@ export default {
                 display: flex;
                 color: #817c7c;
                 margin-bottom: 3px;
+                cursor: pointer;
                 .warnItemLeft{
                     height: 32px;
                     width: 20%;

src/router/index.js

@@ -865,6 +865,16 @@ export const asyncRoutes = [
                 },
             },
             {
+                path: "weatherMachine", // 气象单机偏差分析
+                name: "weatherMachine",
+                component: () => import("@/views/economicsOperation/weatherMachine/weatherMachine"),
+                meta: {
+                    title: "气象单机偏差分析",
+                    icon: "svg-03",
+                    permissions: ["jn_alarmConfig"],
+                },
+            },
+            {
                 path: "economicsReport", // 经济运行分析报告
                 name: "economicsReport",
                 component: () => import("@/views/economicsOperation/jjyxReport"),

src/views/IntegratedAlarm/DetailMatrix/index.vue

@@ -152,15 +152,16 @@
                                     : 'gray'
                                 " v-for="(val, indexe) in value.wtlist" :key="indexe">
                                 <div class="info">
+                                    <!-- 是否预警 -->
+                                    <el-popover placement="top-start" title="预警信息" :width="200" trigger="hover"
+                                        content="点击查看详情" v-if="val.isShowWarn">
+                                        <template #reference>
+                                            <div class="isWarn" @click="showWarnList(val)"></div>
+                                        </template>
+                                    </el-popover>
                                     <!-- wtname + 状态 -->
                                     <div class="card-left" @click="handleLeftClick(val, value.czlx, value.wpid)">
                                         <!-- <i class="lock" @mouseenter="handleMouse"></i> -->
-                                        <el-popover placement="top-start" title="预警信息" :width="200" trigger="hover"
-                                            content="预警情况说明" v-if="1">
-                                            <template #reference>
-                                                <div class="isWarn"></div>
-                                            </template>
-                                        </el-popover>
 
                                         <div class="card-name">{{ val.wtname }}</div>
                                         <i class="svg-icon svg-icon-sm" :class="
@@ -277,8 +278,70 @@
                 </template>
                 <div class="dialog-body" style="height: 100vh">
                     <img class="dialog-img" src="@assets/imgs/dialog.png" />
-                    <windDetail v-if="wtType == -1" :wind="wind" :flag="flag"></windDetail>
-                    <lightDetail v-show="wtType == -2" :wind="wind" :flag="flag"></lightDetail>
+                    <windDetail v-if="wtType == -1" ref="windDetail" :wind="wind" :flag="flag"></windDetail>
+                    <lightDetail v-if="wtType == -2" :wind="wind" :flag="flag"></lightDetail>
+                </div>
+            </el-dialog>
+            <el-dialog :fullscreen="true" top="40px" v-model="warnDialog" :show-close="true" destroy-on-close>
+                <template #title>
+                    <div class="dialog-title">
+                        <div class="title">预警详情</div>
+                    </div>
+                </template>
+                <div class="dialog-body" style="height: 100vh">
+                    <el-table
+                        size="mini"
+                        :data="warntableData"
+                        style="width: 100%; height: calc(100% - 35px - 55px)"
+                        stripe
+                    >
+                        <el-table-column
+                            v-for="item in warntableHeader"
+                            :label="item.title"
+                            :prop="item.code"
+                            :key="item.code"
+                            :width="item.width || ''"
+                            show-overflow-tooltip
+                            header-align="center"
+                            align="center"
+                        >
+                            <template #default="scope">
+                            <p >
+                                <span v-if="item.code == 'rank'">
+                                {{ tableFilter(scope.row.rank) }}
+                                </span>
+                                <span v-else-if="item.code == 'ts'">
+                                {{ formatTime(scope.row.ts) }}
+                                </span>
+                                <span :style="`color:${
+                                    scope.row.isCloseName === '已解除' ? '#05bb4c' : 'var(--el-color-danger)'
+                                }`" v-else-if="item.code == 'isCloseName'" >{{ scope.row.isCloseName}}</span>
+                                <span
+                                :style="`color:${
+                                    scope.row.confirmed ? '#05bb4c' : 'var(--el-color-danger)'
+                                }`"
+                                v-else-if="item.code == 'confirmed'"
+                                >
+                                {{ scope.row.confirmed ? "是" : "否" }}
+                                </span>
+                                <span v-else>
+                                {{
+                                    scope.row[item.code] != "NULL" ? scope.row[item.code] : ""
+                                }}
+                                </span>
+                            </p>
+                            </template>
+                        </el-table-column>
+                    </el-table>
+                    <div class="pagination-wrapper">
+                        <el-pagination
+                        layout="total, prev, pager, next"
+                        :current-page="query.page"
+                        :page-size="query.limit"
+                        :total="query.pageTotal"
+                        @current-change="handlePageChange"
+                        ></el-pagination>
+                    </div>
                 </div>
             </el-dialog>
         </div>
@@ -295,9 +358,11 @@
         findUpColor,
         chunkArray
     } from "@/utills/func.js";
+    import { GetTableDataXo, alarm_history } from "@/api/zhbj/index.js";
     import HeaderNav from "@/components/headerNavSta/index.vue";
     import api from "@api/cockpit/matrix/index.js";
     import dataJson from "./dataJson2.json"
+    import dayjs from "dayjs";
     export default {
         // 名称
         name: "DetailMatrix", //明细矩阵
@@ -314,6 +379,12 @@
         data() {
             return {
                 loading: false,
+                warnDialog: false,
+                query: {
+                    page: 1,
+                    limit: 15,
+                    pageTotal: null,
+                },
                 timmer: null, // 定时器开关
                 sourceMap: {}, // 接口数据
                 showMatrixList: [], //展示数据
@@ -677,33 +748,102 @@
                 wind: {},
                 wtType: -1,
                 flag: false,
+                warntableData: [],
+                warntableHeader: [
+                    { title: "时间", code: "ts", width: "150" },
+                    { title: "场站", code: "wpName", width: "150" },
+                    { title: "机组", code: "code", width: "150" },
+                    { title: "部件", code: "components", width: "200" },
+                    { title: "预警信息", code: "characteristic" },
+                    { title: "报警解除时间", code: "endtsName", width: "150" },
+                    {
+                    title: "状态",
+                    code: "isCloseName",
+                    width: "80",
+                    },
+                    { title: "是否确认", code: "confirmed", width: "100" },
+                    { title: "类型", code: "deviceTypeName", width: "80" },
+                ],
+                changeWind: ""
             };
         },
 
+        watch: {
+            $route: {
+                handler: function (val, oldVal) {
+                    this.getWarnData()
+                }
+            },
+        },
+
         mounted() {
-            // this.sourceMap = dataJson.sourceMapData
-            // this.showMatrixList = dataJson.showMatrixListdata
-            // dataJson.showMatrixListdata.forEach((it, index) => {
-            //     it.wtlist = new Array(125).fill({
-            //         wtname: it.wpname,
-            //         status: index === 4 ? 6 : index,
-            //         // status: 4,
-            //         czlx: -1,
-            //         wtid: 5,
-            //         power: 2514,
-            //         speed: 13,
-            //         current: 251,
-            //         transfer: 21,
-            //         voltage: 25,
-            //         rate: 395,
-            //         ssqfzt: 1
-            //     })
-            // })
             this.requestData(true)
         },
 
         // 函数
         methods: {
+            showWarnList(val) {
+                this.changeWind = val
+                this.warnDialog = true
+                this.getAlarmHistoryt(val)
+            },
+            getColumnStyle(columnItem) {
+                let style = "color:";
+                if (columnItem.endts) {
+                    style += "#05bb4c";
+                } else {
+                    style += "var(--el-color-danger)";
+                }
+                return style;
+            },
+            tableFilter(val) {
+                const obj = {
+                    1: "低级",
+                    2: "低中级",
+                    3: "中级",
+                    4: "中高级",
+                    5: "高级",
+                    booststation: "升压站",
+                    custom: "自定义",
+                    windturbine: "风机",
+                    inverter: "光伏",
+                };
+                return obj[val];
+            },
+            formatTime(val) {
+                return dayjs(val).format("YYYY-MM-DD HH:mm:ss");
+            },
+            // 分页导航
+            handlePageChange(val) {
+                this.query.page = val;
+                this.getAlarmHistoryt(this.changeWind);
+            },
+            async getAlarmHistoryt(val) {
+                let params = {
+                    pageNum: this.query.page,
+                    pageSize: this.query.limit,
+                    alarmId: "",
+                    alarmType: "custom",
+                    deviceType: "windturbine",
+                    stationid: "NX_FGS_HA_FDC_STA",
+                    deviceid:val.wtid,
+                    modelId: "",
+                    components: "",
+                    description: "",
+                    begin: dayjs().add(-1, "hour").format("YYYY-MM-DD HH:mm:ss"),
+                    end: dayjs().format("YYYY-MM-DD HH:mm:ss"),
+                };
+                const { data } = await alarm_history(params);
+                if (data) {
+                    this.query.pageTotal = data?.total;
+                    data?.ls?.forEach((ele) => {
+                        ele.isCloseName = ele.endts ? "已解除" : "未解除";
+                        ele.deviceTypeName = this.tableFilter(ele.deviceType);
+                        ele.endtsName = ele.endts > 0 ? this.formatTime(ele.endts) : "--";
+                    });
+                    this.warntableData = data?.ls;
+                }
+            },
             handleMouse() {},
             deepClone,
             findUpColor,
@@ -761,9 +901,32 @@
                     this.sourceMap = {};
                     this.showMatrixList = [];
                 }
+                
+                if (this.showMatrixList.length>0) {
+                    this.getWarnData(this.showMatrixList[0].wtlist)
+                }
             },
 
-
+            getWarnData(datas) {
+                let params = {
+                    begin: dayjs().add(-1, "hour").format("YYYY-MM-DD HH:mm:ss"),
+                    end: dayjs().format("YYYY-MM-DD HH:mm:ss"),
+                    alarmType: "custom",
+                    stationid: "NX_FGS_HA_FDC_STA"
+                }
+                GetTableDataXo(params).then(res =>{
+                    if (res && res.data) {
+                        for(let i =0;i<datas.length; i++) {
+                            let itv = datas[i]
+                            itv.isShowWarn = false
+                            if (res.data.indexOf(itv.wtid) !== -1) {
+                                itv.isShowWarn = true
+                            }
+                        }
+                        console.log("32154==>>>", this.showMatrixList[0].wtlist)
+                    }
+                })
+            },
 
             // 点击切换状态
             handleClick(val) {
@@ -1021,7 +1184,6 @@
                     };
                     this.flag = true;
                 });
-                //   this.$refs.windDetail.start(wt);
             },
             // 点击右侧数据弹出曲线
             handleRightClick(type, wtid) {
@@ -1759,6 +1921,17 @@
                             align-items: center;
                             width: 100%;
                             height: 50px;
+                            position: relative;
+
+                            .isWarn {
+                                position: absolute;
+                                left: 3px;
+                                top: 3px;
+                                width: 8px;
+                                height: 8px;
+                                background: #ffd700;
+                                border-radius: 20px;
+                            }
 
                             .card-left {
                                 width: 55px;
@@ -1766,17 +1939,7 @@
                                 display: flex;
                                 flex-direction: column;
                                 align-items: center;
-                                position: relative;
-
-                                .isWarn {
-                                    position: absolute;
-                                    left: 3px;
-                                    top: 3px;
-                                    width: 8px;
-                                    height: 8px;
-                                    background: #ffd700;
-                                    border-radius: 20px;
-                                }
+                                
 
                                 .lock {
                                     width: 0;
@@ -2036,4 +2199,5 @@
     .clearfix {
         zoom: 1;
     }
+    
 </style>

src/views/economicsOperation/weatherMachine/weatherMachine.vue

@@ -0,0 +1,319 @@
+<template>
+    <div class="stationPowerContro" :class="!theme ? 'themeDark' : ''">
+        <div class="main_top">
+            <div class="search-item" style="margin-left: 16px">
+                <span class="label">场站：</span>
+                <div class="search-content">
+                    <el-select v-model="stationId" style="width: 120px" clearable size="mini" placeholder="全部"
+                        popper-class="select" @change="getWindturbineList">
+                        <el-option v-for="item in stationList" :key="item.id" :value="item.id" :label="item.name">
+                        </el-option>
+                    </el-select>
+                </div>
+            </div>
+            <el-button class="buttons" round size="mini" @click="getStationData">查询</el-button>
+        </div>
+        <div class="stationPowerControTable">
+            <h2 class="tableTitle">{{ stationName }}气象单机偏差分析</h2>
+            <span class="tableUnit">单位:风速m/s,风向°</span>
+            <div :style="tableHeight">
+                <div class="tablestyle warn-table" style="margin-top: 5px">
+                    <el-table :data="tableData" v-loading="loading" border style="width: 100%"
+                        :max-height="tableMainHeight" ref="stationPowerTable"
+                        element-loading-background="rgba(0,0,0,.5)"
+                        :header-cell-style="{ 'text-align': 'center', 'font-size': '12px' }" :cell-style="{
+              'font-size': '12px',
+            }" :row-style="{ height: '23px' }">
+                        <el-table-column :prop="item.value" :label="item.name" align="center"
+                            v-for="(item, index) in tableColumn" :key="index">
+                            <template #default="scope">
+                                <span>{{scope.row[item.value]}}</span>
+                            </template>
+                        </el-table-column>
+                    </el-table>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+    import {
+        getWpList,
+        apiGetweatherMachine
+    } from "@/api/zhbj";
+    import dataJson from './dataJson.json'
+    import dayjs from "dayjs";
+    import * as XLSX from "xlsx";
+    import {
+        saveAs
+    } from "file-saver";
+    import * as XLSXD from "xlsx-js-style";
+    import {
+        forIn
+    } from '@antv/x6/lib/util/object/object';
+    export default {
+        data() {
+            return {
+                stationId: "",
+                stationName: "",
+                stationList: [],
+                loading: false,
+                tableData: [],
+                tableColumn: [{
+                        value: "name",
+                        name: "名称",
+                    },
+                    {
+                        value: "january",
+                        name: "一月",
+                    },
+                    {
+                        value: "february",
+                        name: "二月",
+                    },
+                    {
+                        value: "march",
+                        name: "三月",
+                    },
+                    {
+                        value: "april",
+                        name: "四月",
+                    },
+                    {
+                        value: "may",
+                        name: "五月",
+                    },
+                    {
+                        value: "june",
+                        name: "六月",
+                    },
+                    {
+                        value: "july",
+                        name: "七月",
+                    },
+                    {
+                        value: "august",
+                        name: "八月",
+                    },
+                    {
+                        value: "september",
+                        name: "九月",
+                    },
+                    {
+                        value: "october",
+                        name: "十月",
+                    },
+                    {
+                        value: "november",
+                        name: "十一月",
+                    },
+                    {
+                        value: "december",
+                        name: "十二月",
+                    }
+                ]
+            };
+        },
+        created() {
+            this.changeData(dataJson)
+            this.funGetStation();
+        },
+        computed: {
+            tableHeight() {
+                let height = (document.documentElement.clientHeight - 190) / 2 + "px";
+                return {
+                    width: "100%",
+                    height: height,
+                };
+            },
+            tableMainHeight() {
+                let height = document.documentElement.clientHeight - 180 + "px";
+                return height;
+            },
+        },
+        methods: {
+            /**场站 */
+            funGetStation() {
+                let that = this;
+                that.stationList = [];
+                that.windStation = ""
+                getWpList().then((res) => {
+                    if (res) {
+                        that.stationList = res.data;
+                        if (that.stationList.length) {
+                            that.stationId = that.stationList[0].id;
+                            that.stationName = that.stationList[0].name;
+                            that.getStationData()
+                        }
+                    }
+                });
+            },
+            getStationData() {
+                let that = this;
+                let params = {
+                    wpid: that.stationId
+                }
+                apiGetweatherMachine(params).then(res => {
+                    that.changeData(res)
+                })
+            },
+            changeData(res) {
+                if (res && res.data) {
+                    for (const key in res.data) {
+                        const element = res.data[key];
+                        let obj = {
+                            name: key,
+                            january: element[0],
+                            february: element[1],
+                            march: element[2],
+                            april: element[3],
+                            may: element[4],
+                            june: element[5],
+                            july: element[6],
+                            august: element[7],
+                            september: element[8],
+                            october: element[9],
+                            november: element[10],
+                            december: element[11],
+                        }
+                        this.tableData.push(obj)
+                    }
+                }
+            },
+            seachData() {
+                this.funGetStation();
+            },
+        },
+    };
+</script>
+
+<style lang="less">
+    .stationPowerContro {
+        padding: 0 20px 0 20px;
+
+        .main_top {
+            height: 40px;
+            display: flex;
+            align-items: center;
+
+            .search-item {
+                display: flex;
+                margin-right: 10px;
+                max-width: 450px;
+                align-items: center;
+
+                .label {
+                    margin-right: 10px;
+                    text-align: right;
+                    white-space: nowrap;
+                    // width: 60px;
+                }
+
+                .search-content {
+                    flex: 1;
+                }
+            }
+        }
+
+        .stationPowerControSeach {
+            margin-top: 20px;
+
+            .seach_top {
+                display: flex;
+
+                .exceed {
+                    .exceedName {
+                        margin-top: 7px;
+                        font-size: 14px;
+                        margin-left: 10px;
+                    }
+
+                    display: flex;
+                    margin-right: 20px;
+
+                    .el-select,
+                    .el-select__wrapper {
+                        height: 32px;
+                    }
+
+                    .el-date-editor {
+                        height: 32px;
+
+                        .el-input__icon,
+                        .el-range-separator {
+                            line-height: 30px;
+                        }
+                    }
+
+                    .select-trigger {
+                        .el-input {
+                            .el-input__wrapper {
+                                height: 30px;
+                            }
+                        }
+
+                        .el-input__suffix {
+                            .el-input__icon {
+                                line-height: 30px;
+                            }
+                        }
+                    }
+                }
+
+                .el-button {
+                    height: 30px;
+                    padding: 0 20px;
+                    line-height: 5px;
+                }
+            }
+        }
+
+        .stationPowerControTable {
+            .tableTitle {
+                display: flex;
+                justify-content: center;
+                // font-size: 18px;
+                font-weight: 600;
+            }
+
+            .tableUnit {
+                font-size: 14px;
+            }
+        }
+    }
+
+    .themeDark {
+        background-image: none;
+
+        .stationPowerControSeach {
+            .exceedName {
+                color: #fff;
+            }
+        }
+
+        .stationPowerControTable {
+
+            .tableTitle,
+            .tableUnit {
+                color: #fff;
+            }
+        }
+    }
+
+    .themeLight {
+        .stationPowerControSeach {
+            .exceedName {
+                color: #000;
+            }
+        }
+
+        .stationPowerControTable {
+
+            .tableTitle,
+            .tableUnit {
+                color: #000;
+            }
+        }
+    }
+</style>

src/views/nxReport/czzdybb/index.vue

@@ -8,7 +8,7 @@
         data() {
             return {
                 url: process.env.VUE_APP_REPORT +
-                    "/rbi/ebibase/showreport.do?resid=EANA$2$2$1$72977a47b6154b299ebcc708634e63dc$f6c89c7391914af08b438662b125e26a&id=admin&pw=admin",
+                    "/rbi/ebipro/easyolap.do?action=edit&resid=EANA$2$8$1$72977a47b6154b299ebcc708634e63dc$bb7ed0d54ad94d6fa1dead9bd0018ecb&id=admin&pw=admin",
             };
         },
     };