Merge pull request 'fixbug' (#34) from dev-luannv24-fixbugs32s2 into dev

Reviewed-on: #34

assets/scss/common/grid.scss

@@ -98,6 +98,12 @@
   @include theme($theme);
 
   .v-application.#{$theme}-mode {
+    .tui-grid-content-area{
+      .tui-grid-header-area{
+        height: auto !important;
+      }
+    }
+
     .grid-title {
       font-weight: 600;
       font-size: 16px;
@@ -308,13 +314,13 @@
             #{$theme},
             "tui-grid-cell-borderColor"
           );
-          .tui-grid-cell-content {
+          // .tui-grid-cell-content {
-            border-right: 1px solid ;
+          //   border-right: 1px solid ;
-            border-right-color: map-deep-get($config,
+          //   border-right-color: map-deep-get($config,
-              #{$theme},
+          //     #{$theme},
-              "tui-grid-cell-borderColor"
+          //     "tui-grid-cell-borderColor"
-            );
+          //   );
-          }
+          // }
         }
       }
 

components/common/button/ActionButtons.vue

@@ -1,21 +1,8 @@
 <template>
 	<div class="d-flex flex-row justify-center align-center" style="gap: 12px">
-		<!--<v-btn icon tile :ripple="false" @click="btnActionsFnc('addLeftToRight')">
+		<a-button @click="btnActionsFnc('removeRightToLeft')" type="primary" ghost :icon="icons.remove" >
-			<v-icon>mdi-chevron-right</v-icon>
-		</v-btn> -->
-		<a-button @click="btnActionsFnc('removeRightToLeft')" type="primary" ghost icon="up" >
 		</a-button>
-
+		<a-button   @click="btnActionsFnc('addLeftToRight')" type="primary" ghost :icon="icons.add">
-		<!--<v-btn
-			icon
-			tile
-			:ripple="false"
-			class="mt-2"
-			@click="btnActionsFnc('removeRightToLeft')"
-		>
-			<v-icon>mdi-chevron-left</v-icon>
-		</v-btn> -->
-		<a-button   @click="btnActionsFnc('addLeftToRight')" type="primary" ghost icon="down">
 		</a-button>
 	</div>
 </template>
@@ -38,8 +25,18 @@ export default {
 			type: Function,
 			required: true,
 		},
+		directionBtn: {
+			type: String,
+			default: "horizontally" //horizontally, vertically.
+		}
+	},
+	computed: {
+		icons() {
+			return this.directionBtn === "vertically"
+				? { remove: "up", add: "down" }
+				: { remove: "left", add: "right" };
+			},
 	},
-	computed: {},
 	data() {
 		return {};
 	},

components/common/button/BtnExcelDownload.vue

