mirror of
				https://github.com/nsnail/NetAdmin.git
				synced 2025-10-31 03:19:26 +08:00 
			
		
		
		
	fix: 🐛 前端样式问题 (#84)
This commit is contained in:
		| @@ -1,8 +1,7 @@ | ||||
| <template> | ||||
|     <svg t="1700642629058" class="icon" viewBox="0 0 1333 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7944" width="128" height="128"> | ||||
|     <svg class="icon" height="128" p-id="7944" t="1700642629058" version="1.1" viewBox="0 0 1333 1024" width="128" xmlns="http://www.w3.org/2000/svg"> | ||||
|         <path | ||||
|             d="M 1101.48 342.52 a 155.844 155.844 0 1 0 -226.753 0 a 244.675 244.675 0 0 0 -53.7662 38.1818 A 197.922 197.922 0 0 0 484.34 373.688 a 243.896 243.896 0 0 0 -63.1169 -48.3117 a 155.844 155.844 0 1 0 -226.753 0 A 245.454 245.454 0 0 0 62.003 544.337 a 38.961 38.961 0 0 0 77.9221 0 a 168.311 168.311 0 0 1 298.441 -105.974 a 38.1818 38.1818 0 0 0 17.1428 13.2468 a 190.909 190.909 0 0 0 66.2337 180.78 a 319.48 319.48 0 0 0 -189.351 290.649 a 38.961 38.961 0 0 0 77.9221 0 a 241.559 241.559 0 0 1 482.337 0 a 38.961 38.961 0 0 0 77.9221 0 a 319.48 319.48 0 0 0 -189.351 -290.649 a 197.922 197.922 0 0 0 69.3506 -149.61 a 196.363 196.363 0 0 0 0 -28.052 a 37.4026 37.4026 0 0 0 17.922 -10.1299 a 166.753 166.753 0 0 1 123.117 -52.9869 A 168.311 168.311 0 0 1 1152.9 559.143 a 38.961 38.961 0 0 0 77.9221 0 a 245.454 245.454 0 0 0 -129.351 -216.623 Z M 308.236 295.767 a 77.9221 77.9221 0 1 1 77.9221 -77.9221 a 77.9221 77.9221 0 0 1 -77.9221 77.9221 Z m 342.857 311.688 a 120.779 120.779 0 1 1 121.558 -124.675 A 121.558 121.558 0 0 1 651.093 607.454 Z m 336.623 -290.649 a 77.9221 77.9221 0 1 1 77.9221 -77.9221 a 77.9221 77.9221 0 0 1 -77.9221 74.8052 Z" | ||||
|             fill="#666666" | ||||
|             p-id="7945"></path> | ||||
|     </svg> | ||||
| </template> | ||||
| @@ -24,8 +24,9 @@ | ||||
|     --el-disabled-bg-color: --el-bg-color; | ||||
| } | ||||
|  | ||||
| .right-panel-search .el-input { | ||||
|     --el-input-width: 15rem; | ||||
| .el-input__inner, | ||||
| .el-range-input { | ||||
|     font-family: inherit; | ||||
| } | ||||
|  | ||||
| .el-date-editor { | ||||
| @@ -301,12 +302,4 @@ body .tox-tinymce-aux { | ||||
|     .el-dialog__body { | ||||
|         flex: 1; | ||||
|     } | ||||
| } | ||||
|  | ||||
| .jv-dark { | ||||
|     background: unset !important; | ||||
| } | ||||
|  | ||||
| .input-width-full .el-input { | ||||
|     --el-input-width: 100%; | ||||
| } | ||||
| @@ -66,14 +66,13 @@ | ||||
|             display: none; | ||||
|         } | ||||
|  | ||||
|         .right-panel { | ||||
|             display: block; | ||||
|             border-top: 1px solid var(--el-border-color-light); | ||||
|             margin-top: 1rem; | ||||
|         .right-panel-search { | ||||
|             flex-direction: column; | ||||
|             align-items: flex-start; | ||||
|         } | ||||
|  | ||||
|         .right-panel .right-panel-search { | ||||
|             display: block; | ||||
|         .right-panel { | ||||
|             margin-top: 1rem; | ||||
|         } | ||||
|     } | ||||
|     .adminui-main > .el-container > *:first-child:not(.el-aside):not(.el-header) { | ||||
|   | ||||
| @@ -8,7 +8,7 @@ | ||||
|                             type: 'input', | ||||
|                             field: ['root', 'keywords'], | ||||
|                             placeholder: '部门编号 / 部门名称 / 备注', | ||||
|                             style: 'width:20rem', | ||||
|                             style: 'width:25rem', | ||||
|                         }, | ||||
|                         { | ||||
|                             type: 'select', | ||||
| @@ -18,6 +18,7 @@ | ||||
|                                 { label: '禁用', value: false }, | ||||
|                             ], | ||||
|                             placeholder: '状态', | ||||
|                             style: 'width:15rem', | ||||
|                         }, | ||||
|                     ]" | ||||
|                     :vue="this" | ||||
| @@ -50,11 +51,11 @@ | ||||
|                 <el-table-column :label="$t('部门名称')" prop="name" sortable="custom"></el-table-column> | ||||
|                 <el-table-column :label="$t('排序')" prop="sort" sortable="custom"></el-table-column> | ||||
|                 <na-col-indicator | ||||
|                     :label="$t('状态')" | ||||
|                     :options="[ | ||||
|                         { text: '启用', type: 'success', value: true }, | ||||
|                         { text: '禁用', type: 'danger', value: false, pulse: true }, | ||||
|                     ]" | ||||
|                     :label="$t('状态')" | ||||
|                     prop="enabled"></na-col-indicator> | ||||
|                 <el-table-column :label="$t('创建时间')" prop="createdTime" sortable="custom"></el-table-column> | ||||
|                 <el-table-column :label="$t('备注')" prop="summary"></el-table-column> | ||||
|   | ||||
| @@ -9,6 +9,7 @@ | ||||
|                             type: 'input', | ||||
|                             field: ['dy', 'keywords'], | ||||
|                             placeholder: '项名 / 项值', | ||||
|                             style: 'width:20rem', | ||||
|                         }, | ||||
|                     ]" | ||||
|                     :vue="this" | ||||
|   | ||||
| @@ -2,7 +2,7 @@ | ||||
|     <el-container> | ||||
|         <el-main class="nopadding"> | ||||
|             <el-container> | ||||
|                 <el-header> | ||||
|                 <el-header class="headerPublic"> | ||||
|                     <div class="left-panel"> | ||||
|                         <na-search | ||||
|                             ref="search" | ||||
| @@ -15,16 +15,19 @@ | ||||
|                                         { label: '失败', value: '300,999' }, | ||||
|                                     ], | ||||
|                                     placeholder: '登录结果', | ||||
|                                     style: 'width:15rem', | ||||
|                                 }, | ||||
|                                 { | ||||
|                                     type: 'input', | ||||
|                                     field: ['dy', 'extraData'], | ||||
|                                     placeholder: '登录名', | ||||
|                                     style: 'width:15rem', | ||||
|                                 }, | ||||
|                                 { | ||||
|                                     type: 'input', | ||||
|                                     field: ['dy', 'createdClientIp'], | ||||
|                                     placeholder: 'IP地址', | ||||
|                                     style: 'width:15rem', | ||||
|                                 }, | ||||
|                             ]" | ||||
|                             :vue="this" | ||||
| @@ -50,15 +53,15 @@ | ||||
|                                 {{ scope.row.httpStatusCode === 200 ? '成功' : '失败' }} | ||||
|                             </template> | ||||
|                         </el-table-column> | ||||
|                         <el-table-column :label="$t('登录名')" prop="extraData" sortable="custom"> </el-table-column> | ||||
|                         <el-table-column :label="$t('登录名')" prop="extraData" sortable="custom"></el-table-column> | ||||
|                         <el-table-column :label="$t('IP地址')" prop="createdClientIp" sortable="custom"></el-table-column> | ||||
|                         <el-table-column :label="$t('操作系统')" prop="os" sortable="custom"></el-table-column> | ||||
|                         <el-table-column | ||||
|                             :label="$t('用户代理')" | ||||
|                             min-width="200" | ||||
|                             prop="createdUserAgent" | ||||
|                             sortable="custom" | ||||
|                             show-overflow-tooltip | ||||
|                             min-width="200"></el-table-column> | ||||
|                             sortable="custom"></el-table-column> | ||||
|                     </sc-table> | ||||
|                 </el-main> | ||||
|             </el-container> | ||||
|   | ||||
| @@ -2,7 +2,7 @@ | ||||
|     <el-container> | ||||
|         <el-main class="nopadding"> | ||||
|             <el-container> | ||||
|                 <el-header> | ||||
|                 <el-header class="headerPublic"> | ||||
|                     <div class="left-panel"> | ||||
|                         <na-search | ||||
|                             :controls="[ | ||||
| @@ -10,6 +10,7 @@ | ||||
|                                     type: 'input', | ||||
|                                     field: ['filter', 'id'], | ||||
|                                     placeholder: '日志编号', | ||||
|                                     style: 'width:15rem', | ||||
|                                 }, | ||||
|                                 { | ||||
|                                     multiple: true, | ||||
| @@ -23,6 +24,7 @@ | ||||
|                                         { label: '90x', value: '900,999' }, | ||||
|                                     ], | ||||
|                                     placeholder: '状态码', | ||||
|                                     style: 'width:20rem', | ||||
|                                 }, | ||||
|                                 { | ||||
|                                     type: 'cascader', | ||||
| @@ -30,16 +32,19 @@ | ||||
|                                     api: $API.sys_api.query, | ||||
|                                     props: { label: 'summary', value: 'id', checkStrictly: true, expandTrigger: 'hover', emitPath: false }, | ||||
|                                     placeholder: '请求服务', | ||||
|                                     style: 'width:20rem', | ||||
|                                 }, | ||||
|                                 { | ||||
|                                     type: 'input', | ||||
|                                     field: ['dy', 'createdUserName'], | ||||
|                                     placeholder: '用户', | ||||
|                                     style: 'width:15rem', | ||||
|                                 }, | ||||
|                                 { | ||||
|                                     type: 'input', | ||||
|                                     field: ['dy', 'createdClientIp'], | ||||
|                                     placeholder: '客户端IP', | ||||
|                                     style: 'width:15rem', | ||||
|                                 }, | ||||
|                             ]" | ||||
|                             :vue="this" | ||||
| @@ -64,7 +69,7 @@ | ||||
|                             <el-table-column :label="$t('路径')" min-width="150" prop="apiId" sortable="custom"></el-table-column> | ||||
|                             <el-table-column :label="$t('描述')" prop="apiSummary"></el-table-column> | ||||
|                             <el-table-column :label="$t('方法')" prop="method" sortable="custom" width="100"></el-table-column> | ||||
|                             <el-table-column align="right" :label="$t('耗时(毫秒)')" prop="duration" sortable="custom" width="120"> | ||||
|                             <el-table-column :label="$t('耗时(毫秒)')" align="right" prop="duration" sortable="custom" width="120"> | ||||
|                                 <template #default="scope"> | ||||
|                                     {{ (scope.row.duration / 1000).toFixed(2) }} | ||||
|                                 </template> | ||||
|   | ||||
| @@ -8,7 +8,7 @@ | ||||
|                             type: 'input', | ||||
|                             field: ['root', 'keywords'], | ||||
|                             placeholder: $t('消息编号 / 消息主题 / 消息内容'), | ||||
|                             style: 'width:25rem', | ||||
|                             style: 'width:20rem', | ||||
|                         }, | ||||
|                         { | ||||
|                             type: 'select', | ||||
| @@ -17,6 +17,7 @@ | ||||
|                                 return { value: x[0], label: x[1][1] } | ||||
|                             }), | ||||
|                             placeholder: $t('消息类型'), | ||||
|                             style: 'width:15rem', | ||||
|                         }, | ||||
|                     ]" | ||||
|                     :vue="this" | ||||
| @@ -43,20 +44,20 @@ | ||||
|                     } | ||||
|                 "> | ||||
|                 <el-table-column type="selection"></el-table-column> | ||||
|                 <el-table-column prop="id" :label="$t('消息编号')" width="150" /> | ||||
|                 <el-table-column :label="$t('消息编号')" prop="id" width="150" /> | ||||
|                 <na-col-avatar :label="$t('用户名')" prop="creator.userName" /> | ||||
|                 <na-col-indicator | ||||
|                     width="100" | ||||
|                     :label="$t('消息类型')" | ||||
|                     :options="[ | ||||
|                         { text: '私信', type: 'success', value: 'private' }, | ||||
|                         { text: '公告', type: 'warning', value: 'public' }, | ||||
|                     ]" | ||||
|                     :label="$t('消息类型')" | ||||
|                     prop="msgType"></na-col-indicator> | ||||
|                     prop="msgType" | ||||
|                     width="100"></na-col-indicator> | ||||
|  | ||||
|                 <el-table-column prop="title" :label="$t('消息主题')" min-width="150" show-overflow-tooltip /> | ||||
|                 <el-table-column prop="summary" show-overflow-tooltip :label="$t('消息摘要')" min-width="200" /> | ||||
|                 <el-table-column prop="createdTime" :label="$t('创建时间')" /> | ||||
|                 <el-table-column :label="$t('消息主题')" min-width="150" prop="title" show-overflow-tooltip /> | ||||
|                 <el-table-column :label="$t('消息摘要')" min-width="200" prop="summary" show-overflow-tooltip /> | ||||
|                 <el-table-column :label="$t('创建时间')" prop="createdTime" /> | ||||
|                 <na-col-operation | ||||
|                     :buttons=" | ||||
|                         naColOperation.buttons.concat({ | ||||
|   | ||||
| @@ -18,6 +18,7 @@ | ||||
|                                 { label: '禁用', value: false }, | ||||
|                             ], | ||||
|                             placeholder: '状态', | ||||
|                             style: 'width:15rem', | ||||
|                         }, | ||||
|                         { | ||||
|                             type: 'select', | ||||
| @@ -27,6 +28,7 @@ | ||||
|                                 { label: '否', value: false }, | ||||
|                             ], | ||||
|                             placeholder: '无限权限', | ||||
|                             style: 'width:15rem', | ||||
|                         }, | ||||
|                         { | ||||
|                             type: 'select', | ||||
| @@ -36,6 +38,7 @@ | ||||
|                                 { label: '否', value: false }, | ||||
|                             ], | ||||
|                             placeholder: '显示仪表板', | ||||
|                             style: 'width:15rem', | ||||
|                         }, | ||||
|                     ]" | ||||
|                     :vue="this" | ||||
| @@ -66,18 +69,18 @@ | ||||
|                 <el-table-column :label="$t('角色名称')" prop="name" sortable="custom"></el-table-column> | ||||
|                 <el-table-column :label="$t('排序')" prop="sort" sortable="custom"></el-table-column> | ||||
|                 <na-col-indicator | ||||
|                     :label="$t('状态')" | ||||
|                     :options="[ | ||||
|                         { text: '启用', type: 'success', value: true }, | ||||
|                         { text: '禁用', type: 'danger', value: false, pulse: true }, | ||||
|                     ]" | ||||
|                     :label="$t('状态')" | ||||
|                     prop="enabled"></na-col-indicator> | ||||
|                 <na-col-indicator | ||||
|                     :label="$t('无限权限')" | ||||
|                     :options="[ | ||||
|                         { text: '是', type: 'success', value: true, pulse: true }, | ||||
|                         { text: '否', type: 'danger', value: false }, | ||||
|                     ]" | ||||
|                     :label="$t('无限权限')" | ||||
|                     prop="ignorePermissionControl"></na-col-indicator> | ||||
|  | ||||
|                 <el-table-column :label="$t('数据范围')" prop="dataScope" sortable="custom"> | ||||
| @@ -87,11 +90,11 @@ | ||||
|                 </el-table-column> | ||||
|  | ||||
|                 <na-col-indicator | ||||
|                     :label="$t('显示仪表板')" | ||||
|                     :options="[ | ||||
|                         { text: '是', type: 'success', value: true }, | ||||
|                         { text: '否', type: 'danger', value: false }, | ||||
|                     ]" | ||||
|                     :label="$t('显示仪表板')" | ||||
|                     prop="displayDashboard"></na-col-indicator> | ||||
|  | ||||
|                 <el-table-column :label="$t('创建时间')" prop="createdTime" sortable="custom"></el-table-column> | ||||
|   | ||||
| @@ -16,6 +16,7 @@ | ||||
|                             api: $API.sys_role.query, | ||||
|                             config: { props: { label: 'name', value: 'id' } }, | ||||
|                             placeholder: '所属角色', | ||||
|                             style: 'width:15rem', | ||||
|                         }, | ||||
|                         { | ||||
|                             type: 'cascader', | ||||
| @@ -23,6 +24,7 @@ | ||||
|                             api: $API.sys_dept.query, | ||||
|                             props: { label: 'name', value: 'id', checkStrictly: true, expandTrigger: 'hover', emitPath: false }, | ||||
|                             placeholder: '所属部门', | ||||
|                             style: 'width:15rem', | ||||
|                         }, | ||||
|                         { | ||||
|                             type: 'select', | ||||
| @@ -32,6 +34,7 @@ | ||||
|                                 { label: '禁用', value: false }, | ||||
|                             ], | ||||
|                             placeholder: '状态', | ||||
|                             style: 'width:15rem', | ||||
|                         }, | ||||
|                     ]" | ||||
|                     :vue="this" | ||||
| @@ -61,14 +64,14 @@ | ||||
|                 <na-col-avatar :label="$t('用户名')" prop="userName" /> | ||||
|                 <el-table-column :label="$t('手机号')" prop="mobile" sortable="custom" width="120"></el-table-column> | ||||
|                 <el-table-column :label="$t('邮箱')" prop="email" sortable="custom"></el-table-column> | ||||
|                 <na-col-tags field="name" :label="$t('所属角色')" prop="roles" @click="(item) => openDialog('sys_role', item.id, 'roleSave')" /> | ||||
|                 <na-col-tags field="name" :label="$t('所属部门')" prop="dept" @click="(item) => openDialog('sys_dept', item.id, 'deptSave')" /> | ||||
|                 <na-col-tags :label="$t('所属角色')" field="name" prop="roles" @click="(item) => openDialog('sys_role', item.id, 'roleSave')" /> | ||||
|                 <na-col-tags :label="$t('所属部门')" field="name" prop="dept" @click="(item) => openDialog('sys_dept', item.id, 'deptSave')" /> | ||||
|                 <na-col-indicator | ||||
|                     :label="$t('状态')" | ||||
|                     :options="[ | ||||
|                         { text: '启用', type: 'success', value: true }, | ||||
|                         { text: '禁用', type: 'danger', value: false, pulse: true }, | ||||
|                     ]" | ||||
|                     :label="$t('状态')" | ||||
|                     prop="enabled"></na-col-indicator> | ||||
|                 <el-table-column :label="$t('创建时间')" prop="createdTime" sortable="custom"></el-table-column> | ||||
|                 <el-table-column :label="$t('备注')" prop="summary" width="50"></el-table-column> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 GitHub
						GitHub