Browse Source

部分组件替换、描述文本修改、字段替换

yangxiao 3 years ago
parent
commit
a3873ae1b8
2 changed files with 13 additions and 8 deletions
  1. 13 5
      src/views/NewPages/dj1.vue
  2. 0 3
      src/views/WindSite/pages/Home/Home.vue

+ 13 - 5
src/views/NewPages/dj1.vue

@@ -69,7 +69,7 @@
       <el-row>
         <el-col :span="15">
           <panel :title="'功率曲线'" class="mg-b-16">
-            <marker-line-chart :height="'28vh'" :list="powerLineChartData" :showLegend="true" />
+            <marker-line-chart :height="'28vh'" :list="powerLineChartData" :units="['(MW)', '(m/s)']" :showLegend="true" />
           </panel>
           <panel :title="'日发电量信息'" class="mg-b-16 outline" :showLine="false">
             <div class="power-info">
@@ -452,7 +452,7 @@
 <script>
 import AreaBarChart from "../../components/chart/combination/area-bar-chart.vue";
 import MultipleBarLineChart from "../../components/chart/combination/multiple-bar-line-chart.vue";
-import MarkerLineChart from "../../components/chart/line/marker-line-chart.vue";
+import MarkerLineChart from "../../components/chart/line/multiple-line-chart.vue";
 import DualPieChart from "../../components/chart/pie/dual-pie-chart.vue";
 import DirectionRadarChart from "@com/chart/radar/radar-chart.vue";
 import panel from "../../components/coms/panel/panel.vue";
@@ -462,7 +462,7 @@ export default {
   setup () { },
   data () {
     return {
-      tabIndex: 4,
+      tabIndex: 0,
       tableData: {
         column: [
           {
@@ -596,6 +596,7 @@ export default {
 
       powerLineChartData: [{
         title: "",
+        yAxisIndex: 0,
         value: []
       }],
 
@@ -945,16 +946,23 @@ export default {
           recorddate: that.recorddate
         },
         success (res) {
-          const keyArray = ["value1", "value2", "value3"];
+          const keyArray = ["value1", "value2", "value3", "value4"];
 
           let powerLineChartData = [{
+            title: "风速",
+            yAxisIndex: 1,
+            value: []
+          }, {
             title: "实际拟合功率",
+            yAxisIndex: 0,
             value: []
           }, {
-            title: "最优拟合功率",
+            title: "最优功率",
+            yAxisIndex: 0,
             value: []
           }, {
             title: "保证功率",
+            yAxisIndex: 0,
             value: []
           }];
 

+ 0 - 3
src/views/WindSite/pages/Home/Home.vue

@@ -357,7 +357,6 @@ export default {
         method: "GET",
         subUrl: "powercompare/windfarmAllAjax",
         success(res) {
-          console.warn(res);
           let btnGroups = [
             {
               icon: "svg-wind-site",
@@ -443,7 +442,6 @@ export default {
           wpId: that.wpId,
         },
         success(res) {
-          console.log(123, res);
           if (res.data) {
             that.tqmap = res.data.tqmap;
             let fjmap = [];
@@ -716,7 +714,6 @@ export default {
   },
   watch: {
     $route(res) {
-      console.warn("router变化");
       this.wpId = res.params.wpId;
       this.requestData(false);
       this.renderBtnActiveIndex();