修正

vpp-ui/src/api/vpp/time.js

@@ -54,6 +54,14 @@ export function listRealTimePlanDataEcharts(query) {
   })
 }
 
+export function listDayAheadPlanDataEcharts(query) {
+  return request({
+    url: '/vpp/dayAheadPlanData/echarts',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询【请填写功能名称】详细
 export function getTime(id) {
   return request({

vpp-ui/src/views/vpp/Articles/index.vue

@@ -88,7 +88,7 @@
           align="center"
           label="节点名称"
           prop="name"
-          width="230px"
+          width="350px"
         >
         </el-table-column>
         <el-table-column

vpp-ui/src/views/vpp/echartsQuery/index.vue

@@ -58,7 +58,7 @@
               align="center"
               label="节点名称"
               prop="name"
-              width="230px"
+              width="350px"
             >
             </el-table-column>
             <el-table-column
@@ -99,7 +99,7 @@
 <script>
 
 import {listDayAheadPlanData} from "@/api/vpp/ahead";
-import {listRealTimePlanDataEcharts} from "@/api/vpp/time";
+import {listDayAheadPlanDataEcharts} from "@/api/vpp/time";
 
 export default {
   name: 'fdjh-name',
@@ -145,7 +145,7 @@ export default {
       });
     },
     listRealTimePredictDataEcharts() {
-      listRealTimePlanDataEcharts(this.table).then(resp => {
+      listDayAheadPlanDataEcharts(this.table).then(resp => {
         this.init({
           "timePoints": resp.times,
           "jhData": resp.plan,

vpp-ui/src/views/vpp/fdjh/gf/index.vue

@@ -88,7 +88,7 @@
           align="center"
           label="节点名称"
           prop="name"
-          width="230px"
+          width="350px"
         >
         </el-table-column>
         <el-table-column

vpp-ui/src/views/vpp/fdjh/hd/index.vue

@@ -88,7 +88,7 @@
           align="center"
           label="节点名称"
           prop="name"
-          width="230px"
+          width="350px"
         >
         </el-table-column>
         <el-table-column

vpp-ui/src/views/vpp/rqdd/rqddjh.vue

@@ -13,7 +13,7 @@
           align="center"
           label="场站名称"
           prop="name"
-          width="230px"
+          width="350px"
         >
         </el-table-column>
         <el-table-column

vpp-ui/src/views/vpp/sjcjjk/gznfh/index.vue

@@ -1,66 +1,66 @@
 <template>
-    <div class="table-wrapper">
-        <div class="table-box">
-            <div class="title"
-                 style="font-family: AliMaMa;font-size: 30px;font-weight: 1000;text-align: left;height: 40px">
-                <span style="position: absolute;top:-3px;left: 70px">高载能负荷</span>
-            </div>
-            <el-table
-                    :cell-style="{border:0,color:'#fff'}"
-                    :data="tableData"
-                    :header-cell-style="{color:'#fff'}"
-                    :row-style="{backgroundColor:'rgb(4,66,115,0.3)'}"
-                    size="mini"
-                    style="width: 1429px;font-size: 17px;background: none"
-            >
-                <el-table-column
-                        align="center"
-                        label="节点名称"
-                        prop="stationName"
-                        width="270px"
-                >
-                </el-table-column>
-                <el-table-column
-                        align="center"
-                        label="预测值"
-                        prop="capacity"
-                >
-                </el-table-column>
-                <el-table-column
-                        align="center"
-                        label="预测时间"
-                        prop="time">
-                </el-table-column>
-                <el-table-column
-                        align="center"
-                        label="数据接收时间"
-                        prop="date">
-                </el-table-column>
-            </el-table>
-        </div>
+  <div class="table-wrapper">
+    <div class="table-box">
+      <div class="title"
+           style="font-family: AliMaMa;font-size: 30px;font-weight: 1000;text-align: left;height: 40px">
+        <span style="position: absolute;top:-3px;left: 70px">高载能负荷</span>
+      </div>
+      <el-table
+        :cell-style="{border:0,color:'#fff'}"
+        :data="tableData"
+        :header-cell-style="{color:'#fff'}"
+        :row-style="{backgroundColor:'rgb(4,66,115,0.3)'}"
+        size="mini"
+        style="width: 1429px;font-size: 17px;background: none"
+      >
+        <el-table-column
+          align="center"
+          label="节点名称"
+          prop="stationName"
+          width="350px"
+        >
+        </el-table-column>
+        <el-table-column
+          align="center"
+          label="预测值"
+          prop="capacity"
+        >
+        </el-table-column>
+        <el-table-column
+          align="center"
+          label="预测时间"
+          prop="time">
+        </el-table-column>
+        <el-table-column
+          align="center"
+          label="数据接收时间"
+          prop="date">
+        </el-table-column>
+      </el-table>
     </div>
+  </div>
 </template>
 
 <script>
 
 export default {
-    name: 'Article-Index',
-    data() {
-        return {
-            form: {
-                taskNumber: '',
-                date: '',
-                current: 1,
-                size: 10
-            },
-            tableData: []
-        }
-    },
-    methods: {},
-    mounted() {
-        const tableDataList = require('../../tabledata.json');
-        this.tableData = tableDataList.windDataList
+  name: 'Article-Index',
+  data() {
+    return {
+      form: {
+        taskNumber: '',
+        date: '',
+        current: 1,
+        size: 10
+      },
+      tableData: []
     }
+  },
+  methods: {},
+  mounted() {
+    const tableDataList = require('../../tabledata.json');
+    this.tableData = tableDataList.windDataList
+  }
 }
 </script>
 

vpp-ui/src/views/vpp/sjcjjk/ptfh/index.vue

@@ -17,7 +17,7 @@
           align="center"
           label="节点名称"
           prop="bus"
-          width="230px"
+          width="350px"
         >
         </el-table-column>
         <el-table-column

vpp-ui/src/views/vpp/ssdd/LeftNav.vue

@@ -101,7 +101,7 @@ export default {
               name: "数据采集监控",
               children: [
                 {
-                  path: "/#ssddhdc",
+                  path: "/#/ssddhdc",
                   name: "火电厂",
                 },
                 {
@@ -186,12 +186,12 @@ export default {
 
 .test {
   background: url(../fdjh/img/node_bg.png) no-repeat;
-//padding-left: 8px; height: 38px; width: 90%; display: inline-block; line-height: 38px;
+  //padding-left: 8px; height: 38px; width: 90%; display: inline-block; line-height: 38px;
 }
 
 .rootbg {
   background: url(../fdjh/img/root_bg.png) no-repeat;
-//padding-left: 8px; height: 38px; width: 90%; display: inline-block; line-height: 38px;
+  //padding-left: 8px; height: 38px; width: 90%; display: inline-block; line-height: 38px;
 }
 
 .sidebar {

vpp-ui/src/views/vpp/ssdd/ssddjh.vue

@@ -13,7 +13,7 @@
           align="center"
           label="场站名称"
           prop="name"
-          width="230px"
+          width="350px"
         >
         </el-table-column>
         <el-table-column

vpp-ui/src/views/vpp/ssddejcd/cn/index.vue

@@ -88,7 +88,7 @@
           align="center"
           label="节点名称"
           prop="name"
-          width="230px"
+          width="350px"
         >
         </el-table-column>
         <el-table-column

vpp-ui/src/views/vpp/ssddejcd/fd/index.vue

@@ -88,7 +88,7 @@
           align="center"
           label="节点名称"
           prop="name"
-          width="230px"
+          width="350px"
         >
         </el-table-column>
         <el-table-column

vpp-ui/src/views/vpp/ssddejcd/gf/index.vue

@@ -88,7 +88,7 @@
           align="center"
           label="节点名称"
           prop="name"
-          width="230px"
+          width="350px"
         >
         </el-table-column>
         <el-table-column

vpp-ui/src/views/vpp/ssddejcd/gznfh/index.vue

@@ -1,66 +1,66 @@
 <template>
-    <div class="table-wrapper">
-        <div class="table-box">
-            <div class="title"
-                 style="font-family: AliMaMa;font-size: 30px;font-weight: 1000;text-align: left;height: 40px">
-                <span style="position: absolute;top:-3px;left: 70px">高载能负荷</span>
-            </div>
-            <el-table
-                    :cell-style="{border:0,color:'#fff'}"
-                    :data="tableData"
-                    :header-cell-style="{color:'#fff'}"
-                    :row-style="{backgroundColor:'rgb(4,66,115,0.3)'}"
-                    size="mini"
-                    style="width: 1429px;font-size: 17px;background: none"
-            >
-                <el-table-column
-                        align="center"
-                        label="节点名称"
-                        prop="stationName"
-                        width="270px"
-                >
-                </el-table-column>
-                <el-table-column
-                        align="center"
-                        label="预测值"
-                        prop="capacity"
-                >
-                </el-table-column>
-                <el-table-column
-                        align="center"
-                        label="预测时间"
-                        prop="time">
-                </el-table-column>
-                <el-table-column
-                        align="center"
-                        label="数据接收时间"
-                        prop="date">
-                </el-table-column>
-            </el-table>
-        </div>
+  <div class="table-wrapper">
+    <div class="table-box">
+      <div class="title"
+           style="font-family: AliMaMa;font-size: 30px;font-weight: 1000;text-align: left;height: 40px">
+        <span style="position: absolute;top:-3px;left: 70px">高载能负荷</span>
+      </div>
+      <el-table
+        :cell-style="{border:0,color:'#fff'}"
+        :data="tableData"
+        :header-cell-style="{color:'#fff'}"
+        :row-style="{backgroundColor:'rgb(4,66,115,0.3)'}"
+        size="mini"
+        style="width: 1429px;font-size: 17px;background: none"
+      >
+        <el-table-column
+          align="center"
+          label="节点名称"
+          prop="stationName"
+          width="350px"
+        >
+        </el-table-column>
+        <el-table-column
+          align="center"
+          label="预测值"
+          prop="capacity"
+        >
+        </el-table-column>
+        <el-table-column
+          align="center"
+          label="预测时间"
+          prop="time">
+        </el-table-column>
+        <el-table-column
+          align="center"
+          label="数据接收时间"
+          prop="date">
+        </el-table-column>
+      </el-table>
     </div>
+  </div>
 </template>
 
 <script>
 
 export default {
-    name: 'Article-Index',
-    data() {
-        return {
-            form: {
-                taskNumber: '',
-                date: '',
-                current: 1,
-                size: 10
-            },
-            tableData: []
-        }
-    },
-    methods: {},
-    mounted() {
-        const tableDataList = require('../../tabledata.json');
-        this.tableData = tableDataList.windDataList
+  name: 'Article-Index',
+  data() {
+    return {
+      form: {
+        taskNumber: '',
+        date: '',
+        current: 1,
+        size: 10
+      },
+      tableData: []
     }
+  },
+  methods: {},
+  mounted() {
+    const tableDataList = require('../../tabledata.json');
+    this.tableData = tableDataList.windDataList
+  }
 }
 </script>
 

vpp-ui/src/views/vpp/ssddejcd/hd/index.vue

@@ -88,7 +88,7 @@
           align="center"
           label="节点名称"
           prop="name"
-          width="230px"
+          width="350px"
         >
         </el-table-column>
         <el-table-column

vpp-ui/src/views/vpp/ssddejcd/ptfh/index.vue

@@ -17,7 +17,7 @@
           align="center"
           label="节点名称"
           prop="bus"
-          width="230px"
+          width="350px"
         >
         </el-table-column>
         <el-table-column

vpp-ui/src/views/vpp/ssddjk/ssdd.vue

@@ -75,7 +75,7 @@
     </div>
     <div class="zx">
       <div class="littleHeadWord">
-        <span>日前调度计划</span>
+        <span>实时调度计划</span>
       </div>
       <CenterMiddle2/>
     </div>

vpp-ui/src/views/vpp/xndc/modules/left-middle.vue

@@ -30,9 +30,10 @@ export default {
       listRealTimePredictDataEcharts().then(res => {
         this.init({
           "timePoints": res.times,
-          "sfData": res.loadPredictP,
-          "ycData": this.ycData
+          "sfData": this.sfData,
+          "ycData": res.loadPredictP
         })
+
       });
     },
     init(newData) {
@@ -165,6 +166,45 @@ export default {
               color: "#f0692f",
               type: 'dashed'
             },
+            label: {
+              show: true,
+              position: 'right',
+              textStyle: {
+                fontSize: 16,
+                fontWeight: 1000,
+                color: "#f0692f"
+              },
+              formatter: (params) => {
+                if (newData.ycData.length - 1 == params.dataIndex) {
+                  return params.value
+                } else {
+                  return ""
+                }
+              },
+            },
+            markLine: {
+              // 锁定最后一个元素展示纵向虚线
+              symbol: ['none', 'none'],
+              label: {show: false},
+              data: [{xAxis: newData.ycData.length - 1}],
+            },
+            areaStyle: {
+              //右，下，左，上
+              color: new graphic.LinearGradient(
+                0, 0, 0, 1,
+                [
+                  {
+                    offset: 0,
+                    color: "rgba(243,91,9,0.74)",
+                  },
+                  {
+                    offset: 1,
+                    color: "rgba(9,202,243,.0)",
+                  },
+                ],
+                false
+              ),
+            },
             data: newData.ycData
           },
         ],

vpp-ui/src/views/vpp/ydjhdjk/gznfh/index.vue

@@ -17,7 +17,7 @@
           align="center"
           label="节点名称"
           prop="name"
-          width="230px"
+          width="350px"
         >
         </el-table-column>
         <el-table-column