update

Reviewed-on: #100

assets/scss/common/input.scss

@@ -1,5 +1,5 @@
 .v-select__custom {
-  padding: 0.125rem;
+  // padding: 0.125rem;
 
   &.v-text-field.v-text-field--solo:not(.v-text-field--solo-flat)>.v-input__control>.v-input__slot {
     box-shadow: none;

components/common/AdminMenu.vue

@@ -43,16 +43,16 @@
 			<!--        </div>-->
 			<!--      </v-list-item>-->
 			<v-list-item>
-				<v-btn @click="pswdChange" small elevation="0">
+				<v-list-item-title @click="pswdChange" class="body-2">
 					<v-icon class="mr-1" size="20">mdi-account-outline</v-icon>
 					<span class="body-2">비밀번호 변경</span>
-				</v-btn>
+				</v-list-item-title>
 			</v-list-item>
 			<v-list-item>
-				<v-btn @click="logout" small elevation="0">
+				<v-list-item-title @click="logout" class="body-2">
 					<v-icon class="mr-1" size="20">mdi-logout</v-icon>
 					<span class="body-2">로그아웃</span>
-				</v-btn>
+				</v-list-item-title>
 			</v-list-item>
 		</v-list>
 	</v-menu>
@@ -105,7 +105,7 @@ export default {
 			});
 		},
 		pswdChange() {
-			this.$parent.$parent.$parent.$parent.$refs['changePswdPop'].dialog = true;
+			this.$parent.$parent.$parent.$refs['changePswdPop'].dialog = true;
 		},
 	},
 	mounted() {},

components/common/modal/ChangePswdPop.vue

@@ -104,7 +104,6 @@ export default {
 	},
 	watch: {
 		async chkDialog(val) {
-			//console.log("watch : ", val)
 			if (val) {
 				this.openDialog();
 

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/common/modal/EvtObjPop.vue

@@ -53,7 +53,7 @@
 					</v-col>
 				</v-row>
 				<!-- <div :style="'height: calc(65vh)'"> -->
-				<div :style="'height: 600px'" class="px-5">
+				<div :style="'height: 620px'" class="px-5">
 					<!-- <div :style="{ height: 'calc(100% - 213px)' }"> -->
 					<div ref="modalGridParent" class="h100 py-3">
 						<!-- :is="loadGrid && dialog ? 'Grid' : null" -->

components/pages/ems/EccInfo/EccIaoTab.vue

@@ -107,7 +107,7 @@ export default {
 				this.detailList[4].class = 'pl-4 mt-2';
 				this.detailList[3].class = 'd-block';
 				this.detailList[2].class = 'd-none';
-				this.detailList[1].class = 'd-block pl-4 mt-1 pb-0';
+				this.detailList[1].class = 'd-block pl-4 mt-3-new pb-0';
 			}
 		},
 	},
@@ -503,5 +503,10 @@ const myDetail = [
 		.tui-grid-layer-state{
 			top: 40px !important;
 		}
+
+		.mt-3-new{
+			margin-top: 3px;
+		}
+
 	}
 </style>

components/pages/ems/ReadObjInfo/ReadObjAddInfoTab.vue

@@ -102,7 +102,7 @@ export default {
 			this.gridInit();
 		},
 		gridInit() {
-			const gridHeight = this.$refs.gridParent.offsetHeight - 31;
+			const gridHeight = this.$refs.gridParent.offsetHeight - 37;
 
 			const myOptions = {
 				columnOptions: {
@@ -113,8 +113,8 @@ export default {
 				header: {
 					height: 28,
 				},
-				rowHeight: 36,
+				rowHeight: 37,
-				minRowHeight: 36,
+				minRowHeight: 37,
 				selectionUnit: 'row',
 				editingEvent: 'click',
 			};
@@ -122,7 +122,6 @@ export default {
 				gridKey: this.gridName,
 				value: myOptions,
 			});
-
 			const _this = this;
 			let useFgSelectList = [];
 			this.pageData.useFgList.forEach(item => {
@@ -442,12 +441,8 @@ export default {
 </script>
 <style lang="scss" scoped >
 ::v-deep {
-	.tui-grid-layer-state {
-		top: 40px !important;
-	}
-	
 	.tui-grid-cell-content-editor {
-		height: 36px !important;
+		height: 37px !important;
 	}
 
 }

layouts/default.vue

@@ -61,7 +61,9 @@
                 </v-list-item>
               </v-list>
             </v-menu>
-            <a-button id="removeBm" class="btn-header" @click="removeBookMark" v-if="bookmarkBtn == 1">
+            <a-button id="removeBm" :style="{
+                    display: 'flex',
+                    alignItems: 'center'}" class="btn-header" @click="removeBookMark" v-if="bookmarkBtn == 1">
               <span class="material-icons" style="font-size: 17px">star</span>
             </a-button>
             <a-button id="addBm" class="btn-header" :style="{

pages/ems/effc/DataSetMngPage.vue

@@ -783,5 +783,8 @@ const dataPathDataExample = getPathDataExample({
   .v-window {
     overflow: visible;
   }
+  .ant-checkbox-inner {
+    padding: 8px;
+  }
 }
 </style>

plugins/gridUtility.js

@@ -327,6 +327,10 @@ export class NewCustomEditor {
 			} else {
 				el.checked = false;
 			}
+
+			divEl.style.position = 'relative';
+			divEl.style.top = rowKey === 0 ? '1px' : '2px';
+
 			el.addEventListener('change', (ev) => {
 				// console.log('props: %o', ev);
 				if (ev.target.checked) {
@@ -401,4 +405,4 @@ export class NewCustomEditor {
 		// }
 		this.el.select();
 	}
-}
+}