guoxiaohuan 4 years ago
parent
commit
fe2510cf52
2 changed files with 34 additions and 19 deletions
  1. BIN
      src/assets/images/icons/1008.png
  2. 34 19
      src/views/statistics/index.vue

BIN
src/assets/images/icons/1008.png


+ 34 - 19
src/views/statistics/index.vue

@@ -47,12 +47,13 @@
                             </div>
                             <span>{{item.smsxtname}}</span>
                         </div>
-                        <div class="system-equipments" >
+                        <div class="system-equipments" v-if="item.assetTypeList">
                             <div class="number" v-for="(equip , index) in item.assetTypeList" :key="index">
                                 <p>{{equip.category_name}}<span v-if="equip.is_exception_num">{{equip.is_exception_num}}</span></p>
                                 <p><span>{{equip.asset_num}}</span><span>台</span></p>
                             </div>
                         </div>
+                        <div v-else style="width:65%;text-align:center;">暂无数据</div>
                     </li>
                 </ul>
             </div>
@@ -481,7 +482,7 @@ export default {
         },
         // 处理集团地图
         pantGroupMap (data, sysId) {
-            this.clearAllLayers() 
+            // this.clearAllLayers() 
             let that = this
             data.children.forEach(item=>{
                 let params = {
@@ -511,22 +512,23 @@ export default {
                             })
                         }
                         let color = that.paintColorByData(num)
-                        let layer = L.geoJSON(JsonData.features, {
-                            style:function(){
-                                return {
-                                    'weight': 1,
-                                    'color':  color.border,
-                                    'fillColor':color.area
-                                }
-                            }
-                        }).addTo(maps);
-
+            
                         let center = JsonData.features[0].properties.center
-                        let marker = L.divIcon({
+
+                        // let marker3 = L.divIcon({
+                        //     center,
+                        //     html: `<div>${JsonData.features[0].properties.name}</div>`,
+                        //     iconSize:30
+                        // })
+
+                         var myIcon = L.divIcon({
                             html: JsonData.features[0].properties.name,
+                            className: 'my-leaflet-div-icon',
                             iconSize:30
-                        })
-                        // let marker = L.circle(center, {radius: 2000}).addTo(maps).bindPopup(contentHtml);
+                        });
+                        L.marker(center, { icon: myIcon }).addTo(maps);
+                        let marker2 = L.circle(center, 100000, { color:'transparent', fillColor:'blue', fillOpacity:0.4}).addTo(maps);
+                        let marker = L.circle(center, 50000, { color:'transparent', fillColor:'red', fillOpacity:1}).addTo(maps);
 
                         if (res.data) {
                             popup = L.popup().setLatLng(center).setContent(contentHtml)
@@ -821,6 +823,17 @@ export default {
                 contextmenu: true,
                 contextmenuWidth: 140,
             })
+            let JsonData = require("../../assets/geoData/china.json")
+             let layer = L.geoJSON(JsonData.features, {
+                style:function(){
+                    return {
+                        'weight': 1,
+                        'color': '#B3D2FF',
+                        'fillColor':'#DEECFF' 
+                    }
+                }
+            }).addTo(maps);
+            return
             if(this.currentLevel === 1) {   //1集团 3区域 0广场
                 this.pantGroupMap(this.currentDistrictData[0],"1001")
             } else if (this.currentLevel === 2) {  // 2中心 
@@ -834,13 +847,13 @@ export default {
             maps.eachLayer(function(layer){
                 maps.removeLayer(layer)
             })
-            let data = require(`../../assets/geoData/ChinaBorder.json`)
+            let data = require(`../../assets/geoData/china.json`)
             L.geoJSON(data.features, {
                 style:function(){
                     return {
                         'weight': 1,
                         'color': 'black',
-                        'fillColor':'#f1f1f1'
+                        'fillColor':'#e0ebff'
                     }
                 }
             }).addTo(maps);
@@ -964,7 +977,9 @@ export default {
                     let result = res.data
                     if (result && Array.isArray(result)) {
                         result.forEach(item => {
-                            item.assetTypeList = item.assetTypeList.splice(0,3)
+                            if (item.assetTypeList) {
+                                item.assetTypeList = item.assetTypeList.splice(0,3)
+                            }
                         })
                         res.data.forEach(item => {
                             item.selected = false
@@ -1150,7 +1165,7 @@ export default {
                 ul{
                     li.system-item{
                         display: flex;
-                        justify-content: space-around;
+                        justify-content: flex-start;
                         align-items: center;
                         width: calc(100% - 3.2rem);
                         margin-left: 1.6rem;