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

全适配移动端

Browse Source
This commit is contained in:
不做码农 2021-12-18 10:00:54 +08:00
parent 0ff75299f7
commit c5c83a0b22
9 changed files with 253 additions and 202 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ZR.CodeGenerator/CodeGenerateTemplate.cs
View File

@ -37,7 +37,7 @@ namespace ZR.CodeGenerator
if (dbFieldInfo.HtmlType == GenConstants.HTML_INPUT_NUMBER)
{
//数字框
sb.AppendLine(" <el-col :span=\"12\">");
sb.AppendLine(" <el-col :lg=\"12\">");
sb.AppendLine($" <el-form-item label=\"{labelName}\" prop=\"{columnName}\">");
sb.AppendLine($" <el-input-number v-model.number=\"form.{columnName}\" placeholder=\"请输入{labelName}\" {labelDisabled}/>");
sb.AppendLine(" </el-form-item>");
@ -46,7 +46,7 @@ namespace ZR.CodeGenerator
else if (dbFieldInfo.HtmlType == GenConstants.HTML_DATETIME)
{
//时间
sb.AppendLine(" <el-col :span=\"12\">");
sb.AppendLine(" <el-col :lg=\"12\">");
sb.AppendLine($" <el-form-item label=\"{labelName}\" prop=\"{columnName}\">");
sb.AppendLine($" <el-date-picker v-model=\"form.{columnName}\" format=\"yyyy-MM-dd HH:mm:ss\" value-format=\"yyyy-MM-dd HH:mm:ss\" type=\"datetime\" placeholder=\"选择日期时间\"> </el-date-picker>");
sb.AppendLine(" </el-form-item>");
@ -55,7 +55,7 @@ namespace ZR.CodeGenerator
else if (dbFieldInfo.HtmlType == GenConstants.HTML_IMAGE_UPLOAD)
{
//图片
sb.AppendLine(" <el-col :span=\"24\">");
sb.AppendLine(" <el-col :lg=\"24\">");
sb.AppendLine($" <el-form-item label=\"{labelName}\" prop=\"{columnName}\">");
sb.AppendLine($@" <UploadImage v-model=""form.{columnName}"" column=""{columnName}"" @input=""handleUploadSuccess"" />");
sb.AppendLine(" </el-form-item>");
@ -64,7 +64,7 @@ namespace ZR.CodeGenerator
else if (dbFieldInfo.HtmlType == GenConstants.HTML_FILE_UPLOAD)
{
//文件
sb.AppendLine(" <el-col :span=\"24\">");
sb.AppendLine(" <el-col :lg=\"24\">");
sb.AppendLine($" <el-form-item label=\"{labelName}\" prop=\"{columnName}\">");
sb.AppendLine($@" <UploadFile v-model=""form.{columnName}"" column=""{columnName}"" @input=""handleUploadSuccess"" />");
sb.AppendLine(" </el-form-item>");
@ -73,7 +73,7 @@ namespace ZR.CodeGenerator
else if (dbFieldInfo.HtmlType == GenConstants.HTML_RADIO)
{
//单选按钮
sb.AppendLine(" <el-col :span=\"12\">");
sb.AppendLine(" <el-col :lg=\"12\">");
sb.AppendLine($" <el-form-item label=\"{labelName}\" prop=\"{columnName}\">");
sb.AppendLine($" <el-radio-group v-model=\"form.{columnName}\">");
if (string.IsNullOrEmpty(dbFieldInfo.DictType))
@ -88,7 +88,7 @@ namespace ZR.CodeGenerator
else if (dbFieldInfo.HtmlType == GenConstants.HTML_TEXTAREA)
{
//文本域
sb.AppendLine(" <el-col :span=\"24\">");
sb.AppendLine(" <el-col :lg=\"24\">");
sb.AppendLine($" <el-form-item label=\"{ labelName}\" prop=\"{columnName}\">");
sb.AppendLine($" <el-input type=\"textarea\" v-model=\"form.{columnName}\" placeholder=\"请输入{labelName}\"/>");
sb.AppendLine(" </el-form-item>");
@ -97,7 +97,7 @@ namespace ZR.CodeGenerator
else if (dbFieldInfo.HtmlType == GenConstants.HTML_EDITOR)
{
//编辑器
sb.AppendLine(" <el-col :span=\"24\">");
sb.AppendLine(" <el-col :lg=\"24\">");
sb.AppendLine($" <el-form-item label=\"{labelName}\" prop=\"{columnName}\">");
sb.AppendLine($" <editor v-model=\"form.{columnName}\" :min-height=\"200\" />");
sb.AppendLine(" </el-form-item>");
@ -106,7 +106,7 @@ namespace ZR.CodeGenerator
else if (dbFieldInfo.HtmlType == GenConstants.HTML_SELECT)
{
//下拉框
sb.AppendLine(" <el-col :span=\"12\">");
sb.AppendLine(" <el-col :lg=\"12\">");
sb.AppendLine($" <el-form-item label=\"{labelName}\" prop=\"{columnName}\">");
sb.AppendLine($" <el-select v-model=\"form.{columnName}\" placeholder=\"请选择{labelName}\"> ");
if (string.IsNullOrEmpty(dbFieldInfo.DictType))
@ -121,7 +121,7 @@ namespace ZR.CodeGenerator
else if( dbFieldInfo.HtmlType == GenConstants.HTML_CHECKBOX)
{
//多选框
sb.AppendLine(" <el-col :span=\"12\">");
sb.AppendLine(" <el-col :lg=\"24\">");
sb.AppendLine($" <el-form-item label=\"{labelName}\" prop=\"{columnName}\">");
sb.AppendLine($" <el-checkbox-group v-model=\"form.{columnName}Checked\"> ");
if (string.IsNullOrEmpty(dbFieldInfo.DictType))
@ -136,7 +136,7 @@ namespace ZR.CodeGenerator
else
{
string inputNumTxt = CodeGeneratorTool.IsNumber(dbFieldInfo.CsharpType) ? ".number" : "";
sb.AppendLine(" <el-col :span=\"12\">");
sb.AppendLine(" <el-col :lg=\"12\">");
sb.AppendLine($" <el-form-item label=\"{labelName}\" prop=\"{columnName}\">");
sb.AppendLine($" <el-input v-model{inputNumTxt}=\"form.{columnName}\" placeholder=\"请输入{labelName}\" {labelDisabled}/>");
sb.AppendLine(" </el-form-item>");

327
ZR.Vue/src/assets/styles/index.scss
View File

@ -181,78 +181,97 @@ aside {
z-index: 1000 !important;
}
/** 基础通用 **/
/** 基础通用 **/
.pt5 {
padding-top: 5px;
}
.pr5 {
padding-right: 5px;
}
.pb5 {
padding-bottom: 5px;
}
.mt5 {
margin-top: 5px;
}
.mr5 {
margin-right: 5px;
}
.mb5 {
margin-bottom: 5px;
}
.mb8 {
margin-bottom: 8px;
}
.ml5 {
margin-left: 5px;
}
.mt10 {
margin-top: 10px;
}
.mr10 {
margin-right: 10px;
}
.mb10 {
margin-bottom: 10px;
}
.ml10 {
margin-left: 10px;
}
.mt20 {
margin-top: 20px;
}
.mr20 {
margin-right: 20px;
}
.mb20 {
margin-bottom: 20px;
}
.ml20 {
margin-left: 20px;
}
.ml {
margin-left: auto;
}
.mr {
margin-right: auto;
}
.mt {
margin-top: auto;
}
.mb {
margin-bottom: auto;
padding-top: 5px;
}
.el-dialog:not(.is-fullscreen){
margin-top: 6vh !important;
.pr5 {
padding-right: 5px;
}
.pb5 {
padding-bottom: 5px;
}
.mt5 {
margin-top: 5px;
}
.mr5 {
margin-right: 5px;
}
.mb5 {
margin-bottom: 5px;
}
.mb8 {
margin-bottom: 8px;
}
.ml5 {
margin-left: 5px;
}
.mt10 {
margin-top: 10px;
}
.mr10 {
margin-right: 10px;
}
.mb10 {
margin-bottom: 10px;
}
.ml10 {
margin-left: 10px;
}
.mt20 {
margin-top: 20px;
}
.mr20 {
margin-right: 20px;
}
.mb20 {
margin-bottom: 20px;
}
.ml20 {
margin-left: 20px;
}
.ml {
margin-left: auto;
}
.mr {
margin-right: auto;
}
.mt {
margin-top: auto;
}
.mb {
margin-bottom: auto;
}
.el-dialog:not(.is-fullscreen) {
margin-top: 6vh !important;
}
/** 表格布局 **/
.pagination-container {
position: relative;
height: 25px;
margin-top: 5px;
padding: 10px 20px !important;
position: relative;
height: 25px;
margin-top: 5px;
padding: 10px 20px !important;
}
/* tree border */
@ -260,149 +279,161 @@ aside {
margin-top: 5px;
border: 1px solid #e5e6e7;
background: #FFFFFF none;
border-radius:4px;
border-radius: 4px;
}
.pagination-container .el-pagination {
right: 0;
position: absolute;
right: 0;
position: absolute;
}
.pull-right {
float: right !important;
float: right !important;
}
/* text color */
.text-navy {
color: #1ab394;
color: #1ab394;
}
.text-primary {
color: inherit;
color: inherit;
}
.text-success {
color: #1c84c6;
color: #1c84c6;
}
.text-info {
color: #23c6c8;
color: #23c6c8;
}
.text-warning {
color: #f8ac59;
color: #f8ac59;
}
.text-danger {
color: #ed5565;
color: #ed5565;
}
.text-muted {
color: #888888;
color: #888888;
}
/* image */
.img-circle {
border-radius: 50%;
border-radius: 50%;
}
.img-lg {
width: 120px;
height: 120px;
width: 120px;
height: 120px;
}
/* 解决element-ui的table表格控件表头与内容列不对齐问题 */
.el-table th.gutter {
display: table-cell !important;
}
.el-checkbox.mini .el-checkbox__label{
.el-checkbox.mini .el-checkbox__label {
font-size: 12px !important;
}
.el-checkbox.small .el-checkbox__label {
font-size: 12px !important;
}
.el-checkbox.medium .el-checkbox__label{
.el-checkbox.medium .el-checkbox__label {
font-size: 14px !important;
}
.vue-treeselect.mini {
font-size: 12px !important;
}
.vue-treeselect.small {
font-size: 13px !important;
}
.vue-treeselect.medium {
font-size: 14px !important;
}
.vue-treeselect.mini .vue-treeselect__control{
.vue-treeselect.mini .vue-treeselect__control {
height: 28px;
}
.vue-treeselect.small .vue-treeselect__control{
.vue-treeselect.small .vue-treeselect__control {
height: 32px;
}
.vue-treeselect.medium .vue-treeselect__control{
.vue-treeselect.medium .vue-treeselect__control {
height: 34px;
}
.vue-treeselect.mini .vue-treeselect__single-value{
.vue-treeselect.mini .vue-treeselect__single-value {
line-height: 28px;
}
.vue-treeselect.small .vue-treeselect__single-value{
.vue-treeselect.small .vue-treeselect__single-value {
line-height: 32px;
}
.vue-treeselect.medium .vue-treeselect__single-value{
.vue-treeselect.medium .vue-treeselect__single-value {
line-height: 34px;
}
.el-table .fixed-width .el-button--mini {
color: #409EFF;
padding-left: 0;
padding-right: 0;
width: inherit;
color: #409EFF;
padding-left: 0;
padding-right: 0;
width: inherit;
}
.el-tree-node__content > .el-checkbox {
margin-right: 8px;
.el-tree-node__content>.el-checkbox {
margin-right: 8px;
}
.list-group-striped > .list-group-item {
border-left: 0;
border-right: 0;
border-radius: 0;
padding-left: 0;
padding-right: 0;
.list-group-striped>.list-group-item {
border-left: 0;
border-right: 0;
border-radius: 0;
padding-left: 0;
padding-right: 0;
}
.list-group {
padding-left: 0px;
list-style: none;
padding-left: 0px;
list-style: none;
}
.list-group-item {
border-bottom: 1px solid #e7eaec;
border-top: 1px solid #e7eaec;
margin-bottom: -1px;
padding: 11px 0px;
font-size: 13px;
border-bottom: 1px solid #e7eaec;
border-top: 1px solid #e7eaec;
margin-bottom: -1px;
padding: 11px 0px;
font-size: 13px;
}
.pull-right {
float: right !important;
float: right !important;
}
.el-card__header {
padding: 14px 15px 7px;
min-height: 40px;
padding: 14px 15px 7px;
min-height: 40px;
}
.el-card__body {
padding: 15px 20px 20px 20px;
padding: 15px 20px 20px 20px;
}
.card-box {
padding-right: 15px;
padding-left: 15px;
margin-bottom: 10px;
padding-right: 15px;
padding-left: 15px;
margin-bottom: 10px;
}
/* button color */
@ -428,43 +459,63 @@ aside {
.img-lg {
width: 120px;
height: 120px;
width: 120px;
height: 120px;
}
.avatar-upload-preview {
position: absolute;
top: 50%;
transform: translate(50%, -50%);
width: 180px;
height: 180px;
border-radius: 50%;
box-shadow: 0 0 4px #ccc;
overflow: hidden;
position: absolute;
top: 50%;
transform: translate(50%, -50%);
width: 180px;
height: 180px;
border-radius: 50%;
box-shadow: 0 0 4px #ccc;
overflow: hidden;
}
/* 拖拽列样式 */
.sortable-ghost{
opacity: .8;
color: #fff!important;
background: #42b983!important;
.sortable-ghost {
opacity: .8;
color: #fff !important;
background: #42b983 !important;
}
.top-right-btn {
position: relative;
float: right;
position: relative;
float: right;
}
.icon {
width: 100px;
}
// 上传文件按钮样式
.uploader-icon {
width: 50px;
height: 50px;
line-height: 50px !important;
border: 1px dashed #ccc;
margin-bottom: 10px;
}
.table-td-thumb {
width: 80px;
width: 50px;
}
// 移动端组件适配
@media screen and (max-width: 500px) {
.el-message {
min-width: 300px !important;
}
}
@media screen and (max-width: 500px) {
.el-message-box {
width: 300px !important;
}
.el-pagination__jump{
display: none !important;
}
.el-pagination__sizes{
display: none !important;
}
}
// dialog
@media screen and (max-width: 500px) {
.el-dialog__wrapper .el-dialog {
width: 95% !important;
}
}

18
ZR.Vue/src/views/monitor/operlog/index.vue
View File

@ -79,38 +79,38 @@
<el-dialog title="操作日志详细" :visible.sync="open" width="700px" append-to-body>
<el-form ref="form" :model="form" label-width="100px" size="mini">
<el-row>
<el-col :span="12">
<el-col :lg="12">
<el-form-item label="操作模块：">{{ form.title }} </el-form-item>
<el-form-item label="登录信息：">{{ form.operName }} / {{ form.operIp }} / {{ form.operLocation }}</el-form-item>
</el-col>
<el-col :span="12">
<el-col :lg="12">
<el-form-item label="请求地址：">{{ form.operUrl }}</el-form-item>
<el-form-item label="请求方式：">{{ form.requestMethod }}</el-form-item>
</el-col>
<el-col :span="12">
<el-col :lg="12">
<el-form-item label="操作方法：">{{ form.method }}</el-form-item>
</el-col>
<el-col :span="12">
<el-col :lg="12">
<el-form-item label="操作类型：">{{ typeFormat(form) }}</el-form-item>
</el-col>
<el-col :span="24">
<el-col :lg="24">
<el-form-item label="请求参数：">{{ form.operParam }}</el-form-item>
</el-col>
<el-col :span="24">
<el-col :lg="24">
<el-form-item label="返回结果：">
{{ form.jsonResult }}
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :lg="12">
<el-form-item label="操作状态：">
<div v-if="form.status === 0">正常</div>
<div v-else-if="form.status === 1">失败</div>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :lg="12">
<el-form-item label="操作时间：">{{ parseTime(form.operTime) }}</el-form-item>
</el-col>
<el-col :span="24">
<el-col :lg="24">
<el-form-item label="异常信息：" v-if="form.status === 1">{{ form.errorMsg }}</el-form-item>
</el-col>
</el-row>

8
ZR.Vue/src/views/monitor/server/index.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="app-container">
<el-row>
<el-col :span="12" class="card-box">
<el-col :lg="12" class="card-box">
<el-card>
<div slot="header"><span>CPU</span></div>
<div class="el-table el-table--enable-row-hover el-table--medium">
@ -43,7 +43,7 @@
</el-card>
</el-col>
<el-col :span="12" class="card-box">
<el-col :lg="12" class="card-box">
<el-card>
<div slot="header"><span>内存</span></div>
<div class="el-table el-table--enable-row-hover el-table--medium">
@ -86,7 +86,7 @@
</el-card>
</el-col>
<el-col :span="24" class="card-box">
<el-col :lg="24" class="card-box">
<el-card>
<div slot="header">
<span>服务器信息</span>
@ -142,7 +142,7 @@
</el-card>
</el-col>
<el-col :span="24" class="card-box">
<el-col :lg="24" class="card-box">
<el-card>
<div slot="header">
<span>.NET Core信息</span>

10
ZR.Vue/src/views/system/article/publish.vue
View File

@ -3,17 +3,17 @@
<el-row :gutter="24">
<!-- :model属性用于表单验证使用 比如下面的el-form-item 的 prop属性用于对表单值进行验证操作 -->
<el-form :model="form" label-position="right" ref="form" size="mini" label-width="100px" :rules="rules" @submit.native.prevent>
<el-col :span="12">
<el-col :lg="12">
<el-form-item label="文章标题" prop="title">
<el-input v-model="form.title" placeholder="请输入文章标题（必须）" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :lg="12">
<el-form-item label="文章分类" prop="category_id">
<treeselect v-model="form.category_id" :options="categoryOptions" :normalizer="normalizer" :show-count="true" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-col :lg="24">
<el-form-item label="文章标签">
<el-tag size="large" :key="tag" v-for="tag in form.dynamicTags" closable :disable-transitions="false" @close="handleCloseTag(tag)">
{{tag}}
@ -23,12 +23,12 @@
<el-button v-else class="button-new-tag" size="small" @click="showInput">+ 文章标签</el-button>
</el-form-item>
</el-col>
<el-col :span="24">
<el-col :lg="24">
<el-form-item prop="content" label="文章内容">
<mavon-editor v-model="form.content" ref="md" @imgAdd="$imgAdd" @change="change" style="min-height: 400px;width:100%" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-col :lg="24">
<el-form-item label="" style="text-align:right;">
<el-button type="cyan" size="mini" @click="handlePublish('1')">发布文章</el-button>
<el-button type="success" size="mini" @click="handlePublish('2')">存为草稿</el-button>

14
ZR.Vue/src/views/system/dept/index.vue
View File

@ -53,37 +53,37 @@
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-col :span="24" v-if="form.parentId !== 0">
<el-col :lg="24" v-if="form.parentId !== 0">
<el-form-item label="上级部门" prop="parentId">
<treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" placeholder="选择上级部门" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :lg="12">
<el-form-item label="部门名称" prop="deptName">
<el-input v-model="form.deptName" placeholder="请输入部门名称" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :lg="12">
<el-form-item label="显示排序" prop="orderNum">
<el-input-number v-model="form.orderNum" controls-position="right" :min="0" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :lg="12">
<el-form-item label="负责人" prop="leader">
<el-input v-model="form.leader" placeholder="请输入负责人" maxlength="20" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :lg="12">
<el-form-item label="联系电话" prop="phone">
<el-input v-model="form.phone" placeholder="请输入联系电话" maxlength="11" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :lg="12">
<el-form-item label="邮箱" prop="email">
<el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :lg="12">
<el-form-item label="部门状态">
<el-radio-group v-model="form.status">
<el-radio v-for="dict in statusOptions" :key="dict.dictValue" :label="dict.dictValue">{{dict.dictLabel}}</el-radio>

24
ZR.Vue/src/views/system/menu/index.vue
View File

@ -71,12 +71,12 @@
<el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row>
<el-col :span="24">
<el-col :lg="24">
<el-form-item label="上级菜单">
<treeselect v-model="form.parentId" :options="menuOptions" :normalizer="normalizer" :show-count="true" @select="handleTreeSelect" placeholder="选择上级菜单" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-col :lg="24">
<el-form-item label="菜单类型" prop="menuType">
<el-radio-group size="mini" v-model="form.menuType">
<el-radio-button label="M">目录</el-radio-button>
@ -85,17 +85,17 @@
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :lg="12">
<el-form-item label="菜单名称" prop="menuName">
<el-input v-model="form.menuName" placeholder="请输入菜单名称" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :lg="12">
<el-form-item label="显示排序" prop="orderNum">
<el-input-number v-model="form.orderNum" controls-position="right" :min="0" :value="999" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-col :lg="24">
<el-form-item v-if="form.menuType != 'F'" label="菜单图标">
<el-popover placement="bottom-start" width="460" trigger="click" @show="$refs['iconSelect'].reset()">
<IconSelect ref="iconSelect" @selected="selected" />
@ -106,7 +106,7 @@
</el-popover>
</el-form-item>
</el-col>
<el-col :span="24">
<el-col :lg="24">
<el-form-item v-if="form.menuType != 'F'" label="路由地址" prop="path">
<span slot="label">
<el-tooltip content="访问的路由地址，如：`user`，如外网地址需内链访问则以`http(s)://`开头" placement="top">
@ -117,7 +117,7 @@
<el-input v-model="form.path" placeholder="请输入路由地址" />
</el-form-item>
</el-col>
<el-col :span="12" v-if="form.menuType == 'C'">
<el-col :lg="12" v-if="form.menuType == 'C'">
<el-form-item label="组件路径" prop="component">
<span slot="label">
<el-tooltip content="访问的组件路径，如：`system/user/index`，默认在`views`目录下" placement="top">
@ -128,7 +128,7 @@
<el-input v-model="form.component" placeholder="请输入组件路径" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :lg="12">
<el-form-item v-if="form.menuType != 'M'" label="权限标识">
<span slot="label">
<el-tooltip content="控制器中定义的权限字符，如：[ActionPermissionFilter(Permission = 'system:user:delete')])" placement="top">
@ -139,7 +139,7 @@
<el-input v-model="form.perms" placeholder="权限名，规范([分类]:[页面]:[动作])" maxlength="50" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :lg="12">
<el-form-item v-if="form.menuType != 'F'" label="显示状态">
<span slot="label">
<el-tooltip content="选择隐藏则路由将不会出现在侧边栏也不可以访问" placement="top">
@ -152,7 +152,7 @@
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :lg="12">
<el-form-item v-if="form.menuType != 'F'" label="是否外链">
<span slot="label">
<el-tooltip content="选择是外链则路由地址需要以`http(s)://`开头" placement="top">
@ -166,7 +166,7 @@
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :lg="12">
<el-form-item v-if="form.menuType != 'F'">
<span slot="label">
<el-tooltip content="选择停用则路由将不会出现在侧边栏，也不能被访问" placement="top">
@ -179,7 +179,7 @@
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :lg="12">
<el-form-item v-if="form.menuType == 'C'" label="是否缓存">
<span slot="label">
<el-tooltip content="选择是则会被`keep-alive`缓存，需要匹配组件的`name`和地址保持一致" placement="top">

26
ZR.Vue/src/views/system/user/index.vue
View File

@ -2,7 +2,7 @@
<div class="app-container">
<el-row :gutter="20">
<!--部门数据-->
<el-col :span="4">
<el-col :lg="4" :sm="24">
<div class="head-container">
<el-input v-model="deptName" placeholder="请输入部门名称" clearable size="small" prefix-icon="el-icon-search" style="margin-bottom: 20px" />
</div>
@ -12,7 +12,7 @@
</div>
</el-col>
<!--用户数据-->
<el-col :span="20">
<el-col :lg="20" :sm="24">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="用户名称" prop="userName">
<el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable size="small" style="width: 240px"
@ -101,12 +101,12 @@
<el-dialog :title="title" :visible.sync="open" width="600px">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row v-if="form.userId == undefined">
<el-col :span="12">
<el-col :lg="12">
<el-form-item label="用户名" prop="userName">
<el-input :disabled="form.userId != undefined" v-model="form.userName" placeholder="请输入用户名(用于登陆)" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :lg="12">
<el-form-item label="用户密码" prop="password">
<el-input :disabled="form.userId != undefined" v-model="form.password" placeholder="请输入用户密码" type="password" />
</el-form-item>
@ -114,38 +114,38 @@
</el-row>
<el-row>
<el-col :span="12">
<el-col :lg="12">
<el-form-item label="用户昵称" prop="nickName">
<el-input v-model="form.nickName" placeholder="请输入用户昵称" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :lg="12">
<el-form-item label="归属部门" prop="deptId">
<treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-col :lg="12">
<el-form-item label="手机号码" prop="phonenumber">
<el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :lg="12">
<el-form-item label="电子邮箱">
<el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-col :lg="12">
<el-form-item label="用户性别">
<el-select v-model="form.sex" placeholder="请选择">
<el-option v-for="dict in sexOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :lg="12">
<el-form-item label="用户状态">
<el-radio-group v-model="form.status">
<el-radio v-for="dict in statusOptions" :key="dict.dictValue" :label="dict.dictValue">{{ dict.dictLabel }}</el-radio>
@ -154,7 +154,7 @@
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-col :lg="12">
<el-form-item label="岗位">
<el-select v-model="form.postIds" multiple placeholder="请选择">
<el-option v-for="item in postOptions" :key="item.postId" :label="item.postName" :value="item.postId" :disabled="item.status == 1">
@ -162,7 +162,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :lg="12">
<el-form-item label="角色">
<el-select v-model="form.roleIds" multiple placeholder="请选择" @change="selectRole($event)">
<el-option v-for="item in roleOptions" :key="item.roleId" :label="item.roleName" :value="item.roleId" :disabled="item.status == 1">
@ -172,7 +172,7 @@
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-col :lg="24">
<el-form-item label="备注">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
</el-form-item>

8
ZR.Vue/src/views/tool/file/index.vue
View File

@ -57,12 +57,12 @@
<el-dialog :title="title" :lock-scroll="false" :visible.sync="open">
<el-form ref="form" :model="form" :rules="rules" label-width="135px">
<el-row>
<!-- <el-col :span="12">
<!-- <el-col :lg="12">
<el-form-item label="自定文件名" prop="fileName">
<el-input v-model="form.fileName" placeholder="请输入文件名" />
</el-form-item>
</el-col> -->
<el-col :span="12">
<el-col :lg="12">
<el-form-item label="存储类型" prop="storeType">
<el-select v-model="form.storeType" placeholder="请选择存储类型" @change="handleSelectStore">
<el-option v-for="item in storeTypeOptions" :key="item.dictValue" :label="item.dictLabel" :value="parseInt(item.dictValue)">
@ -70,7 +70,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :lg="12">
<el-form-item label="存储文件夹前缀" prop="storePath">
<span slot="label">
<el-tooltip content="比如存储到'/uploads' '如果不填写默认按时间存储eg：/2021/12/16(固定段)'" placement="top">
@ -81,7 +81,7 @@
<el-input v-model="form.storePath" placeholder="请输入" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-col :lg="24">
<el-form-item label="上传文件" prop="accessUrl">
<UploadFile v-model="form.accessUrl" :uploadUrl="uploadUrl" :fileType="fileType" :data="{ 'fileDir' : form.storePath}"
column="accessUrl" @input="handleUploadSuccess" />