Commit 1de08991 by 李耀琨

更新

parent ab6029de
{ {
"name": "eladmin-web", "name": "eladmin-web",
"version": "2.6.0", "version": "2.6.0",
"description": "EL-ADMIN 前端源码", "description": " 前端源码",
"author": "Zheng Jie", "author": "Zheng Jie",
"license": "Apache-2.0", "license": "Apache-2.0",
"scripts": { "scripts": {
......
...@@ -388,3 +388,24 @@ export function variableType(data){ ...@@ -388,3 +388,24 @@ export function variableType(data){
method: 'post' method: 'post'
}) })
} }
// 语言列表
export function localeLists(data){
return request({
url:'etlweb//system/locale',
data,
method: 'post'
})
}
// 语言
export function locale(data){
return request({
url:'etlweb/ui/locale',
data,
method: 'post'
})
}
...@@ -25,7 +25,7 @@ export default { ...@@ -25,7 +25,7 @@ export default {
}, },
data() { data() {
return { return {
title: 'ELADMIN-后台管理', title: '后台管理',
logo: Logo logo: Logo
} }
} }
......
...@@ -2,7 +2,7 @@ module.exports = { ...@@ -2,7 +2,7 @@ module.exports = {
/** /**
* @description 网站标题 * @description 网站标题
*/ */
title: 'EL-ADMIN', title: '后台管理系统',
/** /**
* @description 是否显示 tagsView * @description 是否显示 tagsView
*/ */
......
...@@ -1072,6 +1072,14 @@ ...@@ -1072,6 +1072,14 @@
></job-run> ></job-run>
<!-- 执行作业结束 --> <!-- 执行作业结束 -->
<conversionSettings
ref="conversionSettings"
:conversionSettingsDialog.sync="conversionSettingsDialog"
></conversionSettings>
<!-- 数据浏览--> <!-- 数据浏览-->
<el-dialog <el-dialog
title="数据浏览" title="数据浏览"
...@@ -1137,6 +1145,8 @@ import getVariable from "../appBulletFrame/getVariable"; //获取变量 ...@@ -1137,6 +1145,8 @@ import getVariable from "../appBulletFrame/getVariable"; //获取变量
import mergeRecords from "../appBulletFrame/mergeRecords"; //合并记录 import mergeRecords from "../appBulletFrame/mergeRecords"; //合并记录
import selectField from "../appBulletFrame/selectField"; //选择字段 import selectField from "../appBulletFrame/selectField"; //选择字段
import conversionSettings from "../appBulletFrame/conversionSettings" //转换设置
// 作业弹窗组件开始--------------------------------------- // 作业弹窗组件开始---------------------------------------
import trans from "../../../job-dialog/trans"; import trans from "../../../job-dialog/trans";
import setvalue from "../../../job-dialog/set-value"; import setvalue from "../../../job-dialog/set-value";
...@@ -1251,6 +1261,7 @@ export default { ...@@ -1251,6 +1261,7 @@ export default {
getVariableDialog: false, //获取变量 getVariableDialog: false, //获取变量
mergeRecordsDialog: false, //合并记录 mergeRecordsDialog: false, //合并记录
selectFieldDialog:false,//选择字段 selectFieldDialog:false,//选择字段
conversionSettingsDialog:false,//转换设置
// 流程弹窗组件start---------- // 流程弹窗组件start----------
// 流程弹窗组件end------------ // 流程弹窗组件end------------
...@@ -1349,6 +1360,7 @@ export default { ...@@ -1349,6 +1360,7 @@ export default {
getVariable, //获取变量 getVariable, //获取变量
mergeRecords, //合并记录 mergeRecords, //合并记录
selectField,//选择字段 selectField,//选择字段
conversionSettings,//转换设置
// 作业弹簧组件end---------------------- // 作业弹簧组件end----------------------
// 流程弹窗组件start--------- // 流程弹窗组件start---------
switchDialog, switchDialog,
...@@ -2366,7 +2378,7 @@ export default { ...@@ -2366,7 +2378,7 @@ export default {
//画布右键 //画布右键
menu.addItem("转换属性设置", null, () => { menu.addItem("转换属性设置", null, () => {
console.log(cell, "当前节点"); console.log(cell, "当前节点");
alert("Item 1"); this.conversionSettingsDialog = !this.conversionSettingsDialog
}); });
menu.addSeparator(); menu.addSeparator();
......
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
<i class="el-icon-caret-bottom el-icon--right"></i> <i class="el-icon-caret-bottom el-icon--right"></i>
</span> </span>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item> 语言切换</el-dropdown-item> <el-dropdown-item> 语言切换1111</el-dropdown-item>
<el-dropdown-item >关于</el-dropdown-item> <el-dropdown-item >关于</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="login" :style="'background-image:url('+ Background +');'"> <div class="login" :style="'background-image:url('+ Background +');'">
<el-form ref="loginForm" :model="loginForm" :rules="loginRules" label-position="left" label-width="0px" class="login-form"> <el-form ref="loginForm" :model="loginForm" :rules="loginRules" label-position="left" label-width="0px" class="login-form">
<h3 class="title"> <h3 class="title">
EL-ADMIN 后台管理系统 后台管理系统
</h3> </h3>
<el-form-item prop="username"> <el-form-item prop="username">
<el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="账号"> <el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="账号">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment