Bläddra i källkod

接口文档改变 , 优化了格式

linan 5 år sedan
förälder
incheckning
ba3b0922bc

+ 10 - 14
src/views/groupManagment/UnityTrace/UnityTrace.vue

@@ -71,11 +71,9 @@
 <script>
 import { reqReportList } from "@/api/groupManagment";
 
-import chart from "./charts/chart";
 import chart_a from "./charts/chart_a";
 import chart_b from "./charts/chart_b";
 import chart_c from "./charts/chart_c";
-import ae from "./charts/Ae";
 
 const pickerOptions = {
     shortcuts: [
@@ -139,10 +137,9 @@ const formatTime = function(time) {
 export default {
     name: "UnityTrace",
     components: {
-        // chart,
         "chart-a": chart_a,
         "chart-b": chart_b,
-        "chart-c": chart_c,
+        "chart-c": chart_c
     },
     data() {
         return {
@@ -153,15 +150,15 @@ export default {
             pickerOptions,
             value2: null,
             timer_1: null,
-            SData: formatTime( new Date(new Date().getTime() - 3600 * 1000 * 6) ), // 默认最近六小时 
-            EData: formatTime( new Date() )
+            SData: Math.floor(( new Date().getTime() - 3600 * 1000 * 6 ) / 1000), // 默认最近六小时 
+            EData: Math.ceil(new Date().getTime() / 1000)
         };
     },
     created() {
         // 一分钟更新一次   后端10分钟更新一次数据
         this.getReportList({start:this.SData, end:this.EData})
         this.timer_1 = setInterval(() => {
-            // this.getReportList({start:this.SData, end:this.EData})
+            this.getReportList({start:this.SData, end:this.EData})
             console.log("getReportList")
         }, 1000 * 60);
     },
@@ -172,16 +169,15 @@ export default {
     methods: {
         // 事件选择器值改变
         pickerChange(value) {
-            let SData = formatTime(value[0])
-            let EData = formatTime(value[1])
-            this.SData = SData
-            this.EData = EData
+            console.log(value)
+            this.SData = Math.floor(new Date(value[0]).getTime() / 1000)
+            this.EData = Math.ceil(new Date(value[1]).getTime() / 1000)
             console.log(SData, EData)
-            this.getReportList({start: SData, end: EData})
+            this.getReportList({ start: SData, end: EData})
         },
-        // 请求个体数据
+        // 请求个体数据  id  719   824
         getReportList(data) {
-            reqReportList(data)
+            reqReportList({ deviceId:824, ...data })
                 .then(res => {
                     let dateArr = [], 
                         animalTempArr = [],

+ 0 - 45
src/views/groupManagment/UnityTrace/charts/chart.vue

@@ -1,45 +0,0 @@
-<template>
-    <div class="hello">
-        <chart ref="chart1" :options="orgOptions" :auto-resize="true" class="chart"></chart>
-    </div>
-</template>
-
-<script>
-export default {
-    name: "HelloWorld",
-    data() {
-        return {
-            orgOptions: {}
-        };
-    },
-    mounted() {
-        this.orgOptions = {
-            xAxis: {
-                type: "category",
-                data: ["七分钟前", "六分钟前", "五分钟前", "四分钟前", "三分钟前", "两分钟前", "单前"]
-            },
-            yAxis: {
-                type: "value",
-                axisLabel: {
-                    formatter: "{value} °C"
-                },
-                scale: true
-            },
-            series: [
-                {
-                    data: [32.5,32.6,32.4,32.5,32.4,32.6,32.4],
-                    type: "line"
-                }
-            ]
-        };
-    }
-};
-</script>
-
-<style lang="scss" scoped>
-.hello{
-    .chart{
-        width: 100%;
-    }
-}
-</style>

+ 1 - 1
vue.config.js

@@ -16,7 +16,7 @@ module.exports = {
   devServer: {
     disableHostCheck: true
     // proxy: {
-    //   '/api': {                //这里最好有一个 /
+    //   '^/': {                //这里最好有一个 /
     //     target: 'http://115.238.57.190:8010',         // 服务器端接口地址
     //     ws: true,            //如果要代理 websockets,配置这个参数
     //     // 如果是https接口,需要配置这个参数