设备照片查看修改

src/widgets/AttributeAnnotation/Widget.ts

@@ -551,7 +551,9 @@ class AttributeAnnotation extends BaseWidget {
         var that = <any>this;
         if (data.code == 10000) {
             if (data.result.rows && data.result.rows.length > 0) {
+                var SID="RQ";
                 $.each(data.result.rows, function (index2, item2) {
+                  
                     if (item2.visible) {
                         var regx = /null/i;
                         var value = that.item.feature.attributes[item2.name];
@@ -568,6 +570,10 @@ class AttributeAnnotation extends BaseWidget {
                         tr = "<tr><td>" + item2.alias + "</td>" + "<td>" + value + "</td></tr>";
                         that.datarows.append(tr);
                         tr = "";
+
+                        if(item2.name=="sid"||item2.name=="sid".toLocaleUpperCase()){
+                            SID=that.item.feature.attributes[item2.name];
+                        }
                     }
                 })
                  //添加设备照片查看
@@ -578,9 +584,6 @@ class AttributeAnnotation extends BaseWidget {
             else {
                 var SID="RQ";
                 $.each(that.item.feature.attributes, function (index2, item2) {
-                    if(index2=="sid"||index2=="sid".toLocaleUpperCase()){
-                        SID=SID+item2;
-                    }
                     if (!that.that.config.exceptAttribute.some(function (x) { return index2 == x; })) {//过滤非默认的字段
                         var regx = /null/i;
                         var value = item2;
@@ -597,6 +600,10 @@ class AttributeAnnotation extends BaseWidget {
                         tr = "<tr><td>" + that.item.alias[index2] + "</td>" + "<td>" + value + "</td></tr>";
                         that.datarows.append(tr);
                         tr = "";
+
+                        if(item2.name=="sid"||item2.name=="sid".toLocaleUpperCase()){
+                            SID=that.item.feature.attributes[item2.name];
+                        }
                     }
 
                 });

src/widgets/MissionSchedule/Widget.ts

@@ -1784,7 +1784,15 @@ class MissionSchedule extends BaseWidget {
                 //     where += " and " + obj.managelayerfieldname + ' in (' + codes + ')';
 
 
-                var param = { "where": where, "spatialRel": "esriSpatialRelIntersects", "returnGeometry": true, "geometryType": "esriGeometryPolygon", "geometry": JSON.stringify(geometry), "outFields": obj.outfields, "returnIdsOnly": false, "f": "json" };
+                var param = { 
+                    //"where": where,
+                    "spatialRel": "esriSpatialRelIntersects",
+                    "returnGeometry": true, 
+                    "geometryType": "esriGeometryPolygon", 
+                    "geometry": JSON.stringify(geometry),
+                    "outFields": obj.outfields, 
+                    "returnIdsOnly": false,
+                    "f": "json" };
                 $.ajax({
                     type: "POST",
                     url: url + "/" + obj.layerid + "/query",
@@ -2169,6 +2177,8 @@ class MissionSchedule extends BaseWidget {
         }
     }
 
+
+
     //设置点、线或多边形的样式
     setGraphSymbol(type, size?) {
         var symbol = {

src/widgets/MissionSchedule/config.json

@@ -35,7 +35,7 @@
     "deviceForLayer": {
         "2": {
             "layerid": 5,
-            "where": "SUBTYPE = '调压箱'",
+            "where": "SUBTYPE = '303001'",
             "layername": "booster",
             "outfields": "*",
             "keyfield": "SID",
@@ -49,7 +49,7 @@
         },
         "3": {
             "layerid": 5,
-            "where": "SUBTYPE = '调压柜'",
+            "where": "SUBTYPE = '303003'",
             "layername": "booster",
             "outfields": "*",
             "keyfield": "SID",
@@ -476,3 +476,5 @@
         }
     ]
 }
+
+