From 792403d97b0b0e06b9faba5c18c4886bf9f7586b Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Wed, 21 Jan 2026 15:48:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 applications/drone-command/src/page/lock/index.vue |   98 +++++++++++++++++++++++--------------------------
 1 files changed, 46 insertions(+), 52 deletions(-)

diff --git a/applications/drone-command/src/page/lock/index.vue b/applications/drone-command/src/page/lock/index.vue
index 9b65ab3..d797a84 100644
--- a/applications/drone-command/src/page/lock/index.vue
+++ b/applications/drone-command/src/page/lock/index.vue
@@ -5,24 +5,16 @@
     </div>
     <div class="login-weaper">
       <div class="login-left animate__animated animate__fadeInLeft">
-        <img class="img" src="/img/logo.png" alt=""  />
+        <img class="img" src="/img/logo.png" alt="" />
         <p class="title">{{ $t('login.info') }}</p>
       </div>
       <div class="login-border animate__animated animate__fadeInRight">
         <div class="login-main">
           <div class="lock-form animate__animated animate__bounceInDown">
-            <div
-              class="animate__animated"
-              :class="{ shake: passwdError, animate__bounceOut: pass }"
-            >
+            <div class="animate__animated" :class="{ shake: passwdError, animate__bounceOut: pass }">
               <h3 style="color: #333">{{ userInfo.username }}</h3>
-              <el-input
-                placeholder="请输入登录密码"
-                type="password"
-                class="input-with-select animated"
-                v-model="passwd"
-                @keyup.enter="handleLogin"
-              >
+              <el-input placeholder="请输入登录密码" type="password" class="input-with-select animated" v-model="passwd"
+                @keyup.enter="handleLogin">
                 <template #append>
                   <i class="icon-bofangqi-suoping" @click="handleLogin"></i>
                   &nbsp; &nbsp;
@@ -37,80 +29,82 @@
   </div>
 </template>
 <script>
-import { mapGetters } from 'vuex';
-import { removeRefreshToken, removeToken } from '@/utils/auth';
+import { mapGetters } from 'vuex'
+import { removeRefreshToken, removeToken } from '@/utils/auth'
+import { ElMessage, ElMessageBox } from 'element-plus'
 
 export default {
   name: 'lock',
-  data() {
+  data () {
     return {
       time: '',
       timeTimer: null,
       passwd: '',
       passwdError: false,
       pass: false,
-    };
-  },
-  created() {
-    this.getTime();
-    if (this.timeTimer) clearInterval(this.timeTimer);
-    this.timeTimer = setInterval(() => {
-      this.getTime();
-    }, 1000);
-  },
-  beforeDestroy() {
-    if (this.timeTimer) {
-      clearInterval(this.timeTimer);
-      this.timeTimer = null;
     }
   },
-  mounted() {},
+  created () {
+    this.getTime()
+    if (this.timeTimer) clearInterval(this.timeTimer)
+    this.timeTimer = setInterval(() => {
+      this.getTime()
+    }, 1000)
+  },
+  beforeDestroy () {
+    if (this.timeTimer) {
+      clearInterval(this.timeTimer)
+      this.timeTimer = null
+    }
+  },
+  mounted () { },
   computed: {
     ...mapGetters(['userInfo', 'tag', 'lockPasswd']),
   },
   props: [],
   methods: {
-    getTime() {
-      this.time = this.$dayjs().format('YYYY年MM月DD日 HH:mm:ss');
+    getTime () {
+      this.time = this.$dayjs().format('YYYY年MM月DD日 HH:mm:ss')
     },
-    handleLogout() {
-      this.$confirm('是否退出系统, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+    handleLogout () {
+      ElMessageBox.confirm(`是否退出系统, 是否继续?`, '提示', {
         type: 'warning',
+        customClass: 'command-page-view-message-box',
+        confirmButtonClass: 'command-message-box-confirm',
+        cancelButtonClass: 'command-message-box-cancel',
       }).then(() => {
         this.$store.dispatch('LogOut').then(() => {
           // 清除token信息
-          removeToken();
-          removeRefreshToken();
-          this.$router.push({ path: '/login' });
-        });
-      });
+          removeToken()
+          removeRefreshToken()
+          this.$router.push({ path: '/login' })
+        })
+      })
     },
-    handleLogin() {
+    handleLogin () {
       if (this.passwd !== this.lockPasswd) {
-        this.passwd = '';
+        this.passwd = ''
         this.$message({
           message: '解锁密码错误,请重新输入',
           type: 'error',
-        });
-        this.passwdError = true;
+        })
+        this.passwdError = true
         setTimeout(() => {
-          this.passwdError = false;
-        }, 1000);
-        return;
+          this.passwdError = false
+        }, 1000)
+        return
       }
-      this.pass = true;
+      this.pass = true
       setTimeout(() => {
-        this.$store.commit('CLEAR_LOCK');
+        this.$store.commit('CLEAR_LOCK')
         this.$router.push({
           path: this.tag.path,
-        });
-      }, 1000);
+        })
+      }, 1000)
     },
   },
   components: {},
-};
+}
 </script>
 
 <style lang="scss"></style>

--
Gitblit v1.9.3