Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-trungvq7-0729

assets/scss/common.scss

@@ -144,7 +144,7 @@ a {
 
   & .router-tab__container {
     overflow-y: auto;
-    height: calc(100vh - 105px);
+    min-height: calc(100vh - 105px);
     max-height: calc(100vh - 105px);
     padding: 20px;
   }

layouts/default.vue

@@ -131,8 +131,8 @@
                         $depth3rdBulletDark
                       </v-icon>
                       <span v-if="item.url">{{ item.menuNm }}
-                        <span v-if="item.bookmark" class="material-icons" style="font-size: 17px; vertical-align: middle;" @click="addBookMark(item.menuId, item.url, item.bookmark)">star</span>
-                        <span v-else-if="!item.bookmark" class="material-icons" style="font-size: 17px; vertical-align: middle;" @click="addBookMark(item.menuId, item.url, item.bookmark)">star_border</span>
+                        <!-- <span v-if="item.bookmark" class="material-icons" style="font-size: 17px; vertical-align: middle;" @click="addBookMark(item.menuId, item.url, item.bookmark)">star</span>
+                        <span v-else-if="!item.bookmark" class="material-icons" style="font-size: 17px; vertical-align: middle;" @click="addBookMark(item.menuId, item.url, item.bookmark)">star_border</span> -->
                       </span>
                       <span v-else-if="!item.url">{{ item.menuNm }}</span>
                       <v-icon v-if="item.lvl >= 1 && item.childeVo && item.childeVo.length > 0 && !item.url">
@@ -392,7 +392,6 @@ export default {
       deep: true,
       handler(value) {
         if (value) {
-          console.log(value)
           const prgmId = value.prgmId;
           let thisPrgmId = this.$route.query.prgmId;
           var tmp = 0;

mixin/global.js

@@ -58,7 +58,7 @@ export default {
 		layoutInit() {
 			if (this.$refs.searchFilter) {
 				const searchFilterHeight = this.$refs.searchFilter.offsetHeight;
-				this.$refs.contents.style.height = `calc(100% - ${searchFilterHeight + 20}px)`;
+				this.$refs.contents.style.minHeight = `calc(100% - ${searchFilterHeight + 20}px)`;
 			}
 		},
 		//init() {}

pages/comm/auth/UserRoleMngPage.vue

@@ -12,8 +12,6 @@
 								:parentPrgmId="myPrgmId"
 								:sendParam="{ comId }"
 								customClass="select-large"
-								labelCols="12" 
-								textCols="12"
 							/>
 							<!-- <component
                 :is="'selectCodeList'"
@@ -312,9 +310,37 @@ export default {
 			 this.gridInit();
 		},
 
+		gridInitTest() {
+			const rowGrid = {
+				column: [
+				{ header: '사용자No', name: 'userNo', align: 'center', hidden: true },
+				{ header: '사용자명', name: 'userNm' },
+				{ header: '사용자ID', name: 'userLoginId' },
+				{ header: '사용자비밀번호', name: 'userPswd', hidden: true },
+				{ header: '사업장', name: 'blocId', hidden: true },
+				{ header: 'email', name: 'email', hidden: true },
+				{ header: '등록자NO', name: 'regUserNo', hidden: true },
+				{ header: '등록일시', name: 'regDttm', hidden: true },
+				{ header: '수정자NO', name: 'procUserNo', hidden: true },
+				{ header: '수정일시', name: 'procDttm', hidden: true },
+				{ header: 'comId', name: 'comId', hidden: true },
+				{ header: 'deptId', name: 'deptId', hidden: true },
+				],
+				data: dataMockExample,
+				defaultRow: dataMockExample,
+				option: [],
+			}
+			this.dataPathMock = {rowGrid};
+			this.$nextTick(() => {
+				this.loadGrid = true;
+			});
+		},
+
 		// 사용자 리스트 그리드 세팅
 		gridInit() {
 
+			// this.gridInitTest(); return
+
 			const gridHeight = this.$refs.gridParent.offsetHeight - 90;
 
 			const myOptions = {

pages/comm/base/BatchLogMngPage.vue

@@ -4,28 +4,24 @@
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
-					<v-row align="end" no-gutters>
-						<v-col :cols="2.5">
+					<v-row align="center" no-gutters>
+						<v-col :cols="2">
 							<InputText
 								:parentPrgmId="myPrgmId"
 								label="배치ID"
 								valueNm="batchId"
 								:searchOption="true"
-								:iconShow="true"
-								customClass="input-large"
 							/>
 						</v-col>
-						<v-col :cols="2.5">
+						<v-col :cols="2">
 							<InputText
 								:parentPrgmId="myPrgmId"
 								label="배치명"
 								valueNm="batchNm"
 								:searchOption="true"
-								:iconShow="true"
-								customClass="input-large"
 							/>
 						</v-col>
-						<v-col :cols="2.5">
+						<v-col :cols="2">
 							<component
 								:is="'selectCodeList'"
 								:parentPrgmId="myPrgmId"
@@ -33,21 +29,19 @@
 								:dataKey="'execRsltCd'"
 								:sendParam="{ commGrpCd: 'CO_BATCH_EXEC_RSLT', useFg: '1' }"
 								:addAll="true"
-								:iconShow="true"
-								customClass="select-large"
 							/>
 						</v-col>
-						<v-col :cols="2.5">
+						<v-col :cols="2">
 							<component
 								:is="'Datepicker'"
 								:parentPrgmId="myPrgmId"
 								:label="'조회기간'"
-								:customClass="'input-large'"
 							/>
 						</v-col>
-						<v-col :cols="2" class="text-right d-flex align-end justify-end ga-1" style="gap: 4px">
-							<BtnSearch size="large" />
-							<BtnExcelDownload :parentPrgmId="myPrgmId" :gridName="gridName" size="large" />
+						<v-spacer></v-spacer>
+						<v-col :cols="4" class="text-right">
+							<BtnSearch />
+							<BtnExcelDownload :parentPrgmId="myPrgmId" :gridName="gridName" />
 						</v-col>
 					</v-row>
 				</v-card>
@@ -141,7 +135,7 @@ export default {
 			myPrgmId: myPrgmId,
 			loadGrid: false,
 			gridName: 'rowGrid',
-			rowGridOrigin: [],
+			// rowGridOrigin: [],
 			detailList: myDetail,
 		};
 	},
@@ -297,7 +291,7 @@ export default {
 
 			// 엑셀 다운로드용 데이터 재정렬
 			this.xlsDataBind(res);
-			this.rowGridOrigin = Utility.copyObj(newRes);
+			// this.rowGridOrigin = Utility.copyObj(newRes);
 			this.setGridData({
 				gridKey: this.gridName,
 				value: newRes,
@@ -433,3 +427,6 @@ const myDetail = [
 	},
 ];
 </script>
+<style lang="scss">
+@import '@/assets/scss/common.scss';
+</style>

pages/ems/base/AddInfoMngPage.vue

@@ -64,6 +64,7 @@
 								:gridName="gridName"
 								:parentPrgmId="myPrgmId"
 								@getRowsData="getRowData"
+								:dataPath="dataPathMock"
 							/>
 						</div>
 					</div>
@@ -136,10 +137,24 @@ export default {
 		return {
 			myPrgmId: myPrgmId,
 			gridName: 'rowGrid',
-			loadGrid: false,
+			loadGrid: true,
 			tab: null,
 			detailList: myDetail,
 			initedFlag: false,
+			dataPathMock : {
+				'rowGrid': {
+					column: [
+						{ header: '추가 정보 그룹', name: 'addGrpId', align: 'left' },
+						{ header: '추가 정보 ID', name: 'addInfoId', align: 'left' },
+						{ header: '추가 정보 명', name: 'addInfoNm', align: 'left' },
+						{ header: 'Data 형식', name: 'addInfoDataKind', align: 'center' },
+						{ header: '사용여부', name: 'useFg', align: 'center' },
+					],
+					data: dataMockExample,
+					defaultRow: dataMockExample,
+					option: {},
+				},
+			},
 		};
 	},
 	computed: {
@@ -336,7 +351,8 @@ export default {
 			this.search();
 		},
 		async search() {
-			this.loadGrid = false;
+			//process
+			this.loadGrid = true;
 			await this.getRowGridData();
 			await this.setPageData({
 				isFind: false,
@@ -626,7 +642,43 @@ const myDetail = [
 		placeholder: '시스템 자동입력',
 	},
 ];
+
+const dataMockExample = [
+  {
+    addGrpId: 'GRP001',
+    addInfoId: 'INFO001',
+    addInfoNm: '온도 센서',
+    addInfoDataKind: 'DATA01',
+    useFg: true,
+  },
+  {
+    addGrpId: 'GRP002',
+    addInfoId: 'INFO002',
+    addInfoNm: '압력 센서',
+    addInfoDataKind: 'DATA02',
+    useFg: false,
+  },
+  {
+    addGrpId: 'GRP003',
+    addInfoId: 'INFO003',
+    addInfoNm: '압력 센서',
+    addInfoDataKind: 'DATA03',
+    useFg: false,
+  },
+  {
+    addGrpId: 'GRP004',
+    addInfoId: 'INFO004',
+    addInfoNm: '압력 센서',
+    addInfoDataKind: 'DATA04',
+    useFg: false,
+  },
+  {
+    addGrpId: 'GRP005',
+    addInfoId: 'INFO005',
+    addInfoNm: '압력 센서',
+    addInfoDataKind: 'DATA05',
+    useFg: false,
+  },
+];
+
 </script>
-<style lang="scss">
-@import '@/assets/scss/common.scss';
-</style>

pages/ems/base/EnrgReadPlaceMngPage.vue

@@ -25,7 +25,7 @@
 								:textCols="12" :searchOption="true" :customClass="'input-large'" :iconShow="true" />
 						</v-col>
 
-						<BtnSearch @click="search" size="large" />
+						<BtnSearch @click="search" size="large" class="mr-2" />
 
 					</v-row>
 				</v-card>

pages/ems/base/ReadObjectMngPage.vue

@@ -59,7 +59,8 @@
 							:btnActionsFnc="btnActions"
 						/>
 					</div>
-					<div ref="gridParent" class="h100 px-5" style="height:calc(100% - 70px)">
+					<div class="h100 px-5" style="height:calc(100% - 70px)">
+						<div ref="gridParent" class="w100 h100">
 							<component
 								:ref="gridName"
 								:is="loadGrid ? 'Grid' : null"
@@ -70,6 +71,7 @@
 								:selectedRowDataWatchFlag="true"
 							/>
 						</div>
+					</div>
 				</v-card>
 			</v-col>
 			<v-col :cols="7" class="h100">
@@ -405,6 +407,8 @@ export default {
 				value: myColumns,
 			});
 
+			this.loadGrid = true;
+
 			this.search();
 		},
 		async getRowGridData() {
@@ -433,9 +437,8 @@ export default {
 				gridKey: this.gridName,
 				value: newRes,
 			});
-			console.log('-------DEBUG-----newRes: ', newRes);
+
 			this.$nextTick(() => {
-				this.loadGrid = true;
 				if (newRes.length > 0) {
 					try {
 						this.$refs[this.gridName].focus({