Skip to content
This repository was archived by the owner on Nov 13, 2024. It is now read-only.

Commit e781e52

Browse files
yumao233yumao233
committed
Feat: quick install service err view
1 parent 763e77a commit e781e52

File tree

3 files changed

+68
-91
lines changed

3 files changed

+68
-91
lines changed

‎src/app/views/Home.vue‎

Lines changed: 1 addition & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -121,13 +121,6 @@
121121
width="180"
122122
>
123123
<template #default="scope">
124-
<el-button
125-
size="small"
126-
@click="toEditInstance(scope.row)"
127-
:disabled="scope.row.status == -1"
128-
>
129-
{{ $t("general.edit") }}
130-
</el-button>
131124
<el-button
132125
size="small"
133126
@click="toInstance(scope.row.serviceUuid, scope.row.instanceUuid)"
@@ -157,41 +150,6 @@
157150
>
158151
</div>
159152
</div>
160-
161-
<!-- Instance details dialog -->
162-
<Dialog v-model="editInstance.is">
163-
<template #title>{{ $t("instances.dialog.instanceParameterEdit") }}</template>
164-
<template #default>
165-
<div>
166-
<div class="sub-title">
167-
<p class="sub-title-title">{{ $t("instances.dialog.commandClose") }}</p>
168-
<p class="sub-title-info"></p>
169-
{{ $t("instances.dialog.commandCloseInfo") }}
170-
</div>
171-
<div class="flex">
172-
<el-input v-model="editInstance.instance.stopCommand" size="small"></el-input>
173-
</div>
174-
<div class="sub-title row-mt">
175-
<p class="sub-title-title">{{ $t("instances.dialog.inputOrOutputCode") }}</p>
176-
<p class="sub-title-info">{{ $t("instances.dialog.inputOrOutputCodeInfo") }}</p>
177-
</div>
178-
<div class="flex">
179-
<ItemGroup :lr="true">
180-
<el-input v-model="editInstance.instance.ie" size="small" style="width: 40%"></el-input>
181-
<el-input v-model="editInstance.instance.oe" size="small" style="width: 40%"></el-input>
182-
</ItemGroup>
183-
</div>
184-
<div class="row-mt">
185-
<el-button type="success" size="small" @click="saveInstance">{{
186-
$t("instances.dialog.update")
187-
}}</el-button>
188-
<el-button @click="editInstance.is = !editInstance.is" size="small">{{
189-
$t("instances.dialog.close")
190-
}}</el-button>
191-
</div>
192-
</div>
193-
</template>
194-
</Dialog>
195153
</template>
196154

