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

shuishen

2021-02-01 e2fc08e09bdc3863cfae5495034b2c79be868d74

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

 src/api/client/client.js

@@ -2,7 +2,7 @@

export const getList = (current, size, params,pid) => {
  return request({
    url: '/api/blade-jfpts/equipment/equipment/page',
    url: '/api/blade-jfpts/equipment/equipment/pages',
    method: 'get',
    params: {
      ...params,

 src/views/realTimePolice/real.vue

@@ -89,7 +89,7 @@
          icon="el-icon-check"
          :size="size"
          :type="type"
          @click.stop="handleAdd11()"
          @click.stop="handleMap()"
          >定位</el-button
        >
      </template>
@@ -274,16 +274,15 @@
    </el-dialog>

    <el-drawer
      title="我是标题"
      title="电子地图"
      append-to-body="true"
      :visible.sync="qwe"
      :direction="direction"
      :visible.sync="showMap"
    >
      <iframe
        src="http://www.baidu.com"
        :src="mapUrl"
        frameborder="0"
        width="100%"
        height="600px"
        height="100%"
      ></iframe>
    </el-drawer>
  </basic-container>
@@ -302,12 +301,12 @@
export default {
  data() {
    return {
      qwe: false,
      showMap: false,
      mapUrl:"https://s16s652780.51mypc.cn/jfpt/map/index.html",
      hls: "",
      videoSource: "",
      dialogTableVisible: false,
      innerVisibleVideo: false,
      direction: "rtl",
      form: {},
      query: {},
      dateTime: [],
@@ -763,8 +762,9 @@
    handleHistory(row) {
      this.$router.push({ path: `/real/history/${row.deviceNumber}` });
    },
    handleAdd11() {
      this.qwe = true;
    handleMap() {
      this.showMap = true;
      this.mapUrl = "https://s16s652780.51mypc.cn/jfpt/map/index.html?openid=PatrolManagement"
    },
    handleManage(row) {
      this.form = row;