Merge pull request 'dev-dungtv-0807' (#49) from dev-dungtv-0807 into dev

Reviewed-on: #49

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,

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/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

@@ -270,7 +270,7 @@ export default {
 				{
 					header: 'Data 구분',
 					name: 'addInfoDataKind',
-					align: 'center',
+					align: 'left',
 					formatter({ value }) {
 						let retVal = '';
 						const newValue = addInfoDataKindList.filter(

pages/ems/effc/EnrgReptMngPage.vue

@@ -62,20 +62,20 @@
 								<v-card-title class="pa-0">설비별 효율지표 Trend</v-card-title>
 							</v-col>
 							<v-col :cols="4" class="d-flex justify-space-end" >
-									<component
-										class="text-right mr-2"
-										ref="EqpmSelectPop"
-										label=""
-										placeholder="설비..."
-										is="EqpmSelectPop"
-										valueNm="eqpmId"
-										:textCols="12"
-										:parentPrgmId="myPrgmId"
-										:eqpmGrpDisabled="true"
-										:fabDisabled="true"
-										:iconShow="false"
-										:isMulti="true"
-									/>
+								<component
+									class="text-right mr-2"
+									ref="EqpmSelectPop"
+									label=""
+									placeholder="설비..."
+									is="EqpmSelectPop"
+									valueNm="eqpmId"
+									:textCols="12"
+									:parentPrgmId="myPrgmId"
+									:eqpmGrpDisabled="true"
+									:fabDisabled="true"
+									:iconShow="false"
+									:isMulti="true"
+								/>
 								<a-button @click="getEqpmData()" type="primary" >조회</a-button>
 							</v-col>
 						</v-row>

plugins/utility.js

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