1、广汉燃气更改-zjz

src/configure.ts

@@ -1886,7 +1886,7 @@ var AppX = {
                     {
                         "key": "poi1",
                         "name": "广汉注记",
-                        "url": "http://192.168.2.246:6080/arcgis/rest/services/deyang/POI_QY_DEYANG/MapServer"
+                        "url": "http://218.200.166.203:8035/arcgis/rest/services/deyang/POI_QY_DEYANG/MapServer"
                     }
                 ]
             },
@@ -1897,7 +1897,7 @@ var AppX = {
                     {
                         "key": "grid1",
                         "name": "广汉网格",
-                        "url": "http://192.168.2.246:6080/arcgis/rest/services/deyang/BEIJING_GRID/MapServer"
+                        "url": "http://218.200.166.203:8035/arcgis/rest/services/deyang/BEIJING_GRID/MapServer"
                     }
                 ]
             },
@@ -1908,7 +1908,7 @@ var AppX = {
                     {
                         "key": "privateterrain1",
                         "name": "广汉地形",
-                        // "url": "http://192.168.2.246:6080/arcgis/rest/services/deyang/DXT_QY_DEYANG/MapServer",
+                        // "url": "http://218.200.166.203:8035/arcgis/rest/services/deyang/DXT_QY_DEYANG/MapServer",
                         "url": "http://218.200.166.203:1111/arcgis/rest/services/dyrq/DeYang_Vector/MapServer"
                     }
                 ]
@@ -1932,7 +1932,7 @@ var AppX = {
                     {
                         "key": "zhuantitu1",
                         "name": "广汉专题图",
-                        "url": "http://192.168.2.246:6080/arcgis/rest/services/dyrq/PIPE_QY_DYRQ_DYNAMIC/MapServer"
+                        "url": "http://218.200.166.203:8035/arcgis/rest/services/dyrq/PIPE_QY_DYRQ_DYNAMIC/MapServer"
                     }
                 ]
             },
@@ -1942,7 +1942,7 @@ var AppX = {
                     {
                         "groupname": "geometry1",
                         "name": "几何分析服务",
-                        "url": "http://192.168.2.246:6080/arcgis/rest/services/Utilities/Geometry/GeometryServerf"
+                        "url": "http://218.200.166.203:8035/arcgis/rest/services/Utilities/Geometry/GeometryServerf"
                     }
                 ]
             },
@@ -1952,7 +1952,7 @@ var AppX = {
                     {
                         "key": "apiburstpipe1",
                         "name": "爆管分析服务",
-                        // "url": "http://192.168.2.246:6080/arcgis/rest/services/deyang/tftools/GPServer/BurstPipeAnalyzenanbu"
+                        // "url": "http://218.200.166.203:8035/arcgis/rest/services/deyang/tftools/GPServer/BurstPipeAnalyzenanbu"
                         "url": "http://218.200.166.203:8035/arcgis/rest/services/dyrq/BurstPipeAnalyzeRQ/GPServer/BurstPipeAnalyzeRQ"
                     }
                 ]
@@ -1963,7 +1963,7 @@ var AppX = {
                     {
                         "key": "apiconnectedpipe1",
                         "name": "连通性分析服务",
-                        "url": "http://192.168.2.246:6080/arcgis/rest/services/deyang/tftools/GPServer/ConnectedAnalyzenanbu"
+                        "url": "http://218.200.166.203:8035/arcgis/rest/services/dyrq/ShutOffValveExtendRQ/GPServer/ShutOffValveExtendRQ"
                     }
                 ]
             },
@@ -1973,7 +1973,7 @@ var AppX = {
                     {
                         "key": "apiextentvalve1",
                         "name": "扩展关阀分析服务",
-                        "url": "http://192.168.2.246:6080/arcgis/rest/services/deyang/tftools/GPServer/ShutOffValveExtendbinzhou"
+                        "url": "http://218.200.166.203:8035/arcgis/rest/services/deyang/tftools/GPServer/ShutOffValveExtendbinzhou"
                     }
                 ]
             },
