Compare commits

..

2 Commits

9 changed files with 90 additions and 99 deletions

View File

@ -231,6 +231,35 @@ a {
.v-application.#{$theme}-mode { .v-application.#{$theme}-mode {
min-width: 1000px; min-width: 1000px;
.ant-checkbox-wrapper.ant-checkbox-wrapper-disabled,
.ant-checkbox-disabled .ant-checkbox-input
{
cursor: default !important;
}
.v-list-item__title {
font-family: var(--desktop-normal-font-family, "Inter-Regular", sans-serif) !important;
}
.btn-close-menu-list {
min-width: 100px;
border-color: transparent;
background-color: map-deep-get($config, #{$theme}, "btn-header-select-bg") !important;
.v-list-item {
min-height: 30px;
}
.v-list-item__title {
color: map-deep-get($config, #{$theme}, "btn-header-select-color") !important;
&:hover {
color: #46c0ff !important;
cursor: pointer;
}
}
}
.icon-datepicker-color { .icon-datepicker-color {
color: map-deep-get($config, #{$theme}, "icon-datepicker-color"); color: map-deep-get($config, #{$theme}, "icon-datepicker-color");
} }
@ -760,7 +789,7 @@ a {
.v-list-item__title { .v-list-item__title {
color: map-deep-get($config, #{$theme}, "tui-datepicker-calendar-color"); color: map-deep-get($config, #{$theme}, "tui-datepicker-calendar-color");
} }
} }
&.v-select-list{ &.v-select-list{
@ -808,6 +837,7 @@ a {
font-size: 2rem; font-size: 2rem;
font-weight: bold; font-weight: bold;
padding-left: 8px; padding-left: 8px;
margin-top: 2px;
img { img {
width: 139px; width: 139px;
@ -824,20 +854,11 @@ a {
.btn-close-menu-list { .btn-close-menu-list {
min-width: 100px; min-width: 100px;
border-color: transparent; border-color: transparent;
background-color: map-deep-get($config, #{$theme}, "btn-header-select-bg") !important;
.v-list-item { .v-list-item {
min-height: 30px; min-height: 30px;
} }
.v-list-item__title {
color: map-deep-get($config, #{$theme}, "btn-header-select-color");
&:hover {
color: #46c0ff;
}
}
.v-btn { .v-btn {
background-color: transparent !important; background-color: transparent !important;
color: map-deep-get($config, #{$theme}, "btn-header-select-color") !important; color: map-deep-get($config, #{$theme}, "btn-header-select-color") !important;

View File

@ -144,10 +144,11 @@
} }
&.ant-btn-danger { &.ant-btn-danger {
&.ant-btn-background-ghost { &.ant-btn-background-ghost {
color:map-deep-get($config, #{$theme}, "ant-btn-danger-color"); color: map-deep-get($config, #{$theme}, "ant-btn-danger-color");
border-color:map-deep-get($config, #{$theme}, "ant-btn-danger-border"); border-color: map-deep-get($config, #{$theme}, "ant-btn-danger-color");
background: map-deep-get($config, #{$theme}, "ant-btn-danger-bg") !important; // background: map-deep-get($config, #{$theme}, "ant-btn-danger-color") !important;
} }
} }

View File

@ -204,7 +204,7 @@
overflow: auto; overflow: auto;
&::-webkit-scrollbar { &::-webkit-scrollbar {
// width: $scrollbar-width !important; width: $scrollbar-width !important;
height: $scrollbar-width !important; height: $scrollbar-width !important;
-webkit-appearance: initial; -webkit-appearance: initial;
background-color: rgba(0, 0, 0, 0) !important; background-color: rgba(0, 0, 0, 0) !important;
@ -352,11 +352,10 @@
} }
&.tui-grid-layer-editing { &.tui-grid-layer-editing {
background: transparent; background:map-deep-get($config,
// background:map-deep-get($config, #{$theme},
// #{$theme}, "tui-grid-cell-insert-color"
// "tui-grid-cell-insert-color" );
// );
} }
} }
} }

View File

@ -166,7 +166,7 @@ $config: (
ant-btn-primary-color: #212224, ant-btn-primary-color: #212224,
ant-btn-danger-bg:#D32029, ant-btn-danger-bg:#D32029,
ant-btn-danger-border:#D32029, ant-btn-danger-border:#D32029,
ant-btn-danger-color:#212224, ant-btn-danger-color:#D32029,
ant-btn-default-border:#FFFFFF2E, ant-btn-default-border:#FFFFFF2E,
ant-btn-default-bg:#FFFFFF2E, ant-btn-default-bg:#FFFFFF2E,
ant-btn-default-color:#FFFFFFD9, ant-btn-default-color:#FFFFFFD9,

View File

@ -94,7 +94,7 @@
</div> </div>
<v-card-actions class="px-6 py-4 d-flex align-center justify-end"> <v-card-actions class="px-6 py-4 d-flex align-center justify-end">
<a-button :ripple="false" @click="dialogOpenCloseEvent(dialog)" class="ant-btn-popup-default mr-2">닫기</a-button> <a-button :ripple="false" @click="dialogOpenCloseEvent(dialog)" class="mr-2">닫기</a-button>
<a-button :ripple="false" type="primary" @click="setUpdate($event)">확인</a-button> <a-button :ripple="false" type="primary" @click="setUpdate($event)">확인</a-button>
</v-card-actions> </v-card-actions>
</v-card> </v-card>

View File

@ -175,7 +175,7 @@ export default {
header: '사용여부', header: '사용여부',
name: 'useFg', name: 'useFg',
align: 'left', align: 'left',
minWidth: 80, width: 100,
formatter({ value }) { formatter({ value }) {
value = value === true ? '1' : '0'; value = value === true ? '1' : '0';
const newValue = _this.pageData.useFgList.filter( const newValue = _this.pageData.useFgList.filter(
@ -190,7 +190,7 @@ export default {
// } // }
// } // }
}, },
{ header: '비고', name: 'rmrk', align: 'left', minWidth: 50, }, { header: '비고', name: 'rmrk', align: 'left' },
]; ];
this.setGridColumn({ this.setGridColumn({

View File

@ -98,19 +98,17 @@ export default {
watch: { watch: {
selectedObjId(val) { selectedObjId(val) {
if (val === 'TAG') { if (val === 'TAG') {
this.detailList[1].class = 'd-none'; this.detailList[1].class = 'd-none ';
this.detailList[2].class = 'd-block pl-4'; this.detailList[2].class = 'd-block pl-4 mt-2';
this.detailList[3].class = 'd-block'; this.detailList[3].class = 'd-block';
this.detailList[4].class = 'pl-4 mt-2';
} else { } else {
// }else if(val==="READ_PLC"){ // }else if(val==="READ_PLC"){
this.detailList[4].class = 'pl-4 mt-2';
this.detailList[3].class = 'd-block'; this.detailList[3].class = 'd-block';
this.detailList[2].class = 'd-none'; this.detailList[2].class = 'd-none';
this.detailList[1].class = 'd-block pl-4'; this.detailList[1].class = 'd-block pl-4 mt-1 pb-0';
} }
this.detailList[4].class = 'pl-4 mt-2';
console.log(val)
console.log(this.detailList)
}, },
}, },
created() {}, created() {},
@ -380,7 +378,7 @@ const myDetail = [
label: '대상 유형', label: '대상 유형',
disabled: false, disabled: false,
cols: 6, cols: 6,
class: 'pr-4 py-2', class: 'pr-4 py-2 mt-1',
list: 'emMapDivList', list: 'emMapDivList',
valueNm: 'objKind', valueNm: 'objKind',
itemText: 'commCdNm', itemText: 'commCdNm',

View File

@ -912,17 +912,6 @@ const myColumns = [
]; ];
const unAsgnRoleByUserColumns = [ const unAsgnRoleByUserColumns = [
{
header: '',
name: '',
align: 'center',
width: 50,
formatter: (props) => {
return `<label class="custom-radio">
<span class="radio-mark"></span>
</label>`;
}
},
{ header: '역할ID', name: 'roleId', align: 'left' }, { header: '역할ID', name: 'roleId', align: 'left' },
{ header: '역할명', name: 'roleNm' }, { header: '역할명', name: 'roleNm' },
{ header: '적용시작일', name: 'aplyStartDt', hidden: true }, { header: '적용시작일', name: 'aplyStartDt', hidden: true },
@ -932,8 +921,7 @@ const unAsgnRoleByUserColumns = [
]; ];
const asgnRoleByUserColumns = [ const asgnRoleByUserColumns = [
{ header: '역할ID', name: 'roleId', align: 'left' },
{ header: '역할ID', name: 'roleId', align: 'center' },
{ header: '역할명', name: 'roleNm' }, { header: '역할명', name: 'roleNm' },
{ {
header: '적용시작일', header: '적용시작일',
@ -947,6 +935,17 @@ const asgnRoleByUserColumns = [
]; ];
const asgnMenuByUserColumns = [ const asgnMenuByUserColumns = [
{
header: '',
name: '',
align: 'center',
width: 50,
formatter: (props) => {
return `<label class="custom-radio">
<span class="radio-mark"></span>
</label>`;
}
},
{ header: '메뉴명', name: 'menuNm' }]; { header: '메뉴명', name: 'menuNm' }];
const myDetail = blocCdList => { const myDetail = blocCdList => {

View File

@ -60,13 +60,9 @@
<v-card-title class="custom-title-7 pa-0"> <v-card-title class="custom-title-7 pa-0">
파일목록 파일목록
</v-card-title> </v-card-title>
<div v-for="fileData in viewActionData.fileData" <div v-for="fileData in viewActionData.fileData" :key="fileData.apndFileId" class="file-item" style="background-color: unset;">
:key="fileData.apndFileId" <a @click.prevent="downloadFile(fileData)">
:class="['file-item', isDarkMode?'dark':'light']" <div class="d-flex justify-start search-box-label">
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> <v-icon>mdi-paperclip</v-icon>
<span class="file-item-name ml-2">{{ fileData.apndFileNm + '.' + <span class="file-item-name ml-2">{{ fileData.apndFileNm + '.' +
fileData.apndFileExt }}</span> fileData.apndFileExt }}</span>
@ -100,8 +96,7 @@
<v-card-title class="custom-title-7 pa-0">파일첨부</v-card-title> <v-card-title class="custom-title-7 pa-0">파일첨부</v-card-title>
<div class="" v-if="writeActionData.fileData"> <div class="" v-if="writeActionData.fileData">
<div v-for="(fileData, index) in writeActionData.fileData" :key="fileData.apndFileId" <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">
>
<div class="file-item-detail"> <div class="file-item-detail">
<v-icon>mdi-paperclip</v-icon> <v-icon>mdi-paperclip</v-icon>
<span href="#" class="file-item-name">{{ fileData.name }}</span> <span href="#" class="file-item-name">{{ fileData.name }}</span>
@ -149,8 +144,7 @@
<v-card-title class="custom-title-7 pa-0">파일첨부</v-card-title> <v-card-title class="custom-title-7 pa-0">파일첨부</v-card-title>
<div class="" v-if="replyActionData.fileData"> <div class="" v-if="replyActionData.fileData">
<div v-for="(fileData, index) in replyActionData.fileData" :key="fileData.apndFileId" <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">
>
<div class="file-item-detail"> <div class="file-item-detail">
<v-icon>mdi-paperclip</v-icon> <v-icon>mdi-paperclip</v-icon>
<span href="#" class="file-item-name">{{ fileData.name }}</span> <span href="#" class="file-item-name">{{ fileData.name }}</span>
@ -179,7 +173,7 @@
</div> </div>
<!-- 답글 작성 페이지 --> <!-- 답글 작성 페이지 -->
<!-- 수정 페이지 시작 --> <!-- 수정 페이지 시작 -->
<div v-if="pageActionFlag == 'update'" class="update"> <div v-if="pageActionFlag == 'update'">
<v-card> <v-card>
<div class="pa-5"> <div class="pa-5">
<v-row align="center" no-gutters> <v-row align="center" no-gutters>
@ -201,8 +195,7 @@
<v-card-title class="custom-title-7 pa-0">파일첨부</v-card-title> <v-card-title class="custom-title-7 pa-0">파일첨부</v-card-title>
<div class="" v-if="updateActionData.fileData"> <div class="" v-if="updateActionData.fileData">
<div v-for="(fileData, index) in updateActionData.fileData" :key="fileData.apndFileId" <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">
>
<div class="file-item-detail"> <div class="file-item-detail">
<v-icon style="font-size: 18px;">mdi-paperclip</v-icon> <v-icon style="font-size: 18px;">mdi-paperclip</v-icon>
<span href="#" class="file-item-name">{{ fileData.name }}</span> <span href="#" class="file-item-name">{{ fileData.name }}</span>
@ -211,11 +204,9 @@
@click="updateActionData.fileData.splice(index, 1)" /> @click="updateActionData.fileData.splice(index, 1)" />
</div> </div>
</div> </div>
<div class="current-files" v-if="updateActionData.currentFileList"> <div class="" v-if="updateActionData.currentFileList">
<div v-for="(fileData, index) in updateActionData.currentFileList" <div v-for="(fileData, index) in updateActionData.currentFileList"
:key="fileData.apndFileId" :key="fileData.apndFileId" class="file-item d-flex justify-space-between">
:class="['file-item d-flex justify-space-between', isDarkMode?'dark':'light']"
>
<div class="file-item-detail"> <div class="file-item-detail">
<v-icon style="font-size: 18px;">mdi-paperclip</v-icon> <v-icon style="font-size: 18px;">mdi-paperclip</v-icon>
<span @click.prevent="downloadFile(fileData)" href="#" <span @click.prevent="downloadFile(fileData)" href="#"
@ -1059,6 +1050,17 @@ const defaultData = {
cursor: pointer; cursor: pointer;
} }
.file-item {
width: auto;
margin: 2px 0;
padding: 4px;
background-color: #0000000A;
.file-item-name {
color: #1677FF;
}
}
::v-deep { ::v-deep {
.v-input__slot { .v-input__slot {
padding-left: 8px; padding-left: 8px;
@ -1082,46 +1084,17 @@ const defaultData = {
font-size: 1.0rem !important; font-size: 1.0rem !important;
} }
.toastui-editor-mode-switch .tab-item.active {
color: #1677FF
}
.toastui-editor-light .toastui-editor-mode-switch .tab-item {
color: #000000E0
}
.v-icon.anticon-delete svg { .v-icon.anticon-delete svg {
width: 14px; width: 14px;
height: 14px; height: 14px;
} }
} }
@each $theme in dark, light {
@include theme($theme);
::v-deep {
.toastui-editor-#{$theme} {
.toastui-editor-mode-switch {
>.tab-item {
border: none;
background-color: transparent;
color: map-deep-get($config, #{$theme}, "card-title-color") !important;
&.active {
color: map-deep-get($config, #{$theme}, "card-text-info-color") !important;
border-top: 1px solid map-deep-get($config, #{$theme}, "card-text-info-color");
}
}
}
}
}
.file-item {
&.#{$theme} {
width: auto;
margin: 2px 0;
padding: 4px;
background-color: map-deep-get($config, #{$theme}, "v-calendar-day-in-not-month-color");
.file-item-name {
color: map-deep-get($config, #{$theme}, "card-text-info-color");
}
}
}
}
</style> </style>