From 3eced65b14a858329fd2b7f4c8bc6c5d66710c78 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期三, 06 九月 2023 16:57:01 +0800
Subject: [PATCH] Merge branch 'master' of ssh://10.153.19.150:29418/CanadaMes
---
CanadaMes-ui/src/views/power/index.vue | 64 ++++++++++++++++---------------
1 files changed, 33 insertions(+), 31 deletions(-)
diff --git a/CanadaMes-ui/src/views/power/index.vue b/CanadaMes-ui/src/views/power/index.vue
index 567af94..7488cf8 100644
--- a/CanadaMes-ui/src/views/power/index.vue
+++ b/CanadaMes-ui/src/views/power/index.vue
@@ -2,32 +2,32 @@
<div class="app">
<!--闈㈠寘灞戝鑸尯鍩�-->
<el-breadcrumb separator-class="el-icon-arrow-right">
- <el-breadcrumb-item :to="{ path: '/home' }">棣栭〉</el-breadcrumb-item>
- <el-breadcrumb-item>鏉冮檺绠＄悊</el-breadcrumb-item>
- <el-breadcrumb-item>鏉冮檺鍒楄〃</el-breadcrumb-item>
+ <el-breadcrumb-item :to="{ path: '/home' }">{{$t('breadcrumb.home')}}</el-breadcrumb-item>
+ <el-breadcrumb-item>{{$t('breadcrumb.permissionManagement')}}</el-breadcrumb-item>
+ <el-breadcrumb-item>{{$t('breadcrumb.permissionList')}}</el-breadcrumb-item>
</el-breadcrumb>
<!--鍗＄墖瑙嗗浘鍖哄煙-->
<el-card class="el-card">
<el-row :gutter="20">
<!--鎼滅储涓庢坊鍔犲尯鍩�-->
<el-col :span="6">
- <el-input placeholder="璇疯緭鍏ユ潈闄愬悕绉�" v-model="queryInfo.name" clearable @clear="getPowerList()">
+ <el-input :placeholder="$t('search.placeholder')" v-model="queryInfo.name" clearable @clear="getPowerList()">
<el-button slot="append" icon="el-icon-search" @click="getPowerList()"></el-button>
</el-input>
</el-col>
<!--娣诲姞鍖哄煙-->
<el-col :span="4">
- <el-button type="primary" @click="showAddDialog">娣诲姞鏉冮檺</el-button>
+ <el-button type="primary" @click="showAddDialog">{{$t('button.addPermission')}}</el-button>
</el-col>
</el-row>
<!--鏉冮檺鍒楄〃鍖哄煙-->
<el-table :data="powerList.records" border stripe>
<el-table-column label="#" type="index"></el-table-column>
- <el-table-column label="瑙掕壊" prop="role.name"></el-table-column>
- <el-table-column label="鏉冮檺鎻忚堪" prop="permission.description"></el-table-column>
- <el-table-column label="鏉冮檺鍊�" prop="permission.name"></el-table-column>
- <el-table-column label="鍒涘缓鏃堕棿" prop="createTime"></el-table-column>
- <el-table-column label="鏄惁鐢熸晥">
+ <el-table-column :label="$t('table.role')" prop="role.name"></el-table-column>
+ <el-table-column :label="$t('table.permissionDescription')" prop="permission.description"></el-table-column>
+ <el-table-column :label="$t('table.permissionValue')" prop="permission.name"></el-table-column>
+ <el-table-column :label="$t('table.createTime')" prop="createTime"></el-table-column>
+ <el-table-column :label="$t('table.isActive')">
<template slot-scope="scope">
<el-switch :active-value=1
:inactive-value=0
@@ -36,15 +36,15 @@
</el-switch>
</template>
</el-table-column>
- <el-table-column label="鎿嶄綔">
+ <el-table-column :label="$t('table.operation')">
<template slot-scope="scope">
<!--淇敼-->
- <el-tooltip effect="dark" content="淇敼" placement="top" :enterable="false">
+ <el-tooltip effect="dark" :content="$t('tooltip.edit')" placement="top" :enterable="false">
<el-button type="primary" icon="el-icon-edit" size="mini"
@click="showEditDialog(scope.row)"></el-button>
</el-tooltip>
<!--鍒犻櫎-->
- <el-tooltip effect="dark" content="鍒犻櫎" placement="top" :enterable="false">
+ <el-tooltip effect="dark" :content="$t('tooltip.delete')" placement="top" :enterable="false">
<el-button type="danger" icon="el-icon-delete" size="mini"
@click="removeById(scope.row)"></el-button>
</el-tooltip>
@@ -64,14 +64,14 @@
</el-card>
<!--娣诲姞鏉冮檺鐨勫璇濇-->
<el-dialog
- title="娣诲姞鏉冮檺"
+ :title="$t('dialog.addPermission')"
:visible.sync="addDialogVisible"
width="50%"
@close="addDialogClosed">
<!--鍐呭涓讳綋鍖哄煙-->
<el-form :model="addPowerForm" :rules="powerRules" ref="powerRef" label-width="70px">
- <el-form-item label="瑙掕壊" prop="roleId">
- <el-select filterable v-model="addPowerForm.roleId" placeholder="璇烽�夋嫨">
+ <el-form-item :label="$t('form.role')" prop="roleId">
+ <el-select filterable v-model="addPowerForm.roleId" :placeholder="$t('form.select')">
<el-option v-for="item in roleList"
:key="item.id"
:value="item.id"
@@ -79,8 +79,8 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="鏉冮檺" prop="permissionId">
- <el-select filterable v-model="addPowerForm.permissionId" placeholder="璇烽�夋嫨">
+ <el-form-item :label="$t('form.permission')" prop="permissionId">
+ <el-select filterable v-model="addPowerForm.permissionId" :placeholder="$t('form.select')">
<el-option v-for="item in permissionList"
:key="item.id"
:value="item.id"
@@ -88,8 +88,8 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="鏄惁鐢熸晥" prop="state">
- <el-select v-model="addPowerForm.state" placeholder="璇烽�夋嫨">
+ <el-form-item :label="$t('form.isActive')" prop="state">
+ <el-select v-model="addPowerForm.state" :placeholder="$t('form.select')">
<el-option v-for="(item,index) in options"
:key="index"
:value="item.value"
@@ -99,19 +99,19 @@
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
- <el-button @click="addDialogVisible = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="addPower">纭� 瀹�</el-button>
+ <el-button @click="addDialogVisible = false">{{$t('button.cancel')}}</el-button>
+ <el-button type="primary" @click="addPower">{{$t('button.confirm')}}</el-button>
</span>
</el-dialog>
<!--淇敼鏉冮檺鐨勫璇濇-->
<el-dialog
- title="淇敼鏉冮檺"
+ :title="$t('dialog.editPermission')"
:visible.sync="editDialogVisible"
width="50%">
<!--鍐呭涓讳綋鍖哄煙-->
<el-form :model="editRoleForm" :rules="powerRules" ref="powerRef" label-width="70px">
- <el-form-item label="瑙掕壊" prop="roleId">
- <el-select filterable v-model="editRoleForm.roleId" placeholder="璇烽�夋嫨">
+ <el-form-item :label="$t('form.role')" prop="roleId">
+ <el-select filterable v-model="editRoleForm.roleId" :placeholder="$t('form.select')">
<el-option v-for="item in roleList"
:key="item.id"
:value="item.id"
@@ -119,8 +119,8 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item filterable label="鏉冮檺" prop="permissionId">
- <el-select v-model="editRoleForm.permissionId" placeholder="璇烽�夋嫨">
+ <el-form-item filterable :label="$t('form.permission')" prop="permissionId">
+ <el-select v-model="editRoleForm.permissionId" :placeholder="$t('form.select')">
<el-option v-for="item in permissionList"
:key="item.id"
:value="item.id"
@@ -128,8 +128,8 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="鏄惁鐢熸晥" prop="state">
- <el-select v-model="editRoleForm.state" placeholder="璇烽�夋嫨">
+ <el-form-item :label="$t('form.isActive')" prop="state">
+ <el-select v-model="editRoleForm.state" :placeholder="$t('form.select')">
<el-option v-for="(item,index) in options"
:key="index"
:value="item.value"
@@ -139,8 +139,8 @@
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
- <el-button @click="editDialogVisible = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="editRoleInfo">纭� 瀹�</el-button>
+ <el-button @click="editDialogVisible = false">{{$t('button.cancel')}}</el-button>
+ <el-button type="primary" @click="editRoleInfo">{{$t('button.confirm')}}</el-button>
</span>
</el-dialog>
</div>
@@ -150,9 +150,11 @@
import {getById, removeById, saveOrUpdate, selectPage} from "../../api/rolePermission";
import {select} from "../../api/role";
import {selectPermission} from "../../api/permission";
+import LanguageMixin from '../../lang/LanguageMixin'
export default {
name: "Power",
+ mixins: [LanguageMixin],
data() {
return {
queryInfo: {
--
Gitblit v1.8.0