Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(frontend): 单据管理迭代_1206 #7190 #8445

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions dbm-ui/frontend/src/locales/zh-cn.json
Original file line number Diff line number Diff line change
Expand Up @@ -3787,5 +3787,10 @@
"提醒频率:": "提醒频率:",
"校验与修复类型:": "校验与修复类型:",
"校验与修复频率设置:": "校验与修复频率设置:",
"修复主库": "修复主库",
"修复从库": "修复从库",
"检查业务来源的连接:": "检查业务来源的连接:",
"检查主从同步延迟:": "检查主从同步延迟:",
"检查主从数据校验结果:": "检查主从数据校验结果:",
"这行勿动!新增翻译请在上一行添加!": ""
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,9 @@
-->

<template>
<div class="export-data-details">
<DemandInfo
:config="config"
:data="ticketDetails" />
</div>
<DemandInfo
:config="config"
:data="ticketDetails" />
</template>

<script setup lang="tsx">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
<template>
<div class="ticket-details-page">
<div class="demand-info">
<div
v-for="(dataItem, dataKey) in config"
:key="dataKey"
class="ticket-details-info"
:class="{ 'ticket-details-info-no-title': !dataItem.title }">
class="demand-info-info"
:class="{ 'demand-info-info-no-title': !dataItem.title }">
<strong
v-if="dataItem.title"
class="ticket-details-info-title">
class="demand-info-info-title">
{{ dataItem.title }}
</strong>
<div class="ticket-details-list">
<div class="demand-info-list">
<template
v-for="(listItem, listKey) in dataItem.list"
:key="listKey">
<div
v-if="!listItem.isHidden && (listItem.key || listItem.render)"
class="ticket-details-item"
class="demand-info-item"
:class="{
whole: listItem.iswhole,
table: listItem.isTable,
}">
<span class="ticket-details-item-label">{{ listItem.label }}:</span>
<span class="ticket-details-item-value">
<span class="demand-info-item-label">{{ listItem.label }}:</span>
<span class="demand-info-item-value">
<Component
:is="listItem.render"
v-if="listItem.render" />
Expand Down Expand Up @@ -75,43 +75,43 @@
<style lang="less" scoped>
@import '@styles/mixins.less';

.ticket-details-page {
.ticket-details-info {
.demand-info {
.demand-info-info {
padding-left: 82px;
font-size: @font-size-mini;

.ticket-details-info-title {
.demand-info-info-title {
color: @title-color;
}
}

.ticket-details-info-no-title {
.demand-info-info-no-title {
padding-left: 0;
}

.ticket-details-list {
.demand-info-list {
.flex-center();

max-width: 1000px;
padding: 8px 0 16px;
flex-wrap: wrap;
}

.ticket-details-item {
.demand-info-item {
.flex-center();

overflow: hidden;
line-height: 32px;
flex: 0 0 50%;
align-items: flex-start;

.ticket-details-item-label {
.demand-info-item-label {
flex-shrink: 0;
min-width: 160px;
text-align: right;
}

.ticket-details-item-value {
.demand-info-item-value {
overflow: hidden;
color: @title-color;
text-overflow: ellipsis;
Expand All @@ -136,7 +136,7 @@
align-items: flex-start;
flex: 0 0 100%;

.ticket-details-item-value {
.demand-info-item-value {
padding-top: 8px;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<template>
<BkTable :data="ticketDetails.details.infos">
<BkTableColumn :label="t('集群域名')">
<BkTableColumn :label="t('集群')">
<template #default="{ data }">
{{ ticketDetails.details.clusters[data.cluster_id].immute_domain }}
</template>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<!--
* TencentBlueKing is pleased to support the open source community by making 蓝鲸智云-DB管理系统(BlueKing-BK-DBM) available.
*
* Copyright (C) 2017-2023 THL A29 Limited, a Tencent company. All rights reserved.
*
* Licensed under the MIT License (the "License"); you may not use this file except in compliance with the License.
* You may obtain a copy of the License athttps://opensource.org/licenses/MIT
*
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for
* the specific language governing permissions and limitations under the License.
-->
<template>
<Apply :ticket-details="ticketDetails" />
</template>

<script setup lang="ts">
import TicketModel, { type Mysql } from '@services/model/ticket/ticket';

import { TicketTypes } from '@common/const';

import Apply from './common/Apply.vue';

interface Props {
ticketDetails: TicketModel<Mysql.HaApply>;
}

defineProps<Props>();

defineOptions({
name: TicketTypes.MYSQL_HA_APPLY,
inheritAttrs: false,
});
</script>
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,17 @@
</template>
</BkTableColumn>
</BkTable>
<InfoList>
<InfoItem :label="t('检查业务来源的连接:')">
{{ ticketDetails.details.is_check_process ? t('是') : t('否') }}
</InfoItem>
<InfoItem :label="t('检查主从同步延迟:')">
{{ ticketDetails.details.is_check_delay ? t('是') : t('否') }}
</InfoItem>
<InfoItem :label="t('检查主从数据校验结果:')">
{{ ticketDetails.details.is_verify_checksum ? t('是') : t('否') }}
</InfoItem>
</InfoList>
</template>
<script setup lang="ts">
import { useI18n } from 'vue-i18n';
Expand All @@ -44,6 +55,8 @@

import { TicketTypes } from '@common/const';

import InfoList, { Item as InfoItem } from '../components/info-list/Index.vue';

interface Props {
ticketDetails: TicketModel<Mysql.MasterFailOver>;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,17 @@
</template>
</BkTableColumn>
</BkTable>
<InfoList>
<InfoItem :label="t('检查业务来源的连接:')">
{{ ticketDetails.details.is_check_process ? t('是') : t('否') }}
</InfoItem>
<InfoItem :label="t('检查主从同步延迟:')">
{{ ticketDetails.details.is_check_delay ? t('是') : t('否') }}
</InfoItem>
<InfoItem :label="t('检查主从数据校验结果:')">
{{ ticketDetails.details.is_verify_checksum ? t('是') : t('否') }}
</InfoItem>
</InfoList>
</template>
<script setup lang="ts">
import { useI18n } from 'vue-i18n';
Expand All @@ -44,6 +55,8 @@

import { TicketTypes } from '@common/const';

import InfoList, { Item as InfoItem } from '../components/info-list/Index.vue';

interface Props {
ticketDetails: TicketModel<Mysql.MasterSlaveSwitch>;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<!--
* TencentBlueKing is pleased to support the open source community by making 蓝鲸智云-DB管理系统(BlueKing-BK-DBM) available.
*
* Copyright (C) 2017-2023 THL A29 Limited, a Tencent company. All rights reserved.
*
* Licensed under the MIT License (the "License"); you may not use this file except in compliance with the License.
* You may obtain a copy of the License athttps://opensource.org/licenses/MIT
*
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for
* the specific language governing permissions and limitations under the License.
-->
<template>
<Apply :ticket-details="ticketDetails" />
</template>

<script setup lang="ts">
import TicketModel, { type Mysql } from '@services/model/ticket/ticket';

import { TicketTypes } from '@common/const';

import Apply from './common/Apply.vue';

interface Props {
ticketDetails: TicketModel<Mysql.SingleApply>;
}

defineProps<Props>();

defineOptions({
name: TicketTypes.MYSQL_SINGLE_APPLY,
inheritAttrs: false,
});
</script>
Loading
Loading