diff --git a/src/views/modules/sys/app-menu-add-or-update.vue b/src/views/modules/sys/app-menu-add-or-update.vue index b5a90976..ca62ff28 100644 --- a/src/views/modules/sys/app-menu-add-or-update.vue +++ b/src/views/modules/sys/app-menu-add-or-update.vue @@ -69,42 +69,30 @@ :label="$t('menu.sort')"> - -
-
- - - -
-
-
- + label="菜单图标" + v-loading="loading" + prop="icon"> + + + +
+ prop="templateId"> + clearable + placeholder="子菜单模板"> + :key="item.id" + :label="item.templateName" + :value="item.id"> @@ -160,6 +148,7 @@ @@ -349,5 +349,28 @@ export default { } } } + .avatar-uploader .el-upload { + border: 1px dashed #d9d9d9; + border-radius: 6px; + cursor: pointer; + position: relative; + overflow: hidden; + } + .avatar-uploader .el-upload:hover { + border-color: #409eff; + } + .avatar-uploader-icon { + font-size: 28px; + color: #8c939d; + width: 378px; + height: 178px; + line-height: 178px; + text-align: center; + } + .avatar { + width: 300px; + height: 178px; + display: block; + } } diff --git a/src/views/modules/sys/app-menu.vue b/src/views/modules/sys/app-menu.vue index 70830ee5..97af6ce8 100644 --- a/src/views/modules/sys/app-menu.vue +++ b/src/views/modules/sys/app-menu.vue @@ -20,14 +20,13 @@ header-align="center" width="150"> - + :show-overflow-tooltip="true"> --> - - - - - - - diff --git a/src/views/modules/sys/appmenutemplate.vue b/src/views/modules/sys/appmenutemplate.vue index f45efe13..24fed360 100644 --- a/src/views/modules/sys/appmenutemplate.vue +++ b/src/views/modules/sys/appmenutemplate.vue @@ -54,16 +54,6 @@ label="标签颜色" header-align="center" align="center"> - - -