diff --git a/ZR.CodeGenerator/CodeGenerateTemplate.cs b/ZR.CodeGenerator/CodeGenerateTemplate.cs index d1549be..0a70069 100644 --- a/ZR.CodeGenerator/CodeGenerateTemplate.cs +++ b/ZR.CodeGenerator/CodeGenerateTemplate.cs @@ -37,7 +37,7 @@ namespace ZR.CodeGenerator if (dbFieldInfo.HtmlType == GenConstants.HTML_INPUT_NUMBER) { //数字框 - sb.AppendLine(" "); + sb.AppendLine(" "); sb.AppendLine($" "); sb.AppendLine($" "); sb.AppendLine(" "); @@ -46,7 +46,7 @@ namespace ZR.CodeGenerator else if (dbFieldInfo.HtmlType == GenConstants.HTML_DATETIME) { //时间 - sb.AppendLine(" "); + sb.AppendLine(" "); sb.AppendLine($" "); sb.AppendLine($" "); sb.AppendLine(" "); @@ -55,7 +55,7 @@ namespace ZR.CodeGenerator else if (dbFieldInfo.HtmlType == GenConstants.HTML_IMAGE_UPLOAD) { //图片 - sb.AppendLine(" "); + sb.AppendLine(" "); sb.AppendLine($" "); sb.AppendLine($@" "); sb.AppendLine(" "); @@ -64,7 +64,7 @@ namespace ZR.CodeGenerator else if (dbFieldInfo.HtmlType == GenConstants.HTML_FILE_UPLOAD) { //文件 - sb.AppendLine(" "); + sb.AppendLine(" "); sb.AppendLine($" "); sb.AppendLine($@" "); sb.AppendLine(" "); @@ -73,7 +73,7 @@ namespace ZR.CodeGenerator else if (dbFieldInfo.HtmlType == GenConstants.HTML_RADIO) { //单选按钮 - sb.AppendLine(" "); + sb.AppendLine(" "); sb.AppendLine($" "); sb.AppendLine($" "); if (string.IsNullOrEmpty(dbFieldInfo.DictType)) @@ -88,7 +88,7 @@ namespace ZR.CodeGenerator else if (dbFieldInfo.HtmlType == GenConstants.HTML_TEXTAREA) { //文本域 - sb.AppendLine(" "); + sb.AppendLine(" "); sb.AppendLine($" "); sb.AppendLine($" "); sb.AppendLine(" "); @@ -97,7 +97,7 @@ namespace ZR.CodeGenerator else if (dbFieldInfo.HtmlType == GenConstants.HTML_EDITOR) { //编辑器 - sb.AppendLine(" "); + sb.AppendLine(" "); sb.AppendLine($" "); sb.AppendLine($" "); sb.AppendLine(" "); @@ -106,7 +106,7 @@ namespace ZR.CodeGenerator else if (dbFieldInfo.HtmlType == GenConstants.HTML_SELECT) { //下拉框 - sb.AppendLine(" "); + sb.AppendLine(" "); sb.AppendLine($" "); sb.AppendLine($" "); if (string.IsNullOrEmpty(dbFieldInfo.DictType)) @@ -121,7 +121,7 @@ namespace ZR.CodeGenerator else if( dbFieldInfo.HtmlType == GenConstants.HTML_CHECKBOX) { //多选框 - sb.AppendLine(" "); + sb.AppendLine(" "); sb.AppendLine($" "); sb.AppendLine($" "); if (string.IsNullOrEmpty(dbFieldInfo.DictType)) @@ -136,7 +136,7 @@ namespace ZR.CodeGenerator else { string inputNumTxt = CodeGeneratorTool.IsNumber(dbFieldInfo.CsharpType) ? ".number" : ""; - sb.AppendLine(" "); + sb.AppendLine(" "); sb.AppendLine($" "); sb.AppendLine($" "); sb.AppendLine(" "); diff --git a/ZR.Vue/src/assets/styles/index.scss b/ZR.Vue/src/assets/styles/index.scss index b5b323c..ffe41d3 100644 --- a/ZR.Vue/src/assets/styles/index.scss +++ b/ZR.Vue/src/assets/styles/index.scss @@ -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; + } +} \ No newline at end of file diff --git a/ZR.Vue/src/views/monitor/operlog/index.vue b/ZR.Vue/src/views/monitor/operlog/index.vue index 77ba877..5bcc43d 100644 --- a/ZR.Vue/src/views/monitor/operlog/index.vue +++ b/ZR.Vue/src/views/monitor/operlog/index.vue @@ -79,38 +79,38 @@ - + {{ form.title }} {{ form.operName }} / {{ form.operIp }} / {{ form.operLocation }} - + {{ form.operUrl }} {{ form.requestMethod }} - + {{ form.method }} - + {{ typeFormat(form) }} - + {{ form.operParam }} - + {{ form.jsonResult }} - +
正常
失败
- + {{ parseTime(form.operTime) }} - + {{ form.errorMsg }}
diff --git a/ZR.Vue/src/views/monitor/server/index.vue b/ZR.Vue/src/views/monitor/server/index.vue index 5f1ee74..e99bf99 100644 --- a/ZR.Vue/src/views/monitor/server/index.vue +++ b/ZR.Vue/src/views/monitor/server/index.vue @@ -1,7 +1,7 @@