wenyongda/ZrAdminNetCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'izhaorui:main' into main

Browse Source
This commit is contained in:
samisgod 2021-11-23 09:56:15 +08:00 committed by GitHub
commit 36e133cc36
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 91 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ZR.Admin.WebApi/Controllers/CodeGeneratorController.cs
View File

@ -90,8 +90,11 @@ namespace ZR.Admin.WebApi.Controllers
var genTableInfo = GenTableService.GetGenTableInfo(dto.TableId); var genTableInfo = GenTableService.GetGenTableInfo(dto.TableId);
genTableInfo.Columns = GenTableColumnService.GenTableColumns(dto.TableId); genTableInfo.Columns = GenTableColumnService.GenTableColumns(dto.TableId);
if (!string.IsNullOrEmpty(genTableInfo.Options))
{
Dictionary<string, object> options = JsonConvert.DeserializeObject<Dictionary<string, object>>(genTableInfo.Options); Dictionary<string, object> options = JsonConvert.DeserializeObject<Dictionary<string, object>>(genTableInfo.Options);
dto.ParentMenuId = (long)options.GetValueOrDefault("parentMenuId", 0); dto.ParentMenuId = (long)options.GetValueOrDefault("parentMenuId", 0);
}
dto.GenTable = genTableInfo; dto.GenTable = genTableInfo;
//生成代码 //生成代码
CodeGeneratorTool.Generate(genTableInfo, dto); CodeGeneratorTool.Generate(genTableInfo, dto);
@ -176,9 +179,9 @@ namespace ZR.Admin.WebApi.Controllers
ClassName = CodeGeneratorTool.GetClassName(tableName), ClassName = CodeGeneratorTool.GetClassName(tableName),
BusinessName = CodeGeneratorTool.GetClassName(tableName), BusinessName = CodeGeneratorTool.GetClassName(tableName),
FunctionAuthor = ConfigUtils.Instance.GetConfig(GenConstants.Gen_author), FunctionAuthor = ConfigUtils.Instance.GetConfig(GenConstants.Gen_author),
FunctionName = tabInfo.Description, FunctionName = string.IsNullOrEmpty(tabInfo.Description) ? tableName : tabInfo.Description,
TableName = tableName, TableName = tableName,
TableComment = tabInfo.Description, TableComment = string.IsNullOrEmpty(tabInfo.Description) ? tableName : tabInfo.Description,
Create_by = userName, Create_by = userName,
}; };
genTable.TableId = GenTableService.ImportGenTable(genTable); genTable.TableId = GenTableService.ImportGenTable(genTable);

2
ZR.Admin.WebApi/Controllers/System/SysLoginController.cs
View File

@ -137,7 +137,7 @@ namespace ZR.Admin.WebApi.Controllers.System
{ {
string uuid = Guid.NewGuid().ToString().Replace("-", ""); string uuid = Guid.NewGuid().ToString().Replace("-", "");
var code = SecurityCodeHelper.GetRandomEnDigitalText(4); var code = SecurityCodeHelper.GetRandomEnDigitalText(4);
var imgByte = SecurityCodeHelper.GetGifEnDigitalCodeByte(code); var imgByte = SecurityCodeHelper.GetEnDigitalCodeByte(code);
string base64Str = Convert.ToBase64String(imgByte); string base64Str = Convert.ToBase64String(imgByte);
CacheHelper.SetCache(uuid, code); CacheHelper.SetCache(uuid, code);
var obj = new { uuid, img = base64Str };// File(stream, "image/png") var obj = new { uuid, img = base64Str };// File(stream, "image/png")

2
ZR.Admin.WebApi/Properties/launchSettings.json
View File

@ -19,7 +19,7 @@
"commandName": "Project", "commandName": "Project",
"launchBrowser": true, "launchBrowser": true,
"environmentVariables": { "environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Stage" "ASPNETCORE_ENVIRONMENT": ""
}, },
"applicationUrl": "https://localhost:5001;http://localhost:5000" "applicationUrl": "https://localhost:5001;http://localhost:5000"
} }

12
ZR.Admin.WebApi/appsettings.json
View File

