优化

src/main/resources/application-dev.yml

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

src/main/resources/static/maps/css/stylesTest.css

@@ -251,7 +251,7 @@
         position: absolute;
         bottom: -50px;
         height: 120px;
-        width: 1070px;
+        width: 980px;
         left: calc(50% - 500px);
         border-radius: 60px;
         z-index: 8001;

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

@@ -1,18 +1,18 @@
 window.URL_CONFIG = {
     GX_Map_BaseUrl: "",
-    GX_Datas_BaseUrl: "http://39.99.237.110:8090/iserver/services/data-DaAnPostgrsSQL/rest/data",
+    GX_Datas_BaseUrl: "http://39.99.237.110:8090/iserver/services/data-weiweiGIS110/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"
+    GX_Spatialanalyst_BaseUrl: "http://39.99.237.110:8090/iserver/services/spatialAnalysis-weiweiGIS110/restjsr/spatialanalyst",
+    GX_TransportationAnalyst_BaseUrl: "http://39.99.237.110:8090/iserver/services/transportationAnalyst-weiweiGIS110/rest/networkanalyst/weiweiGIS110_Network@weiweiGIS110"
 };
 window.CONST_VALUES = {
     GX_CZ: ["全部", "铸铁", "钢","PVC","PE","PP-R", "铜", "陶制", "铝塑复合管", "不锈钢复合管", "PP-B"],
     GX_GJ: ["全部", "110","160","200","300","400", "500", "600", "700", "800", "900", "1000"],
     GX_GK: ["全部", "200×200", "300×300", "400×400", "500×500", "600×600", "800×800", "1000×1000"],
-    GX_DataSourceName: "DaAnPostgrsSQL",
-    GX_DataSetName: "JSLK",
-    JD_DataSourceName: "DaAnPostgrsSQL",
-    JD_DataSetName: "JSJDPT",
+    GX_DataSourceName: "weiweiGIS110",
+    GX_DataSetName: "gsGX",
+    JD_DataSourceName: "weiweiGIS110",
+    JD_DataSetName: "gsGD",
     SP_Min: "1.00",
     CZ_Min: "0.11",
     QUERY_BufferDistance: "1",
@@ -20,9 +20,9 @@ window.CONST_VALUES = {
         [{
             id: "waterLine",
             name: "供水管线",
-            dataSourceName: "DaAnPostgrsSQL",
-            dataSetName: "JSLK",
-            tableName: "SMDTV_344",
+            dataSourceName: "weiweiGIS110",
+            dataSetName: "gsGX",
+            tableName: "SMDTV_5",
             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:流向"
@@ -30,9 +30,9 @@ window.CONST_VALUES = {
         {
             id: "waterPoint",
             name: "管网节点",
-            dataSourceName: "DaAnPostgrsSQL",
-            dataSetName: "JSJDPT",
-            tableName: "SMDTV_336",
+            dataSourceName: "weiweiGIS110",
+            dataSetName: "dvJD",
+            tableName: "SMDTV_9",
             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:多媒体"
@@ -40,9 +40,9 @@ window.CONST_VALUES = {
         {
             id: "waterMeter",
             name: "水表",
-            dataSourceName: "DaAnPostgrsSQL",
-            dataSetName: "JSSBPT",
-            tableName: "SMDTV_343",
+            dataSourceName: "weiweiGIS110",
+            dataSetName: "dvSB",
+            tableName: "SMDTV_15",
             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:多媒体"
@@ -50,9 +50,9 @@ window.CONST_VALUES = {
             {
                 id: "xfsPoint",
                 name: "消防栓",
-                dataSourceName: "DaAnPostgrsSQL",
-                dataSetName: "JSXFSPT",
-                tableName: "SMDTV_337",
+                dataSourceName: "weiweiGIS110",
+                dataSetName: "dvXFS",
+                tableName: "SMDTV_11",
                 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:多媒体"
@@ -60,9 +60,9 @@ window.CONST_VALUES = {
             {
                 id: "fmPoint",
                 name: "阀门",
-                dataSourceName: "DaAnPostgrsSQL",
-                dataSetName: "JSFMPT",
-                tableName: "SMDTV_338",
+                dataSourceName: "weiweiGIS110",
+                dataSetName: "dvFM",
+                tableName: "SMDTV_10",
                 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:多媒体"
@@ -70,9 +70,9 @@ window.CONST_VALUES = {
             {
                 id: "jyzPoint",
                 name: "加压站",
-                dataSourceName: "DaAnPostgrsSQL",
-                dataSetName: "JSJYZPT",
-                tableName: "SMDTV_340",
+                dataSourceName: "weiweiGIS110",
+                dataSetName: "dvJY",
+                tableName: "SMDTV_28",
                 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:多媒体"
@@ -80,9 +80,9 @@ window.CONST_VALUES = {
             {
                 id: "pqfPoint",
                 name: "排气阀",
-                dataSourceName: "DaAnPostgrsSQL",
-                dataSetName: "JSPQFPT",
-                tableName: "SMDTV_342",
+                dataSourceName: "weiweiGIS110",
+                dataSetName: "dvPQF",
+                tableName: "SMDTV_17",
                 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:多媒体"
@@ -90,9 +90,9 @@ window.CONST_VALUES = {
             {
                 id: "cldPoint",
                 name: "流量监测点",
-                dataSourceName: "DaAnPostgrsSQL",
-                dataSetName: "JSLLJPT",
-                tableName: "SMDTV_335",
+                dataSourceName: "weiweiGIS110",
+                dataSetName: "dvLL",
+                tableName: "SMDTV_13",
                 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:多媒体"
@@ -100,9 +100,9 @@ window.CONST_VALUES = {
             {
                 id: "cydPoint",
                 name: "压力监测点",
-                dataSourceName: "DaAnPostgrsSQL",
-                dataSetName: "JSCYJPT",
-                tableName: "SMDTV_341",
+                dataSourceName: "weiweiGIS110",
+                dataSetName: "dvYL",
+                tableName: "SMDTV_12",
                 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:多媒体"
@@ -110,9 +110,9 @@ window.CONST_VALUES = {
             {
                 id: "szdPoint",
                 name: "水质监测点",
-                dataSourceName: "DaAnPostgrsSQL",
-                dataSetName: "JSSZJPT",
-                tableName: "SMDTV_339",
+                dataSourceName: "weiweiGIS110",
+                dataSetName: "dvSZ",
+                tableName: "SMDTV_14",
                 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:多媒体"
@@ -120,9 +120,9 @@ window.CONST_VALUES = {
             {
                 id: "scPoint",
                 name: "水厂",
-                dataSourceName: "DaAnPostgrsSQL",
-                dataSetName: "JSSCPT",
-                tableName: "SMDTV_334",
+                dataSourceName: "weiweiGIS110",
+                dataSetName: "dvSC",
+                tableName: "SMDTV_16",
                 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/templates/daAnGis.html

@@ -209,9 +209,9 @@
         <div class="bottom-bar-item" id="tool-ltfx">
             <div class="bottom-bar-item-ltfx"></div><span>连通分析</span>
         </div>
-        <div class="bottom-bar-item" id="tool-layerEdit">
-            <div class="bottom-bar-item-bj"></div><span>启动编辑</span>
-        </div>
+<!--        <div class="bottom-bar-item" id="tool-layerEdit">-->
+<!--            <div class="bottom-bar-item-bj"></div><span>启动编辑</span>-->
+<!--        </div>-->
         <div class="bottom-bar-item" id="tool-layerCtrl">
             <div class="bottom-bar-item-layers"></div><span>图层管理</span>
         </div>