Merge branch 'master' of http://192.168.0.105:10010/r/school-web

shuishen

2022-03-28 9844a68a70dc579fb6b22d41767ac0ee59b655d9

Merge branch 'master' of http://192.168.0.105:10010/r/school-web

 src/components/mobileActivity/index.vue

@@ -68,6 +68,7 @@
import moveWindow from "./move";
import { getdetail } from "@/api/mobile/hd/hd";
window.serviceMapSee = {};
window.onceServiceMap = null;
export default {
  name: "mobileActivity",
  computed: {
@@ -213,6 +214,16 @@
          //获取详细信息，来获取底图
          // console.log(this.showActivityData, "see");
          that.serviceMap = [];
          // if (that.serviceMap.length > 0) {
          //   for (let k in window.serviceMapSee) {
          //     if (window.serviceMapSee[k].flag) {
          //       global.viewer.imageryLayers.remove(
          //         window.serviceMapSee[k].layer
          //       );
          //     }
          //   }
          // }
          window.serviceMapSee = {};
          getdetail(this.showActivityData.opendata.id).then((res) => {
            let name = res.data.data.mapname.split(",");
            let url = res.data.data.url.split(",");
@@ -220,40 +231,43 @@
              let d = {
                flag: true,
                label: name[k],
                img: "/img/leftnav/way-checked.png",
                normal: "/img/leftnav/way.png",
                checked: "/img/leftnav/way-checked.png",
                layer: "wayLayer",
                imgSrc: "img/mobile/green.png",
                img: "/img/leftnav/monitor-checked.png",
                normal: "/img/leftnav/monitor.png",
                checked: "/img/leftnav/monitor-checked.png",
                imgSrc: "/img/leftnav/map-monitor.png",
                layer: "serviceMap" + that.serviceMap.length,
                url: url[k],
                to: "serviceMap",
              };
              // this.leftNavData.shift(d);
              this.serviceMap.push(d);
              // console.log(d, "see");
              // that.serviceMap.push(d);
              // window.serviceMapSee[d.layer] =
              //   global.DC.ImageryLayerFactory.createArcGisImageryLayer({
              //     url: url[k],
              //   });
              // global.viewer.addBaseLayer(window.serviceMapSee[d.layer], {
              //   iconUrl: "examples/images/icon/elec.png",
              //   name: d.layer,
              // });
            }
            // const baselayer_shaded =
            //   global.DC.ImageryLayerFactory.createArcGisImageryLayer({
            //     url: "https://services.arcgisonline.com/arcgis/rest/services/World_Physical_Map/MapServer",
            //   });
            // global.viewer.addBaseLayer(baselayer_shaded, {
            //   iconUrl: "examples/images/icon/elec.png",
            //   name: "电子",
            // });

            // console.log(window.serviceMapSee, "see");
            // }
              window.onceServiceMap =
                new global.DC.Namespace.Cesium.ArcGisMapServerImageryProvider({
                  url: url[k],
                });
              window.serviceMapSee[d.layer] = {
                flag: true,
                layer: global.viewer.imageryLayers.addImageryProvider(
                  window.onceServiceMap
                ),
                source: window.onceServiceMap,
              };
              window.onceServiceMap = null;
            }
          });
        };
      } else {
        // console.log(this.showActivity, "see");
        if (window.serviceMapSee != {}) {
          for (let k in window.serviceMapSee) {
            if (window.serviceMapSee[k].flag) {
              //如果是显示状态 就让他关闭
              global.viewer.imageryLayers.remove(window.serviceMapSee[k].layer);
            }
          }
          window.serviceMapSee == {};
        }
      }
    },
  },
@@ -335,7 +349,22 @@
        item.img = item.normal;
      }
      if (item.to == "serviceMap") {
        console.log(item);
        console.log(window.serviceMapSee[item.layer]);
        //清除
        if (!item.flag && window.serviceMapSee[item.layer].flag) {
          window.serviceMapSee[item.layer].flag = false;
          global.viewer.imageryLayers.remove(
            window.serviceMapSee[item.layer].layer
          );
        }
        // 显示
        if (item.flag && !window.serviceMapSee[item.layer].flag) {
          window.serviceMapSee[item.layer].flag = true;
          window.serviceMapSee[item.layer].layer =
            global.viewer.imageryLayers.addImageryProvider(
              window.serviceMapSee[item.layer].source
            );
        }
        return;
      }
      this.$store.commit("showLineOrPoint", {

 src/components/mobilemap/index.vue

@@ -134,8 +134,8 @@

      intervallayerNum: 15,
      frislayertHeight: 160, // 默认高度
      useSuofang: false, //是否缩放 true 去掉了缩放，
      addOthers: true, //加入了活动底图以及抚州底图
      useSuofang: false, //是否缩放 true 去掉了缩放， 抚州 false
      addOthers: true, //加入了活动底图以及抚州底图  抚州 true
    };
  },
  computed: {