@ -7,11 +7,11 @@
} }
}, },
"ConnectionStrings": { "ConnectionStrings": {
"conn_zrAdmin": "server=127.0.0.1;user=zr;pwd=abc;database=admin", "conn_zrAdmin": "server=LAPTOP-STKF2M8H\\SQLEXPRESS;uid=sa;pwd=zradmin123;database=ZrAdmin;Trusted_Connection=SSPI",
"conn_bus": "server=127.0.0.1;user=zr;pwd=abc;database=admin" "conn_bus": "server=LAPTOP-STKF2M8H\\SQLEXPRESS;uid=zr;pwd=zradmin123;database=ZrAdmin;Trusted_Connection=SSPI"
}, },
"conn_zrAdmin_type": 0, //MySql = 0, SqlServer = 1 "conn_zrAdmin_type": 1, //MySql = 0, SqlServer = 1
"conn_bus_type": 0, "conn_bus_type": 1,
"urls": "http://localhost:8888", //项目启动url "urls": "http://localhost:8888", //项目启动url
"sysConfig": { "sysConfig": {
"DBCommandTimeout": 10, "DBCommandTimeout": 10,
@ -30,8 +30,8 @@
"SECRET": "XX" "SECRET": "XX"
}, },
"gen": { "gen": {
"conn": "server=127.0.0.1;user=zr;pwd=abc;database={database}", "conn": "server=LAPTOP-STKF2M8H\\SQLEXPRESS;user=zr;pwd=abc;database={database};Trusted_Connection=SSPI",
"dbType": 0, //MySql = 0, SqlServer = 1 "dbType": 1, //MySql = 0, SqlServer = 1
"autoPre": true, //自动去除表前缀 "autoPre": true, //自动去除表前缀
"author": "zr", "author": "zr",
"tablePrefix": "live_,sys_" //"表前缀（生成类名不会包含表前缀，多个用逗号分隔）", "tablePrefix": "live_,sys_" //"表前缀（生成类名不会包含表前缀，多个用逗号分隔）",

2
ZR.Admin.WebApi/wwwroot/CodeGenTemplate/ControllersTemplate.txt
View File

@ -49,7 +49,7 @@ namespace {ApiControllerNamespace}.Controllers
//开始拼装查询条件 //开始拼装查询条件
var predicate = Expressionable.Create<{ModelName}>(); var predicate = Expressionable.Create<{ModelName}>();
//TODO 搜索条件 //TODO 自己实现搜索条件查询语法参考Sqlsugar，默认查询所有
//predicate = predicate.And(m => m.Name.Contains(parm.Name)); //predicate = predicate.And(m => m.Name.Contains(parm.Name));
var response = _{ModelName}Service.GetPages(predicate.ToExpression(), parm); var response = _{ModelName}Service.GetPages(predicate.ToExpression(), parm);

5
ZR.CodeGenerator/CodeGeneratorTool.cs
View File

@ -482,6 +482,7 @@ namespace ZR.CodeGenerator
Create_by = genTable.Create_by, Create_by = genTable.Create_by,
Create_time = DateTime.Now, Create_time = DateTime.Now,
IsInsert = !column.IsIdentity,//非自增字段都需要插入 IsInsert = !column.IsIdentity,//非自增字段都需要插入
IsEdit = true,
IsQuery = false, IsQuery = false,
HtmlType = GenConstants.HTML_INPUT HtmlType = GenConstants.HTML_INPUT
}; };
@ -509,9 +510,9 @@ namespace ZR.CodeGenerator
genTableColumn.HtmlType = GenConstants.HTML_TEXTAREA; genTableColumn.HtmlType = GenConstants.HTML_TEXTAREA;
} }
//编辑字段 //编辑字段
if (GenConstants.COLUMNNAME_NOT_EDIT.Any(f => column.DbColumnName.Contains(f)) && !column.IsIdentity && !column.IsPrimarykey) if (column.IsIdentity || column.IsPrimarykey || GenConstants.COLUMNNAME_NOT_EDIT.Any(f => column.DbColumnName.Contains(f)) )
{ {
genTableColumn.IsEdit = true; genTableColumn.IsEdit = false;
} }
//列表字段 //列表字段
if (!GenConstants.COLUMNNAME_NOT_LIST.Any(f => column.DbColumnName.Contains(f) && !column.IsPrimarykey)) if (!GenConstants.COLUMNNAME_NOT_LIST.Any(f => column.DbColumnName.Contains(f) && !column.IsPrimarykey))

2
ZR.Vue/README.md
View File

