UI

src/assets/iconfont/iconfont.json

@@ -5,6 +5,34 @@
   "css_prefix_text": "sj-icon-",
   "description": "",
   "glyphs": [
+		{
+		  "icon_id": "201559",
+		  "name": "火险",
+		  "font_class": "hx",
+		  "unicode": "e601",
+		  "unicode_decimal": 58881
+		},
+		{
+		  "icon_id": "5925322",
+		  "name": "已完成",
+		  "font_class": "ywc",
+		  "unicode": "e606",
+		  "unicode_decimal": 58886
+		},
+		{
+		  "icon_id": "5838816",
+		  "name": "人工",
+		  "font_class": "rg",
+		  "unicode": "e876",
+		  "unicode_decimal": 59510
+		},
+		{
+		  "icon_id": "18170107",
+		  "name": "卡口",
+		  "font_class": "kk",
+		  "unicode": "e962",
+		  "unicode_decimal": 59746
+		},
 	  {
 	    "icon_id": "5732759",
 	    "name": "事件定位",

src/assets/styles/base.scss

@@ -170,12 +170,16 @@ ul{
 div::-webkit-scrollbar {
 		display: none;
 }
+
 .w-5{
 	    width: 5.5rem;
 }
 .h-9{
 	height: 9vh;
 }
+.h-19{
+	height: 19.5vh;
+}
 .h-30{
 		height: 29vh;
 }
@@ -280,6 +284,15 @@ div::-webkit-scrollbar {
 	
 	}
 }
+.t-a-center{
+	text-align: center;
+}
+.m-r-none{
+	margin-right: 0 !important;
+}
+.icon-text-col{
+	margin-top: .5rem;
+}
 
 // 一体化可视化模板
 .visual-con {
@@ -313,8 +326,6 @@ div::-webkit-scrollbar {
 			-webkit-transform: translateX(0);
 			transform: translateX(0);
 			transition: all 0.5s ease-in-out;
-		
-			
 		}
 		.indent-style{
 			-webkit-transform: translateX(19rem) !important;

src/views/datacenter.vue

@@ -272,7 +272,6 @@
                 isAggregation: false
               }
               if (resourceTable == 'centerdata_t_forest_weatherstation') {//气象站
-                markersMap.icon = "sj-icon-map-qxz"
                 markersMap.lng = res.data.resourceList[i].longitude
                 markersMap.lat = res.data.resourceList[i].latitude
                 markersMap.bindPopupHtml = '<div>' +
@@ -305,7 +304,6 @@
                   '                </div>' +
                   '                </span></div>'
               } else if (resourceTable == 'centerdata_t_forest_farm') {//林场
-                markersMap.icon = "sj-icon-map-lc"
                 markersMap.lng = res.data.resourceList[i].longitude
                 markersMap.lat = res.data.resourceList[i].latitude
                 markersMap.bindPopupHtml = '<div>' +
@@ -338,7 +336,6 @@
                   '                </div>' +
                   '                </span></div>'
               } else if (resourceTable == 'centerdata_t_forest_landing') {//起降点
-                markersMap.icon = "sj-icon-map-qjd"
                 markersMap.lng = res.data.resourceList[i].longitude
                 markersMap.lat = res.data.resourceList[i].latitude
                 markersMap.bindPopupHtml = '<div>' +
@@ -371,7 +368,6 @@
                   '                </div>' +
                   '                </span></div>'
               } else if (resourceTable == 'centerdata_t_forest_channel') {//水源渠道
-                markersMap.icon = "sj-icon-map-syqd"
                 markersMap.lng = res.data.resourceList[i].longitude
                 markersMap.lat = res.data.resourceList[i].latitude
                 markersMap.bindPopupHtml = '<div>' +
@@ -404,7 +400,6 @@
                   '                </div>' +
                   '                </span></div>'
               } else if (resourceTable == 'centerdata_t_forest_checkpoint') {//防火检查站
-                markersMap.icon = "sj-icon-map-fhjcz"
                 markersMap.lng = res.data.resourceList[i].longitude
                 markersMap.lat = res.data.resourceList[i].latitude
                 markersMap.bindPopupHtml = '<div>' +
@@ -444,7 +439,6 @@
                   '                </div>' +
                   '                </span></div>'
               } else if (resourceTable == 'centerdata_t_forest_waterintake') {//取水口
-                markersMap.icon = "sj-icon-map-qsk"
                 markersMap.lng = res.data.resourceList[i].longitude
                 markersMap.lat = res.data.resourceList[i].latitude
                 markersMap.bindPopupHtml = '<div>' +
@@ -477,7 +471,6 @@
                   '                </div>' +
                   '                </span></div>'
               } else if (resourceTable == 'centerdata_t_forest_watercrane') {//水鹤
-                markersMap.icon = "sj-icon-map-sh"
                 markersMap.lng = res.data.resourceList[i].longitude
                 markersMap.lat = res.data.resourceList[i].latitude
                 markersMap.bindPopupHtml = '<div>' +
@@ -510,7 +503,6 @@
                   '                </div>' +
                   '                </span></div>'
               } else if (resourceTable == 'centerdata_t_forest_firehydrant') {//消火栓
-                markersMap.icon = "sj-icon-map-xhs"
                 markersMap.lng = res.data.resourceList[i].longitude
                 markersMap.lat = res.data.resourceList[i].latitude
                 markersMap.bindPopupHtml = '<div>' +
@@ -550,7 +542,6 @@
                   '                </div>' +
                   '                </span></div>'
               } else if (resourceTable == 'centerdata_t_forest_fireteam') {//森林防火队
-                markersMap.icon = "sj-icon-map-slfh"
                 markersMap.lng = res.data.resourceList[i].longitude
                 markersMap.lat = res.data.resourceList[i].latitude
                 markersMap.bindPopupHtml = '<div>' +
@@ -608,7 +599,6 @@
                 isAggregation: false
               }
               if (that.resourceTable == 'centerdata_t_forest_weatherstation') {//气象站
-                markersMap.icon = "sj-icon-map-qxz"
                 markersMap.lng = res.data.resourceList[i].longitude
                 markersMap.lat = res.data.resourceList[i].latitude
                 markersMap.icon = 'icon_qxz'
@@ -642,7 +632,6 @@
                   '                </div>' +
                   '                </span></div>'
               } else if (that.resourceTable == 'centerdata_t_forest_farm') {//林场
-                markersMap.icon = "sj-icon-map-lc"
                 markersMap.lng = res.data.resourceList[i].longitude
                 markersMap.lat = res.data.resourceList[i].latitude
                 markersMap.bindPopupHtml = '<div>' +
@@ -675,7 +664,6 @@
                   '                </div>' +
                   '                </span></div>'
               } else if (that.resourceTable == 'centerdata_t_forest_landing') {//起降点
-                markersMap.icon = "sj-icon-map-qjd"
                 markersMap.lng = res.data.resourceList[i].longitude
                 markersMap.lat = res.data.resourceList[i].latitude
                 markersMap.bindPopupHtml = '<div>' +
@@ -708,7 +696,6 @@
                   '                </div>' +
                   '                </span></div>'
               } else if (that.resourceTable == 'centerdata_t_forest_channel') {//水源渠道
-                markersMap.icon = "sj-icon-map-syqd"
                 markersMap.lng = res.data.resourceList[i].longitude
                 markersMap.lat = res.data.resourceList[i].latitude
                 markersMap.bindPopupHtml = '<div>' +
@@ -741,7 +728,6 @@
                   '                </div>' +
                   '                </span></div>'
               } else if (that.resourceTable == 'centerdata_t_forest_checkpoint') {//防火检查站
-                markersMap.icon = "sj-icon-map-fhjcz"
                 markersMap.lng = res.data.resourceList[i].longitude
                 markersMap.lat = res.data.resourceList[i].latitude
                 markersMap.bindPopupHtml = '<div>' +
@@ -781,7 +767,6 @@
                   '                </div>' +
                   '                </span></div>'
               } else if (that.resourceTable == 'centerdata_t_forest_waterintake') {//取水口
-                markersMap.icon = "sj-icon-map-qsk"
                 markersMap.lng = res.data.resourceList[i].longitude
                 markersMap.lat = res.data.resourceList[i].latitude
                 markersMap.bindPopupHtml = '<div>' +
@@ -814,7 +799,6 @@
                   '                </div>' +
                   '                </span></div>'
               } else if (that.resourceTable == 'centerdata_t_forest_watercrane') {//水鹤
-                markersMap.icon = "sj-icon-map-sh"
                 markersMap.lng = res.data.resourceList[i].longitude
                 markersMap.lat = res.data.resourceList[i].latitude
                 markersMap.bindPopupHtml = '<div>' +
@@ -847,7 +831,6 @@
                   '                </div>' +
                   '                </span></div>'
               } else if (that.resourceTable == 'centerdata_t_forest_firehydrant') {//消火栓
-                markersMap.icon = "sj-icon-map-xhs"
                 markersMap.lng = res.data.resourceList[i].longitude
                 markersMap.lat = res.data.resourceList[i].latitude
                 markersMap.bindPopupHtml = '<div>' +
@@ -887,7 +870,6 @@
                   '                </div>' +
                   '                </span></div>'
               } else if (that.resourceTable == 'centerdata_t_forest_fireteam') {//森林防火队
-                markersMap.icon = "sj-icon-map-slfh"
                 markersMap.lng = res.data.resourceList[i].longitude
                 markersMap.lat = res.data.resourceList[i].latitude
                 markersMap.bindPopupHtml = '<div>' +

src/views/event.vue

@@ -14,22 +14,22 @@
           </div>
           <div class="i-list-con h-73">
             <div class="d-l-con-icon">
-              <div class="icon-con w-33" v-for="(item,index) in todayEventCountList"
-                   v-on:click="todayEventCountSetMarkers(item.eventStatus)">
-                <div class="icon icon-dot"></div>
-                <div class="icon-text">
-                  <h6>{{item.count}}</h6>
-                  <h5>{{item.eventStatusName}}</h5>
-                </div>
-              </div>
-              <div class="icon-con w-33" v-for="(item,index) in todayEventSourcetList"
-                   v-on:click="todayEventSourcetSetMarkers(item.eventSource)">
-                <div class="icon icon-dot"></div>
-                <div class="icon-text">
-                  <h6>{{item.count}}</h6>
-                  <h5>{{item.eventSourceName}}</h5>
-                </div>
-              </div>
+            	<div class="icon-con w-33 flex-d t-a-center" v-for="(item,index) in todayEventCountList"
+            		v-on:click="todayEventCountSetMarkers(item.eventStatus)">
+            		<div class="icon iconfont icon-mid" :class="item.icon"></div>
+            		<div class="icon-text">
+            			<h5 class="m-r-none icon-text-col">{{item.eventStatusName}}</h5>
+            			<h6 class="m-r-none">{{item.count}}</h6>
+            		</div>
+            	</div>
+            	<div class="icon-con w-33 flex-d t-a-center" v-for="(item,index) in todayEventSourcetList"
+            		v-on:click="todayEventSourcetSetMarkers(item.eventSource)">
+            		<div class="icon iconfont icon-mid" :class="item.icon"></div>
+            		<div class="icon-text">
+            			<h5 class="m-r-none icon-text-col">{{item.eventSourceName}}</h5>
+            			<h6 class="m-r-none">{{item.count}}</h6>
+            		</div>
+            	</div>
             </div>
             <div class="d-tit">
               <h4>事件分布</h4>
@@ -950,6 +950,19 @@
           //今日事件
           that.todayEventCountList = res.data.eventcountStatus
           that.todayEventSourcetList = res.data.eventcountSource
+		  
+		  res.data.eventcountStatus.forEach(function(data, index) {
+		  	that.$set(that.todayEventCountList[0], 'icon', 'sj-icon-wcl');
+		  	that.$set(that.todayEventCountList[1], 'icon', 'sj-icon-clz');
+		  	that.$set(that.todayEventCountList[2], 'icon', 'sj-icon-ywc');
+		  
+		  });
+		  res.data.eventcountSource.forEach(function(data, index) {
+		  	that.$set(that.todayEventSourcetList[0], 'icon', 'sj-icon-rg');
+		  	that.$set(that.todayEventSourcetList[1], 'icon', 'sj-icon-hx');
+		  	that.$set(that.todayEventSourcetList[2], 'icon', 'sj-icon-kk');
+		  
+		  });
           //  事件分布
           that.todayEventCountDeptList = res.data.eventcountDept
           //  事件分类