绘制多边形区域命名规则更新,数据栈按文件夹实例化绑定上传组件

hanbaoshan

2020-10-30 3ba1f2423a7ef6d8f7c3282ca5f5293bc0da4b45

绘制多边形区域命名规则更新,数据栈按文件夹实例化绑定上传组件

 src/components/canvas/Dialog.vue

@@ -1269,7 +1269,10 @@
      this.lineIndex = this.canvasData.line.length;
      this.rectIndex = this.canvasData.rect.length;
      this.arrowIndex = this.canvasData.arrow.length;
      this.polygonIndex = this.canvasData.polygon.length;
      //排除this.canvasData.polygon全部区域(全部区域的id就是摄像机的id)

      let filterPolygonArr = this.canvasData.polygon.filter(item=>item.id != this.TreeDataPool.selectedNode.id)
      this.polygonIndex = filterPolygonArr.length;
    },
    // 生成uuid
    getUuid() {

 src/components/subComponents/DataStackCard.vue

@@ -17,7 +17,7 @@
          <div slot="content">全部打开分析开关</div>
          <span class="bottom-text">
            <i class="iconfont iconquanbu" style="color:#3D68E1;" v-show="ValidCount.length"></i>
            {{ValidCount}}
            <i class="value">{{ValidCount}}</i>
          </span>
        </el-tooltip>
      </div>
@@ -27,10 +27,10 @@
          <span class="bottom-text">
            <i
              class="iconfont iconicon-test6"
              style="color:#3D68E1;margin-left: 15px;"
              style="color:#3D68E1;"
              v-show="InValidCount.length"
            ></i>
            {{InValidCount}}
            <i class="value">{{InValidCount}}</i>
          </span>
        </el-tooltip>
      </div>
@@ -40,7 +40,7 @@
          <div slot="content">正在执行分析处理</div>
          <span class="bottom-text">
            <i class="iconfont iconicon-test11" style="color:#3D68E1" v-show="RunningCount.length"></i>
            {{RunningCount}}
            <i class="value">{{RunningCount}}</i>
          </span>
        </el-tooltip>
      </div>
@@ -50,10 +50,10 @@
          <span class="bottom-text">
            <i
              :class="`iconfont ${fourIcon}`"
              style="color:#3D68E1;margin-left:15px;"
              style="color:#3D68E1;"
              v-show="NoDeal.length"
            ></i>
            {{NoDeal}}
            <i class="value">{{NoDeal}}</i>
          </span>
        </el-tooltip>
      </div>
@@ -156,6 +156,12 @@
    // left: 1px;
    // color: #666666;
    // font-size: 13px;
    .value{
      display: inline-block;
      width: 30px;
      font-size: 14px;
      font-style: normal;
    }
  }
  em {
    font-weight: 700;

 src/pages/cameraAccess/components/DataStackInfo.vue

@@ -105,15 +105,20 @@
        </el-tooltip>

        <!-- 文件上传 -->
        <el-button
          type="primary"
          size="small"
          :disabled="!DataStackPool.selectedDir.id"
          @click="handleUpload"
        >
          上传
          <i class="el-icon-upload el-icon--right"></i>
        </el-button>
        <template v-for="stack in DataStackPool.dirs">
          <el-button
            :class="`uploader_${stack.id}`"
            :key="stack.id"
            type="primary"
            size="small"
            v-show="stack.id == DataStackPool.selectedDir.id"
            :disabled="!DataStackPool.selectedDir.id"
            @click="handleUpload"
          >
            上传
            <i class="el-icon-upload el-icon--right"></i>
          </el-button>
        </template>
      </div>
    </div>

@@ -252,6 +257,7 @@
    <!-- 分页 -->
    <div class="pagination">
      <el-pagination
        v-show="activeName=='uploaded'"
        @size-change="handleSizeChange"
        @current-change="handleRefrashFileList"
        :current-page="page"
@@ -263,10 +269,11 @@
      ></el-pagination>
    </div>

    <!-- 文件上传组件 -->
    <file-uploader ref="uploader" v-show="activeName === 'uploading'" :attrs="attrs" />
    <!-- <file-uploader ref="uploader" v-show="activeName === 'uploading'" /> -->

    <template v-for="stack in DataStackPool.dirs">
      <!-- 文件上传组件 -->
      <file-uploader :ref="`uploader_${stack.id}`" :key="stack.id" v-show="activeName === 'uploading' && stack.id == DataStackPool.selectedDir.id" :attrs="attrs" />
      <!-- <file-uploader ref="uploader" v-show="activeName === 'uploading'" /> -->
    </template>
    <!-- 文件预览 -->
    <el-dialog title="查看文件" :visible.sync="previewDialog" width="500px">
      <video v-if="videoUrl" :src="videoUrl" controls style="margin-top: 12px;">您的浏览器不支持 video 标签。</video>
@@ -427,7 +434,6 @@
      handler (n, o) {
        //数据栈文件数量变更
        //更新独立场景数据栈文件
        console.log(this.$root.$children[0].$children[1].$refs['sepRule']);
        this.$root.$children[0].$children[1].$refs['sepRule'].getStackFiles();
      }
    },
@@ -437,7 +443,7 @@
        if (n == 1) {
          //仅支持上传视频
          this.$set(this.attrs, 'accept', ".mp4");
        }else if (n == 2) {
        } else if (n == 2) {
          //图片
          this.$set(this.attrs, 'accept', ".jpg,.jpeg,.png");
        }
@@ -605,10 +611,9 @@
      this.multipleSelection = [];
    },
    handleUpload () {

      console.log(this.DataStackPool.selectedDir.id)
      console.log(this.$refs.uploader.$refs.button.attrs)
      console.log(this.$refs.uploader.$refs.button.$refs.btn.click())
      debugger
      console.log(this.$refs[`uploader_${this.DataStackPool.selectedDir.id}`][0].$refs.button.$refs.btn.click())
    },
    handleRefrashFileList (val) {
      this.page = val;

 src/pages/cameraAccess/components/SeparateRules.vue

@@ -455,7 +455,7 @@
      polyon.camera_id = this.Camera.cameraId;
      savePolygon(polyon).then(rsp => {
        this.Camera.getPolygon();
        this.Camera.getCameraTask();
        //this.Camera.getCameraTask();
      });
    },
    refresh(url) {