fixbug grid

Reviewed-on: #46

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

@@ -56,6 +56,12 @@
     font-weight: 400;
   }
 
+  
+  th[data-column-name="_checked"] {
+    padding-left: 0;
+  }
+
+
 }
 
 .tui-grid-table{
@@ -63,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 {

assets/scss/common/input.scss

@@ -230,6 +230,10 @@
   }
 }
 
+input[type="checkbox"] {
+  width: 16px;
+  height: 16px
+}
 
 @each $theme in dark, light {
   @include theme($theme);
@@ -237,11 +241,19 @@
   .v-application.#{$theme}-mode {
 
     .ant-checkbox-wrapper {
+      .ant-checkbox {
+        .ant-checkbox-inner {
+          background-color: map-deep-get($config, #{$theme}, "ant-checkbox-bg"); // background for unchecked checkbox
+          border-color: map-deep-get($config, #{$theme}, "ant-checkbox-border");
+        }
+      }
+
       .ant-checkbox-checked {
         .ant-checkbox-inner {
-          background: map-deep-get($config, #{$theme}, "ant-btn-primary-bg");
+          background: map-deep-get($config, #{$theme}, "ant-btn-primary-bg"); // background for checked checkbox
           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 +415,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

@@ -19,6 +19,13 @@
       border-color: currentColor;
       // border-color: map-deep-get($config, #{$theme}, "tui-datepicker-border-color");
 
+      &:hover {
+				border-color: map-deep-get($config, #{$theme}, "v-input-fieldset-hover-color" ) !important;
+			}
+			&:has(.v-input--is-focused){
+				border-width: 2px;
+			}
+
       &.datepicker-large {
         height: 40px;
       }

assets/scss/var.scss

@@ -110,11 +110,11 @@ $config: (
     tui-grid-border-horziontal-color: #212224,
     tui-grid-border-vertical-color: #FFFFFF0F,
     tui-grid-cell-backgroundColor: #212224,
-    tui-grid-cell-color: #FFFFFFA6,
+    tui-grid-cell-color: #FFFFFFD9,
-    tui-grid-cell-insert-color: #13636c,
+    tui-grid-cell-insert-color: #2B2111,
     tui-grid-cell-selected-color: #0A224F,
     tui-grid-cell-modify-color: #13636c,
-    tui-grid-cell-removed-color: #f6637b,
+    tui-grid-cell-removed-color: #2A1215,
     tui-grid-cell-disabled-color: rgb(170, 170, 170),
     tui-grid-cell-hover-backgroundColor: #2d4571,
     v-tabs-items-border-color: #FFFFFF0F,
@@ -175,7 +175,10 @@ $config: (
     btn-header-select-color:#FFFFFFD9,
     subtitle-tab: #FFFFFFA6,
     v-header-border: #424242,
+    v-chart-border: #424242,
     v-sidebar-border: #303030,
+    ant-checkbox-bg: #212224,
+    ant-checkbox-border: #424242,
   ),
   light: (w-g5: $--color-gray_555,
     g5-w: $--color-white,
@@ -314,6 +317,9 @@ $config: (
     btn-header-select-bg:#FFFFFF,
     subtitle-tab: #000000A6,
     v-header-border: #D9D9D9,
+    v-chart-border: #D9D9D9,
     v-sidebar-border: #F0F0F0,
+    ant-checkbox-bg: #FFFFFF,
+    ant-checkbox-border: #D9D9D9,
   ),
 );

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/Datepicker.vue

@@ -426,7 +426,7 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-@import "@/assets/scss/datepicker.scss";
+// @import "@/assets/scss/datepicker.scss";
 
 ::v-deep {
 	.tui-timepicker-row {

components/common/Grid.vue

@@ -9,7 +9,6 @@
 		@dblclick="dblClick"
 		@mouseover="mouseoverEvent"
 		@mouseout="mouseoutEvent"
-		@mousedown="onMousedown"
 		@focusChange="focusChangeEvt"
 	/>
 </template>
@@ -268,15 +267,7 @@ export default {
 				}
 			});
 		},
-		onMousedown(evt) {
-			this.handleSelectedRow(evt);
-		},
 		focusChangeEvt(e) {
-			if(e.rowKey === 0) {
-				this.handleSelectedRow(e);	
-			}
-		},
-		handleSelectedRow(e) {
 			// console.log('focusChangeEvt1...')
 			if (this.preventFocusChangeEvent(e)) {
 				// console.log('prevent focusChangeEvt')
@@ -299,7 +290,6 @@ export default {
 		startEditing(e) {
 			// console.log('startEditing1...')
 			if (this.preventFocusChangeEvent(e)) {
-				// console.log('prevent startEditing')
 				return;
 			}
 
@@ -311,7 +301,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',

components/common/button/ActionButtons.vue

@@ -2,9 +2,9 @@
 	<div class="d-flex justify-center align-center" 
 		:class="directionBtn === 'vertically'?'flex-row':'flex-column'" 
 		style="gap: 12px">
-		<a-button @click="btnActionsFnc('removeRightToLeft')" type="primary" ghost :icon="icons.remove" >
+		<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/form/CheckBox.vue

@@ -12,15 +12,26 @@
 			</label>
 		</v-col>
 		<v-col :cols="item.label ? 7 : ''" >
-			<v-checkbox
+			<!-- <v-checkbox
 				v-model="chkValue"
 				:disabled="disabledFlag"
 				:readonly="item.readonly || false"
 				:required="item.required || false"
 				:false-value="false"
-				:color="isDarkMode ? '#fff' : '#1890ff'"
+				:color="isDarkMode ? '#1668DC' : '#1890ff'"
-				@change="modifyValue"
+				@change="modifyValue"			
-			></v-checkbox>
+  				class="small-checkbox"
+			></v-checkbox> -->
+			<a-checkbox
+        		v-model="chkValue"
+				:disabled="disabledFlag"
+				:readonly="item.readonly || false"
+				:required="item.required || false"
+				:false-value="false"
+				:color="isDarkMode ? '#1668DC' : '#1890ff'"
+				@change="modifyValue"	
+			>
+			</a-checkbox>
 		</v-col>
 	</v-row>
 </template>
@@ -141,7 +152,7 @@ export default {
 		modifyValue(e) {
 			const dt = {
 				columnName: this.item.valueNm,
-				value: e,
+				value: e.target.checked,
 			};
 			this.$emit('gridEditingFinish', dt);
 		},

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,47 +8,38 @@
 			</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"
-				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>
+						<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>
 							<!-- 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 >
 							<v-row>
@@ -59,9 +50,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 +60,11 @@
 
 							</v-row>
 						</v-col>
-						<a-button icon="search" type="primary" @click="search()" class="mb-1 mr-2">조회</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 +85,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 +264,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 +431,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 +523,11 @@ export default {
 
 
 			this.loadGrid = true;
-			this.$nextTick(() => {
+			// this.$nextTick(() => {
-				if (this.isMulti) {
+			// 	if (this.isMulti) {
-					this.getChecked();
+			// 		this.getChecked();
-				}
+			// 	}
-			});
+			// });
 
 		},
 		setUpdate() {
@@ -588,3 +579,16 @@ var eqpmSelectPop = {
 }
 
 </script>
+<style lang="scss" scoped>
+::v-deep {
+	.last-col {
+		flex-basis: content;
+	}
+
+	.v-dialog {
+		overflow-y: hidden;
+	}
+
+}
+
+</style>

components/pages/ems/DataSetInfo/DataSetTagRelTab.vue

@@ -1,7 +1,10 @@
 <template>
   <div>
-    <div class="d-flex justify-space-between align-center" style="min-height: 80px;">
+    <div class="d-flex justify-space-between align-center pb-5" >
-      <span class="txt custom-subtitle-tab">Data Set TAG 연결 정보</span>
+      <!-- <span class="txt custom-title-4">Data Set TAG 연결 정보</span> -->
+      <v-card-title class="pa-0">
+        Data Set TAG 연결 정보
+      </v-card-title>
       <Buttons :parentPrgmId="parentPrgmId" :bindingData="gridName" :detailList="detailDataSetTagList"
         :btnActionsFnc="btnActions" />
     </div>
@@ -14,22 +17,20 @@
         @gridEditingFinish="gridEditingFinish" />
     </div>
 
-    <div ref="formParent" style="min-height: 100px;" class="w100 h100">
+    <div ref="formParent" class="h100">
-      <v-row ref="contents" class="w100">
+      <v-row align="end" ref="contents" class="">
-        <v-col :cols="6">
+        <v-col>
           <component :is="'Datepicker'" :parentPrgmId="parentPrgmId" :label="'검색기간'" :labelCols="12" :textCols="12" />
         </v-col>
-        <v-col :cols="4">
+        <v-col >
           <component :is="'selectCodeList'" :parentPrgmId="parentPrgmId" :label="'주기'" dataKey="mdlDataTerm"
             :sendParam="{ commGrpCd: 'MDL_DATA_TERM', useFg: '1' }" :addAll="false" :labelCols="12" :textCols="12" :iconShow="true" />
         </v-col>
-        <v-col class="text-right align-self-end">
+      </v-row>
-          <a-button @click="jamoviProcClickEvent('view1')" type="primary" :ripple="false" class="mr-1">데이터 분석</a-button>
+      <v-row align="center" no-gutters class="searchFilter mt-2">
+        <v-col class="d-flex justify-end">
+          <a-button @click="jamoviProcClickEvent('view1')" type="primary" :ripple="false" class="mb-1">데이터 분석</a-button>
         </v-col>
-        <!-- <v-card class="searchFilter w100">
-          <v-row align="center" no-gutters>
-          </v-row>
-        </v-card> -->
       </v-row>
     </div>
   </div>
@@ -156,7 +157,7 @@ export default {
         {
           header: '모델 Data 구분',
           name: 'mdlDataTypeCd',
-          align: 'center',
+          align: 'left',
           width: 120,
           formatter({ value }) {
             var retVal = '';
@@ -173,7 +174,7 @@ export default {
         {
           header: '사용여부',
           name: 'useFg',
-          align: 'center',
+          align: 'left',
           width: 100,
           formatter({ value }) {
             value = value === true ? '1' : '0';
@@ -189,7 +190,7 @@ export default {
           //   }
           // }
         },
-        { header: '비고', name: 'rmrk', align: 'center' },
+        { header: '비고', name: 'rmrk', align: 'left' },
       ];
 
       this.setGridColumn({

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

@@ -1,7 +1,9 @@
 <template>
 	<div>
-		<div class="d-flex justify-space-between align-center my-5" >
+		<div class="d-flex justify-space-between align-center mb-5" >
-			<span class="txt custom-subtitle-tab">설비 추가 정보</span>
+			<v-card-title class="txt custom-title-4 pa-0">
+				설비 추가 정보
+			</v-card-title>
 			<Buttons
 				:parentPrgmId="parentPrgmId"
 				:bindingData="gridName"
@@ -120,10 +122,10 @@ export default {
 				bodyHeight: gridHeight,
 				minBodyHeight: gridHeight,
 				header: {
-					height: 28,
+					height: 38,
 				},
-				rowHeight: 29,
+				// rowHeight: 39,
-				minRowHeight: 29,
+				// minRowHeight: 29,
 				selectionUnit: 'row',
 				editingEvent: 'click',
 			};
@@ -263,11 +265,12 @@ export default {
 						}
 						return retVal;
 					},
+					minWidth: 230,
 				},
 				{
 					header: 'Data 구분',
 					name: 'addInfoDataKind',
-					align: 'center',
+					align: 'left',
 					formatter({ value }) {
 						let retVal = '';
 						const newValue = addInfoDataKindList.filter(
@@ -278,6 +281,7 @@ export default {
 						}
 						return retVal;
 					},
+					minWidth: 330,
 				},
 				{
 					header: '숫자 값',
@@ -308,6 +312,7 @@ export default {
 						// console.log('test :', test);
 						return data.row.addInfoDataKind;
 					},
+					minWidth: 330,
 				},
 				//{ header: "추가 정보 값", name: "addInfoVal", align: "center" , editor: "text",
 				//},
@@ -414,3 +419,4 @@ const dataPathDataExample = getPathDataExample({
 	type: '사용', note: '-'
 });
 </script>
+<style lang="scss" scoped> </style>

components/pages/ems/EqpmInfo/EqpmConstTab.vue

@@ -1,7 +1,10 @@
 <template>
 	<div>
-		<div class="d-flex justify-space-between align-center my-5" >
+		<div class="d-flex justify-space-between align-center mb-5" >
-			<span class="txt custom-subtitle-tab">설비 상수 정보</span>
+			<!-- <span class="txt custom-subtitle-tab">설비 상수 정보</span> -->
+			<v-card-title class="txt custom-title-4 pa-0">
+				설비 상수 정보
+			</v-card-title>
 			<Buttons :parentPrgmId="parentPrgmId" :bindingData="gridName" :btnActionsFnc="btnActions" />
 		</div>
 		<div ref="gridParent" style="min-height: calc(100vh - 800px);">
@@ -160,11 +163,11 @@ export default {
 				{ header: '회사 ID', name: 'comId', hidden: true },
 				{ header: '설비 번호', name: 'eqpmId', hidden: true },
 				// { header: '대상항목', name: 'objId', align: 'center', hidden: true},
-				{ header: '물리량 ID', name: 'pysclQtyId', align: 'left' },
+				{ header: '물리량 ID', name: 'pysclQtyId', align: 'left', minWidth: 230, },
-				{ header: '물리량 명', name: 'pysclQtyNm', align: 'left' },
+				{ header: '물리량 명', name: 'pysclQtyNm', align: 'left', minWidth: 230, },
-				{ header: '물리량값', name: 'pysclQtyVal', align: 'left' },
+				{ header: '물리량값', name: 'pysclQtyVal', align: 'left', minWidth: 230, },
 				// { header: '대상항목', name: 'objNm', align: 'left'},
-				{ header: '대상항목', name: 'objId', align: 'left' },
+				{ header: '대상항목', name: 'objId', align: 'left', minWidth: 230, },
 				{
 					header: '에너지원 명',
 					name: 'ercId',
@@ -386,7 +389,7 @@ const myEqpmConstDetail = [
 		required: true,
 		openMode: 'CONST',
 		cols: 6,
-		class: 'py-3 pl-4',
+		class: 'pt-3 pb-1 pl-4',
 		eqpmGrpDisableFlag: true,
 		// eqpmGrpId:'',
 		labelCols: 12,
@@ -406,7 +409,7 @@ const myEqpmConstDetail = [
 		disabled: true,
 		readonly: true,
 		cols: 6,
-		class: 'py-3 pt-1 pl-4',
+		class: 'pb-3 pt-0 pl-4',
 		align: 'right',
 		// class: 'py-2 d-none',
 		labelCols: 12,
@@ -441,3 +444,11 @@ const dataPathDataExample = getPathDataExample({
 	field2: '2222',
 });
 </script>
+
+<style lang="scss" scoped>
+	::v-deep {
+		.tui-grid-layer-state {
+			top: 40px !important;
+		}
+	}
+</style>

components/pages/ems/EqpmInfo/EqpmIaoTab.vue

@@ -1,7 +1,10 @@
 <template>
 	<div>
-		<div class="d-flex justify-space-between align-center my-5" >
+		<div class="d-flex justify-space-between align-center mb-5" >
-			<span class="txt custom-subtitle-tab">설비 입출력 정보</span>
+			<!-- <span class="txt custom-subtitle-tab">설비 입출력 정보</span> -->
+			<v-card-title class="txt custom-title-4 pa-0">
+				설비 입출력 정보
+			</v-card-title>
 			<Buttons
 				:parentPrgmId="parentPrgmId"
 				:bindingData="gridName"
@@ -226,6 +229,7 @@ export default {
 
 						return retVal;
 					},
+					minWidth: 150,
 				},
 				{
 					header: '대상 유형',
@@ -242,9 +246,10 @@ export default {
 
 						return retVal;
 					},
+					minWidth: 150,
 				},
 				{ header: '물리량', name: 'pysclQtyId', align: 'left', hidden: true },
-				{ header: '물리량', name: 'pysclQtyNm', align: 'left' },
+				{ header: '물리량', name: 'pysclQtyNm', align: 'left', minWidth: 150, },
 				{
 					header: '물리량값',
 					name: 'pysclQtyVal',
@@ -269,6 +274,7 @@ export default {
 						);
 						return newValue[0].commCdNm;
 					},
+					minWidth: 100,
 				},
 				{ header: '분배율', name: 'distRt', align: 'right' },
 				{ header: '등록 사용자', name: 'regUserNo', hidden: true },

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

@@ -32,15 +32,18 @@
 					</div>
 				</v-card>
 			</v-col>
-			<v-col cols="12" lg="9">
+			<v-col cols="12" lg="9" class="pl-0">
 				<v-card>
 					<v-card-title>
 						<span class="custom-title-4">역할 메뉴별 권한</span>
 					</v-card-title>
 					<v-row align="center" no-gutters :style="{ height: 'calc(100% - 62px)' }" class="px-5">
 						<v-col class="h100" style="max-width: 400px;">
-							<span class="body-1 font-weight-bold d-flex align-center"
+							<v-card-title class="pl-0 pb-3">
-								:style="{ minHeight: '36px' }">[미배정]메뉴리스트</span>
+								<span class="custom-title-4">[미배정]메뉴리스트</span>
+							</v-card-title>
+							<!-- <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"
@@ -55,15 +58,18 @@
 							<ActionButtons :parentPrgmId="myPrgmId" :leftGridName="gridName2" :rightGridName="gridName3"
 								:btnActionsFnc="dualGridBtnActions" />
 						</v-col> -->
-						<div class="pr-2">
+						<div class="pr-2 arrow-button">
 							<ActionButtons :parentPrgmId="myPrgmId" :leftGridName="gridName2" :rightGridName="gridName3"
-								:btnActionsFnc="dualGridBtnActions" />
+								:btnActionsFnc="dualGridBtnActions"/>
 						</div>
 						<v-col :cols="7" class="h100">
-							<v-row justify="space-between" align="center" no-gutters class="px-5">
+							<v-row justify="space-between" align="center" no-gutters class="px-5 pl-0">
 								<v-col :cols="11">
-									<span class="body-1 font-weight-bold d-flex align-center"
+									<v-card-title class="pl-0 pb-3">
-										:style="{ minHeight: '36px' }">[배정]메뉴별권한 리스트</span>
+										<span class="custom-title-4">[배정]메뉴별권한 리스트</span>
+									</v-card-title>
+									<!-- <span class="body-1 font-weight-bold d-flex align-center"
+										:style="{ minHeight: '36px' }">[배정]메뉴별권한 리스트</span> -->
 									<!-- <span class="body-1 font-weight-bold">[배정]메뉴별권한 리스트</span> -->
 								</v-col>
 								<v-col :cols="1" class="text-right">
@@ -344,8 +350,8 @@ export default {
 			const _this = this;
 
 			const myColumns = [
-				{ header: '역할ID', name: 'roleId', align: 'left', minWidth: 70,width:120 },
+				{ header: '역할ID', name: 'roleId', align: 'left', minWidth: 70, width: 120 },
-				{ header: '역할명', name: 'roleNm', minWidth: 70, align: 'left',width:120 },
+				{ header: '역할명', name: 'roleNm', minWidth: 70, align: 'left', width: 120 },
 				{
 					header: '사용여부',
 					name: 'useFg',
@@ -805,4 +811,23 @@ function numberFormatter({ value }) {
 		return value;
 	}
 }
+
 </script>
+
+
+<style lang="scss" scoped>
+::v-deep {
+	.arrow-button button {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		width: 24px;
+		height: 24px;
+	}
+
+	.arrow-button svg {
+		width: 14px;
+		height: 14px;
+	}
+}
+</style>

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/NoticeMngPage.vue

@@ -46,19 +46,21 @@
 								icon="delete">삭제</a-button>
 						</div>
 					</v-col>
-					<v-col :cols="12" class="mt-5">
+					<v-col :cols="12" class="mt-5 pb-4">
 						<v-card-title class="custom-title-6 pa-0">{{ viewActionData.title }}</v-card-title>
 					</v-col>
-					<v-col :cols="12" style="min-height: 30vh;" class="pa-0">
+					<v-col :cols="12" style="min-height: 30vh;" class="pa-0 custom-view">
-						<viewer v-if="viewActionData.viewerFlag" ref="tuiViewer" height="inherit"
+						<v-card class="pa-3" style="overflow-y:auto;">
-							:initialValue="viewActionData.content" theme="white"
+							<viewer v-if="viewActionData.viewerFlag" ref="tuiViewer" height="inherit"
-							:class="[isDarkMode ? 'theme--white' : 'theme--black', 'custom-view pa-3']" />
+								:initialValue="viewActionData.content" theme="white"
+								:class="[isDarkMode ? 'theme--white' : 'theme--black']" />
+						</v-card>
 					</v-col>
 					<v-col :cols="6" class="mt-5">
 						<v-card-title class="custom-title-7 pa-0">
 							파일목록
 						</v-card-title>
-						<div v-for="fileData in viewActionData.fileData" :key="fileData.apndFileId" class="file-item">
+						<div v-for="fileData in viewActionData.fileData" :key="fileData.apndFileId" class="file-item" style="background-color: unset;">
 							<a @click.prevent="downloadFile(fileData)">
 								<div class="d-flex justify-start search-box-label">
 									<v-icon>mdi-paperclip</v-icon>
@@ -187,13 +189,26 @@
 								<div v-for="(fileData, index) in updateActionData.fileData" :key="fileData.apndFileId"
 									class="file-item d-flex justify-space-between">
 									<div class="file-item-detail">
-										<v-icon>mdi-paperclip</v-icon>
+										<v-icon style="font-size: 18px;">mdi-paperclip</v-icon>
 										<span href="#" class="file-item-name">{{ fileData.name }}</span>
 									</div>
 									<a-icon type="delete" class="v-icon pointer"
 										@click="updateActionData.fileData.splice(index, 1)" />
 								</div>
 							</div>
+							<div class="" v-if="updateActionData.currentFileList">
+								<div v-for="(fileData, index) in updateActionData.currentFileList"
+									:key="fileData.apndFileId" class="file-item d-flex justify-space-between">
+									<div class="file-item-detail">
+										<v-icon style="font-size: 18px;">mdi-paperclip</v-icon>
+										<span @click.prevent="downloadFile(fileData)" href="#"
+											class="file-item-name pointer">{{ fileData.apndFileNm + '.' +
+												fileData.apndFileExt }}</span>
+									</div>
+									<a-icon type="delete" class="v-icon pointer"
+										@click="addFileToDeleteFileList(fileData)" />
+								</div>
+							</div>
 							<a-button class="mt-2" icon="upload" @click="$refs.updateInputFile.$refs.input.click()">
 								업로드
 							</a-button>
@@ -1044,7 +1059,7 @@ const defaultData = {
 	.custom-view {
 		border: 1px solid;
 		border-radius: 6px;
-		height: 100%;
+		height: 0;
 
 		@each $theme in dark, light {
 			@include theme($theme);
@@ -1065,5 +1080,10 @@ const defaultData = {
 	.toastui-editor-mode-switch .tab-item {
 		color: #000000E0
 	}
+
+	.v-icon.anticon-delete svg {
+		width: 14px;
+		height: 14px;
+	}
 }
 </style>

pages/comm/base/PrgmMngPage.vue

@@ -103,21 +103,6 @@ export default {
 			gridName: 'rowGrid',
 			// rowGridOrigin: [],
 			detailList: myDetail,
-
-			dataPathMock: {
-				'rowGrid': {
-					column: [
-						{ header: '프로그램ID', name: 'field1', align: 'left' },
-						{ header: '프로그램덤', name: 'field2', align: 'left' },
-						{ header: '타임', name: 'field3', align: 'left' },
-						{ header: '사용여부', name: 'field4', align: 'left' }
-					],
-					option: {
-						scrollY: false,
-						scrollX: false,
-					}
-				}
-			},
 		};
 	},
 	computed: {
@@ -189,17 +174,17 @@ export default {
 			const gridHeight = this.$refs.gridParent.offsetHeight - 36;
 
 			const myOptions = {
-				scrollX: false,
+				scrollY: true,
 			};
 			// console.log("this.pageData", this.pageData)
 			const _this = this;
 			const myColumns = [
-				{ header: '프로그램ID', name: 'prgmId', align: 'center' },
+				{ header: '프로그램ID', name: 'prgmId', align: 'left' },
-				{ header: '프로그램명', name: 'prgmNm' },
+				{ header: '프로그램명', name: 'prgmNm', align: 'left' },
 				{
 					header: '타입',
 					name: 'prgmTpCd',
-					align: 'center',
+					align: 'left',
 					formatter({ value }) {
 						return value ? (value === '1' ? '프로그램' : '팝업') : null;
 					},
@@ -207,7 +192,7 @@ export default {
 				{
 					header: '사용여부',
 					name: 'useFg',
-					align: 'center',
+					align: 'left',
 					formatter({ value }) {
 						value = value === true ? '1' : '0';
 						const newValue = _this.pageData.selectUseFgList.filter(

pages/ems/base/DashboardPage.vue

@@ -840,7 +840,7 @@ export default {
         { header: "주의", name: "careStndVal", align: "right", width: 40 },
         { header: "경고", name: "warnStndVal", align: "right", width: 40 },
         { header: "가이드", name: "totVal", align: "right", width: 40 },
-        { header: "알람 내용", name: "alrmMsg", align: "left" },
+        { header: "알람 내용", name: "alrmMsg", align: "left", resizable: false },
         { header: "설비종류", name: "eqpmKindId", align: "left", hidden: true },
         { header: "설비종류", name: "eqpmKindNm", align: "left", 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/EquipmentMasterMngPage.vue

@@ -365,7 +365,7 @@ export default {
 					header: '사업장',
 					name: 'blocId',
 					width: 100,
-					align: 'center',
+					align: 'left',
 					hidden: true,
 					formatter({ value }) {
 						let retVal = '';

pages/ems/effc/DataSetMngPage.vue

@@ -53,7 +53,8 @@
         </v-col>
         <v-col :cols="7" >
           <v-card class="pb-5">
-            <v-card-title class="custom-title-4" style="min-height:76px;">Data Set 상세
+            <v-card-title class="custom-title-4 pb-0 mb-2" >
+              Data Set 상세
             </v-card-title>
             <div class="px-5" style="min-height:calc(100% - 76px)">
               <v-tabs v-model="tab">
@@ -284,13 +285,13 @@ export default {
           header: '모델링 DataSet ID',
           name: 'dataSetId',
           align: 'left',
-          width: 180,
+          minWidth: 200,
         },
         {
           header: 'DataSet 명',
           name: 'dataSetNm',
           align: 'left',
-          width: 200,
+          minWidth: 200,
         },
         {
           header: '사업장',
@@ -311,8 +312,8 @@ export default {
         {
           header: '사용 여부',
           name: 'useFg',
-          width: 100,
+          minWidth: 200,
-          align: 'center',
+          align: 'left',
           formatter({ value }) {
             value = value === true ? '1' : '0';
             const newValue = _this.pageData.useFgList.filter(
@@ -321,7 +322,7 @@ export default {
             return newValue[0].commCdNm;
           },
         },
-        { header: '비고', name: 'rmrk', align: 'left' },
+        { header: '비고', name: 'rmrk', align: 'left', minWidth: 100, },
       ];
 
       this.setGridColumn({

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/EnrgReptMngPage.vue

@@ -62,20 +62,20 @@
 								<v-card-title class="pa-0">설비별 효율지표 Trend</v-card-title>
 							</v-col>
 							<v-col :cols="4" class="d-flex justify-space-end" >
-									<component
+								<component
-										class="text-right mr-2"
+									class="text-right mr-2"
-										ref="EqpmSelectPop"
+									ref="EqpmSelectPop"
-										label=""
+									label=""
-										placeholder="설비..."
+									placeholder="설비..."
-										is="EqpmSelectPop"
+									is="EqpmSelectPop"
-										valueNm="eqpmId"
+									valueNm="eqpmId"
-										:textCols="12"
+									:textCols="12"
-										:parentPrgmId="myPrgmId"
+									:parentPrgmId="myPrgmId"
-										:eqpmGrpDisabled="true"
+									:eqpmGrpDisabled="true"
-										:fabDisabled="true"
+									:fabDisabled="true"
-										:iconShow="false"
+									:iconShow="false"
-										:isMulti="true"
+									:isMulti="true"
-									/>
+								/>
 								<a-button @click="getEqpmData()" type="primary" >조회</a-button>
 							</v-col>
 						</v-row>

pages/ems/effc/EnrgUsePlanPage.vue

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

plugins/utility.js

@@ -289,8 +289,8 @@ const Utility = () => {
 			header: {
 				height: 28,
 			},
-			rowHeight: 29,
+			rowHeight: 37,
-			minRowHeight: 29,
+			minRowHeight: 37,
 			columnOptions: {
 				resizable: true,
 				minWidth: 100,