图标更新

src/main/resources/application-dev.yml

@@ -7,9 +7,9 @@ spring:
     druid:
      #主库数据源
      master:
-        url: jdbc:postgresql://127.0.0.1:5432/DaAnPostgrsSQL
+        url: jdbc:postgresql://39.99.237.110:5432/DaAnPostgrsSQL?currentSchema=sdx
         username: postgres
-        password: 123456
+        password: wwkj@2136807
      #备数据源 #关闭
      slave:
         enabled: false

src/main/resources/static/maps/bs/s-cz.html

@@ -85,12 +85,12 @@
         var title = $('input[name="THENAME"]:checked')[0].attributes.title.value;
 
         var czTypes = $("#czTypes input:checked");
-        if (czTypes.length == 0) {
-            layer.msg('请至少选择一种材质！', {
-                icon: 7
-            });
-            return;
-        }
+        // if (czTypes.length == 0) {
+        //     layer.msg('请至少选择一种材质！', {
+        //         icon: 7
+        //     });
+        //     return;
+        // }
         var czs = "";
         for (let index = 0; index < czTypes.length; index++) {
             var checked = czTypes[index].checked;

src/main/resources/static/maps/js/configTest.js

@@ -1,9 +1,9 @@
 window.URL_CONFIG = {
     GX_Map_BaseUrl: "",
-    GX_Datas_BaseUrl: "http://localhost:8090/iserver/services/data-DaAnPostgrsSQL/rest/data",
-    GX_Plot_BaseUrl: "http://localhost:8090/iserver/services/plot-TY/rest/plot/",
-    GX_Spatialanalyst_BaseUrl: "http://localhost:8090/iserver/services/spatialAnalysis-DaAnPostgrsSQL/restjsr/spatialanalyst",
-    GX_TransportationAnalyst_BaseUrl: "http://localhost:8090/iserver/services/transportationAnalyst-DaAnPostgrsSQL/rest/networkanalyst/DaAnPostgrsSQL_Network@DaAnPostgrsSQL"
+    GX_Datas_BaseUrl: "http://39.99.237.110:8090/iserver/services/data-DaAnPostgrsSQL/rest/data",
+    GX_Plot_BaseUrl: "http://39.99.237.110:8090/iserver/services/plot-TY/rest/plot/",
+    GX_Spatialanalyst_BaseUrl: "http://39.99.237.110:8090/iserver/services/spatialAnalysis-DaAnPostgrsSQL/restjsr/spatialanalyst",
+    GX_TransportationAnalyst_BaseUrl: "http://39.99.237.110:8090/iserver/services/transportationAnalyst-DaAnPostgrsSQL/rest/networkanalyst/DaAnPostgrsSQL_Network@DaAnPostgrsSQL"
 };
 window.CONST_VALUES = {
     GX_CZ: ["全部", "铸铁", "钢","PVC","PE","PP-R", "铜", "陶制", "铝塑复合管", "不锈钢复合管", "PP-B"],
@@ -22,7 +22,7 @@ window.CONST_VALUES = {
             name: "供水管线",
             dataSourceName: "DaAnPostgrsSQL",
             dataSetName: "JSLK",
-            tableName: "SMDTV_153",
+            tableName: "SMDTV_344",
             dataType: "line",
             showZoom: 0,
             cols:"SMID:实体编号,BSM:管段编号,QSDH:起始点号,ZDDH:终点点号,CZ:材质,GJ:管径(MM),QDMS:起点埋深(M),ZDMS:终点埋深(M),CD:长度(M),DZMS:地址描述,LRRQ:录入日期,MSRQ:埋设日期,MSFS:埋设方式,GCBH:工程编号,ZCBH:资产编号,QSDW:权属单位,CQBH:测区编号,TCDW:探测单位,BZ:备注,FLDM:分类代码,TZBM:特征编码,ENABLED:是否可用,YL:压力,LX:流向"
@@ -32,7 +32,7 @@ window.CONST_VALUES = {
             name: "管网节点",
             dataSourceName: "DaAnPostgrsSQL",
             dataSetName: "JSJDPT",
-            tableName: "SMDTV_137",
+            tableName: "SMDTV_336",
             dataType: "point",
             showZoom: 15,
             cols:"SMID:实体编号,BSM:管点编号,FSW:附属物,TZ:特征,CZ:材质,GG:规格,DMGC:地面高程(M),DINGGC:管顶高程(M),MS:埋深(M),X:X坐标,Y:Y坐标,TFH:图幅号,DZMS:地址描述,LRRQ:录入日期,MSRQ:埋设日期,MSFS:埋设方式,QSDW:权属单位,SSBH:设施编号,XH:型号,BZ:备注,CQBH:测区编号,WTH:物探号,FLDM:分类代码,YL:压力,DMT:多媒体"
@@ -42,7 +42,7 @@ window.CONST_VALUES = {
             name: "水表",
             dataSourceName: "DaAnPostgrsSQL",
             dataSetName: "JSSBPT",
-            tableName: "SMDTV_151",
+            tableName: "SMDTV_343",
             dataType: "point",
             showZoom: 15,
             cols:"SMID:实体编号,BSM:管点编号,FSW:附属物,TZ:特征,CZ:材质,GG:规格,DMGC:地面高程(M),DINGGC:管顶高程(M),MS:埋深(M),X:X坐标,Y:Y坐标,TFH:图幅号,DZMS:地址描述,LRRQ:录入日期,MSRQ:埋设日期,MSFS:埋设方式,QSDW:权属单位,SSBH:设施编号,XH:型号,BZ:备注,CQBH:测区编号,WTH:物探号,FLDM:分类代码,YL:压力,DMT:多媒体"
@@ -52,7 +52,7 @@ window.CONST_VALUES = {
                 name: "消防栓",
                 dataSourceName: "DaAnPostgrsSQL",
                 dataSetName: "JSXFSPT",
-                tableName: "SMDTV_139",
+                tableName: "SMDTV_337",
                 dataType: "point",
                 showZoom: 15,
                 cols:"SMID:实体编号,BSM:管点编号,FSW:附属物,TZ:特征,CZ:材质,GG:规格,DMGC:地面高程(M),DINGGC:管顶高程(M),MS:埋深(M),X:X坐标,Y:Y坐标,TFH:图幅号,DZMS:地址描述,LRRQ:录入日期,MSRQ:埋设日期,MSFS:埋设方式,QSDW:权属单位,SSBH:设施编号,XH:型号,BZ:备注,CQBH:测区编号,WTH:物探号,FLDM:分类代码,YL:压力,DMT:多媒体"
@@ -62,7 +62,7 @@ window.CONST_VALUES = {
                 name: "阀门",
                 dataSourceName: "DaAnPostgrsSQL",
                 dataSetName: "JSFMPT",
-                tableName: "SMDTV_140",
+                tableName: "SMDTV_338",
                 dataType: "point",
                 showZoom: 15,
                 cols:"SMID:实体编号,BSM:管点编号,FSW:附属物,TZ:特征,CZ:材质,GG:规格,DMGC:地面高程(M),DINGGC:管顶高程(M),MS:埋深(M),X:X坐标,Y:Y坐标,TFH:图幅号,DZMS:地址描述,LRRQ:录入日期,MSRQ:埋设日期,MSFS:埋设方式,QSDW:权属单位,SSBH:设施编号,XH:型号,BZ:备注,CQBH:测区编号,WTH:物探号,FLDM:分类代码,YL:压力,DMT:多媒体"
@@ -72,7 +72,7 @@ window.CONST_VALUES = {
                 name: "加压站",
                 dataSourceName: "DaAnPostgrsSQL",
                 dataSetName: "JSJYZPT",
-                tableName: "SMDTV_142",
+                tableName: "SMDTV_340",
                 dataType: "point",
                 showZoom: 15,
                 cols:"SMID:实体编号,BSM:管点编号,FSW:附属物,TZ:特征,CZ:材质,GG:规格,DMGC:地面高程(M),DINGGC:管顶高程(M),MS:埋深(M),X:X坐标,Y:Y坐标,TFH:图幅号,DZMS:地址描述,LRRQ:录入日期,MSRQ:埋设日期,MSFS:埋设方式,QSDW:权属单位,SSBH:设施编号,XH:型号,BZ:备注,CQBH:测区编号,WTH:物探号,FLDM:分类代码,YL:压力,DMT:多媒体"
@@ -82,7 +82,7 @@ window.CONST_VALUES = {
                 name: "排气阀",
                 dataSourceName: "DaAnPostgrsSQL",
                 dataSetName: "JSPQFPT",
-                tableName: "SMDTV_150",
+                tableName: "SMDTV_342",
                 dataType: "point",
                 showZoom: 15,
                 cols:"SMID:实体编号,BSM:管点编号,FSW:附属物,TZ:特征,CZ:材质,GG:规格,DMGC:地面高程(M),DINGGC:管顶高程(M),MS:埋深(M),X:X坐标,Y:Y坐标,TFH:图幅号,DZMS:地址描述,LRRQ:录入日期,MSRQ:埋设日期,MSFS:埋设方式,QSDW:权属单位,SSBH:设施编号,XH:型号,BZ:备注,CQBH:测区编号,WTH:物探号,FLDM:分类代码,YL:压力,DMT:多媒体"
@@ -92,7 +92,7 @@ window.CONST_VALUES = {
                 name: "流量监测点",
                 dataSourceName: "DaAnPostgrsSQL",
                 dataSetName: "JSLLJPT",
-                tableName: "SMDTV_136",
+                tableName: "SMDTV_335",
                 dataType: "point",
                 showZoom: 15,
                 cols:"SMID:实体编号,BSM:管点编号,FSW:附属物,TZ:特征,CZ:材质,GG:规格,DMGC:地面高程(M),DINGGC:管顶高程(M),MS:埋深(M),X:X坐标,Y:Y坐标,TFH:图幅号,DZMS:地址描述,LRRQ:录入日期,MSRQ:埋设日期,MSFS:埋设方式,QSDW:权属单位,SSBH:设施编号,XH:型号,BZ:备注,CQBH:测区编号,WTH:物探号,FLDM:分类代码,YL:压力,DMT:多媒体"
@@ -102,7 +102,7 @@ window.CONST_VALUES = {
                 name: "压力监测点",
                 dataSourceName: "DaAnPostgrsSQL",
                 dataSetName: "JSCYJPT",
-                tableName: "SMDTV_143",
+                tableName: "SMDTV_341",
                 dataType: "point",
                 showZoom: 15,
                 cols:"SMID:实体编号,BSM:管点编号,FSW:附属物,TZ:特征,CZ:材质,GG:规格,DMGC:地面高程(M),DINGGC:管顶高程(M),MS:埋深(M),X:X坐标,Y:Y坐标,TFH:图幅号,DZMS:地址描述,LRRQ:录入日期,MSRQ:埋设日期,MSFS:埋设方式,QSDW:权属单位,SSBH:设施编号,XH:型号,BZ:备注,CQBH:测区编号,WTH:物探号,FLDM:分类代码,YL:压力,DMT:多媒体"
@@ -112,7 +112,7 @@ window.CONST_VALUES = {
                 name: "水质监测点",
                 dataSourceName: "DaAnPostgrsSQL",
                 dataSetName: "JSSZJPT",
-                tableName: "SMDTV_141",
+                tableName: "SMDTV_339",
                 dataType: "point",
                 showZoom: 15,
                 cols:"SMID:实体编号,BSM:管点编号,FSW:附属物,TZ:特征,CZ:材质,GG:规格,DMGC:地面高程(M),DINGGC:管顶高程(M),MS:埋深(M),X:X坐标,Y:Y坐标,TFH:图幅号,DZMS:地址描述,LRRQ:录入日期,MSRQ:埋设日期,MSFS:埋设方式,QSDW:权属单位,SSBH:设施编号,XH:型号,BZ:备注,CQBH:测区编号,WTH:物探号,FLDM:分类代码,YL:压力,DMT:多媒体"
@@ -122,7 +122,7 @@ window.CONST_VALUES = {
                 name: "水厂",
                 dataSourceName: "DaAnPostgrsSQL",
                 dataSetName: "JSSCPT",
-                tableName: "SMDTV_135",
+                tableName: "SMDTV_334",
                 dataType: "point",
                 showZoom: 15,
                 cols:"SMID:实体编号,BSM:管点编号,FSW:附属物,TZ:特征,CZ:材质,GG:规格,DMGC:地面高程(M),DINGGC:管顶高程(M),MS:埋深(M),X:X坐标,Y:Y坐标,TFH:图幅号,DZMS:地址描述,LRRQ:录入日期,MSRQ:埋设日期,MSFS:埋设方式,QSDW:权属单位,SSBH:设施编号,XH:型号,BZ:备注,CQBH:测区编号,WTH:物探号,FLDM:分类代码,YL:压力,DMT:多媒体"

src/main/resources/static/maps/js/mapsTest.js

@@ -823,12 +823,13 @@ panels.createPagesByFeatures = function(params) {
     while (tableNew.indexOf('THETABLEID') > -1)
         tableNew = tableNew.replace('THETABLEID', tableNewID);
     let cols = [];
-
+    var showZoom = 10;
     let lyrs = CONST_VALUES.GX_Datas;
     for (var index = 0; index < lyrs.length; index++) {
         var lyr = lyrs[index];
         if(dataSourceName == lyr.dataSourceName && dataSetName == lyr.dataSetName){
             var showCols = lyr.cols;
+            showZoom = lyr.showZoom;
             if(showCols != undefined && showCols != ""){
                 var colsArr = showCols.split(",");
                 for(var i = 0; i < colsArr.length; i++){
@@ -898,7 +899,7 @@ panels.createPagesByFeatures = function(params) {
                         style:{color: "#2e3a1f"},
                         onEachFeature: function (feature, layer) {
                             if(feature.geometry.type == 'Point'){
-                                map.flyTo(layer._latlng, 10);
+                                map.flyTo(layer._latlng, showZoom);
                             }
                             else{
                                 map.flyToBounds(layer._bounds);