From dabb3ab825e23a2550e0ec9df6d2d47482d1822c Mon Sep 17 00:00:00 2001
From: 13404089107 <puwei@sinata.cn>
Date: 星期四, 26 六月 2025 15:30:56 +0800
Subject: [PATCH] Merge branch 'main' of http://120.76.84.145:10101/gitblit/r/H5/leshan-laboratory
---
culture/src/views/middleground/index.vue | 42 +++++++++++++++++++++++++++++++++---------
1 files changed, 33 insertions(+), 9 deletions(-)
diff --git a/culture/src/views/middleground/index.vue b/culture/src/views/middleground/index.vue
index 06e4b2c..e08ac33 100644
--- a/culture/src/views/middleground/index.vue
+++ b/culture/src/views/middleground/index.vue
@@ -37,22 +37,20 @@
<div class="title">待办事项</div>
<!-- 待办事项列表将放置在这里 -->
<div class="todo-list">
- <div class="todo-item" v-for="i in 6" :key="i">
+ <div class="todo-item" v-for="(item,index) in list" :key="index" @click.stop="toDetail(item)">
<div class="todo-details">
<div class="notice-card">
- <div class="todo-icon">
- </div>
- <div class="red-notice"></div>
+ <div class="todo-icon"></div>
+ <div class="red-notice" v-if="item.status==1"></div>
</div>
-
- <span class="todo-title">您有 [1] 条 【项目课题方案】 等待审批</span>
+ <span class="todo-title" :title="item.noticeContent || ''">{{item.noticeContent||''}}</span>
</div>
<div class="todo-meta">
<div class="me"></div>
- <span class="todo-submitter">提交人: 王晓晓</span>
+ <span class="todo-submitter">提交人: {{item.commitName||''}}</span>
<div class="time"></div>
- <span class="todo-submitter">2023.12.10 08:00</span>
+ <span class="todo-submitter">{{item.createTime||''}}</span>
</div>
</div>
</div>
@@ -66,6 +64,7 @@
<script>
import { loginReq } from './service'
import { Calendar } from "ant-design-vue";
+import { getList,read } from "./service";
import HeaderNav from '../../layouts/components/HeaderNav.vue'
export default {
name: 'Login',
@@ -85,6 +84,7 @@
date: new Date(),
viewWidth: '',
scale: 1,
+ list:[],
// 审批人
moduleList2: [
{
@@ -149,6 +149,10 @@
created() {
// 初始化时检查窗口大小
this.handleResize();
+ getList().then(res=>{
+ this.list = res
+
+ })
},
mounted() {
// 监听窗口大小变化
@@ -174,6 +178,19 @@
})
}
},
+ toDetail(item){
+ read({id:item.id}).then(res=>{
+ let urlList=['/strainReportLibrary/reportLibraryOne','/strainReportLibrary/reportLibraryOne','/strain-library/strain-library-manage'
+ ,'/strain/pedigree-vhart','/strain/breeding-record','/strain/validation/primitive-cell',
+ '/strainReportLibrary/reportLibraryOne','/strainReportLibrary/reportLibraryOne','/deliveryAssessment/projectTeamIntegral',
+ ]
+ let url=urlList[item.noticeType *1]
+ this.$router.push({
+ path: url,
+ });
+ })
+
+ }
},
computed: {
currentModuleList() {
@@ -894,6 +911,7 @@
.todo-list {
flex: 1;
height: 100%;
+ max-height: 264px;
overflow: auto;
}
@@ -902,7 +920,7 @@
display: flex;
align-items: center;
justify-content: space-between;
- margin-bottom: 20PX;
+ margin-bottom: 20px;
/* 分隔线 */
&:first-child {
@@ -947,11 +965,17 @@
font-size: 14px;
color: #303133;
line-height: 24px;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ max-width: 400px;
+ cursor: pointer;
}
.todo-meta {
display: flex;
align-items: center;
+ min-width:260px;
}
.time {
--
Gitblit v1.7.1