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

Commit

Permalink
Optimization: Mobile UI details
Browse files Browse the repository at this point in the history
  • Loading branch information
YuMao233 committed May 31, 2023
1 parent 10d5ac2 commit 75a4e9d
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 19 deletions.
6 changes: 3 additions & 3 deletions src/app/views/FileManager/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
</div>
</el-col>
<el-col :md="6">
<div class="flex flex-space-center flex-align-items-center">
<div class="flex flex-space-center flex-align-items-center row-mb">
<el-input
v-model="searchFileName"
:placeholder="$t('fileManager.searchFile')"
Expand Down Expand Up @@ -223,7 +223,7 @@
:label="$t('fileManager.lastEdit')"
width="160"
></el-table-column>
<el-table-column :label="$t('general.operate')" style="text-align: center">
<el-table-column :label="$t('general.operate')" style="text-align: center" width="280">
<template #default="scope">
<el-button size="mini" v-if="!isWindows" @click="toEditFilePermission(scope.row)">{{
$t("general.permission")
Expand Down Expand Up @@ -412,7 +412,7 @@ export default defineComponent({
return arr;
},
isWindows() {
return this.statusInfo?.platform === "win32";
return this.statusInfo?.platform == "win32";
}
},
async mounted() {
Expand Down
34 changes: 25 additions & 9 deletions src/app/views/Services.vue
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,15 @@
<Panel :tipType="1">
<template #title>
<span>{{ node.remarks || `${node.ip}:${node.port}` }}</span>
<span style="margin-left: 8px">
<i style="cursor: pointer" class="el-icon-edit" @click="updateRemarks(node)"></i>
</span>
</template>
<template #default>
<div class="daemonInfoArea">
<div class="daemonValueArea">
<el-row :gutter="20">
<el-col :span="6" :offset="0">
<el-col :md="12" :xs="12" :lg="6" :offset="0">
<p>
{{ $t("services.platform") }}
</p>
Expand All @@ -55,29 +58,29 @@
}}
</div>
</el-col>
<el-col :span="6" :offset="0">
<el-col :md="12" :xs="12" :lg="6" :offset="0">
<p>
{{ $t("overview.mem") }}
</p>
<div>
{{ node?.system?.memText || "--" }}
</div>
</el-col>
<el-col :span="6" :offset="0">
<el-col :md="12" :xs="12" :lg="6" :offset="0">
<p>CPU</p>
<div v-if="node.system">
{{ Number(node.system.cpuUsage * 100).toFixed(1) }}%
</div>
<div v-else>--</div>
</el-col>
<el-col :span="6" :offset="0">
<el-col :md="12" :xs="12" :lg="6" :offset="0">
<p>{{ $t("services.instanceStatus") }}</p>
<div v-if="node.instance">
{{ node.instance.running }}/{{ node.instance.total }}
</div>
<div v-else>--</div>
</el-col>
<el-col :span="6" :offset="0">
<el-col :md="12" :xs="12" :lg="6" :offset="0">
<p>{{ $t("overview.connectStatus") }}</p>
<div>
<span class="color-green" v-if="node.available">
Expand All @@ -97,7 +100,7 @@
</span>
</div>
</el-col>
<el-col :span="6" :offset="0">
<el-col :md="12" :xs="12" :lg="6" :offset="0">
<p>{{ $t("services.version") }}</p>
<div v-if="node.instance">
<span
Expand All @@ -118,7 +121,7 @@
</div>
<div v-else>--</div>
</el-col>
<el-col :span="6" :offset="0">
<el-col :md="12" :xs="12" :lg="6" :offset="0">
<p>Daemon ID</p>
<div>
<el-tooltip
Expand Down Expand Up @@ -178,7 +181,7 @@
</div>
</el-col>
<el-col :md="12" :xl="12" :offset="0">
<div class="daemon-operations" style="text-align: right">
<div class="daemon-operations">
<template v-if="node.available">
<el-link type="primary" size="mini" @click="toDaemonTerminalPage(node.uuid)">
<span class="color-black">{{ $t("services.toTerminal") }}</span>
Expand Down Expand Up @@ -638,11 +641,24 @@ export default {
overflow: hidden;
}
.daemon-operations {
text-align: right;
.el-link,
> span {
font-size: 12px;
line-height: 28px;
margin-left: 4px;
margin-left: 6px;
}
}

@media (max-width: 900px) {
.daemon-operations {
margin-top: 12px;
text-align: left;
.el-link,
> span {
margin-left: 0px !important;
margin-right: 8px;
}
}
}
</style>
14 changes: 7 additions & 7 deletions src/language/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@
"043": "Row",
"044": "install error",
"045": "third-party service",
"046": "read",
"047": "to write",
"048": "executable",
"049": "owner",
"050": "user group",
"051": "anyone",
"046": "Read",
"047": "Write",
"048": "Executable",
"049": "Owner",
"050": "User Group",
"051": "Anyone",
"052": "Files",
"053": "Terminal",
"054": "Console"
Expand Down Expand Up @@ -1153,7 +1153,7 @@
"009": "You haven't saved the file yet, do you want to go back?"
},
"FileManager_PermissionDialog": {
"001": "File/folder permissions",
"001": "File permissions",
"002": "apply to subdirectory"
},
"GlobalFileManager_index": {
Expand Down

0 comments on commit 75a4e9d

Please sign in to comment.