Skip to content

D
dataease
提交 da8e4473 authored 作者: taojinlong's avatar taojinlong
浏览文件
操作

feat: 国际化

上级 e963e586
全部展开 显示空白字符变更
内嵌 并排
正在显示 包含 181 行增加 和 281 行删除
frontend/src/lang/en.js
浏览文件 @ da8e4473
差异被折叠。
frontend/src/lang/zh.js
浏览文件 @ da8e4473
差异被折叠。
frontend/src/views/panel/GrantAuth/index.vue
浏览文件 @ da8e4473
......@@ -8,14 +8,14 @@
</div>
<el-tabs v-model="activeName" :class="{'de-search-header': showSearchInput}" @tab-click="handleClick">
<el-tab-pane :lazy="true" class="de-tab" label="部门" :name="tabNames[0]"><grant-dept :ref="tabNames[0]" :resource-id="resourceId" :key-word="key" /></el-tab-pane>
<el-tab-pane :lazy="true" class="de-tab" label="角色" :name="tabNames[1]"><grant-role :ref="tabNames[1]" :resource-id="resourceId" :key-word="key" /></el-tab-pane>
<el-tab-pane :lazy="true" class="de-tab" label="用户" :name="tabNames[2]"><grant-user :ref="tabNames[2]" :resource-id="resourceId" :key-word="key" /></el-tab-pane>
<el-tab-pane :lazy="true" class="de-tab" :label="$t('commons.organization')" :name="tabNames[0]"><grant-dept :ref="tabNames[0]" :resource-id="resourceId" :key-word="key" /></el-tab-pane>
<el-tab-pane :lazy="true" class="de-tab" :label="$t('commons.role')" :name="tabNames[1]"><grant-role :ref="tabNames[1]" :resource-id="resourceId" :key-word="key" /></el-tab-pane>
<el-tab-pane :lazy="true" class="de-tab" :label="$t('commons.user')" :name="tabNames[2]"><grant-user :ref="tabNames[2]" :resource-id="resourceId" :key-word="key" /></el-tab-pane>
</el-tabs>
<div class="auth-root-class">
<span slot="footer">
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="save">确 定</el-button>
<el-button @click="cancel">{{ $t('commons.cancel') }}</el-button>
<el-button type="primary" @click="save">{{ $t('commons.confirm') }}</el-button>
</span>
</div>
</div>
......
frontend/src/views/panel/GrantAuth/user/index.vue
浏览文件 @ da8e4473
......@@ -8,7 +8,8 @@
:row-style="{height: '35px'}"
@filter-change="filterChange"
>
<el-table-column :column-key="fieldName" :label="columnLabel" :prop="fieldName" filter-placement="right-start" :filters="filter_options" :filter-multiple="false" :filter-method="filterHandler" />
<el-table-column :column-key="fieldName" :label="columnLabel" :prop="fieldName" filter-placement="right-start"
:filters="filter_options" :filter-multiple="false" :filter-method="filterHandler" />
<el-table-column type="selection" fixd />
</el-table>
</div>
......
frontend/src/views/panel/SubjectSetting/PanelStyle/BackgroundSelector.vue
浏览文件 @ da8e4473
......@@ -9,7 +9,7 @@
<el-col>
<el-row>
<el-col :span="6">
<el-radio v-model="panel.backgroundType" label="color" @change="onChangeType">颜色</el-radio>
<el-radio v-model="panel.backgroundType" label="color" @change="onChangeType">{{$t('chart.color')}}</el-radio>
</el-col>
<el-col :span="18">
<colorPicker v-model="panel.color" style="margin-top: 6px;cursor: pointer;z-index: 1004;border: solid 1px black" />
......@@ -17,7 +17,7 @@
</el-row>
<el-row style="height: 60px;margin-top:10px;overflow: hidden">
<el-col :span="6">
<el-radio v-model="panel.backgroundType" label="image" @change="onChangeType">图片</el-radio>
<el-radio v-model="panel.backgroundType" label="image" @change="onChangeType">{{$t('panel.photo')}}</el-radio>
</el-col>
<el-col :span="18">
<el-upload
......@@ -40,7 +40,7 @@
</el-col>
</el-row>
</el-col>
<el-button slot="reference" size="mini" class="shape-item">背景<i class="el-icon-setting el-icon--right" /></el-button>
<el-button slot="reference" size="mini" class="shape-item">{{$t('chart.background')}} <i class="el-icon-setting el-icon--right" /></el-button>
</el-popover>
</div>
</div>
......
frontend/src/views/panel/SubjectSetting/PanelStyle/ComponentGap.vue
浏览文件 @ da8e4473
......@@ -7,10 +7,10 @@
trigger="click"
>
<el-col>
<el-radio v-model="panelStyleForm.gap" label="yes" @change="onChangePanelStyle">有间隙</el-radio>
<el-radio v-model="panelStyleForm.gap" label="no" @change="onChangePanelStyle">无间隙</el-radio>
<el-radio v-model="panelStyleForm.gap" label="yes" @change="onChangePanelStyle">{{ $t('panel.gap') }} </el-radio>
<el-radio v-model="panelStyleForm.gap" label="no" @change="onChangePanelStyle">{{ $t('panel.no_gap') }}</el-radio>
</el-col>
<el-button slot="reference" size="mini" class="shape-item">组件间隙<i class="el-icon-setting el-icon--right" /></el-button>
<el-button slot="reference" size="mini" class="shape-item">{{ $t('panel.component_gap') }} <i class="el-icon-setting el-icon--right" /></el-button>
</el-popover>
</div>
</div>
......
frontend/src/views/panel/SubjectSetting/PreSubject/Slider.vue
浏览文件 @ da8e4473
......@@ -70,7 +70,7 @@
</ul>
</el-col>
<el-col :span="7" style="margin: auto;height: 30px;font-size:12px;color:#3685f2">
<span><a @click="saveSelfSubject">保存个人主题</a></span>
<span><a @click="saveSelfSubject">{{ $t('commons.save') }}</a></span>
</el-col>
</el-row>
</el-row>
......
frontend/src/views/panel/SubjectSetting/index.vue
浏览文件 @ da8e4473
<template>
<el-row class="slider-container">
<div style="height: 40px; line-height: 40px; padding-left: 15px; text-align: left; white-space: pre; text-overflow: ellipsis; left: 0px; right: 0px; top: 0px; font-weight: 700">仪表盘主题</div>
<div style="height: 40px; line-height: 40px; padding-left: 15px; text-align: left; white-space: pre; text-overflow: ellipsis; left: 0px; right: 0px; top: 0px; font-weight: 700">{{ $t('panel.dashboard_theme') }} </div>
<div style="height: 1px; position: absolute; left: 15px; right: 15px; top: 40px; box-sizing:border-box;border-bottom: 1px solid #e8eaed" />
<div>
<slider />
......@@ -8,34 +8,28 @@
<!--折叠面板-->
<div style="margin: 10px;overflow-y: auto">
<el-collapse v-model="activeNames" @change="handleChange">
<el-collapse-item title="仪表盘" name="panel">
<el-collapse-item :title="$t('panel.panel')" name="panel">
<el-row style="background-color: #f7f8fa; margin: 5px">
<background-selector class="attr-selector" />
<component-gap class="attr-selector" />
</el-row>
</el-collapse-item>
<el-collapse-item title="组件样式" name="component">
<el-collapse-item :title="$t('chart.module_style')" name="component">
<el-row style="background-color: #f7f8fa; margin: 5px">
<title-selector class="attr-selector" :chart="chart" @onTextChange="onTextChange" />
<background-color-selector class="attr-selector" :chart="chart" @onChangeBackgroundForm="onChangeBackgroundForm" />
</el-row>
</el-collapse-item>
<el-collapse-item title="图形属性" name="graphical">
<el-collapse-item :title="$t('chart.shape_attr')" name="graphical">
<el-row style="background-color: #f7f8fa; margin: 5px">
<color-selector :source-type="'panelEchart'" class="attr-selector" :chart="chart" @onColorChange="onColorChange" />
</el-row>
</el-collapse-item>
<el-collapse-item title="表格" name="table">
<el-collapse-item :title="$t('panel.table')" name="table">
<el-row style="background-color: #f7f8fa; margin: 5px">
<color-selector :source-type="'panelTable'" class="attr-selector" :chart="chart" @onColorChange="onColorChange" />
</el-row>
</el-collapse-item>
<!-- <el-collapse-item title="过滤组件" name="filter">-->
<!-- <el-row style="background-color: #f7f8fa; margin: 5px">-->
<!-- <background-selector class="attr-selector" @onChangePanelStyle="onChangePanelStyle" />-->
<!-- <component-gap class="attr-selector" @onChangePanelStyle="onChangePanelStyle" />-->
<!-- </el-row>-->
<!-- </el-collapse-item>-->
</el-collapse>
</div>
</el-row>
......
frontend/src/views/panel/ViewSelect/index.vue
浏览文件 @ da8e4473
......@@ -4,7 +4,7 @@
<el-row style="margin-left: 5px;margin-right: 5px">
<el-input
v-model="templateFilterText"
placeholder="输入关键字进行过滤"
:placeholder="$t('panel.filter_keywords')"
size="mini"
clearable
prefix-icon="el-icon-search"
......
frontend/src/views/panel/edit/index.vue
浏览文件 @ da8e4473
......@@ -2,7 +2,7 @@
<el-row>
<el-row class="de-header">
<span style="float: left;line-height: 35px; color: gray">
名称：{{ panelInfo.name || '测试仪表板' }}
{{ $t('commons.name') }} ：{{ panelInfo.name || '测试仪表板' }}
</span>
<!--横向工具栏-->
<Toolbar @showPanel="showPanel" @close-left-panel="closeLeftPanel" />
......@@ -19,7 +19,7 @@
<!-- 视图文字 -->
<div style="position: relative; margin: 18px auto 30px">
<div style="max-width: 100%;text-align: center;white-space: nowrap;text-overflow: ellipsis;position: relative;flex-shrink: 0;">
视图
{{ $t('panel.view') }}
</div>
</div>
<!-- 视图分割线 -->
......@@ -34,7 +34,7 @@
</div>
<div style=" position: absolute;left: 0px;right: 0px;bottom: 10px; height: 16px;">
<div style=" max-width: 100%;text-align: center;white-space: nowrap;text-overflow: ellipsis;position: relative;flex-shrink: 0;">
组件
{{ $t('panel.module') }}
</div>
</div>
</div>
......@@ -70,17 +70,11 @@
<el-dialog
v-if="filterVisible && panelInfo.id"
title="过滤组件"
:title="$t('panel.module')"
:visible.sync="filterVisible"
custom-class="de-filter-dialog"
>
<filter-dialog v-if="filterVisible && currentWidget" :widget-info="currentWidget" :component-info="currentFilterCom" @re-fresh-component="reFreshComponent">
<!-- <de-drawing-widget
v-if="filterVisible"
style="width: 100% !important;"
class="component"
:service-name="currentWidget.name"
/> -->
<component
:is="currentFilterCom.component"
:id="'component' + currentFilterCom.id"
......@@ -90,14 +84,10 @@
:in-draw="false"
/>
</filter-dialog>
<!-- <div slot="footer" class="dialog-footer">
<el-button type="text" @click="editPasswordVisible = false">{{ $t('commons.cancel') }}</el-button>
<el-button type="primary" @click="editUserPassword('editPasswordForm')">确认</el-button>
</div> -->
<div style="text-align: end !important;margin: 0 15px !important;">
<span slot="footer">
<el-button @click="cancelFilter">取 消</el-button>
<el-button :disabled="!currentFilterCom.options.attrs.fieldId" type="primary" @click="sureFilter">确 定</el-button>
<el-button @click="cancelFilter">{{ $t('commons.cancel') }}</el-button>
<el-button :disabled="!currentFilterCom.options.attrs.fieldId" type="primary" @click="sureFilter">{{ $t('commons.confirm') }}</el-button>
</span>
</div>
</el-dialog>
......
frontend/src/views/panel/enshrine/index.vue
浏览文件 @ da8e4473
......@@ -8,7 +8,7 @@
:highlight-current-row="true"
style="width: 100%"
>
<el-table-column prop="name" label="名称">
<el-table-column prop="name" :label="$t('commons.name')">
<template :id="scope.row.storeId" slot-scope="scope">
<div class="start-item">
<div class="filter-db-row star-item-content" @click="showPanel(scope.row)">
......
frontend/src/views/panel/filter/filterDialog.vue
浏览文件 @ da8e4473
......@@ -12,14 +12,6 @@
</el-breadcrumb-item>
</el-breadcrumb>
</div>
<!-- <div class="component-search filter-common">
<el-input
placeholder="请输入内容"
prefix-icon="el-icon-search"
/>
</div> -->
<!-- <div class="component-result-content filter-common" @dragstart="handleDragStart" @dragend="handleDragEnd"> -->
<div class="component-result-content filter-common">
<el-tree
v-if="showDomType === 'tree'"
......@@ -38,7 +30,7 @@
:highlight-current-row="true"
style="width: 100%"
>
<el-table-column prop="name" label="名称">
<el-table-column prop="name" :label="$t('commons.name')">
<template v-if="showDomType === 'db'" :id="scope.row.id" slot-scope="scope">
<div class="filter-db-row" @click="showFieldDatas(scope.row)">
<i class="el-icon-s-data" />
......@@ -68,7 +60,7 @@
</div>
</div>
</el-tab-pane>
<el-tab-pane :lazy="true" class="de-tab" label="按组件选择" name="assembly">
<el-tab-pane :lazy="true" class="de-tab" :label="$t('panel.select_by_module')" name="assembly">
<div class="component-header filter-common">
<el-breadcrumb separator-class="el-icon-arrow-right">
<el-breadcrumb-item v-for="bread in componentSetBreads" :key="bread.label">
......@@ -77,12 +69,7 @@
</el-breadcrumb-item>
</el-breadcrumb>
</div>
<!-- <div class="component-search filter-common">
<el-input
placeholder="请输入内容"
prefix-icon="el-icon-search"
/>
</div> -->
<div class="component-result-content filter-common">
<el-table
v-if="comShowDomType === 'view'"
......@@ -93,7 +80,7 @@
:highlight-current-row="true"
style="width: 100%"
>
<el-table-column prop="name" label="名称">
<el-table-column prop="name" :label="$t('commons.name')">
<template v-if="comShowDomType === 'view'" :id="scope.row.id" slot-scope="scope">
<div class="filter-db-row" @click="comShowFieldDatas(scope.row)">
<i class="el-icon-s-data" />
......
frontend/src/views/panel/list/PanelList.vue
浏览文件 @ da8e4473
......@@ -3,7 +3,7 @@
<!-- panel list -->
<el-col>
<el-row>
<span class="header-title">默认仪表盘</span>
<span class="header-title">{{ $t('panel.default_panel') }}</span>
<div class="block">
<el-tree
:default-expanded-keys="expandedArray"
......@@ -28,7 +28,7 @@
</el-row>
<el-row>
<span class="header-title">仪表盘列表</span>
<span class="header-title">{{ $t('panel.panel') }}</span>
</el-row>
<el-col class="custom-tree-container">
<div class="block">
......@@ -91,9 +91,8 @@
<el-dropdown-item v-if="data.nodeType==='panel'" icon="el-icon-edit" :command="beforeClickMore('edit',data,node)">
{{ $t('panel.edit') }}
</el-dropdown-item>
<el-dropdown-item v-if="data.nodeType==='panel'" icon="el-icon-paperclip" :command="beforeClickMore('link',data,node)">
创建公共链接
{{ $t('panel.create_public_links') }}
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
......@@ -132,9 +131,6 @@
@closed="removeLink"
>
<link-generate v-if="linkVisible" :resource-id="linkResourceId" />
<!-- <span slot="footer" class="dialog-footer">
<el-button @click="copyUri">复制链接</el-button>
</span> -->
</el-dialog>
<!--新建仪表盘dialog-->
<el-dialog :title="panelDialogTitle" :visible.sync="editPanel.visible" :show-close="true" width="600px">
......
frontend/src/views/panel/list/PanelMain.vue
浏览文件 @ da8e4473
......@@ -3,15 +3,15 @@
<de-aside-container>
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane name="PanelList">
<span slot="label"><i class="el-icon-document" />列表</span>
<span slot="label"><i class="el-icon-document" />{{ $t('panel.panel_list')}}</span>
<panel-list />
</el-tab-pane>
<el-tab-pane name="panels_star" :lazy="true">
<span slot="label"><i class="el-icon-star-off" />收藏</span>
<span slot="label"><i class="el-icon-star-off" />{{ $t('panel.store')}}</span>
<enshrine v-if="showEnshrine" />
</el-tab-pane>
<el-tab-pane name="panels_share" :lazy="true">
<span slot="label"><i class="el-icon-share" />分享</span>
<span slot="label"><i class="el-icon-share" />{{ $t('panel.share')}}</span>
<share-tree v-if="showShare" />
</el-tab-pane>
</el-tabs>
......
frontend/src/views/panel/list/PanelViewShow.vue
浏览文件 @ da8e4473
......@@ -5,29 +5,29 @@
<!--TODO 仪表盘头部区域-->
<span>{{ panelInfo.name || '测试仪表板' }}</span>
<span style="float: right;margin-right: 10px">
<el-tooltip content="保存为模板">
<el-tooltip :content="$t('panel.save_to_panel')">
<el-button class="el-icon-folder-checked" size="mini" circle @click="saveToTemplate" />
</el-tooltip>
</span>
<span style="float: right;margin-right: 10px">
<el-tooltip content="导出为模板">
<el-tooltip :content="$t('panel.export_to_panel')">
<el-button class="el-icon-download" size="mini" circle @click="downloadToTemplate" />
</el-tooltip>
</span>
<span style="float: right;margin-right: 10px">
<el-tooltip content="预览">
<el-tooltip :content="$t('panel.preview')">
<el-button class="el-icon-view" size="mini" circle @click="clickPreview" />
</el-tooltip>
</span>
<span v-if="!hasStar && panelInfo" style="float: right;margin-right: 10px">
<el-tooltip content="收藏">
<el-tooltip :content="$t('panel.store')">
<el-button class="el-icon-star-off" size="mini" circle @click="star" />
</el-tooltip>
</span>
<span v-if="hasStar && panelInfo" style="float: right;margin-right: 10px">
<el-tooltip content="取消">
<el-tooltip :content="$t('commons.cancle')">
<el-button class="el-icon-star-on" size="mini" circle @click="unstar" />
</el-tooltip>
</span>
......@@ -41,7 +41,7 @@
</el-col>
<el-col v-if="panelInfo.name.length===0" style="height: 100%;">
<el-row style="height: 100%;" class="custom-position">
请从左侧选择仪表盘
{{ $t('panle.select_panel_from_left') }}
</el-row>
</el-col>
......
frontend/src/views/panel/list/SaveToTemplate.vue
浏览文件 @ da8e4473
<template>
<el-row>
<el-row>
<el-col :span="4">模板名称</el-col>
<el-col :span="4"> {{ $t('panel.template_nale')}}</el-col>
<el-col :span="20">
<el-input v-model="templateInfo.name" clearable size="mini" />
</el-col>
......@@ -18,9 +18,6 @@
>
<el-table-column :label="columnLabel" :column-key="fieldName" :prop="fieldName" />
<el-table-column align="right">
<!-- <template slot="header">-->
<!-- <el-input v-model="keyWordSearch" size="mini" placeholder="输入关键字搜索" />-->
<!-- </template>-->
<template slot-scope="scope">
<el-radio v-model="tableRadio" :label="scope.row"><i /></el-radio>
</template>
......@@ -29,8 +26,8 @@
</div>
</el-row>
<el-row class="root-class">
<el-button @click="cancel()">取 消</el-button>
<el-button type="primary" @click="save()">确 定</el-button>
<el-button @click="cancel()">{{ $t('commons.cancle')}}</el-button>
<el-button type="primary" @click="save()">{{ $t('commons.save')}}</el-button>
</el-row>
</el-row>
</template>
......
frontend/src/views/panel/preview/index.vue
浏览文件 @ da8e4473
......@@ -3,7 +3,7 @@
<!-- <de-header>Header</de-header> -->
<span style="line-height: 35px; position: absolute; top:10px;right: 10px">
<el-button size="mini" @click="toDir">
关闭
{{ $t('commons.close') }}
</el-button>
</span>
<de-container>
......
frontend/src/views/panel/template/component/TemplateList.vue
浏览文件 @ da8e4473
......@@ -2,14 +2,14 @@
<el-col>
<el-row>
<el-button icon="el-icon-folder-add" type="primary" size="mini" @click="add()">
添加分类
{{ $t('panel.add_category') }}
</el-button>
</el-row>
<el-row style="margin-top: 5px">
<el-row>
<el-input
v-model="templateFilterText"
placeholder="输入关键字进行过滤"
:placeholder="$t('panel.filter_keywords')"
size="mini"
clearable
prefix-icon="el-icon-search"
......@@ -48,10 +48,10 @@
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item icon="el-icon-edit" :command="beforeClickMore('edit',data,node)">
重命名
{{ $t('panel.rename') }}
</el-dropdown-item>
<el-dropdown-item icon="el-icon-delete" :command="beforeClickMore('delete',data,node)">
删除
{{ $t('panel.delete') }}
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
......
frontend/src/views/panel/template/index.vue
浏览文件 @ da8e4473
......@@ -3,13 +3,17 @@
<de-aside-container>
<el-tabs v-model="currentTemplateType" @tab-click="handleClick">
<el-tab-pane name="system">
<span slot="label"><i class="el-icon-document" />系统模板</span>
<template-list v-if="currentTemplateType==='system'" :template-type="currentTemplateType" :template-list="templateList" @templateDelete="templateDelete" @templateEdit="templateEdit" @showCurrentTemplate="showCurrentTemplate" @showTemplateEditDialog="showTemplateEditDialog" />
<span slot="label"><i class="el-icon-document" /> {{ $t('panel.sys_template') }}</span>
<template-list v-if="currentTemplateType==='system'" :template-type="currentTemplateType" :template-list="templateList"
@templateDelete="templateDelete" @templateEdit="templateEdit" @showCurrentTemplate="showCurrentTemplate"
@showTemplateEditDialog="showTemplateEditDialog" />
</el-tab-pane>
<el-tab-pane name="self">
<span slot="label"><i class="el-icon-star-off" />用户模板</span>
<span slot="label"><i class="el-icon-star-off" />{{ $t('panel.user_template') }}</span>
<!--v-if 重新渲染 强制刷新首行高亮属性-->
<template-list v-if="currentTemplateType==='self'" :template-type="currentTemplateType" :template-list="templateList" @templateDelete="templateDelete" @templateEdit="templateEdit" @showCurrentTemplate="showCurrentTemplate" @showTemplateEditDialog="showTemplateEditDialog" />
<template-list v-if="currentTemplateType==='self'" :template-type="currentTemplateType" :template-list="templateList"
@templateDelete="templateDelete" @templateEdit="templateEdit" @showCurrentTemplate="showCurrentTemplate"
@showTemplateEditDialog="showTemplateEditDialog" />
</el-tab-pane>
</el-tabs>
</de-aside-container>
......@@ -24,13 +28,13 @@
</de-main-container>
<el-dialog :title="dialogTitle" :visible="editTemplate" :show-close="false" width="30%">
<el-form ref="templateEditForm" :model="templateEditForm" :rules="templateEditFormRules">
<el-form-item label="名称" prop="name">
<el-form-item :label="$t('commons.name')" prop="name">
<el-input v-model="templateEditForm.name" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button size="mini" @click="close()">{{ $t('panel.cancel') }}</el-button>
<el-button type="primary" size="mini" @click="saveTemplateEdit(templateEditForm)">{{ $t('panel.confirm') }}
<el-button size="mini" @click="close()">{{ $t('commons.cancel') }}</el-button>
<el-button type="primary" size="mini" @click="saveTemplateEdit(templateEditForm)">{{ $t('commons.confirm') }}
</el-button>
</div>
</el-dialog>
......
frontend/src/views/system/datasource/form.vue
浏览文件 @ da8e4473
......@@ -9,7 +9,7 @@
<el-input v-model="form.desc" autocomplete="off" type="textarea" />
</el-form-item>
<el-form-item :label="$t('datasource.type')" prop="type">
<el-select v-model="form.type" :placeholder="$t('datasource.please_choose_type')" class="select-width" @change="changeType()" :disabled="formType=='modify'">
<el-select v-model="form.type" :placeholder="$t('datasource.please_choose_type')" class="select-width" :disabled="formType=='modify'" @change="changeType()">
<el-option
v-for="item in allTypes"
:key="item.name"
......@@ -23,23 +23,21 @@
<el-input v-model="form.configuration.dataBase" autocomplete="off" :disabled="formType=='modify'" />
</el-form-item>
<el-form-item v-if="form.configuration.dataSourceType=='jdbc'" :label="$t('datasource.user_name')" prop="configuration.username">
<el-input v-model="form.configuration.username" autocomplete="off" :disabled="formType=='modify'"/>
<el-input v-model="form.configuration.username" autocomplete="off" :disabled="formType=='modify'" />
</el-form-item>
<el-form-item v-if="form.configuration.dataSourceType=='jdbc'" :label="$t('datasource.password')" prop="configuration.password">
<el-input v-model="form.configuration.password" autocomplete="off" show-password :disabled="formType=='modify'"/>
<el-input v-model="form.configuration.password" autocomplete="off" show-password :disabled="formType=='modify'" />
</el-form-item>
<el-form-item v-if="form.configuration.dataSourceType=='jdbc'" :label="$t('datasource.host')" prop="configuration.host">
<el-input v-model="form.configuration.host" autocomplete="off" :disabled="formType=='modify'"/>
<el-input v-model="form.configuration.host" autocomplete="off" :disabled="formType=='modify'" />
</el-form-item>
<el-form-item v-if="form.configuration.dataSourceType=='jdbc'" :label="$t('datasource.port')" prop="configuration.port">
<el-input v-model="form.configuration.port" autocomplete="off" :disabled="formType=='modify'"/>
<el-input v-model="form.configuration.port" autocomplete="off" :disabled="formType=='modify'" />
</el-form-item>
<el-form-item>
<el-button @click="validaDatasource">{{ $t('commons.validate') }}</el-button>
<el-button type="primary" @click="save">保存</el-button>
<!-- <el-button @click="reset">重置</el-button>-->
<el-button type="primary" @click="save">{{ $t('commons.save') }}</el-button>
</el-form-item>
</el-form>
......
frontend/src/views/system/dept/form.vue
浏览文件 @ da8e4473
<template>
<layout-content :header="formType=='add' ? $t('organization.create') : $t('organization.modify')" back-name="组织管理">
<el-form ref="deptForm" :model="form" :rules="rule" size="small" label-width="auto" label-position="right">
<el-form-item label="组织名称" prop="name">
<el-form-item :label="$t('organization.name')" prop="name">
<el-input v-model="form.name" />
</el-form-item>
<el-form-item label="组织排序" prop="deptSort">
<el-form-item :label="$t('organization.sort')" prop="deptSort">
<el-input-number
v-model.number="form.deptSort"
......@@ -14,33 +14,25 @@
/>
</el-form-item>
<el-form-item label="顶级组织" prop="top">
<el-form-item :label="$t('organization.top_org')" prop="top">
<el-radio-group v-model="form.top" @change="topChange">
<el-radio :label="true">是</el-radio>
<el-radio :label="false">否</el-radio>
<el-radio :label="true">{{ $t('commons.yes') }}</el-radio>
<el-radio :label="false">{{ $t('commons.no') }}</el-radio>
</el-radio-group>
</el-form-item>
<!-- <el-form-item label="状态" prop="enabled">
<el-radio-group v-model="form.enabled" disabled>
<el-radio :label="true">启用</el-radio>
<el-radio :label="false">停用</el-radio>
</el-radio-group>
</el-form-item> -->
<el-form-item v-if="!form.top" label="上级组织" prop="pid">
<el-form-item v-if="!form.top" :label="$t('organization.parent_org')" prop="pid">
<treeselect
v-model="form.pid"
:auto-load-root-options="false"
:load-options="loadDepts"
:options="depts"
placeholder="选择上级类目"
:placeholder="$t('organization.select_parent_org')"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="save">保存</el-button>
<el-button @click="reset">重置</el-button>
<el-button type="primary" @click="save">{{ $t('commons.save') }}</el-button>
<el-button @click="reset">{{ $t('commons.reset') }}</el-button>
</el-form-item>
</el-form>
......
frontend/src/views/system/dept/index.vue
浏览文件 @ da8e4473
<template>
<layout-content v-loading="$store.getters.loadingMap[$store.getters.currentPath]">
<!-- <complex-table
ref="table"
:data="tableData"
:lazy="isLazy"
:load="loadExpandDatas"
:columns="columns"
:buttons="buttons"
:header="header"
:search-config="searchConfig"
:pagination-config="paginationConfig"
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
:default-expand-all="isTableExpand"
row-key="deptId"
@search="search"
> -->
<tree-table
:columns="columns"
:search-config="searchConfig"
@search="search"
>
<template #toolbar>
<el-button v-permission="['dept:add']" icon="el-icon-circle-plus-outline" @click="create">{{ $t('organization.create') }}</el-button>
<!-- <fu-table-button v-permission="['dept:add']" icon="el-icon-circle-plus-outline" :label="$t('organization.create')" @click="create" /> -->
</template>
<el-table
ref="table"
......@@ -35,28 +17,15 @@
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
row-key="deptId"
>
<!-- <el-table-column type="selection" fix /> -->
<el-table-column label="名称" prop="name" />
<el-table-column label="下属组织数" prop="subCount" />
<!-- <el-table-column label="状态" align="center" prop="enabled">
<template slot-scope="scope">
<el-switch
v-model="scope.row.enabled"
:disabled="scope.row.id === 1"
active-color="#409EFF"
inactive-color="#F56C6C"
@change="changeEnabled(scope.row, scope.row.enabled,)"
/>
</template>
</el-table-column> -->
<el-table-column prop="createTime" label="创建日期">
<el-table-column :label="$t('organization.name')" prop="name" />
<el-table-column :label="$t('organization.sub_organizations')" prop="subCount" />
<el-table-column prop="createTime" :label="$t('organization.create_time')">
<template v-slot:default="scope">
<span>{{ scope.row.createTime | timestampFormatDate }}</span>
</template>
</el-table-column>
<fu-table-operations :buttons="buttons" label="操作" fix />
<fu-table-operations :buttons="buttons" :label="$t('commons.operating')" fix />
</el-table>
</tree-table>
<!-- </complex-table> -->
......@@ -72,10 +41,10 @@
>
<el-form ref="createOrganization" inline :model="form" :rules="rule" size="small" label-width="80px">
<el-form-item label="组织名称" prop="name">
<el-form-item :label="$t('organization.name')" prop="name">
<el-input v-model="form.name" style="width: 370px;" />
</el-form-item>
<el-form-item label="组织排序" prop="deptSort">
<el-form-item :label="$t('organization.sort')" prop="deptSort">
<el-input-number
v-model.number="form.deptSort"
:min="0"
......@@ -85,36 +54,34 @@
/>
</el-form-item>
<el-form-item label="顶级组织" prop="top">
<el-form-item :label="$t('organization.top_org')" prop="top">
<el-radio-group v-model="form.top" style="width: 140px" @change="topChange">
<el-radio :label="true">是</el-radio>
<el-radio :label="false">否</el-radio>
<el-radio :label="true">{{ $t('commons.yes') }}</el-radio>
<el-radio :label="false">{{ $t('commons.no') }}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="状态" prop="enabled">
<el-form-item label="$t('commons.status')" prop="enabled">
<el-radio-group v-model="form.enabled" style="width: 140px" disabled>
<el-radio :label="true">启用</el-radio>
<el-radio :label="false">停用</el-radio>
<el-radio :label="true">{{ $t('commons.enable') }}</el-radio>
<el-radio :label="false">{{ $t('commons.disable') }}</el-radio>
</el-radio-group>
<!-- <el-radio v-for="item in dict.dept_status" :key="item.id" v-model="form.enabled" :label="item.value">{{ item.label }}</el-radio> -->
</el-form-item>
<el-form-item v-if="!form.top" style="margin-bottom: 0;" label="上级组织" prop="pid">
<el-form-item v-if="!form.top" style="margin-bottom: 0;" :label="$t('organization.parent_org')" prop="pid">
<treeselect
v-model="form.pid"
:auto-load-root-options="false"
:load-options="loadDepts"
:options="depts"
style="width: 370px;"
placeholder="选择上级类目"
:placeholder="$t('organization.select_parent_org')"
/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="dialogOrgAddVisible = false">{{ $t('commons.cancel') }}</el-button>
<el-button type="primary" @click="createDept('createOrganization')">确认</el-button>
<el-button type="primary" @click="createDept('createOrganization')">{{ $t('commons.confirm') }}</el-button>
</div>
</el-dialog>
......
frontend/src/views/system/menu/form.vue
浏览文件 @ da8e4473
......@@ -3,12 +3,12 @@
<el-form ref="menuForm" :model="form" :rules="rule" size="small" label-width="auto" label-position="right">
<el-form-item label="菜单类型" prop="type">
<el-radio-group v-model="form.type" size="mini" :disabled="formType!=='add'">
<el-radio-button label="0">目录</el-radio-button>
<el-radio-button label="1">菜单</el-radio-button>
<el-radio-button label="2">按钮</el-radio-button>
<el-radio-button label="0">{{ $t('commons.catalogue') }}</el-radio-button>
<el-radio-button label="1">{{ $t('commons.menu') }}</el-radio-button>
<el-radio-button label="2">{{ $t('commons.button') }}</el-radio-button>
</el-radio-group>
</el-form-item>
<el-form-item v-if="form.type=== 1 && form.icon" label="菜单图标" prop="icon">
<el-form-item v-if="form.type=== 1 && form.icon" :label="$t('commons.icon')" prop="icon">
<el-popover
placement="bottom-start"
width="425"
......@@ -16,47 +16,34 @@
@show="$refs['iconSelect'].reset()"
>
<IconSelect ref="iconSelect" @selected="selected" />
<el-input slot="reference" v-model="form.icon" placeholder="点击选择图标" readonly>
<el-input slot="reference" v-model="form.icon" :placeholder="$t('menu.select_icon')" readonly>
<svg-icon v-if="form.icon" slot="prefix" :icon-class="form.icon" class="el-input__icon" style="height: 32px;width: 16px;" />
<i v-else slot="prefix" class="el-icon-search el-input__icon" />
</el-input>
</el-popover>
</el-form-item>
<el-form-item v-if="form.type !== 2" label="菜单标题" prop="title">
<el-input v-model="form.title" placeholder="菜单标题" />
<el-form-item v-if="form.type !== 2" :label="$t('menu.tile')" prop="title">
<el-input v-model="form.title" :placeholder="$t('menu.tile')" />
</el-form-item>
<el-form-item v-if="form.type === 2" label="按钮名称" prop="title">
<el-input v-model="form.title" placeholder="按钮名称" />
<el-form-item v-if="form.type === 2" label="$t('menu.button_name')" prop="title">
<el-input v-model="form.title" :placeholder="$t('menu.button_name')" />
</el-form-item>
<!-- <el-form-item v-if="form.type !== 0" label="权限标识" prop="permission">
<el-input v-model="form.permission" :disabled="form.iframe || formType!=='add'" placeholder="权限标识" />
</el-form-item>
<el-form-item v-if="form.type !== 2" label="路由地址" prop="path">
<el-input v-model="form.path" placeholder="路由地址" :disabled="formType!=='add'" />
</el-form-item> -->
<el-form-item v-if="form.type !== 2" label="菜单排序" prop="menuSort">
<el-form-item v-if="form.type !== 2" label="$t('menu.menu_sort')" prop="menuSort">
<el-input-number v-model.number="form.menuSort" :min="0" :max="999" controls-position="right" />
</el-form-item>
<!-- <el-form-item v-if="!form.iframe && form.type === 1" label="组件名称" prop="componentName">
<el-input v-model="form.componentName" :disabled="formType!=='add'" placeholder="匹配组件内Name字段" />
</el-form-item>
<el-form-item v-if="!form.iframe && form.type === 1" label="组件路径" prop="component">
<el-input v-model="form.component" :disabled="formType!=='add'" placeholder="组件路径" />
</el-form-item> -->
<el-form-item label="上级类目" prop="pid">
<el-form-item :label="$t('menu.parent_category')" prop="pid">
<treeselect
v-model="form.pid"
:disabled="formType!=='add'"
:options="menus"
:load-options="loadMenus"
placeholder="选择上级类目"
:placeholder="$t('menu.parent_category')"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="save">保存</el-button>
<el-button @click="reset">重置</el-button>
<el-button type="primary" @click="save">{{ $t('commons.reset') }}</el-button>
<el-button @click="reset">{{ $t('commons.confirm') }}</el-button>
</el-form-item>
</el-form>
......
frontend/src/views/system/menu/index.vue
浏览文件 @ da8e4473
......@@ -21,23 +21,19 @@
>
<!-- <el-table-column type="selection" fix /> -->
<el-table-column :show-overflow-tooltip="true" label="菜单标题" prop="title" />
<el-table-column prop="icon" label="图标" align="center">
<el-table-column :show-overflow-tooltip="true" :label="$t('menu.tile')" prop="title" />
<el-table-column prop="icon" :label="$t('commons.icon')" align="center">
<template slot-scope="scope">
<svg-icon :icon-class="scope.row.icon ? scope.row.icon : ''" />
</template>
</el-table-column>
<!-- <el-table-column :show-overflow-tooltip="true" prop="permission" label="权限标识" />
<el-table-column :show-overflow-tooltip="true" prop="component" label="组件路径" /> -->
<el-table-column prop="createTime" label="创建日期">
<el-table-column prop="createTime" :label="$t('menu.create_time')" >
<template v-slot:default="scope">
<span>{{ scope.row.createTime | timestampFormatDate }}</span>
</template>
</el-table-column>
<fu-table-operations :buttons="buttons" label="操作" fix />
<fu-table-operations :buttons="buttons" :label="$t('commons.operating')" fix />
</el-table>
</tree-table>
......@@ -53,12 +49,12 @@
<el-form-item label="菜单类型" prop="type">
<el-radio-group v-model="form.type" size="mini" :disabled="formType!=='add'" style="width: 179px">
<el-radio-button label="0">目录</el-radio-button>
<el-radio-button label="1">菜单</el-radio-button>
<el-radio-button label="2">按钮</el-radio-button>
<el-radio-button label="0">{{ $t('commons.catalogue') }} </el-radio-button>
<el-radio-button label="1">{{ $t('commons.menu') }} </el-radio-button>
<el-radio-button label="2">{{ $t('commons.button') }}</el-radio-button>
</el-radio-group>
</el-form-item>
<el-form-item v-show="form.type!== 2" label="菜单图标" prop="icon">
<el-form-item v-show="form.type!== 2" :label="$t('commons.icon')" prop="icon">
<el-popover
placement="bottom-start"
width="425"
......@@ -66,48 +62,48 @@
@show="$refs['iconSelect'].reset()"
>
<IconSelect ref="iconSelect" @selected="selected" />
<el-input slot="reference" v-model="form.icon" style="width: 450px;" placeholder="点击选择图标" readonly>
<el-input slot="reference" v-model="form.icon" style="width: 450px;" :placeholder="$t('menu.select_icon')" readonly>
<svg-icon v-if="form.icon" slot="prefix" :icon-class="form.icon" class="el-input__icon" style="height: 32px;width: 16px;" />
<i v-else slot="prefix" class="el-icon-search el-input__icon" />
</el-input>
</el-popover>
</el-form-item>
<el-form-item v-if="form.type !== 2" label="菜单标题" prop="title">
<el-input v-model="form.title" :style=" form.type === '0' ? 'width: 450px' : 'width: 179px'" placeholder="菜单标题" />
<el-form-item v-if="form.type !== 2" :label="$t('menu.tile')" prop="title">
<el-input v-model="form.title" :style=" form.type === '0' ? 'width: 450px' : 'width: 179px'" :placeholder="$t('menu.tile')" />
</el-form-item>
<el-form-item v-if="form.type === 2" label="按钮名称" prop="title">
<el-input v-model="form.title" placeholder="按钮名称" style="width: 179px;" />
<el-form-item v-if="form.type === 2" :label="$t('menu.button_name')" prop="title">
<el-input v-model="form.title" :placeholder="$t('menu.button_name')" style="width: 179px;" />
</el-form-item>
<el-form-item v-show="form.type !== 0" label="权限标识" prop="permission">
<el-input v-model="form.permission" :disabled="form.iframe || formType!=='add'" placeholder="权限标识" style="width: 179px;" />
<el-form-item v-show="form.type !== 0" :label="$t('menu.authority_identification')" prop="permission">
<el-input v-model="form.permission" :disabled="form.iframe || formType!=='add'" :placeholder="$t('menu.authority_identification')" style="width: 179px;" />
</el-form-item>
<el-form-item v-if="form.type !== 2" label="路由地址" prop="path">
<el-input v-model="form.path" placeholder="路由地址" :disabled="formType!=='add'" style="width: 179px;" />
<el-form-item v-if="form.type !== 2" label="$t('menu.route_addr')" prop="path">
<el-input v-model="form.path" :placeholder="$t('menu.route_addr')" :disabled="formType!=='add'" style="width: 179px;" />
</el-form-item>
<el-form-item label="菜单排序" prop="menuSort">
<el-form-item :label="$t('menu.menu_sort')" prop="menuSort">
<el-input-number v-model.number="form.menuSort" :min="0" :max="999" controls-position="right" style="width: 179px;" />
</el-form-item>
<el-form-item v-show="!form.iframe && form.type === 1" label="组件名称" prop="componentName">
<el-input v-model="form.componentName" :disabled="formType!=='add'" style="width: 179px;" placeholder="匹配组件内Name字段" />
<el-form-item v-show="!form.iframe && form.type === 1" :label="$t('menu.module_name')" prop="componentName">
<el-input v-model="form.componentName" :disabled="formType!=='add'" style="width: 179px;" :placeholder="匹配组件内Name字段" />
</el-form-item>
<el-form-item v-show="!form.iframe && form.type === 1" label="组件路径" prop="component">
<el-input v-model="form.component" :disabled="formType!=='add'" style="width: 179px;" placeholder="组件路径" />
<el-form-item v-show="!form.iframe && form.type === 1" label="$t('menu.path')" prop="component">
<el-input v-model="form.component" :disabled="formType!=='add'" style="width: 179px;" :placeholder="$t('menu.path')" />
</el-form-item>
<el-form-item label="上级类目" prop="pid">
<el-form-item :label="$t('menu.parent_category')" prop="pid">
<treeselect
v-model="form.pid"
:disabled="formType!=='add'"
:options="menus"
:load-options="loadMenus"
style="width: 450px;"
placeholder="选择上级类目"
:placeholder="$t('menu.parent_category')"
/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="dialogVisible = false">{{ $t('commons.cancel') }}</el-button>
<el-button type="primary" @click="createMenu('menuForm')">确认</el-button>
<el-button type="primary" @click="createMenu('menuForm')">{{ $t('commons.confirm') }}</el-button>
</div>
</el-dialog>
......
frontend/src/views/system/role/form.vue
浏览文件 @ da8e4473
<template>
<layout-content :header="formType=='add' ? $t('role.add') : $t('role.modify')" back-name="角色管理">
<el-form ref="roleForm" :model="form" :rules="rule" size="small" label-width="auto" label-position="right">
<el-form-item label="角色名称" prop="name">
<el-form-item :label="$t('commons.name')" prop="name">
<el-input v-model="form.name" />
</el-form-item>
<!-- <el-form-item label="角色代码" prop="code">
<el-input v-model="form.code" :disabled="formType !== 'add'" />
</el-form-item> -->
<el-form-item label="描述信息" prop="description">
<el-form-item :label="$t('commons.description')" prop="description">
<el-input v-model="form.description" type="textarea" />
</el-form-item>
<el-form-item>
<el-button type="primary" @click="save">保存</el-button>
<el-button @click="reset">重置</el-button>
<el-button type="primary" @click="save">{{ $t('commons.save') }}</el-button>
<el-button @click="reset">{{ $t('commons.reset') }}</el-button>
</el-form-item>
</el-form>
......
frontend/src/views/system/role/index.vue
浏览文件 @ da8e4473
......@@ -14,23 +14,21 @@
@row-click="rowClick"
>
<template #toolbar>
<!-- <fu-table-button icon="el-icon-circle-plus-outline" :label="$t('role.add')" @click="create" /> -->
<el-button v-permission="['role:add']" icon="el-icon-circle-plus-outline" @click="create">{{ $t('role.add') }}</el-button>
</template>
<el-table-column prop="name" label="名称" />
<!-- <el-table-column prop="code" label="代码" /> -->
<el-table-column :show-overflow-tooltip="true" prop="createTime" label="创建日期">
<el-table-column prop="name" :label="$t('commons.name')" />
<el-table-column :show-overflow-tooltip="true" prop="createTime" :label="$t('commons.create_time')">
<template v-slot:default="scope">
<span>{{ scope.row.createTime | timestampFormatDate }}</span>
</template>
</el-table-column>
<fu-table-operations :buttons="buttons" label="操作" fix />
<fu-table-operations :buttons="buttons" :label="$t('commons.operating')" fix />
</complex-table>
</el-aside>
<el-main style="padding: 8px 20px;">
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="菜单授权" name="first">
<el-tab-pane :label="$t('role.menu_authorization')" name="first">
<el-tree
ref="menu"
lazy
......@@ -44,7 +42,7 @@
@check="menuChange"
/>
</el-tab-pane>
<el-tab-pane label="数据授权" name="second">玩命开发中...</el-tab-pane>
<el-tab-pane :label="$t('role.data_authorization')" name="second">玩命开发中...</el-tab-pane>
</el-tabs>
</el-main>
</el-container>
......@@ -72,7 +70,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="dialogVisible = false">{{ $t('commons.cancel') }}</el-button>
<el-button type="primary" @click="saveRole('roleForm')">确认</el-button>
<el-button type="primary" @click="saveRole('roleForm')">{{ $t('commons.confirm') }}</el-button>
</div>
</el-dialog>
......
frontend/src/views/system/user/form.vue
浏览文件 @ da8e4473
<template>
<layout-content :header="formType=='add' ? $t('user.create') : $t('user.modify')" back-name="用户管理">
<el-form ref="createUserForm" :model="form" :rules="rule" size="small" label-width="auto" label-position="right">
<el-form-item label="用户名" prop="username">
<el-form-item :label="$t('commons.name')" prop="username">
<el-input v-model="form.username" />
</el-form-item>
<el-form-item label="电话" prop="phone">
<el-form-item :label="$t('commons.phone')" prop="phone">
<el-input v-model="form.phone" />
</el-form-item>
<el-form-item label="昵称" prop="nickName">
<el-form-item :label="$t('commons.nick_name')" prop="nickName">
<el-input v-model="form.nickName" />
</el-form-item>
<el-form-item label="邮箱" prop="email">
<el-form-item :label="$t('commons.email')" prop="email">
<el-input v-model="form.email" />
</el-form-item>
<el-form-item label="性别">
<el-form-item :label="$t('commons.gender')">
<el-radio-group v-model="form.gender" style="width: 178px">
<el-radio label="男">男</el-radio>
<el-radio label="女">女</el-radio>
<el-radio :label="$t('commons.man')">{{ $t('commons.man') }}</el-radio>
<el-radio :label="$t('commons.woman')">{{ $t('commons.woman') }}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="状态">
<el-form-item :label="$t('commons.status')">
<el-radio-group v-model="form.enabled" style="width: 140px">
<el-radio :label="1">启用</el-radio>
<el-radio :label="0">停用</el-radio>
<el-radio :label="1">{{ $t('user.enable') }}</el-radio>
<el-radio :label="0">{{ $t('user.disable') }}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="部门" prop="dept">
<el-form-item :label="$t('commons.organization')" prop="dept">
<treeselect
v-model="form.deptId"
:options="depts"
:load-options="loadDepts"
:auto-load-root-options="false"
placeholder="选择部门"
:placeholder="$t('user.choose_org')"
/>
</el-form-item>
<el-form-item label="角色" prop="roleIds">
<el-form-item :label="$t('commons.role')" prop="roleIds">
<el-select
v-model="form.roleIds"
style="width: 100%"
multiple
placeholder="请选择"
:placeholder="$t('commons.please_select')"
@remove-tag="deleteTag"
@change="changeRole"
>
......@@ -53,8 +53,8 @@
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="save">保存</el-button>
<el-button @click="reset">重置</el-button>
<el-button type="primary" @click="save">{{ $t('commons.confirm') }}</el-button>
<el-button @click="reset">{{ $t('commons.reset') }}</el-button>
</el-form-item>
</el-form>
......
frontend/src/views/system/user/index.vue
浏览文件 @ da8e4473
......@@ -14,28 +14,28 @@
<!-- <fu-table-button v-permission="['user:add']" icon="el-icon-circle-plus-outline" :label="$t('user.create')" @click="create" /> -->
</template>
<el-table-column prop="username" label="ID" width="80" />
<el-table-column prop="nickName" :label="$t('commons.name')" width="140" />
<el-table-column prop="gender" label="性别" width="50" />
<el-table-column prop="username" :label="$t('commons.name')" />
<el-table-column prop="nickName" :label="$t('commons.nick_name')" />
<el-table-column prop="gender" :label="$t('commons.gender')" />
<el-table-column :show-overflow-tooltip="true" prop="phone" width="200" label="电话" />
<el-table-column :show-overflow-tooltip="true" width="200" prop="email" :label="$t('commons.email')" />
<el-table-column :show-overflow-tooltip="true" prop="phone" :label="$t('commons.phone')" />
<el-table-column :show-overflow-tooltip="true" prop="email" :label="$t('commons.email')" />
<el-table-column :show-overflow-tooltip="true" prop="dept" :label="$t('commons.organization')">
<template slot-scope="scope">
<div>{{ scope.row.dept.deptName }}</div>
</template>
</el-table-column>
<el-table-column prop="status" :label="$t('commons.status')" width="60">
<el-table-column prop="status" :label="$t('commons.status')" >
<template v-slot:default="scope">
<el-switch v-model="scope.row.enabled" :active-value="1" :inactive-value="0" inactive-color="#DCDFE6" @change="changeSwitch(scope.row)" />
</template>
</el-table-column>
<el-table-column prop="createTime" :label="$t('commons.create_time')" width="160">
<el-table-column prop="createTime" :label="$t('commons.create_time')">
<template v-slot:default="scope">
<span>{{ scope.row.createTime | timestampFormatDate }}</span>
</template>
</el-table-column>
<fu-table-operations :buttons="buttons" label="操作" fix />
<fu-table-operations :buttons="buttons" :label="$t('commons.operating')" fix />
</complex-table>
<el-dialog
......@@ -49,47 +49,47 @@
>
<el-form ref="createUserForm" :inline="true" :model="form" :rules="rule" size="small" label-width="66px">
<el-form-item label="用户名" prop="username">
<el-form-item :label="$t('commons.name')" prop="username">
<el-input v-model="form.username" />
</el-form-item>
<el-form-item label="电话" prop="phone">
<el-form-item :label="$t('commons.phone')" prop="phone">
<el-input v-model="form.phone" />
</el-form-item>
<el-form-item label="昵称" prop="nickName">
<el-form-item :label="$t('commons.nick_name')" prop="nickName">
<el-input v-model="form.nickName" />
</el-form-item>
<el-form-item label="邮箱" prop="email">
<el-form-item :label="$t('commons.email')" prop="email">
<el-input v-model="form.email" />
</el-form-item>
<el-form-item label="性别">
<el-form-item :label="$t('commons.gender')">
<el-radio-group v-model="form.gender" style="width: 178px">
<el-radio label="男">男</el-radio>
<el-radio label="女">女</el-radio>
<el-radio :label="$t('commons.man')">{{ $t('commons.man') }}</el-radio>
<el-radio :label="$t('commons.woman')">{{ $t('commons.woman') }}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="状态">
<el-form-item :label="$t('commons.status')" >
<el-radio-group v-model="form.enabled" style="width: 140px">
<el-radio :label="1">启用</el-radio>
<el-radio :label="0">停用</el-radio>
<el-radio :label="1">{{ $t('commons.enable') }} </el-radio>
<el-radio :label="0"> {{ $t('commons.disable') }} </el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="部门" prop="dept">
<el-form-item :label="$t('commons.organization')" prop="dept">
<treeselect
v-model="form.deptId"
:options="depts"
:load-options="loadDepts"
style="width: 430px"
placeholder="选择部门"
:placeholder="$t('user.choose_org')"
/>
</el-form-item>
<el-form-item style="margin-bottom: 0;" label="角色" prop="roleIds">
<el-form-item style="margin-bottom: 0;" :label="$t('commons.role')" prop="roleIds">
<el-select
v-model="form.roleIds"
style="width: 430px"
multiple
required="true"
placeholder="请选择"
:placeholder="$t('commons.please_select')"
@remove-tag="deleteTag"
@change="changeRole"
>
......@@ -104,7 +104,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="dialogVisible = false">{{ $t('commons.cancel') }}</el-button>
<el-button type="primary" @click="createUser('createUserForm')">确认</el-button>
<el-button type="primary" @click="createUser('createUserForm')">{{ $t('commons.confirm') }}</el-button>
</div>
</el-dialog>
......@@ -134,7 +134,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="editPasswordVisible = false">{{ $t('commons.cancel') }}</el-button>
<el-button type="primary" @click="editUserPassword('editPasswordForm')">确认</el-button>
<el-button type="primary" @click="editUserPassword('editPasswordForm')">{{ $t('commons.confirm') }}</el-button>
</div>
</el-dialog>
</layout-content>
......@@ -178,9 +178,7 @@ export default {
useQuickSearch: false,
quickPlaceholder: '按姓名搜索',
components: [
// { field: 'name', label: '姓名', component: 'FuComplexInput', defaultOperator: 'eq' },
{ field: 'nick_name', label: '姓名', component: 'FuComplexInput' },
{
field: 'u.enabled',
label: '状态',
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论