Merge branch 'master' of http://192.168.0.115:3000/4dkankan/laser_v1

css/style.css

@@ -902,4 +902,16 @@ download-button .input-group .btn-primary {
 attributes-editor .form-group .btn-primary:hover {
     background: #15BEC8;
     border-color: #15BEC8;
+}
+
+.panel-body .panel-group .panel:nth-of-type(-n+5) {
+    display: none;
+}
+/* 导入/导出兴趣点 */
+poi-export-import .collapse-style{
+      display: none !important;
+}
+/* 第三方许可 */
+#third-party-licenses-button{
+    display: none;
 }

locat/addDataSet.html

@@ -167,8 +167,8 @@
         </div>
     </div>
 
-    <script src="https://cdn.jsdelivr.net/npm/vue/dist/vue.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/axios/dist/axios.min.js"></script>
+    <script src="./js/vue.js"></script>
+    <script src="./js/axios.min.js"></script>
     <script type="text/javascript">
         //输入经纬度就可以定位
     </script>
@@ -199,97 +199,14 @@
                     ageControlLocation2: [],
                     gpsControlCoordinate1: [],
                     gpsControlCoordinate2: [],
+                    sceneNum:'',
                 }
             },
             created() {
 
             },
             mounted() {
-                // document.getElementById("location1").addEventListener("click", location1);
-                // document.getElementById("location2").addEventListener("click", location2);
-                // // document.getElementById("clear").addEventListener("click", clearMap);
-
-                // function location1() {
-                //     let alon = document.getElementById("alon").value;
-                //     let alat = document.getElementById("alat").value;
-                //     addPoint(+alon, +alat, "锚点1")
-                // }
-
-                // function location2() {
-                //     let blon = document.getElementById("blon").value;
-                //     let blat = document.getElementById("blat").value;
-                //     addPoint(+blon, +blat, "锚点2")
-                // }
-
-
-                // let pointLayerArray = [];
-                // let map = initMap('map');
-
-                // function initMap(divid) {
-                //     let gaodeMapLayer = new ol.layer.Tile({
-                //         source: new ol.source.XYZ({
-                //             url: 'http://wprd03.is.autonavi.com/appmaptile?lang=zh_cn&size=1&style=7&x={x}&y={y}&z={z}' //高德地图切片访问路径
-                //         })
-                //     });
-
-                //     return new ol.Map({
-                //         layers: [gaodeMapLayer],
-                //         target: divid,
-                //         view: new ol.View({
-                //             center: ol.proj.fromLonLat([113.59569403794666,
-                //                 22.36656052911783
-                //             ]), //最初定位的位置
-                //             zoom: 4 //地图层级
-                //         })
-                //     });
-
-                // }
-
-                // function addPoint(lon, lat, text) {
-
-                //     let vector = new ol.source.Vector();
-                //     let vLayer = new ol.layer.Vector({
-                //         source: vector
-                //     })
-                //     vLayer.type = "con_point";
-                //     map.addLayer(vLayer)
-                //     pointLayerArray.push(vLayer);
-                //     let labelCoords = ol.proj.transform([lon, lat], "EPSG:4326", "EPSG:3857");
-                //     let feature = new ol.Feature({
-                //         geometry: new ol.geom.Point(labelCoords)
-                //     });
-                //     vector.addFeature(feature);
-                //     vLayer.setStyle(new ol.style.Style({
-                //         image: new ol.style.Circle({ //点样式
-                //             radius: 7,
-                //             fill: new ol.style.Fill({
-                //                 color: '#00c033'
-                //             })
-                //         }),
-                //         text: new ol.style.Text({
-                //             text: text,
-                //             font: '15px sans-serif',
-                //             offsetX: 5,
-                //             offsetY: -10,
-                //             fill: new ol.style.Fill({
-                //                 color: "#b9391f"
-                //             }),
-                //             stroke: new ol.style.Stroke({
-                //                 color: "#b9391f"
-                //             })
-                //         })
-                //     }))
-                //     map.getView().setCenter(labelCoords)
-                // }
-
-                // function clearMap() {
-                //     pointLayerArray.map(each => {
-                //         if (each.type == "con_point") {
-                //             map.removeLayer(each)
-                //         }
-                //     });
-                //     pointLayerArray = [];
-                // }
+               
 
 
 
@@ -319,7 +236,6 @@
                 },
                 clearMap() {
                     this.pointLayerArray.map(each => {
-                        alert(1)
                         if (each.type == "con_point") {
                             this.map.removeLayer(each)
                         }
@@ -392,7 +308,9 @@
                     this.gpsControlCoordinate2.push(this.blat - 0)
                     this.gpsControlCoordinate2.push(this.balt - 0)
 
+                    this.sceneNum = window.location.pathname.split('/')[2]
                 },
+                
                 commit() {
 
                     this.handleData()
@@ -401,7 +319,8 @@
                             ageControlLocation2: this.ageControlLocation2,
                             gpsControlCoordinate1: this.gpsControlCoordinate1,
                             gpsControlCoordinate2: this.gpsControlCoordinate2,
-                            id: 1
+                            sceneNum:this.sceneNum,
+                            // id: 1
                         })
                         .then(function (response) {
                             alert('成功')

template_menu/PickCoordSys.html

@@ -1,24 +1,24 @@
 <div>
     <div><img src onerror="IV.custom.init_coord()"></div>
     <div  id="editor_coord_froms" align="center" style="height:30px;margin-top: 10px;margin-left: 30px;margin-RIGHT:20px;">
-        <span >Ñ¡Ôñ×ø±êϵ£º</span>
-        <select id="select_coordinate" style="width:200px;" onchange="IV.custom.pick_coord(this)">£¨ÎÞ£©</select>
+        <span >选择�标系</span>
+        <select id="select_coordinate" style="width:200px;" onchange="IV.custom.pick_coord(this)">æ— </select>
         <br/>
 
         <div id="coord_editor">
             <hr style="background-color:grey" />
-            <span >ÐÂÔö×ø±êϵ</span>
+            <span>新增�标系</span>
             <div  style="margin-top:10px; width: 95%;height: 100px;padding: 10px; border: 1px solid grey;  border-radius: 4px;">
-                <span >Ãû³Æ£º</span>
+                <span>�称：</span>
                 <input id="coord_name" type="text"  style="margin-left:10px;">
                 <br/> <br/>
-                <span >proj4£º</span>
+                <span>proj4：</span>
                 <input id="coord_proj4" type="text"  style="margin-left:10px;">
             </div>
             <br/>
             <div align="center">
-                <input type="button" id="save_coord" value="±£´æ" style="width:100px;margin-top: 5px" onclick="IV.custom.save_coord_action()">
-                <input type="button" id="del_coord" value="ɾ³ý" style="width:100px;margin-top: 5px" onclick="IV.custom.del_coord_action()">
+                <input type="button" id="save_coord" value="�存" style="width:100px;margin-top: 5px" onclick="IV.custom.save_coord_action()">
+                <input type="button" id="del_coord" value="删除" style="width:100px;margin-top: 5px" onclick="IV.custom.del_coord_action()">
             </div>
     </div>
     </div>