zhaobao 2 жил өмнө
parent
commit
80bd500fdf

+ 7 - 0
src/api/goaf/task.js

@@ -8,6 +8,13 @@ export function goaftaskList(params) {
     params
   })
 }
+export function goafTodaytaskList(params) {
+  return request({
+    url: "/goaf/goafcheckRecord/list",
+    method: 'GET',
+    params
+  })
+}
 
 // 分页获取任务列表
 export function getCheckTaskByPage(params) {

+ 13 - 13
src/views/home/components/TodayCheckTask.vue

@@ -22,7 +22,7 @@
 </template>
 <script>
 import { Vue3SeamlessScroll } from "vue3-seamless-scroll";
-import { goaftaskList } from '@/api/goaf/task'
+import { goafTodaytaskList,goaftaskList } from '@/api/goaf/task'
 import {getTime} from '@/utils'
 export default {
     name:"TodayCheckTask",
@@ -44,23 +44,23 @@ export default {
             let status=['待处理','处理完成','已逾期']
             return status[val]
         },
-        load(){
-            let date=new Date()
-            let y= date.getFullYear()
-            let m=date.getMonth()+1
-            let d=date.getDate()
+        async load(){
             let expectedStartDate=getTime()
             let expectedEndDate=getTime(1)
-            goaftaskList({
+            let unfinishedResult=await goaftaskList({
                 expectedStartDate,
                 expectedEndDate         
-            }).then((res)=>{
-                let complete=res.data.filter(item=>item.status===1).length
-                let unfinished=res.data.length-complete
-                this.complete=complete
-                this.unfinished=unfinished
-                this.items=res.data
             })
+            let completeResult=await goafTodaytaskList({
+                checkEndDate:expectedStartDate,
+                checkEndDate:expectedEndDate         
+            })
+            let unfinishedData=unfinishedResult.data
+            let completeData=completeResult.data
+            let items=unfinishedData.concat(completeData)
+                this.complete=completeData.length
+                this.unfinished=unfinishedData.length
+                this.items=items           
         }
     }
 }

+ 3 - 0
src/views/home/index.vue

@@ -116,6 +116,9 @@ import {
             })
         },
         mqttResponse(topic,message){
+            if(!message.includes('{')){
+                return
+            }
             let data=message?JSON.parse(Uint8ArrayToString(message)):''
             this.$nextTick(()=>{
                 if(topic==="topic/goaf/waring/person"){

+ 1 - 0
vue.config.js

@@ -6,6 +6,7 @@ module.exports = defineConfig({
   outputDir: 'dist',
   assetsDir: 'static',
   transpileDependencies: true,
+  productionSourceMap: false,
   configureWebpack: {
     resolve: {
       alias: {