merge file

pages/ems/base/ReadResultCloseMngPage.vue

@@ -91,7 +91,7 @@
               </a-button>
             </div>
           </div>
-          <div ref="gridParent" class="px-5 w100" style="min-height: 60vh">
+          <div ref="gridParent" class="px-5 w100" style="height: 55vh;">
               <component
                 :is="loadGrid ? 'Grid' : null"
                 :ref="gridName"
@@ -242,6 +242,10 @@ export default {
         columnOptions: {
           resizable: true,
         },
+        pageOptions: {
+					useClient: true,
+					perPage: 13,
+				},
       };
       this.setGridOption({
         gridKey: this.gridName,

pages/ems/effc/EnrgUseEqpmDetlMntrPage.vue

@@ -865,7 +865,7 @@ export default {
             currentChartData["data"][j]["totVal"];
 				}
 
-        console.log("text seri data", seriesData);
+        // console.log("text seri data", seriesData);
 
         this.$store.state.pageData[myPrgmId][chartKey]["xAxis"]["data"] = xAxisData;
         this.$store.state.pageData[myPrgmId][chartKey]["series"][0]["data"] = seriesData;