update screen 34, 20

components/common/Grid.vue

@@ -107,16 +107,13 @@ export default {
 		},
 		chkGridOptions() {
 			const options = {
-				// bodyHeight: 'fitToContent',
-				scrollX: false,
-				scrollY: false,
 				...this.gridData.option,
-				useIcon: false,
 			};
 			options.treeColumnOptions = {
 				useIcon: false,
 				...options.treeColumnOptions,
 			};
+
 			return options;
 		},
 		defaultRow() {
@@ -163,7 +160,7 @@ export default {
 	},
 	created() {},
 	async mounted() {
-		// console.log('--------------DEBUG----gridData: ', this.gridData);
+		// console.log(this.dataPath);
 		if (this.gridName) {
 			this.gridInstance = this.$refs['tuigrid' + this.gridName];
 
@@ -271,11 +268,12 @@ export default {
 			});
 		},
 		focusChangeEvt(e) {
+			console.log("------------------DEBUG-------focusChangeEvt:", e);
 			// console.log('focusChangeEvt1...')
-			if (this.preventFocusChangeEvent(e)) {
+			// if (this.preventFocusChangeEvent(e)) {
-				// console.log('prevent focusChangeEvt')
+			// 	// console.log('prevent focusChangeEvt')
-				return;
+			// 	return;
-			}
+			// }
 			// console.log('focusChangeEvt2...')
 			// cell 선택시 row 선택 method
 			if (e.rowKey >= 0) {
@@ -291,6 +289,7 @@ export default {
 			this.sendSelectedRowData(e.rowKey);
 		},
 		startEditing(e) {
+			console.log("------------DEBUG-----startEditing----", e);
 			// console.log('startEditing1...')
 			if (this.preventFocusChangeEvent(e)) {
 				// console.log('prevent startEditing')
@@ -666,8 +665,6 @@ export default {
       store.dimension.offsetLeft = offsetLeft;
     },
 		setHeight(_a,height){
-			return; // setting auto height
-			
       // console.log("setHeight");
       var dimension = _a.dimension;
       var headerHeight = dimension.headerHeight, summaryHeight = dimension.summaryHeight, tableBorderWidth = dimension.tableBorderWidth;
@@ -705,11 +702,6 @@ export default {
 </script>
 <style scoped lang="scss">
 ::v-deep .tui-grid-container {
-	
-	// .tui-grid-body-area {
-	// 	overflow: hidden !important;
-	// }
-
 	.tui-grid-content-area {
 		.tui-grid-cell-content {
 			input[type='number'] {

components/pages/ems/EqpmInfo/EqpmIaoTab.vue

@@ -4,24 +4,24 @@
 			class="d-flex justify-space-between align-center"
 			style="height: 80px;"
 		>
-			<span class="txt custom-title-4-new">설비 입출력 정보</span>
+			<span class="txt">설비 입출력 정보</span>
 			<Buttons
 				:parentPrgmId="parentPrgmId"
 				:bindingData="gridName"
 				:btnActionsFnc="btnActions"
 			/>
 		</div>
-		<div ref="gridParent" style="min-height: calc(100vh - 800px);" >
+		<div ref="gridParent" style="height: calc(100vh - 800px);">
-			<!-- :is="loadGrid ? 'Grid' : null" -->
 			<Grid
 				:ref="gridName"
+				:is="loadGrid ? 'Grid' : null"
 				:gridName="gridName"
 				:parentPrgmId="parentPrgmId"
 				@getRowsData="getRowData"
 				:innerTabGridInfo="innerTabGridInfo"
 			/>
 		</div>
-		<div style="min-height: calc(100vh - 900px);" class="mt-4">
+		<div style="min-height: calc(100vh - 900px);">
 			<component
 				:is="'Form'"
 				:parentPrgmId="parentPrgmId"
@@ -65,22 +65,6 @@ export default {
 
 			inputList_emMapDiv: [],
 			inputList_cmInOut: [],
-			dataPathMock: {
-        'rowEqpmIaoGrid' : {
-          column: [
-            { header: '대상항목', name: 'id', headerAlign: 'left' },
-            { header: '에너지원 명', name: 'lable', headerAlign: 'left' },
-            { header: '대상 유형', name: 'type', headerAlign: 'left' },
-            { header: '물리량', name: 'note', headerAlign: 'left' },
-            { header: '계산여부', name: 'field1', headerAlign: 'left' },
-            { header: '분배율', name: 'field2', headerAlign: 'left' }
-          ],
-          data: dataPathDataExample,
-          defaultRow: dataPathDataExample,
-          option: {}
-        }
-      },
-
 		};
 	},
 	computed: {
@@ -129,16 +113,16 @@ export default {
 		selectedObjId(val) {
 			console.log('selectedObjId : ', val);
 			if (val === 'TAG') {
-				this.detailList[2].class = 'py-2 d-none';
+				this.detailList[2].class = 'py-3 d-none';
-				this.detailList[3].class = 'py-2 d-none';
+				this.detailList[3].class = 'py-3 pl-4 pt-1 d-none';
-				this.detailList[4].class = 'py-2';
+				this.detailList[4].class = 'py-3';
-				this.detailList[5].class = 'py-2';
+				this.detailList[5].class = 'py-3';
 			} else {
 				// }else if(val==="READ_PLC"){
-				this.detailList[5].class = 'py-2 d-none';
+				this.detailList[5].class = 'py-3 d-none';
-				this.detailList[4].class = 'py-2 d-none';
+				this.detailList[4].class = 'py-3 d-none';
-				this.detailList[3].class = 'py-2';
+				this.detailList[3].class = 'py-3 pl-4 pt-1';
-				this.detailList[2].class = 'py-2';
+				this.detailList[2].class = 'py-3';
 			}
 		},
 		selectedCalcFg(val) {
@@ -171,7 +155,7 @@ export default {
 		},
 	},
 	mounted() {
-		// this.init();
+		this.init();
 	},
 	methods: {
 		...mapMutations({
@@ -296,9 +280,7 @@ export default {
 				value: myColumns,
 			});
 
-			this.$nextTick(() => {
+			this.loadGrid = true;
-				this.loadGrid = true;
-			});
 		},
 		async getRowData(data, gridName) {
 			if (data.rowStat === 'I') {
@@ -417,6 +399,7 @@ export default {
 	},
 };
 
+
 function checkDuplicate(data, targetKey) {
 	var duplicateFlag = false;
 	var set = new Set();
@@ -487,7 +470,7 @@ const myEqpmIaoDetail = [
 	},
 	{
 		type: 'EvtObjPop',
-		labelContent: '대상 항목 111',
+		labelContent: '대상 항목',
 		valueNm: 'objId',
 		valueNm2: 'objNm',
 		bindNm: 'objNm',
@@ -502,7 +485,7 @@ const myEqpmIaoDetail = [
 	},
 	{
 		type: 'InputText',
-		cols: 5,
+		cols: 6,
 		class: 'py-3 d-none',
 		valueNm: 'objNm',
 		readonly: true,
@@ -615,13 +598,4 @@ const myEqpmIaoDetail = [
 		iconShow: true
 	},
 ];
-
-import { getPathDataExample } from '@/const/const'
-const dataPathDataExample = getPathDataExample({
-	id: 'INCHEON.HVAC.EQP_HT_CH001.UT_CH101.CHI_AMP_1A_PV',
-	lable: 'INCHEON 고온 냉동기 101호기 - 호로1',
-	type: '사용', note: '-',
-	field1: '1111',
-	field2: '2222',
-});
 </script>

pages/comm/base/PrgmMngPage.vue

@@ -50,17 +50,16 @@
 							/>
 						</div>
 					</div>
-					<div style="min-height: 60vh">
+					<div ref="gridParent" style="height: 100vh">
-						<div ref="gridParent" class="px-5 h100">
+						<!-- <div ref="gridParent" class="px-5 h100">
-							<component
+						</div> -->
-								:ref="gridName"
+						<component
-								:is="loadGrid ? 'Grid' : null"
+							:ref="gridName"
-								:parentPrgmId="myPrgmId"
+							:is="loadGrid ? 'Grid' : null"
-								:gridName="gridName"
+							:parentPrgmId="myPrgmId"
-								@getRowsData="getRowData"
+							:gridName="gridName"
-								:dataPath="dataPathMock"
+							@getRowsData="getRowData"
-							/>
+						/>
-						</div>
 					</div>
 				</v-card>
 			</v-col>
@@ -262,8 +261,6 @@ export default {
 			});
 
 			// this.getRowGridData();
-
-			this.loadGrid = true;
 		},
 		async search() {
 			await this.getRowGridData();
@@ -296,7 +293,8 @@ export default {
 				gridKey: this.gridName,
 				value: newRes,
 			});
-
+			this.loadGrid = true;
+			
 			this.$nextTick(() => {
 				if (newRes.length > 0) {
 					this.$refs[this.gridName].focus({
@@ -316,6 +314,14 @@ export default {
 			});
 		},
 		async getRowData(data, gridName) {
+			console.log("-----------------------DEBUG--getRowData--------------",
+			{
+				gridKey: gridName,
+				gridSelect: true,
+				rowGridSelectKey: data.rowKey,
+				rowGridSelectData: data,
+			}
+			);
 			this.setGridSelectData({
 				gridKey: gridName,
 				gridSelect: true,
@@ -327,6 +333,7 @@ export default {
 				rowGridSelectKey: data.rowKey,
 				rowGridSelectData: data,
 			});
+			
 		},
 		compareData(type, newDt) {
 			if (this.selectedCommCdData[type] == newDt) {