update

Reviewed-on: #40

assets/scss/common.scss

@@ -484,6 +484,10 @@ a {
       border-bottom: 1px solid map-deep-get($config, #{$theme}, "v-header-border");
     }
 
+    .custom-chart{
+      border: 1px solid map-deep-get($config, #{$theme}, "v-chart-border");
+    }
+
     .btn-header {
       background-color: map-deep-get($config, #{$theme}, "v-btn-header-background");
       border:1px solid map-deep-get($config, #{$theme}, "v-btn-header-border");
@@ -860,7 +864,7 @@ a {
           );
 
           .day-label {
-            color: map-deep-get($config, #{$theme}, "non-activate");
+            color: map-deep-get($config, #{$theme}, "card-text-title-color");
           }
         }
       }

assets/scss/common/button.scss

@@ -66,6 +66,12 @@
       }
     }
 
+    .custom-action-btn{
+      height: 24px;
+      width: 24px;
+      font-size: 12px;
+    }
+
     .v-btn {
       background-color: map-deep-get($config,
         #{$theme},

assets/scss/common/grid.scss

@@ -17,18 +17,6 @@
     border: 0 !important;
   }
 
-  // &-body-container {
-  //   width: 100% !important;
-  // }
-
-  // &-table {
-  //   width: 100% !important;
-  // }
-
-  // &-lside-area .tui-grid-body-area {
-  //   margin-right: -11px;
-  // }
-
   &-lside-area .tui-grid-scrollbar-left-bottom {
     display: none;
   }
@@ -68,6 +56,12 @@
     font-weight: 400;
   }
 
+  
+  th[data-column-name="_checked"] {
+    padding-left: 0;
+  }
+
+
 }
 
 .tui-grid-table{
@@ -75,6 +69,13 @@
   .tui-grid-cell-has-input .tui-grid-cell-content {
     padding: 8px;
   }
+
+  th[data-column-name="_checked"] {
+    &.tui-grid-cell-header  {
+      padding-left: 0;
+    }
+    
+  }
 }
 
 .treeGrid {
@@ -150,55 +151,28 @@
 
       &-body-container{
         border-right: 0;
-        // border-right-color: map-deep-get($config,
+        // position: relative;
-        //   #{$theme},
-        //   "tui-grid-cell-borderColor"
-        // );
         width: auto !important;
+
         .tui-grid-table-container{
-          width: 100% !important;
+          // width: 100% !important;
           .tui-grid-table {
-            width: 100% !important;
+            // width: 100% !important;
+            // table-layout: fixed;
+            // th, td {
+            //   &:last-child{
+            //     width: auto !important;
+            //   }
+            // }
           }
         }
       }
 
-      &-container,
+      &-summary-area,
-      &-summary-area {
+      &-container {
         font-family: Inter;
-        // color: #000000E0;
  
-        & ::-webkit-scrollbar {
-          width: $scrollbar-width !important;
-          width: 0 !important;
-          height: $scrollbar-width !important;
-          -webkit-appearance: initial;
-          // background-color: map-deep-get($config,
-          //   #{$theme},
-          //   "tui-grid-cell-borderColor"
-          // ) !important;
-          background-color: rgba(0, 0, 0, 0) !important;
-          border-radius: 3px !important;
-        }
-
-        & ::-webkit-scrollbar-track {
-          // background-color: map-deep-get($config,
-          //   #{$theme},
-          //   "tui-grid-cell-borderColor"
-          // ) !important;
-          background-color: rgba(0, 0, 0, 0) !important;
-        }
-
-        & ::-webkit-scrollbar-thumb {
-          // width: 50px !important;
-          height: 50px !important;
-          background-color: map-deep-get($config, #{$theme}, "scrollbar-thumb");
-          // background-color: rgba(0, 0, 0, 0);
-          border-radius: 3px;
-        }
-
         .tui-grid-cell {
-
           &.tui-grid-cell-summary {
             color: map-deep-get($config,
               #{$theme},
@@ -208,6 +182,32 @@
         }
       }
 
+      &-body-area {
+        overflow: auto;
+
+        &::-webkit-scrollbar {
+          width: $scrollbar-width !important;
+          height: $scrollbar-width !important;
+          -webkit-appearance: initial;
+          background-color: rgba(0, 0, 0, 0) !important;
+          border-radius: 3px !important;
+          // border-right: 1px solid;
+          // border-right-color: map-deep-get($config, #{$theme}, "tui-grid-cell-borderColor");
+        }
+
+        &::-webkit-scrollbar-track {
+          background-color: rgba(0, 0, 0, 0) !important;
+        }
+
+        &::-webkit-scrollbar-thumb {
+          height: 50px !important;
+          background-color: map-deep-get($config, #{$theme}, "scrollbar-thumb");
+          border-radius: 3px;
+          // width: 50px !important;
+          // background-color: rgba(0, 0, 0, 0);
+        }
+      }
+
       &-rside-area {
         background-color: map-deep-get($config, #{$theme}, "scrollbar-track");
       }
@@ -246,13 +246,13 @@
       &-scrollbar-right-bottom {
         width: $scrollbar-width !important;
         height: $scrollbar-width !important;
-        // display: none !important;
         border-color: map-deep-get($config, #{$theme}, "cardBackground");
         background-color: map-deep-get($config, #{$theme}, "cardBackground");
+        box-sizing: border-box;
+        // display: none !important;
         // border: none !important;
         // bottom: -1px;
         // right: -2px;
-        box-sizing: border-box;
         // display: none;
       }
 
@@ -363,10 +363,10 @@
           #{$theme},
           "tui-grid-cell-backgroundColor"
         );
-        width: 100% !important;
+        // width: 100% !important;
-        .tui-grid-table {
+        // .tui-grid-table {
-          width: 100% !important;
+        //   width: 100% !important;
-        }
+        // }
       }
 
       &-row-odd,

assets/scss/common/input.scss

@@ -230,6 +230,10 @@
   }
 }
 
+input[type="checkbox"] {
+  width: 16px;
+  height: 16px
+}
 
 @each $theme in dark, light {
   @include theme($theme);
@@ -242,6 +246,7 @@
           background: map-deep-get($config, #{$theme}, "ant-btn-primary-bg");
           border-color:map-deep-get($config, #{$theme}, "ant-btn-primary-bg");
           color:map-deep-get($config, #{$theme}, "ant-btn-primary-color");
+
           &.ant-checkbox-inner::after {
             border-color: map-deep-get($config, #{$theme}, "ant-btn-primary-color");
           }
@@ -403,6 +408,13 @@
         "v-input-textarea-border"
       );
     }
+
+    input[type="checkbox"] {
+      accent-color: map-deep-get($config,
+        #{$theme},
+        "ant-btn-primary-bg"
+      );
+    }
   }
 
   .v-radio {

assets/scss/datepicker.scss

@@ -15,8 +15,9 @@
       border-radius: 6px;
       border: solid 1px;
       height: 32px;
-      // border-color: #424242;
+      color: map-deep-get($config, #{$theme}, "v-input-fieldset-color") !important;
-      border-color: map-deep-get($config, #{$theme}, "tui-datepicker-border-color");
+      border-color: currentColor;
+      // border-color: map-deep-get($config, #{$theme}, "tui-datepicker-border-color");
 
       &.datepicker-large {
         height: 40px;

assets/scss/var.scss

@@ -175,6 +175,7 @@ $config: (
     btn-header-select-color:#FFFFFFD9,
     subtitle-tab: #FFFFFFA6,
     v-header-border: #424242,
+    v-chart-border: #424242,
     v-sidebar-border: #303030,
   ),
   light: (w-g5: $--color-gray_555,
@@ -314,6 +315,7 @@ $config: (
     btn-header-select-bg:#FFFFFF,
     subtitle-tab: #000000A6,
     v-header-border: #D9D9D9,
+    v-chart-border: #D9D9D9,
     v-sidebar-border: #F0F0F0,
   ),
 );

components/common/Chart.vue

@@ -61,7 +61,8 @@ export default {
 			isDarkMode: 'isDarkMode',
 			chartOption(state) {
 				var dark_Col = [
-					'#01AE6A',
+					'#79B100',
+					// '#01AE6A',
 					'#FFB046',
 					'#F6637B',
 					'#944FE9',
@@ -194,7 +195,8 @@ export default {
 				var lightCol_dashReadplcStatus = ['#3cc380', '#ffb13b', '#f98694'];
 
 				var light_Col = [
-					'#3CC380',
+					'#3BAD43',
+					// '#3CC380',
 					'#FFB13B',
 					'#F98694',
 					'#CF74E5',

components/common/DatepickerTimeSelectBox.vue

@@ -52,6 +52,7 @@
             selectBoxTimeItemList.minInterval ? selectBoxTimeItemList.minInterval : 1
           "
           @update:propsValue="selectTimeValue1 = $event"
+          customClass="select-large"
         />
         <!-- <div v-show="isRange" class="mx-3" :style="{ lineHeight: 0 }">~</div> -->
 
@@ -99,6 +100,7 @@
             selectBoxTimeItemList.minInterval ? selectBoxTimeItemList.minInterval : 1
           "
           @update:propsValue="selectTimeValue2 = $event"
+          customClass="select-large"
         />
       </div>
     </v-col>

components/common/Grid.vue

@@ -299,7 +299,6 @@ export default {
 		startEditing(e) {
 			// console.log('startEditing1...')
 			if (this.preventFocusChangeEvent(e)) {
-				// console.log('prevent startEditing')
 				return;
 			}
 
@@ -311,7 +310,6 @@ export default {
 			// console.log('startEditing2...')
 			if (this.editorGrid && e.rowKey >= 0) {
 				this.editorStartKey = e.rowKey;
-				// console.log("E::", this.gridInstance.invoke("getRow", e.rowKey));
 				this.gridInstance.invoke('startEditing', e.rowKey, e.columnName);
 				this.$emit(
 					'getRowsData',
@@ -621,7 +619,6 @@ export default {
 			this.gridInstance.invoke('refreshLayout');
 		},
 		refreshGrid(){
-      console.log("---------DEBUG---refreshGrid: ");
 			// console.log("refreshLayout",this.$refs['tuigrid' + this.gridName])
       var store = this.$refs['tuigrid' + this.gridName].gridInstance.store;
       var containerEl = this.$refs['tuigrid' + this.gridName].$el;

components/common/button/ActionButtons.vue

@@ -1,8 +1,10 @@
 <template>
-	<div class="d-flex flex-row justify-center align-center" style="gap: 12px">
+	<div class="d-flex justify-center align-center" 
-		<a-button @click="btnActionsFnc('removeRightToLeft')" type="primary" ghost :icon="icons.remove" >
+		:class="directionBtn === 'vertically'?'flex-row':'flex-column'" 
+		style="gap: 12px">
+		<a-button @click="btnActionsFnc('removeRightToLeft')" type="primary" ghost :icon="icons.remove" class="custom-action-btn">
 		</a-button>
-		<a-button   @click="btnActionsFnc('addLeftToRight')" type="primary" ghost :icon="icons.add">
+		<a-button   @click="btnActionsFnc('addLeftToRight')" type="primary" ghost :icon="icons.add" class="custom-action-btn">
 		</a-button>
 	</div>
 </template>

components/common/button/BtnSearch.vue

@@ -10,7 +10,7 @@ export default {
 		size: {
 			type: String,
 			require: false,
-			default: "middle", // small, middle, large
+			default: "default", // small, default, large
 		}
 	},
 	methods: {

components/common/modal/EnrgEffcEqpmDetailPop.vue

@@ -119,8 +119,7 @@
 						/>
 					</div> -->
 
-				<v-card-actions>
+				<v-card-actions class="px-6 py-4 d-flex align-center justify-end">
-					<v-spacer></v-spacer>
 					<a-button color="primary" type="primary" @click="closePop()">확인</a-button>
 				</v-card-actions>
 			</v-card>
@@ -275,7 +274,12 @@ export default {
 			// const gridHeight = this.$refs.gridParent.offsetHeight - 30;
 
 			const myOptions = {
-				rowHeaders: ['rowNum'],
+				rowHeaders: [
+					{
+						type: 'rowNum',
+						align: 'right',
+					},
+				],
 				columnOptions: {
 					resizable: true,
 					minWidth: 100
@@ -319,19 +323,19 @@ export default {
 					header: '주의',
 					width: 100,
 					name: 'careStndVal',
-					align: 'center'
+					align: 'right'
 				},
 				{
 					header: '경고',
 					width: 100,
 					name: 'warnStndVal',
-					align: 'center'
+					align: 'right'
 				},
 				{
 					header: '가이드값',
 					width: 100,
 					name: 'totVal',
-					align: 'center'
+					align: 'right'
 				},
 				{
 					header: '알람내용',

components/common/modal/EnrgUsePlanModiPop.vue

@@ -65,13 +65,10 @@
 				
 				<!-- <div id="chartParent" ref="chartParent" style="height: 100px"> -->
 				<div :style="'height: calc(50vh)'">
-					<div class="d-flex align-center justify-space-between pa-4" style="height: 10%">
-						<v-card-title class="pa-0 custom-title-4">사용량 계획</v-card-title>
-					</div>
 					<!-- <div id="chartParent" ref="chartParent" :style="'height: 80%'"> -->
-					<div id="chartParent" ref="chartParent" style="height: 70%">
+					<div id="chartParent" ref="chartParent" style="height: 100%" class="px-6">
 						<component
-							class="w100 h100"
+							class="w100 h100 py-7 custom-chart"
 							:is="loadChart ? 'Chart' : null"
 							:parentPrgmId="parentPrgmId"
 							:modalId="modalId"
@@ -130,7 +127,6 @@
 						/>
 					</div> -->
 				
-				<v-divider></v-divider>
 				<v-card-actions class="pa-5 d-flex align-center justify-end">
 					<a-button color="primary" type="default" class="mr-2" dark @click="closePop()">취소</a-button>					
 					<a-button color="primary" type="primary" dark @click="setUpdate()">확정</a-button>
@@ -533,7 +529,7 @@ export default {
 			seriesData = data.map(item => ({
 				name: item.gubun == '2PLAN' ? '계획' : '전년실적',
 				type: item.gubun == '2PLAN' ? 'line' : 'bar',
-				data: targetMonthList.map(obj => item[obj] || null)
+				data: targetMonthList.map(obj => item[obj] || null),
 				// data: targetMonthList.map(obj => item[obj] || 0)
 			}));
 			this.nowSeriesData = seriesData;
@@ -558,7 +554,6 @@ export default {
 				series: seriesData,
 				tooltip: tooltipData
 			};
-			// console.log('option', option);
 			await this.$nextTick(() => {
 				
 			});
@@ -601,7 +596,6 @@ export default {
 			sData2 = nowSeriesData.filter(item => {
 				return item.name == '계획';
 			})[0]['data'];
-			// console.log('sData1', sData);			
 			if(targetMonth.includes('qty')){
 				targetMonth = parseInt(targetMonth.slice(-2));
 			}
@@ -610,13 +604,11 @@ export default {
 					sData2[i] = sData[i] * targetRatio;
 				}
 			}
-			// console.log('sData2', sData2);
 			seriesData = nowSeriesData.map(item => ({
 				...item,
 				data: item.name == '계획' ? sData2 : item.data
 			}));
 			
-			// console.log('seriesData', seriesData);
 			await this.$nextTick(() => {
 				
 			});
@@ -643,4 +635,4 @@ let modifyEnrgUsePlanModalDataKey =
 	modifyEnrgUsePlanChart: Utility.defaultChartOption(true)
 };
 // 전력량 요금(원/kWh)
-</script>
+</script>

components/common/modal/EqpmSelectPop.vue

@@ -8,49 +8,37 @@
 			</label>
 		</v-col>
 		<v-col :cols="textCols">
-			<v-text-field
+			<v-text-field readonly v-model="selectValue" append-icon="" :class="['v-input__custom', customClass]"
-				readonly
+				@click="dialogOpenCloseEvent(dialog)" outlined :hide-details="true" :required="required || false"
-				v-model="selectValue"
+				:disabled="disabled || false"><template v-slot:append>
-				append-icon="mdi-magnify"
-				:class="['v-input__custom', customClass]"
-				@click="dialogOpenCloseEvent(dialog)"
-				outlined
-				:hide-details="true"
-				:required="required || false"
-				:disabled="disabled || false"
-				:placeholder="placeholder"
-			>
-				<template v-slot:append>
 					<!-- Custom SVG icon -->
 					<v-icon>$icoSearch</v-icon>
 				</template>
 			</v-text-field>
 		</v-col>
-		<v-dialog ref="popModal" v-model="dialog" width="800" scrollable>
+		<v-dialog ref="popModal" v-model="dialog" width="800" content-class="custom-dialog" scrollable>
-			<v-card style="height: 90vh;">
+			<v-card style="height: 100%;">
 				<v-card-title class="px-5 py-4 d-flex align-center justify-space-between">
 					<span class="custom-title-4">설비 선택</span>
 					<a-button icon="close" type="text" @click="dialogOpenCloseEvent(dialog)"></a-button>
 				</v-card-title>
-				<div class="pa-2 pt-0">
+				<div class="px-5 pt-2">
 					<!-- <v-card class="searchFilter">
 					</v-card> -->
-					<v-row align="end" class="searchFilter">
+					<v-row align="end">
 						<v-col :cols="3.5">
 							<!-- 설비그룹 -->
 							<component :is="'SelectBox'" :propsValue="selectValue01" :itemList="selectValueList01"
-								:label="'설비그룹'" :disabled="eqpmGrpDisabled"
+								:label="'설비그룹'" :disabled="eqpmGrpDisabled" @update:propsValue="selectValue01 = $event"
-								@update:propsValue="selectValue01 = $event" :labelCols="12" :textCols="12"
+								:labelCols="12" :textCols="12" :iconShow="true" />
-								:iconShow="true" />
 						</v-col>
-						<v-col :cols="3.5">
+						<v-col>
 							<!-- FAB -->
-							<component :is="'SelectBoxMulti'" :propsValue="selectValue02"
+							<component :is="'SelectBoxMulti'" :propsValue="selectValue02" :itemList="selectValueList02"
-								:itemList="selectValueList02" :label="'FAB'" :labelCols="12" :multiple="true"
+								:label="'FAB'" :labelCols="12" :multiple="true" :disabled="fabDisabled"
-								:disabled="fabDisabled" @update:propsValue="selectValue02 = $event" :textCols="12"
+								@update:propsValue="selectValue02 = $event" :textCols="12" :iconShow="true" />
-								:iconShow="true" />
 						</v-col>
-						<v-col :cols="3.5">
+						<v-col >
 							<v-row>
 								<v-col :cols="12" class="py-0">
 									<label for="" class="search-box-label">
@@ -59,9 +47,8 @@
 									</label>
 								</v-col>
 								<v-col :cols="12" class="pt-0">
-									<v-text-field append-icon="" class="v-input__custom" outlined
+									<v-text-field append-icon="" class="v-input__custom" outlined :hide-details="true"
-										:hide-details="true" v-model="searchWord" @keyup.enter="search"><template
+										v-model="searchWord" @keyup.enter="search"><template v-slot:append>
-											v-slot:append>
 											<!-- Custom SVG icon -->
 											<v-icon>$icoSearch</v-icon>
 
@@ -70,7 +57,11 @@
 
 							</v-row>
 						</v-col>
-						<a-button icon="search" type="primary" @click="search()" class="search-button">조회</a-button>
+						<v-col :cols="2" class="last-col mr-2">
+							<a-button icon="search" :ripple="false" type="primary" @click="search()"
+								class="search-button">조회</a-button>
+						</v-col>
+
 					</v-row>
 
 					<!-- <v-row align="center" no-gutters style="margin-top: 14px;">
@@ -91,13 +82,13 @@
 					</v-row> -->
 				</div>
 
-				<v-card-text class="px-2 w100">
+				<div class="pa-5" style="height:calc(100% - 30px)">
-					<div ref="modalGridParent" style="height: 450px;" class="h100 w100">
+					<div ref="modalGridParent" class="h100 w100">
 						<component :ref="gridName" :is="loadGrid ? 'Grid' : null"
 							:dataPath="searchParam.eqpmSelectPopData.eqpmSelectPop" :gridName="gridName"
 							:parentPrgmId="parentPrgmId" @getRowsData="getRowData" />
 					</div>
-				</v-card-text>
+				</div>
 
 				<v-card-actions class="px-6 py-4 d-flex align-center justify-end">
 					<a-button :ripple="false" @click="dialogOpenCloseEvent(dialog)" class="mr-2">닫기</a-button>
@@ -270,7 +261,7 @@ export default {
 		},
 		chkDialog() {
 			if (this.isMulti) {
-				this.$store.state.pageData[this.parentPrgmId][this.modalDataKey][this.myModalKey][this.gridName].option.rowHeaders = [{ type: 'checkbox' }];
+				this.$store.state.pageData[this.parentPrgmId][this.modalDataKey][this.myModalKey][this.gridName].option.rowHeaders = [{ type: 'checkbox', width: 72 }];
 			} else {
 				this.$store.state.pageData[this.parentPrgmId][this.modalDataKey][this.myModalKey][this.gridName].option.rowHeaders = [];
 			}
@@ -437,18 +428,15 @@ export default {
 				{
 					header: 'FAB',
 					name: 'fabNm',
-					align: 'center'
 				},
 				{
 					header: '설비ID',
-					name: 'eqpmId',
+					name: 'eqpmId'
-					align: 'center',
 					// hidden:true
 				},
 				{
 					header: '설비명',
-					name: 'eqpmNm',
+					name: 'eqpmNm'
-					align: 'center'
 				},
 				{
 					header: 'eccId',
@@ -532,11 +520,11 @@ export default {
 
 
 			this.loadGrid = true;
-			this.$nextTick(() => {
+			// this.$nextTick(() => {
-				if (this.isMulti) {
+			// 	if (this.isMulti) {
-					this.getChecked();
+			// 		this.getChecked();
-				}
+			// 	}
-			});
+			// });
 
 		},
 		setUpdate() {
@@ -588,3 +576,16 @@ var eqpmSelectPop = {
 }
 
 </script>
+<style lang="scss" scoped>
+::v-deep {
+	.last-col {
+		flex-basis: content;
+	}
+
+	.v-dialog {
+		overflow-y: hidden;
+	}
+
+}
+
+</style>

components/common/select/SelectBoxMulti.vue

@@ -140,6 +140,4 @@ export default {
 };
 </script>
 
-<style scoped lang="scss">
+<style scoped lang="scss"></style>
-
-</style>

components/common/select/SelectBoxTime.vue

@@ -22,7 +22,7 @@
         outlined
         :menu-props="{ auto: true, offsetY: true }"
         :hide-details="true"
-        :class="'v-select__custom'"
+        :class="['v-select__custom', customClass]"
         :disabled="disabled"
         :readonly="readonly"
         @click="setDatepickerHide"
@@ -106,6 +106,10 @@ export default {
       require: false,
       default: 1,
     },
+    customClass: {
+      type: String,
+      require: false,
+    },
   },
   emits: ["update:propsValue"],
   data() {

components/pages/ems/EccInfo/EccIaoTab.vue

@@ -11,7 +11,7 @@
 				:btnActionsFnc="btnActions"
 			/>
 		</div>
-		<div ref="gridParent" style="height: calc(100vh - 760px);">
+		<div ref="gridParent" >
 			<component
 				:ref="gridName"
 				:is="loadGrid ? 'Grid' : null"

components/pages/ems/EqpmInfo/EqpmAddInfoTab.vue

@@ -8,7 +8,7 @@
 				:btnActionsFnc="btnActions"
 			/>
 		</div>
-		<div ref="gridParent" style="height: calc(100vh - 520px);">
+		<div ref="gridParent" class="w100" style="height: calc(100vh - 520px);">
 			<Grid
 				:ref="gridName"
 				:is="loadGrid ? 'Grid' : null"
@@ -296,7 +296,7 @@ export default {
 				{
 					header: '추가 정보 값',
 					name: 'addInfoVal',
-					align: 'center',
+					align: 'left',
 					renderer: {
 						type: CustomRenderer,
 					},

components/pages/ems/EqpmInfo/EqpmIaoTab.vue

@@ -8,7 +8,7 @@
 				:btnActionsFnc="btnActions"
 			/>
 		</div>
-		<div ref="gridParent" style="height: calc(100vh - 800px);">
+		<div ref="gridParent" style="height: calc(100vh - 700px);">
 			<Grid
 				:ref="gridName"
 				:is="loadGrid ? 'Grid' : null"
@@ -18,7 +18,7 @@
 				:innerTabGridInfo="innerTabGridInfo"
 			/>
 		</div>
-		<div style="min-height: calc(100vh - 900px);" class="mt-4">
+		<div style="height: 60vh;" class="mt-5">
 			<component
 				:is="'Form'"
 				:parentPrgmId="parentPrgmId"
@@ -114,7 +114,7 @@ export default {
 				this.detailList[2].class = 'py-3 d-none';
 				this.detailList[3].class = 'py-3 pl-4 pt-1 d-none';
 
-				this.detailList[4].class = 'py-3';
+				this.detailList[4].class = 'py-3 pl-4';
 				this.detailList[5].class = 'py-3 pl-4';
 				this.detailList[6].class = 'py-3 pl-4 pt-0';
 			} else {
@@ -230,7 +230,7 @@ export default {
 				{
 					header: '대상 유형',
 					name: 'objKind',
-					align: 'center',
+					align: 'left',
 					formatter({ value }) {
 						var retVal = '';
 
@@ -261,7 +261,7 @@ export default {
 				{
 					header: '계산여부',
 					name: 'calcFg',
-					align: 'center',
+					align: 'left',
 					formatter({ value }) {
 						value = value === true ? '1' : '0';
 						const newValue = _this.pageData.useFgList.filter(
@@ -612,3 +612,10 @@ const myEqpmIaoDetail = [
 	},
 ];
 </script>
+<style lang="scss" scoped >
+::v-deep {
+	.tui-grid-layer-state {
+		top: 40px !important;
+	}
+}
+</style>

components/pages/ems/ErcChrgInfo/ErcChrgInfoTab.vue

@@ -20,6 +20,12 @@
 				</v-card>
 			</v-col>
 		</v-row>
+		<!-- Create the line between date picker and form -->
+		<v-row class="my-5" no-gutters>
+			<v-col>
+				<div style="height: 1px; background-color: #ccc;"></div>
+			</v-col>
+		</v-row>
 		<v-row class="search-box" align="center" no-gutters style="height: 44px;">
 			<v-col :cols="4">
 				<label for="" class="search-box-label">

components/pages/ems/ReadObjInfo/ReadObjAddInfoTab.vue

@@ -1,8 +1,8 @@
 <template>
 	<div>
 		<div
-			class="d-flex justify-space-between align-center"
+			class="d-flex justify-space-between"
-			style="height: 80px;"
+			style="height: 45px;"
 		>
 			<span class="txt custom-subtitle-tab">검침 대상 추가 정보</span>
 			<Buttons
@@ -143,7 +143,6 @@ export default {
 			class CustomRenderer {
 				constructor(props) {
 					//const { min, max } = props.columnInfo.renderer.options;
-					//console.log('props: %o', props);
 
 					const el = document.createElement('input');
 					if (
@@ -215,15 +214,12 @@ export default {
 						}
 						$(el).addClass('tui-grid-content-text');
 					}
-					// console.log('props: %o', props);
-					// console.log('el: %o', el);
 					this.el = el;
 
 					this.render(props);
 				}
 
 				change(ev) {
-					//console.log('props: %o', ev);
 					if (ev.target.checked) {
 						ev.target.value = 1;
 					} else {
@@ -245,7 +241,6 @@ export default {
 					} else {
 						this.el.value = String(props.value);
 					}
-					//console.log('props: %o', props);
 				}
 
 				mounted() {
@@ -275,7 +270,7 @@ export default {
 				{
 					header: 'Data 구분',
 					name: 'addInfoDataKind',
-					align: 'center',
+					align: 'left',
 					formatter({ value }) {
 						let retVal = '';
 						const newValue = addInfoDataKindList.filter(
@@ -323,8 +318,6 @@ export default {
 				},
 				//{ header: "추가 정보 값", name: "addInfoVal", align: "center" , editor: "text",
 				// formatter({ value, row , column}) {
-				//   console.log("addInfoVal row : ", row);
-				//   console.log("addInfoVal state : ", column);
 				//   if(row.addInfoDataKind === "NUM"){
 				//     column.align = "right";
 				//   }else{

components/pages/ems/ReadPlcInfo/ReadPlcTagRelTab.vue

@@ -332,7 +332,7 @@ const myReadPlcTagDetail = [
 		valueNm2: 'tagNm',
 		disabled: true,
 		cols: 6,
-		class: 'pr-4 pb-2 py-3',
+		class: 'pr-4 pb-2 py-2',
 		required: true,
 		labelCols: 12,
 		textCols: 12,
@@ -345,7 +345,7 @@ const myReadPlcTagDetail = [
 		valueNm: 'ercId',
 		disabled: false,
 		cols: 6,
-		class: 'pl-4 py-3',
+		class: 'pl-4 pb-2 py-3',
 		list: 'ercNmList',
 		itemText: 'text',
 		itemValue: 'value',

pages/comm/auth/MenuRoleMngPage.vue

@@ -5,22 +5,12 @@
 				<v-card class="searchFilter">
 					<v-row algin="end" no-gutters>
 						<v-col :cols="3">
-							<InputText
+							<InputText :parentPrgmId="myPrgmId" label="역할ID" valueNm="roleId" :searchOption="true"
-								:parentPrgmId="myPrgmId"
+								customClass="input-large" />
-								label="역할ID"
-								valueNm="roleId"
-								:searchOption="true"
-								customClass="input-large"
-							/>
 						</v-col>
 						<v-col :cols="3">
-							<InputText
+							<InputText :parentPrgmId="myPrgmId" label="역할명" valueNm="roleNm" :searchOption="true"
-								:parentPrgmId="myPrgmId"
+								customClass="input-large" />
-								label="역할명"
-								valueNm="roleNm"
-								:searchOption="true"
-								customClass="input-large"
-							/>
 						</v-col>
 						<v-col class="text-right d-flex justify-end align-end mr-3">
 							<BtnSearch size="large" />
@@ -30,81 +20,55 @@
 			</v-col>
 		</v-row>
 
-		<v-row ref="contents" >
+		<v-row ref="contents">
-			<v-col cols="12" lg="2" >
+			<v-col cols="12" lg="3">
 				<v-card>
 					<v-card-title>
 						<span class="custom-title-4">역할 리스트</span>
 					</v-card-title>
 					<div ref="gridParent" class="px-5" style="height: 60vh;">
-						<component
+						<component :is="loadGrid ? 'Grid' : null" :ref="gridName + myPrgmId" :gridName="gridName"
-							:is="loadGrid ? 'Grid' : null"
+							:parentPrgmId="myPrgmId" @getRowsData="getRowData" />
-							:ref="gridName + myPrgmId"
-							:gridName="gridName"
-							:parentPrgmId="myPrgmId"
-							@getRowsData="getRowData"
-						/>
 					</div>
 				</v-card>
 			</v-col>
-			<v-col cols="12" lg="10" >
+			<v-col cols="12" lg="9">
 				<v-card>
 					<v-card-title>
 						<span class="custom-title-4">역할 메뉴별 권한</span>
 					</v-card-title>
-					<v-row
+					<v-row align="center" no-gutters :style="{ height: 'calc(100% - 62px)' }" class="px-5">
-						align="center"
+						<v-col class="h100" style="max-width: 400px;">
-						no-gutters
+							<span class="body-1 font-weight-bold d-flex align-center"
-						:style="{ height: 'calc(100% - 62px)' }"
+								:style="{ minHeight: '36px' }">[미배정]메뉴리스트</span>
-						class="px-5"
-					>
-						<v-col :cols="4" class="h100">
-							<span
-								class="body-1 font-weight-bold d-flex align-center"
-								:style="{ minHeight: '36px' }"
-								>[미배정]메뉴리스트</span
-							>
 							<div ref="treeGridParent" class="px-0 mt-2" style="height: 60vh;">
 								<!-- <div
 									ref="treeGridParent"
 									class="w100 h100"
 								>
 							</div> -->
-								<component
+								<component :is="loadTreeGrid ? 'Grid' : null" :ref="gridName2 + myPrgmId"
-									:is="loadTreeGrid ? 'Grid' : null"
+									:gridName="gridName2" :parentPrgmId="myPrgmId" @getRowsData="getUnAsgnRowData" />
-									:ref="gridName2 + myPrgmId"
-									:gridName="gridName2"
-									:parentPrgmId="myPrgmId"
-									@getRowsData="getUnAsgnRowData"
-								/>
 							</div>
 						</v-col>
-						<v-col :cols="1">
+						<!-- <v-col :cols="1.5">
-							<ActionButtons
+							<ActionButtons :parentPrgmId="myPrgmId" :leftGridName="gridName2" :rightGridName="gridName3"
-								:parentPrgmId="myPrgmId"
+								:btnActionsFnc="dualGridBtnActions" />
-								:leftGridName="gridName2"
+						</v-col> -->
-								:rightGridName="gridName3"
+						<div class="pr-2">
-								:btnActionsFnc="dualGridBtnActions"
+							<ActionButtons :parentPrgmId="myPrgmId" :leftGridName="gridName2" :rightGridName="gridName3"
-							/>
+								:btnActionsFnc="dualGridBtnActions" />
-						</v-col>
+						</div>
 						<v-col :cols="7" class="h100">
-							<v-row
+							<v-row justify="space-between" align="center" no-gutters class="px-5">
-								justify="space-between"
-								align="center"
-								no-gutters
-								class="px-5"
-							>
 								<v-col :cols="11">
-									<span class="body-1 font-weight-bold"
+									<span class="body-1 font-weight-bold d-flex align-center"
-										>[배정]메뉴별권한 리스트</span
+										:style="{ minHeight: '36px' }">[배정]메뉴별권한 리스트</span>
-									>
+									<!-- <span class="body-1 font-weight-bold">[배정]메뉴별권한 리스트</span> -->
 								</v-col>
 								<v-col :cols="1" class="text-right">
-									<Buttons
+									<Buttons :parentPrgmId="myPrgmId" :bindingData="gridName3"
-										:parentPrgmId="myPrgmId"
+										:btnActionsFnc="btnActions" />
-										:bindingData="gridName3"
-										:btnActionsFnc="btnActions"
-									/>
 								</v-col>
 							</v-row>
 							<div ref="treeGridParent2" class="px-0 mt-2" style="height: 60vh;">
@@ -113,14 +77,9 @@
 									class="w100 h100"
 								>
 							</div> -->
-								<component
+								<component :is="loadTreeGrid2 ? 'Grid' : null" :ref="gridName3 + myPrgmId"
-									:is="loadTreeGrid2 ? 'Grid' : null"
+									:gridName="gridName3" :parentPrgmId="myPrgmId" :editorGrid="true"
-									:ref="gridName3 + myPrgmId"
+									@getRowsData="getAsgnRowData" />
-									:gridName="gridName3"
-									:parentPrgmId="myPrgmId"
-									:editorGrid="true"
-									@getRowsData="getAsgnRowData"
-								/>
 							</div>
 						</v-col>
 					</v-row>
@@ -286,8 +245,8 @@ export default {
 		async gridInit() {
 			//---------------------gridOption 설정 시작----------------------------
 			const gridHeight = this.$refs.gridParent.offsetHeight - 30;
-			const treeGridHeight = this.$refs.treeGridParent.offsetHeight - 30;
+			const treeGridHeight = this.$refs.treeGridParent.offsetHeight - 50;
-			const treeGridHeight2 = this.$refs.treeGridParent2.offsetHeight - 30;
+			const treeGridHeight2 = this.$refs.treeGridParent2.offsetHeight - 50;
 			// const gridHeight = this.$refs.contents.offsetHeight - 30;
 
 			const myOptions = {
@@ -316,8 +275,10 @@ export default {
 				treeColumnOptions: {
 					name: 'menuNm',
 				},
-				scrollX: false,
+				rowHeight: 37,
-				// scrollY: false,
+				minRowHeight: 37,
+				scrollX: true,
+				scrollY: true,
 			};
 
 			this.setGridOption({
@@ -347,6 +308,9 @@ export default {
 					const el = document.createElement('input');
 					const { grid, rowKey, columnInfo } = props;
 					el.type = 'checkbox';
+					$(el).css('width', '16px');
+					$(el).css('height', '16px');
+					$(el).css('accent-color', '#1677FF');
 					el.value = props.value;
 					this.el = el;
 
@@ -380,12 +344,12 @@ export default {
 			const _this = this;
 
 			const myColumns = [
-				{ header: '역할ID', name: 'roleId', align: 'center', minWidth: 70 },
+				{ header: '역할ID', name: 'roleId', align: 'left', minWidth: 70,width:120 },
-				{ header: '역할명', name: 'roleNm', minWidth: 70 },
+				{ header: '역할명', name: 'roleNm', minWidth: 70, align: 'left',width:120 },
 				{
 					header: '사용여부',
 					name: 'useFg',
-					align: 'center',
+					align: 'left',
 					minWidth: 84,
 					formatter({ value }) {
 						const newValue = _this.pageData.useFgList.filter(
@@ -408,6 +372,7 @@ export default {
 				{
 					header: '메뉴명',
 					name: 'menuNm',
+					maxWidth: 120,
 					validation: {
 						dataType: 'string',
 						validatorFn: (value, row) => {
@@ -549,12 +514,12 @@ export default {
 						//rowKey: 0,
 						rowKey:
 							this.pageData.rowGridSelectKey == '' ||
-							this.pageData.rowGridSelectKey == null
+								this.pageData.rowGridSelectKey == null
 								? 0
 								: this.pageData.rowGridSelectKey ==
-								  this.$refs[this.gridName + this.myPrgmId].getData().length - 1
+									this.$refs[this.gridName + this.myPrgmId].getData().length - 1
-								? this.pageData.rowGridSelectKey
+									? this.pageData.rowGridSelectKey
-								: 0,
+									: 0,
 						columnName: 'roleId',
 						setScroll: true,
 					});
@@ -609,8 +574,8 @@ export default {
 						item.upMenuId && item.upMenuId != '0'
 							? item.upMenuId
 							: item.upMenuId == '0'
-							? '00'
+								? '00'
-							: 'ROOT',
+								: 'ROOT',
 				};
 				return newItem;
 			});
@@ -649,8 +614,8 @@ export default {
 						item.upMenuId && item.upMenuId != '0'
 							? item.upMenuId
 							: item.upMenuId == '0'
-							? '00'
+								? '00'
-							: 'ROOT',
+								: 'ROOT',
 				};
 				return newItem;
 			});

pages/comm/auth/UserRoleMngPage.vue

@@ -12,8 +12,8 @@
 								:parentPrgmId="myPrgmId"
 								:sendParam="{ comId }"
 								customClass="select-large"
-								labelCols="12"
+								:labelCols="12"
-								textCols="12"
+								:textCols="12"
 							/>
 							<!-- <component
                 :is="'selectCodeList'"

pages/comm/base/BatchMngPage.vue

@@ -15,25 +15,15 @@
 								:customClass="'input-large'" />
 						</v-col>
 						<v-col :cols="2.5">
-							<component
+							<component :is="'selectCodeList'" :parentPrgmId="myPrgmId" :label="'배치 실행 구분'"
-								:is="'selectCodeList'"
-								:parentPrgmId="myPrgmId"
-								:label="'배치 실행 구분'"
 								:dataKey="'searchBatchExecTp'"
-								:sendParam="{ commGrpCd: 'CO_BATCH_EXEC_TP', useFg: '1' }"
+								:sendParam="{ commGrpCd: 'CO_BATCH_EXEC_TP', useFg: '1' }" :addAll="true"
-								:addAll="true"
+								:customClass="'select-large'" />
-								:customClass="'select-large'"
-							/>
 						</v-col>
 						<v-col :cols="2.5" class="pr-4">
-							<component
+							<component :is="'selectCodeList'" :parentPrgmId="myPrgmId" :label="'사용여부'"
-								:is="'selectCodeList'"
+								:dataKey="'searchUseFg'" :sendParam="{ commGrpCd: 'CO_USEFG', useFg: '1' }"
-								:parentPrgmId="myPrgmId"
+								:customClass="'select-large'" />
-								:label="'사용여부'"
-								:dataKey="'searchUseFg'"
-								:sendParam="{ commGrpCd: 'CO_USEFG', useFg: '1' }"
-								:customClass="'select-large'"
-							/>
 						</v-col>
 						<BtnSearch size="large" class="mr-2" />
 
@@ -42,9 +32,9 @@
 			</v-col>
 		</v-row>
 
-		<v-row ref="contents" class="mt-4">
+		<v-row ref="contents" class="mt-4 h100">
 			<!-- 배치 리스트 -->
-			<v-col :cols="6" class="h100 pr-2">
+			<v-col :cols="6" class="pr-2">
 				<v-card class="pb-5">
 					<div class="d-flex align-center justify-space-between pa-4">
 						<!-- <v-card-title>
@@ -56,7 +46,7 @@
 							:btnActionsFnc="btnActions" />
 					</div>
 					<div class="px-4">
-						<div ref="gridParent" class="h100 w100">
+						<div ref="gridParent" class="h100 w100" style="height:calc(100% - 70px)">
 							<component :ref="gridName" :is="loadGrid ? 'Grid' : null" :parentPrgmId="myPrgmId"
 								:gridName="gridName" @getRowsData="getRowData" />
 						</div>
@@ -65,7 +55,7 @@
 				</v-card>
 			</v-col>
 			<!-- 배치 상세 -->
-			<v-col :cols="6" class="h100 pl-3">
+			<v-col :cols="6" class="pl-3">
 				<v-card class="pd-y-20 h100">
 					<v-card-title class="d-flex justify-space-between align-end pa-4">
 						<span class="tit ft-size_20 ft-weight_600">배치 상세</span>
@@ -82,14 +72,17 @@
 				<v-card style="height: 100%">
 					<v-card-title class="v-card__title d-flex align-center justify-space-between">
 						<span class="custom-title-4">DB 프로시져 파라메터 설정</span>
-						<div>
+						<a-button icon="close" type="text" @click="dialog = false"></a-button>
-							<Buttons :parentPrgmId="myPrgmId" :bindingData="gridNameParam"
+
-								:btnActionsFnc="btnActionsParam" />
-						</div>
 					</v-card-title>
 					<div class="pa-5">
-						<v-row align="center" no-gutters>
+						<v-row align="end" no-gutters>
-							<v-col cols="12" class="text-right"> </v-col>
+							<v-col cols="12" class="d-flex justify-end">
+
+								<Buttons :parentPrgmId="myPrgmId" :bindingData="gridNameParam"
+									:btnActionsFnc="btnActionsParam" />
+
+							</v-col>
 						</v-row>
 					</div>
 					<v-card-text style="height: 300px;">
@@ -101,10 +94,9 @@
 							</div>
 						</div>
 					</v-card-text>
-					<v-card-actions>
+					<v-card-actions class="px-6 py-4 d-flex align-center justify-end">
-						<v-spacer></v-spacer>
+						<a-button :ripple="false" @click="dialog = false" class="mr-2">닫기</a-button>
-						<v-btn color="primary" dark @click="setParamChangeData()">확인</v-btn>
+						<a-button :ripple="false" type="primary" @click="setParamChangeData()">확인</a-button>
-						<v-btn color="primary" dark @click="dialog = false">닫기</v-btn>
 					</v-card-actions>
 				</v-card>
 			</v-dialog>
@@ -156,7 +148,7 @@ export default {
 			myPrgmId: myPrgmId,
 			loadGrid: false,
 			gridName: 'rowGrid',
-			
+
 			// rowGridOrigin: [],
 			detailList: myDetail,
 
@@ -261,7 +253,7 @@ export default {
 
 			const _this = this;
 			const myColumns = [
-				{ header: '배치ID', name: 'batchId', align: 'center', width: 100 },
+				{ header: '배치ID', name: 'batchId', align: 'right', width: 100 },
 				{ header: '배치명', name: 'batchNm', minWidth: 200 },
 				{
 					header: '배치 실행 구분',
@@ -283,7 +275,6 @@ export default {
 				{
 					header: '사용여부',
 					name: 'useFg',
-					align: 'center',
 					width: 145,
 					formatter({ value }) {
 						let retVal = '';
@@ -556,7 +547,7 @@ export default {
 			}
 		},
 		gridParamInit() {
-			
+
 			const gridHeight = this.$refs.gridParent.offsetHeight - 36;
 			const myOptions = {
 				columnOptions: {
@@ -567,6 +558,10 @@ export default {
 				selectionUnit: 'row',
 				editingEvent: 'click',
 				scrollX: false,
+				header: {
+					height: 37,
+				},
+				rowHeight: 37,
 			};
 			this.setGridOption({
 				gridKey: this.gridNameParam,
@@ -592,7 +587,6 @@ export default {
 				{
 					header: 'MODE',
 					name: 'mode',
-					align: 'center',
 					formatter({ value }) {
 						return value == ('OUT' || 'out') ? 'OUT' : 'IN';
 					},
@@ -642,7 +636,7 @@ export default {
 		},
 		getRowParamData() {
 			this.paramLoadGrid = false;
-			// let res = [];
+			let res = [];
 
 			// /* this.pageData.paramStrData 처리 */
 			// // console.log("this.pageData.paramStrData : ", JSON.parse(this.pageData.paramStrData));
@@ -717,7 +711,6 @@ export default {
 		},
 		inputClick(event, item, valueNm) {
 			if (valueNm == 'refVal1') {
-				this.dialog = true;
 				const rowIdxKey = this.$refs[this.gridName].gridInstance.invoke(
 					'getFocusedCell',
 				).rowKey;

pages/comm/base/PrgmMngPage.vue

@@ -7,28 +7,15 @@
 				<v-card class="searchFilter">
 					<v-row align="end" no-gutters>
 						<v-col :cols="3">
-							<component
+							<component :is="'selectCodeList'" :parentPrgmId="myPrgmId" :label="'사용여부'"
-								:is="'selectCodeList'"
+								:dataKey="'selectUseFg'" :sendParam="{ commGrpCd: 'CO_USEFG', useFg: '1' }"
-								:parentPrgmId="myPrgmId"
+								:addAll="true" customClass="select-large" />
-								:label="'사용여부'"
-								:dataKey="'selectUseFg'"
-								:sendParam="{ commGrpCd: 'CO_USEFG', useFg: '1' }"
-								:addAll="true"
-								customClass="select-large"
-							/>
 						</v-col>
 						<v-col :cols="3">
-							<InputText
+							<InputText :parentPrgmId="myPrgmId" label="프로그램명" valueNm="prgmNm" :searchOption="true"
-								:parentPrgmId="myPrgmId"
+								:labelCols="12" :textCols="12" customClass="input-large" />
-								label="프로그램명"
-								valueNm="prgmNm"
-								:searchOption="true"
-								:labelCols="12"
-								:textCols="12"
-								customClass="input-large"
-							/>
 						</v-col>
-						<v-col :cols="5" class="text-right">
+						<v-col :cols="6" class="text-right">
 							<BtnSearch size="large" />
 						</v-col>
 					</v-row>
@@ -38,46 +25,32 @@
 
 		<v-row ref="contents">
 			<!-- 프로그램 리스트 -->
-			<v-col :cols="5" >
+			<v-col :cols="5">
-				<v-card class="pb-5">
+				<v-card class="pa-5">
-					<div class="d-flex align-center justify-space-between pa-5">
+					<div class="d-flex align-center justify-space-between">
 						<v-card-title class="pa-0">프로그램 리스트</v-card-title>
 						<div>
-							<Buttons
+							<Buttons :parentPrgmId="myPrgmId" :bindingData="gridName" :detailList="detailList"
-								:parentPrgmId="myPrgmId"
+								:btnActionsFnc="btnActions" />
-								:bindingData="gridName"
-								:detailList="detailList"
-								:btnActionsFnc="btnActions"
-							/>
 						</div>
 					</div>
-					<div ref="gridParent" style="height: 60vh">
+					<div ref="gridParent" class="pt-5" style="height: 60vh">
 						<!-- <div ref="gridParent" class="px-5 h100">
 						</div> -->
-						<component
+						<component :ref="gridName" :is="loadGrid ? 'Grid' : null" :parentPrgmId="myPrgmId"
-							:ref="gridName"
+							:gridName="gridName" @getRowsData="getRowData" />
-							:is="loadGrid ? 'Grid' : null"
-							:parentPrgmId="myPrgmId"
-							:gridName="gridName"
-							@getRowsData="getRowData"
-						/>
 					</div>
 				</v-card>
 			</v-col>
 			<!-- 프로그램 상세 -->
-			<v-col :cols="7" >
+			<v-col :cols="7">
 				<v-card class="pb-5">
 					<div class="d-flex align-center justify-space-between pa-5">
 						<v-card-title class="pa-0">프로그램 상세</v-card-title>
 					</div>
 					<div class="px-5" style="min-height:calc(100% - 76px)">
-						<component
+						<component :is="'Form'" :parentPrgmId="myPrgmId" :bindingData="gridName"
-							:is="'Form'"
+							:detailList="detailList" @gridEditingFinish="gridEditingFinish" />
-							:parentPrgmId="myPrgmId"
-							:bindingData="gridName"
-							:detailList="detailList"
-							@gridEditingFinish="gridEditingFinish"
-						/>
 						<!-- <div class="w100">
 						</div> -->
 					</div>
@@ -132,21 +105,19 @@ export default {
 			detailList: myDetail,
 
 			dataPathMock: {
-        'rowGrid': {
+				'rowGrid': {
-          column: [
+					column: [
-            { header: '프로그램ID', name: 'field1', align: 'left' },
+						{ header: '프로그램ID', name: 'field1', align: 'left' },
-            { header: '프로그램덤', name: 'field2', align: 'left' },
+						{ header: '프로그램덤', name: 'field2', align: 'left' },
-            { header: '타임', name: 'field3', align: 'left' },
+						{ header: '타임', name: 'field3', align: 'left' },
-            { header: '사용여부', name: 'field4', align: 'left' }
+						{ header: '사용여부', name: 'field4', align: 'left' }
-          ],
+					],
-          data: dataPathDataExample,
+					option: {
-          defaultRow: dataPathDataExample,
-          option: {
 						scrollY: false,
 						scrollX: false,
 					}
-        }
+				}
-      },
+			},
 		};
 	},
 	computed: {
@@ -295,7 +266,7 @@ export default {
 				value: newRes,
 			});
 			this.loadGrid = true;
-			
+
 			this.$nextTick(() => {
 				if (newRes.length > 0) {
 					this.$refs[this.gridName].focus({
@@ -303,12 +274,12 @@ export default {
 						//rowKey: this.chkRowGridSelectKey || 0,
 						rowKey:
 							this.pageData.rowGridSelectKey == '' ||
-							this.pageData.rowGridSelectKey == null
+								this.pageData.rowGridSelectKey == null
 								? 0
 								: this.pageData.rowGridSelectKey ==
-								  this.$refs[this.gridName].getData().length - 1
+									this.$refs[this.gridName].getData().length - 1
-								? this.pageData.rowGridSelectKey
+									? this.pageData.rowGridSelectKey
-								: 0,
+									: 0,
 						setScroll: true,
 					});
 				}
@@ -331,7 +302,7 @@ export default {
 				rowGridSelectKey: data.rowKey,
 				rowGridSelectData: data,
 			});
-			
+
 		},
 		compareData(type, newDt) {
 			if (this.selectedCommCdData[type] == newDt) {
@@ -487,7 +458,7 @@ const myDetail = [
 		valueNm: 'prgmTpCd',
 		essential: true,
 		cols: 6,
-		class: 'py-2',
+		class: 'py-2 pt-5',
 		list: [
 			{ text: '프로그램', value: '1' },
 			{ text: '팝업', value: '2' },
@@ -502,10 +473,11 @@ const myDetail = [
 		essential: true,
 		disabled: false,
 		cols: 6,
-		class: 'py-2',
+		class: 'py-2 pt-13',
 		value: { '1': true, '0': false },
 		required: true,
 		textCols: 12,
+		labelCols:12,
 		iconShow: true
 	},
 	{
@@ -514,7 +486,7 @@ const myDetail = [
 		valueNm: 'url',
 		disabled: false,
 		cols: 12,
-		class: 'py-2',
+		class: 'py-2 pt-4',
 		required: true,
 		textCols: 12,
 		iconShow: true
@@ -525,7 +497,7 @@ const myDetail = [
 		valueNm: 'regUserNo',
 		disabled: true,
 		cols: 6,
-		class: 'py-2',
+		class: 'py-2 pt-5',
 		placeholder: '시스템 자동입력',
 		textCols: 12,
 		iconShow: true
@@ -536,7 +508,7 @@ const myDetail = [
 		valueNm: 'regDttm',
 		disabled: true,
 		cols: 6,
-		class: 'py-2',
+		class: 'py-2 pt-5',
 		placeholder: '시스템 자동입력',
 		textCols: 12,
 		iconShow: true
@@ -547,7 +519,7 @@ const myDetail = [
 		valueNm: 'procUserNo',
 		disabled: true,
 		cols: 6,
-		class: 'py-2',
+		class: 'py-2 pt-5',
 		placeholder: '시스템 자동입력',
 		textCols: 12,
 		iconShow: true
@@ -558,19 +530,10 @@ const myDetail = [
 		valueNm: 'procDttm',
 		disabled: true,
 		cols: 6,
-		class: 'py-2',
+		class: 'py-2 pt-5',
 		placeholder: '시스템 자동입력',
 		textCols: 12,
 		iconShow: true
 	},
 ];
-
-
-import { getPathDataExample } from '@/const/const'
-const dataPathDataExample = getPathDataExample({
-  field1: 'PRG0001',
-  field2: '대시보드',
-  field3: '프로그램', 
-	field4: '사용'
-});
 </script>

pages/ems/base/DashboardPage.vue

@@ -803,7 +803,7 @@ export default {
           header: "NO",
           name: "rowNum",
           width: 70,
-          align: "center",
+          align: "right",
           // hidden: true,
         },
         {

pages/ems/base/EnrgCostCenterMngPage.vue

@@ -3,7 +3,7 @@
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
-					<v-row align="center" no-gutters>
+					<v-row align="end" no-gutters>
 						<v-col :cols="2.5">
 							<component
 								:is="'selectCodeList'"
@@ -49,8 +49,8 @@
 								:parentPrgmId="myPrgmId"
 								label="공정명"
 								valueNm="eccNm"
-								:labelCols="2"
+								:labelCols="12"
-								:textCols="9"
+								:textCols="12"
 								:searchOption="true"
 							/>
 						</v-col>
@@ -59,7 +59,13 @@
 						</v-col>
 					</v-row>
 					<v-row align="center" no-gutters>
-						
+						<div style="display: none">
+								<component
+									:is="'SelectBlocMstr'"
+									ref="SelectBlocMstr"
+									:parentPrgmId="myPrgmId"
+								/>
+							</div>
 					</v-row>
 				</v-card>
 			</v-col>
@@ -91,7 +97,7 @@
 					</div>
 				</v-card>
 			</v-col>
-			<v-col :cols="7" class="h100">
+			<v-col :cols="7" style="min-height:75vh;">
 				<v-card class="pb-5">
 					<v-card-title class="custom-title-4" style="min-height:76px;"
 						>공정 상세

pages/ems/base/EqpmKindPage.vue

@@ -167,7 +167,7 @@ export default {
 					header: '설비종류ID',
 					name: 'eqpmKindId',
 					width: gridWidth * 0.5,
-					align: 'center',
+					align: 'left',
 				},
 				{
 					header: '설비종류명',

pages/ems/base/EquipmentMasterMngPage.vue

@@ -382,7 +382,7 @@ export default {
 					header: '사용 여부',
 					name: 'useFg',
 					width: 100,
-					align: 'center',
+					align: 'left',
 					formatter({ value }) {
 						const newValue = _this.pageData.useFgList.filter(
 							item => item.commCd == value,

pages/ems/effc/EnrgEffcEqpmDetlMntrPage.vue

@@ -67,14 +67,8 @@
 					</div>
 					<div class="px-4" style="height:calc(100% - 76px)">
 						<div ref="gridParent" class="w100 h100">
-							<component
+							<component :ref="gridName" :is="loadGrid ? 'Grid' : null" :gridName="gridName"
-								:ref="gridName"
+								:parentPrgmId="myPrgmId" :columnClickEventFlag="true" @columnClick="columnClick" />
-								:is="loadGrid ? 'Grid' : null"
-								:gridName="gridName"
-								:parentPrgmId="myPrgmId"
-								:columnClickEventFlag="true"
-								@columnClick="columnClick"
-							/>
 						</div>
 					</div>
 				</v-card>
@@ -552,7 +546,12 @@ export default {
 				columnOptions: {
 					resizable: true,
 				},
-				rowHeaders: ['rowNum'],
+				rowHeaders: [
+					{
+						type: 'rowNum',
+						align: 'right',
+					},
+				],
 				header: {
 					height: 37,
 				},
@@ -642,7 +641,7 @@ export default {
 				{
 					header: '평가',
 					name: 'okFg',
-					align: 'center',
+					align: 'left',
 					width: 80,
 				},
 				{

pages/ems/effc/EnrgUsePlanPage.vue

@@ -286,7 +286,7 @@ export default {
 					resizable: true,
 				},
 				header: {
-					height: 65,
+					height: 75,
 					complexColumns: myComplexColumns,
 				},
 			};

pages/ems/effc/EqpmIndMntrPage.vue

@@ -104,7 +104,6 @@
                 :is="loadGrid ? 'Grid' : null"
                 :gridName="gridName"
                 :parentPrgmId="myPrgmId"
-                @dblClick="gridDoubleClickEvent"
               />
               <!--
 							<component
@@ -143,7 +142,6 @@ import SelectBox from "@/components/common/select/SelectBox";
 import SelectCmCycle from "@/components/common/select/SelectCmCycle";
 import DatePicker from "@/components/common/Datepicker";
 import Grid from "~/components/common/Grid";
-import PageTitle from "@/components/common/PageTitle";
 
 let myTitle;
 let myPrgmId;
@@ -170,7 +168,6 @@ export default {
     SelectCmCycle,
     DatePicker,
     Grid,
-    PageTitle,
   },
   data() {
     return {
@@ -204,6 +201,7 @@ export default {
   computed: {
     ...mapState({
       pageData: (state) => state.pageData[myPrgmId],
+      isDarkMode: "isDarkMode",
     }),
     fromDt() {
       return this.pageData.fromDt;
@@ -237,6 +235,16 @@ export default {
         await this.search();
       }
     },
+    isDarkMode(newVal) {
+      // Switch mode for 10 tooltips
+      for (let i = 0; i < 10; i++) {
+        const tooltipEl = document.getElementById(`tooltipElement_${i}`);
+        if (tooltipEl) {
+          tooltipEl.classList.remove("light-mode", "dark-mode");
+          tooltipEl.classList.add(newVal ? "dark-mode" : "light-mode");
+        }
+      }
+    },
   },
   async beforeCreate() {
     myPrgmId = this.$route.query.prgmId;
@@ -357,13 +365,79 @@ export default {
     gridInit() {
       const gridHeight = this.$refs.gridParent.offsetHeight - 30;
       const _this = this;
+      // 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();
+				}
+			}
 
       var columnList = [
         { header: "NO", name: "no", align: "right", width: 80 },
         { header: "fabId", name: "fabId", hidden: true },
         { header: "FAB", name: "fabNm", align: "left" },
         { header: "eqpmGrpId", name: "eqpmGrpId", hidden: true },
-        { header: "설비그룹", name: "eqpmGrpNm", align: "left", width: 200 },
+        { header: "설비그룹", name: "eqpmGrpNm", align: "left", width: 200,
+          // Render custom button to switch page instead of double click on row
+          renderer: {
+            type: CustomButton,
+            options: {
+              value: '보기',
+              onClick: (rowKey) => {
+                const gridInstance = this.$refs[this.gridName].gridInstance;
+                const eventRowData = gridInstance.invoke("getRow", rowKey);
+
+                const data = {
+                  cmCycle: this.pageData.cmCycle,
+                  fromDt: this.pageData.fromDt,
+                  fabId: this.selectValue01,
+                  eqpmKindId: this.selectValue02,
+                  eqpmGrpId: this.selectValue03,
+                  eqpmId: eventRowData.eqpmId,
+                };
+                const key = "tick_" + Math.random();
+                this.$router.push({
+                  name: "ems-effc-EnrgUseEqpmDetlMntrPage",
+                  query: {
+                    prgmId: "PRG0082",
+                  },
+                  params: {
+                    ...data,
+                    key: key,
+                  },
+                });
+              }
+            }
+          }
+        },
         { header: "eqpmId", name: "eqpmId", hidden: true },
         { header: "설비명", name: "eqpmNm", align: "left", width: 200 },
         {
@@ -472,6 +546,10 @@ export default {
             },
           ],
         },
+        pageOptions: {
+          useClient: true,
+          perPage: 3,
+        }
       };
 
       this.setGridOption({
@@ -693,53 +771,83 @@ function numberFormatter({ value }) {
 }
 </script>
 <style lang="scss" scoped>
-@for $i from 0 through 9 {
+::v-deep {
-  #gridParent > * {
+  @for $i from 0 through 9 {
-    // .tui-grid-content-area{
+    #gridParent > * {
-    background-color: red;
+      // .tui-grid-content-area{
-    color: red;
+      background-color: red;
-    overflow: visible;
+      color: red;
-    position: relative;
+      overflow: visible;
-  }
+      position: relative;
-  #tooltipTargetElement_#{$i} {
+    }
-    overflow: visible;
+    #tooltipTargetElement_#{$i} {
-    position: relative; // 테스트3번쨰
+      overflow: visible;
-    white-space: nowrap; // 테스트3번쨰
+      position: relative; // 테스트3번쨰
-  }
+      white-space: nowrap; // 테스트3번쨰
-  #tooltipElement_#{$i} {
+    }
-    display: none;
+    #tooltipElement_#{$i} {
-    overflow: visible;
+      display: none;
-    position: relative;
+      overflow: visible;
-  }
+      position: relative;
-  #tooltipTargetElement_#{$i}:hover #tooltipElement_#{$i} {
+    }
-    display: block;
+    #tooltipTargetElement_#{$i}:hover #tooltipElement_#{$i} {
-    position: absolute;
+      display: block;
-    min-width: 100%;
+      position: absolute;
-    bottom: 30px;
+      min-width: 100%;
-    z-index: 1000000000;
+      bottom: 40px;
-    align: "center";
+      z-index: 1000000000;
-    color: #f2f2f2;
+      align: "center";
-    background-color: #7f7f7f;
+      color: #f2f2f2;
-    // width : 77px;
+      background-color: #000000d9;
-    width: 200%;
+      // width : 77px;
-    left: -50%;
+      width: 200%;
-    border-radius: 3px;
+      left: -50%;
-    word-break: keep-all;
+      border-radius: 4px;
-    white-space: pre-wrap;
+      padding: 6px 0px;
-  }
+      word-break: keep-all;
-  .tui-grid-rside-area {
+      white-space: pre-wrap;
-    display: none;
+      // Light mode
-    overflow: visible;
+      &.light-mode {
-    overflow-x: visible;
+        background-color: #000000d9;
-    overflow-y: visible;
+      }
-  }
+      // Dark mode
-  .tui-grid-header-area {
+      &.dark-mode {
-    border-style: solid;
+        background-color: #424242;
-    border-width: 0 0 1px;
+      }
-    position: relative;
+
-    overflow: visible;
+      &::after {
-    overflow-x: visible;
+        content: "";
-    overflow-y: visible;
+        position: absolute;
+        top: 100%;
+        left: 50%;
+        margin-left: -6px;
+        border-width: 6px;
+        border-style: solid;
+      }
+
+      &.light-mode::after {
+        border-color: #000000d9 transparent transparent transparent;
+      }
+
+      &.dark-mode::after {
+        border-color: #424242 transparent transparent transparent;
+      }
+    }
+
+    .tui-grid-rside-area {
+      display: none;
+      overflow: visible;
+      overflow-x: visible;
+      overflow-y: visible;
+    }
+    .tui-grid-header-area {
+      border-style: solid;
+      border-width: 0 0 1px;
+      position: relative;
+      overflow: visible;
+      overflow-x: visible;
+      overflow-y: visible;
+    }
   }
 }
 </style>