Sfoglia il codice sorgente

Merge branch 'develop' into develop-test

YaolongHan 4 anni fa
parent
commit
895bbe96b8
1 ha cambiato i file con 12 aggiunte e 12 eliminazioni
  1. 12 12
      src/views/statistics/index.vue

+ 12 - 12
src/views/statistics/index.vue

@@ -308,8 +308,8 @@
             <thead>
               <tr>
                 <th width="10%">序号</th>
-                <th width="20%">中心</th>
-                <th width="20%">区域</th>
+                <th width="20%">大区 </th>
+                <th width="20%">城市公司</th>
                 <th width="20%">广场名称</th>
                 <th width="30%">异常原因</th>
               </tr>
@@ -335,7 +335,7 @@
             <thead>
               <tr>
                 <th width="10%">序号</th>
-                <th width="20%">大区</th>
+                <th width="20%">大区 </th>
                 <th width="20%">城市公司</th>
                 <th width="20%">广场名称</th>
                 <th width="30%">异常原因</th>
@@ -1162,7 +1162,7 @@ export default {
           };
         },
       }).addTo(myMaps);
-
+ 
       if (this.currentLevel === 1) {
         //1集团
         this.pantGroupMap(this.currentZoneData, this.currentSysId);
@@ -1205,7 +1205,6 @@ export default {
      */
     openMaskPanel(system) {
       let target = this.getDataByCityCcode(this.selectedZone)
-      console.log('target',target)
       if (target) {
         this.currentDialogLevel = target.level
         this.currentLevel = target.level
@@ -1229,7 +1228,7 @@ export default {
           });
         }
       });
-
+ 
       if (this.tabData.length) {
         this.activeName = this.tabData[0].id;
         this.currentDialogTab = this.activeName;
@@ -1552,7 +1551,7 @@ export default {
         let marker = L.marker(center, { icon: textIcon }).addTo(groupLayer);
         let marker2 = L.marker(center, { icon: circleIcon }).addTo(groupLayer);
         let feaureGroup = L.featureGroup([marker, marker2]);
-
+       
         popup.on('add' , (ev) => {
            let popupDom = document.querySelectorAll('.leaflet-mypopup-content')[0]
            let tipDom = document.querySelectorAll('.leaflet-popup-tip')[0]
@@ -1564,7 +1563,7 @@ export default {
              tipDom.style.background="#09173E"
            }
         })
-
+      
         marker2.on("mouseover", (ev) => {
             popup.openOn(myMaps);
         });
@@ -1620,7 +1619,7 @@ export default {
           let item = data[i];
           if (item.is_exception_num) {
             html += `<div class="line">
-                            <span>${item.category_name}</span>
+                            <span>${item.category_name}</span> 
                             <span>${item.asset_num || "--"}${
               item.category_name === "屋面logo"
                 ? "个"
@@ -1634,7 +1633,7 @@ export default {
                 </div>`;
           } else {
             html += `<div class="line">
-                            <span>${item.category_name}</span>
+                            <span>${item.category_name}</span> 
                             <span>${item.asset_num || "--"}${
               item.category_name === "屋面logo"
                 ? "个"
@@ -1657,7 +1656,7 @@ export default {
 };
 </script>
 
-<style scoped lang="less">
+<style scoped lang="less">  
 @import "../../assets/css/dark.less";
 @import "../../assets/css/light.less";
 .dark-my-leaflet-div-icon{
@@ -1689,4 +1688,5 @@ export default {
   padding-top: 0;
 }
 
-</style>
+</style> 
+