节前备份

src/views/powerconfiguration/index.vue

@@ -74,7 +74,7 @@
         <el-table-column prop="value" label="设备启停控制" align="center" width="200">
           <template #default="scope">
             <el-switch
-              v-model="scope.row.binding"
+              v-model="scope.row.value"
               active-value="1"
               inactive-value="0"
               @change="changeswitch(scope.row)"
@@ -359,7 +359,7 @@ const Switchvalue = ref();
 
 const changeswitch = async (row: { eid: any; value: string }) => {
   // console.log("Switch value:", newValue);
-  console.log("Switch value:", row);
+  console.log("Switch value:", row.value);
 
   if (row.value == "0") {
     Switchvalue.value = "确定关闭设备吗?";

src/views/reportforms/index.vue

@@ -77,7 +77,7 @@
                   <el-button size="large" type="primary" plain>{{ $t("reportforms.export") }}</el-button>
                   <template #dropdown>
                     <el-dropdown-menu v-for="(item, index) in columnList" :key="index">
-                      <el-dropdown-item>
+                      <el-dropdown-item v-if="item.label != '并网点'">
                         <el-checkbox @change="oncheck" v-model="item.ifcolumn" :label="item.label" size="large" />
                         <template v-if="item.children">
                           <template v-for="(items, i) in item.children" :key="i">
@@ -96,8 +96,14 @@
             &ensp;&ensp;
             <el-table :data="tableData.list" style="width: 100%" align="center" :show-overflow-tooltip="true">
               <!-- <el-table-column type="selection" width="55" /> -->
+
               <template v-for="(item, index) in columnList" :key="index">
-                <el-table-column v-if="item.ifcolumn" :label="item.label" :prop="item.prop" align="center">
+                <el-table-column
+                  v-if="item.ifcolumn && item.label != '并网点'"
+                  :label="item.label"
+                  :prop="item.prop"
+                  align="center"
+                >
                   <template v-if="item.children">
                     <template v-for="(items, i) in item.children" :key="i">
                       <el-table-column v-if="items.ifcolumn" :label="items.label" :prop="items.prop" align="center">
@@ -106,6 +112,7 @@
                   </template>
                 </el-table-column>
               </template>
+
               <!-- <el-table-column prop="stationName" label="站点名称" width="150" align="center" />
               <el-table-column label="充电量(kWh)" align="center">
                 <el-table-column prop="chargeSharp" label="尖" align="center" />
@@ -535,6 +542,12 @@ import { other, Station } from "@/api/interface";
 // 汇总表头
 const columnList = ref([
   {
+    prop: "grid",
+    label: "并网点",
+    ifcolumn: true,
+    children: null
+  },
+  {
     prop: "stationName",
     label: "日期",
     ifcolumn: true,
@@ -620,6 +633,7 @@ const singlecolumnList = ref([
     ifcolumn: true,
     children: null
   },
+
   {
     prop: "",
     label: "充电量(kWh)",
@@ -1137,7 +1151,7 @@ const onexport = async () => {
   if (columnList.value) {
     for (const column of columnList.value) {
       if (column?.ifcolumn) {
-        if (column.prop) {
+        if (column.prop && column.prop != "grid") {
           obj.push(column.prop);
         }
         if (column.children) {
@@ -1346,9 +1360,9 @@ const getstategriddayURL = async () => {
     endDate: StateGrid.value[1]
   };
   const { data } = await stategriddayURL(obj, stategridSite.value);
-  data.total.stationName = "总计";
+  // data.total.stationName = "总计";
 
-  data.list.push(data.total);
+  // data.list.push(data.total);
   GridReportdata.value = data;
 };
 // 月份
@@ -1358,9 +1372,9 @@ const getstategridmonthURL = async () => {
     endYearMonth: StateGrid.value[1]
   };
   const { data } = await stategridmonthURL(obj, stategridSite.value);
-  data.total.stationName = "总计";
+  // data.total.stationName = "总计";
 
-  data.list.push(data.total);
+  // data.list.push(data.total);
   GridReportdata.value = data;
 };
 // 年份
@@ -1370,9 +1384,9 @@ const getstategridyearURL = async () => {
     endYear: StateGrid.value[1]
   };
   const { data } = await stategridyearURL(obj, stategridSite.value);
-  data.total.stationName = "总计";
+  // data.total.stationName = "总计";
 
-  data.list.push(data.total);
+  // data.list.push(data.total);
   GridReportdata.value = data;
 };