hotfix bug screen 10

Merge pull request 'Fix bug Screen 13' (#70 ) from dev-trungvq7-0729 into dev
Reviewed-on: #70
2025-08-18 09:25:41 +07:00 · 2025-08-18 10:50:01 +09:00 · 2025-08-18 10:47:00 +09:00 · 2025-08-18 10:44:55 +09:00 · 2025-08-18 10:40:46 +09:00 · 2025-08-15 15:52:52 +09:00
11 changed files with 329 additions and 228 deletions
--- a/assets/scss/common/grid.scss
+++ b/assets/scss/common/grid.scss
@ -109,6 +109,44 @@
  @include theme($theme);

  .v-application.#{$theme}-mode {
+    .enrg-effc {
+      .tui-grid-rside-area {
+        .tui-grid-table {
+          tr {
+
+            td:nth-child(4),
+            td:nth-child(10) {
+              .tui-grid-cell-content {
+                color: map-deep-get($config,
+                  #{$theme},
+                  "router-tab-item-active-color"
+                );
+              }
+            }
+          }
+
+          .tui-grid {
+
+            &-row-odd,
+            &-row-even {
+              &:hover {
+
+                >td:nth-child(4),
+                td:nth-child(10) {
+                  .tui-grid-cell-content {
+                    color: map-deep-get($config,
+                      #{$theme},
+                      "router-tab-item-active-color"
+                    );
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+
    .tui-grid-content-area {
      .tui-grid-header-area {
        height: auto !important;
@ -204,7 +242,7 @@
        overflow: auto;

        &::-webkit-scrollbar {
-          // width: $scrollbar-width !important;
+          width: $scrollbar-width !important;
          height: $scrollbar-width !important;
          -webkit-appearance: initial;
          background-color: rgba(0, 0, 0, 0) !important;
@ -358,6 +396,15 @@
            //   "tui-grid-cell-insert-color"
            // );
          }
+
+          span {
+            &.custom-link {
+              color: map-deep-get($config,
+                #{$theme},
+                "router-tab-item-active-color"
+              );
+            }
+          }
        }
      }

--- a/assets/scss/common/pagination.scss
+++ b/assets/scss/common/pagination.scss
@ -2,6 +2,13 @@

  // @include theme($theme);
  .v-application.#{$theme}-mode {
+    .pagination-wrapper {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      padding: 12px 0;
+      margin-top: 10px;
+    }

    .ant-pagination-item,
    .ant-pagination-prev,
--- a/components/pages/ems/DataSetInfo/DataSetTagRelTab.vue
+++ b/components/pages/ems/DataSetInfo/DataSetTagRelTab.vue
@ -39,8 +39,6 @@
 import { mapState, mapMutations, mapActions } from 'vuex';
 import Buttons from '~/components/common/button/Buttons';
 import Grid from '~/components/common/Grid';
-import { CustomCheckbox } from '~/plugins/gridUtility';
-import { CustomNumberEditor } from '~/plugins/gridUtility';
 import Form from '~/components/common/form/Form';
 import mixinGlobal from '@/mixin/global.js';
 import Utility from '~/plugins/utility';
@ -70,18 +68,6 @@ export default {
      loadGrid: false,
      gridName: 'rowDataSetTagRelGrid',
      detailDataSetTagList: myDataSetTagDetail,
-      dataPathMock: {
-        "rowDataSetTagRelGrid": {
-          column: [
-            { header: 'TAG ID', name: 'id', headerAlign: 'left' },
-            { header: 'TAG 명', name: 'name', headerAlign: 'left' },
-            { header: '모델 Data 구분', name: 'type', headerAlign: 'left' }
-          ],
-          data: dataPathDataExample,
-          defaultRow: dataPathDataExample,
-          option: {}
-        }
-      },
    };
  },
  computed: {
@ -324,7 +310,7 @@ const myDataSetTagDetail = [
    valueNm: 'tagNm',
    disabled: false,
    cols: 6,
-    class: 'py-2 mt-2',
+    class: 'py-2 mt-1',
    required: true,
    labelCols: 12,
    textCols: 12,
@ -350,12 +336,11 @@ const myDataSetTagDetail = [
    valueNm: 'useFg',
    disabled: false,
    cols: 5,
-    class: 'py-2 mt-2',
+    class: 'py-2 mt-1',
    value: { '1': true, '0': false },
    required: true,
    textCols: 12,
    iconShow: true,
-    // class: "d-flex align-end"
  },
  {
    type: 'TextArea',
@ -369,23 +354,4 @@ const myDataSetTagDetail = [
    required: false,
  },
 ];
-
-
-const dataPathDataExample = [
-  {
-    id: 'INCHEON.HVAC.EQP_HT_CH001.UT_CH101.CHI_AMP_1A_PV',
-    name: 'INCHEON 고온 냉동기 101호기 - 호로1',
-    type: '합계'
-  },
-  {
-    id: 'INCHEON.HVAC.EQP_HT_CH001.UT_CH101.CHI_AMP_1A_PV',
-    name: 'INCHEON 고온 냉동기 101호기 - 호로1',
-    type: '합계'
-  },
-  {
-    id: 'INCHEON.HVAC.EQP_HT_CH001.UT_CH101.CHI_AMP_1A_PV',
-    name: 'INCHEON 고온 냉동기 101호기 - 호로1',
-    type: '합계'
-  },
-];
 </script>
--- a/components/pages/ems/ErcChrgInfo/ErcChrgInfoTab.vue
+++ b/components/pages/ems/ErcChrgInfo/ErcChrgInfoTab.vue
@ -6,7 +6,7 @@
 					<v-row>
 						<v-col :cols="8" style="padding:0px">
 							<!-- 조회기간 -->
-							<DatePicker :parentPrgmId="parentPrgmId" label="조회기간" />
+							<DatePicker :parentPrgmId="parentPrgmId" label="조회기간" customClass="tab-datepicker" />
 						</v-col>
 						<v-col cols="4" class="d-flex justify-end align-center">
 							<Buttons
@ -378,3 +378,10 @@ function numberFormatter({ value }) {
 	return value.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',');
 }
 </script>
+<style lang="scss" scoped>
+	::v-deep {
+		.tab-datepicker {
+			width: 64% !important;
+		}
+	}
+</style>
--- a/pages/comm/base/BatchLogMngPage.vue
+++ b/pages/comm/base/BatchLogMngPage.vue
@ -7,41 +7,21 @@
 				<v-card class="searchFilter">
 					<v-row align="end" no-gutters>
 						<v-col :cols="2.5">
-							<InputText
-								:parentPrgmId="myPrgmId"
-								label="배치ID"
-								valueNm="batchId"
-								:searchOption="true"
-								customClass="input-large"
-							/>
+							<InputText :parentPrgmId="myPrgmId" label="배치ID" valueNm="batchId" :searchOption="true"
+								customClass="input-large" />
 						</v-col>
 						<v-col :cols="2.5">
-							<InputText
-								:parentPrgmId="myPrgmId"
-								label="배치명"
-								valueNm="batchNm"
-								:searchOption="true"
-								customClass="input-large"
-							/>
+							<InputText :parentPrgmId="myPrgmId" label="배치명" valueNm="batchNm" :searchOption="true"
+								customClass="input-large" />
 						</v-col>
 						<v-col :cols="2.5">
-							<component
-								:is="'selectCodeList'"
-								:parentPrgmId="myPrgmId"
-								:label="'실행 결과'"
-								:dataKey="'execRsltCd'"
-								:sendParam="{ commGrpCd: 'CO_BATCH_EXEC_RSLT', useFg: '1' }"
-								:addAll="true"
-								customClass="select-large"
-							/>
+							<component :is="'selectCodeList'" :parentPrgmId="myPrgmId" :label="'실행 결과'"
+								:dataKey="'execRsltCd'" :sendParam="{ commGrpCd: 'CO_BATCH_EXEC_RSLT', useFg: '1' }"
+								:addAll="true" customClass="select-large" />
 						</v-col>
 						<v-col :cols="2.5">
-							<component
-								:is="'Datepicker'"
-								:parentPrgmId="myPrgmId"
-								:label="'조회기간'"
-								customClass="datepicker-large"
-							/>
+							<component :is="'Datepicker'" :parentPrgmId="myPrgmId" :label="'조회기간'"
+								customClass="datepicker-large" />
 						</v-col>
 						<div class="text-right d-flex align-end justify-end pl-9" style="gap: 8px">
 							<BtnSearch />
@ -54,41 +34,30 @@

 		<v-row ref="contents">
 			<!-- 배치 리스트 -->
-			<v-col :cols="12" style="height:50%">
-				<v-card class="pb-5 h100">
+			<v-col :cols="12" style="height:70%">
+				<v-card class="h100">
 					<v-card-title>배치 리스트</v-card-title>
-					<div class="h100" style="height:calc(100% - 70px)">
+					<div class="h100" style="height:calc(100% - 150px)">
 						<div ref="gridParent" class="px-5 h100">
-							<component
-								:ref="gridName"
-								:is="loadGrid ? 'Grid' : null"
-								:parentPrgmId="myPrgmId"
-								:gridName="gridName"
-								@getRowsData="getRowData"
-							/>
+							<component :ref="gridName" :is="loadGrid ? 'Grid' : null" :parentPrgmId="myPrgmId"
+								:gridName="gridName" @getRowsData="getRowData" />
+						</div>
+						<div class="d-flex align-center justify-center pt-7" v-if="loadGrid && totalCount > 0">
+							<pagination id="pagination" :total-count="totalCount" :page-num="page" :limit="limit"
+								@loadData="changeGrid" />
 						</div>
-						<div class="d-flex align-center justify-center pa-5" v-if="loadGrid && totalCount > 0">
-						<pagination id="pagination" :total-count="totalCount" :page-num="page" :limit="limit"
-							@loadData="changeGrid" />
-					</div>
 					</div>
 				</v-card>
 			</v-col>
 			<!-- 배치 상세 -->
-			<v-col :cols="12" style="height:50%">
-				<v-card class="pb-5 h100">
+			<v-col :cols="12" style="height:30%">
+				<v-card class="h100">
 					<div class="d-flex align-center justify-space-between pa-5">
 						<v-card-title class="pa-0">배치 상세</v-card-title>
 					</div>
-					<div style="height:calc(100% - 50px)">
-						<div ref="gridParent" class="px-5 h100">
-							<component
-								:is="'Form'"
-								:parentPrgmId="myPrgmId"
-								:detailList="detailList"
-								@gridEditingFinish="gridEditingFinish"
-							/>
-						</div>
+					<div style="height:calc(100% - 50px)" class="px-5">
+						<component :is="'Form'" :parentPrgmId="myPrgmId" :detailList="detailList"
+							@gridEditingFinish="gridEditingFinish" />
 					</div>
 				</v-card>
 			</v-col>
@ -147,7 +116,7 @@ export default {
 			gridName: 'rowGrid',
 			// rowGridOrigin: [],
 			detailList: myDetail,
-			itemsPerPage: 10,
+			itemsPerPage: 20,
 			itemsPerPageArray: [10, 20, 30],
 			limit: 20,
 			page: 1,
@ -215,12 +184,12 @@ export default {
 			this.gridInit();
 		},
 		layoutInit() {
-		  this.$refs.contents.style.height = 'auto';
+			const searchFilterHeight = this.$refs.searchFilter.offsetHeight;
+			this.$refs.contents.style.height = `calc(100% - 30px - ${searchFilterHeight}px)`;
 		},
 		gridInit() {
 			this.loadGrid = false;
-			const gridHeight = this.$refs.gridParent.offsetHeight;
-
+			const gridHeight = this.$refs.gridParent.offsetHeight - 30;
 			const myOptions = {
 				scrollX: false,
 			};
@ -469,6 +438,7 @@ const myDetail = [
 		readonly: true,
 		cols: 12,
 		class: 'py-2',
+		rows: 3
 	},
 ];
 </script>
--- a/pages/comm/base/CalendarMngPage.vue
+++ b/pages/comm/base/CalendarMngPage.vue
@ -41,7 +41,7 @@
 					<v-card-title>
 						<span class="custom-title-4">캘린더 미리보기</span>
 					</v-card-title>
-					<v-card-actions class="px-5 d-block" >
+					<v-card-actions class="px-5 d-block">
 						<Calendar :parentPrgmId="myPrgmId" :gridName="gridName" :headerVisible="false"
 							:showTitle="false" />
 					</v-card-actions>
@ -470,71 +470,76 @@ const defaultData = {
 };
 </script>
 <style lang="scss" scoped>
-.selectbox:focus {
-	outline: none;
-}
-
-.calendarOption {
-	box-sizing: border-box;
-	position: relative;
-	width: 100%;
-	height: 100%;
-	padding: 0;
-	margin: 0;
-}
-
-select.selectbox {
-	box-sizing: border-box;
-	position: relative;
-	width: 100%;
-	height: 100%;
-	/* 높이 초기화 */
-	padding: 0;
-	margin: 0;
-	line-height: normal;
-	/* line-height 초기화 */
-	font-family: inherit;
-	/* 폰트 상속 */
-	border: 0;
-	// opacity: 0;  /* 숨기기 */
-	// filter:alpha(opacity=0);  /* IE8 숨기기 */
-	// -webkit-appearance: none; /* 네이티브 외형 감추기 */
-	// -moz-appearance: none;
-	// appearance: none;
-	opacity: 1;
-	/* 숨기기 */
-	filter: alpha(opacity=1);
-	/* IE8 숨기기 */
-	-webkit-appearance: auto;
-	/* 네이티브 외형 감추기 */
-	-moz-appearance: auto;
-	appearance: auto;
-}
-
-.tui-grid-layer-editing {
-	position: absolute;
-	background: #fff;
-	// background-image: initial;
-	// background-position-x: initial;
-	// background-position-y: initial;
-	// background-size: initial;
-	// background-repeat-x: initial;
-	// background-repeat-y: initial;
-	// background-attachment: initial;
-	// background-origin: initial;
-	// background-clip: initial;
-	// background-color: rgb(255, 255, 255);
-	// z-index: 15;
-	padding: 0;
-	margin: 0;
-	/* border-style: solid; */
-	/* border-width: 1px; */
-	white-space: nowrap;
-	border-width: 0px;
-	// box-sizing: border-box;
-}
-
 ::v-deep {
+	.selectbox:focus {
+		outline: none;
+	}
+
+	.calendarOption {
+		box-sizing: border-box;
+		position: relative;
+		width: 100%;
+		height: 100%;
+		padding: 0;
+		margin: 0;
+	}
+
+	select.selectbox {
+		box-sizing: border-box;
+		position: relative;
+		width: 100%;
+		height: 100%;
+		/* 높이 초기화 */
+		padding: 0;
+		margin: 0;
+		line-height: normal;
+		/* line-height 초기화 */
+		font-family: inherit;
+		/* 폰트 상속 */
+		border: 0;
+		// opacity: 0;  /* 숨기기 */
+		// filter:alpha(opacity=0);  /* IE8 숨기기 */
+		// -webkit-appearance: none; /* 네이티브 외형 감추기 */
+		// -moz-appearance: none;
+		// appearance: none;
+		opacity: 1;
+		/* 숨기기 */
+		filter: alpha(opacity=1);
+		/* IE8 숨기기 */
+		-webkit-appearance: auto;
+		/* 네이티브 외형 감추기 */
+		-moz-appearance: auto;
+		appearance: auto;
+		background: #fff;
+		border: 1px solid #d9d9d9;
+		border-radius: 6px;
+		color: rgba(0,0,0,0.87843);
+	}
+
+	.tui-grid-layer-editing {
+		position: absolute;
+		background: #fff;
+		// background-image: initial;
+		// background-position-x: initial;
+		// background-position-y: initial;
+		// background-size: initial;
+		// background-repeat-x: initial;
+		// background-repeat-y: initial;
+		// background-attachment: initial;
+		// background-origin: initial;
+		// background-clip: initial;
+		// background-color: rgb(255, 255, 255);
+		// z-index: 15;
+		padding: 0;
+		margin: 0;
+		/* border-style: solid; */
+		/* border-width: 1px; */
+		white-space: nowrap;
+		border-width: 0px;
+		// box-sizing: border-box;
+	}
+
+
 	.custom-vc-calender {
 		.vc-header {
 			display: none;
--- a/pages/ems/base/DashboardPage.vue
+++ b/pages/ems/base/DashboardPage.vue
@ -512,7 +512,7 @@
      <v-col cols="12" sm="12" xl="12" style="height: 300px">
        <v-card style="border-radius: 4px" class="pb-5">
          <div style="height: 20px"></div>
-          <div class="h100 px-5" style="height: calc(100% - 30px)">
+          <div class="h100 px-5" style="height: calc(100% - 70px)">
            <div ref="gridParent" class="h100 w100">
              <component
                :is="loadGrid ? 'Grid' : null"
@ -521,6 +521,16 @@
                :ref="gridName"
                @dblClick="gridClickEvent"
              />
+              <div v-if="loadGrid && totalCount > 0" class="pagination-wrapper">
+                <pagination
+                  id="pagination"
+                  :total-count="totalCount"
+                  :page-num="page"
+                  :limit="limit"
+                  :itemsPerPageArray="itemsPerPageArray"
+                  @loadData="changeGrid"
+                />
+              </div>
            </div>
          </div>
        </v-card>
@ -539,6 +549,7 @@ import DateUtility from "~/plugins/dateUtility";
 import Utility from "~/plugins/utility";
 import Grid from "~/components/common/Grid";
 import Chart from "~/components/common/Chart";
+import pagination from "~/components/common/Pagination";

 import AntCard from "~/components/common/card/AntCard";

@ -579,7 +590,8 @@ export default {
    Chart,
    UnusedStatPopPage,
    EtcStatPopPage,
-    PageTitle
+    PageTitle,
+    pagination
  },
  computed: {
    ...mapState({
@ -697,6 +709,10 @@ export default {

      gridName: "dashBoard_grid_01",
      loadGrid: false,
+      itemsPerPageArray: [10, 20, 50],
+      limit: 10,
+      page: 1,
+      totalCount: 0,
      isGridLoading: true,
    };
  },
@ -735,6 +751,11 @@ export default {
      }
      this.timer = setInterval(this.search, 90000); //15분 주기마다 갱신
    },
+    changeGrid: async function (pageNum, limit) {
+      this.page = pageNum;
+      this.limit = limit;
+      await this.getGridData();
+    },
    async search() {
      await new Promise((resolve) => setTimeout(resolve, 1500));
      if (this.$router.currentRoute.fullPath == this.myHome.root) {
@ -756,6 +777,41 @@ export default {
        // gridHeight = gridHeight*0.9
        gridHeight = this.$refs.gridParent.offsetHeight - 35;
      }
+      // Define custom button
+      class CustomButton {
+        constructor(props, pageData) {
+          const { grid, rowKey, columnInfo } = props;
+          const gridData = grid.store.data.rawData;
+          const value = gridData[rowKey][columnInfo.name];
+          const onClickCallback = columnInfo.renderer.options.onClick;
+
+          this.disabled = columnInfo.renderer.options.disabled || false;
+          const elDiv = document.createElement("div");
+          elDiv.innerHTML = `<span>${value}</span>`;
+          $(elDiv).addClass("tui-grid-cell-content d-flex justify-space-between");
+          const el2 = document.createElement("button");
+          $(el2).addClass("edit-btn blue--text");
+          el2.innerText = "보기";
+          elDiv.appendChild(el2);
+          this.el = elDiv;
+          if (!this.disabled && typeof onClickCallback === "function") {
+            // click 이벤트
+            this.el.addEventListener("click", function (event) {
+              onClickCallback(rowKey);
+            });
+          }
+        }
+        getElement() {
+          return this.el;
+        }
+        getValue() {
+          // return this.el.value;
+        }
+        mounted() {
+          // this.el.focus();
+        }
+      }
+
      const myOptions = {
        // scrollX: false,
        setScroll: true,
@ -840,7 +896,42 @@ export default {
        { header: "주의", name: "careStndVal", align: "right", width: 40 },
        { header: "경고", name: "warnStndVal", align: "right", width: 40 },
        { header: "가이드", name: "totVal", align: "right", width: 40 },
-        { header: "알람 내용", name: "alrmMsg", align: "left", resizable: false },
+        { header: "알람 내용", name: "alrmMsg", align: "left", resizable: false,
+          // Render custom button to switch page instead of double click on row
+          renderer: {
+            type: CustomButton,
+            options: {
+              value: "보기",
+              onClick: (rowKey) => {
+                var gridInstance = this.$refs[this.gridName].gridInstance;
+                var eventRowData = gridInstance.invoke("getRow", rowKey);
+                var data = {
+                  cmCycle: "CYC_DAY",
+                  fromDt:
+                    eventRowData.totDttm != undefined
+                      ? eventRowData.totDttm
+                      : Utility.setFormatDate(new Date(), "YYYY-MM-DD HH:mm"),
+                  fabId: eventRowData.fabId,
+                  eqpmKindId: eventRowData.eqpmKindId,
+                  eqpmGrpId: eventRowData.eqpmGrpId,
+                  eqpmId: eventRowData.eqpmId,
+                };
+                var key = "tick_" + Math.random();
+                this.$router.push({
+                  name: "ems-effc-EnrgUseEqpmDetlMntrPage",
+                  query: {
+                    prgmId: "PRG0082",
+                    // tick:key
+                  },
+                  params: {
+                    ...data,
+                    key: key,
+                  },
+                });
+              },
+            },
+          },
+         },
        { header: "설비종류", name: "eqpmKindId", align: "left", hidden: true },
        { header: "설비종류", name: "eqpmKindNm", align: "left", hidden: true },
      ];
@ -855,11 +946,21 @@ export default {
    },
    async getGridData() {
      this.loadGrid = false;
-      // console
+      // Get total records of grid
+      const totalRes =  await this.postApiReturn({
+        apiKey: "selectIssueGdIdxDataPageTotal",
+        resKey: "issueGdIdxDataPageTotal",
+      }); 
+      this.totalCount = totalRes[0].totalcount;
+
      const res = await this.postApiReturn({
        apiKey: "selectIssueGdIdxData",
        resKey: "issueGdIdxData",
-        sendParam: {},
+        sendParam: {
+          limit: this.limit,
+          page: this.page,
+          offset: (this.page - 1) * this.limit,
+        },
      });
      // let fakeData = [
      // 	{
--- a/pages/ems/base/EnrgResourceCenterMngPage.vue
+++ b/pages/ems/base/EnrgResourceCenterMngPage.vue
@ -84,67 +84,64 @@
 				</v-card>
 			</v-col>
 		</v-row>
-		<v-row >
-			<v-col :cols="5" class="h100">
-				<v-card class="pb-5">
-					<v-card-title class="d-flex justify-space-between align-end">
-						<span class="tit ft-size_20 ft-weight_600">에너지원 정보</span>
-						<Buttons
-							:parentPrgmId="myPrgmId"
-							:bindingData="gridName"
-							:detailList="detailList"
-							:btnActionsFnc="btnActions"
-						/>
-					</v-card-title>
-					<div class="px-5" style="height:calc(100% - 106px)">
-						<div ref="gridParent" class="w100 h100">
-							<component
-								:ref="gridName"
-								:is="loadGrid ? 'Grid' : null"
-								:gridName="gridName"
-								:parentPrgmId="myPrgmId"
-								@getRowsData="getRowData"
-								@sendSelectedRowStatInfo="getSelectedRowStatInfo"
-								:selectedRowDataWatchFlag="true"
-							/>
-						</div>
+		<v-row align="stretch">
+			<v-col :cols="5">
+				<v-card class="d-flex flex-column h100">
+				<v-card-title class="d-flex justify-space-between align-end">
+					<span class="tit ft-size_20 ft-weight_600">에너지원 정보</span>
+					<Buttons
+					:parentPrgmId="myPrgmId"
+					:bindingData="gridName"
+					:detailList="detailList"
+					:btnActionsFnc="btnActions"
+					/>
+				</v-card-title>
+				<div class="px-5" style="height: auto;">
+					<div ref="gridParent" class="w100">
+					<component
+						:ref="gridName"
+						:is="loadGrid ? 'Grid' : null"
+						:gridName="gridName"
+						:parentPrgmId="myPrgmId"
+						@getRowsData="getRowData"
+						@sendSelectedRowStatInfo="getSelectedRowStatInfo"
+						:selectedRowDataWatchFlag="true"
+					/>
 					</div>
+				</div>
 				</v-card>
 			</v-col>
-			<v-col :cols="7" class="h100">
-				<v-card class="pb-5">
-					<v-card-title>에너지원 상세</v-card-title>
-					<div class="px-5" style="min-height: auto;">
-						<v-tabs v-model="tab">
-							<v-tab
-								v-for="item in items"
-								:key="item.id"
-								:disabled="item.disabledFlag"
-							>
-								{{ item.name }}
-							</v-tab>
-						</v-tabs>
-						<v-tabs-items
-							v-model="tab"
-							class="py-6"
-							style="min-height: auto;"
-						>
-							<v-tab-item v-for="(item, idx) in items" :key="item.id">				
-								<component
-										v-if="item.id == 'ercInfoTab'"
-										:is="'Form'"
-										:parentPrgmId="myPrgmId"
-										:detailList="detailList"
-										@gridEditingFinish="gridEditingFinish"
-								/>
-								<ErcChrgInfoTab
-										v-if="item.id == 'ercChrgInfoTab'"
-										:parentPrgmId="myPrgmId"
-										:innerTabGridInfo="{ tab, idx }"
-								/>
-							</v-tab-item>
-						</v-tabs-items>
-					</div>
+
+			<v-col :cols="7">
+				<v-card class="d-flex flex-column h100">
+				<v-card-title>에너지원 상세</v-card-title>
+				<div class="px-5" style="height: auto;">
+					<v-tabs v-model="tab">
+					<v-tab
+						v-for="item in items"
+						:key="item.id"
+						:disabled="item.disabledFlag"
+					>
+						{{ item.name }}
+					</v-tab>
+					</v-tabs>
+					<v-tabs-items v-model="tab" class="py-6">
+					<v-tab-item v-for="(item, idx) in items" :key="item.id">
+						<component
+						v-if="item.id == 'ercInfoTab'"
+						:is="'Form'"
+						:parentPrgmId="myPrgmId"
+						:detailList="detailList"
+						@gridEditingFinish="gridEditingFinish"
+						/>
+						<ErcChrgInfoTab
+						v-if="item.id == 'ercChrgInfoTab'"
+						:parentPrgmId="myPrgmId"
+						:innerTabGridInfo="{ tab, idx }"
+						/>
+					</v-tab-item>
+					</v-tabs-items>
+				</div>
 				</v-card>
 			</v-col>
 		</v-row>
--- a/pages/ems/effc/EnrgEffcEqpmDetlMntrPage.vue
+++ b/pages/ems/effc/EnrgEffcEqpmDetlMntrPage.vue
@ -66,7 +66,7 @@
 						<v-card-title class="pa-0">설비별 현황 리스트</v-card-title>
 					</div>
 					<div class="px-4" style="height:calc(100% - 76px)">
-						<div ref="gridParent" class="w100 h100">
+						<div ref="gridParent" class="w100 h100 enrg-effc">
 							<component :ref="gridName" :is="loadGrid ? 'Grid' : null" :gridName="gridName"
 								:parentPrgmId="myPrgmId" :columnClickEventFlag="true" @columnClick="columnClick" />
 						</div>
--- a/pages/ems/effc/EnrgUseEqpmDetlMntrPage.vue
+++ b/pages/ems/effc/EnrgUseEqpmDetlMntrPage.vue
@ -152,16 +152,16 @@
            </div>
          </div>
        </v-row>
-        <v-row class="pa-1" style="height: 52%; width: 100%">
+        <v-row class="pa-1" style="height: 45%; width: 100%">
          <v-card class="pa-1" style="height: 100%; width: 100%; overflow: hidden">
            <div style="height: 15%">
-              <v-card-title class="d-flex align-center justify-space-between pl-3">
+              <v-card-title class="d-flex align-center justify-space-between pl-3 pt-2">
                <span class="tit ft-size_20 ft-weight_600">가이드 알람정보</span>
              </v-card-title>
            </div>
            <div
              ref="gridParent01"
-              class="pl-3 mt-5"
+              class="pl-3 mt-3"
              style="height: 75%; overflow: hidden;"
            >
              <component
--- a/store/modules/list.js
+++ b/store/modules/list.js
@ -970,4 +970,5 @@ const INIT_URL_STATE = {
 	selectTodayNgTopTen: 'ems/base/DashboardCtr/selectTodayNgTopTen',
 	selectCompareEqpmTGdChart: 'ems/base/DashboardCtr/selectCompareEqpmTGdChart',
 	selectIssueGdIdxData: 'ems/base/DashboardCtr/selectIssueGdIdxData',
+	selectIssueGdIdxDataPageTotal: 'ems/base/DashboardCtr/selectIssueGdIdxDataPageTotal',
 };
Author	SHA1	Message	Date
Tran Van Dung/(Tran Van Dung)/현장대리인/SK	50698ac661	hotfix bug screen 10	2025-08-18 09:25:41 +07:00
dev	c815eae2ca	Merge pull request 'Fix bug Screen 13' (#70 ) from dev-trungvq7-0729 into dev Reviewed-on: #70	2025-08-18 10:50:01 +09:00
dev	8a9dfd9949	Merge pull request 'fix desgin screen 38' (#69 ) from dev-manhph1-figbug into dev Reviewed-on: #69	2025-08-18 10:47:00 +09:00
dev	3155258656	Update 1508	2025-08-18 10:44:55 +09:00
dev	68916550e5	Update 1508	2025-08-18 10:40:46 +09:00
Pham Hoang Manh/(Pham Hoang Manh)/현장대리인/SK	1250b3d3af	fix desgin screen 38	2025-08-15 15:52:52 +09:00
dev	be1e0426e0	Merge pull request 'Add paging and button view detail for S1 dashboard + Fix bugs 156 163' (#68 ) from dev-nghiantt-fix-bugs into dev Reviewed-on: #68	2025-08-15 10:10:47 +09:00
Michael	81a20d2851	Add paging and button view detail for S1 dashboard + Fix bugs 156 163	2025-08-14 17:09:19 +09:00