fix ui EvtObjPop

assets/scss/common.scss

@@ -144,7 +144,7 @@ a {
 
   & .router-tab__container {
     overflow-y: auto;
-    height: calc(100vh - 105px);
+    min-height: calc(100vh - 105px);
     max-height: calc(100vh - 105px);
     padding: 20px;
   }
@@ -486,7 +486,7 @@ a {
     .container--fluid {
       background-color: map-deep-get($config, #{$theme}, "container-fluid");
       .menu-container {
-        height:calc(100vh - 60px);
+        max-height:calc(100vh - 60px);
         overflow-y: auto;
       }
     }

assets/scss/common/grid.scss

@@ -254,23 +254,12 @@
           "tui-grid-border-vertical-color"
         );
 
-        // &-current-row{
+        &-current-row{
-        // }
+          td {
-        td.row-selected {
             .custom-radio {
-            background-color: map-deep-get($config,
-              #{$theme},
-              "ant-btn-primary-color"
-            );
               .radio-mark{
-              border-color: map-deep-get($config,
+                border-color: #1677ff;
-                #{$theme},
+                background-color: #fff;
-                "arow-line-color"
-              );
-              background-color: map-deep-get($config,
-                #{$theme},
-                "arow-line-btn-bg-color"
-              );
                 &::after {
                   content: "";
                   position: absolute;
@@ -280,10 +269,8 @@
                   height: 11px;
                   width: 11px;
                   border-radius: 50%;
-                background-color: map-deep-get($config,
+                  background-color: #1677ff;
-                  #{$theme},
+                }
-                  "arow-line-color"
-                );
               }
             }
           }

assets/scss/common/input.scss

@@ -188,7 +188,7 @@
   transform: translateY(-50%);
   height: 18px;
   width: 18px;
-  // background-color: white;
+  background-color: white;
   border: 2px solid #ccc;
   border-radius: 50%;
   transition: all 0.2s ease;
@@ -263,6 +263,9 @@
         "v-input-backgroundColor"
       );
 
+
+      
+
       &:not(.v-input--radio-group, .v-input--checkbox) {
         .v-input__slot {
           background-color: map-deep-get($config,
@@ -369,17 +372,6 @@
         }
       }
     }
-
-    .radio-mark {
-      background-color: map-deep-get($config,
-        #{$theme},
-        "ant-btn-primary-color"
-      );
-      border-color: map-deep-get($config,
-        #{$theme},
-        "v-input-textarea-border"
-      );
-    }
   }
 
   .v-radio {

assets/scss/common/text.scss

@@ -63,12 +63,6 @@
   line-height: 1.25 !important;
 }
 
-.custom-title-7 {
-  font-size: 0.875rem !important;
-  font-weight: 400 !important;
-  line-height: 22px !important;
-}
-
 .custom-title-8 {
   font-size: 0.75rem !important;
   font-weight: 700 !important;
@@ -82,15 +76,15 @@
 
 .custom-text-2 {
   opacity: 0.6;
+  font-family: SpoqaHanSansNeo;
   font-size: 14px;
+  font-weight: normal;
+  font-stretch: normal;
+  font-style: normal;
   line-height: 2.17;
-  // font-weight: normal;
+  letter-spacing: normal;
-  // font-stretch: normal;
+  text-align: right;
-  // font-style: normal;
+  color: #fff;
-  // letter-spacing: normal;
-  // text-align: right;
-  // color: #fff;
-  // font-family: SpoqaHanSansNeo;
 }
 
 .text-color--white-0 {

components/common/Grid.vue

@@ -4,13 +4,12 @@
 		:data="chkGridData"
 		:columns="chkGridColumns"
 		:options="chkGridOptions"
-		@mousedown="onMousedown"
+		@focusChange="focusChangeEvt"
 		@click="startEditing"
 		@editingFinish="editingFinish"
 		@dblclick="dblClick"
 		@mouseover="mouseoverEvent"
 		@mouseout="mouseoutEvent"
-		@focusChange="focusChangeEvt"
 	/>
 </template>
 <script>
@@ -108,13 +107,16 @@ export default {
 		},
 		chkGridOptions() {
 			const options = {
+				// bodyHeight: 'fitToContent',
+				scrollX: false,
+				scrollY: false,
 				...this.gridData.option,
+				useIcon: false,
 			};
 			options.treeColumnOptions = {
 				useIcon: false,
 				...options.treeColumnOptions,
 			};
-
 			return options;
 		},
 		defaultRow() {
@@ -161,7 +163,7 @@ export default {
 	},
 	created() {},
 	async mounted() {
-		// console.log(this.dataPath);
+		// console.log('--------------DEBUG----gridData: ', this.gridData);
 		if (this.gridName) {
 			this.gridInstance = this.$refs['tuigrid' + this.gridName];
 
@@ -184,13 +186,13 @@ export default {
 		}),
 		// true : 현재 행 혹은 연결된 그리드가 수정중인 상태
 		checkGridState() {
-			const rowStatList = ['I', 'U', 'D'];
+			var rowStatList = ['I', 'U', 'D'];
-			const row = this.gridInstance.invoke('getFocusedCell');
+			var row = this.gridInstance.invoke('getFocusedCell');
 
 			if (row) {
-				const rowData = this.gridInstance.invoke('getRow', row.rowKey);
+				var rowData = this.gridInstance.invoke('getRow', row.rowKey);
 				if (rowData) {
-					const rowStat = rowData['rowStat'];
+					var rowStat = rowData['rowStat'];
 					if (rowStatList.includes(rowStat)) {
 						return true;
 					}
@@ -198,8 +200,8 @@ export default {
 			}
 
 			if (this.preventFocusChangeEventTargetGridList) {
-				for (let gridInstance of this.preventFocusChangeEventTargetGridList) {
+				for (var gridInstance of this.preventFocusChangeEventTargetGridList) {
-					const dataArr = gridInstance.save();
+					var dataArr = gridInstance.save();
 
 					if (dataArr.length > 0) {
 						return true;
@@ -251,11 +253,9 @@ export default {
 			this.gridInstance.invoke('check', rowData.rowKey, instance);
 		},
 		setSelectionRange(rowKey) {
-			// console.log("------------------DEBUG-------setSelectionRange:", rowKey);
 			const rowDatas = this.gridInstance.invoke('getData');
 			rowDatas.forEach(item => {
 				if (item.rowKey == rowKey) {
-					// console.log("------------------DEBUG-------setSelectionRange---item:", item);
 					this.gridInstance.invoke(
 						'addRowClassName',
 						item.rowKey,
@@ -270,12 +270,7 @@ export default {
 				}
 			});
 		},
-		onMousedown(evt) {
-			// console.log("------------------DEBUG-------onMousedown:", evt);
-			this.focusChangeEvt(evt);
-		},
 		focusChangeEvt(e) {
-			// console.log("------------------DEBUG-------focusChangeEvt:", e);
 			// console.log('focusChangeEvt1...')
 			if (this.preventFocusChangeEvent(e)) {
 				// console.log('prevent focusChangeEvt')
@@ -296,7 +291,6 @@ export default {
 			this.sendSelectedRowData(e.rowKey);
 		},
 		startEditing(e) {
-			// console.log("------------------DEBUG-------startEditing:", e);
 			// console.log('startEditing1...')
 			if (this.preventFocusChangeEvent(e)) {
 				// console.log('prevent startEditing')
@@ -323,7 +317,6 @@ export default {
 			}
 		},
 		async editingFinish(e) {
-			// console.log('------------------DEBUG-------editingFinish:', e);
 			// console.log("Editing END E::", e);
 			// editor 간 이동시 수정되는 문제 수정
 			// e.rowEditingFg: grid의 한 row를 한번에 수정할 시 각각의 cell 마다 click 이벤트가 발생하지 않아 this.editorStartKey값이 제대로 입력 되지 않는 경우를 대비하여 만든 Fg
@@ -673,6 +666,8 @@ export default {
       store.dimension.offsetLeft = offsetLeft;
     },
 		setHeight(_a,height){
+			return; // setting auto height
+			
       // console.log("setHeight");
       var dimension = _a.dimension;
       var headerHeight = dimension.headerHeight, summaryHeight = dimension.summaryHeight, tableBorderWidth = dimension.tableBorderWidth;
@@ -685,7 +680,6 @@ export default {
 						? this.gridInstance.invoke('getFocusedCell').rowKey
 						: eventRowKey;
 				var rowData = this.gridInstance.invoke('getRow', rowKey);
-				// console.log('------------------DEBUG-------sendSelectedRowData:', {eventRowKey, rowKey});
 				this.$emit('sendSelectedRowStatInfo', rowData);
 			}
 		},
@@ -711,6 +705,11 @@ export default {
 </script>
 <style scoped lang="scss">
 ::v-deep .tui-grid-container {
+	
+	// .tui-grid-body-area {
+	// 	overflow: hidden !important;
+	// }
+
 	.tui-grid-content-area {
 		.tui-grid-cell-content {
 			input[type='number'] {

components/common/PastRsltDatePicker.vue

@@ -2,7 +2,9 @@
 	<v-row class="search-box" align="center" no-gutters>
 		<v-col v-if="label" :cols="labelCols">
 			<label for="" class="search-box-label">
-				<v-icon x-small color="primary" class="mr-1">mdi-record-circle</v-icon>
+				<v-icon small color="primary" 
+				:class="['mr-1', required ? 'icon-orange' : 'icon-blue']"
+				>$icoBulletPoint</v-icon>
 				{{ label }}
 			</label>
 		</v-col>
@@ -17,14 +19,16 @@
 					readonly
 					outlined
 				>
-					<template #append>
+					<template #append >
-						<v-icon size="20">$icoCalendar</v-icon>
+						<v-icon size="20" v-show="!isRange">$icoCalendar</v-icon>
 					</template>
 					<template #append-outer>
 						<div ref="startpicker-container" id="startpicker-container"></div>
 					</template>
 				</v-text-field>
-				<div v-show="isRange" class="mx-3" :style="{ lineHeight: 0 }">~</div>
+				<div v-if="isRange" class="mx-3" :style="{ lineHeight: 0 }">
+					<img :src="arrowIcon" alt="">
+				</div>
 				<v-text-field
 					v-show="isRange"
 					id="endpicker"
@@ -129,6 +133,12 @@ export default {
 				this.defaultRange === 'no limite'
 			);
 		},
+		arrowIcon() {
+			if(this.isDarkMode){
+				return require('@/assets/images/arrow_datepicker_dm.png');
+			}
+			return require('@/assets/images/arrow_datepicker.png');
+		}
 	},
 	watch: {
 		myCmCycle() {

components/common/ThemeSwitch.vue

@@ -31,8 +31,8 @@ export default {
 			this.mode = !this.mode;
 			this.$vuetify.theme.isDark = this.mode;
 			this.setThemeChange(this.mode);
-			// console.log(this.mode)
+			console.log(this.mode)
-			// console.log(this.$vuetify.theme.isDark)
+			console.log(this.$vuetify.theme.isDark)
 		},
 	},
 };

components/common/form/InputNumber.vue

@@ -125,7 +125,7 @@ export default {
 		modifyValue(e) {
 			let val = e.target.value.replace(/[^-.0-9]/g, '');
 
-			// console.log('val : ', val);
+			console.log('val : ', val);
 
 			if(this.item.min != undefined && parseFloat(val) < this.item.min){
 				val = this.item.min;
@@ -134,7 +134,7 @@ export default {
 			if(this.item.max != undefined && parseFloat(val) > this.item.max){
 				val = this.item.max;
 			}
-			// console.log('val2 : ', val);
+			console.log('val2 : ', val);
 
 			this.textValue = val;
 			// this.textValue = this.validateNumber(val);

components/common/modal/DrSimulSlctPop.vue

@@ -152,12 +152,12 @@ export default {
 				const snarData = this.searchParam.isMulti
 					? this.searchParam.snarInfoList
 					: this.searchParam.snarInfo;
-				// console.log('this.searchParam.isMulti', this.searchParam.isMulti);
+				console.log('this.searchParam.isMulti', this.searchParam.isMulti);
-				// console.log(
+				console.log(
-				// 	'this.searchParam.snarInfoList',
+					'this.searchParam.snarInfoList',
-				// 	this.searchParam.snarInfoList,
+					this.searchParam.snarInfoList,
-				// );
+				);
-				// console.log('this.searchParam.snarInfo', this.searchParam.snarInfo);
+				console.log('this.searchParam.snarInfo', this.searchParam.snarInfo);
 				if (Array.isArray(snarData)) {
 					if (snarData.length > 0) {
 						for (const item of snarData) {

components/common/modal/DrSnarExecPop.vue

@@ -394,7 +394,7 @@ export default {
 					params: {},
 				},
 			});
-			// console.log('statusCd', statusCd);
+			console.log('statusCd', statusCd);
 			if (statusCd.data.retnCd == 0) {
 				const params2 = {
 					simulationId: statusCd.data.dataset.simulId,

components/common/modal/EgrpPysclQtyPop.vue

@@ -46,10 +46,11 @@
 										v-model="searchWord" @keyup.enter="search"><template v-slot:append>
 											<!-- Custom SVG icon -->
 											<v-icon>$icoSearch</v-icon>
+
 										</template></v-text-field>
 								</v-col>
 								<v-spacer></v-spacer>
-								<v-col :cols="3" class="text-right">
+								<v-col cols="3" class="text-right">
 									<a-button icon="search" type="primary" @click="search()"
 										class="search-button">조회</a-button>
 									<!-- <v-btn :ripple="false" @click="initSearch()">

components/common/modal/EqpmSelectPop_bk.vue

@@ -286,8 +286,8 @@ export default {
 			// Row selection config
 			rowSelection: {
 				onChange: (selectedRowKeys, selectedRows) => {
-					// console.log('Selected Row Keys:', selectedRowKeys);
+					console.log('Selected Row Keys:', selectedRowKeys);
-					// console.log('Selected Rows:', selectedRows);
+					console.log('Selected Rows:', selectedRows);
 				},
 			}
 		};
@@ -332,7 +332,7 @@ export default {
 		// 	this.getRowGridData();
 		// },
 		searchFab() {
-			// console.log('tttttttttttt')
+			console.log('tttttttttttt')
 			// this.filteredData = this.data.filter(item => {
 			// 	const matchGrp = this.eqpmGrpSelected ? item.group === this.eqpmGrpSelected : true;
 			// 	const matchFab = this.localFabSelected ? item.fab === this.localFabSelected : true;

components/common/modal/EvtObjPop.vue

@@ -1,5 +1,5 @@
 <template>
-	<v-row class="search-box" align="center">
+	<v-row class="search-box no-gutters" align="center">
 		<v-col :cols="option.labelCols" class="py-0">
 			<label for="" class="search-box-label">
 				<v-icon v-if="item.iconShow" small
@@ -8,13 +8,11 @@
 			</label>
 		</v-col>
 		<v-col :cols="option.textCols" class="py-0">
-			<v-text-field readonly append-icon="" class="v-input__custom" outlined :hide-details="true"
+			<v-text-field readonly append-icon="" :class="['v-select__custom', customClass]" outlined :hide-details="true"
-				v-model="searchWord" @keyup.enter="typeEnterKey" @click="dialogOpenCloseEvent(dialog)"
+				v-model="selectValue" @keyup.enter="typeEnterKey" @click="dialogOpenCloseEvent(dialog)" style="padding: 0;"
 				:required="item.required || false"><template v-slot:append>
 					<!-- Custom SVG icon -->
 					<v-icon>$icoSearch</v-icon>
-
-
 				</template></v-text-field>
 		</v-col>
 
@@ -43,8 +41,6 @@
 								class="search-button">조회</a-button>
 						</v-row>
 					</v-col>
-
-
 				</v-row>
 				<!-- <div :style="'height: calc(65vh)'"> -->
 				<div :style="'height: 600px'" class="px-5">

components/common/modal/FixedValueModiPop.vue

@@ -126,7 +126,7 @@ export default {
 		async chkDialog(val) {
 			if (val) {
 				// 열릴 때
-				// console.log('dsfafds');
+				console.log('dsfafds');
 				await this.getData();
 				// console.log("chkDialog: ", val);
 				// if(this.searchParam.selecUserList.length > 0){

components/common/modal/FtnPlcFormPop.vue

@@ -22,8 +22,8 @@
 				outlined
 				:hide-details="true"
 			>
-			<!-- Custom SVG icon -->
 			<template v-slot:append>
+					<!-- Custom SVG icon -->
 					<v-icon>$icoSearch</v-icon>
 			</template>
 		</v-text-field>
@@ -31,20 +31,28 @@
 
 		<v-dialog v-model="dialog" scrollable width="700px">
 			<v-card style="height: 100%">
-				<v-card-title class="px-6 py-4 d-flex align-center justify-space-between">
+				<v-card-title class="pa-5 d-flex align-center justify-space-between">
 					<span class="custom-title-4">{{ option.modalTitle }}</span>
-					<a-button icon="close" type="text" @click="dialogOpenCloseEvent(dialog)"></a-button>
+					<v-btn
+						icon
+						tile
+						:ripple="false"
+						@click="dialogOpenCloseEvent(dialog)"
+					>
+						<v-icon>mdi-close</v-icon>
+					</v-btn>
 				</v-card-title>
 				<div class="pa-5">
 					<v-row align="center" no-gutters>
-						<v-col :cols="12">
+						<v-col :cols="3">
 							<label for="" class="search-box-label">
-								<!-- <v-icon x-small color="primary" class="mr-1">mdi-record-circle</v-icon> -->
+								<v-icon x-small color="primary" class="mr-1"
-								<v-icon small :class="['mr-1 icon-blue']">$icoBulletPoint</v-icon>
+									>mdi-record-circle</v-icon
+								>
 								검색
 							</label>
 						</v-col>
-						<v-col :cols="9">
+						<v-col :cols="5">
 							<v-text-field
 								append-icon="mdi-magnify"
 								class="v-input__custom"
@@ -55,19 +63,21 @@
 							></v-text-field>
 						</v-col>
 						<v-spacer></v-spacer>
-						<v-col :cols="3" class="text-right">
+						<v-col cols="4" class="text-right">
-							<a-button type="primary" @click="search()" icon="search">
+							<v-btn :ripple="false" @click="search()">
 								조회
-							</a-button>
+							</v-btn>
-							<a-button @click="initSearch()">
+							<v-btn :ripple="false" @click="initSearch()">
 								초기화
-							</a-button>
+							</v-btn>
 						</v-col>
 					</v-row>
 				</div>
-			<!-- <v-divider></v-divider> -->
+				<v-divider></v-divider>
-				<div style="height: 429px;" class="py-3 px-5">
+				<!-- <div :style="'height: calc(65vh)'"> -->
-					<div ref="modalGridParent" class="h100 w100">
+					<div :style="'height: 429px;'">
+					<!-- <div :style="{ height: 'calc(100% - 213px)' }"> -->
+					<div ref="modalGridParent" class="h100 w100 py-3">
 						<component
 							:is="loadGrid && dialog ? 'Grid' : null"
 							:gridName="grid_01"
@@ -78,9 +88,11 @@
 						/>
 					</div>
 				</div>
-				<v-card-actions class="pa-5 d-flex align-center justify-end">
+				<v-card-actions class="pa-5 d-flex align-center justify-center">
-					<a-button class="mr-2" @click="dialogOpenCloseEvent(dialog)">닫기</a-button>
+					<v-btn :ripple="false" @click="setUpdate($event)">확인</v-btn>
-					<a-button type="primary" @click="setUpdate($event)">확인</a-button>
+					<v-btn :ripple="false" @click="dialogOpenCloseEvent(dialog)"
+						>닫기</v-btn
+					>
 				</v-card-actions>
 			</v-card>
 		</v-dialog>
@@ -324,7 +336,7 @@ export default {
 				}))
 			};
 
-			// console.log(res);
+			console.log(res);
 			
 			this.setModalGridData({
 				modalKey: this.myModalKey,
@@ -383,31 +395,7 @@ var FtnPlcFormPop = {
 </script>
 
 <style lang="scss" scoped>
-// @each $theme in dark, light {
-// 	@include theme($theme);
-// 	.v-application.#{$theme}-mode {
-// 		.v-input--is-readonly {
-// 			border-color: map-deep-get($config,
-// 				#{$theme},
-// 				"v-input-readonly-border-color"
-// 			);
-// 			::v-deep {
-// 				&:not(.v-input--radio-group, .v-input--checkbox) {
-// 					.v-input__slot {
-// 						background-color: map-deep-get($config,
-// 							#{$theme},
-// 							"v-input-backgroundColor"
-// 						) !important;
-// 					}
-// 				}
-// 			}
-
-// 		}
-// 	}
-// }
-
 ::v-deep {
-
 	.v-dialog {
 		overflow-y: hidden !important;
 	}
@@ -430,4 +418,26 @@ var FtnPlcFormPop = {
 	}
 }
 
+@each $theme in dark, light {
+	.v-application.#{$theme}-mode {
+		.v-dialog {
+			.v-card {
+				&__title {
+					color: map-deep-get($color, 'white', '0');
+					@if $theme == dark {
+						background-color: #2d3355;
+						.v-btn {
+							background-color: #2d3355;
+						}
+					} @else {
+						background-color: #3f4d7d;
+						.v-btn {
+							background-color: #3f4d7d;
+						}
+					}
+				}
+			}
+		}
+	}
+}
 </style>

components/common/modal/FtnPlcMultiPop3.vue

@@ -294,10 +294,10 @@ export default {
 			if (this.searchParam.energyCd < 0) {
 				roiIdVal = null;
 			} else {
-				// console.log(
+				console.log(
-				// 	'this.searchParam.energyList[this.searchParam.energyCd]',
+					'this.searchParam.energyList[this.searchParam.energyCd]',
-				// 	this.searchParam.energyList[this.searchParam.energyCd],
+					this.searchParam.energyList[this.searchParam.energyCd],
-				// );
+				);
 				roiIdVal = this.searchParam.energyList[this.searchParam.energyCd + 1]
 					.cd;
 			}

components/common/modal/OnlnBaseEccPop.vue

@@ -239,13 +239,13 @@ export default {
 			this.selectedData.eccNm = '';
 
 			if (this.bindOption === null) {
-				// console.log('this.bindOption is null...');
+				console.log('this.bindOption is null...');
 				this.setPageData({
 					modalEccId: '',
 					modalEccNm: '',
 				});
 			} else {
-				// console.log('this.bindOption is not null...');
+				console.log('this.bindOption is not null...');
 				this.setPageData({
 					[this.bindOption.eccId]: '',
 					[this.bindOption.eccNm]: '',
@@ -296,12 +296,12 @@ export default {
 						? localStorage.getItem(this.parentPrgmId + 'ModalEccNm')
 						: '',
 			});
-			// console.log(
+			console.log(
-			// 	'localStorage.getItem(this.parentPrgmId + "ModalEccNm") : ',
+				'localStorage.getItem(this.parentPrgmId + "ModalEccNm") : ',
-			// 	localStorage.getItem(this.parentPrgmId + 'ModalEccNm') != null
+				localStorage.getItem(this.parentPrgmId + 'ModalEccNm') != null
-			// 		? localStorage.getItem(this.parentPrgmId + 'ModalEccNm')
+					? localStorage.getItem(this.parentPrgmId + 'ModalEccNm')
-			// 		: '',
+					: '',
-			// );
+			);
 			this.textFieldData =
 				localStorage.getItem(this.parentPrgmId + 'ModalEccNm') != null
 					? localStorage.getItem(this.parentPrgmId + 'ModalEccNm')

components/common/modal/PlanPop.vue

@@ -296,25 +296,25 @@ export default {
 			}
 		},
 		strtDt(val) {
-			// console.log('strtDt : ', val);
+			console.log('strtDt : ', val);
 			this.checkStrtAndEndDateTime('start');
 			if (this.startDatepickerInstance3) {
 				this.startDatepickerInstance3.setDate(new Date(this.endDt));
 			}
 		},
 		endDt(val) {
-			// console.log('endDt : ', val);
+			console.log('endDt : ', val);
 			this.checkStrtAndEndDateTime('end');
 			if (this.startDatepickerInstance) {
 				this.startDatepickerInstance.setDate(new Date(this.strtDt));
 			}
 		},
 		strtHh(val) {
-			// console.log('strtHh : ', val);
+			console.log('strtHh : ', val);
 			this.checkStrtAndEndDateTime('start');
 		},
 		endHh(val) {
-			// console.log('endHh : ', val);
+			console.log('endHh : ', val);
 			this.checkStrtAndEndDateTime('end');
 		},
 		strtMm(val) {

components/common/modal/ReadPlcDisableFuncPop.vue

@@ -253,7 +253,7 @@ export default {
 					readObjid: this.searchParam.energyCd,
 				},
 			});
-			// console.log('getTreeData : ', res);
+			console.log('getTreeData : ', res);
 			// this.treeData = res;
 			// const ROOT = res[0].plcCd;
 			const setTreeData = await this.setTree({
@@ -327,7 +327,7 @@ export default {
 		// 공정/설비 트리 row 클릭이벤트
 		async getRowData(data) {
 			// console.log("getRowData 시작...");
-			// console.log('data', data);
+			console.log('data', data);
 			this.activeRowData = data;
 			// if(data.enableFg == 1){
 			// this.activeRowData = data;

components/common/select/SelectDsEnrg.vue

@@ -70,7 +70,7 @@ export default {
 				return this.searchParam[this.parentPrgmId][this.enrgCd];
 			},
 			set(value) {
-				// console.log('value : ', value);
+				console.log('value : ', value);
 				return this.setPageData({ [this.enrgCd]: value });
 			},
 		},

components/form/CustomInput.vue

@@ -270,8 +270,8 @@ export default {
 			filteredData: [],
 			rowSelection: {
 				onChange: (selectedRowKeys, selectedRows) => {
-					// console.log('Selected Row Keys:', selectedRowKeys);
+					console.log('Selected Row Keys:', selectedRowKeys);
-					// console.log('Selected Rows:', selectedRows);
+					console.log('Selected Rows:', selectedRows);
 				},
 			}
 		};

components/pages/ems/DataSetInfo/DataSetTagRelTab.vue

@@ -213,7 +213,7 @@ export default {
       let dataArr = [];
       switch (action) {
         case 'add':
-          // console.log('add this.pageData : '); // , this.pageData);
+          console.log('add this.pageData : '); // , this.pageData);
           const defaultRow = {
             dataSetId: this.pageData.dataSetId,
             dataSetNm: this.pageData.dataSetNm,
@@ -296,7 +296,7 @@ export default {
         comId: this.selectedComId,
         dataSetId: this.selectedDataSetId,
       };
-      // console.log('data : ', data);
+      console.log('data : ', data);
       this.$emit('jamoviClickEvent', 'view1', data);
     },
   },

components/pages/ems/EqpmInfo/EqpmAddInfoTab.vue

@@ -1,7 +1,10 @@
 <template>
 	<div>
-		<div class="d-flex justify-space-between align-center my-5" >
+		<div
-			<span class="txt custom-subtitle-tab">설비 추가 정보</span>
+			class="d-flex justify-space-between align-center"
+			style="height: 80px;"
+		>
+			<span class="txt custom-title-4-new">설비 추가 정보</span>
 			<Buttons
 				:parentPrgmId="parentPrgmId"
 				:bindingData="gridName"
@@ -17,6 +20,7 @@
 				:editorGrid="true"
 				:innerTabGridInfo="innerTabGridInfo"
 				@getRowsData="getRowData"
+				:dataPath="dataPathMock"
 			/>
 		</div>
 	</div>
@@ -48,7 +52,7 @@ export default {
 	},
 	data() {
 		return {
-			loadGrid: false,
+			loadGrid: true,
 			gridName: 'rowDetailGrid',
 			rowKey: null,
 			edtingFinishFlag: 'Y',
@@ -339,9 +343,7 @@ export default {
 				value: myColumns,
 			});
 
-			this.$nextTick(() => {
 			this.loadGrid = true;
-			});
 		},
 		async btnActions(action) {
 			let dataArr = [];

components/pages/ems/EqpmInfo/EqpmConstTab.vue

@@ -1,12 +1,12 @@
 <template>
 	<div>
-		<div class="d-flex justify-space-between align-center my-5" >
+		<div class="d-flex justify-space-between align-center" style="height: 80px;">
-			<span class="txt custom-subtitle-tab">설비 상수 정보</span>
+			<span class="txt custom-title-4-new">설비 상수 정보</span>
 			<Buttons :parentPrgmId="parentPrgmId" :bindingData="gridName" :btnActionsFnc="btnActions" />
 		</div>
 		<div ref="gridParent" style="min-height: calc(100vh - 800px);">
 			<Grid :ref="gridName" :is="loadGrid ? 'Grid' : null" :gridName="gridName" :parentPrgmId="parentPrgmId"
-				@getRowsData="getRowData" :innerTabGridInfo="innerTabGridInfo" />
+				@getRowsData="getRowData" :innerTabGridInfo="innerTabGridInfo" :dataPath="dataPathMock" />
 		</div>
 		<div style="min-height: calc(100vh - 900px);" class="mt-4">
 			<component :is="'Form'" :parentPrgmId="parentPrgmId" :bindingData="gridName" :detailList="detailList"
@@ -41,7 +41,7 @@ export default {
 	},
 	data() {
 		return {
-			loadGrid: false,
+			loadGrid: true,
 			gridName: 'rowEqpmConstGrid',
 			detailList: myEqpmConstDetail,
 
@@ -232,9 +232,7 @@ export default {
 				value: myColumns,
 			});
 
-			this.$nextTick(() => {
 			this.loadGrid = true;
-			});
 		},
 		async getRowData(data, gridName) {
 			if (data.rowStat === 'I') {
@@ -291,8 +289,8 @@ export default {
 
 						dataArr.map(item => {
 							for (var key of Object.keys(item)) {
-								// console.log('key : ', key);
+								console.log('key : ', key);
-								// console.log('item[key] : ', item[key]);
+								console.log('item[key] : ', item[key]);
 								if (!item[key] && requiredKeyList.includes(key)) {
 									validCheck = false;
 								}

components/pages/ems/EqpmInfo/EqpmIaoTab.vue

@@ -1,24 +1,28 @@
 <template>
 	<div>
-		<div class="d-flex justify-space-between align-center my-5" >
+		<div
-			<span class="txt custom-subtitle-tab">설비 입출력 정보</span>
+			class="d-flex justify-space-between align-center"
+			style="height: 80px;"
+		>
+			<span class="txt custom-title-4-new">설비 입출력 정보</span>
 			<Buttons
 				:parentPrgmId="parentPrgmId"
 				:bindingData="gridName"
 				:btnActionsFnc="btnActions"
 			/>
 		</div>
-		<div ref="gridParent" style="height: calc(100vh - 800px);">
+		<div ref="gridParent" style="min-height: calc(100vh - 800px);" >
+			<!-- :is="loadGrid ? 'Grid' : null" -->
 			<Grid
 				:ref="gridName"
-				:is="loadGrid ? 'Grid' : null"
 				:gridName="gridName"
 				:parentPrgmId="parentPrgmId"
 				@getRowsData="getRowData"
 				:innerTabGridInfo="innerTabGridInfo"
+				:dataPath="dataPathMock"
 			/>
 		</div>
-		<div style="min-height: calc(100vh - 900px);">
+		<div style="min-height: calc(100vh - 900px);" class="mt-4">
 			<component
 				:is="'Form'"
 				:parentPrgmId="parentPrgmId"
@@ -56,12 +60,28 @@ export default {
 	},
 	data() {
 		return {
-			loadGrid: false,
+			loadGrid: true,
 			gridName: 'rowEqpmIaoGrid',
 			detailList: myEqpmIaoDetail,
 
 			inputList_emMapDiv: [],
 			inputList_cmInOut: [],
+			dataPathMock: {
+        'rowEqpmIaoGrid' : {
+          column: [
+            { header: '대상항목', name: 'id', headerAlign: 'left' },
+            { header: '에너지원 명', name: 'lable', headerAlign: 'left' },
+            { header: '대상 유형', name: 'type', headerAlign: 'left' },
+            { header: '물리량', name: 'note', headerAlign: 'left' },
+            { header: '계산여부', name: 'field1', headerAlign: 'left' },
+            { header: '분배율', name: 'field2', headerAlign: 'left' }
+          ],
+          data: dataPathDataExample,
+          defaultRow: dataPathDataExample,
+          option: {}
+        }
+      },
+
 		};
 	},
 	computed: {
@@ -108,18 +128,18 @@ export default {
 	},
 	watch: {
 		selectedObjId(val) {
-			// console.log('selectedObjId : ', val);
+			console.log('selectedObjId : ', val);
 			if (val === 'TAG') {
-				this.detailList[2].class = 'py-3 d-none';
+				this.detailList[2].class = 'py-2 d-none';
-				this.detailList[3].class = 'py-3 pl-4 pt-1 d-none';
+				this.detailList[3].class = 'py-2 d-none';
-				this.detailList[4].class = 'py-3';
+				this.detailList[4].class = 'py-2';
-				this.detailList[5].class = 'py-3';
+				this.detailList[5].class = 'py-2';
 			} else {
 				// }else if(val==="READ_PLC"){
-				this.detailList[5].class = 'py-3 d-none';
+				this.detailList[5].class = 'py-2 d-none';
-				this.detailList[4].class = 'py-3 d-none';
+				this.detailList[4].class = 'py-2 d-none';
-				this.detailList[3].class = 'py-3 pl-4 pt-1';
+				this.detailList[3].class = 'py-2';
-				this.detailList[2].class = 'py-3';
+				this.detailList[2].class = 'py-2';
 			}
 		},
 		selectedCalcFg(val) {
@@ -152,7 +172,7 @@ export default {
 		},
 	},
 	mounted() {
-		this.init();
+		// this.init();
 	},
 	methods: {
 		...mapMutations({
@@ -335,7 +355,7 @@ export default {
 					}
 
 					if (dataArr.length > 0) {
-						// console.log('dataArr : ', dataArr);
+						console.log('dataArr : ', dataArr);
 
 						var requiredKeyList = this.detailList
 							.filter(item => {
@@ -396,7 +416,6 @@ export default {
 	},
 };
 
-
 function checkDuplicate(data, targetKey) {
 	var duplicateFlag = false;
 	var set = new Set();
@@ -467,7 +486,7 @@ const myEqpmIaoDetail = [
 	},
 	{
 		type: 'EvtObjPop',
-		labelContent: '대상 항목',
+		labelContent: '대상 항목 111',
 		valueNm: 'objId',
 		valueNm2: 'objNm',
 		bindNm: 'objNm',
@@ -482,7 +501,7 @@ const myEqpmIaoDetail = [
 	},
 	{
 		type: 'InputText',
-		cols: 6,
+		cols: 5,
 		class: 'py-3 d-none',
 		valueNm: 'objNm',
 		readonly: true,
@@ -595,4 +614,13 @@ const myEqpmIaoDetail = [
 		iconShow: true
 	},
 ];
+
+import { getPathDataExample } from '@/const/const'
+const dataPathDataExample = getPathDataExample({
+	id: 'INCHEON.HVAC.EQP_HT_CH001.UT_CH101.CHI_AMP_1A_PV',
+	lable: 'INCHEON 고온 냉동기 101호기 - 호로1',
+	type: '사용', note: '-',
+	field1: '1111',
+	field2: '2222',
+});
 </script>

components/pages/ems/TagInfo/TagAddInfoTab.vue

@@ -1,7 +1,7 @@
 <template>
 		<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">TAG 추가 정보</span>
+			<span style="color:#000000A6" class="tit custom-title-4-new">TAG 추가 정보</span>
 			<Buttons
 				:parentPrgmId="parentPrgmId"
 				:bindingData="gridName"

mixin/global.js

@@ -58,7 +58,7 @@ export default {
 		layoutInit() {
 			if (this.$refs.searchFilter) {
 				const searchFilterHeight = this.$refs.searchFilter.offsetHeight;
-				this.$refs.contents.style.height = `calc(100% - ${searchFilterHeight + 20}px)`;
+				this.$refs.contents.style.minHeight = `calc(100% - ${searchFilterHeight + 20}px)`;
 			}
 		},
 		//init() {}

pages/comm/auth/MenuRoleMngPage.vue

@@ -36,7 +36,11 @@
 					<v-card-title>
 						<span class="custom-title-4">역할 리스트</span>
 					</v-card-title>
-					<div ref="gridParent" class="px-5" style="height: 60vh;">
+					<div class="px-5" style="height:calc(100% - 100px)">
+						<div
+							ref="gridParent"
+							class="w100 h100"
+						>
 							<component
 								:is="loadGrid ? 'Grid' : null"
 								:ref="gridName + myPrgmId"
@@ -45,6 +49,7 @@
 								@getRowsData="getRowData"
 							/>
 						</div>
+					</div>
 				</v-card>
 			</v-col>
 			<v-col cols="12" lg="10" >
@@ -64,12 +69,11 @@
 								:style="{ minHeight: '36px' }"
 								>[미배정]메뉴리스트</span
 							>
-							<div ref="treeGridParent" class="px-0 mt-2" style="height: 60vh;">
+							<div class="px-0 mt-2" style="height:calc(100% - 64px)">
-								<!-- <div
+								<div
 									ref="treeGridParent"
 									class="w100 h100"
 								>
-							</div> -->
 									<component
 										:is="loadTreeGrid ? 'Grid' : null"
 										:ref="gridName2 + myPrgmId"
@@ -78,6 +82,7 @@
 										@getRowsData="getUnAsgnRowData"
 									/>
 								</div>
+							</div>
 						</v-col>
 						<v-col :cols="1">
 							<ActionButtons
@@ -107,12 +112,11 @@
 									/>
 								</v-col>
 							</v-row>
-							<div ref="treeGridParent2" class="px-0 mt-2" style="height: 60vh;">
+							<div class="px-0 mt-2" style="height:calc(100% - 64px)">
-								<!-- <div
+								<div
 									ref="treeGridParent2"
 									class="w100 h100"
 								>
-							</div> -->
 									<component
 										:is="loadTreeGrid2 ? 'Grid' : null"
 										:ref="gridName3 + myPrgmId"
@@ -122,6 +126,7 @@
 										@getRowsData="getAsgnRowData"
 									/>
 								</div>
+							</div>
 						</v-col>
 					</v-row>
 				</v-card>
@@ -403,9 +408,9 @@ export default {
 					align: 'center',
 					width: 30,
 					formatter: (props) => {
-						return `<span class="custom-radio">
+						return `<label class="custom-radio">
 									<span class="radio-mark"></span>
-								</span>`;
+								</label>`;
 					}
 				},
 				{
@@ -426,9 +431,9 @@ export default {
 					align: 'center',
 					width: 30,
 					formatter: (props) => {
-						return `<span class="custom-radio">
+						return `<label class="custom-radio">
 									<span class="radio-mark"></span>
-								</span>`;
+								</label>`;
 					}
 				},
 				{ header: '역할ID', name: 'roleId', hidden: true },
@@ -568,7 +573,6 @@ export default {
 			});
 		},
 		async getRowData(data) {
-
 			await this.setPageData({
 				rowGridSelectKey: data.rowKey,
 				rowGridSelectData: {
@@ -674,8 +678,6 @@ export default {
 		},
 
 		getUnAsgnRowData(data) {
-			console.log("------------------DEBUG-------getUnAsgnRowData:", data);
-
 			const getRowData = data;
 			this.leftSelectRowData = Object.assign({}, getRowData);
 		},

pages/comm/base/NoticeMngPage.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="l-layout">
-		<CommonPageTitle />
+		<common-page-title />
 		<!-- 리스트 페이지 시작 -->
 		<div v-if="pageActionFlag == 'list'" class="h1001">
 			<v-card class="" >
@@ -16,9 +16,11 @@
 							</div>
 						</v-col>
 						<v-col :cols="12" ref="contents" class="mt-5" style="min-height: calc(100% - 76px);">
-							<div ref="gridParent" class="px-50" style="min-height: 70vh;">
+							<div ref="gridParent" class="h100 px-50">
+								<!-- <component :ref="gridName" :is="loadGrid ? 'Grid' : null" :gridName="gridName" :parentPrgmId="myPrgmId"
+									 @getRowsData="getRowData" /> -->
 								<component :ref="gridName" :is="loadGrid ? 'Grid' : null" :gridName="gridName" :parentPrgmId="myPrgmId"
-									 @getRowsData="getRowData" />
+                  @getRowsData="getRowData" :selectedRowDataWatchFlag="true" />
 							</div>
 						</v-col>
 					</v-row>
@@ -27,7 +29,7 @@
 		</div>
 		<!-- 리스트 페이지 끝 -->
 		<!-- 상세보기 페이지 시작 -->
-		<div v-if="pageActionFlag == 'view'" >
+		<div v-if="pageActionFlag == 'view'" class="h1001">
 			<v-card>
 				<v-row class="pa-5">
 					<v-col :cols="12" class="d-flex align-center justify-space-between ">
@@ -45,25 +47,25 @@
 							<a-button @click="viewPageButtonGroupClickEvent('delete')" type="danger" ghost icon="delete">삭제</a-button>
 						</div>
 					</v-col>
-					<v-col :cols="12" class="mt-5">
+					<v-col :cols="12">
-						<v-card-title class="custom-title-6 pa-0">{{ viewActionData.title }}</v-card-title>
+						<p class="custom-title-3 mb-2"> 제목 </p>
+						<v-text-field v-model="viewActionData.title" class="v-input__custom" hide-details :readonly="true">
+						</v-text-field>
 					</v-col>
-					<v-col :cols="12" style="min-height: 30vh;" class="pa-0">
+					<v-col :cols="12" style="min-height:calc(90vh - 218px);" class="pa-5">
 						<viewer v-if="viewActionData.viewerFlag" ref="tuiViewer" height="inherit"
 							:initialValue="viewActionData.content" theme="white"
-							:class="[isDarkMode ? 'theme--white' : 'theme--black', 'custom-view pa-3']" />
+							:class="isDarkMode ? 'theme--white' : 'theme--black'" />
 					</v-col>
-					<v-col :cols="6" class="mt-5">
+					<v-col :cols="6">
-						<v-card-title class="custom-title-7 pa-0">
+						<p class="custom-title-3 mb-2">파일목록</p>
-							파일목록
-						</v-card-title>
 						<div v-for="fileData in viewActionData.fileData" 
 							:key="fileData.apndFileId" 
 							class="file-item">
 							<a @click.prevent="downloadFile(fileData)">
-								<div class="d-flex justify-start search-box-label">
+								<div class="d-flex justify-space-between search-box-label">
 									<v-icon>mdi-paperclip</v-icon>
-									<span class="file-item-name ml-2">{{ fileData.apndFileNm + '.' + fileData.apndFileExt }}</span>
+									<span class="file-item-name">{{ fileData.apndFileNm + '.' + fileData.apndFileExt }}</span>
 								</div>
 							</a>
 						</div>
@@ -73,24 +75,28 @@
 		</div>
 		<!-- 상세보기 페이지 끝 -->
 		<!-- 작성 페이지 시작 -->
-		<div v-if="pageActionFlag == 'write'" >
+		<div v-if="pageActionFlag == 'write'" class="h1001">
 			<v-card>
 				<div class="pa-5">
 					<v-row class="pa-50">
 						<v-col :cols="12" class="">
 							<v-card-title class="custom-title-4 pa-0">공지사항</v-card-title>
 						</v-col>
-						<v-col :cols="12" class="mt-4">
+						<v-col :cols="12" class="custom-title-4-new mt-4">
-							<v-card-title class="custom-title-7 pa-0">제목</v-card-title>
+							<p class="custom-title-3 mb-2">제목</p>
 							<v-text-field v-model="writeActionData.title" class="v-input__custom" hide-details outlined>
 							</v-text-field>
 						</v-col>
-						<v-col :cols="12" style="min-height: calc(100vh - 450px);">
+						<v-col :cols="12" style="min-height: calc(90vh - 270px);">
 							<editor ref="tuiEditor" height="100%" initialEditType="wysiwyg" />
 						</v-col>
 	
-						<v-col :cols="6" class="mt-5">
+						<v-col :cols="12" class="mt-2">
-							<v-card-title class="custom-title-7 pa-0">파일첨부</v-card-title>
+							<p class="custom-title-3 mb-2">
+								파일첨부
+							</p>
+						</v-col>
+						<v-col :cols="6">
 							<div class="" v-if="writeActionData.fileData">
 								<div 
 									v-for="(fileData, index) in writeActionData.fileData" 
@@ -126,23 +132,25 @@
 		</div>
 		<!-- 작성 페이지 끝 -->
 		<!-- 답글 작성 페이지 시작 -->
-		<div v-if="pageActionFlag == 'reply'" >
+		<div v-if="pageActionFlag == 'reply'" class="h1001">
 			<v-card class="pa-5">
 				<v-row align="center" class="mt-0">
 					<v-col :cols="12" class="">
 						<v-card-title class="custom-title-4 pa-0">공지사항</v-card-title>
 					</v-col>
-					<v-col :cols="12" class="mt-4">
+					<v-col :cols="12">
-						<v-card-title class="custom-title-7 pa-0">제목</v-card-title>
+						<p class="custom-title-3 mb-2">제목</p>
-						<v-text-field v-model="replyActionData.title" class="v-input__custom" outlined
+						<v-text-field v-model="replyActionData.title" class="v-input__custom" placeholder="제목" outlined
 							hide-details>
 						</v-text-field>
 					</v-col>
 					<v-col :cols="12" style="height: calc(100vh - 270px);" class="mt-2">
 						<editor ref="tuiReplyEditor" height="100%" initialEditType="wysiwyg" />
 					</v-col>
-					<v-col :cols="6" class="mt-5">
+					<v-col :cols="6" class="mt-4">
-						<v-card-title class="custom-title-7 pa-0">파일첨부</v-card-title>
+						<p class="custom-title-3 mb-2">
+							파일첨부
+						</p>
 						<div class="" v-if="replyActionData.fileData">
 							<div 
 								v-for="(fileData, index) in replyActionData.fileData" 
@@ -170,7 +178,7 @@
 		</div>
 		<!-- 답글 작성 페이지 끝 -->
 		<!-- 수정 페이지 시작 -->
-		<div v-if="pageActionFlag == 'update'" >
+		<div v-if="pageActionFlag == 'update'" class="h1001">
 			<v-card>
 				<div class="pa-5">
 					<v-row align="center" no-gutters>
@@ -178,16 +186,16 @@
 							<v-card-title class="custom-title-4 pa-0">공지사항</v-card-title>
 						</v-col>
 						<v-col :cols="12" class="mt-4">
-							<v-card-title class="custom-title-7 pa-0">제목</v-card-title>
+							<p class="custom-title-3 mb-2">제목</p>
-							<v-text-field v-model="updateActionData.title" class="v-input__custom" hide-details outlined>
+							<v-text-field v-model="updateActionData.title" class="v-input__custom" placeholder="" hide-details outlined>
 							</v-text-field>
 						</v-col>
 						<v-col :cols="12" style="height: calc(90vh - 270px);" class="mt-4" >
 							<editor ref="tuiUpdateEditor" height="100%" initialEditType="wysiwyg"
 								:initialValue="updateActionData.content" />
 						</v-col>
-						<v-col :cols="6" class="mt-5">
+						<v-col :cols="6">
-								<v-card-title class="custom-title-7 pa-0">파일첨부</v-card-title>
+								<p class="pa-0 mb-2 custom-title-4-new-1">파일첨부</p>
 								<div class="" v-if="updateActionData.fileData">
 									<div 
 										v-for="(fileData, index) in updateActionData.fileData"
@@ -398,6 +406,7 @@ export default {
 			this.getGridData();
 		},
 		gridInit() {
+			this.loadGrid = false;
 			const gridHeight = this.$refs.contents.offsetHeight - 76;
 
 			const myOptions = {};
@@ -461,6 +470,13 @@ export default {
 				gridKey: this.gridName,
 				value: columnList,
 			});
+
+			// // -----------------------TEST------------------
+			// this.dataPathMock[this.gridName] = {
+			// 	column: columnList,
+			// 	data: dataPathDataExample,
+			// }
+			// // -----------------------END TEST--------------
 			this.getGridData();
 		},
 		async getGridData() {
@@ -476,14 +492,25 @@ export default {
 				sendParam: params,
 			});
 
+			// console.log('----------DEBUG--------res: ', res);
+			const newRes = res.map(item => {
+        const newObj = {
+          ...item,
+          rowStat: null,
+          dataSetId: item.dataSetId,
+          dataSetNm: item.dataSetNm,
+          useFg: item.useFg === '1' ? true : false, // 화면 개발 편의를 위해 boolean 타입으로 교체, 저장시 "1", "0" 으로 바꿔 보내야 함
+        };
+        return newObj;
+      });
+
 			this.setGridData({
 				gridKey: this.gridName,
-				value: res,
+				value: newRes,
-			});
-			this.$nextTick(() => {
-				this.loadGrid = true;
 			});
+
 			this.setPageData({ isFind: false });
+			this.loadGrid = true;
 		},
 		getRowData(data) {
 			this.selectedRowKey = data.rowKey;
@@ -1046,19 +1073,4 @@ const dataPathDataExample = getPathDataExample({
 		color: #1677FF;
 	}
 }
-::v-deep {
-	.v-input__slot {
-		padding-left: 8px;
-		padding-right: 8px;
-	}
-	.custom-view {
-		border: 1px solid;
-		border-radius: 6px;
-		height: 100%;
-		@each $theme in dark, light {
-			@include theme($theme);
-			border-color: map-deep-get($config, #{$theme}, "v-input-textarea-border");;
-		}
-	}
-}
 </style>

pages/comm/base/PrgmMngPage.vue

@@ -16,7 +16,7 @@
 								customClass="select-large"
 							/>
 						</v-col>
-						<v-col :cols="3">
+						<v-col :cols="4">
 							<InputText
 								:parentPrgmId="myPrgmId"
 								label="프로그램명"
@@ -50,17 +50,18 @@
 							/>
 						</div>
 					</div>
-					<div ref="gridParent" style="height: 60vh">
+					<div style="min-height: 60vh">
-						<!-- <div ref="gridParent" class="px-5 h100">
+						<div ref="gridParent" class="px-5 h100">
-						</div> -->
 							<component
 								:ref="gridName"
 								:is="loadGrid ? 'Grid' : null"
 								:parentPrgmId="myPrgmId"
 								:gridName="gridName"
 								@getRowsData="getRowData"
+								:dataPath="dataPathMock"
 							/>
 						</div>
+					</div>
 				</v-card>
 			</v-col>
 			<!-- 프로그램 상세 -->
@@ -261,6 +262,8 @@ export default {
 			});
 
 			// this.getRowGridData();
+
+			this.loadGrid = true;
 		},
 		async search() {
 			await this.getRowGridData();
@@ -293,7 +296,6 @@ export default {
 				gridKey: this.gridName,
 				value: newRes,
 			});
-			this.loadGrid = true;
 
 			this.$nextTick(() => {
 				if (newRes.length > 0) {
@@ -314,12 +316,6 @@ export default {
 			});
 		},
 		async getRowData(data, gridName) {
-			// console.log("-----------------------DEBUG--getRowData--------------", {
-			// 	gridKey: gridName,
-			// 	gridSelect: true,
-			// 	rowGridSelectKey: data.rowKey,
-			// 	rowGridSelectData: data,
-			// });
 			this.setGridSelectData({
 				gridKey: gridName,
 				gridSelect: true,
@@ -331,7 +327,6 @@ export default {
 				rowGridSelectKey: data.rowKey,
 				rowGridSelectData: data,
 			});
-			
 		},
 		compareData(type, newDt) {
 			if (this.selectedCommCdData[type] == newDt) {

pages/ems/base/EffcIdxMngPage.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="l-layout">
-		<CommonPageTitle />
+		<common-page-title />
 		<v-row ref="searchFilter" class="mt-2">
 			<v-col :cols="12">
 				<v-card class="searchFilter">

pages/ems/base/EnrgReadPlaceMngPage.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="l-layout">
-		<CommonPageTitle />
+		<common-page-title />
 		<v-row ref="searchFilter" class="mt-2">
 			<v-col :cols="12">
 				<v-card class="searchFilter">

pages/ems/base/EqpmGrpPysclQtyMngPage.vue

@@ -1,6 +1,6 @@
 <template>
 	<div ref="mainDiv" class="l-layout">
-		<CommonPageTitle />
+		<common-page-title />
 		<v-row ref="searchFilter" class="mt-2">
 			<v-col :cols="12">
 				<v-card class="searchFilter">

pages/ems/base/EqpmKindPage.vue

@@ -1,6 +1,6 @@
 <template>
 	<div ref="mainDiv" class="l-layout">
-		<PageTitle/>
+		<CommonPageTitle/>
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">

pages/ems/base/EquipmentGroupMngPage.vue

@@ -1,6 +1,6 @@
 <template>
 	<div ref="mainDiv" class="l-layout">
-		<PageTitle />
+		<CommonPageTitle />
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
@@ -480,18 +480,17 @@ const myDetail = [
 		labelCols: 12,
 		textCols: 12,
 	},
+	
 	{
 		type: 'CheckBox',
 		label: '사용 여부',
 		valueNm: 'useFg',
 		disabled: false,
 		cols: 6,
-		class: 'py-2 pr-4 pt-5',
+		class: 'py-2 pr-4 pt-4',
 		value: { '1': true, '0': false },
 		required: true,
 		iconShow: true,
-		labelCols: 12,
-		textCols: 12,
 	},
 	{
 		type: 'SelectBox',

pages/ems/base/EquipmentMasterMngPage.vue

@@ -1,6 +1,5 @@
 <template>
 	<div class="l-layout">
-		<CommonPageTitle />
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
@@ -35,23 +34,23 @@
 			</v-col>
 		</v-row>
 		<v-row ref="contents">
-			<v-col :cols="5" >
+			<v-col :cols="5" class="h100">
 				<v-card class="pb-5">
 					<div class="d-flex align-center justify-space-between pa-5">
 						<v-card-title class="pa-0 custom-title-4">설비 정보</v-card-title>
 						<Buttons :parentPrgmId="myPrgmId" :bindingData="gridName" :detailList="detailList"
 							:btnActionsFnc="btnActions" />
 					</div>
-					<div ref="gridParent" class="px-5" style="min-height:60vh;">
+					<div class="px-5" style="min-height:calc(100% - 76px)">
+						<div ref="gridParent" class="w100 h100">
 							<component :ref="gridName" :is="loadGrid ? 'Grid' : null" :gridName="gridName" :parentPrgmId="myPrgmId"
 								@getRowsData="getRowData" @sendSelectedRowStatInfo="getSelectedRowStatInfo"
-							:selectedRowDataWatchFlag="true" :preventFocusChangeEventFlag="false" />
+								:selectedRowDataWatchFlag="true" :preventFocusChangeEventFlag="false" :dataPath="dataPathMock" />
-						<!-- <div ref="gridParent" class="w100 h100">
+						</div>
-						</div> -->
 					</div>
 				</v-card>
 			</v-col>
-			<v-col :cols="7" >
+			<v-col :cols="7" class="h100">
 				<v-card class="pb-5">
 					<v-card-title class="custom-title-4" style="min-height:76px;">설비 상세</v-card-title>
 					<div class="px-5" style="min-height:calc(100% - 76px)">
@@ -288,7 +287,7 @@ export default {
 					blocId: this.userInfo.blocId,
 				},
 			});
-			// console.log('res : ', res);
+			console.log('res : ', res);
 			res.map(item => {
 				const it = { text: item.ercNm, value: item.ercId };
 				ercList.push(it);

pages/ems/base/GdIdxMngPage.vue

@@ -1,6 +1,6 @@
 <template>
 	<div ref="mainDiv" class="l-layout">
-		<CommonPageTitle />
+		<common-page-title />
 		<v-row ref="searchFilter" class="mt-2">
 			<v-col :cols="12">
 				<v-card class="searchFilter">

pages/ems/base/GdStndMngPage.vue

@@ -1,6 +1,6 @@
 <template>
 	<div ref="mainDiv" class="l-layout">
-		<CommonPageTitle />
+		<common-page-title />
 		<v-row ref="searchFilter" class="mt-2">
 			<v-col :cols="12">
 				<v-card class="searchFilter">

pages/ems/base/PastRsltDataReadPage.vue

@@ -1,63 +1,26 @@
 <template>
 	<div class="l-layout">
-		<PageTitle text="측정 위치 데이터 조회" />
+		<CommonPageTitle />
 
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
 					<v-row align="end" no-gutters>
-						<v-col :cols="2">
-							<component
-								:is="'SelectBlocMstr'"
-								ref="SelectBlocMstr"
-								:parentPrgmId="myPrgmId"
-								:textCols="12"
-								customClass="select-large"
-							/>
-						</v-col>
-						<!-- <v-col :cols="2">
-							<component
-								label="검침개소"
-								:is="'PastRsltDataReadPop'"
-								:parentPrgmId="myPrgmId"
-							/>
-						</v-col> -->
-						<!-- <v-col :cols="2">
-               <component 
-              :is="'SelectTagNmList'"
-              ref="SelectTagNmList"
-              :parentPrgmId="myPrgmId"
-              />
-            </v-col> -->
 						<v-col :cols="3">
-							<!-- <component
+							<component :is="'SelectBlocMstr'" ref="SelectBlocMstr" :parentPrgmId="myPrgmId"
-								:is="'PastRsltDataReadTagPop'"
+								:textCols="12" customClass="select-large" />
-								:parentPrgmId="myPrgmId"
-								:label="'TAG'"
-							/> -->
-							<component
-								:is="'EvtObjPop'"
-								:parentPrgmId="myPrgmId"
-								:item="evtObjPopItem"
-								customClass="select-large"
-							/>
 						</v-col>
-						<v-col :cols="4">
+						<v-col :cols="3">
-							<component
+							<component :is="'EvtObjPop'" :parentPrgmId="myPrgmId" :item="evtObjPopItem"
-								:is="'Datepicker'"
+								customClass="select-large" />
-								:parentPrgmId="myPrgmId"
+						</v-col>
-								:label="'조회기간'"
+						<v-col :cols="3">
-								:textCols="12"
+							<!-- 대상일 -->
-							/>
+							<component :is="'Datepicker'" :parentPrgmId="myPrgmId" :label="'조회기간'" :textCols="12" />
 						</v-col>
 						<v-col :cols="3" class="d-flex align-end justify-end text-right">
-							 <BtnExcelDownload
+							<BtnExcelDownload class="mr-1" :parentPrgmId="myPrgmId" :gridName="gridName" type="primary"
-							 	class="mr-1"
+								size="large" />
-								:parentPrgmId="myPrgmId"
-								:gridName="gridName"
-								type="primary"
-								size="large"
-							/>
 							<BtnSearch @click="search" size="large" />
 						</v-col>
 					</v-row>
@@ -68,12 +31,12 @@
 			<v-col :cols="12" style="height: 100%" class="h100">
 				<v-card class="px-5 py-5 h100">
 					<div ref="gridParent" class="h100 px-5" style="height: 100%">
-						<component
+						<component ref="myGrid" :is="loadGrid ? 'Grid' : null" :gridName="gridName"
-							ref="myGrid"
+							:parentPrgmId="myPrgmId" />
-							:is="loadGrid ? 'Grid' : null"
+					</div>
-							:gridName="gridName"
+					<div class="d-flex align-center justify-space-between">
-							:parentPrgmId="myPrgmId"
+						<pagination id="pagination" :total-count="totalCount" :page-num="page" :limit="limit"
-						/>
+							@loadData="changeGrid" />
 					</div>
 				</v-card>
 			</v-col>
@@ -97,7 +60,7 @@ import BtnExcelDownload from '~/components/common/button/BtnExcelDownload';
 import DateUtility from '~/plugins/dateUtility';
 // import Search from "~/components/common/search";
 import EvtObjPop from '~/components/common/modal/EvtObjPop';
-import PageTitle from "~/components/common/PageTitle";
+import pagination from '~/components/Pagination';
 
 let myTitle;
 // const myPrgmId = "PRG0052";
@@ -130,7 +93,7 @@ export default {
 		PastRsltDataReadPop,
 		PastRsltDataReadTagPop,
 		EvtObjPop,
-		PageTitle,
+		pagination,
 	},
 	data() {
 		return {
@@ -146,12 +109,16 @@ export default {
 				valueNm2: 'tagNm',
 				iconShow: true,
 				disabled: false,
-				labelCols: 12,
 				textCols: 12,
 				class: 'py-2',
 				required: false,
 				formFg: false,
 			},
+			itemsPerPage: 10,
+			itemsPerPageArray: [10, 20, 30],
+			limit: 20,
+			page: 1,
+			totalCount: 0,
 		};
 	},
 	computed: {
@@ -164,9 +131,6 @@ export default {
 		chkTagId() {
 			return this.pageData.tagList === undefined ? null : this.pageData.tagId;
 		},
-		// chkTagList() {
-		// 	return this.pageData.tagList;
-		// },
 		chkTagNm() {
 			return this.pageData.tagData.tagNm;
 		},
@@ -176,18 +140,16 @@ export default {
 	},
 	watch: {
 		chkIsFind(val) {
-			if (val) this.search();
+			if (val) {
+				this.page = 1;
+				this.search();
+			}
 		},
 		chkTagId(val) {
 			if (this.initFlag && val != null) {
 				this.search();
 			}
 		},
-		// chkTagList() {
-		// 	if(this.initFlag){
-		// 		this.search();
-		// 	}
-		// },
 		chkTagNm() {
 			if (this.initFlag) {
 				this.search();
@@ -207,7 +169,7 @@ export default {
 			defaultData: defaultData,
 		});
 	},
-	created() {},
+	created() { },
 	async mounted() {
 		await this.setFromDt();
 		await this.init();
@@ -330,6 +292,7 @@ export default {
 			this.loadGrid = false;
 
 			let res = [];
+			let res2 = [];
 			let yearQuarterData = [];
 			yearQuarterData = this.yearQuarterMaker([
 				this.pageData.fromDt,
@@ -381,8 +344,18 @@ export default {
 					apiKey: 'selectTagRawDataByQuarter',
 					resKey: 'pastRsltReadData',
 					sendParam: sendParams,
+					limit: this.limit,
+					page: this.page,
+					offset: (this.page - 1) * this.limit, // MariaDB Query에서 직접 계산이 안됨
 				});
 
+				res2 = await this.postApiReturn({
+					apiKey: 'selectTagRawDataByQuarterPageTotal',
+					resKey: 'pastRslPageTotal',
+					sendParam: sendParams
+				});
+				this.totalCount = res2[0].totalcount;
+
 				this.setGridData({
 					gridKey: this.gridName,
 					value: res,
@@ -393,6 +366,9 @@ export default {
 					fromDt: this.pageData.fromDt,
 					toDt: this.pageData.toDt,
 					yearQuarterList: yearQuarterData['yearQuarterList'],
+					limit: this.limit,
+					page: this.page,
+					offset: (this.page - 1) * this.limit, // MariaDB Query에서 직접 계산이 안됨
 				};
 				sendParams['tagId'] = this.pageData.tagId;
 				//
@@ -410,6 +386,13 @@ export default {
 					sendParam: sendParams,
 				});
 
+				res2 = await this.postApiReturn({
+					apiKey: 'selectTagRawDataByQuarterPageTotal',
+					resKey: 'pastRslPageTotal',
+					sendParam: sendParams
+				});
+				this.totalCount = res2[0].totalcount;
+
 				this.setGridData({
 					gridKey: this.gridName,
 					value: res,
@@ -487,6 +470,12 @@ export default {
 			finalResult['yearQuarterList'] = result;
 			return finalResult;
 		},
+		changeGrid: async function (pageNum, limit) {
+			this.page = pageNum;
+			this.limit = limit;
+
+			this.search();
+		},
 	},
 };
 

pages/ems/base/ReadObjectMngPage.vue

@@ -59,7 +59,8 @@
 							:btnActionsFnc="btnActions"
 						/>
 					</div>
-					<div ref="gridParent" class="h100 px-5" style="height:calc(100% - 70px)">
+					<div class="h100 px-5" style="height:calc(100% - 70px)">
+						<div ref="gridParent" class="w100 h100">
 							<component
 								:ref="gridName"
 								:is="loadGrid ? 'Grid' : null"
@@ -70,6 +71,7 @@
 								:selectedRowDataWatchFlag="true"
 							/>
 						</div>
+					</div>
 				</v-card>
 			</v-col>
 			<v-col :cols="7" class="h100">

pages/ems/base/ReadResultCloseMngPage.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="l-layout">
-    <CommonPageTitle />
+    <common-page-title />
     <v-row ref="searchFilter">
       <!-- 조회조견 -->
       <v-col :cols="12">
@@ -91,7 +91,7 @@
               </a-button>
             </div>
           </div>
-          <div ref="gridParent" class="px-5 w100" style="height: 55vh;">
+          <div ref="gridParent" class="px-5 w100" style="min-height: 60vh">
               <component
                 :is="loadGrid ? 'Grid' : null"
                 :ref="gridName"
@@ -242,10 +242,6 @@ export default {
         columnOptions: {
           resizable: true,
         },
-        pageOptions: {
-					useClient: true,
-					perPage: 13,
-				},
       };
       this.setGridOption({
         gridKey: this.gridName,

pages/ems/base/TagMngPage_Pagination.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="l-layout">
-		<PageTitle/>
+		<CommonPageTitle/>
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
@@ -58,7 +58,7 @@
 								@sendSelectedRowStatInfo="getSelectedRowStatInfo" :selectedRowDataWatchFlag="true" />
 						</div>
 					</v-card-actions>
-					<!-- <div class="d-flex align-center justify-space-between">
+					<div class="d-flex align-center justify-space-between">
 						<pagination
 							id="pagination"
 							:total-count="totalCount"
@@ -66,7 +66,7 @@
 							:limit="limit"
 							@loadData="changeGrid"
 						/>
-					</div> -->
+					</div>
 				</v-card>
 			</v-col>
 			<v-col :cols="7" class="h100">
@@ -107,7 +107,6 @@ import TagAddInfoTab from '@/components/pages/ems/TagInfo/TagAddInfoTab';
 import Grid from '~/components/common/Grid';
 import Utility from '~/plugins/utility';
 import pagination from '~/components/Pagination';
-import PageTitle from "~/components/common/PageTitle";
 
 let myTitle;
 // const myPrgmId = "PRG0051";
@@ -140,13 +139,12 @@ export default {
 		TagAddInfoTab,
 		Grid,
 		pagination,
-		PageTitle
 	},
 	data() {
 		return {
 			myPrgmId: myPrgmId,
 			gridName: 'rowGrid',
-			loadGrid: true,
+			loadGrid: false,
 			tab: null,
 			items: [
 				{ name: 'TAG 정보', id: 'tagBaseInfoTab', disabledFlag: false },
@@ -275,16 +273,12 @@ export default {
 			this.gridInit();
 		},
 		gridInit() {
-			const gridHeight = this.$refs.gridParent.offsetHeight - 180;
+			const gridHeight = this.$refs.gridParent.offsetHeight - 16;
 
 			const myOptions = {
 				columnOptions: {
 					resizable: true,
 				},
-				pageOptions: {
-					useClient: true,
-					perPage: 10,
-				},
 				scrollX: true,
 				header: {
 					height: 38,
@@ -536,7 +530,7 @@ export default {
 							columnName: 'tagId',
 							setScroll: true,
 						});
-					} catch (error) { }
+					} catch (error) {}
 					// this.$refs[this.gridName].focus({
 					//   rowKey: 0,
 					//   columnName: "tagId",
@@ -773,7 +767,7 @@ export default {
 		gridEditingFinish(data) {
 			this.$refs[this.gridName].editingFinish(data);
 		},
-		changeGrid: async function (pageNum, limit) {
+		changeGrid: async function(pageNum, limit) {
 			this.page = pageNum;
 			this.limit = limit;
 

pages/ems/effc/EnrgMapPage.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="l-layout">
-		<CommonPageTitle />
+		<common-page-title />
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">

pages/ems/effc/EnrgUseEqpmDetlMntrPage.vue

@@ -975,7 +975,7 @@ export default {
       var seriesData = null;
 
       xAxisData = this.makeChartGroup01XaxisData();
-      // console.log("text xaxis", xAxisData);
+      console.log("text xaxis", xAxisData);
 
       for (var i = 0; i < dataKeyList.length; i++) {
         seriesData = new Array(xAxisData.length).fill(10);
@@ -988,12 +988,12 @@ 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;
 
-        // console.log("chart data", this.$store.state.pageData[myPrgmId][chartKey]);
+        console.log("chart data", this.$store.state.pageData[myPrgmId][chartKey]);
       }
     },
     getGroup01ChartOption() {
@@ -1007,7 +1007,7 @@ export default {
       };
 
       chartOption["series"][0]["symbol"] = "none";
-      // console.log("chartOption: ", chartOption);
+      console.log("chartOption: ", chartOption);
       return chartOption;
     },
     makeChartGroup01XaxisData() {

pages/ems/effc/EnrgUsePlanPage.vue

@@ -1,6 +1,6 @@
 <template>
 	<div ref="mainDiv" class="l-layout">
-		<CommonPageTitle />
+		<common-page-title />
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">

store/modules/list.js

@@ -669,7 +669,8 @@ const INIT_URL_STATE = {
 	// prgmId : PRG0052 과거 검침 데이터 조회
 	selectTagRawDataByQuarter:
 		'ems/base/PastRsltDataReadCtr/selectTagRawDataByQuarter',
-
+	selectTagRawDataByQuarterPageTotal:
+		'ems/base/PastRsltDataReadCtr/selectTagRawDataByQuarterPageTotal',
 	// prgmId : PRG4107 개인화 대시보드
 	selectIndvWidgetList: 'ems/base/DashboardHfemsCtr/selectIndvWidgetList',
 	selectEnergyUseReadHourAddup: