Merge branch 'fly' into xy-ly

src/views/components/carouselChart.vue

@@ -190,8 +190,8 @@ export default {
       canvas: null,
       ctx: null,
       imgpic: null,
-      color: "#00ff00",
+      color: "",
-      num: 5,
+      num: "",
       showBigpic: false,
       flagline: true,
     };
@@ -212,6 +212,8 @@ export default {
       .then((res) => {
         console.log(res);
         this.localPoints = res.data.list;
+        this.color = res.data.color;
+        this.num = res.data.boderWidth;
         this.drawline();
       })
       .catch((err) => {});

src/views/management/monitoringEquipment/photographicDevice/components/pictureTags.vue

@@ -93,7 +93,7 @@ export default {
       ctx: null,
       imgpic: null,
       drawingSurfaceImageData: "",
-      color: "#00ff00",
+      color: "#0000ff",
       num: 2,
       flag: false,
       x: 0,