解决冲突

liuyg

2021-06-02 029883129b3014a8cbd694fe09409bf4379c2cc2

解决冲突

 config.json

@@ -16,37 +16,35 @@
  "modeUrl": "http://www.sw797.com:801/gzsw3D/v2/data/mx/",
  "cesiumToken": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiI2ODUxMWQxMC1lNzZjLTRhZjktYmZiMS1lNWFmYWJkZWIwOTEiLCJpZCI6MTQxNzMsInNjb3BlcyI6WyJhc3IiLCJnYyJdLCJpYXQiOjE1NjQ5Njg5NzV9.ojKhhmjl8L0EtxsZC14LZgmXn5VVS0CRBCYuRK_DdIo",
  "authorizedCrossOriginDomains": [],
  "title": "智慧湾里三维电子沙盘",
  "title": "鄱阳湖数据一张图",
  "subtitle": "",
  "keepAppState": true,
  "logo": "",
  "geometryService": "https://utility.arcgisonline.com/arcgis/rest/services/Geometry/GeometryServer",
  "links": [
    {
  "links": [{
      "label": "",
      "url": ""
    }
  ],
  }],
  "widgetOnScreen": {
    "widgets": [
      {
        "uri": "themes/FoldableTheme/widgets/HeaderController/Widget",
        "position": {
          "left": 0,
          "top": 0,
          "right": 0,
          "height": 70,
          "relativeTo": "browser"
        }
      },
      {
    "widgets": [{
        "uri": "widgets/CommonBase/Widget"
      },

      {
        "uri": "widgets/Tool/Widget",
        "position": {
          "right": 154,
          "top": 20,
          "height": "32px",
          "width": "96px",
          "relativeTo": "map"
        }
      },
      {
        "uri": "widgets/Layermanagement/Widget",
        "position": {
          "right": 82,
          "top": 55,
          "top": 20,
          "height": "32px",
          "width": "72px",
          "relativeTo": "map"
@@ -56,22 +54,13 @@
        "uri": "widgets/Basemap/Widget",
        "position": {
          "right": 10,
          "top": 55,
          "top": 20,
          "height": "32px",
          "width": "72px",
          "relativeTo": "map"
        }
      },
      {
        "uri": "widgets/Tool/Widget",
        "position": {
          "right": 154,
          "top": 55,
          "height": "32px",
          "width": "96px",
          "relativeTo": "map"
        }
      },

      {
        "uri": "widgets/HelpButton/Widget",
        "position": {
@@ -164,6 +153,16 @@
          "height": "780px",
          "relativeTo": "map"
        }
      }, {
        "name": "我的标记",
        "uri": "widgets/Sign/Widget",
        "position": {
          "right": 10,
          "top": 96,
          "width": "320px",
          "height": "360px",
          "relativeTo": "map"
        }
      }
    ],
    "groups": [],
@@ -185,72 +184,85 @@
    },
    "imageryProviderViewModels": [
      {
        "name": "天地图影像",
        "tooltip": "天地图全球影像地图服务（国家测绘局）",
        "iconUrl": "images/basemaps/tiandituimage.png",
        "layers": [
          {
            "label": "天地图影像",
            "type": "wmts",
            "url": "http://t0.tianditu.gov.cn/img_w/wmts?tk=e9533f5acb2ac470b07f406a4d24b4f0",
            "layer": "img",
            "style": "default",
            "format": "tiles",
            "tileMatrixSetID": "w",
            "maximumLevel": 17
          },
          {
            "label": "天地图影像标注",
            "type": "wmts",
            "url": "http://t0.tianditu.gov.cn/cia_w/wmts?tk=e9533f5acb2ac470b07f406a4d24b4f0",
            "layer": "cia",
            "style": "default",
            "format": "tiles",
            "tileMatrixSetID": "w",
            "maximumLevel": 17
          }
        ]
      },
      {
        "name": "赣州电子地图",
        "tooltip": "赣州电子地图",
        "iconUrl": "images/basemaps/tianditushiliang.png",
        "layers": [
          {
            "label": "赣州电子地图",
            "type": "wmts",
            "url": "http://sw797.com:6080/arcgis/rest/services/GZHS/MapServer/WMTS",
            "layer": "GZHS",
            "style": "default",
            "format": "image/jpgpng",
            "tileMatrixSetID": "default028mm",
            "maximumLevel": 17
          }
        ]
      },
      {
        "name": "天地图矢量",
        "tooltip": "天地图矢量",
        "iconUrl": "images/basemaps/tianditushiliang.png",
        "layers": [
          {
            "label": "天地图矢量",
            "type": "SuperMap",
            "url": "http://61.131.223.3:8090/iserver/services/map-tianditu/rest/maps/矢量底图_经纬度",
            "maximumLevel": 16,
            "minimumLevel":0
          },
          {
            "label": "矢量L7L17",
            "type": "SuperMap",
            "url": "http://61.131.223.3:8090/iserver/services/map-arcgis-NCVECNCDLGCGCS2000BLL7L172019NEW/rest/maps/NCDLG_CGCS2000BL_L7L17_2019NEW",
            "maximumLevel": 16,
            "minimumLevel":0
          },
          {
            "label": "矢量L18L20",
            "type": "SuperMap",
            "url": "http://61.131.223.3:8090/iserver/services/map-arcgis-NCVECNCDLGDTCGCS2000BLL18L202019NEW/rest/maps/NCDLGDT_CGCS2000BL_L18L20_2019NEW",
            "maximumLevel": 19,
            "minimumLevel":0
            "type": "wmts",
            "url": "http://t0.tianditu.gov.cn/vec_w/wmts?tk=e9533f5acb2ac470b07f406a4d24b4f0",
            "layer": "vec",
            "style": "default",
            "format": "tiles",
            "tileMatrixSetID": "w",
            "maximumLevel": 17
          },
          {
            "label": "天地图矢量标注",
            "type": "SuperMap",
            "url": "http://61.131.223.3:8090/iserver/services/map-tianditu/rest/maps/矢量中文注记_经纬度",
            "maximumLevel": 19,
            "minimumLevel":0
            "type": "wmts",
            "url": "http://t0.tianditu.gov.cn/cva_w/wmts?tk=e9533f5acb2ac470b07f406a4d24b4f0",
            "layer": "cva",
            "style": "default",
            "format": "tiles",
            "tileMatrixSetID": "w",
            "maximumLevel": 17
          }
        ]
      },
      {
        "name": "天地图影像",
        "tooltip": "天地图影像",
        "iconUrl": "images/basemaps/tiandituimage.png",
        "name": "离线影像",
        "tooltip": "赣州市离线影像",
        "iconUrl": "images/basemaps/gzyx.png",
        "layers": [
          {
            "label": "天地图影像",
            "type": "SuperMap",
            "url": "http://61.131.223.3:8090/iserver/services/map-tianditu/rest/maps/影像底图_经纬度",
            "maximumLevel": 16,
            "minimumLevel":0
          },
          {
            "label": "影像L7L17",
            "type": "SuperMap",
            "url": "http://61.131.223.3:8090/iserver/services/map-arcgis-NCDOMNCDOMCGCS2000BLL7L172019NEW/rest/maps/NCDOM_CGCS2000BL_L7L17_2019NEW",
            "maximumLevel": 16,
            "minimumLevel":0
          },
          {
            "label": "影像L18L20",
            "type": "SuperMap",
            "url": "http://61.131.223.3:8090/iserver/services/map-arcgis-NCDOMNCDOMCGCS2000BLL18L202019NEW/rest/maps/NCDOM_CGCS2000BL_L18L20_2019NEW",
            "maximumLevel": 19,
            "minimumLevel":0
          },
          {
            "label": "天地图影像标注",
            "type": "SuperMap",
            "url": "http://61.131.223.3:8090/iserver/services/map-tianditu/rest/maps/影像中文注记_经纬度",
            "maximumLevel": 19,
            "minimumLevel":0
            "label": "赣州市离线影像",
            "type": "url",
            "url": "http://www.sw797.com:10011/gzsw3D/v2/data/wp/{z}/{x}/{y}.png"
          }
        ]
      }
@@ -266,7 +278,7 @@
        "name": "赣州地形",
        "tooltip": "由 普适科技 提供的赣州地形",
        "iconUrl": "images/basemaps/TerrainSTK.png",
        "url": "http://www.sw797.com:801/gzsw3D/v2/data/gzdx"
        "url": "http://www.sw797.com:10011/gzsw3D/v2/data/gzdx"
      }
    ],
    "mapOptions": {
@@ -307,36 +319,7 @@
        "relativeTo": "map"
      }
    },
    "widgets": [
      {
        "name": "景点介绍",
        "uri": "widgets/Scenic/Widget"
      },{
        "name": "旅游路线",
        "uri": "widgets/PathShow/Widget"
      },
      {
        "name": "飞行路线",
        "uri": "widgets/SuperMapFlyRoute/Widget",
        "position": {
          "left": 20,
          "top": 60,
          "width": "260px",
          "height": "64%",
          "relativeTo": "map"
        }
      }, {
        "name": "我的标记",
        "uri": "widgets/Sign/Widget",
        "position": {
          "left": 20,
          "top": 60,
          "width": "320px",
          "height": "360px",
          "relativeTo": "map"
        }
      }
    ],
    "widgets": [],
    "groups": []
  },
  "loadingPage": {

 index.html

@@ -116,27 +116,10 @@

        .index_query {
            position: absolute;
            left: 42%;
            left: 45%;
            top: 60px;
            z-index: 999;
            width: 300px;
            /* border: 1px seagreen solid; */
            display: flex;
            align-items: center;
            background-color: #fff;
            border-radius: 6px 6px 6px 6px;
        }

        .input-font {
            /* width: 3rem; */
            height: 35px;
            /* color: #fff; */
            display: flex;
            font-size: 16px;
            align-items: center;
            justify-content: center;
            border-right: 1px solid rgba(0, 0, 0, .2);
            cursor:pointer
            width: 260px;
        }

        #mh_query li {
@@ -171,13 +154,12 @@
            outline: 0;
            float: left;
            border: none;
            /* box-shadow: 0 2px 6px #3a3c42; */
            box-shadow: 0 2px 6px #3a3c42;
            border-top-left-radius: 2px;
            border-bottom-left-radius: 2px;
            color: #000;
            /* background-color: rgba(63, 72, 84, .7); */
            color: #fff;
            background-color: rgba(63, 72, 84, .7);
            border: none;
            border-radius: 0px 5px 5px 0px;
        }

        input::-webkit-input-placeholder {
@@ -189,7 +171,6 @@
            right: 0;
            height: 35px;
            cursor: pointer;
            /* border-radius: 0px 0px 5px 5px; */
        }

        .cesium-viewer-toolbar {
@@ -229,19 +210,12 @@
        <div id="jimu-layout-manager"></div>

        <div class="index_query">
            <!-- <div>
        <div>
            <input id="local_data" autocomplete="off" data-provide="typeahead" type="text" class="input-sm"
                   placeholder="输入关键字以搜索"/>
            <img class="input_img" src="images/query.png">
        </div>
        <div id="mh_query"></div> -->
            <div id="i-f-gjz" class="input-font"
                style="border-radius: 5px 0 0px 5px;width:4.7rem;background-color: #3E9FFC;color: #fff;">关键字</div>
            <div id="i-f-zb" class="input-font" style="width:3.5rem">坐标</div>
            <!-- <input type="text" placeholder="输入关键字以搜索" class="input-sm /> -->
            <input id="local_data" autocomplete="off" data-provide="typeahead" type="text" class="input-sm"
                placeholder="输入关键字以搜索" />
            <img class="input_img" src="images/query.png">
        <div id="mh_query"></div>
        </div>

    </div>
@@ -255,21 +229,10 @@
    window.Cesium = Cesium;
  </script> -->
    <script type="text/javascript" src="init.js"></script>
    <script>
<!-- <script>

        var indData = [];
        //关键字和坐标点击事件
        var states = 'gjz';
        $("#i-f-gjz").click(function () {
            console.log("gjz");
            $("#i-f-zb").css({'backgroundColor': '#fff','color': '#000'});
            $("#i-f-gjz").css({'backgroundColor': '#3E9FFC','color': '#fff'});
        })
        $("#i-f-zb").click(function () {
            console.log("zb");
            $("#i-f-gjz").css({'backgroundColor': '#fff','color': '#000'});
            $("#i-f-zb").css({'backgroundColor': '#3E9FFC','color': '#fff'});
        })
 
        //搜索点击事件
        $(".input_img").click(function () {
            var query = $("#local_data").val();
@@ -423,7 +386,6 @@
        }


    </script>
</script> -->
</body>

</html>

 widgets/Sign/css/style.css

@@ -7,6 +7,7 @@
  /* opacity      : .8; */
  color: rgb(238, 235, 235);
  font-size: 16px;
  display: none;
}

#sign_table {

 widgets/Tool/Widget.html

@@ -6,6 +6,7 @@
                <li><i></i> <span class="measure-tool">图上量算</span></li>
                <!--<li><i></i> <span class="rolling-tool">卷帘对比</span></li>-->
                <!--<li><i></i> <span class="location-tool">查询定位</span></li>-->
                <li><i></i> <span class="sign-tool">我的标记</span></li>
                <li><i></i> <span class="CoorPosition-tool">坐标定位</span></li>
                <li><i></i> <span class="MapPrinting-tool">地图打印</span></li>
                <li><i></i> <span class="RouteNavigate-tool">路线导航</span></li>