zqwang hace 1 año
padre
commit
0d1e410788
Se han modificado 1 ficheros con 24 adiciones y 10 borrados
  1. 24 10
      src/views/notice/mynotice/index.vue

+ 24 - 10
src/views/notice/mynotice/index.vue

@@ -2,7 +2,7 @@
 	
 	<div v-show="showAll == false"> 
 		<el-card style="padding: 5px; 15px;height: calc(24vh);">
-			<div class="header-title"> <h3>最新通知 </h3> <h4  @click="go2page">查看全部</h4></div>
+			<div class="header-title"> <p>最新通知 </p> <lable  @click="go2page">查看全部</lable></div>
 			<noticeBlock></noticeBlock>
 		</el-card>
 
@@ -53,11 +53,11 @@
 			</el-col>
 		</el-row>
 	</div>
-  <el-dialog draggable v-model="centerDialogVisible" :title="notice.title" width="30%" center>
-    <div class="flex flex-wrap break-all" v-html="notice.content"></div>
+  <el-dialog draggable v-model="centerDialogVisible" :title="popuNotice.title" width="30%" center>
+    <div class="flex flex-wrap break-all" v-html="popuNotice.content"></div>
     <template #footer>
       <span class="dialog-footer">
-        <el-button @click="readNotice">我知道了</el-button>
+        <el-button @click="popuReadNotice">我知道了</el-button>
       </span>
     </template>
   </el-dialog>
@@ -76,6 +76,7 @@ const api = 'system/notices/notice/mine';
 
 const centerDialogVisible = ref(false)
 const notice = ref({})
+const popuNotice = ref({});
 const noticesTypes = ref<object>([]);
 const activeName = ref(0)
 const showAll = ref(false)
@@ -85,11 +86,19 @@ const currentTableData = computed(() => data.value?.data);
 const readNotice = () => {
 	if(notice.value.id > 0 && notice.value.is_read == 0){
 	  noticeRead(notice.value.id).then(res => {
+		search();
+	  })
 	
+	}
+ 
+}
+const popuReadNotice = () => {
+	if(popuNotice.value.id > 0){
+	  noticeRead(popuNotice.value.id).then(res => {
+		search();
 	  })
-	search();
 	}
-  centerDialogVisible.value = false
+	 centerDialogVisible.value = false
 }
 const getFistNotice = async () => {
 	let param  = query.value;
@@ -150,9 +159,9 @@ onMounted(async () => {
   noticePopup().then(res => {
     if (res.data.id) {
       centerDialogVisible.value = true;
-      notice.value.id = res.data.id
-      notice.value.title = res.data.title
-      notice.value.content = res.data.content
+      popuNotice.value.id = res.data.id
+      popuNotice.value.title = res.data.title
+      popuNotice.value.content = res.data.content
     }
   })
 	query.value.notice_type_id = activeName;
@@ -169,10 +178,15 @@ onMounted(async () => {
   display: flex;
   align-items: center;
   justify-content:space-between;
-  h4{
+	
+  lable{
+	  font-size: 18px;
 	  margin-right: 50px;
 	  color:  #409EFF;
   }
+  p{
+	font-size: 18px;
+  }
 }
 .bak-txt{
 	border-color: aliceblue;