Merge branch 'dev' into dev_tides

Crunchy

2025-04-29 e5454b769d44a34af423bf87ac8a740bf8c20341

 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 {
@@ -195,6 +201,12 @@
    // 跳转页面
    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}`
@@ -353,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