@@ -113,7 +108,7 @@
import { ref, onMounted, onBeforeUnmount, defineProps } from 'vue'
import { recordRoute } from '@/config'
import { useRoute, useRouter } from 'vue-router'
- import { getUser, mynotice, mynoticeRead } from '@/api/home'
+ import { getUser, mynotice } from '@/api/home'
import { useStore } from 'vuex'
import { getSgcTotal } from '@/api/home'
import mybus from '@/myplugins/mybus'
@@ -243,15 +238,20 @@
mynotice({ page: 1, limit: 999, readStatus: 0 }).then((res) => {
console.log('我的消息', res.data.data)
mynoticeNum.value = res.data.data.total
- mynoticeData.value = res.data.data.list
+ mynoticeData.value = res.data.data.list.splice(0, 3)
})
}
- const read = (item) => {
- mynoticeRead(item.id).then((res) => {
- console.log('已读', res)
- getMynotice()
+ const goToView = () => {
+ router.push({
+ path: '/mynoticeView',
})
}
+ // const read = (item) => {
+ // mynoticeRead(item.id).then((res) => {
+ // console.log('已读', res)
+ // getMynotice()
+ // })
+ // }
onMounted(() => {
getSgcTotal().then((res) => {
console.log('初始化========================>', res.data.data.count)
@@ -397,7 +397,7 @@
}
}
.mynotice {
- width: 2.5rem;
+ width: 4rem;
height: 3rem;
background: #eee;
border-radius: 0.05rem;
@@ -405,24 +405,33 @@
top: 0.45rem;
right: 3.1rem;
overflow-y: scroll;
+ .bottom {
+ cursor: pointer;
+ width: 100%;
+ text-align: center;
+ color: #000;
+ font-size: 0.16rem;
+ }
}
.mynotice::-webkit-scrollbar {
display: none;
}
:deep(.ant-list-item) {
border-bottom: 0.01rem solid #ccc;
+ padding: 0.1rem;
}
:deep(.ant-list-item-meta-title) {
- display: flex;
- justify-content: space-around;
- align-items: center;
- padding: 0 0.05rem;
+ // display: flex;
+ // justify-content: space-around;
+ // align-items: center;
+ // padding: 0 0.05rem;
a {
- width: 1.5rem;
- // 超出显示...
+ width: 3.8rem;
overflow: hidden;
text-overflow: ellipsis;
- white-space: nowrap;
+ display: -webkit-box;
+ -webkit-line-clamp: 2;
+ -webkit-box-orient: vertical;
}
button {
width: 0.7rem;
diff --git a/front/src/views/mynoticeView/components/NoticeList.vue b/front/src/views/mynoticeView/components/NoticeList.vue
new file mode 100644
index 00000000..7e4db574
--- /dev/null
+++ b/front/src/views/mynoticeView/components/NoticeList.vue
@@ -0,0 +1,260 @@
+
+
+
+
+
+
+
+
{{ nav.title + '(' + nav.num + ')' }}
+
+
+
+
搜索
+
+
+
+
+
+
搜索
+
重置
+
+
+
+
+
+ 全部消息
+ 已读消息
+ 未读消息
+
+
+
+
全选
+
+ 共
+ 2
+ 条消息
+
+
+
+
标记为已读
+
+
+
+
+
+
+
+
+ {{ item.title }}
+
+ {{ '发布时间：' + item.time }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/front/src/views/mynoticeView/index.vue b/front/src/views/mynoticeView/index.vue
new file mode 100644
index 00000000..8b012893
--- /dev/null
+++ b/front/src/views/mynoticeView/index.vue
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
From 15b0d7c5ae71d3857375d2c2bf5c5590ff32676f Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Tue, 21 Jun 2022 17:01:04 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E5=A4=B4=E9=83=A8=E5=8A=A0=E9=98=B4?=
=?UTF-8?q?=E5=BD=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
front/src/views/home/components/header.vue | 2 ++
1 file changed, 2 insertions(+)
diff --git a/front/src/views/home/components/header.vue b/front/src/views/home/components/header.vue
index 6c4639dd..3fc68faa 100644
--- a/front/src/views/home/components/header.vue
+++ b/front/src/views/home/components/header.vue
@@ -131,6 +131,7 @@
const select = ref(router.currentRoute.value.name)
const mynoticeFlag = ref(false)
const mynoticeData = ref([])
+ // eslint-disable-next-line no-undef
const navList = ref(navListManagement.navList)
const props = defineProps({
showView: { type: String, default: '' },
@@ -362,6 +363,7 @@
}
.white {
background-color: #fff;
+ box-shadow: 0 0.02rem 0.1rem rgba(0, 0, 0, 0.1);
.name {
color: #0058e1;
}
From 25eed3e27b91b084f3779ab0308af764f28b33bc Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Tue, 21 Jun 2022 17:01:19 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E9=9D=92=E5=B2=9B=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
front/public/static/config/location.js | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/front/public/static/config/location.js b/front/public/static/config/location.js
index 0b85c99c..50aebc14 100644
--- a/front/public/static/config/location.js
+++ b/front/public/static/config/location.js
@@ -1,12 +1,12 @@
/*
* @Author: hisense.wuhongjian
* @Date: 2020-07-07 16:03:23
- * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-04-01 10:51:45
+ * @LastEditors: hisense.liangjunhua
+ * @LastEditTime: 2022-06-21 16:58:56
* @Description: 数据资源参数配置
*/
-// const newLocation = 'qingdao'
-const newLocation = 'baotou'
+const newLocation = 'qingdao'
+// const newLocation = 'baotou'
// const newLocation = 'xihaian'
// 数据资源数据
From c9855a55c30fbb3c4c2dd9d45dc30337e9858b3b Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Tue, 21 Jun 2022 17:04:20 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E6=BB=9A=E5=8A=A8=E6=9D=A1bug=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
front/src/views/home/components/header.vue | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/front/src/views/home/components/header.vue b/front/src/views/home/components/header.vue
index 3fc68faa..17e0cad5 100644
--- a/front/src/views/home/components/header.vue
+++ b/front/src/views/home/components/header.vue
@@ -265,21 +265,21 @@
if (mynoticeDom) {
mynoticeDom.addEventListener('mouseover', () => {
mynoticeFlag.value = true
- document.documentElement.style.overflow = 'hidden'
+ document.documentElement.style.overflowY = 'hidden'
})
mynoticeDom.addEventListener('mouseout', () => {
mynoticeFlag.value = false
- document.documentElement.style.overflow = 'scroll'
+ document.documentElement.style.overflowY = 'scroll'
})
}
if (mynotice) {
mynotice.addEventListener('mouseover', () => {
mynoticeFlag.value = true
- document.documentElement.style.overflow = 'hidden'
+ document.documentElement.style.overflowY = 'hidden'
})
mynotice.addEventListener('mouseout', () => {
mynoticeFlag.value = false
- document.documentElement.style.overflow = 'scroll'
+ document.documentElement.style.overflowY = 'scroll'
})
}
mybus.on('getSgcNum', () => {