Merge remote-tracking branch 'origin/master'

zengh

2021-03-26 847d39af8b11a4c1f22e52ab3eb6bdcb82c8dc1a

Merge remote-tracking branch 'origin/master'

 src/page/index/logo.vue

@@ -384,22 +384,7 @@

          if (response.data.data.length > 0) {
            that.deviceId = response.data.data[0].id;
            if (
              response.data.data[0].waringType == "紧急求救" &&
              response.data.data[0].alarmId == userId
            ) {
              response.data.data[0].waringType = "一键求助";
              that.form = response.data.data[0];
              that.peopleList = [
                { label: that.form.oneContacts, value: that.form.onePhone },
                { label: that.form.twoContacts, value: that.form.twoPhone },
                { label: that.form.threeContacts, value: that.form.threePhone },
              ];
              that.peopleName = that.form.oneContacts;
              that.peoplePhone = that.form.onePhone;
              that.dialogTableVisible = true;
              // Recorder.getPermiRecorderssion().then(() => {});

              newAxios
                .post(
                  "/api_control",
@@ -416,6 +401,7 @@
                      `https://web.byisf.com:18000/GetPlayUrl?deviceCode=${that.form.serialNumber}&chl=${that.form.channelNumber}`
                    )
                    .then((result) => {
                    console.log(result)
                      axios({
                        method: "post",
                        url: `/api/blade-jfpts/rvideo/rVoid`,
@@ -427,6 +413,21 @@
                      }).then((resdata) => {});
                    });
                });
            if (
              response.data.data[0].waringType == "紧急求救" &&
              response.data.data[0].alarmId == userId
            ) {
              response.data.data[0].waringType = "一键求助";
              
              that.peopleList = [
                { label: that.form.oneContacts, value: that.form.onePhone },
                { label: that.form.twoContacts, value: that.form.twoPhone },
                { label: that.form.threeContacts, value: that.form.threePhone },
              ];
              that.peopleName = that.form.oneContacts;
              that.peoplePhone = that.form.onePhone;
              that.dialogTableVisible = true;
              // Recorder.getPermiRecorderssion().then(() => {});

              that.ofX = null;
              that.ofY = null;

 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;

 src/views/realTimePolice/realHistory.vue

@@ -41,7 +41,14 @@
          :size="size"
          :type="type"
          @click.stop="handleStart(row)"
          >视频回放
          >实时视频
        </el-button>
        <el-button
          icon="el-icon-video-camera-solid"
          :size="size"
          :type="type"
          @click.stop="oldStartVideo(row)"
          >查看历史
        </el-button>
      </template>
    </avue-crud>
@@ -58,6 +65,27 @@
        height="600px"
      ></iframe>
    </el-drawer>

    <el-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
        :src="vaddress"
        muted="muted"
        autoplay="autoplay"
        loop
        id="old_video"
        style="width: 100%; height: 100%; object-fit: fill"
        controls
      ></video>
    </el-dialog>
  </basic-container>
</template>

@@ -85,7 +113,7 @@
        height: "auto",
        indexLabel: "序号",
        calcHeight: 30,
        menuWidth: 160,
        menuWidth: 240,
        size: "mini",
        labelWidth: "100",
        dialogWidth: 950,
@@ -272,6 +300,8 @@
        ],
      },
      data: [],
      oldVideoSatart: false,
      vaddress: null,
    };
  },
  computed: {
@@ -561,9 +591,45 @@
    handleAdd11() {
      this.qwe = true;
    },
    oldStartVideo(row) {
      this.vaddress = row.vaddress;
      this.oldVideoSatart = true;
    },
  },
};
</script>

<style>

.old-video-dialog-box {
  position: absolute !important;
  top: 0px !important;
  left: 0px !important;
  right: 0px !important;
  bottom: 0px !important;
  margin: auto !important;
  width: 720px !important;
  z-index: 2200 !important;
}

.old-video-dialog-box .el-dialog {
  position: absolute !important;
  top: 0 !important;
  left: 0 !important;
  right: 0 !important;
  bottom: 0 !important;
  margin: auto !important;
  height: 558px;
  border-radius: 10px 10px 10px 10px;
}

.old-video-dialog-box .el-dialog .el-dialog__header {
  padding-top: 10px;
}

.old-video-dialog-box .el-dialog .el-dialog__body {
  padding: 10px !important;
  height: calc(100% - 44px);
  box-sizing: border-box;
}
</style>