@@ -1983,7 +1983,7 @@ var AppX = {
                     {
                         "key": "apipipepath1",
                         "name": "路径分析服务",
-                        "url": "http://192.168.2.246:6080/arcgis/rest/services/deyang/tftools/GPServer/PathAnalyzenanbu"
+                        "url": "http://218.200.166.203:8035/arcgis/rest/services/dyrq/PathAnalyzeRQ/GPServer/PathAnalyzeRQ"
                     }
                 ]
             },
@@ -1993,14 +1993,14 @@ var AppX = {
                     {
                         "key": "filterMapRQ",
                         "name": "图层过滤服务",
-                        "url": "http://192.168.2.246:6080/arcgis/rest/services/dyrq/FilterMapRQ2/GPServer/FilterMapRQ",
-                        // "mapServerUrl": "http://192.168.2.246:6080/arcgis/rest/services/dyrq/FilterMapRQ2/MapServer"
+                        "url": "http://218.200.166.203:8035/arcgis/rest/services/dyrq/FilterMapRQ/GPServer/FilterMapRQ",
+                        // "mapServerUrl": "http://218.200.166.203:8035/arcgis/rest/services/dyrq/FilterMapRQ2/MapServer"
                     },
                     {
                         "key": "filterMapRQ2",
                         "name": "图层过滤服务2",
-                        "url": "http://192.168.2.246:6080/arcgis/rest/services/dyrq/FilterMapRQ2/MapServer",
-                        // "mapServerUrl": "http://192.168.2.246:6080/arcgis/rest/services/dyrq/FilterMapRQ2/MapServer"
+                        "url": "http://218.200.166.203:8035/arcgis/rest/services/dyrq/FilterMapRQ/MapServer",
+                        // "mapServerUrl": "http://218.200.166.203:8035/arcgis/rest/services/dyrq/FilterMapRQ2/MapServer"
                     }
                 ]
             },
@@ -2010,7 +2010,7 @@ var AppX = {
                     {
                         "key": "vectorprint1",
                         "name": "矢量打印服务",
-                        "url": "http://192.168.2.246:6080/arcgis/rest/services/TFPrint/GPServer/TFPrint"
+                        "url": "http://218.200.166.203:8035/arcgis/rest/services/TFPrint/GPServer/TFPrint"
                     }
                 ]
             },
@@ -2020,7 +2020,7 @@ var AppX = {
                     {
                         "key": "createversion",
                         "name": "版本创建",
-                        "url": "http://192.168.2.246:6080/arcgis/rest/services/dyrq/TFSDEVersion/GPServer/TFCreateVersion",
+                        "url": "http://218.200.166.203:8035/arcgis/rest/services/dyrq/TFSDEVersion/GPServer/TFCreateVersion",
                     }
                 ]
             },
@@ -2030,7 +2030,7 @@ var AppX = {
                     {
                         "key": "deleteversion",
                         "name": "版本创建",
-                        "url": "http://192.168.2.246:6080/arcgis/rest/services/dyrq/TFSDEVersion/GPServer/TFDeleteVersion",
+                        "url": "http://218.200.166.203:8035/arcgis/rest/services/dyrq/TFSDEVersion/GPServer/TFDeleteVersion",
                     }
                 ]
             },
@@ -2040,7 +2040,7 @@ var AppX = {
                     {
                         "key": "rasterprint1",
                         "name": "栅格打印",
-                        "url": "http://192.168.2.246:6080/arcgis/rest/services/Utilities/PrintingTools/GPServer/Export%20Web%20Map%20Task"
+                        "url": "http://218.200.166.203:8035/arcgis/rest/services/Utilities/PrintingTools/GPServer/Export%20Web%20Map%20Task"
                     }
                 ]
             },
@@ -2066,12 +2066,13 @@ var AppX = {
             },
             "dyxzq": {
                 "name": "行政区划",
-                "type": "tiled",
+                "type": "dynamic",        //dyxzq  // tiled
                 "config": [
                     {
                         "key": "dyxzq",
                         "name": "广汉行政区",
-                        "url": "http://192.168.2.246:6080/arcgis/rest/services//dyrq/XZQ/MapServer"
+                        // "url": "http://218.200.166.203:8035/arcgis/rest/services//dyrq/XZQ/MapServer"
+                        "url":"http://218.200.166.203:8035/arcgis/rest/services/dyrq/XZQ/MapServer"
                     }
                 ]
             },
