Merge pull request 'add rowSeq for screen 7' (#102) from dev-manhph1-figbug into dev

Reviewed-on: #102

components/common/modal/EqpmBaseInfoPop.vue

@@ -23,7 +23,7 @@
 					<span class="custom-title-4">{{ option.modalTitle }}</span>
 					<a-button icon="close" type="text" @click="dialogOpenCloseEvent(dialog)"></a-button>
 				</v-card-title>
-				<div class="pa-6 pt-0">
+				<div class="pa-6 pt-0 pb-3">
 					<v-row align="center">
 						<v-col :cols="5">
 							<component :is="'SelectBox'" ref="SelectBox1" :labelCols="12" :textCols="12"
@@ -43,7 +43,7 @@
 										물리량명
 									</label>
 								</v-col>
-								<v-col :cols="9"> <v-text-field append-icon="" class="v-input__custom" outlined
+								<v-col :cols="10" class="pr-2"> <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 -->
@@ -51,8 +51,7 @@
 
 
 										</template></v-text-field></v-col>
-								<v-spacer></v-spacer>
+								<v-col cols="2" class="text-right">
-								<v-col cols="3" class="text-right">
 									<a-button icon="search" type="primary" @click="search()"
 										class="search-button">조회</a-button>
 
@@ -63,9 +62,9 @@
 
 				</div>
 				<!-- <div :style="'height: calc(50vh)'"> -->
-				<div :style="'height: 429px;'">
+				<div :style="{ height: 'calc(100% - 60px)' }">
 					<!-- <div :style="{ height: 'calc(100% - 213px)' }"> -->
-					<div ref="modalGridParent" class="h100 px-6 py-4">
+					<div ref="modalGridParent" class="px-6 py-4">
 						<component :is="loadGrid && dialog ? 'Grid' : null" :gridName="gridName"
 							:dataPath="searchParam.modalDataEqpmBaseInfoPop.eqpmBaseInfoPop"
 							:parentPrgmId="parentPrgmId" @getRowsData="getRowData" @dblClick="setUpdate($event)" />

components/pages/ems/ReadObjInfo/ReadObjAddInfoTab.vue

@@ -102,7 +102,7 @@ export default {
 			this.gridInit();
 		},
 		gridInit() {
-			const gridHeight = this.$refs.gridParent.offsetHeight;
+			const gridHeight = this.$refs.gridParent.offsetHeight - 37;
 
 			const myOptions = {
 				columnOptions: {
@@ -113,8 +113,8 @@ export default {
 				header: {
 					height: 28,
 				},
-				rowHeight: 38,
+				rowHeight: 37,
-				minRowHeight: 38,
+				minRowHeight: 37,
 				selectionUnit: 'row',
 				editingEvent: 'click',
 			};
@@ -441,14 +441,8 @@ export default {
 </script>
 <style lang="scss" scoped >
 ::v-deep {
-	.tui-grid-layer-state {
-		top: 40px !important;
-	}
-	
 	.tui-grid-cell-content-editor {
-		position: relative;
+		height: 37px !important;
-		height: 39px !important;
-		top: 39px !important;
 	}
 
 }

pages/ems/effc/EnrgEffcEqpmDetlMntrPage.vue

@@ -561,12 +561,6 @@ export default {
 				columnOptions: {
 					resizable: true,
 				},
-				rowHeaders: [
-					{
-						type: 'rowNum',
-						align: 'right',
-					},
-				],
 				header: {
 					height: 37,
 				},
@@ -623,6 +617,7 @@ export default {
 				}
 			}
 			const myColumns = [
+				{ header: 'No.', name: 'rowSeq', align: 'right', width: 90 },
 				{
 					header: 'FAB',
 					name: 'fabNm',