zhangzengfei
2020-10-14 5f93eed344a797eb09018bb37df7d8ea0a1f1ec0
修复数据栈无法绘制区域的问题
2个文件已修改
48 ■■■■■ 已修改文件
src/pages/cameraAccess/components/SeparateRules.vue 37 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/cameraAccess/index/VideoManage.vue 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/cameraAccess/components/SeparateRules.vue
@@ -335,7 +335,7 @@
            this.stackFilesSize = 5;
            this.stackId = n;
            if (this.stackId) {
              console.log('getStackFiles')
              // console.log('getStackFiles')
              this.swipercanvasData = [];
              this.getStackFiles()
            }
@@ -346,14 +346,14 @@
  },
  methods: {
    prevClick () {
      console.log(this.swiperIndex)
      console.log(this.$refs.swiper.swiper.activeIndex)
      // console.log(this.swiperIndex)
      // console.log(this.$refs.swiper.swiper.activeIndex)
      if (this.swiperIndex == 0) {
        console.log('本次分页的第一条')
        // console.log('本次分页的第一条')
        //请求上一页
        if (this.stackFilesPage > 1) {
          this.stackFilesPage--;
          this.getStackFiles();
          this.getStackFiles(true);
        } else {
          this.$message({
            type: 'info',
@@ -364,16 +364,14 @@
      }
    },
    nextClick () {
      console.log(this.swiperIndex)
      console.log(this.$refs.swiper.swiper.activeIndex)
      if (this.swiperIndex == this.swipercanvasData.length - 1) {
        console.log('最后一张,加载更多')
        // console.log('最后一张,加载更多')
        //请求下一页
        this.stackFilesPage++;
        this.getStackFiles();
        this.getStackFiles(true);
      }
    },
    getStackFiles () {
    getStackFiles(onClick = false) {
      this.getStackFileLoading = true;
      let _this = this;
      findAllFileByStackId({ name: '', stackId: this.stackId, page: this.stackFilesPage, size: this.stackFilesSize, type: 0 }).then(res => {
@@ -390,20 +388,19 @@
                loading: false
              }
            });
            console.log(_this.swipercanvasData)
            console.log(this.swipercanvasData)
            this.swiperIndex = 0;
            this.$refs.swiper.swiper.activeIndex = 0;
          } else {
            console.log(this.swipercanvasData)
            if (onClick) {
            this.$message({
              type: 'info',
                type: 'warning',
              message: '已无更多数据!'
            });
          }
          }
        } else {
          console.log(this.swipercanvasData)
          // console.log(this.swipercanvasData)
          this.$message({
            type: 'error',
            message: '数据请求失败,请稍后重试!'
@@ -411,7 +408,7 @@
        }
        this.getStackFileLoading = false;
      }).catch(e => {
        console.log(e);
        // console.log(e);
        this.getStackFileLoading = false;
      });
    },
@@ -445,7 +442,13 @@
      }, 3000)
    },
    drawBaseImg () {
      if (Array.isArray(this.$refs.canvas)) {
        if (this.$refs.canvas.length > 0) {
          this.$refs.canvas[0].showModal();
        }
      } else {
      this.$refs.canvas.showModal();
      }
    },
    getCanvasData (data) {
      let polyon = { ...data };
@@ -1023,7 +1026,7 @@
  }
}
.el-loading-spinner {
  background: url('/images/cameraAccess/loading.gif') no-repeat;
  background: url("/images/cameraAccess/loading.gif") no-repeat;
  top: 50%;
  margin-top: -21px;
  width: calc(100% - 260px) !important;
src/pages/cameraAccess/index/VideoManage.vue
@@ -1,6 +1,12 @@
<template>
  <div class="s-video-manage">
    <el-tabs class="video-tab" ref="topTab" v-model="activeName" type="border-card" @tab-click="handleClick">
    <el-tabs
      class="video-tab"
      ref="topTab"
      v-model="activeName"
      type="border-card"
      @tab-click="handleClick"
    >
      <el-tab-pane
        :label="firstLabeName"
        name="camera-info"
@@ -108,14 +114,11 @@
    },
    "DataStackPool.selectedDir": {
      handler(node, oldNode) {
        console.log(this.activeName)
        console.log(node, '勾选本地视频')
        if (this.TreeDataPool.treeActiveName !== 'dataStack') {
          return
        }
        this.$nextTick(() => {
          if (this.activeName == "camera-info") {
            console.log("dataStackInfo.selectDir(node)")
            this.$refs.dataStackInfo.selectDir(node);
          } else if (this.activeName == "separate-rule" && node.length !== 0) {
            this.$refs.sepRule.initCameraData(node.id);