update

src/router/index.js

@@ -382,6 +382,14 @@ const routes = [{
 			import( /* webpackChunkName: "windsitehome" */ "../views/NewPages/station.vue"),
 	},
 
+	//报表管理-统计分析-新能源日报
+	{
+		path: "/decision/statisticAnalysis/daily",
+		name: "ny",
+		component: () =>
+			import( /* webpackChunkName: "windsitehome" */ "../views/NewPages/daily.vue"),
+	},
+
 	{
 		path: "/decision/nhycfsdl",
 		name: "nhycfsdl",

src/views/NewPages/daily.vue

@@ -0,0 +1,63 @@
+<template>
+  <div class="daily">
+      <h1 class="tit">国电电力河北新能源日报</h1>
+      <div class="daily-table">
+           <el-table
+      :data="tableData"
+      style="width: 100%">
+      <el-table-column
+        prop="date"
+        label="日期"
+        width="180">
+      </el-table-column>
+      <el-table-column
+        prop="name"
+        label="姓名"
+        width="180">
+      </el-table-column>
+      <el-table-column
+        prop="address"
+        label="地址">
+      </el-table-column>
+    </el-table>
+      </div>
+  </div>
+</template>
+
+<script>
+export default {
+      data() {
+        return {
+          tableData: [{
+            date: '2016-05-02',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1518 弄'
+          }, {
+            date: '2016-05-04',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1517 弄'
+          }, {
+            date: '2016-05-01',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1519 弄'
+          }, {
+            date: '2016-05-03',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1516 弄'
+          }]
+        }
+      }
+    }
+</script>
+
+<style lang="less" scoped>
+.daily{
+.tit{
+    text-align: center;
+    color: rgb(131, 121, 121);
+}
+.daily-table{
+     margin: 20px 20px 0 20px;
+}
+}
+</style>

src/views/NewPages/form.vue

@@ -36,11 +36,15 @@
           :prop="i"
           :label="i === 'name' ? '名字' : i === 'date' ? '日期' : i"
           :fixed="i === 'name' || i === 'date' ? 'left' : null"
-          width="200"
+          width="160"
           align="center"
         >
           <template #default="scope">
-            <!-- <el-input @input="send(scope.row)"  v-if="scope.row.name =='止码' && i != 'name' && i != 'date'" v-model="scope.row[i]" :disabled='routerData.isConfirm == 1'></el-input> -->
+            <!-- <el-input @input="send(scope.row)"
+              v-if="scope.row.name =='止码' && i != 'name' && i != 'date'" 
+              v-model="scope.row[i]" 
+              :disabled='timeNow.isConfirm == 1'>
+              </el-input> -->
             <el-input
               @input="send(scope.row)"
               v-if="scope.row.name == '止码' && i != 'name' && i != 'date'"
@@ -63,11 +67,11 @@ export default {
     return {
       tableData: [],
       tableTit: [],
-      timeNow: this.$route.query,
+      timeNow: {},
     };
   },
   created() {
-    this.getFormList();
+    (this.timeNow = this.$route.query), this.getFormList();
   },
   methods: {
     getFormList() {
@@ -77,27 +81,28 @@ export default {
           theday: this.timeNow.theday,
         })
         .then((res) => {
-          // console.log(res.data);
-          for (let i = 0; i < res.data.length; i++) {
+          for (let i = 0; i < res.data.length ? res.data.length : ""; i++) {
             for (let key in res.data[i]) {
               if (key === "date") {
-                res.data[i][key] = res.data[i][key].slice(0, 10);
+                res.data[i][key] = new Date(res.data[i][key]).formatDate("yyyy-MM-dd");
               }
             }
           }
-
           this.tableData = res.data;
-
-          // console.log(res.data);
-          // console.log(44444444444444444444, this.tableTit, this.tableData);
         });
     },
     // 表格
-    handleClick(row) {
-      // console.log(row);
-    },
+    handleClick(row) {},
     back() {
-      this.$router.push("/decision/statisticAnalysis");
+      this.$router.push({
+        path: "/decision/statisticAnalysis",
+        query: {
+          theday: this.timeNow.theday,
+          wpid: this.timeNow.wpid,
+          beginDate: this.timeNow.beginDate,
+          endDate: this.timeNow.endDate,
+        },
+      });
     },
     blackCZ() {
       this.$router.push({
@@ -105,6 +110,8 @@ export default {
         query: {
           theday: this.timeNow.theday,
           wpid: this.timeNow.wpid,
+          beginDate: this.timeNow.beginDate,
+          endDate: this.timeNow.endDate,
         },
       });
     },

src/views/NewPages/station.vue

@@ -17,8 +17,8 @@
           v-for="(i, index) in tableClu.slice(0, 2)"
           :key="index"
           :prop="i"
-          :label="i"
-          width="240"
+          :label="i === 'name' ? '名称' : i"
+          width="140"
         >
           <template #default="scope">
             {{ scope.row[i] }}
@@ -36,17 +36,18 @@
             :key="i"
             :prop="i"
             label="当日值"
-           
             align="center"
+            width="100"
           >
             <template #default="scope">
               <!-- <el-input
               v-if="tableString.indexOf(i) != -1"
-              :disabled="scope.row['是否可编辑'] == 1 || routerData.isConfirm == 1"
+              :disabled="scope.row['是否可编辑'] == 1 || timeNow.isConfirm == 1"
               size="mini"
               @change="changeNum(scope.row)"
               v-model="scope.row[i]"
             ></el-input> -->
+
               <el-input
                 v-if="tableString.indexOf(i) != -1"
                 :disabled="true"
@@ -72,12 +73,11 @@ export default {
       tableClu: [],
       tableCluObj: [],
       tableString: [],
-      timeNow: this.$route.query,
+      timeNow: {},
     };
   },
   created() {
-    // console.log("xxxxxxxxxxxxxxxxxxxxxxxxx", this.timeNow);
-    this.getCZList();
+    (this.timeNow = this.$route.query), this.getCZList();
   },
   methods: {
     //   场站
@@ -93,16 +93,13 @@ export default {
               if (typeof i[k] == "object") {
                 if (i[k] != null) {
                   for (let p of res.data[0] ? Object.keys(i[k]) : "") {
-                    // console.log(i[k][p]);
                     i[k + p] = i[k][p];
                   }
                 }
               }
             }
           }
-
           this.tableData = res.data;
-          // console.log("tableData", this.tableData);
           for (let i of res.data[0] ? Object.keys(res.data[0]) : "") {
             if (typeof res.data[0][i] != "object") {
               if (i != "是否可编辑" && i != "id") {
@@ -121,12 +118,18 @@ export default {
           for (let i of this.tableCluObj) {
             this.tableString.push(i + "当日值(编辑)");
           }
-          // console.log("tableClu", this.tableClu);
-          // console.log("tableCluObj", this.tableCluObj);
         });
     },
     back() {
-      this.$router.push("/decision/statisticAnalysis");
+      this.$router.push({
+        path: "/decision/statisticAnalysis",
+        query: {
+          theday: this.timeNow.theday,
+          wpid: this.timeNow.wpid,
+          beginDate: this.timeNow.beginDate,
+          endDate: this.timeNow.endDate,
+        },
+      });
     },
     backForm() {
       this.$router.push({
@@ -134,10 +137,11 @@ export default {
         query: {
           theday: this.timeNow.theday,
           wpid: this.timeNow.wpid,
+          beginDate: this.timeNow.beginDate,
+          endDate: this.timeNow.endDate,
         },
       });
     },
-
     addClass({ row, column, rowIndex, columnIndex }) {
       // if(columnIndex === 4){
       if (parseFloat(row.麻黄山风电场) < 0) {
@@ -164,15 +168,12 @@ export default {
       if (parseFloat(row.宣和光伏发电站) < 0) {
         return "background:yellow";
       }
-
-      // }
     },
     changeNum(v) {
       const date = this.routerData.data.theday;
       const wpid = this.routerData.data.wpid;
       v.date = date;
       v.wpid = wpid;
-      // console.log(this.routerData);
       this.sendData.push(v);
     },
   },

src/views/NewPages/statisticAnalysis.vue

@@ -70,9 +70,11 @@
 import api from "@api/economic/index.js";
 export default {
   created() {
+    // 将查询的日期存入到routerData
+    this.routerData.beginDate = this.$route.query.beginDate;
+    this.routerData.endDate = this.$route.query.endDate;
     this.getList();
   },
-
   components: {},
   data() {
     return {
@@ -86,9 +88,9 @@ export default {
       ],
       tableData: [],
       loading: false,
+      routerData: {},
     };
   },
-
   methods: {
     handleClickCZ(row) {
       this.$router.push({
@@ -96,6 +98,9 @@ export default {
         query: {
           wpid: row.wpid,
           theday: row.theday,
+           isConfirm: row.isConfirm,
+          beginDate: this.routerData.beginDate,
+          endDate: this.routerData.endDate,
         },
       });
     },
@@ -103,29 +108,32 @@ export default {
       this.$router.push({
         path: "/decision/statisticAnalysis/form",
         query: {
-          wpid: row.wpid,
+          wpid: row.wpid, 
           theday: row.theday,
+          isConfirm: row.isConfirm,
+          beginDate: this.routerData.beginDate,
+          endDate: this.routerData.endDate,
         },
       });
     },
     handleClick3(row) {
-      console.log("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", row);
       api.analysisplusCommit(row).then((res) => {
-        console.log("666666666666666666", res);
         this.getList();
-        // this.tableData = res.data;
       });
     },
     getList: function () {
+      if (this.$route.query.beginDate != null) {
+        this.dateArea[0] = this.$route.query.beginDate;
+        this.dateArea[1] = this.$route.query.endDate;
+      }
       api
         .statisticAnalysis({
           beginDate: new Date(this.dateArea[0]).formatDate("yyyy-MM-dd"),
           endDate: new Date(this.dateArea[1]).formatDate("yyyy-MM-dd"),
         })
         .then((res) => {
-          // console.log('666666666666666666',res.data);
           this.tableData = res.data;
-          this.loading=false
+          this.loading = false;
         });
     },
     getTime(val) {
@@ -144,7 +152,6 @@ export default {
         return end;
       }
     },
-
     // 格式化日期
     fmtDate(date) {
       let curDate = date || new Date();
@@ -169,6 +176,13 @@ export default {
       );
     },
     search() {
+      // 将查询的日期存入到routerData
+      this.routerData.beginDate = new Date(this.dateArea[0]).formatDate(
+        "yyyy-MM-dd"
+      );
+      this.routerData.endDate = new Date(this.dateArea[1]).formatDate(
+        "yyyy-MM-dd"
+      );
       this.loading = true;
       this.getList();
     },

src/views/layout/Menu.vue

@@ -346,6 +346,11 @@ export default {
                   icon: "svg-matrix",
                   path: "/decision/statisticAnalysis",
                 },
+                {
+                  text: "新能源日报",
+                  icon: "svg-matrix",
+                  path: "/decision/statisticAnalysis/daily",
+                },
              
               ],
             },