Parcourir la source

问题修改,气象和测风塔单机偏差两个都增加一个year参数,样式修改

sunzehao il y a 1 mois
Parent
commit
8802cf3d7c

+ 1 - 0
src/views/economicsOperation/benchmarkingManagement/siteBenchmarking/index.vue

@@ -127,6 +127,7 @@
           </el-table-column>
           <el-table-column
             align="center"
+            width="95"
             show-overflow-tooltip
             prop="date"
             label="日期"

+ 18 - 1
src/views/economicsOperation/singleMachineDeviation/singleMachineDev.vue

@@ -11,6 +11,20 @@
                     </el-select>
                 </div>
             </div>
+            <div class="search-item" style="margin-left: 16px">
+                <span class="label">年份:</span>
+                <div class="search-content">
+                    <el-date-picker
+                    size="mini"
+                    type="year"
+                    v-model="year"
+                    value-format="YYYY"
+                    placeholder="请选择"
+                    popper-class="date-select"
+                    >
+                    </el-date-picker>
+                </div>
+            </div>
             <el-button class="buttons" round size="mini" @click="getStationData">查询</el-button>
         </div>
         <div class="stationPowerControTable">
@@ -55,6 +69,7 @@
     export default {
         data() {
             return {
+                year: "",
                 stationId: "",
                 stationName: "",
                 stationList: [],
@@ -118,6 +133,7 @@
         created() {
             // this.changeData(dataJson)
             this.funGetStation();
+            this.year = dayjs().format("YYYY")
         },
         computed: {
             tableHeight() {
@@ -152,7 +168,8 @@
             getStationData() {
                 let that = this;
                 let params = {
-                    wpid: that.stationId
+                    wpid: that.stationId,
+                    year: that.year
                 }
                 apiGetwinddirection(params).then(res => {
                     that.changeData(res)

+ 18 - 1
src/views/economicsOperation/weatherMachine/weatherMachine.vue

@@ -11,6 +11,20 @@
                     </el-select>
                 </div>
             </div>
+            <div class="search-item" style="margin-left: 16px">
+                <span class="label">年份:</span>
+                <div class="search-content">
+                    <el-date-picker
+                    size="mini"
+                    type="year"
+                    v-model="year"
+                    value-format="YYYY"
+                    placeholder="请选择"
+                    popper-class="date-select"
+                    >
+                    </el-date-picker>
+                </div>
+            </div>
             <el-button class="buttons" round size="mini" @click="getStationData">查询</el-button>
         </div>
         <div class="stationPowerControTable">
@@ -55,6 +69,7 @@
     export default {
         data() {
             return {
+                year: "",
                 stationId: "",
                 stationName: "",
                 stationList: [],
@@ -118,6 +133,7 @@
         created() {
             this.changeData(dataJson)
             this.funGetStation();
+            this.year = dayjs().format("YYYY")
         },
         computed: {
             tableHeight() {
@@ -152,7 +168,8 @@
             getStationData() {
                 let that = this;
                 let params = {
-                    wpid: that.stationId
+                    wpid: that.stationId,
+                    year: that.year
                 }
                 apiGetweatherMachine(params).then(res => {
                     that.changeData(res)

+ 7 - 7
src/views/economicsOperation/windAnalyse/singleWindAnasyle/historyDetail.vue

@@ -6,7 +6,7 @@
         <el-date-picker
           v-model="pickerTimer"
           type="daterange"
-          range-separator="To"
+          range-separator=""
           start-placeholder="开始时间"
           end-placeholder="结束时间"
           size="mini"
@@ -297,13 +297,13 @@ export default {
       this.historysingleMachineData = dataJson.data.data.records;
       this.page.total = dataJson.data.data.length;
       if (this.tabIndex == -1) {
-        // datas = await getApihistorywindturbinegoodnesslist(params);
-        // this.historysingleMachineData = datas.data.data.records;
-        // this.page.total = datas.data.data.total;
+        datas = await getApihistorywindturbinegoodnesslist(params);
+        this.historysingleMachineData = datas.data.data.records;
+        this.page.total = datas.data.data.total;
       } else {
-        datas = await getApihistorywindturbinegoodnesslistGf(params);
-        this.historysingleMachineData = datas.data.data;
-        this.page.total = datas.data.data.length;
+        // datas = await getApihistorywindturbinegoodnesslistGf(params);
+        // this.historysingleMachineData = datas.data.data;
+        // this.page.total = datas.data.data.length;
       }
     },
     handleSizeChange(val) {

+ 33 - 33
src/views/economicsOperation/windAnalyse/singleWindAnasyle/windDetailDialog.vue

@@ -52,7 +52,7 @@
                 v-for="item in tabIndex != 2 ? wpArray : cftlist"
                 :key="item.id"
                 :value="item.id"
-                :label="item.name"
+                :label="item.aname"
               />
             </el-select>
           </div>
@@ -126,26 +126,26 @@
     </div>
 
     <!-- tab1 -->
-    <div v-if="tabIndex == 0" class="TabOne tabs">
-      <panel :title="'功率分析'" class="TabOne_topChart">
-        <area-line-chart
-          :height="'100%'"
-          :lineData="lostChartData"
-          :units="lostChartUnit"
-          :areaData="LostChartBgColorData"
-          @areaClick="areaBarChartClick"
-          :showLegend="true"
-        />
-      </panel>
-      <panel :title="'损失电量分析'" class="TabOne_centerChart">
-        <multiple-bar-line-chart
-          :height="'100%'"
-          :barData="powerChartData"
-          :lineData="powerChartLineData"
-          :units="['(kWh)', '(m/s)']"
-          :showLegend="true"
-        />
-      </panel>
+    <div v-if="tabIndex == 0" class="TabOne tabsev">
+        <panel :title="'功率分析'" class="TabOne_topChart">
+            <area-line-chart
+            :height="'100%'"
+            :lineData="lostChartData"
+            :units="lostChartUnit"
+            :areaData="LostChartBgColorData"
+            @areaClick="areaBarChartClick"
+            :showLegend="true"
+            />
+        </panel>
+        <panel :title="'损失电量分析'" class="TabOne_centerChart">
+            <multiple-bar-line-chart
+            :height="'100%'"
+            :barData="powerChartData"
+            :lineData="powerChartLineData"
+            :units="['(kWh)', '(m/s)']"
+            :showLegend="true"
+            />
+        </panel>
       <div class="table-info">
         <panel class="table-panel" :title="'当日报警记录'" :showLine="false">
           <el-table
@@ -188,7 +188,7 @@
     </div>
 
     <!-- tab2 -->
-    <div v-if="tabIndex == 1" class="tab-2 tabs">
+    <div v-if="tabIndex == 1" class="tab-2 tabsev">
       <el-row style="height: 100%">
         <el-col style="height: 100%; padding-right: 10px" :span="15">
           <panel :title="'功率曲线'" style="height: 270px; margin-bottom: 10px">
@@ -463,7 +463,7 @@
     </div>
 
     <!-- tab3 -->
-    <div v-if="tabIndex == 2" class="tab-3 tabs">
+    <div v-if="tabIndex == 2" class="tab-3 tabsev">
       <el-row style="height: calc((100% - 10px) / 2); margin-bottom: 10px">
         <el-col :span="8" class="tabColSty">
           <panel
@@ -639,7 +639,7 @@
     </div>
 
     <!-- tab4 -->
-    <div v-if="tabIndex == 3" class="tab-4 tabs">
+    <div v-if="tabIndex == 3" class="tab-4 tabsev">
       <el-row style="height: calc((100% - 10px) / 2); margin-bottom: 10px">
         <el-col :span="8" class="tabColSty">
           <panel
@@ -815,7 +815,7 @@
     </div>
 
     <!-- tab5 -->
-    <div v-if="tabIndex == 4" class="tab-5 tabs">
+    <div v-if="tabIndex == 4" class="tab-5 tabsev">
       <el-row style="height: calc((100% - 10px) / 2); margin-bottom: 10px">
         <el-col :span="8">
           <panel title="日小风切入">
@@ -1935,7 +1935,7 @@ export default {
       }
     }
   }
-  .tabs {
+  .tabsev {
     height: calc(100% - 55px);
   }
   .outline {
@@ -1944,13 +1944,13 @@ export default {
 
   .TabOne {
     .TabOne_topChart {
-      height: calc((100% - 260px) / 2);
-      margin-bottom: 10px;
-    }
-    .TabOne_centerChart {
-      margin-bottom: 10px;
-      height: calc((100% - 260px) / 2);
-    }
+        height: calc((100% - 260px) / 2);
+        margin-bottom: 10px;
+        }
+        .TabOne_centerChart {
+        margin-bottom: 10px;
+        height: calc((100% - 260px) / 2);
+        }
     .table-info {
       display: flex;
       height: 260px;