fixbug grid

Reviewed-on: #46

assets/scss/common/input.scss

@@ -241,9 +241,16 @@ input[type="checkbox"] {
   .v-application.#{$theme}-mode {
 
     .ant-checkbox-wrapper {
+      .ant-checkbox {
+        .ant-checkbox-inner {
+          background-color: map-deep-get($config, #{$theme}, "ant-checkbox-bg"); // background for unchecked checkbox
+          border-color: map-deep-get($config, #{$theme}, "ant-checkbox-border");
+        }
+      }
+
       .ant-checkbox-checked {
         .ant-checkbox-inner {
-          background: map-deep-get($config, #{$theme}, "ant-btn-primary-bg");
+          background: map-deep-get($config, #{$theme}, "ant-btn-primary-bg"); // background for checked checkbox
           border-color:map-deep-get($config, #{$theme}, "ant-btn-primary-bg");
           color:map-deep-get($config, #{$theme}, "ant-btn-primary-color");
 

assets/scss/datepicker.scss

@@ -19,6 +19,13 @@
       border-color: currentColor;
       // border-color: map-deep-get($config, #{$theme}, "tui-datepicker-border-color");
 
+      &:hover {
+				border-color: map-deep-get($config, #{$theme}, "v-input-fieldset-hover-color" ) !important;
+			}
+			&:has(.v-input--is-focused){
+				border-width: 2px;
+			}
+
       &.datepicker-large {
         height: 40px;
       }

assets/scss/var.scss

@@ -111,10 +111,10 @@ $config: (
     tui-grid-border-vertical-color: #FFFFFF0F,
     tui-grid-cell-backgroundColor: #212224,
     tui-grid-cell-color: #FFFFFFD9,
-    tui-grid-cell-insert-color: #13636c,
+    tui-grid-cell-insert-color: #2B2111,
     tui-grid-cell-selected-color: #0A224F,
     tui-grid-cell-modify-color: #13636c,
-    tui-grid-cell-removed-color: #f6637b,
+    tui-grid-cell-removed-color: #2A1215,
     tui-grid-cell-disabled-color: rgb(170, 170, 170),
     tui-grid-cell-hover-backgroundColor: #2d4571,
     v-tabs-items-border-color: #FFFFFF0F,
@@ -177,6 +177,8 @@ $config: (
     v-header-border: #424242,
     v-chart-border: #424242,
     v-sidebar-border: #303030,
+    ant-checkbox-bg: #212224,
+    ant-checkbox-border: #424242,
   ),
   light: (w-g5: $--color-gray_555,
     g5-w: $--color-white,
@@ -317,5 +319,7 @@ $config: (
     v-header-border: #D9D9D9,
     v-chart-border: #D9D9D9,
     v-sidebar-border: #F0F0F0,
+    ant-checkbox-bg: #FFFFFF,
+    ant-checkbox-border: #D9D9D9,
   ),
 );

components/common/Datepicker.vue

@@ -426,7 +426,7 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-@import "@/assets/scss/datepicker.scss";
+// @import "@/assets/scss/datepicker.scss";
 
 ::v-deep {
 	.tui-timepicker-row {

components/common/Grid.vue

@@ -9,7 +9,6 @@
 		@dblclick="dblClick"
 		@mouseover="mouseoverEvent"
 		@mouseout="mouseoutEvent"
-		@mousedown="onMousedown"
 		@focusChange="focusChangeEvt"
 	/>
 </template>
@@ -268,13 +267,7 @@ export default {
 				}
 			});
 		},
-		onMousedown(evt) {
-			this.handleSelectedRow(evt);
-		},
 		focusChangeEvt(e) {
-			this.handleSelectedRow(e);	
-		},
-		handleSelectedRow(e) {
 			// console.log('focusChangeEvt1...')
 			if (this.preventFocusChangeEvent(e)) {
 				// console.log('prevent focusChangeEvt')

components/common/form/CheckBox.vue

@@ -12,15 +12,26 @@
 			</label>
 		</v-col>
 		<v-col :cols="item.label ? 7 : ''" >
-			<v-checkbox
+			<!-- <v-checkbox
 				v-model="chkValue"
 				:disabled="disabledFlag"
 				:readonly="item.readonly || false"
 				:required="item.required || false"
 				:false-value="false"
-				:color="isDarkMode ? '#fff' : '#1890ff'"
+				:color="isDarkMode ? '#1668DC' : '#1890ff'"
 				@change="modifyValue"			
-			></v-checkbox>
+  				class="small-checkbox"
+			></v-checkbox> -->
+			<a-checkbox
+        		v-model="chkValue"
+				:disabled="disabledFlag"
+				:readonly="item.readonly || false"
+				:required="item.required || false"
+				:false-value="false"
+				:color="isDarkMode ? '#1668DC' : '#1890ff'"
+				@change="modifyValue"	
+			>
+			</a-checkbox>
 		</v-col>
 	</v-row>
 </template>
@@ -141,7 +152,7 @@ export default {
 		modifyValue(e) {
 			const dt = {
 				columnName: this.item.valueNm,
-				value: e,
+				value: e.target.checked,
 			};
 			this.$emit('gridEditingFinish', dt);
 		},

components/common/modal/EqpmSelectPop.vue

@@ -10,7 +10,10 @@
 		<v-col :cols="textCols">
 			<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>
+				:disabled="disabled || false"
+				:placeholder="placeholder"
+				>
+				<template v-slot:append>
 					<!-- Custom SVG icon -->
 					<v-icon>$icoSearch</v-icon>
 				</template>

components/pages/ems/DataSetInfo/DataSetTagRelTab.vue

@@ -190,7 +190,7 @@ export default {
           //   }
           // }
         },
-        { header: '비고', name: 'rmrk', align: 'center' },
+        { header: '비고', name: 'rmrk', align: 'left' },
       ];
 
       this.setGridColumn({

components/pages/ems/EqpmInfo/EqpmAddInfoTab.vue

@@ -1,7 +1,9 @@
 <template>
 	<div>
-		<div class="d-flex justify-space-between align-center my-5" >
+		<div class="d-flex justify-space-between align-center mb-5" >
-			<span class="txt custom-subtitle-tab">설비 추가 정보</span>
+			<v-card-title class="txt custom-title-4 pa-0">
+				설비 추가 정보
+			</v-card-title>
 			<Buttons
 				:parentPrgmId="parentPrgmId"
 				:bindingData="gridName"
@@ -268,7 +270,7 @@ export default {
 				{
 					header: 'Data 구분',
 					name: 'addInfoDataKind',
-					align: 'center',
+					align: 'left',
 					formatter({ value }) {
 						let retVal = '';
 						const newValue = addInfoDataKindList.filter(

components/pages/ems/EqpmInfo/EqpmConstTab.vue

@@ -1,7 +1,10 @@
 <template>
 	<div>
-		<div class="d-flex justify-space-between align-center my-5" >
+		<div class="d-flex justify-space-between align-center mb-5" >
-			<span class="txt custom-subtitle-tab">설비 상수 정보</span>
+			<!-- <span class="txt custom-subtitle-tab">설비 상수 정보</span> -->
+			<v-card-title class="txt custom-title-4 pa-0">
+				설비 상수 정보
+			</v-card-title>
 			<Buttons :parentPrgmId="parentPrgmId" :bindingData="gridName" :btnActionsFnc="btnActions" />
 		</div>
 		<div ref="gridParent" style="min-height: calc(100vh - 800px);">
@@ -386,7 +389,7 @@ const myEqpmConstDetail = [
 		required: true,
 		openMode: 'CONST',
 		cols: 6,
-		class: 'py-3 pl-4',
+		class: 'pt-3 pb-1 pl-4',
 		eqpmGrpDisableFlag: true,
 		// eqpmGrpId:'',
 		labelCols: 12,
@@ -406,7 +409,7 @@ const myEqpmConstDetail = [
 		disabled: true,
 		readonly: true,
 		cols: 6,
-		class: 'py-3 pt-1 pl-4',
+		class: 'pb-3 pt-0 pl-4',
 		align: 'right',
 		// class: 'py-2 d-none',
 		labelCols: 12,

components/pages/ems/EqpmInfo/EqpmIaoTab.vue

@@ -1,7 +1,10 @@
 <template>
 	<div>
-		<div class="d-flex justify-space-between align-center my-5" >
+		<div class="d-flex justify-space-between align-center mb-5" >
-			<span class="txt custom-subtitle-tab">설비 입출력 정보</span>
+			<!-- <span class="txt custom-subtitle-tab">설비 입출력 정보</span> -->
+			<v-card-title class="txt custom-title-4 pa-0">
+				설비 입출력 정보
+			</v-card-title>
 			<Buttons
 				:parentPrgmId="parentPrgmId"
 				:bindingData="gridName"
@@ -226,6 +229,7 @@ export default {
 
 						return retVal;
 					},
+					minWidth: 150,
 				},
 				{
 					header: '대상 유형',
@@ -242,9 +246,10 @@ export default {
 
 						return retVal;
 					},
+					minWidth: 150,
 				},
 				{ header: '물리량', name: 'pysclQtyId', align: 'left', hidden: true },
-				{ header: '물리량', name: 'pysclQtyNm', align: 'left' },
+				{ header: '물리량', name: 'pysclQtyNm', align: 'left', minWidth: 150, },
 				{
 					header: '물리량값',
 					name: 'pysclQtyVal',
@@ -269,6 +274,7 @@ export default {
 						);
 						return newValue[0].commCdNm;
 					},
+					minWidth: 100,
 				},
 				{ header: '분배율', name: 'distRt', align: 'right' },
 				{ header: '등록 사용자', name: 'regUserNo', hidden: true },

pages/ems/base/DashboardPage.vue

@@ -840,7 +840,7 @@ export default {
         { header: "주의", name: "careStndVal", align: "right", width: 40 },
         { header: "경고", name: "warnStndVal", align: "right", width: 40 },
         { header: "가이드", name: "totVal", align: "right", width: 40 },
-        { header: "알람 내용", name: "alrmMsg", align: "left" },
+        { header: "알람 내용", name: "alrmMsg", align: "left", resizable: false },
         { header: "설비종류", name: "eqpmKindId", align: "left", hidden: true },
         { header: "설비종류", name: "eqpmKindNm", align: "left", hidden: true },
       ];

pages/ems/base/EquipmentMasterMngPage.vue

@@ -365,7 +365,7 @@ export default {
 					header: '사업장',
 					name: 'blocId',
 					width: 100,
-					align: 'center',
+					align: 'left',
 					hidden: true,
 					formatter({ value }) {
 						let retVal = '';

plugins/utility.js

@@ -289,8 +289,8 @@ const Utility = () => {
 			header: {
 				height: 28,
 			},
-			rowHeight: 29,
+			rowHeight: 37,
-			minRowHeight: 29,
+			minRowHeight: 37,
 			columnOptions: {
 				resizable: true,
 				minWidth: 100,