南昌市物联网技防平台-前端
jxdnsong
2021-02-03 dcbd5d098edf9decdde645a4941500fdb59a6277
解决地图定位冲突
1 files modified
9 ■■■■■ changed files
src/views/realTimePolice/real.vue 9 ●●●●● patch | view | raw | blame | history
src/views/realTimePolice/real.vue
@@ -274,7 +274,6 @@
      </el-form>
    </el-dialog>
<<<<<<< HEAD
    <el-drawer
      title="电子地图"
      append-to-body="true"
@@ -287,10 +286,6 @@
        width="100%"
        height="100%"
      ></iframe>
=======
    <el-drawer title="电子地图" append-to-body="true" :visible.sync="showMap">
      <iframe :src="mapUrl" frameborder="0" width="100%" height="100%"></iframe>
>>>>>>> cb724c3b33fc850771b87c3c6feaa582addac56a
    </el-drawer>
  </basic-container>
</template>
@@ -309,10 +304,6 @@
  data() {
    return {
      showMap: false,
<<<<<<< HEAD
=======
      mapUrl: "https://s16s652780.51mypc.cn/jfpt/map/index.html",
>>>>>>> cb724c3b33fc850771b87c3c6feaa582addac56a
      hls: "",
      videoSource: "",
      dialogTableVisible: false,