wezone
/
Ry-master
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	ruoyi-ui/src/assets/styles/ruoyi.scss
#	ruoyi-ui/src/views/tool/gen/index.vue
This commit is contained in:
疯狂的狮子li 2020-04-29 09:17:17 +08:00
parent 1dae7c9bc9 1062da678f
commit 42008124b6
23 changed files with 41 additions and 341 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-ui/src/api/login.js
View File

@ -37,4 +37,4 @@ export function getCodeImg() {
url: '/captchaImage',
method: 'get'
})
}
}

4
ruoyi-ui/src/assets/styles/ruoyi.scss
View File

@ -138,7 +138,7 @@
padding-left: 15px;
margin-bottom: 10px;
}
/* text color */
.text-navy {
color: #1ab394;
@ -194,4 +194,4 @@
opacity: .8;
color: #fff!important;
background: #42b983!important;
}
}

2
ruoyi-ui/src/components/RuoYi/Git/index.vue
View File

@ -18,4 +18,4 @@ export default {
}
}
}
</script>
</script>

2
ruoyi-ui/src/layout/components/Navbar.vue
View File

@ -7,7 +7,7 @@
<div class="right-menu">
<template v-if="device!=='mobile'">
<search id="header-search" class="right-menu-item" />
<el-tooltip content="源码地址" effect="dark" placement="bottom">
<ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
</el-tooltip>

11
ruoyi-ui/src/utils/index.js
View File

@ -3,12 +3,12 @@
*/
export function formatDate(cellValue) {
if (cellValue == null || cellValue == "") return "";
var date = new Date(cellValue)
var date = new Date(cellValue)
var year = date.getFullYear()
var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1
var day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate()
var hours = date.getHours() < 10 ? '0' + date.getHours() : date.getHours()
var minutes = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()
var day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate()
var hours = date.getHours() < 10 ? '0' + date.getHours() : date.getHours()
var minutes = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()
var seconds = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds()
return year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds
}
@ -326,7 +326,7 @@ export function makeMap(str, expectsLowerCase) {
? val => map[val.toLowerCase()]
: val => map[val]
}
export const exportDefault = 'export default '
export const beautifierConf = {
@ -383,3 +383,4 @@ export function camelCase(str) {
export function isNumberStr(str) {
return /^[+-]?(0|([1-9]\d*))(\.\d+)?$/g.test(str)
}

2
ruoyi-ui/src/utils/permission.js
View File

@ -46,4 +46,4 @@ export function checkRole(value) {
console.error(`need roles! Like checkRole="['admin','editor']"`)
return false
}
}
}

1
ruoyi-ui/src/utils/ruoyi.js
View File

@ -131,3 +131,4 @@ export function handleTree(data, id, parentId, children, rootId) {
});
return treeData != '' ? treeData : data;
}

299
ruoyi-ui/src/views/cstest/cstest/index.vue
View File

@ -1,299 +0,0 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
<el-form-item label="key键" prop="testKey">
<el-input
v-model="queryParams.testKey"
placeholder="请输入key键"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="值" prop="value">
<el-input
v-model="queryParams.value"
placeholder="请输入值"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="创建时间" prop="createTime">
<el-date-picker clearable size="small" style="width: 200px"
v-model="queryParams.createTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择创建时间">
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['cstest:cstest:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['cstest:cstest:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['cstest:cstest:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['cstest:cstest:export']"
>导出</el-button>
</el-col>
</el-row>
<el-table v-loading="loading" :data="cstestList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="主键" align="center" prop="id" />
<el-table-column label="key键" align="center" prop="testKey" />
<el-table-column label="值" align="center" prop="value" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['cstest:cstest:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['cstest:cstest:remove']"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改测试对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="key键" prop="testKey">
<el-input v-model="form.testKey" placeholder="请输入key键" />
</el-form-item>
<el-form-item label="值" prop="value">
<el-input v-model="form.value" placeholder="请输入值" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listCstest, getCstest, delCstest, addCstest, updateCstest, exportCstest } from "@/api/cstest/cstest";
export default {
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 总条数
total: 0,
// 测试表格数据
cstestList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
testKey: undefined,
value: undefined,
createTime: undefined,
},
// 表单参数
form: {},
// 表单校验
rules: {
testKey: [
{ required: true, message: "key键不能为空", trigger: "blur" }
], value: [
{ required: true, message: "值不能为空", trigger: "blur" }
], version: [
{ required: true, message: "版本不能为空", trigger: "blur" }
], createTime: [
{ required: true, message: "创建时间不能为空", trigger: "blur" }
], deleted: [
{ required: true, message: "删除状态不能为空", trigger: "blur" }
] }
};
},
created() {
this.getList();
},
methods: {
/** 查询测试列表 */
getList() {
this.loading = true;
listCstest(this.queryParams).then(response => {
this.cstestList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
id: undefined,
testKey: undefined,
value: undefined,
version: undefined,
createTime: undefined,
deleted: undefined
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length!=1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加测试";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids
getCstest(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改测试";
});
},
/** 提交按钮 */
submitForm: function() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != undefined) {
updateCstest(this.form).then(response => {
if (response.code === 200) {
this.msgSuccess("修改成功");
this.open = false;
this.getList();
} else {
this.msgError(response.msg);
}
});
} else {
addCstest(this.form).then(response => {
if (response.code === 200) {
this.msgSuccess("新增成功");
this.open = false;
this.getList();
} else {
this.msgError(response.msg);
}
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$confirm('是否确认删除测试编号为"' + ids + '"的数据项?', "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(function() {
return delCstest(ids);
}).then(() => {
this.getList();
this.msgSuccess("删除成功");
}).catch(function() {});
},
/** 导出按钮操作 */
handleExport() {
const queryParams = this.queryParams;
this.$confirm('是否确认导出所有测试数据项?', "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(function() {
return exportCstest(queryParams);
}).then(response => {
this.download(response.msg);
}).catch(function() {});
}
}
};
</script>

