updatecode

Reviewed-on: #64

assets/scss/common.scss

@@ -231,6 +231,35 @@ a {
   .v-application.#{$theme}-mode {
     min-width: 1000px;
 
+    .ant-checkbox-wrapper.ant-checkbox-wrapper-disabled,
+    .ant-checkbox-disabled .ant-checkbox-input
+    {
+      cursor: default !important;
+    }
+
+    .v-list-item__title {
+      font-family: var(--desktop-normal-font-family, "Inter-Regular", sans-serif) !important;
+    }
+
+    .btn-close-menu-list {
+      min-width: 100px;
+      border-color: transparent;
+      background-color: map-deep-get($config, #{$theme}, "btn-header-select-bg") !important;
+  
+      .v-list-item {
+        min-height: 30px;
+      }
+  
+      .v-list-item__title {
+        color: map-deep-get($config, #{$theme}, "btn-header-select-color") !important;
+  
+        &:hover {
+          color: #46c0ff !important;
+          cursor: pointer;
+        }
+      }
+    }
+
     .icon-datepicker-color {
       color: map-deep-get($config, #{$theme}, "icon-datepicker-color");
     }
@@ -760,7 +789,7 @@ a {
 	
 				.v-list-item__title {
 					color: map-deep-get($config, #{$theme}, "tui-datepicker-calendar-color");
-				}
+        }
 			}
 	
 			&.v-select-list{
@@ -808,6 +837,7 @@ a {
       font-size: 2rem;
       font-weight: bold;
       padding-left: 8px;
+      margin-top: 2px;
 
       img {
         width: 139px;
@@ -824,20 +854,11 @@ a {
   .btn-close-menu-list {
     min-width: 100px;
     border-color: transparent;
-    background-color: map-deep-get($config, #{$theme}, "btn-header-select-bg") !important;
 
     .v-list-item {
       min-height: 30px;
     }
 
-    .v-list-item__title {
-      color: map-deep-get($config, #{$theme}, "btn-header-select-color");
-
-      &:hover {
-        color: #46c0ff;
-      }
-    }
-
     .v-btn {
       background-color: transparent !important;
       color: map-deep-get($config, #{$theme}, "btn-header-select-color") !important;

assets/scss/common/grid.scss

@@ -56,25 +56,35 @@
     font-weight: 400;
   }
 
-  
+
   th[data-column-name="_checked"] {
     padding-left: 0;
   }
 
 
+
 }
 
-.tui-grid-table{
+.tui-grid-table {
+
   .tui-grid-cell-header,
   .tui-grid-cell-has-input .tui-grid-cell-content {
     padding: 8px;
   }
 
   th[data-column-name="_checked"] {
-    &.tui-grid-cell-header  {
+    &.tui-grid-cell-header {
       padding-left: 0;
     }
-    
+
+  }
+
+  .tui-grid-cell {
+    &:last-child {
+      input[type=checkbox] {
+        margin-top: 8px;
+      }
+    }
   }
 }
 
@@ -99,8 +109,8 @@
   @include theme($theme);
 
   .v-application.#{$theme}-mode {
-    .tui-grid-content-area{
-      .tui-grid-header-area{
+    .tui-grid-content-area {
+      .tui-grid-header-area {
         height: auto !important;
       }
     }
@@ -115,9 +125,9 @@
         "tui-grid-title-color"
       );
     }
-    
-    .grid-toggle-section{
-      .tui-grid-rside-area{
+
+    .grid-toggle-section {
+      .tui-grid-rside-area {
         .tui-grid-body-area {
           height: auto !important;
 
@@ -145,16 +155,17 @@
         }
       }
 
-      &-border-line-right{
+      &-border-line-right {
         opacity: 0;
       }
 
-      &-body-container{
+      &-body-container {
         border-right: 0;
         // position: relative;
         width: auto !important;
 
-        .tui-grid-table-container{
+        .tui-grid-table-container {
+
           // width: 100% !important;
           .tui-grid-table {
             // width: 100% !important;
@@ -166,12 +177,19 @@
             // }
           }
         }
+
+        .tui-grid-layer-editing {
+          border-color: map-deep-get($config,
+            #{$theme},
+            "tui-grid-border-vertical-color"
+          );
+        }
       }
 
       &-summary-area,
       &-container {
         font-family: Inter;
- 
+
         .tui-grid-cell {
           &.tui-grid-cell-summary {
             color: map-deep-get($config,
@@ -285,7 +303,8 @@
               #{$theme},
               "ant-btn-primary-color"
             );
-            .radio-mark{
+
+            .radio-mark {
               border-color: map-deep-get($config,
                 #{$theme},
                 "arow-line-color"
@@ -294,6 +313,7 @@
                 #{$theme},
                 "arow-line-btn-bg-color"
               );
+
               &::after {
                 content: "";
                 position: absolute;
@@ -311,12 +331,39 @@
             }
           }
         }
+
+        .tui-grid-cell-content {
+
+          input[type='text'],
+          input[type='password'] {
+            border-color: map-deep-get($config,
+              #{$theme},
+              "v-input-fieldset-color"
+            );
+            background: map-deep-get($config,
+              #{$theme},
+              "v-input-backgroundColor"
+            );
+            border-radius: 4px;
+            color: map-deep-get($config,
+              #{$theme},
+              "tui-grid-cell-color"
+            );
+          }
+
+          &.tui-grid-layer-editing {
+            background:map-deep-get($config,
+              #{$theme},
+              "tui-grid-cell-insert-color"
+            );
+          }
+        }
       }
 
       &-cell {
         &:last-child {
           padding-right: 1px;
-          border-right: 1px solid ;
+          border-right: 1px solid;
           border-right-color: map-deep-get($config,
             #{$theme},
             "tui-grid-cell-borderColor"
@@ -349,7 +396,7 @@
           "tui-grid-border-vertical-color"
         );
         color: map-deep-get($config,
-        #{$theme},
+          #{$theme},
           "tui-grid-header-color"
         );
 
@@ -395,14 +442,14 @@
           background-color: map-deep-get($config,
             #{$theme},
             "tui-grid-cell-insert-color"
-          );
+          ) !important;
         }
 
         &.row-modify {
           background-color: map-deep-get($config,
             #{$theme},
             "tui-grid-cell-modify-color"
-          );
+          ) !important;
         }
 
         &.row-removed {
@@ -497,6 +544,7 @@
 
       &-tree-button-expand {
         z-index: 9999;
+
         .tui-grid-btn-tree {
           i {
             width: 16px;
@@ -516,6 +564,7 @@
 
       &-tree-button-collapse {
         z-index: 9999;
+
         .tui-grid-btn-tree {
           i {
             width: 16px;

assets/scss/var.scss

@@ -113,7 +113,7 @@ $config: (
     tui-grid-cell-color: #FFFFFFD9,
     tui-grid-cell-insert-color: #2B2111,
     tui-grid-cell-selected-color: #0A224F,
-    tui-grid-cell-modify-color: #13636c,
+    tui-grid-cell-modify-color: #2B2111,
     tui-grid-cell-removed-color: #2A1215,
     tui-grid-cell-disabled-color: rgb(170, 170, 170),
     tui-grid-cell-hover-backgroundColor: #2d4571,
@@ -263,7 +263,7 @@ $config: (
     tui-grid-cell-color: #000000E0,
     tui-grid-cell-insert-color: #FFFBE6,
     tui-grid-cell-selected-color: #E6F4FF,
-    tui-grid-cell-modify-color: #e6f5f7,
+    tui-grid-cell-modify-color: #FFFBE6,
     tui-grid-cell-removed-color: #FFF1F0,
     tui-grid-cell-hover-backgroundColor: #f5f5f5,
     v-tabs-items-border-color: #0000000F,

components/common/Grid.vue

@@ -301,7 +301,7 @@ export default {
 			// console.log('startEditing2...')
 			if (this.editorGrid && e.rowKey >= 0) {
 				this.editorStartKey = e.rowKey;
-				this.gridInstance.invoke('startEditing', e.rowKey, e.columnName);
+				this.gridInstance.invoke('startEditing', e.rowKey, e.columnName, 'row-modify');
 				this.$emit(
 					'getRowsData',
 					this.gridInstance.invoke('getRow', e.rowKey),

components/common/modal/PlanPop.vue

@@ -238,7 +238,13 @@ export default {
 			type: Object,
 			require: false,
 			default: () => {
-				return {};
+				return {
+					selectTimeValue1: "00 : 00", // selectBoxTime에 필요한 prop
+					selectTimeValueList1: [], // selectBoxTime에 필요한 prop
+					selectTimeValue2: "01 : 00", // selectBoxTime에 필요한 prop
+					selectTimeValueList2: [], // selectBoxTime에 필요한 prop
+					minInterval: 10,
+				};
 			},
 		},
 	},
@@ -536,8 +542,8 @@ export default {
 			let returnData = res[0];
 			this.strtDt = Utility.setFormatDate(returnData.strtDt, 'YYYY-MM-DD');
 			this.endDt = Utility.setFormatDate(returnData.endDt, 'YYYY-MM-DD');
-			this.selectTimeValue1 = returnData.strtHh+' : '+  returnData.strtMm;
-			this.selectTimeValue2 = returnData.endHh+' : '+  returnData.endMm;
+			this.selectTimeValue1 = returnData.strtHh + ' : ' + returnData.strtMm;
+			this.selectTimeValue2 = returnData.endHh + ' : ' + returnData.endMm;
 			this.planTitle = returnData.planTitle;
 			this.planCntn = returnData.planCntn;
 			this.planColor = returnData.planColor;

components/common/select/SelectBoxTime.vue

@@ -20,7 +20,7 @@
         item-value="value"
         solo
         outlined
-        :menu-props="{ auto: true, offsetY: true }"
+        :menu-props="{ top: false, offsetY: true }"
         :hide-details="true"
         :class="['v-select__custom', customClass]"
         :disabled="disabled"

components/pages/ems/EccInfo/EccIaoTab.vue

@@ -98,19 +98,17 @@ export default {
 	watch: {
 		selectedObjId(val) {
 			if (val === 'TAG') {
-				this.detailList[1].class = 'd-none';
-				this.detailList[2].class = 'd-block pl-4';
+				this.detailList[1].class = 'd-none ';
+				this.detailList[2].class = 'd-block pl-4 mt-2';
 				this.detailList[3].class = 'd-block';
+				this.detailList[4].class = 'pl-4 mt-2';
 			} else {
 				// }else if(val==="READ_PLC"){
+				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';
+				this.detailList[1].class = 'd-block pl-4 mt-1 pb-0';
 			}
-			this.detailList[4].class = 'pl-4 mt-2';
-			
-			console.log(val)
-			console.log(this.detailList)
 		},
 	},
 	created() {},
@@ -380,7 +378,7 @@ const myDetail = [
 		label: '대상 유형',
 		disabled: false,
 		cols: 6,
-		class: 'pr-4 py-2',
+		class: 'pr-4 py-2 mt-1',
 		list: 'emMapDivList',
 		valueNm: 'objKind',
 		itemText: 'commCdNm',

pages/comm/auth/UserRoleMngPage.vue

@@ -912,17 +912,6 @@ const myColumns = [
 ];
 
 const unAsgnRoleByUserColumns = [
-	{
-		header: '',
-		name: '',
-		align: 'center',
-		width: 50,
-		formatter: (props) => {
-			return `<label class="custom-radio">
-						<span class="radio-mark"></span>
-					</label>`;
-		}
-	},	
 	{ header: '역할ID', name: 'roleId', align: 'left' },
 	{ header: '역할명', name: 'roleNm' },
 	{ header: '적용시작일', name: 'aplyStartDt', hidden: true },
@@ -932,8 +921,7 @@ const unAsgnRoleByUserColumns = [
 ];
 
 const asgnRoleByUserColumns = [
-	
-	{ header: '역할ID', name: 'roleId', align: 'center' },
+	{ header: '역할ID', name: 'roleId', align: 'left' },
 	{ header: '역할명', name: 'roleNm' },
 	{
 		header: '적용시작일',
@@ -947,6 +935,17 @@ const asgnRoleByUserColumns = [
 ];
 
 const asgnMenuByUserColumns = [
+	{
+		header: '',
+		name: '',
+		align: 'center',
+		width: 50,
+		formatter: (props) => {
+			return `<label class="custom-radio">
+						<span class="radio-mark"></span>
+					</label>`;
+		}
+	},	
 	{ header: '메뉴명', name: 'menuNm' }];
 
 const myDetail = blocCdList => {