提交

src/App.vue

@@ -14,7 +14,9 @@ export default {
     appHeader
   }
 }
-setToken(getQueryObject().token)
+if(getQueryObject().token){
+  setToken(getQueryObject().token)
+}
 
 </script>
 <style lang="scss" scoped>

src/layout/index.vue

@@ -8,8 +8,8 @@ export default {
     },
     methods:{
         back(){
-            // this.$router.push('/')
-            this.$router.go(-1)
+            this.$router.push('/')
+            // this.$router.go(-1)
         }
     }
 }

src/views/home/components/ReportTask.vue

@@ -2,10 +2,10 @@
     <div class="item report">
         <div class="title">
             <span class="name">巡检预警汇报</span>
-            <span class="number">24</span>
+            <span class="number">{{total}}</span>
         </div>
         <div class="container">                
-            <Vue3SeamlessScroll :list="data" class="scroll" hover>    
+            <Vue3SeamlessScroll :list="items" class="scroll" hover>    
                 <table>
                     <tr class="report-title">
                         <td>预警名称</td>
@@ -13,11 +13,11 @@
                         <td>等级</td>
                         <td>时间</td>
                     </tr>                                    
-                    <tr class="report-item" v-for="(item,index) in data">
-                        <td :title="item.name">{{ item.name }}</td>
-                        <td :title="item.level">{{ item.level }}</td>
-                        <td :title="item.level">{{ item.level }}</td>
-                        <td :title="item.time">{{ item.time }}</td>
+                    <tr class="report-item" v-for="(item,index) in items" :key="index">
+                        <td :title="item.hdangerTitle">{{ item.hdangerTitle }}</td>
+                        <td :title="item.status">完成</td>
+                        <td :title="item.level">{{ hdangerLevel(item.hdangerLevel) }}</td>
+                        <td :title="item.time">{{ item.dangerDeadline }}</td>
                     </tr> 
                 </table> 
             </Vue3SeamlessScroll>                      
@@ -26,18 +26,40 @@
 </template>
 <script>
 import { Vue3SeamlessScroll } from "vue3-seamless-scroll";
+import { getDangerByList } from '@/api/goaf/dangerApi'
 export default {
-    name:"ReportTask",
+    name:"WarnReport",
     components:{
         Vue3SeamlessScroll,
     },
-    props:{
-        data:{
-            type:Object,
-            default:{
-
-            }
+    data(){
+        return{
+            items:[],
+            total:0
         }
     },
+    created(){
+        this.load()
+    },
+    methods:{
+        formateStatus(val){
+            let status=['待处理','处理完成','已逾期']
+            return status[val]
+        },
+        hdangerLevel(val){
+            let status=['较低','一般','较大','重大']
+            return status[val]
+        },
+        load(){
+            getDangerByList({
+                // page: 1,
+                // limit: 10,
+                status: 4
+            }).then((res)=>{
+                this.total=res.data.length
+                this.items=res.data
+            })
+        }
+    }
 }
 </script>

src/views/home/components/WarnReport.vue

@@ -3,17 +3,17 @@
         <div class="title">
             <span class="name">今日巡检任务</span>
             <div class="number" style="color:#fff">
-                已完成：<span style="color: #44D7B6;">24</span>
-                <span style="padding-left: 15px;">未完成：5</span>
+                已完成：<span style="color: #44D7B6;">{{ complete }}</span>
+                <span style="padding-left: 15px;">未完成：{{ unfinished }}</span>
             </div>
         </div>
         <div class="container">
-            <Vue3SeamlessScroll :list="data" class="scroll" hover>    
-                <div class="report-item" v-for="(item,index) in data">
-                    <div class="name" :title="item.name||'{Ⅲ号-770-32003}:有无渗水情况'">{Ⅲ号-770-32003}:有无渗水情况</div>
+            <Vue3SeamlessScroll :list="items" class="scroll" hover>    
+                <div class="report-item" v-for="(item,index) in items" :key="index">
+                    <div class="name" :title="item.taskTitle">{{ item.taskTitle }}</div>
                     <div class="footer">
-                        <div class="status">已完成</div>
-                        <div class="user">张三</div>
+                        <div class="status">{{ formateStatus(item.status) }}</div>
+                        <div class="user">{{ item.handleAccountName }}</div>
                     </div>
                 </div> 
             </Vue3SeamlessScroll>              
@@ -22,17 +22,35 @@
 </template>
 <script>
 import { Vue3SeamlessScroll } from "vue3-seamless-scroll";
+import { goaftaskList } from '@/api/goaf/task'
 export default {
     name:"WarnReport",
     components:{
         Vue3SeamlessScroll,
     },
-    props:{
-        data:{
-            type:Object,
-            default:{
-
-            }
+    data(){
+        return{
+            items:[],
+            complete:0,
+            unfinished:0
+        }
+    },
+    created(){
+        this.load()
+    },
+    methods:{
+        formateStatus(val){
+            let status=['待处理','处理完成','已逾期']
+            return status[val]
+        },
+        load(){
+            goaftaskList().then((res)=>{
+                let complete=res.data.filter(item=>item.status===1)
+                let unfinished=res.data.length-complete
+                this.complete=complete
+                this.unfinished=unfinished
+                this.items=res.data
+            })
         }
     }
 }

src/views/home/index.vue

@@ -2,8 +2,8 @@
 <div class="home-view">
     <div class="side-left">
         <warning-statistics ref="warning-statistics" />
-        <report-task :data="reportData" />  
-        <warn-report :data="reportData" /> 
+        <report-task />  
+        <warn-report /> 
     </div>
     <div class="main">
         <Map ref="map" />