From 9a2293ea12531e49bb183a1a98e7bc3b065fffa6 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期五, 19 七月 2024 16:09:51 +0800
Subject: [PATCH] feat：通知空数据提示
---
src/layout/components/Navbar.vue | 8 ++++++--
src/views/education/department/edit.vue | 2 +-
src/views/education/subject/list.vue | 1 +
src/views/education/department/list.vue | 3 ++-
4 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index cfb834a..8ca66de 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -32,11 +32,14 @@
<div class="notify-warp" v-if="notify.feedBack && notify.feedBack > 0">
{{notify.feedBack}}鏉�<el-link @click="jump('/exam/feedback/list')" class="core" type="primary">閿欓鍙嶉</el-link>绛夊緟鎮ㄧ殑澶勭悊锛�
</div>
- <div class="notify-warp" v-if="notify.mobilize && notify.mobilize > 0">
+ <div class="notify-warp" v-else-if="notify.mobilize && notify.mobilize > 0">
{{notify.mobilize}}鏉�<el-link @click="jump('/user/departmentExamine/list')" class="core" type="primary">閮ㄩ棬璋冨姩瀹℃牳</el-link>绛夊緟鎮ㄧ殑澶勭悊锛�
</div>
- <div class="notify-warp" v-if="notify.status && notify.status > 0">
+ <div class="notify-warp" v-else-if="notify.status && notify.status > 0">
{{notify.status}}鏉�<el-link @click="jump('/user/UserConditionExamine/list')" class="core" type="primary">鐘舵�佸鏍�</el-link>绛夊緟鎮ㄧ殑澶勭悊锛�
+ </div>
+ <div class="notify-warp" v-else-if="notify.feedBack === 0 && notify.mobilize === 0 && notify.status === 0 ">
+ <el-empty description="鏆傛棤閫氱煡"></el-empty>
</div>
<span slot="footer" class="dialog-footer">
<el-button v-if="this.notify.ids && this.notify.ids.length > 0" type="success" @click="allRead">涓�閿叏璇�</el-button>
@@ -123,6 +126,7 @@
.notify-warp {
display: flex;
flex-direction: row;
+ justify-content: center;
}
.navbar {
height: 60px;
diff --git a/src/views/education/department/edit.vue b/src/views/education/department/edit.vue
index cb7e90a..269437a 100644
--- a/src/views/education/department/edit.vue
+++ b/src/views/education/department/edit.vue
@@ -19,7 +19,7 @@
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item v-if="fig === 0" label="绠＄悊鍛橈細">
- <el-select v-model="form.adminId" filterable placeholder="閫夋嫨绠＄悊鍛�">
+ <el-select v-model="form.adminId" filterable placeholder="閫夋嫨绠＄悊鍛�" multiple collapse-tags>
<el-option
v-for="item in deptUserList"
:key="item.id"
diff --git a/src/views/education/department/list.vue b/src/views/education/department/list.vue
index 884a261..f03b96a 100644
--- a/src/views/education/department/list.vue
+++ b/src/views/education/department/list.vue
@@ -21,6 +21,7 @@
style="width: 100%"
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
:row-class-name="tableRowClassName"
+ default-expand-all
row-key="id"
>
<el-table-column prop="name" label="閮ㄩ棬"/>
@@ -47,7 +48,7 @@
:visible.sync="dialogVisible"
width="400px"
:before-close="handleClose">
- <el-select v-model="updateAdminForm.adminIds" @change="changSelect" multiple filterable placeholder="閫夋嫨绠＄悊鍛�">
+ <el-select v-model="updateAdminForm.adminIds" @change="changSelect" multiple filterable placeholder="閫夋嫨绠＄悊鍛�" collapse-tags>
<el-option
v-for="item in deptUserList"
:key="item.id"
diff --git a/src/views/education/subject/list.vue b/src/views/education/subject/list.vue
index a9f56c3..a6691a2 100644
--- a/src/views/education/subject/list.vue
+++ b/src/views/education/subject/list.vue
@@ -18,6 +18,7 @@
<el-table
v-loading="listLoading"
:data="tableData"
+ default-expand-all
border fit highlight-current-row style="width: 100%"
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
row-key="id"
--
Gitblit v1.8.0