diff --git a/src/components/Tinymce.vue b/src/components/Tinymce.vue index f294790..6ed6a7d 100644 --- a/src/components/Tinymce.vue +++ b/src/components/Tinymce.vue @@ -60,13 +60,17 @@ const props = defineProps({ toolbar: { type: [String, Array], default: [ - "fullscreen undo redo restoredraft | cut copy paste pastetext | forecolor backcolor bold italic underline strikethrough link anchor | alignleft aligncenter alignright alignjustify outdent indent | bullist numlist | blockquote subscript superscript removeformat ", + "fullscreen undo redo | cut copy paste pastetext | forecolor backcolor bold italic underline strikethrough link anchor | alignleft aligncenter alignright alignjustify outdent indent | bullist numlist | blockquote subscript superscript removeformat ", "styleselect formatselect fontselect fontsizeselect | table image axupimgs media pagebreak insertdatetime selectall visualblocks searchreplace | code preview | indent2em lineheight formatpainter", ], }, fontFormats: { type: [String, Array], default: "微软雅黑=Microsoft YaHei,Helvetica Neue,PingFang SC,sans-serif;苹果苹方=PingFang SC,Microsoft YaHei,sans-serif;宋体=simsun,serif;仿宋体=FangSong,serif;黑体=SimHei,sans-serif;Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book antiqua,palatino;" + }, + height:{ + type: Number, + default: 450 } }) const content = ref(props.value); @@ -78,9 +82,9 @@ const init = reactive({ content_css: '/skins/content/default/content.css', language: 'zh_CN', placeholder: "在这里输入文字", //textarea中的提示信息 - min_width: 320, - min_height: 220, - height: 500, //注:引入autoresize插件时,此属性失效 + min_width: 300, + min_height: 200, + height: props.height, //注:引入autoresize插件时,此属性失效 resize: "both", //编辑器宽高是否可变,false-否,true-高可变,'both'-宽高均可,注意引号 promotion: false, branding: false, //tiny技术支持信息是否显示 diff --git a/src/fvcomponents/fvSearchForm/index.vue b/src/fvcomponents/fvSearchForm/index.vue index b4c6534..f082ac7 100644 --- a/src/fvcomponents/fvSearchForm/index.vue +++ b/src/fvcomponents/fvSearchForm/index.vue @@ -1,28 +1,28 @@ - { getList() }) - + \ No newline at end of file + diff --git a/src/layout/navbar/index.vue b/src/layout/navbar/index.vue index 9339358..bf89253 100644 --- a/src/layout/navbar/index.vue +++ b/src/layout/navbar/index.vue @@ -7,7 +7,7 @@
- 欢迎回来,{{userInfo.userName}} + 欢迎回来,{{userInfo.userName}}
    @@ -81,6 +81,7 @@ const handleLogout = () => { align-items: center; .user-box{ + cursor: pointer; margin-left: 10px; position: relative; >div:first-child{ diff --git a/src/views/home/index.vue b/src/views/home/index.vue index df9fd49..33aceb3 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -16,15 +16,19 @@

    待办 ({{ todoNum }})

    - + + +
- - - - + + + +
@@ -36,7 +40,7 @@ {{ item.title }}
-
+

工具下载

常用网站 @@ -115,7 +119,7 @@ const tableConfig = reactive({ label: '类型', align: 'center', showOverflowTooltip: false, - // currentRender: ({row, index}) => () + currentRender: ({row, index}) => () }, { prop: 'createTime', @@ -197,6 +201,12 @@ const headBtnClick = (key) => { border-radius: 10px; background-color: #ffffff; + .el-table__empty-block { + .el-empty { + padding: 10px 0; + } + } + .statistics { width: 99%; margin-bottom: 20px; @@ -210,7 +220,7 @@ const headBtnClick = (key) => { margin-top: 15px; .block-right { - margin-left: 40px; + margin-left: 15%; display: flex; flex-direction: column; justify-content: center; @@ -218,11 +228,13 @@ const headBtnClick = (key) => { font-size: 17px; > span:first-child { + white-space: nowrap; color: #000000; margin-bottom: 10px; } > span:last-child { + white-space: nowrap; font-size: 20px; font-weight: bold; @@ -257,14 +269,14 @@ const headBtnClick = (key) => { // } //} - .right-top, .right-down { + .right-top { flex: 0.5; padding: 15px; border-radius: 10px; background-color: #ffffff; } - .right-down,.right-top { + .right-top { flex: 0.48; > div:first-child { @@ -273,10 +285,12 @@ const headBtnClick = (key) => { align-items: center; h3 { + white-space: nowrap; margin-left: 15px; } > span { + white-space: nowrap; color: #927648; font-size: 14px; }