odjbin/mosr-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix : 完善页面细节

Browse Source
This commit is contained in:
odjbin
2024-05-10 00:29:07 +08:00
parent 90de57698b
commit 371a55cfe1
5 changed files with 68 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/components/Tinymce.vue
View File

@@ -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技术支持信息是否显示

55
src/fvcomponents/fvSearchForm/index.vue
View File

@@ -1,28 +1,28 @@
<template>
<el-form
:model="form"
v-bind="$attrs"
label-width="auto"
ref="formInstance"
class="search-form"
:model="form"
v-bind="$attrs"
label-width="auto"
ref="formInstance"
class="search-form"
>
<el-row>
<el-col
v-for="(item, index) in filterConfig"
:span="5"
:offset="index == 0 || index / 4 ==1 ? 0 : 1"
:key="item.prop"
>
<el-form-item
v-bind="item"
v-for="(item, index) in filterConfig"
:span="5"
:offset="index == 0 || index / 4 ==1 ? 0 : 1"
:key="item.prop"
>
<el-form-item
v-bind="item"
:key="item.prop"
>
<template #default>
<component
:is="item.component"
v-bind="item.props || {}"
v-on="item.on || {}"
v-model="form[item.prop]"
<component
:is="item.component"
v-bind="item.props || {}"
v-on="item.on || {}"
v-model="form[item.prop]"
>
</component>
</template>
@@ -33,7 +33,7 @@
<el-button v-if="searchConfig.length>=4" link type="primary" @click="showMore = !showMore">
{{ showMore ? '收起' : '展开' }}
</el-button>
<el-button type="primary" @click="getValues" :icon="Search">搜索</el-button>
<el-button @click="getValues" color="#DED0B2" :icon="Search">搜索</el-button>
<el-button @click="handleReset" :icon="Refresh">重置</el-button>
</el-form-item>
</el-col>
@@ -58,22 +58,22 @@ const formInstance = ref(null)
const showMore = ref(false)
const filterConfig = computed(()=>{
const arr = props.searchConfig.filter(item=>{
if(item.prop) return true
const filterConfig = computed(() => {
const arr = props.searchConfig.filter(item => {
if (item.prop) return true
})
return arr.length >= 4 && showMore.value ? arr : arr.slice(0, 3)
})
// 搜索功能表单元素默认值
const setDefaultFormValues = () => {
filterConfig.value.forEach(item=>{
filterConfig.value.forEach(item => {
form.value[item.prop] = item.props?.defaultValue || null
})
}
watchEffect(()=>{
if(filterConfig.value.length) {
watchEffect(() => {
if (filterConfig.value.length) {
setDefaultFormValues()
}
})
@@ -90,8 +90,8 @@ const handleReset = () => {
emits('search', form.value)
}
onMounted(()=>{
emits('getInstance', Object.assign({}, unref(formInstance),{
onMounted(() => {
emits('getInstance', Object.assign({}, unref(formInstance), {
getValues,
handleReset,
}))
@@ -103,9 +103,10 @@ onMounted(()=>{
.search-form {
padding-top: 18px;
}
.btn-col {
display: flex;
justify-content: space-evenly;
align-items: center;
}
</style>
</style>

11
src/fvcomponents/fvTable/index.vue
View File

@@ -2,10 +2,11 @@
<div class="fv-table-container">
<!-- 表格头部按钮 -->
<div class="fv-table-btn" v-if="tableConfig.btns">
<el-button
<el-button
v-for="btn in tableConfig.btns"
:key="btn.key"
:key="btn.key"
:type="btn.type || ''"
:color="btn.color || ''"
v-perm="btn.auth || ['*:*:*']"
@click="handleClickBtns(btn.key)"
>
@@ -47,7 +48,7 @@
</template>
</el-table>
<!-- 分页 -->
<fvPagination
<fvPagination
v-if="pagination"
:current-page="localData.query.pageNum"
:page-size="localData.query.pageSize"
@@ -180,9 +181,9 @@ defineExpose({ refresh, updateLoading, getQuery, tableInstance })
onMounted(() => {
getList()
})
</script>
<style lang="scss" scoped>
</style>
</style>

3
src/layout/navbar/index.vue
View File

@@ -7,7 +7,7 @@
<div class="user-box">
<div>
<!-- <img :src="userInfo.avatar" alt="" @click.stop="handleVisitedP">-->
<span>欢迎回来，{{userInfo.userName}}</span>
<span @click.stop="handleVisitedP">欢迎回来，{{userInfo.userName}}</span>
</div>
<div class="person" v-if="visitedP">
<ul>
@@ -81,6 +81,7 @@ const handleLogout = () => {
align-items: center;
.user-box{
cursor: pointer;
margin-left: 10px;
position: relative;
>div:first-child{

34
src/views/home/index.vue
View File

@@ -16,15 +16,19 @@
</el-col>
</el-row>
<h4>待办 ({{ todoNum }})</h4>
<fvTable ref="tableIns" :tableConfig="tableConfig" @headBtnClick="headBtnClick"></fvTable>
<fvTable ref="tableIns" :tableConfig="tableConfig" @headBtnClick="headBtnClick">
<template #empty>
<el-empty description="暂无待办"/>
</template>
</fvTable>
</div>
</el-col>
<el-col :xs="24" :sm="8" :md="6" :lg="4" :xl="4">
<div class="right">
<!-- <div class="right-top">-->
<!-- <h3>欢迎回来， Sunshine</h3>-->
<!-- <div>科技创新项目需求征集中， 要求参见OA内部信！</div>-->
<!-- </div>-->
<!-- <div class="right-top">-->
<!-- <h3>欢迎回来， Sunshine</h3>-->
<!-- <div>科技创新项目需求征集中， 要求参见OA内部信！</div>-->
<!-- </div>-->
<!-- <div class="right-gap"></div>-->
<div class="right-top ">
<div>
@@ -36,7 +40,7 @@
{{ item.title }}
</div>
</div>
<div class="right-down">
<div class="right-top">
<div>
<h3>工具下载</h3>
<span>常用网站</span>
@@ -115,7 +119,7 @@ const tableConfig = reactive({
label: '类型',
align: 'center',
showOverflowTooltip: false,
// currentRender: ({row, index}) => (<Tag dictType={'normal_disable'} value={row.state}/>)
currentRender: ({row, index}) => (<Tag dictType={'todo_type'} value={row.state}/>)
},
{
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;
}