0
ruoyi-ui/src/views/login/auth-redirect.vue
View File

0
ruoyi-ui/src/views/login/components/SocialSignin.vue
View File

2
ruoyi-ui/src/views/monitor/job/index.vue
View File

@ -485,4 +485,4 @@ export default {
}
}
};
</script>
</script>

2
ruoyi-ui/src/views/system/config/index.vue
View File

@ -343,4 +343,4 @@ export default {
}
}
};
</script>
</script>

18
ruoyi-ui/src/views/system/dept/index.vue
View File

@ -56,17 +56,17 @@
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:dept:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-plus"
<el-button
size="mini"
type="text"
icon="el-icon-plus"
@click="handleAdd(scope.row)"
v-hasPermi="['system:dept:add']"
>新增</el-button>
@ -316,4 +316,4 @@ export default {
}
}
};
</script>
</script>

2
ruoyi-ui/src/views/system/dict/data.vue
View File

@ -352,4 +352,4 @@ export default {
}
}
};
</script>
</script>

2
ruoyi-ui/src/views/system/dict/index.vue
View File

@ -347,4 +347,4 @@ export default {
}
}
};
</script>
</script>

16
ruoyi-ui/src/views/system/menu/index.vue
View File

@ -49,16 +49,16 @@
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button size="mini"
type="text"
icon="el-icon-edit"
<el-button size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:menu:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-plus"
<el-button
size="mini"
type="text"
icon="el-icon-plus"
@click="handleAdd(scope.row)"
v-hasPermi="['system:menu:add']"
>新增</el-button>
@ -373,4 +373,4 @@ export default {
}
}
};
</script>
</script>

2
ruoyi-ui/src/views/system/notice/index.vue
View File

@ -342,4 +342,4 @@ export default {
}
}
};
</script>
</script>

4
ruoyi-ui/src/views/system/post/index.vue
View File

@ -107,7 +107,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -324,4 +324,4 @@ export default {
}
}
};
</script>
</script>

2
ruoyi-ui/src/views/system/role/index.vue
View File

@ -545,4 +545,4 @@ export default {
}
}
};
</script>
</script>

2
ruoyi-ui/src/views/system/user/index.vue
View File

@ -662,4 +662,4 @@ export default {
}
}
};
</script>
</script>

2
ruoyi-ui/src/views/system/user/profile/userAvatar.vue
View File

@ -135,4 +135,4 @@ export default {
}
}
};
</script>
</script>

2
ruoyi-ui/src/views/tool/gen/index.vue
View File

@ -288,4 +288,4 @@ export default {
}
}
};
</script>
</script>

3
ruoyi/src/main/resources/vm/java/domain.java.vm
View File

@ -17,9 +17,6 @@ import com.ruoyi.framework.web.domain.BaseEntity;
#elseif($table.tree)
import com.ruoyi.framework.web.domain.TreeEntity;
#end
#foreach ($import in $importList)
import ${import};
#end
/**
* ${functionName}对象 ${tableName}