Merge branch 'master' of http://124.70.43.205:3000/sunzehao/windLifecontrolPro

.env.development

@@ -31,11 +31,11 @@ VUE_APP_REPORT_URL = 'http://172.16.12.101:9001'
 
 # 功率预测
 # 徐世利
-# VUE_APP_BASE_URL = 'http://192.168.2.150:8086'
+VUE_APP_BASE_URL = 'http://192.168.2.150:8086'
 # 马力军
 # VUE_APP_BASE_URL = 'http://192.168.2.45:8086'
 # 王波
-VUE_APP_BASE_URL = 'http://172.16.12.101:8086'
+# VUE_APP_BASE_URL = 'http://172.16.12.101:8086'
 
 # 综合报警
 # VUE_APP_ALARM = 'http://10.127.7.241:6015'

components.d.ts

@@ -20,7 +20,7 @@ declare module 'vue' {
     CalculationModelConfiguration: typeof import('./src/components/powerPredictionComponent/configPage/calculationModelConfiguration.vue')['default']
     Card1: typeof import('./src/components/coms/cards/card-1.vue')['default']
     CheckTable: typeof import('./src/components/coms/table/check-table.vue')['default']
-    Col: typeof import('./src/components/coms/grid/col.vue')['default']
+    Col: typeof import('./src/components/homeComponent/grid/col.vue')['default']
     CollapseList: typeof import('./src/components/coms/collapse/collapse-list.vue')['default']
     CollectionLineManagement: typeof import('./src/components/powerPredictionComponent/configPage/stationFlode/collectionLineManagement.vue')['default']
     CommonHeaders: typeof import('./src/components/commonHeaders.vue')['default']
@@ -154,7 +154,7 @@ declare module 'vue' {
     RoleManagement: typeof import('./src/components/powerPredictionComponent/configPage/roleManagement.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
-    Row: typeof import('./src/components/coms/grid/row.vue')['default']
+    Row: typeof import('./src/components/homeComponent/grid/row.vue')['default']
     SBQ: typeof import('./src/components/powerPredictionComponent/configPage/configDesignVue/SBQ.vue')['default']
     ScatterLineChart: typeof import('./src/components/chart/combination/scatter-line-chart.vue')['default']
     SimpleLineChart: typeof import('./src/components/chart/line/simple-line-chart.vue')['default']
@@ -166,7 +166,7 @@ declare module 'vue' {
     StrightLineChart: typeof import('./src/components/chart/line/stright-line-chart.vue')['default']
     SubmitBtn: typeof import('./src/components/generatingCapacityComponent/SubmitBtn.vue')['default']
     SvgDraw: typeof import('./src/components/coms/icon/svg-draw.vue')['default']
-    SvgIcon: typeof import('./src/components/coms/icon/svg-icon.vue')['default']
+    SvgIcon: typeof import('./src/components/powerPredictionComponent/svgIcon/index.vue')['default']
     SvgPageShow: typeof import('./src/components/powerPredictionComponent/powerControlSvg/svgPageShow.vue')['default']
     Tab: typeof import('./src/components/coms/tabs/tab.vue')['default']
     Table: typeof import('./src/components/generatingCapacityComponent/table.vue')['default']

src/api/api.js

@@ -1144,4 +1144,14 @@ export function apiGetallStationPower(params) {
         method: 'get',
         params: params
     })
+}
+
+// 获取双细则
+export function apiexaminScore(params) {
+    return httpRequest({
+        baseURL: process.env.VUE_APP_BASE_URL,
+        url: 'examin/score',
+        method: 'get',
+        params: params
+    })
 }

src/assets/css/eleCss/el-popper.less

@@ -26,6 +26,8 @@
 
 }
 
+
+
 .el-picker__popper {
     background: #606769 !important;
 
@@ -159,10 +161,9 @@
 
         .el-picker-panel__body-wrapper {
             .el-picker-panel__body {
-                color: #fff;
+                color: #fff !important;
 
                 .el-date-picker__header {
-
                     .el-date-picker__prev-btn,
                     .el-date-picker__next-btn {
                         .el-picker-panel__icon-btn {
@@ -226,6 +227,12 @@
                             }
                         }
                     }
+
+                }
+                .el-date-range-picker__content{
+                    .el-date-range-picker__header{
+                        color: #fff !important;
+                    }
                 }
             }
 

src/themeDark.less

@@ -719,6 +719,22 @@
     .el-popper {
         // border: 1px solid rgb(10, 23, 42) !important;
     }
+    .el-popper{
+        .el-picker-panel{
+            .el-picker-panel__body-wrapper{
+                .el-picker-panel__body{
+                    .el-picker-panel__content{
+                        .el-date-range-picker__header{
+                            .el-picker-panel__icon-btn{
+                                color: #929292 !important;
+                            }
+                            color: #fff;
+                        }
+                    }
+                }
+            }
+        }
+    }
 
     .el-select-dropdown__wrap {
         background-color: rgb(10, 23, 42);

src/views/IntegratedAlarm/deviceConfig/components/ycpoint.vue

@@ -45,7 +45,7 @@
       <el-upload
         class="upload-demo"
         :disabled="desc?.code == ''"
-        action="/sharding/device/input"
+        :action="`${$store.state.baseURL}/device/input`"
         :show-file-list="false"
         :on-success="handleSuccess"
         :on-progress="handleProgress"

src/views/generatingCapacity/dataAnalysis/posAnalysis/components/leafletMap.vue

@@ -30,7 +30,7 @@ export default {
       layers: [],
       rightObj: {},
       areaLayer: null,
-      tilsUrl: "./static/kMapTiles/{z}/{x}/{y}.jpg",
+      tilsUrl: "./static/kMapTiles/{z}/{x}/{y}.png",
       ciLayer: null,
       viewCenterMap: {
         GJNY_SXGS_ZZ_FDC_STA: { lng: 107.86058, lat: 37.37861 },

src/views/powerPrediction/component/detailedRules.json

@@ -2,28 +2,28 @@
     "code": 200,
     "data": {
         "stationData1": [
-            { "stationName": "场站A", "code1": 85, "code2": 80},
-            { "stationName": "场站B", "code1": 83, "code2": 79},
-            { "stationName": "场站C", "code1": 88, "code2": 84},
-            { "stationName": "场站D", "code1": 80, "code2": 76},
-            { "stationName": "场站E", "code1": 87, "code2": 83},
-            { "stationName": "场站F", "code1": 84, "code2": 80}
+            { "siteName": "场站A", "accuracyRate1": 85, "accuracyRate4": 80},
+            { "siteName": "场站B", "accuracyRate1": 83, "accuracyRate4": 79},
+            { "siteName": "场站C", "accuracyRate1": 88, "accuracyRate4": 84},
+            { "siteName": "场站D", "accuracyRate1": 80, "accuracyRate4": 76},
+            { "siteName": "场站E", "accuracyRate1": 87, "accuracyRate4": 83},
+            { "siteName": "场站F", "accuracyRate1": 84, "accuracyRate4": 80}
         ],
         "stationData2": [
-            { "stationName": "场站A", "code1": 85, "code2": 80, "code3": 85, "code4": 80},
-            { "stationName": "场站B", "code1": 65, "code2": 79, "code3": 76, "code4": 35},
-            { "stationName": "场站C", "code1": 76, "code2": 38, "code3": 45, "code4": 72},
-            { "stationName": "场站D", "code1": 90, "code2": 57, "code3": 54, "code4": 28},
-            { "stationName": "场站E", "code1": 52, "code2": 49, "code3": 68, "code4": 48},
-            { "stationName": "场站F", "code1": 39, "code2": 90, "code3": 33, "code4": 68}
+            { "siteName": "场站A", "accuracyRate1": 85, "accuracyRate2": 80, "accuracyRate3": 85, "accuracyRate4": 80},
+            { "siteName": "场站B", "accuracyRate1": 65, "accuracyRate2": 79, "accuracyRate3": 76, "accuracyRate4": 35},
+            { "siteName": "场站C", "accuracyRate1": 76, "accuracyRate2": 38, "accuracyRate3": 45, "accuracyRate4": 72},
+            { "siteName": "场站D", "accuracyRate1": 90, "accuracyRate2": 57, "accuracyRate3": 54, "accuracyRate4": 28},
+            { "siteName": "场站E", "accuracyRate1": 52, "accuracyRate2": 49, "accuracyRate3": 68, "accuracyRate4": 48},
+            { "siteName": "场站F", "accuracyRate1": 39, "accuracyRate2": 90, "accuracyRate3": 33, "accuracyRate4": 68}
         ],
         "stationData3": [
-            { "stationName": "场站A", "code1": 85, "code2": 80},
-            { "stationName": "场站B", "code1": 83, "code2": 79},
-            { "stationName": "场站C", "code1": 88, "code2": 84},
-            { "stationName": "场站D", "code1": 80, "code2": 76},
-            { "stationName": "场站E", "code1": 87, "code2": 83},
-            { "stationName": "场站F", "code1": 84, "code2": 80}
+            { "siteName": "场站A", "accuracyRate2": 85, "accuracyRate3": 80},
+            { "siteName": "场站B", "accuracyRate2": 83, "accuracyRate3": 79},
+            { "siteName": "场站C", "accuracyRate2": 88, "accuracyRate3": 84},
+            { "siteName": "场站D", "accuracyRate2": 80, "accuracyRate3": 76},
+            { "siteName": "场站E", "accuracyRate2": 87, "accuracyRate3": 83},
+            { "siteName": "场站F", "accuracyRate2": 84, "accuracyRate3": 80}
         ],
         "stationData": [
             { "name": "场站A", "shortPeak": 85, "shortNonPeak": 80, "ultraAcc": [82, 78, 75, 70], "available": { "actual": 120, "possible": 123 } },

src/views/powerPrediction/detailedRulesPage.vue

@@ -4,10 +4,13 @@
             <div class="seach_top">
                 <div class="exceed">
                     <span class="exceedName" style="x`">时间：</span>
-                    <el-date-picker v-model="pickerTime" @change="changeTime" format="YYYY-MM-DD" type="date"
+                    <el-date-picker v-model="pickerTime" @change="changeTime"
+                    range-separator="至"
+                    start-placeholder="开始时间"
+                    end-placeholder="结束时间" format="YYYY-MM-DD" type="daterange"
                         placeholder="选择时间" />
                 </div>
-                <el-button type="primary" @click="seachData">计 算</el-button>
+                <el-button type="primary" @click="seachData">查 询</el-button>
             </div>
         </div>
         <el-row class="detailedRulesMain" v-loading="loading">
@@ -42,7 +45,7 @@
 
 <script>
     import {
-        apiGetallStationPower
+        apiexaminScore
     } from "../../api/api";
 
     import jsonData from "./component/detailedRules.json";
@@ -51,7 +54,7 @@
         data() {
             return {
                 loading: false,
-                pickerTime: "",
+                pickerTime: [],
                 titelMonth: "",
                 stateData: [{
                         name: "短期预测",
@@ -59,19 +62,19 @@
                         span: 7,
                         column: [{
                                 name: "场站名称",
-                                code: "stationName"
+                                code: "siteName"
                             },
                             {
                                 name: "重点时段准确率(%)",
-                                code: "code1"
+                                code: "accuracyRate1"
                             },
                             {
                                 name: "非重点时段准确率(%)",
-                                code: "code2"
+                                code: "accuracyRate4"
                             },
                             {
                                 name: "考核扣分",
-                                code: "code3",
+                                code: "examinScore",
                                 width: 80
                             }
                         ],
@@ -83,27 +86,27 @@
                         span: 9,
                         column: [{
                                 name: "场站名称",
-                                code: "stationName"
+                                code: "siteName"
                             },
                             {
                                 name: "1小时准确率(%)",
-                                code: "code1"
+                                code: "accuracyRate1"
                             },
                             {
                                 name: "2小时准确率(%)",
-                                code: "code2"
+                                code: "accuracyRate2"
                             },
                             {
                                 name: "3小时准确率(%)",
-                                code: "code3"
+                                code: "accuracyRate3"
                             },
                             {
                                 name: "4小时准确率(%)",
-                                code: "code4"
+                                code: "accuracyRate4"
                             },
                             {
                                 name: "考核扣分",
-                                code: "code5",
+                                code: "examinScore",
                                 width: 80
                             }
                         ],
@@ -115,23 +118,23 @@
                         span: 8,
                         column: [{
                                 name: "场站名称",
-                                code: "stationName"
+                                code: "siteName"
                             },
                             {
                                 name: "实际电量(Mwh)",
-                                code: "code1"
+                                code: "accuracyRate2"
                             },
                             {
                                 name: "可用电量(Mwh)",
-                                code: "code2"
+                                code: "accuracyRate3"
                             },
                             {
                                 name: "准确率(%)",
-                                code: "code3"
+                                code: "accuracyRate1"
                             },
                             {
                                 name: "考核扣分",
-                                code: "code4",
+                                code: "examinScore",
                                 width: 80
                             }
                         ],
@@ -153,14 +156,7 @@
             },
         },
         created() {
-            this.pickerTime = dayjs(new Date()).format("YYYY-MM-DD");
-            this.titelMonth =
-                this.pickerTime.split("-")[0] +
-                "年" +
-                this.pickerTime.split("-")[1] +
-                "月" +
-                this.pickerTime.split("-")[2] +
-                "日";
+            this.pickerTime = [dayjs(new Date()).subtract(1, 'day').format("YYYY-MM-DD"), dayjs(new Date()).format("YYYY-MM-DD")];
         },
         mounted() {
             this.getStationData();
@@ -168,16 +164,23 @@
         methods: {
             getStationData() {
                 let that = this;
-                // that.loading = true;
-                // let params = {
-                //     date: that.pickerTime,
-                // };
-                // apiGetallStationPower(params).then((res) => {
-                //     that.loading = false;
-                // })
-                this.getshortTermdata(jsonData.data.stationData1)
-                this.getultraShortTermdata(jsonData.data.stationData2)
-                this.getavailablePowerdata(jsonData.data.stationData3)
+                that.getshortTermdata(jsonData.data.stationData1)
+                that.getultraShortTermdata(jsonData.data.stationData2)
+                that.getavailablePowerdata(jsonData.data.stationData3)
+                that.loading = true;
+                let params = {
+                    beginDate: that.pickerTime[0],
+                    endDate: that.pickerTime[1]
+                };
+                apiexaminScore(params).then((res) => {
+                    if (res && res.data) {
+                        that.getshortTermdata(res.data["短期预测"])
+                        that.getultraShortTermdata(res.data["超短期预测"])
+                        that.getavailablePowerdata(res.data["可用电量"])
+                    }
+                    that.loading = false;
+                })
+                
             },
             getshortTermdata(datas) {
                 this.stateData[0].datas = datas
@@ -185,9 +188,9 @@
                 let shortPeak = []
                 let shortNonPeak = []
                 datas.forEach(it => {
-                    xAxis.push(it.stationName)
-                    shortPeak.push(it.code1)
-                    shortNonPeak.push(it.code2)
+                    xAxis.push(it.siteName.substring(0, it.siteName.indexOf('风电场')))
+                    shortPeak.push(it.accuracyRate1)
+                    shortNonPeak.push(it.accuracyRate4)
                 });
                 let series = [{
                         name: "重点时段准确率(%)",
@@ -208,9 +211,9 @@
                 let series = []
                 datas.forEach(it => {
                     let seriesObj = {
-                        name: it.stationName,
+                        name: it.siteName.substring(0, it.siteName.indexOf('风电场')),
                         type: "line",
-                        data: [it.code1, it.code2, it.code3, it.code4],
+                        data: [it.accuracyRate1, it.accuracyRate2, it.accuracyRate3, it.accuracyRate4],
                         symbol: "none",
                     };
                     series.push(seriesObj);
@@ -223,9 +226,9 @@
                 let active = []
                 let available = []
                 datas.forEach(it => {
-                    xAxis.push(it.stationName)
-                    active.push(it.code1)
-                    available.push(it.code2)
+                    xAxis.push(it.siteName.substring(0, it.siteName.indexOf('风电场')))
+                    active.push(it.accuracyRate2)
+                    available.push(it.accuracyRate3)
                 });
                 let series = [{
                         name: "实际电量(Mwh)",
@@ -281,8 +284,7 @@
                 });
             },
             seachData() {
-                let str = dayjs(this.pickerTime).format("YYYY-MM");
-                this.titelMonth = str.split("-")[0] + "年" + str.split("-")[1] + "月";
+                this.pickerTime = [dayjs(this.pickerTime[0]).format("YYYY-MM-DD"), dayjs(this.pickerTime[1]).format("YYYY-MM-DD")]
                 this.getStationData();
             },
         },
@@ -309,11 +311,6 @@
                     display: flex;
                     margin-right: 20px;
 
-                    .el-select,
-                    .el-select__wrapper {
-                        height: 32px;
-                    }
-
                     .el-date-editor {
                         height: 32px;
 
@@ -321,6 +318,8 @@
                         .el-range-separator {
                             line-height: 30px;
                         }
+
+                        
                     }
 
                     .select-trigger {
@@ -376,6 +375,16 @@
             .exceedName {
                 color: #fff;
             }
+            .seach_top {
+                display: flex;
+                .exceed {
+                    .el-date-editor {
+                        .el-range-input, .el-range-separator{
+                            color: #fff;
+                        }
+                    }
+                }
+            }
         }
     }
 
@@ -386,4 +395,5 @@
             }
         }
     }
+
 </style>