Merge remote-tracking branch 'origin/master'

zengh

2021-03-26 847d39af8b11a4c1f22e52ab3eb6bdcb82c8dc1a

 src/views/policeTracking/policeTracking.vue

@@ -502,12 +502,13 @@
      ></iframe>

      <el-dialog
        class="ss-video-dialog"
        class="old-video-dialog-box"
        width="100%"
        title="历史回放"
        :visible.sync="oldVideoSatart"
        :close-on-press-escape="false"
        :close-on-click-modal="false"
        @close="vaddress = ''"
        append-to-body
      >
        <video
@@ -607,7 +608,6 @@
      baseUrl: "",
      oldVideoSatart: false,
      vaddress: null,
      peopleListX: [],
    };
  },
  created() {
@@ -790,9 +790,7 @@
    getList() {
      var that = this;
      axios
        .get(
          `/api/blade-user/page?current=1&size=9999&work_status=&deptId=`
        )
        .get(`/api/blade-user/page?current=1&size=9999&work_status=&deptId=`)
        .then(function (res) {
          that.tableData = [];
          var i = 0;