gitadmin/sk_fems_ui
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

[Draf] compare dev vs main #43

Open
dev wants to merge 257 commits from dev into dev-base
pull from: dev
merge into: gitadmin:dev-base
Conversation 0 Commits 257 Files Changed 248 +42626 -28476
216 changed files with 42626 additions and 28476 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit dca6673a11 - Show all commits

2
components/common/form/TextArea.vue
View File

@ -4,7 +4,7 @@
v-if="item.label"
:cols="item.cols == 12 ? 2 : 4"
:style="item.padding ? 'padding-left:10px' : ''"
class="mb-2"
class="py-0"
>
<label for="" class="search-box-label">
<v-icon

65
pages/ems/effc/EnrgEffcEqpmDetlMntrPage.vue
View File

@ -843,38 +843,39 @@ export default {
});
},
async getFab() {
// let res = await this.postApiReturn({
// apiKey: 'selectFabCodeList',
// resKey: 'fabCodeLists',
// sendParam: {},
// });
this.selectValueList02 = [
{ text: '온도 센서', value: 'ECC001' },
{ text: '압력 센서', value: 'ECC002' },
{ text: '유량 센서', value: 'ECC003' },
{ text: '습도 센서', value: 'ECC004' },
{ text: '전압 센서', value: 'ECC005' }
];
// if (res.length > 0) {
// // this.selectValueList02 = await res.map(item => {
// // return {
// // text: item.eccNm,
// // value: item.eccId,
// // };
// // });
// this.selectValueList02.unshift({
// text: '전체',
// value: null,
// });
// if (this.routeData.fabId != null && this.routeData.fabId != '') {
// this.selectValue02 = this.routeData.fabId;
// } else if (this.routeData.fabId == null || this.routeData.fabId == '') {
// this.selectValue02 = this.selectValueList02[0].value;
// }
// } else {
// this.selectValueList02 = [];
// this.selectValue02 = null;
// }
let res = await this.postApiReturn({
apiKey: 'selectFabCodeList',
resKey: 'fabCodeLists',
sendParam: {},
});
// this.selectValueList02 = [
// { text: '온도 센서', value: 'ECC001' },
// { text: '압력 센서', value: 'ECC002' },
// { text: '유량 센서', value: 'ECC003' },
// { text: '습도 센서', value: 'ECC004' },
// { text: '전압 센서', value: 'ECC005' }
// ];
console.log(res)
if (res.length > 0) {
// this.selectValueList02 = await res.map(item => {
// return {
// text: item.eccNm,
// value: item.eccId,
// };
// });
this.selectValueList02.unshift({
text: '전체',
value: null,
});
if (this.routeData.fabId != null && this.routeData.fabId != '') {
this.selectValue02 = this.routeData.fabId;
} else if (this.routeData.fabId == null || this.routeData.fabId == '') {
this.selectValue02 = this.selectValueList02[0].value;
}
} else {
this.selectValueList02 = [];
this.selectValue02 = null;
}
this.setPageData({
fabIdList: this.selectValueList02,
fabId: this.selectValue02,

2
store/modules/menu.js
View File

@ -157,7 +157,7 @@ export const actions = {
{
comId: 'd48',
sysDivCd: 'energyeffc', //시스템구분
menuId: 'MNU0106', // MENU_ID (메뉴ID)
menuId: 'MNU0097', // MENU_ID (메뉴ID)
prgmId: 'PRG0084', // PRGM_ID (프로그램ID)
upMenuId: 'menu2', // UP_MENU_ID (상위메뉴ID)
menuNm: '7. Energy Efficiency Equipment',// MENU_NM (메뉴명)