@@ -45,7 +45,7 @@ export default {
 		size: {
 			type: String,
 			require: false,
-			default: "default", // small, middle, large
+			default: "default", // small, default, large
 		}
 	},
 	data() {

components/common/modal/ChangeUserPswdPopPage.vue

@@ -44,8 +44,7 @@
 				<v-card-title>
 					<span class="custom-title-4">비밀번호 {{ isPassword }}</span>
 				</v-card-title>
-				<v-divider></v-divider>
+				<v-card-text class="pb-4">
-				<v-card-text>
 					<v-col>
 						<label for="" class="search-box-label">
 							{{ isPassword }}할 비밀번호를 입력하세요
@@ -73,11 +72,10 @@
 						></v-text-field>
 					</v-col>
 				</v-card-text>
-				<v-divider></v-divider>
+				<v-card-actions class="pb-4">
-				<v-card-actions>
 					<v-spacer></v-spacer>
 					<!-- <v-btn color="primary" dark @click="setUpdate()">확인</v-btn> -->
-					<div>
+					<div class="pr-3">
 						 <a-button @click="close()" class="btn-default">삭제</a-button>
 						 <a-button type="primary" @click="setUpdate()" class="v-btn-add-text">
 							 확인

components/pages/ems/DataSetInfo/DataSetTagRelTab.vue

@@ -38,7 +38,7 @@
 import { mapState, mapMutations, mapActions } from 'vuex';
 import Buttons from '~/components/common/button/Buttons';
 import Grid from '~/components/common/Grid';
-import { CustumChecbox } from '~/plugins/gridUtility';
+import { CustomCheckbox } from '~/plugins/gridUtility';
 import { CustomNumberEditor } from '~/plugins/gridUtility';
 import Form from '~/components/common/form/Form';
 import mixinGlobal from '@/mixin/global.js';

components/pages/ems/ReadPlcInfo/ReadPlcTagRelTab.vue

@@ -30,7 +30,7 @@
 import { mapState, mapMutations, mapActions } from 'vuex';
 import Buttons from '~/components/common/button/Buttons';
 import Grid from '~/components/common/Grid';
-import { CustumChecbox } from '~/plugins/gridUtility';
+import { CustomCheckbox } from '~/plugins/gridUtility';
 import { CustomNumberEditor } from '~/plugins/gridUtility';
 import Form from '~/components/common/form/Form';
 import mixinGlobal from '@/mixin/global.js';
@@ -185,7 +185,7 @@ export default {
 					align: 'center',
 					width: 100,
 					// renderer: {
-					//   type: CustumChecbox,
+					//   type: CustomCheckbox,
 					//   options: {
 					//     onlyone: true,
 					//     // disabled: true

pages/comm/auth/MenuRoleMngPage.vue

@@ -342,7 +342,7 @@ export default {
 			//---------------------gridOption 설정 끝----------------------------
 
 			//---------------------gridName3의 체크박스 설정 시작----------------------------
-			class CustumChecbox {
+			class CustomCheckbox {
 				constructor(props) {
 					const el = document.createElement('input');
 					const { grid, rowKey, columnInfo } = props;
@@ -433,7 +433,7 @@ export default {
 					name: 'useFg',
 					align: 'center',
 					renderer: {
-						type: CustumChecbox,
+						type: CustomCheckbox,
 					},
 				},
 				{
@@ -441,7 +441,7 @@ export default {
 					name: 'authCd1',
 					align: 'center',
 					renderer: {
-						type: CustumChecbox,
+						type: CustomCheckbox,
 					},
 				},
 				{
@@ -449,7 +449,7 @@ export default {
 					name: 'authCd2',
 					align: 'center',
 					renderer: {
-						type: CustumChecbox,
+						type: CustomCheckbox,
 					},
 				},
 				{
@@ -457,7 +457,7 @@ export default {
 					name: 'authCd3',
 					align: 'center',
 					renderer: {
-						type: CustumChecbox,
+						type: CustomCheckbox,
 					},
 				},
 				{
@@ -465,7 +465,7 @@ export default {
 					name: 'authCd4',
 					align: 'center',
 					renderer: {
-						type: CustumChecbox,
+						type: CustomCheckbox,
 					},
 				},
 				{
@@ -473,7 +473,7 @@ export default {
 					name: 'authCd5',
 					align: 'center',
 					renderer: {
-						type: CustumChecbox,
+						type: CustomCheckbox,
 					},
 				},
 				{
@@ -481,7 +481,7 @@ export default {
 					name: 'authCd6',
 					align: 'center',
 					renderer: {
-						type: CustumChecbox,
+						type: CustomCheckbox,
 					},
 				},
 			];

pages/comm/auth/UserRoleMngPage.vue

@@ -151,6 +151,7 @@
 												:leftGridName="gridName2"
 												:rightGridName="gridName3"
 												:btnActionsFnc="dualGridBtnActions"
+												directionBtn="vertically"
 											/>
 										</v-col>
 										<v-col :cols="12" class="h100">
@@ -981,7 +982,7 @@ const myDetail = blocCdList => {
 			cols: 6,
 			labelCols: 12,
 			textCols: 12,
-			class: 'py-2 pr-4',
+			class: 'py-2 pl-4',
 			iconShow: true,
 			required: true,
 		},
@@ -1005,7 +1006,7 @@ const myDetail = blocCdList => {
 			cols: 6,
 			labelCols: 12,
 			textCols: 12,
-			class: 'py-2 pr-4',
+			class: 'py-2 pl-4',
 			iconShow: true,
 			required: true,
 		},
@@ -1031,7 +1032,7 @@ const myDetail = blocCdList => {
 			cols: 6,
 			labelCols: 12,
 			textCols: 12,
-			class: 'py-2 pr-4',
+			class: 'py-2 pl-4',
 			iconShow: true,
 		},
 		{
@@ -1054,7 +1055,7 @@ const myDetail = blocCdList => {
 			cols: 6,
 			labelCols: 12,
 			textCols: 12,
-			class: 'py-2 pr-4',
+			class: 'py-2 pl-4',
 			iconShow: true,
 			placeholder: '시스템 자동입력',
 		},
@@ -1078,7 +1079,7 @@ const myDetail = blocCdList => {
 			cols: 6,
 			labelCols: 12,
 			textCols: 12,
-			class: 'py-2 pr-4',
+			class: 'py-2 pl-4',
 			iconShow: true,
 			placeholder: '시스템 자동입력',
 		},

pages/ems/base/EnrgCostCenterMngPage.vue

@@ -4,7 +4,7 @@
 			<v-col :cols="12">
 				<v-card class="searchFilter">
 					<v-row align="center" no-gutters>
-						<v-col :cols="3">
+						<v-col :cols="2.5">
 							<component
 								:is="'selectCodeList'"
 								:parentPrgmId="myPrgmId"
@@ -14,7 +14,7 @@
 								:addAll="true"
 							/>
 						</v-col>
-						<v-col :cols="3">
+						<v-col :cols="2.5">
 							<component
 								:is="'selectCodeList'"
 								:parentPrgmId="myPrgmId"
@@ -24,8 +24,8 @@
 								:addAll="true"
 							/>
 						</v-col>
-						<v-col :cols="3">
+						<!-- 사업장 -->
-							<!-- 사업장 -->
+						<!-- <v-col :cols="3">
 							<div style="visibility:hidden">
 								<component
 									:is="'SelectBlocMstr'"
@@ -33,13 +33,8 @@
 									:parentPrgmId="myPrgmId"
 								/>
 							</div>
-						</v-col>
+						</v-col> -->
-						<v-col :cols="3" class="text-right">
+						<v-col :cols="2.5">
-							<BtnSearch @click="search" />
-						</v-col>
-					</v-row>
-					<v-row align="center" no-gutters>
-						<v-col :cols="3">
 							<component
 								:is="'selectCodeList'"
 								:parentPrgmId="myPrgmId"
@@ -49,7 +44,7 @@
 								:addAll="true"
 							/>
 						</v-col>
-						<v-col :cols="6">
+						<v-col :cols="2.5">
 							<InputText
 								:parentPrgmId="myPrgmId"
 								label="공정명"
@@ -59,6 +54,12 @@
 								:searchOption="true"
 							/>
 						</v-col>
+						<v-col class="text-right">
+							<BtnSearch @click="search" />
+						</v-col>
+					</v-row>
+					<v-row align="center" no-gutters>
+						
 					</v-row>
 				</v-card>
 			</v-col>

pages/ems/effc/EnrgUsePlanPage.vue

@@ -10,15 +10,15 @@
 						</v-col>
 						<v-col :cols="2.5">
 							<component :is="'SelectBox'" ref="SelectBox1" :propsValue="selectValue01" :itemList="selectValueList01"
-								:label="'FAB'" @update:propsValue="selectValue01 = $event" :iconShow="false" customClass="select-large" />
+								:label="'FAB'" @update:propsValue="selectValue01 = $event" :iconShow="true" customClass="select-large" />
 						</v-col>
 						<v-col :cols="2.5">
 							<component :is="'SelectBox'" ref="SelectBox2" :propsValue="selectValue02" :itemList="selectValueList02"
-								:label="'설비종류'" @update:propsValue="selectValue02 = $event" :iconShow="false" customClass="select-large"/>
+								:label="'설비종류'" @update:propsValue="selectValue02 = $event" :iconShow="true" customClass="select-large"/>
 						</v-col>
 						<v-col :cols="2.5">
 							<component :is="'SelectBox'" ref="SelectBox3" :propsValue="selectValue03" :itemList="selectValueList03"
-								:label="'설비그룹'" @update:propsValue="selectValue03 = $event" :iconShow="false" customClass="select-large" />
+								:label="'설비그룹'" @update:propsValue="selectValue03 = $event" :iconShow="true" customClass="select-large" />
 						</v-col>
 
 						<BtnSearch size="large" @click="search" />
@@ -33,7 +33,7 @@
 		<v-row ref="contents">
 			<v-col :cols="12" >
 				<v-card class="pb-5">
-					<div class="d-flex align-center justify-space-between pa-4">
+					<div class="d-flex align-center justify-space-between py-4 px-4">
 						<v-card-title class="pa-0 custom-title-4">설비별 에너지 계획 리스트</v-card-title>
 						<Buttons :parentPrgmId="myPrgmId" :bindingData="gridName" :btnActionsFnc="btnActions" />
 					</div>
@@ -291,7 +291,7 @@ export default {
 				},
 			};
 
-			class CustumButton {
+			class CustomButton {
 				constructor(props) {
 					const { grid, rowKey, columnInfo } = props;
 
@@ -304,7 +304,7 @@ export default {
 					$(elDiv).addClass('tui-grid-cell-content d-flex justify-space-between');
 					const el2 = document.createElement('button');
 					$(el2).addClass('edit-btn blue--text');
-					el2.innerText = 'Edit';
+					el2.innerText = '편집하다';
 					elDiv.appendChild(el2);
 
 					this.el = elDiv;
@@ -352,7 +352,7 @@ export default {
 					header: 'NO',
 					name: 'rowNum',
 					width: 40,
-					align: 'center',
+					align: 'right',
 					// hidden: true,
 				},
 				{
@@ -389,7 +389,7 @@ export default {
 					// `;
 					// }
 					renderer: {
-						type: CustumButton,
+						type: CustomButton,
 						options: {
 							value: '계획수정',
 						},
@@ -402,7 +402,7 @@ export default {
 					align: 'center',
 					hidden: true,
 					renderer: {
-						type: CustumButton,
+						type: CustomButton,
 						options: {
 							value: '계획수정',
 						},

plugins/gridUtility.js

@@ -115,7 +115,7 @@ export class CustomCalcNumberEditor {
 	}
 }
 
-export class CustumChecbox {
+export class CustomCheckbox {
 	constructor(props) {
 		const el = document.createElement('input');
 		const { grid, rowKey, columnInfo } = props;
@@ -169,7 +169,7 @@ export class CustumChecbox {
 	}
 }
 
-export class CustumButton {
+export class CustomButton {
 	constructor(props) {
 		const el = document.createElement('button');
 		const { grid, rowKey, columnInfo } = props;