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

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

Browse Source
This commit is contained in:
dev
2025-08-07 18:54:21 +09:00
parent c9bc9d3186 a06d2e553d
commit d8c5bd5323
31 changed files with 724 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
pages/comm/auth/MenuRoleMngPage.vue
View File

@ -32,15 +32,18 @@
</div>
</v-card>
</v-col>
<v-col cols="12" lg="9">
<v-col cols="12" lg="9" class="pl-0">
<v-card>
<v-card-title>
<span class="custom-title-4">역할 메뉴별 권한</span>
</v-card-title>
<v-row align="center" no-gutters :style="{ height: 'calc(100% - 62px)' }" class="px-5">
<v-col class="h100" style="max-width: 400px;">
<span class="body-1 font-weight-bold d-flex align-center"
:style="{ minHeight: '36px' }">[미배정]메뉴리스트</span>
<v-card-title class="pl-0 pb-3">
<span class="custom-title-4">[미배정]메뉴리스트</span>
</v-card-title>
<!-- <span class="body-1 font-weight-bold d-flex align-center"
:style="{ minHeight: '36px' }">[미배정]메뉴리스트</span> -->
<div ref="treeGridParent" class="px-0 mt-2" style="height: 60vh;">
<!-- <div
ref="treeGridParent"
@ -55,15 +58,18 @@
<ActionButtons :parentPrgmId="myPrgmId" :leftGridName="gridName2" :rightGridName="gridName3"
:btnActionsFnc="dualGridBtnActions" />
</v-col> -->
<div class="pr-2">
<div class="pr-2 arrow-button">
<ActionButtons :parentPrgmId="myPrgmId" :leftGridName="gridName2" :rightGridName="gridName3"
:btnActionsFnc="dualGridBtnActions" />
:btnActionsFnc="dualGridBtnActions"/>
</div>
<v-col :cols="7" class="h100">
<v-row justify="space-between" align="center" no-gutters class="px-5">
<v-row justify="space-between" align="center" no-gutters class="px-5 pl-0">
<v-col :cols="11">
<span class="body-1 font-weight-bold d-flex align-center"
:style="{ minHeight: '36px' }">[배정]메뉴별권한 리스트</span>
<v-card-title class="pl-0 pb-3">
<span class="custom-title-4">[배정]메뉴별권한 리스트</span>
</v-card-title>
<!-- <span class="body-1 font-weight-bold d-flex align-center"
:style="{ minHeight: '36px' }">[배정]메뉴별권한 리스트</span> -->
<!-- <span class="body-1 font-weight-bold">[배정]메뉴별권한 리스트</span> -->
</v-col>
<v-col :cols="1" class="text-right">
@ -344,8 +350,8 @@ export default {
const _this = this;
const myColumns = [
{ header: '역할ID', name: 'roleId', align: 'left', minWidth: 70,width:120 },
{ header: '역할명', name: 'roleNm', minWidth: 70, align: 'left',width:120 },
{ header: '역할ID', name: 'roleId', align: 'left', minWidth: 70, width: 120 },
{ header: '역할명', name: 'roleNm', minWidth: 70, align: 'left', width: 120 },
{
header: '사용여부',
name: 'useFg',
@ -805,4 +811,23 @@ function numberFormatter({ value }) {
return value;
}
}
</script>
<style lang="scss" scoped>
::v-deep {
.arrow-button button {
display: flex;
justify-content: center;
align-items: center;
width: 24px;
height: 24px;
}
.arrow-button svg {
width: 14px;
height: 14px;
}
}
</style>

4
pages/comm/auth/UserRoleMngPage.vue
View File

@ -12,8 +12,8 @@
:parentPrgmId="myPrgmId"
:sendParam="{ comId }"
customClass="select-large"
labelCols="12"
textCols="12"
:labelCols="12"
:textCols="12"
/>
<!-- <component
:is="'selectCodeList'"

47
pages/comm/base/NoticeMngPage.vue
View File

@ -46,19 +46,21 @@
icon="delete">삭제</a-button>
</div>
</v-col>
<v-col :cols="12" class="mt-5">
<v-col :cols="12" class="mt-5 pb-4">
<v-card-title class="custom-title-6 pa-0">{{ viewActionData.title }}</v-card-title>
</v-col>
<v-col :cols="12" style="min-height: 30vh;" class="pa-0">
<viewer v-if="viewActionData.viewerFlag" ref="tuiViewer" height="inherit"
:initialValue="viewActionData.content" theme="white"
:class="[isDarkMode ? 'theme--white' : 'theme--black', 'custom-view pa-3']" />
<v-col :cols="12" style="min-height: 30vh;" class="pa-0 custom-view">
<v-card class="pa-3" style="overflow-y:auto;">
<viewer v-if="viewActionData.viewerFlag" ref="tuiViewer" height="inherit"
:initialValue="viewActionData.content" theme="white"
:class="[isDarkMode ? 'theme--white' : 'theme--black']" />
</v-card>
</v-col>
<v-col :cols="6" class="mt-5">
<v-card-title class="custom-title-7 pa-0">
파일목록
</v-card-title>
<div v-for="fileData in viewActionData.fileData" :key="fileData.apndFileId" class="file-item">
<div v-for="fileData in viewActionData.fileData" :key="fileData.apndFileId" class="file-item" style="background-color: unset;">
<a @click.prevent="downloadFile(fileData)">
<div class="d-flex justify-start search-box-label">
<v-icon>mdi-paperclip</v-icon>
@ -86,7 +88,8 @@
</v-text-field>
</v-col>
<v-col :cols="12" style="min-height: calc(100vh - 450px);">
<editor ref="tuiEditor" height="100%" initialEditType="wysiwyg" />
<editor ref="tuiEditor" height="100%" initialEditType="wysiwyg"
:class="[isDarkMode ? 'toastui-editor-dark' : 'toastui-editor-light']"/>
</v-col>
<v-col :cols="6" class="mt-5">
@ -132,7 +135,8 @@
</v-text-field>
</v-col>
<v-col :cols="12" style="height: calc(100vh - 270px);" class="mt-2">
<editor ref="tuiReplyEditor" height="100%" initialEditType="wysiwyg" />
<editor ref="tuiReplyEditor" height="100%" initialEditType="wysiwyg"
: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>
@ -179,7 +183,8 @@
</v-col>
<v-col :cols="12" style="height: calc(90vh - 270px);" class="mt-4">
<editor ref="tuiUpdateEditor" height="100%" initialEditType="wysiwyg"
:initialValue="updateActionData.content" />
:initialValue="updateActionData.content"
: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>
@ -187,13 +192,26 @@
<div v-for="(fileData, index) in updateActionData.fileData" :key="fileData.apndFileId"
class="file-item d-flex justify-space-between">
<div class="file-item-detail">
<v-icon>mdi-paperclip</v-icon>
<v-icon style="font-size: 18px;">mdi-paperclip</v-icon>
<span href="#" class="file-item-name">{{ fileData.name }}</span>
</div>
<a-icon type="delete" class="v-icon pointer"
@click="updateActionData.fileData.splice(index, 1)" />
</div>
</div>
<div class="" v-if="updateActionData.currentFileList">
<div v-for="(fileData, index) in updateActionData.currentFileList"
:key="fileData.apndFileId" class="file-item d-flex justify-space-between">
<div class="file-item-detail">
<v-icon style="font-size: 18px;">mdi-paperclip</v-icon>
<span @click.prevent="downloadFile(fileData)" href="#"
class="file-item-name pointer">{{ fileData.apndFileNm + '.' +
fileData.apndFileExt }}</span>
</div>
<a-icon type="delete" class="v-icon pointer"
@click="addFileToDeleteFileList(fileData)" />
</div>
</div>
<a-button class="mt-2" icon="upload" @click="$refs.updateInputFile.$refs.input.click()">
업로드
</a-button>
@ -1044,7 +1062,7 @@ const defaultData = {
.custom-view {
border: 1px solid;
border-radius: 6px;
height: 100%;
height: 0;
@each $theme in dark, light {
@include theme($theme);
@ -1062,8 +1080,13 @@ const defaultData = {
color: #1677FF
}
.toastui-editor-mode-switch .tab-item {
.toastui-editor-light .toastui-editor-mode-switch .tab-item {
color: #000000E0
}
.v-icon.anticon-delete svg {
width: 14px;
height: 14px;
}
}
</style>

25
pages/comm/base/PrgmMngPage.vue
View File

@ -103,21 +103,6 @@ export default {
gridName: 'rowGrid',
// rowGridOrigin: [],
detailList: myDetail,
dataPathMock: {
'rowGrid': {
column: [
{ header: '프로그램ID', name: 'field1', align: 'left' },
{ header: '프로그램덤', name: 'field2', align: 'left' },
{ header: '타임', name: 'field3', align: 'left' },
{ header: '사용여부', name: 'field4', align: 'left' }
],
option: {
scrollY: false,
scrollX: false,
}
}
},
};
},
computed: {
@ -189,17 +174,17 @@ export default {
const gridHeight = this.$refs.gridParent.offsetHeight - 36;
const myOptions = {
scrollX: false,
scrollY: true,
};
// console.log("this.pageData", this.pageData)
const _this = this;
const myColumns = [
{ header: '프로그램ID', name: 'prgmId', align: 'center' },
{ header: '프로그램명', name: 'prgmNm' },
{ header: '프로그램ID', name: 'prgmId', align: 'left' },
{ header: '프로그램명', name: 'prgmNm', align: 'left' },
{
header: '타입',
name: 'prgmTpCd',
align: 'center',
align: 'left',
formatter({ value }) {
return value ? (value === '1' ? '프로그램' : '팝업') : null;
},
@ -207,7 +192,7 @@ export default {
{
header: '사용여부',
name: 'useFg',
align: 'center',
align: 'left',
formatter({ value }) {
value = value === true ? '1' : '0';
const newValue = _this.pageData.selectUseFgList.filter(

2
pages/ems/base/DashboardPage.vue
View File

@ -840,7 +840,7 @@ export default {
{ header: "주의", name: "careStndVal", align: "right", width: 40 },
{ header: "경고", name: "warnStndVal", align: "right", width: 40 },
{ header: "가이드", name: "totVal", align: "right", width: 40 },
{ header: "알람 내용", name: "alrmMsg", align: "left" },
{ header: "알람 내용", name: "alrmMsg", align: "left", resizable: false },
{ header: "설비종류", name: "eqpmKindId", align: "left", hidden: true },
{ header: "설비종류", name: "eqpmKindNm", align: "left", hidden: true },
];

16
pages/ems/base/EnrgCostCenterMngPage.vue
View File

@ -3,7 +3,7 @@
<v-row ref="searchFilter">
<v-col :cols="12">
<v-card class="searchFilter">
<v-row align="center" no-gutters>
<v-row align="end" no-gutters>
<v-col :cols="2.5">
<component
:is="'selectCodeList'"
@ -49,8 +49,8 @@
:parentPrgmId="myPrgmId"
label="공정명"
valueNm="eccNm"
:labelCols="2"
:textCols="9"
:labelCols="12"
:textCols="12"
:searchOption="true"
/>
</v-col>
@ -59,7 +59,13 @@
</v-col>
</v-row>
<v-row align="center" no-gutters>
<div style="display: none">
<component
:is="'SelectBlocMstr'"
ref="SelectBlocMstr"
:parentPrgmId="myPrgmId"
/>
</div>
</v-row>
</v-card>
</v-col>
@ -91,7 +97,7 @@
</div>
</v-card>
</v-col>
<v-col :cols="7" class="h100">
<v-col :cols="7" style="min-height:75vh;">
<v-card class="pb-5">
<v-card-title class="custom-title-4" style="min-height:76px;"
>공정 상세

2
pages/ems/base/EquipmentMasterMngPage.vue
View File

@ -365,7 +365,7 @@ export default {
header: '사업장',
name: 'blocId',
width: 100,
align: 'center',
align: 'left',
hidden: true,
formatter({ value }) {
let retVal = '';

13
pages/ems/effc/DataSetMngPage.vue
View File

@ -53,7 +53,8 @@
</v-col>
<v-col :cols="7" >
<v-card class="pb-5">
<v-card-title class="custom-title-4" style="min-height:76px;">Data Set 상세
<v-card-title class="custom-title-4 pb-0 mb-2" >
Data Set 상세
</v-card-title>
<div class="px-5" style="min-height:calc(100% - 76px)">
<v-tabs v-model="tab">
@ -284,13 +285,13 @@ export default {
header: '모델링 DataSet ID',
name: 'dataSetId',
align: 'left',
width: 180,
minWidth: 200,
},
{
header: 'DataSet 명',
name: 'dataSetNm',
align: 'left',
width: 200,
minWidth: 200,
},
{
header: '사업장',
@ -311,8 +312,8 @@ export default {
{
header: '사용 여부',
name: 'useFg',
width: 100,
align: 'center',
minWidth: 200,
align: 'left',
formatter({ value }) {
value = value === true ? '1' : '0';
const newValue = _this.pageData.useFgList.filter(
@ -321,7 +322,7 @@ export default {
return newValue[0].commCdNm;
},
},
{ header: '비고', name: 'rmrk', align: 'left' },
{ header: '비고', name: 'rmrk', align: 'left', minWidth: 100, },
];
this.setGridColumn({

28
pages/ems/effc/EnrgReptMngPage.vue
View File

@ -62,20 +62,20 @@
<v-card-title class="pa-0">설비별 효율지표 Trend</v-card-title>
</v-col>
<v-col :cols="4" class="d-flex justify-space-end" >
<component
class="text-right mr-2"
ref="EqpmSelectPop"
label=""
placeholder="설비..."
is="EqpmSelectPop"
valueNm="eqpmId"
:textCols="12"
:parentPrgmId="myPrgmId"
:eqpmGrpDisabled="true"
:fabDisabled="true"
:iconShow="false"
:isMulti="true"
/>
<component
class="text-right mr-2"
ref="EqpmSelectPop"
label=""
placeholder="설비..."
is="EqpmSelectPop"
valueNm="eqpmId"
:textCols="12"
:parentPrgmId="myPrgmId"
:eqpmGrpDisabled="true"
:fabDisabled="true"
:iconShow="false"
:isMulti="true"
/>
<a-button @click="getEqpmData()" type="primary" >조회</a-button>
</v-col>
</v-row>

2
pages/ems/effc/EnrgUsePlanPage.vue
View File

@ -286,7 +286,7 @@ export default {
resizable: true,
},
header: {
height: 65,
height: 75,
complexColumns: myComplexColumns,
},
};