hanbaoshan
2020-09-08 eac5d05a36dd2c1b388bc401166af53716f11771
底库查看详情默认时间修改,实时监控区域比例调整
3个文件已修改
22 ■■■■ 已修改文件
src/components/canvas/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/player/index.vue 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/library/components/personList.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/canvas/index.vue
@@ -103,7 +103,7 @@
      ctx: null,
      visible: false,
      baseImg: undefined,
      showProportion: 1.71
      showProportion: 1.666
    };
  },
  watch: {
src/components/player/index.vue
@@ -62,7 +62,8 @@
        arrow: [],
        polygon: []
      },
      showProportion: 3.65,
      showProportion: 3.2,
      showProportionY: 3.58,
      canvas: null,
      ctx: null
    };
@@ -294,15 +295,15 @@
        }
        _this.ctx.strokeStyle = "yellow";
        _this.ctx.beginPath();
        _this.ctx.moveTo(v.location[0].x / _this.showProportion, v.location[0].y / _this.showProportion);
        _this.ctx.moveTo(v.location[0].x / _this.showProportion, v.location[0].y / _this.showProportionY);
        for (let i = 1; i < v.location.length; i++) {
          _this.ctx.lineTo(v.location[i].x / _this.showProportion, v.location[i].y / _this.showProportion);
          _this.ctx.lineTo(v.location[i].x / _this.showProportion, v.location[i].y / _this.showProportionY);
        }
        _this.ctx.closePath();
        _this.ctx.stroke();
        _this.showRemarks(
          v.location[v.location.length - 1].x / _this.showProportion,
          v.location[v.location.length - 1].y / _this.showProportion,
          v.location[v.location.length - 1].y / _this.showProportionY,
          v.name
        );
        _this.canvas.style.cursor = "default";
@@ -316,15 +317,15 @@
          // 将当前元素标红
          _this.ctx.strokeStyle = "red";
          _this.ctx.beginPath();
          _this.ctx.moveTo(v.location[0].x / _this.showProportion, v.location[0].y / _this.showProportion);
          _this.ctx.moveTo(v.location[0].x / _this.showProportion, v.location[0].y / _this.showProportionY);
          for (let i = 1; i < v.location.length; i++) {
            _this.ctx.lineTo(v.location[i].x / _this.showProportion, v.location[i].y / _this.showProportion);
            _this.ctx.lineTo(v.location[i].x / _this.showProportion, v.location[i].y / _this.showProportionY);
          }
          _this.ctx.closePath();
          _this.ctx.stroke();
          _this.showRemarks(
            v.location[v.location.length - 1].x / _this.showProportion,
            v.location[v.location.length - 1].y / _this.showProportion,
            v.location[v.location.length - 1].y / _this.showProportionY,
            v.name
          );
          _this.canvas.style.cursor = "pointer";
@@ -393,7 +394,8 @@
    this.$nextTick(()=>{
      this.canvas = this.$refs.areaCanvas;
      this.ctx = this.canvas.getContext("2d");
      this.ctx.lineWidth = '1'
      this.ctx.lineWidth = 1;
      this.initArea()
     
    })
src/pages/library/components/personList.vue
@@ -543,7 +543,7 @@
export default {
  data() {
    return {
      timeRange: [new Date(2020, 7, 25, 8), new Date()],
      timeRange: [new Date(2020, 7, 25, 8), new Date(new Date().setHours(23,59,59))],
      memberInfo: {
        personName: '',
        sex: '',