Skip to content

Commit

Permalink
fix: 首页提单修复 (#1697)
Browse files Browse the repository at this point in the history
  • Loading branch information
leafage-collb authored Nov 4, 2024
1 parent 6b49e9b commit 19f7dd6
Show file tree
Hide file tree
Showing 6 changed files with 193 additions and 56 deletions.
2 changes: 2 additions & 0 deletions webfe/package_vue/src/language/lang/en.js
Original file line number Diff line number Diff line change
Expand Up @@ -2855,4 +2855,6 @@ export default {
'太棒了!': 'Awesome!',
慢查询告警数量: 'Number of slow query alerts',
告警内容: 'Alarm content',
慢查询记录: 'Slow query records',
'GCS-MySQL 增强服务实例已解绑,无法再查看慢查询记录': 'The GCS-MySQL Add-ons instance has been unbound, and slow query records can no longer be viewed',
};
2 changes: 2 additions & 0 deletions webfe/package_vue/src/language/lang/zh.js
Original file line number Diff line number Diff line change
Expand Up @@ -2992,4 +2992,6 @@ export default {
'太棒了!': '太棒了!',
慢查询告警数量: '慢查询告警数量',
告警内容: '告警内容',
慢查询记录: '慢查询记录',
'GCS-MySQL 增强服务实例已解绑,无法再查看慢查询记录': 'GCS-MySQL 增强服务实例已解绑,无法再查看慢查询记录',
};
8 changes: 8 additions & 0 deletions webfe/package_vue/src/store/modules/service.js
Original file line number Diff line number Diff line change
Expand Up @@ -145,5 +145,13 @@ export default {
const url = `${BACKEND_URL}/api/bkapps/applications/${appCode}/modules/${moduleId}/services/${service}/`;
return http.get(url, {}, config);
},

/**
* 获取应用增强服务信息
*/
getServiceInfo({}, { appCode, moduleId }, config = {}) {
const url = `${BACKEND_URL}/api/bkapps/applications/${appCode}/modules/${moduleId}/services/info/`;
return http.get(url, {}, config);
},
},
};
Original file line number Diff line number Diff line change
Expand Up @@ -73,16 +73,23 @@
</bk-table-column>
<bk-table-column
label=""
width="180"
:width="localLanguage === 'en' ? 210 : 180"
>
<template slot-scope="{ row: childRow }">
<bk-button
:text="true"
class="ml10"
@click="handleDetail(childRow)"
>
{{ $t('查看详情') }}
</bk-button>
<bk-button
v-if="childRow.labels && childRow.labels.includes('gcs_mysql_slow_query')"
:text="true"
class="ml10"
@click="handleSlowQuery(props.row, childRow)"
>
{{ $t('慢查询记录') }}
</bk-button>
</template>
</bk-table-column>
</bk-table>
Expand All @@ -97,7 +104,10 @@
class="app-name-wrapper"
v-bk-overflow-tips="{ content: `${row.application.name}(${row.application.code})` }"
>
<span class="click-area" @click="toAppDetail(row)">
<span
class="click-area"
@click="toAppDetail(row)"
>
<img
class="app-logo"
:src="row.application.logo_url"
Expand All @@ -109,7 +119,10 @@
</span>
</span>
<span class="ml20 msg">
MySQL {{ $t('慢查询告警数量') }}: <span :class="{ 'slow-query': !!row.slow_query_count }">{{ row.slow_query_count }}</span>/{{ row.count }}
MySQL {{ $t('慢查询告警数量') }}:
<span :class="{ 'slow-query': !!row.slow_query_count }">{{ row.slow_query_count }}</span>
<span>/</span>
<span>{{ row.count }}</span>
</span>
</div>
</template>
Expand Down Expand Up @@ -154,8 +167,14 @@ export default {
expandRowKeys: [],
slowQueryCount: 0,
selectionTime: {},
errorMessage: this.$t('GCS-MySQL 增强服务实例已解绑,无法再查看慢查询记录'),
};
},
computed: {
localLanguage() {
return this.$store.state.localLanguage;
},
},
created() {
dayjs.extend(relativeTime);
bus.$on('home-date', (time) => {
Expand Down Expand Up @@ -247,6 +266,53 @@ export default {
handleDetail(row) {
window.open(row.detail_link, '_blank');
},
// 处理慢查询页面跳转
handleSlowQuery(row, childRow) {
const params = {
appCode: row.application.code,
moduleId: childRow?.module_name || 'default',
};
this.getServiceInfo(params, childRow.env);
},
async getServiceInfo(params, env) {
try {
const GCS_MYSQL_NAME = 'gcs_mysql';
const res = await this.$store.dispatch('service/getServiceInfo', params);
const services = res[env];
if (!services.length) {
this.$paasMessage({
theme: 'error',
message: this.errorMessage,
});
return;
}
// 服务服务id
const serviceId = services?.find((v) => v.name === GCS_MYSQL_NAME)?.service_id;
this.getServiceInstances(params, serviceId);
} catch (e) {
this.catchErrorHandler(e);
}
},
// 获取服务实例详情
async getServiceInstances(params, serviceId) {
try {
const res = await this.$store.dispatch('service/getServiceInstances', {
...params,
service: serviceId,
});
if (!res.results.length) {
this.$paasMessage({
theme: 'error',
message: this.errorMessage,
});
return;
}
const url = `${res.results[0].service_instance?.config?.admin_url}&redirect_url=instance.slow_sql.fingers.list`;
window.open(url, '_blank');
} catch (e) {
this.catchErrorHandler(e);
}
},
},
};
</script>
Expand Down Expand Up @@ -274,10 +340,10 @@ export default {
color: #3a84ff;
}
.msg {
color: #63656E;
color: #63656e;
}
.slow-query {
color: #EA3636;
color: #ea3636;
}
}
}
Expand All @@ -297,8 +363,13 @@ export default {
.bk-table-expand-icon .bk-icon {
color: #979ba5;
}
.child-module-table-cls .bk-table-header-wrapper {
display: none;
.child-module-table-cls {
.bk-table-header-wrapper {
display: none;
}
.bk-table-body-wrapper {
color: #63656e;
}
}
.env-column-cls .cell {
display: flex;
Expand Down
Loading

0 comments on commit 19f7dd6

Please sign in to comment.