From e5454b769d44a34af423bf87ac8a740bf8c20341 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 29 四月 2025 13:25:29 +0800
Subject: [PATCH] Merge branch 'dev' into dev_tides
---
src/views/index.vue | 75 +++++++++----------------------------
1 files changed, 19 insertions(+), 56 deletions(-)
diff --git a/src/views/index.vue b/src/views/index.vue
index 1ef8d8f..b9dcf90 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -94,7 +94,13 @@
<script>
import ScrollPagination from '@/components/index/scroll-paging.vue'
-import {calendarWorkByWeek, currentUserWorkHourCount, msgRoll, page} from "@/api/index/report";
+import {
+ calendarWorkByWeek,
+ currentUserWorkHourCount,
+ msgRoll,
+ page,
+ triggerModificationStatusToRead
+} from "@/api/index/report";
import Echarts from "@/components/echarts/echarts.vue";
import {mapGetters} from "vuex";
export default {
@@ -116,7 +122,7 @@
list:[],
currentPage:1,
pageSize: 8, // 涓�椤�7鏉�
- total: null,
+ total: 0,
listLoading: true, // 缁勪欢loading鐨勫睍绀�,榛樿涓簍rue
finishLoding: false, // 鍔犺浇瀹屾垚锛屾樉绀哄凡缁忔病鏈夋洿澶氫簡
timer:null,
@@ -130,7 +136,6 @@
radius: ['40%', '60%'],
avoidLabelOverlap: false,
itemStyle: {
- borderRadius: 5,
borderColor: '#fff',
borderWidth: 2
},
@@ -194,8 +199,14 @@
},
methods: {
// 璺宠浆椤甸潰
- goAddList() {
-
+ goAddList(m) {
+ this.$router.push({name: m.jumpPath, query: { activeName: m.jumpId }})
+ this.changeStatus(m)
+ },
+ changeStatus (m) {
+ triggerModificationStatusToRead({id: m.id}).then(res => {
+ console.log(res.data)
+ })
},
getList(){
const key = `_${this.currentPage}`
@@ -354,7 +365,6 @@
month: month,
}
currentUserWorkHourCount(params).then(res => {
- console.log(res)
this.totalHour = res.data.totalHour
this.materialPieSeries[0].data[0].value = res.data.subsidiaryHour
this.materialPieSeries[0].data[1].value = res.data.yieldHour
@@ -429,22 +439,6 @@
box-sizing: border-box;
}
-.right-1{
- padding: 10px 10px 4px;
- display: flex;
- align-items: center;
- justify-content: space-between;
- margin-bottom: 16px;
-}
-
-.right-1-item{
- width: 25%;
- display: flex;
- align-items: center;
- justify-content: center;
- cursor: pointer;
-}
-
.right-1-item .mun{
margin-left: 6px;
color: #0166E2;
@@ -474,28 +468,8 @@
>>>.el-calendar-table tr td:first-child{
border-left: 0;
}
-.control{
- display: flex;
- align-items: center;
- justify-content: space-between;
- box-sizing: border-box;
- padding: 0px 0 10px;
-}
-.control .el-button{
- width: 32px;
- height: 32px;
- border-radius: 8px;
- border: 1px solid #E8E8E8;
- background: #fff;
- padding: 0;
- color: #0166E2;
- font-size: 20px;
-}
-.list2-item{
- line-height: 22px;
- display: flex;
- margin-bottom: 12px;
- font-size: 14px;
+.right-3 {
+ height: 600px;
}
.right-3-tab{
padding: 20px 20px 10px 20px;
@@ -519,7 +493,7 @@
.right-3-list{
padding: 0 20px 20px 20px;
box-sizing: border-box;
- height: 390px;
+ height: 544px;
overflow-y: auto;
}
.list3-item{
@@ -625,17 +599,6 @@
padding: 8px 8px 16px;
display: flex;
flex-direction: column;
-}
-.search_thing {
- height: 50px;
- margin-bottom: 26px;
-}
-
-.search_label {
- width: 120px;
- font-size: 14px;
- text-align: left;
- margin-bottom: 10px;
}
>>>.el-calendar-day span{
display: inline-block;
--
Gitblit v1.9.3