Merge pull request 'fix desgin screen 38' (#69) from dev-manhph1-figbug into dev

Reviewed-on: #69

assets/scss/common/grid.scss

@@ -21,15 +21,6 @@
     display: none;
   }
 
-  &-no-scroll-y {
-    .tui-grid-rside-area {
-      .tui-grid-header-area,
-      .tui-grid-summary-area {
-        margin-right: 0 !important;
-      }
-    }
-  }
-
   &-rside-area {
 
     .tui-grid-header-area,

components/common/Grid.vue

@@ -174,11 +174,6 @@ export default {
 				this.gridScrollTop = e.target.scrollTop;
 				this.gridScrollLeft = e.target.scrollLeft;
 			});
-			if (this.scrollBody.scrollHeight > this.scrollBody.clientHeight) {
-				this.gridInstance.$el.getElementsByClassName('tui-grid-content-area')[0].classList.remove('tui-grid-no-scroll-y');
-			} else {
-				this.gridInstance.$el.getElementsByClassName('tui-grid-content-area')[0].classList.add('tui-grid-no-scroll-y');
-			}
 		}
 	},
 	methods: {

pages/comm/base/NoticeMngPage.vue

@@ -4,7 +4,7 @@
 		<!-- 리스트 페이지 시작 -->
 		<div v-if="pageActionFlag == 'list'" class="h1001">
 			<v-card class="">
-				<div class="pa-5 pb-0">
+				<div class="pa-5">
 					<v-row align="center" no-gutters>
 						<v-col :cols="12" class="d-flex align-center justify-space-between">
 							<v-card-title class="pa-0 custom-title-4">공지사항</v-card-title>
@@ -15,15 +15,11 @@
 								<!-- <v-btn @click="listPageButtonGroupClickEvent('delete')" :ripple="false">삭제</v-btn> -->
 							</div>
 						</v-col>
-						<v-col :cols="12" ref="contents" class="mt-5" style="min-height: calc(100% - 73px);">
+						<v-col :cols="12" ref="contents" class="mt-5" style="min-height: calc(100% - 76px);">
-							<div ref="gridParent" class="px-50" style="min-height: 64vh;">
+							<div ref="gridParent" class="px-50" style="min-height: 70vh;">
 								<component :ref="gridName" :is="loadGrid ? 'Grid' : null" :gridName="gridName"
 									:parentPrgmId="myPrgmId" @getRowsData="getRowData" />
 							</div>
-							<div class="d-flex align-center justify-center pa-5" v-if="loadGrid && totalCount > 0">
-								<pagination id="pagination" :total-count="totalCount" :page-num="page" :limit="limit"
-									@loadData="changeGrid" />
-							</div>
 						</v-col>
 					</v-row>
 				</div>
@@ -41,7 +37,7 @@
 								class="mr-1" icon="unordered-list">목록</a-button>
 							<a-button @click="viewPageButtonGroupClickEvent('reply')" type="primary" :ripple="false"
 								class="mr-1" icon="send-outlined">
-								<v-icon small :class="['mr-2']">$icoSend</v-icon>
+								<v-icon small :class="['mr-2']" >$icoSend</v-icon>
 								답글
 							</a-button>
 							<a-button @click="viewPageButtonGroupClickEvent('update')" type="primary" :ripple="false"
@@ -64,8 +60,11 @@
 						<v-card-title class="custom-title-7 pa-0">
 							파일목록
 						</v-card-title>
-						<div v-for="fileData in viewActionData.fileData" :key="fileData.apndFileId"
+						<div v-for="fileData in viewActionData.fileData" 
-							:class="['file-item', isDarkMode ? 'dark' : 'light']" style="background-color: unset;">
+							:key="fileData.apndFileId" 
+							:class="['file-item', isDarkMode?'dark':'light']"
+							style="background-color: unset;"
+						>
 							<a @click.prevent="downloadFile(fileData)" class="pa-0">
 								<div class="d-flex justify-start search-box-label mb-0">
 									<v-icon>mdi-paperclip</v-icon>
@@ -94,14 +93,15 @@
 						</v-col>
 						<v-col :cols="12" style="min-height: calc(100vh - 450px);">
 							<editor ref="tuiEditor" height="100%" initialEditType="wysiwyg"
-								:class="[isDarkMode ? 'toastui-editor-dark' : 'toastui-editor-light']" />
+							:class="[isDarkMode ? 'toastui-editor-dark' : 'toastui-editor-light']"/>
 						</v-col>
 
 						<v-col :cols="6" class="mt-5">
 							<v-card-title class="custom-title-7 pa-0">파일첨부</v-card-title>
 							<div class="" v-if="writeActionData.fileData">
 								<div v-for="(fileData, index) in writeActionData.fileData" :key="fileData.apndFileId"
-									:class="['file-item d-flex justify-space-between', isDarkMode ? 'dark' : 'light']">
+									:class="['file-item d-flex justify-space-between', isDarkMode?'dark':'light']"
+								>
 									<div class="file-item-detail">
 										<v-icon>mdi-paperclip</v-icon>
 										<span href="#" class="file-item-name">{{ fileData.name }}</span>
@@ -110,16 +110,17 @@
 										@click="writeActionData.업로드fileData.splice(index, 1)" />
 								</div>
 							</div>
-							<a-button class="ant-btn-popup-default mt-3" color="primary" icon="upload"
+							<a-button class="ant-btn-popup-default mt-3" color="primary" icon="upload" @click="$refs.writeInputFile.$refs.input.click()">
-								@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"
+							<a-button @click="writePageButtonGroupClickEvent('cancel')" 
-								class="ant-btn-popup-default mr-2" color="primary">취소</a-button>
+								: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>
@@ -142,13 +143,14 @@
 					</v-col>
 					<v-col :cols="12" style="height: calc(100vh - 270px);" class="mt-2">
 						<editor ref="tuiReplyEditor" height="100%" initialEditType="wysiwyg" 
-							:class="[isDarkMode ? 'toastui-editor-dark' : 'toastui-editor-light']" />
+						:class="[isDarkMode ? 'toastui-editor-dark' : 'toastui-editor-light']"/>
 					</v-col>
 					<v-col :cols="6" class="mt-5">
 						<v-card-title class="custom-title-7 pa-0">파일첨부</v-card-title>
 						<div class="" v-if="replyActionData.fileData">
 							<div v-for="(fileData, index) in replyActionData.fileData" :key="fileData.apndFileId"
-								:class="['file-item d-flex justify-space-between', isDarkMode ? 'dark' : 'light']">
+								:class="['file-item d-flex justify-space-between', isDarkMode?'dark':'light']"
+							>
 								<div class="file-item-detail">
 									<v-icon>mdi-paperclip</v-icon>
 									<span href="#" class="file-item-name">{{ fileData.name }}</span>
@@ -157,8 +159,7 @@
 									@click="replyActionData.fileData.splice(index, 1)" />
 							</div>
 						</div>
-						<a-button class="ant-btn-popup-default mt-3" color="primary" icon="upload"
+						<a-button class="ant-btn-popup-default mt-3" color="primary" icon="upload" @click="$refs.replyInputFile.$refs.input.click()">
-							@click="$refs.replyInputFile.$refs.input.click()">
 							업로드
 						</a-button>
 						<v-file-input ref="replyInputFile" multiple show-size v-model="replyActionData.fileData"
@@ -166,8 +167,10 @@
 						</v-file-input>
 					</v-col>
 					<v-col :cols="12" class="text-right">
-						<a-button @click="replyPageButtonGroupClickEvent('cancel')" class="ant-btn-popup-default mr-2"
+						<a-button @click="replyPageButtonGroupClickEvent('cancel')" 
-							color="primary" :ripple="false">취소</a-button>
+							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>
@@ -192,13 +195,14 @@
 						<v-col :cols="12" style="height: calc(90vh - 270px);" class="mt-4">
 							<editor ref="tuiUpdateEditor" height="100%" initialEditType="wysiwyg"
 								:initialValue="updateActionData.content"
-								:class="[isDarkMode ? 'toastui-editor-dark' : 'toastui-editor-light']" />
+								:class="[isDarkMode ? 'toastui-editor-dark' : 'toastui-editor-light']"/>
 						</v-col>
 						<v-col :cols="6" class="mt-5">
 							<v-card-title class="custom-title-7 pa-0">파일첨부</v-card-title>
 							<div class="" v-if="updateActionData.fileData">
 								<div v-for="(fileData, index) in updateActionData.fileData" :key="fileData.apndFileId"
-									:class="['file-item d-flex justify-space-between', isDarkMode ? 'dark' : 'light']">
+									:class="['file-item d-flex justify-space-between', isDarkMode?'dark':'light']"
+								>
 									<div class="file-item-detail">
 										<v-icon style="font-size: 18px;">mdi-paperclip</v-icon>
 										<span href="#" class="file-item-name">{{ fileData.name }}</span>
@@ -210,7 +214,8 @@
 							<div class="current-files" v-if="updateActionData.currentFileList">
 								<div v-for="(fileData, index) in updateActionData.currentFileList"
 									:key="fileData.apndFileId"
-									:class="['file-item d-flex justify-space-between', isDarkMode ? 'dark' : 'light']">
+									:class="['file-item d-flex justify-space-between', isDarkMode?'dark':'light']"
+								>
 									<div class="file-item-detail">
 										<v-icon style="font-size: 18px;">mdi-paperclip</v-icon>
 										<span @click.prevent="downloadFile(fileData)" href="#"
@@ -221,8 +226,7 @@
 										@click="addFileToDeleteFileList(fileData)" />
 								</div>
 							</div>
-							<a-button class="ant-btn-popup-default mt-2" color="primary" icon="upload"
+							<a-button class="ant-btn-popup-default mt-2" color="primary" icon="upload" @click="$refs.updateInputFile.$refs.input.click()">
-								@click="$refs.updateInputFile.$refs.input.click()">
 								업로드
 							</a-button>
 							<v-file-input ref="updateInputFile" multiple show-size v-model="updateActionData.fileData"
@@ -231,7 +235,9 @@
 						</v-col>
 						<v-col :cols="12" class="text-right">
 							<a-button @click="updatePageButtonGroupClickEvent('cancel')" 
-								class="ant-btn-popup-default mr-2" color="primary">취소</a-button>
+								class="ant-btn-popup-default mr-2" 
+								color="primary"
+							>취소</a-button>
 							<a-button @click="updatePageButtonGroupClickEvent('update')" type="primary">등록</a-button>
 						</v-col>
 					</v-row>
@@ -252,7 +258,6 @@ import '@toast-ui/editor/dist/toastui-editor.css';
 import { Editor } from '@toast-ui/vue-editor';
 import '@toast-ui/editor/dist/toastui-editor-viewer.css';
 import { Viewer } from '@toast-ui/vue-editor';
-import pagination from '~/components/common/Pagination';
 
 let myTitle;
 // const myPrgmId = "PRG0034";
@@ -279,7 +284,6 @@ export default {
 		Utility,
 		Editor,
 		Viewer,
-		pagination,
 	},
 	data() {
 		return {
@@ -294,11 +298,6 @@ export default {
 			loadGrid: false,
 			selectedRowKey: null,
 			selectedRowData: null,
-			itemsPerPage: 10,
-			itemsPerPageArray: [10, 20, 30],
-			limit: 20,
-			page: 1,
-			totalCount: 0,
 			writeActionData: {
 				title: '',
 				postNo: null,
@@ -340,10 +339,7 @@ export default {
 	},
 	watch: {
 		chkIsFind(val) {
-			if (val) {
+			if (val) this.search();
-				this.page = 1;
-				this.search();
-			}
 		},
 	},
 	async beforeCreate() {
@@ -429,7 +425,7 @@ export default {
 			this.getGridData();
 		},
 		gridInit() {
-			const gridHeight = this.$refs.contents.offsetHeight - 120;
+			const gridHeight = this.$refs.contents.offsetHeight - 76;
 
 			const myOptions = {
 				header: {
@@ -501,29 +497,16 @@ export default {
 		async getGridData() {
 			var params = {
 				bordNo: 'BORD0001',
-				limit: this.limit,
-				page: this.page,
-				offset: (this.page - 1) * this.limit, // MariaDB Query에서 직접 계산이 안됨
 			};
 
 			this.loadGrid = false;
 
 			const res = await this.postApiReturn({
-				apiKey: 'selectPostData',
+				apiKey: 'selectPostList',
-				resKey: 'postPage',
+				resKey: 'postData',
 				sendParam: params,
 			});
 
-			const res2 = await this.postApiReturn({
-				apiKey: 'selectPostPageTotal',
-				resKey: 'postPageTotal',
-				sendParam: {
-					bordNo: 'BORD0001',
-				}
-			});
-
-			this.totalCount = res2[0].totalcount;
-
 			this.setGridData({
 				gridKey: this.gridName,
 				value: res,
@@ -1055,12 +1038,6 @@ export default {
 
 			return resultFlag;
 		},
-		changeGrid: async function (pageNum, limit) {
-			this.page = pageNum;
-			this.limit = limit;
-
-			this.search();
-		},
 	},
 };
 

pages/ems/base/PastRsltDataReadPage.vue

@@ -12,7 +12,7 @@
 						</v-col>
 						<v-col :cols="3">
 							<component :is="'EvtObjPop'" :parentPrgmId="myPrgmId" :item="evtObjPopItem"
-								class="no-gutters" customClass="select-large pa-0" />
+								class="no-gutters" customClass="select-large" />
 						</v-col>
 						<v-col :cols="3">
 							<!-- 대상일 -->
@@ -38,7 +38,7 @@
 					<div class="d-flex align-center justify-center pa-5" v-if="loadGrid && totalCount > 0">
 							<pagination id="pagination" :total-count="totalCount" :page-num="page" :limit="limit"
 								@loadData="changeGrid" />
-					</div>
+						</div>
 				</v-card>
 
 			</v-col>

pages/ems/effc/EnrgUsePlanPage.vue

@@ -32,19 +32,15 @@
 		</v-row>
 		<v-row ref="contents">
 			<v-col :cols="12" >
-				<v-card>
+				<v-card class="pb-5">
 					<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>
-					<div ref="gridParent" class="px-5" style="min-height: 50vh;">
+					<div ref="gridParent" class="px-5" style="min-height: 60vh;">
 						<component :ref="gridName" :is="loadGrid ? 'Grid' : null" :gridName="gridName" :parentPrgmId="myPrgmId"
 							:editorGrid="true" @getRowsData="getRowData" />
 					</div>
-					<div class="d-flex align-center justify-center pa-5" v-if="loadGrid && totalCount > 0">
-							<pagination id="pagination" :total-count="totalCount" :page-num="page" :limit="limit"
-								@loadData="changeGrid" />
-					</div>
 				</v-card>
 			</v-col>
 		</v-row>
@@ -61,7 +57,7 @@ import Grid from '~/components/common/Grid';
 import Utility from '~/plugins/utility';
 import Buttons from '~/components/common/button/Buttons';
 import EnrgUsePlanModiPop from '~/components/common/modal/EnrgUsePlanModiPop';
-import pagination from '~/components/common/Pagination';
+import DateUtility from '~/plugins/dateUtility';
 
 let myTitle;
 let myPrgmId;
@@ -90,7 +86,6 @@ export default {
 		Grid,
 		Buttons,
 		EnrgUsePlanModiPop,
-		pagination
 	},
 	data() {
 		return {
@@ -109,11 +104,7 @@ export default {
 			fromDt: new Date().getFullYear(),
 			rowKey: null,
 			edtingFinishFlag: 'Y',
-			itemsPerPage: 10,
+			// gridName: 'rowGrid',
-			itemsPerPageArray: [10, 20, 30],
-			limit: 20,
-			page: 1,
-			totalCount: 0,
 		};
 	},
 	computed: {
@@ -143,10 +134,7 @@ export default {
 			this.fromDt = val;
 		},
 		chkIsFind(val) {
-			if (val) {
+			if (val) this.search();
-				this.page = 1;
-				this.search();
-			}
 		},
 		async selectValue01(val) {
 			if (this.initedFlag) {
@@ -277,7 +265,7 @@ export default {
 		gridInit() {
 			this.loadGrid = false;
 			let _this = this;
-			const gridHeight = this.$refs.gridParent.offsetHeight - 40;
+			const gridHeight = this.$refs.gridParent.offsetHeight - 50;
 			let yyyyCol = this.pageData.fromDt + '년';
 			let childCols1 = [];
 			let myComplexColumns = [
@@ -370,14 +358,14 @@ export default {
 				{
 					header: 'FAB',
 					name: 'fab',
-					width: 85,
+					width: 100,
 					align: 'left',
 					// hidden: true,
 				},
 				{
 					header: '공정명',
 					name: 'eccNm',
-					width: 150,
+					width: 100,
 					align: 'left',
 					hidden: true,
 				},
@@ -427,7 +415,7 @@ export default {
 				{
 					header: '구분',
 					name: 'gubun',
-					width: 150,
+					width: 200,
 					align: 'left',
 					// hidden: true,
 					formatter({ value }) {
@@ -459,7 +447,7 @@ export default {
 				myColumns.push({
 					header: i.toString() + '월',
 					name: qty,
-					width: 70,
+					width: 80,
 					align: 'right',
 					editor: 'text',
 					formatter: this.numberFormatter,
@@ -512,25 +500,8 @@ export default {
 					pastDt: parseInt(this.fromDt) - 1,
 					eqpmGrpId: this.selectValue03,
 					eccId: this.selectValue01,
-					limit: this.limit,
-					page: this.page,
-					offset: (this.page - 1) * this.limit, // MariaDB Query에서 직접 계산이 안됨
 				},
 			});
-
-			const res2 = await this.postApiReturn({
-				apiKey: 'selectEnrgUsePlanPageTotal',
-				resKey: 'enrgUsePlanPageTotal',
-				sendParam: {
-					fromDt: this.fromDt,
-					pastDt: parseInt(this.fromDt) - 1,
-					eqpmGrpId: this.selectValue03,
-					eccId: this.selectValue01,
-				},
-			});
-
-			this.totalCount = res2[0].totalcount;
-
 			let fabText = this.pageData.eccIdList.filter(item => {
 				return item.value == this.selectValue01;
 			})[0]['text'];
@@ -763,12 +734,6 @@ export default {
 				}
 			}
 		},
-		changeGrid: async function (pageNum, limit) {
-			this.page = pageNum;
-			this.limit = limit;
-
-			this.search();
-		},
 	},
 };
 const dt = new Date();

store/modules/list.js

@@ -514,8 +514,6 @@ const INIT_URL_STATE = {
 
 	// prgmId: "PRG0003" 공지사항
 	selectPostList: 'comm/base/NoticeMngCtr/selectPostList',
-	selectPostData: 'comm/base/NoticeMngCtr/selectPostData',
-	selectPostPageTotal: 'comm/base/NoticeMngCtr/selectPostPageTotal',
 	deletePostList: 'comm/base/NoticeMngCtr/deletePost',
 
 	//prgmId: "PRG0121" 공지사항 게시물 상세조회
@@ -904,8 +902,6 @@ const INIT_URL_STATE = {
 	//prgmId: PRG0079 에너지사용량계획
 	selectFabCodeList: 'ems/effc/EnrgUsePlanCtr/selectFabCodeList',
 	selectEnrgUsePlanData: 'ems/effc/EnrgUsePlanCtr/selectEnrgUsePlanData',
-	selectEnrgUsePlanPageTotal: 'ems/effc/EnrgUsePlanCtr/selectEnrgUsePlanPageTotal',
-
 	saveEmsEqpmMmPlanDatas: 'ems/effc/EnrgUsePlanCtr/saveEmsEqpmMmPlanDatas',
 
 	//prgmId : PRG0080 에너지 사용량 - Total Summary