From a0f8a7b96827feaecb350e407fb32c87323c38e2 Mon Sep 17 00:00:00 2001
From: ssongliu <songlius11@163.com>
Date: Mon, 5 Dec 2022 15:44:13 +0800
Subject: [PATCH] =?UTF-8?q?style:=20redis=20=E6=8C=89=E9=92=AE=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/app-status/index.vue | 31 ++------------------
 frontend/src/lang/modules/en.ts              |  2 +-
 frontend/src/lang/modules/zh.ts              |  2 +-
 frontend/src/views/database/redis/index.vue  | 11 ++++---
 4 files changed, 11 insertions(+), 35 deletions(-)

diff --git a/frontend/src/components/app-status/index.vue b/frontend/src/components/app-status/index.vue
index bf293c460..a9e01dbe5 100644
--- a/frontend/src/components/app-status/index.vue
+++ b/frontend/src/components/app-status/index.vue
@@ -22,7 +22,7 @@
                             </el-tag>
                         </div>
                     </el-col>
-                    <el-col :lg="5" :xl="4">
+                    <el-col :lg="6" :xl="4">
                         <div>
                             {{ $t('website.lastBackupAt') }}:
                             <el-tag v-if="data.lastBackupAt != ''" type="info">{{ data.lastBackupAt }}</el-tag>
@@ -30,8 +30,6 @@
                         </div>
                     </el-col>
                     <el-col :lg="4" :xl="6">
-                        <el-button type="primary" link @click="onOperate('restart')">{{ $t('app.restart') }}</el-button>
-                        <el-divider direction="vertical" />
                         <el-button type="primary" link @click="setting">{{ $t('commons.button.set') }}</el-button>
                     </el-col>
                 </el-row>
@@ -47,10 +45,8 @@
     </div>
 </template>
 <script lang="ts" setup>
-import { CheckAppInstalled, InstalledOp } from '@/api/modules/app';
-import i18n from '@/lang';
+import { CheckAppInstalled } from '@/api/modules/app';
 import router from '@/routers';
-import { ElMessage, ElMessageBox } from 'element-plus';
 import { onMounted, reactive, ref } from 'vue';
 import Status from '@/components/status/index.vue';
 
@@ -95,29 +91,6 @@ const onCheck = async () => {
     loading.value = false;
 };
 
-const onOperate = async (operation: string) => {
-    operateReq.operate = operation;
-    ElMessageBox.confirm(
-        i18n.global.t('app.operatorHelper', [i18n.global.t('app.' + operation)]),
-        i18n.global.t('app.' + operation),
-        {
-            confirmButtonText: i18n.global.t('commons.button.confirm'),
-            cancelButtonText: i18n.global.t('commons.button.cancel'),
-            type: 'info',
-        },
-    ).then(() => {
-        loading.value = true;
-        InstalledOp(operateReq)
-            .then(() => {
-                ElMessage.success(i18n.global.t('commons.msg.operationSuccess'));
-                onCheck();
-            })
-            .finally(() => {
-                loading.value = false;
-            });
-    });
-};
-
 onMounted(() => {
     key.value = props.appKey;
     onCheck();
diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts
index bf075d01d..874840323 100644
--- a/frontend/src/lang/modules/en.ts
+++ b/frontend/src/lang/modules/en.ts
@@ -82,7 +82,7 @@ export default {
             welcome: 'Welcome back, please enter your username and password to log in!',
             errorAuthInfo: 'The user name or password you entered is incorrect, please re-enter!',
             captchaHelper: 'Please enter the verification code',
-            errorCaptcha: 'Incorrect verification code information!',
+            errorCaptcha: 'Verification code error!',
             safeEntrance: 'Please use the correct entry to log in to the panel',
             reason: 'Cause of error:',
             reasonHelper:
diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts
index 6f3c5f6ea..94539095c 100644
--- a/frontend/src/lang/modules/zh.ts
+++ b/frontend/src/lang/modules/zh.ts
@@ -84,7 +84,7 @@ export default {
             welcome: '欢迎回来，请输入用户名和密码登录！',
             errorAuthInfo: '您输入的用户名或密码不正确，请重新输入！',
             captchaHelper: '请输入验证码',
-            errorCaptcha: '错误的验证码信息！',
+            errorCaptcha: '验证码错误！',
             safeEntrance: '请使用正确的入口登录面板',
             reason: '错误原因：',
             reasonHelper:
diff --git a/frontend/src/views/database/redis/index.vue b/frontend/src/views/database/redis/index.vue
index 3f5605907..ff18aaf89 100644
--- a/frontend/src/views/database/redis/index.vue
+++ b/frontend/src/views/database/redis/index.vue
@@ -4,10 +4,13 @@
 
         <AppStatus :app-key="'redis'" style="margin-top: 20px" @setting="onSetting" @is-exist="checkExist"></AppStatus>
         <div v-show="redisIsExist">
-            <Setting ref="settingRef" style="margin-top: 20px" />
+            <el-button style="margin-top: 20px" type="p" @click="goDashboard" icon="Position">
+                Redis-Commander
+            </el-button>
 
-            <el-button style="margin-top: 20px" type="p" @click="goDashboard" icon="Position">Redis-Command</el-button>
-            <Terminal v-show="!isOnSetting" ref="terminalRef" />
+            <Setting ref="settingRef" style="margin-top: 10px" />
+
+            <Terminal style="margin-top: 10px" v-show="!isOnSetting" ref="terminalRef" />
         </div>
 
         <el-dialog
@@ -17,7 +20,7 @@
             :close-on-click-modal="false"
             :destroy-on-close="true"
         >
-            <el-alert :closable="false" :title="$t('app.checkInstalledWarn', ['Redis-Command'])" type="info">
+            <el-alert :closable="false" :title="$t('app.checkInstalledWarn', ['Redis-Commander'])" type="info">
                 <el-link icon="Position" @click="goRouter('/apps')" type="primary">
                     {{ $t('database.goInstall') }}
                 </el-link>