去掉所有mock数据

src/components/Camera/index.vue

@@ -3,7 +3,7 @@
     <div class="area">
       <a v-on:click="hideCameras">
         <Icon name="jiantou" :iconClass="`icon-jiantou-${showCarmera ? 'down' : 'left'}`" />
-        <span>{{ cameraLocation }}</span>
+        <span>{{ groupName }}</span>
       </a>
     </div>
     <a
@@ -12,7 +12,7 @@
       :key="item.cameraId"
       @click="handleClickCamera(item.cameraId)"
     >
-      <div :class="{item:true,active:activeId === item.cameraId}">
+      <div :class="{item:true,active:currentCameraId === item.cameraId}">
         <div class="item-name">
           <Icon name="camera" iconClass="icon-camera" />
           <span>{{ item.cameraName }}</span>
@@ -34,24 +34,16 @@ import BaseVue from "@/types/baseVue";
 @Component({ components: { Icon } })
 export default class Camera extends BaseVue {
   @Prop() private detail!: CameraItem[];
-  @Prop() private cameraLocation!: string;
-  @Prop() private groupIndex!: number;
+  @Prop() private groupName!: string;
+  @Prop() private currentCameraId!: number;
 
   showCarmera = true;
-  activeId = "";
-
-  mounted() {
-    if (this.groupIndex === 0 && this.detail && this.detail.length > 0) {
-      this.activeId = this.detail[0].cameraId;
-    }
-  }
 
   hideCameras(): void {
     this.showCarmera = !this.showCarmera;
   }
 
   handleClickCamera(cameraId: string): void {
-    this.activeId = cameraId;
     this.$emit("clickCamera", { cameraId });
   }
 }

src/service/CameraService.ts

@@ -25,10 +25,10 @@ export async function getCameraDogFormate(data: any) {
   //组装数据结构
   const ar = {}
   rp.data.forEach(d => {
-    if (!ar[d.cameraLocation]) {
-      ar[d.cameraLocation] = [d]
+    if (!ar[d.groupName]) {
+      ar[d.groupName] = [d]
     } else {
-      ar[d.cameraLocation].push(d)
+      ar[d.groupName].push(d)
     }
   })
   return ar

src/views/dashboard/index.vue

@@ -11,9 +11,9 @@
           <Camera
             v-for="(value,key,index) in cameras"
             :key="index"
-            :cameraLocation="key"
+            :groupName="key"
             :detail="value"
-            :groupIndex="index"
+            :currentCameraId="currentCameraId"
             @clickCamera="handleClickCamera"
           />
         </div>
@@ -99,6 +99,7 @@ export default class Dashboard extends BaseVue {
   };
   dogTotal = 0;
   currentDogId = 0;
+  currentCameraId = "";
 
   async created(): Promise<void> {
     this.queryCamera();
@@ -132,11 +133,20 @@ export default class Dashboard extends BaseVue {
       const myVideo = this_.$refs["my-video"];
       //@ts-ignore
       myVideo.onSrcChange(this_.videoUrl);
-      // const track = await getLabelInfo(dog.labelFileName);
-      // this.trackData = track.filter((d) => d.DogId === dog.id);
-      this.trackData = dogTrackData.filter(
+      try {
+        const track = await getLabelInfo(dog.labelFileName);
+        this.trackData = track.filter((d) => d.DogId == dog.id);
+      } catch (err) {
+        this.$message.error("下载标识文件失败");
+        console.log(
+          `%c-下载标识文件失败:${err}`,
+          "color: red; background: yellow;"
+        );
+        this_.trackData = dogTrackData.filter(
           (d) => d.DogId === "1440845582095753223" //this.dogData[0].id
         );
+      }
+      console.log("trackData", this.trackData);
       //@ts-ignore
       myVideo.onTrackDataChange(this_.trackData);
     }, 100);
@@ -151,6 +161,7 @@ export default class Dashboard extends BaseVue {
     this.dogTotal = rp.data.total;
   }
   handleClickCamera({ cameraId }) {
+    this.currentCameraId = cameraId;
     this.queryDogParam.cameraId = cameraId;
     this.queryDogInfo();
   }
@@ -167,6 +178,7 @@ export default class Dashboard extends BaseVue {
     for (const item in this.cameras) {
       if (this.cameras[item] && this.cameras[item].length > 0) {
         this.queryDogParam.cameraId = this.cameras[item][0].cameraId;
+        this.currentCameraId = this.queryDogParam.cameraId;
         await this.queryDogInfo();
         break;
       }

src/views/dogHot/index.vue

@@ -30,7 +30,6 @@ import { Vue, Component } from "vue-property-decorator";
 import { getCameraDog } from "@/service/CameraService";
 import dayjs from "dayjs";
 import { CameraItem } from "@/components/Camera/data";
-import cameraData from "@/mock/dogHot";
 
 declare const window: any;
 @Component({})
@@ -83,11 +82,13 @@ export default class DogHot extends Vue {
       beginTime: this.beginTime,
       endTime: this.endTime,
     });
+    if (rp.data && rp.data.length > 0) {
       this.heatmap.setDataSet({
-      data: cameraData, //this.convertHeatmapData(rp.data),
+        data: this.convertHeatmapData(rp.data),
         max: 100,
       });
     }
+  }
 
   convertHeatmapData(data: CameraItem[]) {
     const ar = [];

src/views/sysSetting/index.vue

@@ -148,7 +148,7 @@ export default class SysSetting extends BaseVue {
         validator: (rule, value, callback) => {
           const n = value * 1;
           setTimeout(() => {
-            if (!Number.isInteger(n)) {
+            if (Number.isNaN(n)) {
               callback(new Error("请输入数字值"));
             } else {
               if (n < -180 || n > 180) {
@@ -168,7 +168,7 @@ export default class SysSetting extends BaseVue {
         validator: (rule, value, callback) => {
           const n = value * 1;
           setTimeout(() => {
-            if (!Number.isInteger(n)) {
+            if (Number.isNaN(n)) {
               callback(new Error("请输入数字值"));
             } else {
               if (n < -85 || n > 85) {
@@ -186,7 +186,7 @@ export default class SysSetting extends BaseVue {
   queryData = {
     current: 1,
     groupName: "",
-    name: "",
+    cameraName: "",
     size: 10,
   };
 
@@ -257,7 +257,7 @@ export default class SysSetting extends BaseVue {
   }
   handleClean(): void {
     this.queryData.groupName = "";
-    this.queryData.name = "";
+    this.queryData.cameraName = "";
     this.queryCamera();
   }