updatecode

fixbug
Merge pull request 'Update screen 13, grid color' (#64 ) from dev-trungvq7-0729 into dev
2025-08-14 12:01:07 +09:00 · 2025-08-14 11:34:02 +09:00 · 2025-08-13 19:02:06 +09:00 · 2025-08-13 18:20:59 +09:00 · 2025-08-13 17:14:44 +09:00 · 2025-08-13 17:14:39 +09:00
13 changed files with 169 additions and 83 deletions
--- a/assets/scss/common.scss
+++ b/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");
    }
@ -253,16 +282,12 @@ a {
      color: map-deep-get($config, #{$theme}, "v-select-label-color");
    }

-    // .header {
-    //   background-color: map-deep-get($config, #{$theme}, "header-backgroud");
-    //   border-bottom: 1px solid map-deep-get($config, #{$theme}, "v-header-border");
-    // }
-
    .custom-chart{
      border: 1px solid map-deep-get($config, #{$theme}, "v-chart-border");
    }

    .v-icon {
+      color: currentColor;
      &.icon-orange {
        svg {
          fill:map-deep-get($config,
@ -812,6 +837,7 @@ a {
      font-size: 2rem;
      font-weight: bold;
      padding-left: 8px;
+      margin-top: 2px;

      img {
        width: 139px;
@ -828,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;
--- a/assets/scss/common/button.scss
+++ b/assets/scss/common/button.scss
@ -144,10 +144,11 @@
      }

      &.ant-btn-danger {
+
        &.ant-btn-background-ghost {
          color: map-deep-get($config, #{$theme}, "ant-btn-danger-color");
-          border-color:map-deep-get($config, #{$theme}, "ant-btn-danger-border");
-          background: map-deep-get($config, #{$theme}, "ant-btn-danger-bg") !important;
+          border-color: map-deep-get($config, #{$theme}, "ant-btn-danger-color");
+          // background: map-deep-get($config, #{$theme}, "ant-btn-danger-color") !important;
        }
      }

--- a/assets/scss/common/grid.scss
+++ b/assets/scss/common/grid.scss
@ -62,9 +62,11 @@
  }


+
 }

 .tui-grid-table {
+
  .tui-grid-cell-header,
  .tui-grid-cell-has-input .tui-grid-cell-content {
    padding: 8px;
@ -76,6 +78,14 @@
    }

  }
+
+  .tui-grid-cell {
+    &:last-child {
+      input[type=checkbox] {
+        margin-top: 8px;
+      }
+    }
+  }
 }

 .treeGrid {
@ -155,6 +165,7 @@
        width: auto !important;

        .tui-grid-table-container {
+
          // width: 100% !important;
          .tui-grid-table {
            // width: 100% !important;
@ -166,6 +177,13 @@
            // }
          }
        }
+
+        .tui-grid-layer-editing {
+          border-color: map-deep-get($config,
+            #{$theme},
+            "tui-grid-border-vertical-color"
+          );
+        }
      }

      &-summary-area,
@ -285,6 +303,7 @@
              #{$theme},
              "ant-btn-primary-color"
            );
+
            .radio-mark {
              border-color: map-deep-get($config,
                #{$theme},
@ -294,6 +313,7 @@
                #{$theme},
                "arow-line-btn-bg-color"
              );
+
              &::after {
                content: "";
                position: absolute;
@ -311,6 +331,33 @@
            }
          }
        }
+
+        .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 {
@ -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;
--- a/assets/scss/layout.scss
+++ b/assets/scss/layout.scss
@ -79,6 +79,8 @@
            &>.v-treeview-node__root:before {
              border-radius: 6px;
              z-index: -1;
+              background-color: rgba(0, 0, 0, 0);
+              transition-duration: 0s;
            }
    
            &>.v-treeview-node__root:hover:before {
@ -379,11 +381,6 @@
              .v-treeview-node__children {
                .v-treeview-node {
                  >.v-treeview-node__root {
-                    .v-treeview-node__content {
-                      .v-treeview-node__label {
-                        color: map-deep-get($config, #{$theme}, "card-default-color");
-                      }
-                    }
                    
                    *:hover,
                    :hover {
@ -391,9 +388,14 @@
                    }
  
                    &:hover {
+                      background-color: rgba(0, 0, 0, 0);
+                      
+                      &:before {
+                        opacity: 1 !important;
                        border: 1px solid  map-deep-get($config, #{$theme}, "v-input-textarea-border");
                        border-radius: 8px;
-                      background-color: rgba(0, 0, 0, 0);
+                      }
+
                      .v-treeview-node__content {
                        .v-treeview-node__label {
                          color: map-deep-get($config, #{$theme}, "tui-grid-title-color");
@ -418,6 +420,12 @@
                      }
                    }
  
+                    .v-treeview-node__content {
+                      .v-treeview-node__label {
+                        color: map-deep-get($config, #{$theme}, "card-default-color");
+                      }
+                    }
+
                  }
                }
  
--- a/assets/scss/var.scss
+++ b/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,
@ -166,7 +166,7 @@ $config: (
    ant-btn-primary-color: #212224,
    ant-btn-danger-bg:#D32029,
    ant-btn-danger-border:#D32029,
-    ant-btn-danger-color:#212224,
+    ant-btn-danger-color:#D32029,
    ant-btn-default-border:#FFFFFF2E,
    ant-btn-default-bg:#FFFFFF2E,
    ant-btn-default-color:#FFFFFFD9,
@ -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,
--- a/components/common/Grid.vue
+++ b/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),
--- a/components/common/modal/PlanPop.vue
+++ b/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,
+				};
 			},
 		},
 	},
--- a/components/common/select/SelectBoxTime.vue
+++ b/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"
--- a/components/icons/icoSend.vue
+++ b/components/icons/icoSend.vue
@ -1,5 +1,5 @@
 <template>
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-  <path d="M15.4899 7.76897L0.552358 0.279682C0.491643 0.249325 0.422 0.242182 0.355929 0.258253C0.282599 0.276381 0.219441 0.322828 0.180282 0.387423C0.141124 0.452017 0.129156 0.529497 0.147 0.602896L1.68629 6.89218C1.7095 6.98682 1.77914 7.06361 1.872 7.09397L4.5095 7.99932L1.87379 8.90468C1.78093 8.93682 1.71129 9.01182 1.68986 9.10647L0.147 15.4047C0.130929 15.4708 0.138072 15.5404 0.168429 15.5993C0.238072 15.7404 0.4095 15.7975 0.552358 15.7279L15.4899 8.28147C15.5452 8.25468 15.5899 8.20825 15.6184 8.15468C15.6881 8.01182 15.6309 7.8404 15.4899 7.76897ZM1.90771 13.6154L2.80593 9.94397L8.07736 8.13504C8.11843 8.12075 8.15236 8.08861 8.16664 8.04575C8.19164 7.97075 8.15236 7.8904 8.07736 7.86361L2.80593 6.05647L1.91129 2.39932L13.1256 8.02254L1.90771 13.6154Z" fill="white"/>
+  <path d="M15.4899 7.76897L0.552358 0.279682C0.491643 0.249325 0.422 0.242182 0.355929 0.258253C0.282599 0.276381 0.219441 0.322828 0.180282 0.387423C0.141124 0.452017 0.129156 0.529497 0.147 0.602896L1.68629 6.89218C1.7095 6.98682 1.77914 7.06361 1.872 7.09397L4.5095 7.99932L1.87379 8.90468C1.78093 8.93682 1.71129 9.01182 1.68986 9.10647L0.147 15.4047C0.130929 15.4708 0.138072 15.5404 0.168429 15.5993C0.238072 15.7404 0.4095 15.7975 0.552358 15.7279L15.4899 8.28147C15.5452 8.25468 15.5899 8.20825 15.6184 8.15468C15.6881 8.01182 15.6309 7.8404 15.4899 7.76897ZM1.90771 13.6154L2.80593 9.94397L8.07736 8.13504C8.11843 8.12075 8.15236 8.08861 8.16664 8.04575C8.19164 7.97075 8.15236 7.8904 8.07736 7.86361L2.80593 6.05647L1.91129 2.39932L13.1256 8.02254L1.90771 13.6154Z" fill="currentColor"/>
 </svg>
 </template>
--- a/components/pages/ems/EccInfo/EccIaoTab.vue
+++ b/components/pages/ems/EccInfo/EccIaoTab.vue
@ -99,18 +99,16 @@ export default {
 		selectedObjId(val) {
 			if (val === 'TAG') {
 				this.detailList[1].class = 'd-none ';
-				this.detailList[2].class = 'd-block pl-4';
+				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',
--- a/pages/comm/auth/UserRoleMngPage.vue
+++ b/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 => {
--- a/pages/comm/base/NoticeMngPage.vue
+++ b/pages/comm/base/NoticeMngPage.vue
@ -105,15 +105,17 @@
 										@click="writeActionData.업로드fileData.splice(index, 1)" />
 								</div>
 							</div>
-							<a-button class="mt-2" icon="upload" @click="$refs.writeInputFile.$refs.input.click()">
+							<a-button class="ant-btn-popup-default mt-3" color="primary" icon="upload" @click="$refs.writeInputFile.$refs.input.click()">
 								업로드
 							</a-button>
 							<v-file-input ref="writeInputFile" v-model="writeActionData.fileData" multiple outlined
 								hide-input class="d-none" prepend-icon="mdi-tray-arrow-up"></v-file-input>
 						</v-col>
 						<v-col :cols="12" class="text-right">
-							<a-button @click="writePageButtonGroupClickEvent('cancel')" :ripple="false"
-								class="mr-2">취소</a-button>
+							<a-button @click="writePageButtonGroupClickEvent('cancel')" 
+								:ripple="false"
+								class="ant-btn-popup-default mr-2" 
+								color="primary" >취소</a-button>
 							<a-button @click="writePageButtonGroupClickEvent('write')" :ripple="false"
 								type="primary">등록</a-button>
 						</v-col>
@ -151,7 +153,7 @@
 									@click="replyActionData.fileData.splice(index, 1)" />
 							</div>
 						</div>
-						<a-button class="mt-3" icon="upload" @click="$refs.replyInputFile.$refs.input.click()">
+						<a-button class="ant-btn-popup-default mt-3" color="primary" icon="upload" @click="$refs.replyInputFile.$refs.input.click()">
 							업로드
 						</a-button>
 						<v-file-input ref="replyInputFile" multiple show-size v-model="replyActionData.fileData"
@ -159,7 +161,10 @@
 						</v-file-input>
 					</v-col>
 					<v-col :cols="12" class="text-right">
-						<a-button @click="replyPageButtonGroupClickEvent('cancel')" :ripple="false">취소</a-button>
+						<a-button @click="replyPageButtonGroupClickEvent('cancel')" 
+							class="ant-btn-popup-default mr-2" 
+							color="primary"
+							:ripple="false">취소</a-button>
 						<a-button @click="replyPageButtonGroupClickEvent('reply')" :ripple="false"
 							type="primary">등록</a-button>
 					</v-col>
@ -212,7 +217,7 @@
 										@click="addFileToDeleteFileList(fileData)" />
 								</div>
 							</div>
-							<a-button class="mt-2" icon="upload" @click="$refs.updateInputFile.$refs.input.click()">
+							<a-button class="ant-btn-popup-default mt-2" color="primary" icon="upload" @click="$refs.updateInputFile.$refs.input.click()">
 								업로드
 							</a-button>
 							<v-file-input ref="updateInputFile" multiple show-size v-model="updateActionData.fileData"
@ -220,7 +225,10 @@
 							</v-file-input>
 						</v-col>
 						<v-col :cols="12" class="text-right">
-							<a-button @click="updatePageButtonGroupClickEvent('cancel')">취소</a-button>
+							<a-button @click="updatePageButtonGroupClickEvent('cancel')" 
+								class="ant-btn-popup-default mr-2" 
+								color="primary"
+							>취소</a-button>
 							<a-button @click="updatePageButtonGroupClickEvent('update')" type="primary">등록</a-button>
 						</v-col>
 					</v-row>
--- a/pages/ems/effc/EnrgReptMngPage.vue
+++ b/pages/ems/effc/EnrgReptMngPage.vue
@ -35,7 +35,7 @@
 						</v-col>
 						<v-col :cols="6.5" class="text-right d-flex align-end justify-end align-self-end">
 							<!-- 조회버튼 -->
-							<a-button icon="file-excel" class="d-inline-flex-1 mr-1" size="large" @click="createExcel()">엑셀</a-button>
+							<a-button type="default" icon="file-excel" class="d-inline-flex-1 mr-1" size="large" @click="createExcel()">엑셀</a-button>
 							<BtnSearch @click="search" size="large"  />
 						</v-col>
 					</v-row>
Author	SHA1	Message	Date
Nguyen Van Luan/(Nguyen Van Luan)/현장대리인/SK	856d0db130	updatecode	2025-08-14 12:01:07 +09:00
Nguyen Van Luan/(Nguyen Van Luan)/현장대리인/SK	6973321137	fixbug	2025-08-14 11:34:02 +09:00
dev	2cea34dbab	Merge pull request 'Update screen 13, grid color' (#64 ) from dev-trungvq7-0729 into dev Reviewed-on: #64	2025-08-13 19:02:06 +09:00
dev	f41bd1283a	Update 1308	2025-08-13 18:20:59 +09:00
dev	d5c59286ad	Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-trungvq7-0729	2025-08-13 17:14:44 +09:00
dev	287c68252b	Update 1108	2025-08-13 17:14:39 +09:00
dev	59ec2eda59	Merge pull request 'dev-dungtv-0813' (#63 ) from dev-dungtv-0813 into dev Reviewed-on: #63	2025-08-13 16:12:46 +09:00
Tran Van Dung/(Tran Van Dung)/현장대리인/SK	f6c071bdf0	fix menu item:hover style	2025-08-13 13:37:51 +07:00
Tran Van Dung/(Tran Van Dung)/현장대리인/SK	24882a21a5	fix bugs style button delete	2025-08-13 13:20:58 +07:00