Merge remote-tracking branch 'origin/master'

dcit-hcsystem-hcsystem-master/src/views/qyMap/qyMap.vue

@@ -80,7 +80,7 @@
                             </el-tooltip>
                         </div>
                         <div class="markbox-span">
-                            <span>0</span>
+                            <span>{{tjNumberObj.troubleNum}}</span>
                         </div>
                     </div>
     </div>
@@ -148,6 +148,7 @@ export default class GIS extends Vue {
     @Provide() windowsArr: any = [];
     @Provide() windowsArr1: any = [];
     @Provide() windowsArr2: any = [];
+    @Provide() windowsArr3: any = [];
     @Provide() currentWindow: any = "";
     // @Provide() searchOption: any = {
     //     city: "石家庄",
@@ -307,7 +308,6 @@ export default class GIS extends Vue {
                             `<p><span>隐患类型:</span>${trouble.troubleType}</p >` +
                             `<p><span>隐患等级:</span>${trouble.troubleLevel}</p >` +
                             `<p><span>地址:</span>${trouble.address}</p >` +
-                            `<p><button onclick="updateTrouble">修改</button></p >` +
                             `</div>` +
                             `<p class="gengxin"><button>更新</button></p>`;
                     that.Mutil.addPopup(html, trouble.id, trouble.longitude, trouble.latitude)
@@ -441,11 +441,11 @@ export default class GIS extends Vue {
             offset: [-13, -2],
             events: {
                 click: (e: any) => {
-                    that.windowsArr2.forEach((ele: any) => {
+                    that.windowsArr3.forEach((ele: any) => {
                         ele.visible = false;
                     });
                     that.$nextTick(() => {
-                        that.currentWindow = that.windowsArr2[index];
+                        that.currentWindow = that.windowsArr3[index];
                         that.currentWindow.visible = true;
                     });
                 },
@@ -454,7 +454,7 @@ export default class GIS extends Vue {
         };
         that.Mutil.addMarkerToMap(
             'yh',
-            obj.deviceName,
+            obj.troubleName,
             icon,
             [obj.longitude, obj.latitude],
             0.6,
@@ -625,7 +625,8 @@ export default class GIS extends Vue {
 	    { cityId: "", countyId: "", provinceId: "" },
 	    function (res: any) {
 	      if (res.code == 0) {
-	        that.tjNumberObj = res.data;
+            that.tjNumberObj = res.data;
+            console.log("that.tjNumberObj",that.tjNumberObj)
 	        let obj = res.data,
 	          arr: any = [];
 	        arr.push({
@@ -676,8 +677,8 @@ export default class GIS extends Vue {
                         center: center
                     })
             }
-            if (res.code == 0 && res.data.goodsList.length > 0) {
-                    that.yhmapData = res.data.goodsList;
+            if (res.code == 0 && res.data.troubleList.length > 0) {
+                    that.yhmapData = res.data.troubleList;
                     let yhlatSum = 0;
                     let yhlngSum = 0;
                     that.yhmapData.forEach((ele: any, index: any) => {