Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue

shuishen

2021-02-03 57282048850d03ee8db828f586c364577a44f02f

 src/views/realTimePolice/real.vue

@@ -89,7 +89,7 @@
          icon="el-icon-location-outline"
          :size="size"
          :type="type"
          @click.stop="handleMap()"
          @click.stop="handleMap(row)"
          >定位</el-button
        >
      </template>
@@ -274,8 +274,18 @@
      </el-form>
    </el-dialog>

    <el-drawer title="电子地图" append-to-body="true" :visible.sync="showMap">
      <iframe :src="mapUrl" frameborder="0" width="100%" height="100%"></iframe>
    <el-drawer
      title="电子地图"
      append-to-body="true"
      :visible.sync="showMap"
    >
      <iframe
        id="mapDiv"
        src="https://s16s652780.51mypc.cn/jfpt/map/index.html"
        frameborder="0"
        width="100%"
        height="100%"
      ></iframe>
    </el-drawer>
  </basic-container>
</template>
@@ -294,7 +304,6 @@
  data() {
    return {
      showMap: false,
      mapUrl: "https://s16s652780.51mypc.cn/jfpt/map/index.html",
      hls: "",
      videoSource: "",
      dialogTableVisible: false,
@@ -613,7 +622,6 @@
      this.onLoad(this.page, this.query);
    },
    onLoad(page, params = {}) {
      debugger
      const { releaseTimeRange } = this.query;
      let values = {
        ...params
@@ -636,6 +644,11 @@
      getList(page.currentPage, page.pageSize, values).then(res => {
        const data = res.data.data;
        this.page.total = data.total;

        data.records.sort((a,b)=>{
          return a.jtype - b.jtype;
        });

        this.data = data.records;
        this.loading = false;
        this.selectionClear();
@@ -761,10 +774,11 @@
    handleHistory(row) {
      this.$router.push({ path: `/real/history/${row.deviceNumber}` });
    },
    handleMap() {
    handleMap(row) {
      this.showMap = true;
      this.mapUrl =
        "https://s16s652780.51mypc.cn/jfpt/map/index.html?openid=PatrolManagement";
      debugger;
      var sddsds = document.getElementById("mapDiv");
      document.getElementById("mapDiv").contentWindow.dw(row.jd,row.wd)
    },
    handleManage(row) {
      this.form = row;
@@ -780,7 +794,7 @@
      } else {
        axios({
          url:
            "http://192.168.0.102:1888/api/blade-jfpts/jingdan/jingdan/submit",
            "https://s16s652780.51mypc.cn/api/blade-jfpts/jingdan/jingdan/submit",
          method: "post",
          data: {
            rName: row.rname,
@@ -822,7 +836,7 @@
      var that = this;
      axios({
        url:
          "http://192.168.0.102:1888/api/blade-jfpts/alarm/alarm/deletejj?id=" +
          "https://s16s652780.51mypc.cn/api/blade-jfpts/alarm/alarm/deletejj?id=" +
          row.id,
        method: "post"
      }).then(function() {
@@ -834,7 +848,7 @@
      var that = this;
      axios({
        url:
          "http://192.168.0.102:1888/api/blade-jfpts/alarm/alarm/updateJtype?id=" +
          "https://s16s652780.51mypc.cn/api/blade-jfpts/alarm/alarm/updateJtype?id=" +
          row.id +
          "&czTime=" +
          row.czTime +