上传文件报错修改,地图弹窗字段增加地址

src/widgets/EquipmentInstitution/Widget.ts

@@ -21,7 +21,7 @@ class EquipmentInstitution extends BaseWidget {
     currentTarget = null;
     verificationHelper = null;
     result
-    numMax = null; //最大顺序号
+    numMax = 1; //最大顺序号
     addFloatpanel = null;
 
     /**
@@ -479,6 +479,9 @@ class EquipmentInstitution extends BaseWidget {
             })
         }
         this.numMax = Math.max.apply(null, num) + 1;
+        if(this.numMax == -Infinity || this.numMax == Infinity){
+            this.numMax = 1;
+        }
         this.domObj.find("#all_check").prop("checked", false);
         if (datas.length == 0) {
             if (this.ztree) {

src/widgets/InfoWindow/Widget.ts

@@ -154,23 +154,26 @@ class InfoWindow extends BaseWidget {
                 results[0].feature.attributes["设备编码"]=( results[0].feature.attributes["设备编码"].toLowerCase()=="null"?"": results[0].feature.attributes["设备编码"])
                 results[0].feature.attributes["管径"]=( results[0].feature.attributes["管径"].toLowerCase()=="null"?"": results[0].feature.attributes["管径"])
                 results[0].feature.attributes["材质"]=( results[0].feature.attributes["材质"].toLowerCase()=="null"?"": results[0].feature.attributes["材质"])
+                results[0].feature.attributes["地址"]=(results[0].layerName.toLowerCase()=="null"?"": results[0].feature.attributes["地址"])
                 results[0].feature.attributes["图层设备名称"]=(results[0].layerName.toLowerCase()=="null"?"": results[0].layerName)
-                template = new esri.InfoTemplate("${图层设备名称}${设备编码}","<b>设备编码:</b>${设备编码}<br/><b>管径:</b>${管径}<br/><b>材质:</b>${材质}");
+                template = new esri.InfoTemplate("${图层设备名称}${设备编码}","<b>设备编码:</b>${设备编码}<br/><b>管径:</b>${管径}<br/><b>材质:</b>${材质}<br/><b>地址:</b>${地址}");
             }else{
                 if(results[0].layerName=="阀门"){
                     results[0].feature.attributes["设备编码"]=( results[0].feature.attributes["设备编码"].toLowerCase()=="null"?"": results[0].feature.attributes["设备编码"])
                     results[0].feature.attributes["管径"]=( results[0].feature.attributes["管径"].toLowerCase()=="null"?"": results[0].feature.attributes["管径"])
                     results[0].feature.attributes["材质"]=( results[0].feature.attributes["材质"].toLowerCase()=="null"?"": results[0].feature.attributes["材质"])
+                    results[0].feature.attributes["地址"]=(results[0].layerName.toLowerCase()=="null"?"": results[0].feature.attributes["地址"])
                     results[0].feature.attributes["开关状态"]=( results[0].feature.attributes["开关状态"].toLowerCase()=="null"?"": results[0].feature.attributes["开关状态"])
                     results[0].feature.attributes["图层设备名称"]=(results[0].layerName.toLowerCase()=="null"?"": results[0].layerName)
-                    template = new esri.InfoTemplate("${图层设备名称}${设备编码}","<b>设备编码:</b>${设备编码}<br/><b>管径:</b>${管径}<br/><b>材质:</b>${材质}<br/><b>开关状态:</b>${开关状态}");
+                    template = new esri.InfoTemplate("${图层设备名称}${设备编码}","<b>设备编码:</b>${设备编码}<br/><b>管径:</b>${管径}<br/><b>材质:</b>${材质}<br/><b>开关状态:</b>${开关状态}<br/><b>地址:</b>${地址}");
                 }else{
                     results[0].feature.attributes["设备编码"]=( results[0].feature.attributes["设备编码"].toLowerCase()=="null"?"": results[0].feature.attributes["设备编码"])
                     results[0].feature.attributes["管径"]=( results[0].feature.attributes["管径"].toLowerCase()=="null"?"": results[0].feature.attributes["管径"])
                     results[0].feature.attributes["材质"]=( results[0].feature.attributes["材质"].toLowerCase()=="null"?"": results[0].feature.attributes["材质"])
+                    results[0].feature.attributes["地址"]=(results[0].layerName.toLowerCase()=="null"?"": results[0].feature.attributes["地址"])
                     results[0].feature.attributes["工作状态"]=( results[0].feature.attributes["工作状态"].toLowerCase()=="null"?"": results[0].feature.attributes["工作状态"])
                     results[0].feature.attributes["图层设备名称"]=(results[0].layerName.toLowerCase()=="null"?"": results[0].layerName)
-                    template = new esri.InfoTemplate("${图层设备名称}${设备编码}","<b>设备编码:</b>${设备编码}<br/><b>管径:</b>${管径}<br/><b>材质:</b>${材质}<br/><b>工作状态:</b>${工作状态}");
+                    template = new esri.InfoTemplate("${图层设备名称}${设备编码}","<b>设备编码:</b>${设备编码}<br/><b>管径:</b>${管径}<br/><b>材质:</b>${材质}<br/><b>工作状态:</b>${工作状态}<br/><b>地址:</b>${地址}");
                 }
             }
         }