197155
<style></style>
@@ -205,6 +163,7 @@ import { request, requestUserInfo } from "../service/protocol";
205163
import { API_INSTANCE_LOW_PERMISSION_PUT } from "../service/common";
206164
import { statusCodeToText } from "../service/instance_tools";
207165
export default {
166+
// eslint-disable-next-line vue/no-unused-components
208167
components: { Panel, LineLabel, Dialog, ValueCard },
209168
data: function () {
210169
return {

‎src/app/views/quickstart/McPreset.vue‎

Lines changed: 64 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -7,48 +7,58 @@
77
<Panel style="width: 100%" v-if="!installView">
88
<template #title>{{ $t("views.quickstart_McPreset.001") }}</template>
99
<template #default>
10-
<p>{{ $t("views.quickstart_McPreset.002", [remoteUuid]) }}</p>
11-
<el-table
12-
:data="tableData"
13-
size="small"
14-
stripe
15-
style="width: 100%"
16-
v-loading="requestLoading"
17-
>
18-
<el-table-column
19-
prop="info"
20-
min-width="300px"
21-
:label="$t('CommonText.006')"
22-
></el-table-column>
23-
<el-table-column
24-
prop="mc"
25-
width="120px"
26-
:label="$t('views.quickstart_McPreset.003')"
27-
></el-table-column>
28-
<el-table-column
29-
prop="java"
30-
width="120px"
31-
:label="$t('views.quickstart_McPreset.004')"
32-
></el-table-column>
33-
<el-table-column prop="size" width="120px" :label="$t('views.quickstart_McPreset.005')">
34-
<template v-slot="scope">{{
35-
$t("views.quickstart_McPreset.006", [scope.row.size])
36-
}}</template>
37-
</el-table-column>
38-
<el-table-column prop="remark" :label="$t('CommonText.007')"></el-table-column>
39-
<el-table-column :label="$t('CommonText.008')">
40-
<template v-slot="scope">
41-
<el-button
42-
type="success"
43-
size="small"
44-
@click="handleSelectTemplate(scope.$index, scope.row)"
45-
>{{ $t("CommonText.009") }}</el-button
10+
<div v-loading="requestLoading">
11+
<div v-if="tableData && tableData.length > 0">
12+
<p>{{ $t("views.quickstart_McPreset.002", [remoteUuid]) }}</p>
13+
<el-table :data="tableData" size="small" stripe style="width: 100%">
14+
<el-table-column
15+
prop="info"
16+
min-width="300px"
17+
:label="$t('CommonText.006')"
18+
></el-table-column>
19+
<el-table-column
20+
prop="mc"
21+
width="120px"
22+
:label="$t('views.quickstart_McPreset.003')"
23+
></el-table-column>
24+
<el-table-column
25+
prop="java"
26+
width="120px"
27+
:label="$t('views.quickstart_McPreset.004')"
28+
></el-table-column>
29+
<el-table-column
30+
prop="size"
31+
width="120px"
32+
:label="$t('views.quickstart_McPreset.005')"
4633
>
47-
</template>
48-
</el-table-column>
49-
</el-table>
50-
51-
<p>{{ $t("views.quickstart_McPreset.007") }}</p>
34+
<template v-slot="scope">{{
35+
$t("views.quickstart_McPreset.006", [scope.row.size])
36+
}}</template>
37+
</el-table-column>
38+
<el-table-column prop="remark" :label="$t('CommonText.007')"></el-table-column>
39+
<el-table-column :label="$t('CommonText.008')">
40+
<template v-slot="scope">
41+
<el-button
42+
type="success"
43+
size="small"
44+
@click="handleSelectTemplate(scope.$index, scope.row)"
45+
>{{ $t("CommonText.009") }}</el-button
46+
>
47+
</template>
48+
</el-table-column>
49+
</el-table>
50+
<p>{{ $t("views.quickstart_McPreset.007") }}</p>
51+
</div>
52+
<div v-else-if="!requestLoading" class="flex flex-align-items-center flex-space-center">
53+
<div style="text-align: center">
54+
<i class="el-icon-warning-outline" style="font-size: 100px"></i>
55+
<h2>{{ $t("install.stoppedServiceTitle") }}</h2>
56+
<div>
57+
<p>{{ $t("install.stoppedServiceContent") }}</p>
58+
</div>
59+
</div>
60+
</div>
61+
</div>
5262
</template>
5363
</Panel>
5464

@@ -130,14 +140,20 @@ export default {
130140
methods: {
131141
async init() {
132142
this.requestLoading = true;
133-
const data = await request({
134-
method: "GET",
135-
url: API_GET_QUICK_INSTALL_LIST_ADDR
136-
});
137-
this.tableData = data;
138-
this.requestLoading = false; // 直接前往详情页
143+
try {
144+
const data = await request({
145+
method: "GET",
146+
url: API_GET_QUICK_INSTALL_LIST_ADDR
147+
});
148+
this.tableData = data || [];
149+
} catch (error) {
150+
this.$message({ type: "error", message: error.message });
151+
this.tableData = null;
152+
} finally {
153+
this.requestLoading = false;
154+
}
139155
140-
if (this.taskId) {
156+
if (this.taskId && this.tableData) {
141157
this.percentage = 50;
142158
this.startDownloadTask();
143159
}

‎src/language/zh_cn.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -963,7 +963,9 @@
963963
"ohhhInfo": "最后，您是第一次使用此软件吗？",
964964
"firstTime": "首次使用",
965965
"oldUSer": "老用户",
966-
"adminOK": "管理员已创建"
966+
"adminOK": "管理员已创建",
967+
"stoppedServiceTitle": "正在维护中",
968+
"stoppedServiceContent": "很抱歉，无法获取最新预设整合包列表，可能是您的网络问题或服务器正在维护中。"
967969
},
968970
"notify": {
969971
"connectDaemonError": "访问远程节点异常",

0 commit comments

Comments
 (0)