@ -30,7 +30,7 @@ npm run build:prod
``` ```
# 插件说明 # 插件说明
### Autoprefixer ### Autoprefixer （已删除）
浏览器自动补全前缀 浏览器自动补全前缀
例如： 例如：
``` ```

9
ZR.Vue/package.json
View File

@ -51,7 +51,6 @@
"@vue/cli-plugin-babel": "4.4.4", "@vue/cli-plugin-babel": "4.4.4",
"@vue/cli-plugin-eslint": "4.4.4", "@vue/cli-plugin-eslint": "4.4.4",
"@vue/cli-service": "4.4.4", "@vue/cli-service": "4.4.4",
"autoprefixer": "9.5.1",
"babel-eslint": "10.1.0", "babel-eslint": "10.1.0",
"babel-plugin-dynamic-import-node": "2.3.3", "babel-plugin-dynamic-import-node": "2.3.3",
"chalk": "4.1.0", "chalk": "4.1.0",
@ -59,13 +58,11 @@
"eslint": "6.7.2", "eslint": "6.7.2",
"eslint-plugin-vue": "6.2.2", "eslint-plugin-vue": "6.2.2",
"lint-staged": "8.1.5", "lint-staged": "8.1.5",
"node-sass": "4.14.1", "sass": "1.32.13",
"runjs": "4.3.2", "runjs": "4.4.2",
"sass-loader": "8.0.2", "sass-loader": "10.1.0",
"script-ext-html-webpack-plugin": "2.1.3", "script-ext-html-webpack-plugin": "2.1.3",
"serve-static": "1.13.2",
"svg-sprite-loader": "4.1.3", "svg-sprite-loader": "4.1.3",
"svgo": "2.8.0",
"vue-template-compiler": "2.6.12" "vue-template-compiler": "2.6.12"
}, },
"engines": { "engines": {

2
ZR.Vue/src/components/HeaderSearch/index.vue
View File

@ -168,7 +168,7 @@ export default {
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
/deep/ .el-input__inner { ::v-deep .el-input__inner {
border-radius: 0; border-radius: 0;
border: 0; border: 0;
padding-left: 0; padding-left: 0;

185
ZR.Vue/src/views/system/notice/index.vue
View File

@ -2,31 +2,14 @@
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="公告标题" prop="noticeTitle"> <el-form-item label="公告标题" prop="noticeTitle">
<el-input <el-input v-model="queryParams.noticeTitle" placeholder="请输入公告标题" clearable size="small" @keyup.enter.native="handleQuery" />
v-model="queryParams.noticeTitle"
placeholder="请输入公告标题"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="操作人员" prop="createBy"> <el-form-item label="操作人员" prop="createBy">
<el-input <el-input v-model="queryParams.createBy" placeholder="请输入操作人员" clearable size="small" @keyup.enter.native="handleQuery" />
v-model="queryParams.createBy"
placeholder="请输入操作人员"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="类型" prop="noticeType"> <el-form-item label="类型" prop="noticeType">
<el-select v-model="queryParams.noticeType" placeholder="公告类型" clearable size="small"> <el-select v-model="queryParams.noticeType" placeholder="公告类型" clearable size="small">
<el-option <el-option v-for="dict in typeOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
v-for="dict in typeOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
@ -37,33 +20,15 @@
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['system:notice:add']">新增</el-button>
type="primary"
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['system:notice:add']"
>新增</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button type="success" icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate" v-hasPermi="['system:notice:edit']">修改
type="success" </el-button>
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:notice:edit']"
>修改</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button type="danger" icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" v-hasPermi="['system:notice:remove']">删除
type="danger" </el-button>
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:notice:remove']"
>删除</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
@ -71,26 +36,9 @@
<el-table v-loading="loading" :data="noticeList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="noticeList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" align="center" prop="noticeId" width="100" /> <el-table-column label="序号" align="center" prop="noticeId" width="100" />
<el-table-column <el-table-column label="公告标题" align="center" prop="noticeTitle" :show-overflow-tooltip="true" />
label="公告标题" <el-table-column label="公告类型" align="center" prop="noticeType" :formatter="typeFormat" width="100" />
align="center" <el-table-column label="状态" align="center" prop="status" :formatter="statusFormat" width="100" />
prop="noticeTitle"
:show-overflow-tooltip="true"
/>
<el-table-column
label="公告类型"
align="center"
prop="noticeType"
:formatter="typeFormat"
width="100"
/>
<el-table-column
label="状态"
align="center"
prop="status"
:formatter="statusFormat"
width="100"
/>
<el-table-column label="创建者" align="center" prop="createBy" width="100" /> <el-table-column label="创建者" align="center" prop="createBy" width="100" />
<el-table-column label="创建时间" align="center" prop="createTime" width="100"> <el-table-column label="创建时间" align="center" prop="createTime" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
@ -99,31 +47,14 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:notice:edit']">修改</el-button>
size="mini" <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['system:notice:remove']">删除
type="text" </el-button>
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:notice:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:notice:remove']"
>删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改公告对话框 --> <!-- 添加或修改公告对话框 -->
<el-dialog :title="title" :visible.sync="open" width="780px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="780px" append-to-body>
@ -137,29 +68,20 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="公告类型" prop="noticeType"> <el-form-item label="公告类型" prop="noticeType">
<el-select v-model="form.noticeType" placeholder="请选择"> <el-select v-model="form.noticeType" placeholder="请选择">
<el-option <el-option v-for="dict in typeOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue"></el-option>
v-for="dict in typeOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="状态"> <el-form-item label="状态">
<el-radio-group v-model="form.status"> <el-radio-group v-model="form.status">
<el-radio <el-radio v-for="dict in statusOptions" :key="dict.dictValue" :label="dict.dictValue">{{dict.dictLabel}}</el-radio>
v-for="dict in statusOptions"
:key="dict.dictValue"
:label="dict.dictValue"
>{{dict.dictLabel}}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="内容"> <el-form-item label="内容">
<editor v-model="form.noticeContent" :min-height="192"/> <editor v-model="form.noticeContent" :min-height="192" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -173,13 +95,20 @@
</template> </template>
<script> <script>
import { listNotice, getNotice, delNotice, addNotice, updateNotice, exportNotice } from "@/api/system/notice"; import {
import Editor from '@/components/Editor'; listNotice,
getNotice,
delNotice,
addNotice,
updateNotice,
// exportNotice,
} from "@/api/system/notice";
import Editor from "@/components/Editor";
export default { export default {
name: "Notice", name: "Notice",
components: { components: {
Editor Editor,
}, },
data() { data() {
return { return {
@ -211,27 +140,27 @@ export default {
pageSize: 10, pageSize: 10,
noticeTitle: undefined, noticeTitle: undefined,
createBy: undefined, createBy: undefined,
status: undefined status: undefined,
}, },
// 表单参数 // 表单参数
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {
noticeTitle: [ noticeTitle: [
{ required: true, message: "公告标题不能为空", trigger: "blur" } { required: true, message: "公告标题不能为空", trigger: "blur" },
], ],
noticeType: [ noticeType: [
{ required: true, message: "公告类型不能为空", trigger: "change" } { required: true, message: "公告类型不能为空", trigger: "change" },
] ],
} },
}; };
}, },
created() { created() {
this.getList(); this.getList();
this.getDicts("sys_notice_status").then(response => { this.getDicts("sys_notice_status").then((response) => {
this.statusOptions = response.data; this.statusOptions = response.data;
}); });
this.getDicts("sys_notice_type").then(response => { this.getDicts("sys_notice_type").then((response) => {
this.typeOptions = response.data; this.typeOptions = response.data;
}); });
}, },
@ -239,7 +168,7 @@ export default {
/** 查询公告列表 */ /** 查询公告列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listNotice(this.queryParams).then(response => { listNotice(this.queryParams).then((response) => {
this.noticeList = response.rows; this.noticeList = response.rows;
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
@ -265,7 +194,7 @@ export default {
noticeTitle: undefined, noticeTitle: undefined,
noticeType: undefined, noticeType: undefined,
noticeContent: undefined, noticeContent: undefined,
status: "0" status: "0",
}; };
this.resetForm("form"); this.resetForm("form");
}, },
@ -281,9 +210,9 @@ export default {
}, },
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map(item => item.noticeId) this.ids = selection.map((item) => item.noticeId);
this.single = selection.length!=1 this.single = selection.length != 1;
this.multiple = !selection.length this.multiple = !selection.length;
}, },
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
@ -294,25 +223,25 @@ export default {
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset();
const noticeId = row.noticeId || this.ids const noticeId = row.noticeId || this.ids;
getNotice(noticeId).then(response => { getNotice(noticeId).then((response) => {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
this.title = "修改公告"; this.title = "修改公告";
}); });
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm: function() { submitForm: function () {
this.$refs["form"].validate(valid => { this.$refs["form"].validate((valid) => {
if (valid) { if (valid) {
if (this.form.noticeId != undefined) { if (this.form.noticeId != undefined) {
updateNotice(this.form).then(response => { updateNotice(this.form).then((response) => {
this.msgSuccess("修改成功"); this.msgSuccess("修改成功");
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
} else { } else {
addNotice(this.form).then(response => { addNotice(this.form).then((response) => {
this.msgSuccess("新增成功"); this.msgSuccess("新增成功");
this.open = false; this.open = false;
this.getList(); this.getList();
@ -323,18 +252,24 @@ export default {
}, },
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const noticeIds = row.noticeId || this.ids const noticeIds = row.noticeId || this.ids;
this.$confirm('是否确认删除公告编号为"' + noticeIds + '"的数据项?', "警告", { this.$confirm(
'是否确认删除公告编号为"' + noticeIds + '"的数据项?',
"警告",
{
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning" type: "warning",
}).then(function() { }
)
.then(function () {
return delNotice(noticeIds); return delNotice(noticeIds);
}).then(() => { })
.then(() => {
this.getList(); this.getList();
this.msgSuccess("删除成功"); this.msgSuccess("删除成功");
}) });
} },
} },
}; };
</script> </script>

7
ZR.Vue/src/views/tool/email/sendEmail.vue
View File

@ -9,11 +9,12 @@
<el-input v-model="form.subject"></el-input> <el-input v-model="form.subject"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="邮件内容" prop="content"> <el-form-item label="邮件内容" prop="content">
<el-input v-model="form.content" rows="3" type="textarea"></el-input> <editor v-model="form.content" :min-height="192" />
</el-form-item> </el-form-item>
<el-form-item label="附件"> <el-form-item label="附件">
<el-upload name="file" ref="upload" :data="{savetype: form.saveType, filePath: form.filePath}" :headers="headers" :auto-upload="false" :on-success="uploadSuccess" :action="uploadActionUrl"> <el-upload name="file" ref="upload" :data="{savetype: form.saveType, filePath: form.filePath}" :headers="headers" :auto-upload="false"
:on-success="uploadSuccess" :action="uploadActionUrl">
<el-button slot="trigger" size="mini" icon="el-icon-upload">选择文件</el-button> <el-button slot="trigger" size="mini" icon="el-icon-upload">选择文件</el-button>
<el-button style="margin-left: 10px;" size="mini" type="primary" @click="submitUpload">上传到服务器</el-button> <el-button style="margin-left: 10px;" size="mini" type="primary" @click="submitUpload">上传到服务器</el-button>
</el-upload> </el-upload>
@ -27,9 +28,11 @@
<script> <script>
import { sendEmail } from "@/api/common"; import { sendEmail } from "@/api/common";
import { getToken } from "@/utils/auth"; import { getToken } from "@/utils/auth";
import Editor from "@/components/Editor";
export default { export default {
name: "sendEmail", name: "sendEmail",
components: { Editor },
data() { data() {
return { return {
form: { form: {

4
ZR.Vue/src/views/tool/gen/editTable.vue
View File

@ -51,7 +51,7 @@
<el-checkbox v-model="scope.row.isList"></el-checkbox> <el-checkbox v-model="scope.row.isList"></el-checkbox>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="查询" min-width="5%"> <!-- <el-table-column label="查询" min-width="5%">
<template slot-scope="scope"> <template slot-scope="scope">
<el-checkbox v-model="scope.row.isQuery"></el-checkbox> <el-checkbox v-model="scope.row.isQuery"></el-checkbox>
</template> </template>
@ -69,7 +69,7 @@
<el-option label="BETWEEN" value="BETWEEN" /> <el-option label="BETWEEN" value="BETWEEN" />
</el-select> </el-select>
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column label="显示类型" min-width="12%"> <el-table-column label="显示类型" min-width="12%">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select v-model="scope.row.htmlType"> <el-select v-model="scope.row.htmlType">

BIN
document/admin-sqlserver.sql
View File

Binary file not shown.