From 3cbdeaa5e8983ea5071ea446813ef5215b9822a0 Mon Sep 17 00:00:00 2001 From: wuyouming666 <2265557248@qq.com> Date: 星期一, 25 十二月 2023 14:39:28 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes --- CanadaMes-ui/src/layout/index.vue | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/CanadaMes-ui/src/layout/index.vue b/CanadaMes-ui/src/layout/index.vue index ec7f6a6..a2c944d 100644 --- a/CanadaMes-ui/src/layout/index.vue +++ b/CanadaMes-ui/src/layout/index.vue @@ -67,23 +67,24 @@ <el-menu-item index="1-1" @click="logout">{{ $t('exit') }}</el-menu-item> <el-menu-item index="1-2" @click="showChangePasswordDialog">{{ $t('changePassword') }}</el-menu-item> </el-submenu> + </template> <template> - <el-dialog title="淇敼瀵嗙爜" :visible.sync="dialogVisible" width="30%"> - <el-form ref="form" :model="formData" label-width="100px"> - <el-form-item label="鏃у瘑鐮�"> + <el-dialog :title="$t('changePassword')" :visible.sync="dialogVisible" width="30%"> + <el-form ref="form" :model="formData" label-width="200px"> + <el-form-item :label="$t('Old password')"> <el-input v-model="formData.oldPassword" type="password" show-password></el-input> </el-form-item> - <el-form-item label="鏂板瘑鐮�"> + <el-form-item :label="$t('New password')"> <el-input v-model="formData.newPassword" type="password" show-password></el-input> </el-form-item> - <el-form-item label="纭鏂板瘑鐮�"> + <el-form-item :label="$t('Confirm password')"> <el-input v-model="formData.confirmPassword" type="password" show-password></el-input> </el-form-item> </el-form> <div slot="footer" class="dialog-footer"> - <el-button @click="dialogVisible = false">鍙栨秷</el-button> - <el-button type="primary" @click="savePassword">淇濆瓨</el-button> + <el-button @click="dialogVisible = false">{{ $t('cancel') }}</el-button> + <el-button type="primary" @click="savePassword">{{ $t('confirm') }}</el-button> </div> </el-dialog> </template> @@ -134,6 +135,9 @@ // Tag // }, created() { + + + selectList(this.menuListForm).then(res => { this.menuList = res.data @@ -170,7 +174,6 @@ // this.$store.commit('tags/addTag', tag); // } }, - removeTag() { // this.$store.commit('tags/removeTag', index); // 浠� Vuex Store 涓Щ闄ゆ爣绛� -- Gitblit v1.8.0