Merge pull request 'fix bug screen 10' (#42) from dev-dungtv-0807 into dev

Reviewed-on: #42

assets/scss/common.scss

@@ -860,7 +860,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/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,50 +151,28 @@
 
       &-body-container{
         border-right: 0;
-        // border-right-color: map-deep-get($config,
-        //   #{$theme},
-        //   "tui-grid-cell-borderColor"
-        // );
+        // position: relative;
         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: 0 !important;
-          height: $scrollbar-width !important;
-          -webkit-appearance: initial;
-          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},
@@ -203,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");
       }
@@ -241,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;
       }
 
@@ -358,10 +363,10 @@
           #{$theme},
           "tui-grid-cell-backgroundColor"
         );
-        width: 100% !important;
-        .tui-grid-table {
-          width: 100% !important;
-        }
+        // width: 100% !important;
+        // .tui-grid-table {
+        //   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;
-      border-color: map-deep-get($config, #{$theme}, "tui-datepicker-border-color");
+      color: map-deep-get($config, #{$theme}, "v-input-fieldset-color") !important;
+      border-color: currentColor;
+      // border-color: map-deep-get($config, #{$theme}, "tui-datepicker-border-color");
 
       &.datepicker-large {
         height: 40px;

assets/scss/var.scss

@@ -110,7 +110,7 @@ $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-selected-color: #0A224F,
     tui-grid-cell-modify-color: #13636c,

components/common/modal/EnrgEffcEqpmDetailPop.vue

@@ -119,8 +119,7 @@
 						/>
 					</div> -->
 
-				<v-card-actions>
-					<v-spacer></v-spacer>
+				<v-card-actions class="px-6 py-4 d-flex align-center justify-end">
 					<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/EqpmSelectPop.vue

@@ -8,49 +8,37 @@
 			</label>
 		</v-col>
 		<v-col :cols="textCols">
-			<v-text-field
-				readonly
-				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>
+			<v-text-field readonly v-model="selectValue" append-icon="" :class="['v-input__custom', customClass]"
+				@click="dialogOpenCloseEvent(dialog)" outlined :hide-details="true" :required="required || false"
+				:disabled="disabled || false"><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-card style="height: 90vh;">
+		<v-dialog ref="popModal" v-model="dialog" width="800" content-class="custom-dialog" scrollable>
+			<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"
-								@update:propsValue="selectValue01 = $event" :labelCols="12" :textCols="12"
-								:iconShow="true" />
+								:label="'설비그룹'" :disabled="eqpmGrpDisabled" @update:propsValue="selectValue01 = $event"
+								:labelCols="12" :textCols="12" :iconShow="true" />
 						</v-col>
-						<v-col :cols="3.5">
+						<v-col>
 							<!-- FAB -->
-							<component :is="'SelectBoxMulti'" :propsValue="selectValue02"
-								:itemList="selectValueList02" :label="'FAB'" :labelCols="12" :multiple="true"
-								:disabled="fabDisabled" @update:propsValue="selectValue02 = $event" :textCols="12"
-								:iconShow="true" />
+							<component :is="'SelectBoxMulti'" :propsValue="selectValue02" :itemList="selectValueList02"
+								:label="'FAB'" :labelCols="12" :multiple="true" :disabled="fabDisabled"
+								@update:propsValue="selectValue02 = $event" :textCols="12" :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
-										:hide-details="true" v-model="searchWord" @keyup.enter="search"><template
-											v-slot:append>
+									<v-text-field append-icon="" class="v-input__custom" outlined :hide-details="true"
+										v-model="searchWord" @keyup.enter="search"><template 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 ref="modalGridParent" style="height: 450px;" class="h100 w100">
+				<div class="pa-5" style="height:calc(100% - 30px)">
+					<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',
-					align: 'center',
+					name: 'eqpmId'
 					// hidden:true
 				},
 				{
 					header: '설비명',
-					name: 'eqpmNm',
-					align: 'center'
+					name: 'eqpmNm'
 				},
 				{
 					header: 'eccId',
@@ -532,11 +520,11 @@ export default {
 
 
 			this.loadGrid = true;
-			this.$nextTick(() => {
-				if (this.isMulti) {
-					this.getChecked();
-				}
-			});
+			// this.$nextTick(() => {
+			// 	if (this.isMulti) {
+			// 		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/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"
@@ -120,10 +120,10 @@ export default {
 				bodyHeight: gridHeight,
 				minBodyHeight: gridHeight,
 				header: {
-					height: 28,
+					height: 38,
 				},
-				rowHeight: 29,
-				minRowHeight: 29,
+				// rowHeight: 39,
+				// minRowHeight: 29,
 				selectionUnit: 'row',
 				editingEvent: 'click',
 			};
@@ -263,6 +263,7 @@ export default {
 						}
 						return retVal;
 					},
+					minWidth: 230,
 				},
 				{
 					header: 'Data 구분',
@@ -278,6 +279,7 @@ export default {
 						}
 						return retVal;
 					},
+					minWidth: 330,
 				},
 				{
 					header: '숫자 값',
@@ -296,7 +298,7 @@ export default {
 				{
 					header: '추가 정보 값',
 					name: 'addInfoVal',
-					align: 'center',
+					align: 'left',
 					renderer: {
 						type: CustomRenderer,
 					},
@@ -308,6 +310,7 @@ export default {
 						// console.log('test :', test);
 						return data.row.addInfoDataKind;
 					},
+					minWidth: 330,
 				},
 				//{ header: "추가 정보 값", name: "addInfoVal", align: "center" , editor: "text",
 				//},
@@ -414,3 +417,4 @@ const dataPathDataExample = getPathDataExample({
 	type: '사용', note: '-'
 });
 </script>
+<style lang="scss" scoped> </style>

components/pages/ems/EqpmInfo/EqpmConstTab.vue

@@ -160,11 +160,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: '물리량 명', name: 'pysclQtyNm', align: 'left' },
-				{ header: '물리량값', name: 'pysclQtyVal', align: 'left' },
+				{ header: '물리량 ID', name: 'pysclQtyId', align: 'left', minWidth: 230, },
+				{ header: '물리량 명', name: 'pysclQtyNm', align: 'left', minWidth: 230, },
+				{ 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',
@@ -441,3 +441,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

@@ -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/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

@@ -55,7 +55,7 @@
 							<ActionButtons :parentPrgmId="myPrgmId" :leftGridName="gridName2" :rightGridName="gridName3"
 								:btnActionsFnc="dualGridBtnActions" />
 						</v-col> -->
-						<div class="px-2">
+						<div class="pr-2">
 							<ActionButtons :parentPrgmId="myPrgmId" :leftGridName="gridName2" :rightGridName="gridName3"
 								:btnActionsFnc="dualGridBtnActions" />
 						</div>

pages/comm/base/BatchMngPage.vue

@@ -15,25 +15,15 @@
 								:customClass="'input-large'" />
 						</v-col>
 						<v-col :cols="2.5">
-							<component
-								:is="'selectCodeList'"
-								:parentPrgmId="myPrgmId"
-								:label="'배치 실행 구분'"
+							<component :is="'selectCodeList'" :parentPrgmId="myPrgmId" :label="'배치 실행 구분'"
 								:dataKey="'searchBatchExecTp'"
-								:sendParam="{ commGrpCd: 'CO_BATCH_EXEC_TP', useFg: '1' }"
-								:addAll="true"
-								:customClass="'select-large'"
-							/>
+								:sendParam="{ commGrpCd: 'CO_BATCH_EXEC_TP', useFg: '1' }" :addAll="true"
+								:customClass="'select-large'" />
 						</v-col>
 						<v-col :cols="2.5" class="pr-4">
-							<component
-								:is="'selectCodeList'"
-								:parentPrgmId="myPrgmId"
-								:label="'사용여부'"
-								:dataKey="'searchUseFg'"
-								:sendParam="{ commGrpCd: 'CO_USEFG', useFg: '1' }"
-								:customClass="'select-large'"
-							/>
+							<component :is="'selectCodeList'" :parentPrgmId="myPrgmId" :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>
-							<Buttons :parentPrgmId="myPrgmId" :bindingData="gridNameParam"
-								:btnActionsFnc="btnActionsParam" />
-						</div>
+						<a-button icon="close" type="text" @click="dialog = false"></a-button>
+
 					</v-card-title>
 					<div class="pa-5">
-						<v-row align="center" no-gutters>
-							<v-col cols="12" class="text-right"> </v-col>
+						<v-row align="end" no-gutters>
+							<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-spacer></v-spacer>
-						<v-btn color="primary" dark @click="setParamChangeData()">확인</v-btn>
-						<v-btn color="primary" dark @click="dialog = false">닫기</v-btn>
+					<v-card-actions class="px-6 py-4 d-flex align-center justify-end">
+						<a-button :ripple="false" @click="dialog = false" class="mr-2">닫기</a-button>
+						<a-button :ripple="false" type="primary" @click="setParamChangeData()">확인</a-button>
 					</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/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/DataSetMngPage.vue

@@ -284,13 +284,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,7 +311,7 @@ export default {
         {
           header: '사용 여부',
           name: 'useFg',
-          width: 100,
+          minWidth: 200,
           align: 'center',
           formatter({ value }) {
             value = value === true ? '1' : '0';
@@ -321,7 +321,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
-								:ref="gridName"
-								:is="loadGrid ? 'Grid' : null"
-								:gridName="gridName"
-								:parentPrgmId="myPrgmId"
-								:columnClickEventFlag="true"
-								@columnClick="columnClick"
-							/>
+							<component :ref="gridName" :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,
 				},
 				{