merge file

pages/comm/auth/MenuRoleMngPage.vue

@@ -36,19 +36,14 @@
 					<v-card-title>
 						<span class="custom-title-4">역할 리스트</span>
 					</v-card-title>
-					<div class="px-5" style="height:calc(100% - 100px)">
-						<div
-							ref="gridParent"
-							class="w100 h100"
-						>
-							<component
-								:is="loadGrid ? 'Grid' : null"
-								:ref="gridName + myPrgmId"
-								:gridName="gridName"
-								:parentPrgmId="myPrgmId"
-								@getRowsData="getRowData"
-							/>
-						</div>
+					<div ref="gridParent" class="px-5" style="height: 60vh;">
+						<component
+							:is="loadGrid ? 'Grid' : null"
+							:ref="gridName + myPrgmId"
+							:gridName="gridName"
+							:parentPrgmId="myPrgmId"
+							@getRowsData="getRowData"
+						/>
 					</div>
 				</v-card>
 			</v-col>
@@ -69,19 +64,19 @@
 								:style="{ minHeight: '36px' }"
 								>[미배정]메뉴리스트</span
 							>
-							<div class="px-0 mt-2" style="height:calc(100% - 64px)">
-								<div
+							<div ref="treeGridParent" class="px-0 mt-2" style="height: 60vh;">
+								<!-- <div
 									ref="treeGridParent"
 									class="w100 h100"
 								>
-									<component
-										:is="loadTreeGrid ? 'Grid' : null"
-										:ref="gridName2 + myPrgmId"
-										:gridName="gridName2"
-										:parentPrgmId="myPrgmId"
-										@getRowsData="getUnAsgnRowData"
-									/>
-								</div>
+							</div> -->
+								<component
+									:is="loadTreeGrid ? 'Grid' : null"
+									:ref="gridName2 + myPrgmId"
+									:gridName="gridName2"
+									:parentPrgmId="myPrgmId"
+									@getRowsData="getUnAsgnRowData"
+								/>
 							</div>
 						</v-col>
 						<v-col :cols="1">
@@ -112,20 +107,20 @@
 									/>
 								</v-col>
 							</v-row>
-							<div class="px-0 mt-2" style="height:calc(100% - 64px)">
-								<div
+							<div ref="treeGridParent2" class="px-0 mt-2" style="height: 60vh;">
+								<!-- <div
 									ref="treeGridParent2"
 									class="w100 h100"
 								>
-									<component
-										:is="loadTreeGrid2 ? 'Grid' : null"
-										:ref="gridName3 + myPrgmId"
-										:gridName="gridName3"
-										:parentPrgmId="myPrgmId"
-										:editorGrid="true"
-										@getRowsData="getAsgnRowData"
-									/>
-								</div>
+							</div> -->
+								<component
+									:is="loadTreeGrid2 ? 'Grid' : null"
+									:ref="gridName3 + myPrgmId"
+									:gridName="gridName3"
+									:parentPrgmId="myPrgmId"
+									:editorGrid="true"
+									@getRowsData="getAsgnRowData"
+								/>
 							</div>
 						</v-col>
 					</v-row>
@@ -408,9 +403,9 @@ export default {
 					align: 'center',
 					width: 30,
 					formatter: (props) => {
-						return `<label class="custom-radio">
+						return `<span class="custom-radio">
 									<span class="radio-mark"></span>
-								</label>`;
+								</span>`;
 					}
 				},
 				{
@@ -431,9 +426,9 @@ export default {
 					align: 'center',
 					width: 30,
 					formatter: (props) => {
-						return `<label class="custom-radio">
+						return `<span class="custom-radio">
 									<span class="radio-mark"></span>
-								</label>`;
+								</span>`;
 					}
 				},
 				{ header: '역할ID', name: 'roleId', hidden: true },
@@ -573,6 +568,7 @@ export default {
 			});
 		},
 		async getRowData(data) {
+
 			await this.setPageData({
 				rowGridSelectKey: data.rowKey,
 				rowGridSelectData: {
@@ -678,6 +674,8 @@ export default {
 		},
 
 		getUnAsgnRowData(data) {
+			console.log("------------------DEBUG-------getUnAsgnRowData:", data);
+
 			const getRowData = data;
 			this.leftSelectRowData = Object.assign({}, getRowData);
 		},

pages/comm/base/PrgmMngPage.vue

@@ -50,7 +50,7 @@
 							/>
 						</div>
 					</div>
-					<div ref="gridParent" style="height: 100vh">
+					<div ref="gridParent" style="height: 60vh">
 						<!-- <div ref="gridParent" class="px-5 h100">
 						</div> -->
 						<component