@@ -2081,7 +2082,7 @@ var AppX = {
                     {
                         "key": "fangdamap1",
                         "name": "放大镜管线服务",
-                        "url": "http://192.168.2.246:6080/arcgis/rest/services/dyrq/PIPE_QY_DYRQ_FANGDA/MapServer"
+                        "url": "http://218.200.166.203:8035/arcgis/rest/services/dyrq/PIPE_QY_FANGDA/MapServer"
                     }
                 ]
             },
@@ -2091,7 +2092,7 @@ var AppX = {
                     {
                         "key": "pipedata1",
                         "name": "管线业务服务",
-                        "url": "http://192.168.2.246:6080/arcgis/rest/services/dyrq/PIPE_QY_DYRQ_DYNAMIC/MapServer"
+                        "url": "http://218.200.166.203:8035/arcgis/rest/services/GUANGHAN/PIPE_QY_GHRQ/MapServer"
                     }
                 ]
             },

src/widgets/HomePage/map.class.ts

@@ -48,7 +48,7 @@ class homeMap {
      * **/
     setBasemap(action) {
         let basemap = this.globel.AppX.appConfig.gisResource[this.globel.config.xzq];
-        if ((basemap || basemap.config || basemap.config[0] || basemap.config[0].url)) {
+        if (!(basemap || basemap.config || basemap.config[0] || basemap.config[0].url)) {
             console.log("行政区服务为发布");
             return;
         }

src/widgets/Printing/Widget.ts

@@ -250,7 +250,7 @@ class Printing extends BaseWidget {
                 "Format": that.domObj.find(".format").val(),//"PDF"
                 "Layout_Template": "Default",//that.domObj.find(".layout").val(),//"DefaultA0L"
                 "Georef_info": "False",
-                "Template_Folder": that.printtemplatePath + "/" + baseMapType,
+                "Template_Folder": that.printtemplatePath + "/11", //底图无法导出，默认11   that.printtemplatePath + "/" + baseMapType,
                 "f": "pjson"
             };
             let url = that.apiPrint + "/submitJob";
@@ -393,6 +393,9 @@ class Printing extends BaseWidget {
             return;
         }
         var fileurl = esri.config.defaults.io.alwaysUseProxy ? esri.config.defaults.io.proxyUrl + "?" + e.value.url : e.value.url;
+
+        fileurl = fileurl.replace('172.26.2.17:6080','218.200.166.203:8035');
+
         if (that.hander.domObj.find(".format").val() == "PDF") {
             that.dom.replaceWith("<div>" + that.count + ".<a target=_blank title='打开' href=" + fileurl + ">" + that.caption + "</a></div>");
         } else {

src/widgets/Printing/config.json

@@ -4,7 +4,7 @@
 	"styleUrl": "widgets/Printing/css/style.scss",
 	"imagePath": "images/image.png",
 	"pdfPath": "images/pdf.png",
-	"defaultTitle": "铜仁综合管网",
+	"defaultTitle": "广汉综合管网",
 	"defaultAuthor": "",
 	"defaultCopyright": "",
 	"defaultFormat": "PDF",

src/widgets/TemplatePrint/Widget.ts

@@ -220,6 +220,7 @@ class TemplatePrint extends BaseWidget {
             return;
         }
         var fileurl = esri.config.defaults.io.alwaysUseProxy ? esri.config.defaults.io.proxyUrl + "?" + e.value.url : e.value.url;
+        fileurl = fileurl.replace('172.26.2.17:6080','218.200.166.203:8035');
         if (that.hander.domObj.find(".format").val() == "PDF") {
             that.dom.replaceWith("<div>" + that.count + ".<a target=_blank title='打开' href=" + fileurl + ">" + that.caption + "</a></div>");
         } else {

src/widgets/WorkSpace/Widget.ts

@@ -290,8 +290,9 @@ class WorkSpace extends BaseWidget {
     printResult(result) {
         var that: any = this;
         that.dom.innerHTML="点击下载"
-        console.log(result.url);
-        $(that.dom).data('url',result.url);
+        let fileurl = result.url.replace('172.26.2.17:6080','218.200.166.203:8035');
+        console.log(fileurl);
+        $(that.dom).data('url',fileurl);
         var time = 600000;
         setTimeout(() => {
             that.dom.innerHTML="打印"