Explorar el Código

统计分析接口直连

JX.LI hace 1 año
padre
commit
9c86c0112f

+ 21 - 15
src/api/bigdata/bigdata.js

@@ -3,38 +3,44 @@ import request from '@/utils/request'
 //饼图
 export function initPieChartData(param) {
   return request({
-    url: '/center-traffic/data/initPieChartData',
+    url: '/center-event/eventreport/getEventTypeStatistics',
     method: 'post',
-    data:param
+    data: param
   })
 }
 
 //事件
-export function eventcatalogueBigData() {
+export function getTotal(data) {
   return request({
-    url: '/center-traffic/data/eventcatalogueBigData',
-    method: 'post'
+    url: '/center-event/eventreport/getTotal',
+    method: 'post',
+    data: data
+  })
+}
+//事件
+export function getEventStatusStatistics(data) {
+  return request({
+    url: '/center-event/eventreport/getEventStatusStatistics',
+    method: 'post',
+    data: data
   })
 }
 
-export function deptBigData() {
+
+export function deptBigData(data) {
   return request({
-    url: '/center-traffic/data/deptBigData',
-    method: 'get',
+    url: '/center-event/eventreport/getEventDeptStatistics',
+    method: 'post',
+    data: data
   })
 }
 
 
 //热力图
 export function getRlt(param) {
-  //暂时传当年,以后再说
-  if (param == null) {
-    let myDate = new Date();
-    param = {day: myDate.getFullYear()}
-  }
   return request({
-    url: '/center-traffic/data/getHeatMap',
+    url: '/center-event/eventreport/getHeatMap',
     method: 'post',
-    data : param
+    data: param
   })
 }

+ 380 - 355
src/views/bigdata/bigdata.vue

@@ -1,50 +1,52 @@
 <!--一体化首页-->
 <template>
-	<div class="bigdata-con">
-		<!-- 头部B -->
-		<div class="header">
-			<!-- title -->
-			<router-link class="header-left" exact><img class="logo" src="@/assets/images/integrated/logo-small.png" />
-				<h3 class="title">{{systemTitle.title}}-{{systemTitle.subTitle}}-统计分析</h3></router-link>
-			<div class="bignav">
-				<img src="@/assets/images/integrated/bigdata-header-nav-left.png" />
-				<router-link v-for="(navbar,index) in navbar " :key="index" :to="navbar.path" class="bignav-list" exact>
-					{{navbar.name}}
-				</router-link>
-				<img src="@/assets/images/integrated/bigdata-header-nav-right.png" />
-			</div>
-		</div>
-		<!-- 头部E -->
-
-		<div class="bigdata-body">
-			<!-- 第一纵向-->
-			<div class="bigdata-list wid-li-1">
+  <div class="bigdata-con">
+    <!-- 头部B -->
+    <div class="header">
+      <!-- title -->
+      <router-link class="header-left" exact><img class="logo" src="@/assets/images/integrated/logo-small.png" />
+        <h3 class="title">{{systemTitle.title}}-{{systemTitle.subTitle}}-统计分析</h3>
+      </router-link>
+      <div class="bignav">
+        <img src="@/assets/images/integrated/bigdata-header-nav-left.png" />
+        <router-link v-for="(navbar,index) in navbar " :key="index" :to="navbar.path" class="bignav-list" exact>
+          {{navbar.name}}
+        </router-link>
+        <img src="@/assets/images/integrated/bigdata-header-nav-right.png" />
+      </div>
+    </div>
+    <!-- 头部E -->
+
+    <div class="bigdata-body">
+      <!-- 第一纵向-->
+      <div class="bigdata-list wid-li-1">
         <div class="b-con mg-b-20">
           <div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
             <span>道路晾晒预警事件占比</span><!--道路晾晒预警事件占比--饼图-->
           </div>
           <chartPit_dlls ref="chartPit_dlls"></chartPit_dlls>
         </div>
-				<div class="b-con mg-b-20">
+        <div class="b-con mg-b-20">
           <div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
             <span>工程车预警事件占比</span><!--工程车预警事件占比--饼图-->
           </div>
           <chartPit_gcc ref="chartPit_gcc"></chartPit_gcc>
-				</div>
+        </div>
         <div class="b-con mg-b-20">
           <div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
             <span>倒车预警事件占比</span><!--倒车预警--饼图-->
           </div>
           <chartPit_dc ref="chartPit_dc"></chartPit_dc>
         </div>
-			</div>
-			<!-- 第二纵向-->
-			<div class="bigdata-list wid-li-2 m-l-15">
-				<div class="bigdata-map mg-b-20">
-          <bigdataSupermap ref="bigdataSupermap" style="width: 100%;height: 59vh;" class="indexSupermapClass" :mapDiv="'bigdataMap'" dynamicPlotting="false"
-                           :mapSite="{doubleClickZoom:false}" :codes="['9fa5']" :isSideBySide="false"/>
-				</div>
-				<!--<tabbar></tabbar>-->
+      </div>
+      <!-- 第二纵向-->
+      <div class="bigdata-list wid-li-2 m-l-15">
+        <div class="bigdata-map mg-b-20">
+          <bigdataSupermap ref="bigdataSupermap" style="width: 100%;height: 59vh;" class="indexSupermapClass"
+            :mapDiv="'bigdataMap'" dynamicPlotting="false" :mapSite="{doubleClickZoom:false}" :codes="['9fa5']"
+            :isSideBySide="false" />
+        </div>
+        <!--<tabbar></tabbar>-->
         <div class="b-con mg-b-20">
           <div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
             <span>事件类型、分布统计</span><!--统计事件类型种类;统计每个种类占当前部门查看权限所有事件的百分比;事件总数;未处理;处理中--两个饼图三个数据信息-->
@@ -59,77 +61,84 @@
             <chartEvent ref="chartEvent"></chartEvent>
           </div>
         </div>
-			</div>
-			<!-- 第三纵向-->
-			<div class="bigdata-list wid-li-1 m-l-15">
-				<div class="b-con mg-b-20">
-					<div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
-						<span>超速预警事件占比</span><!--超速预警事件占比--饼图-->
-					</div>
+      </div>
+      <!-- 第三纵向-->
+      <div class="bigdata-list wid-li-1 m-l-15">
+        <div class="b-con mg-b-20">
+          <div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
+            <span>超速预警事件占比</span><!--超速预警事件占比--饼图-->
+          </div>
           <chartPit_cs ref="chartPit_cs"></chartPit_cs>
-				</div>
-				<div class="b-con mg-b-20">
-					<div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
-						<span>抛瞄预警事件占比</span><!--抛瞄预警事件占比--饼图-->
-					</div>
+        </div>
+        <div class="b-con mg-b-20">
+          <div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
+            <span>抛瞄预警事件占比</span><!--抛瞄预警事件占比--饼图-->
+          </div>
           <chartPit_pm ref="chartPit_pm"></chartPit_pm>
-				</div>
+        </div>
         <div class="b-con">
           <div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
             <span>压线预警事件占比</span><!--压线预警事件占比--饼图-->
           </div>
           <chartPit_yx ref="chartPit_yx"></chartPit_yx>
         </div>
-			</div>
-			<!-- 第四纵向-->
-			<div class="bigdata-list wid-li-1 m-l-15">
-				<div class="b-con mg-b-20">
-					<div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
-						<span>交通事故预警事件占比</span><!--交通事故预警事件占比--饼图-->
-					</div>
+      </div>
+      <!-- 第四纵向-->
+      <div class="bigdata-list wid-li-1 m-l-15">
+        <div class="b-con mg-b-20">
+          <div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
+            <span>交通事故预警事件占比</span><!--交通事故预警事件占比--饼图-->
+          </div>
           <chartPit_jtsg ref="chartPit_jtsg"></chartPit_jtsg>
-				</div>
-				<div class="b-con mg-b-20">
-					<div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
-						<span>路障预警事件占比</span><!--路障预警事件占比--饼图-->
-					</div>
+        </div>
+        <div class="b-con mg-b-20">
+          <div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
+            <span>路障预警事件占比</span><!--路障预警事件占比--饼图-->
+          </div>
           <chartPit_lz ref="chartPit_lz"></chartPit_lz>
-				</div>
+        </div>
         <div class="b-con">
           <div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
             <span>施工预警事件占比</span><!--施工预警事件占比--饼图-->
           </div>
           <chartPit_sg ref="chartPit_sg"></chartPit_sg>
         </div>
-			</div>
-		</div>
-	</div>
+      </div>
+    </div>
+  </div>
 </template>
 
 <script>
-	import fastMenu from './fastmenu.vue' //右侧菜单
-	//echarts
-	import chartEvent from './chart-event.vue' //事件
-	import chartPit_dlls from './chart-pit-dlls.vue' //饼图
-	import chartPit_gcc from './chart-pit-gcc.vue' //饼图
-	import chartPit_dc from './chart-pit-dc.vue' //饼图
-	import chartPit_cs from './chart-pit-cs.vue' //饼图
-	import chartPit_pm from './chart-pit-pm.vue' //饼图
-	import chartPit_yx from './chart-pit-yx.vue' //饼图
-	import chartPit_jtsg from './chart-pit-jtsg.vue' //饼图
-	import chartPit_lz from './chart-pit-lz.vue' //饼图
-	import chartPit_sg from './chart-pit-sg.vue' //饼图
+  import fastMenu from './fastmenu.vue' //右侧菜单
+  //echarts
+  import chartEvent from './chart-event.vue' //事件
+  import chartPit_dlls from './chart-pit-dlls.vue' //饼图
+  import chartPit_gcc from './chart-pit-gcc.vue' //饼图
+  import chartPit_dc from './chart-pit-dc.vue' //饼图
+  import chartPit_cs from './chart-pit-cs.vue' //饼图
+  import chartPit_pm from './chart-pit-pm.vue' //饼图
+  import chartPit_yx from './chart-pit-yx.vue' //饼图
+  import chartPit_jtsg from './chart-pit-jtsg.vue' //饼图
+  import chartPit_lz from './chart-pit-lz.vue' //饼图
+  import chartPit_sg from './chart-pit-sg.vue' //饼图
   import bigdataSupermap from '@/components/supermap' //超图
 
-  import {initPieChartData,eventcatalogueBigData,deptBigData,getRlt} from '@/api/bigdata/bigdata';
+  import {
+    initPieChartData,
+    getTotal,
+    getEventStatusStatistics,
+    deptBigData,
+    getRlt
+  } from '@/api/bigdata/bigdata';
   import {
     fontConfig
   } from '@/api/login'
+  import Cookies from 'js-cookie'
 
-	export default {
-		components: {
-			fastMenu,
-			chartEvent,
+  export default {
+    components: {
+      fastMenu,
+      chartEvent,
       chartPit_dlls,
       chartPit_gcc,
       chartPit_dc,
@@ -140,64 +149,67 @@
       chartPit_lz,
       chartPit_sg,
       bigdataSupermap,
-		},
+    },
     created() {
       this.fontConfig()
       this.eventcatalogueBigData();
-			this.rlt()
+      this.rlt()
     },
     mounted() {
 
     },
-		data() {
-			return {
-        systemTitle:{
-          title:'',  //标题
-          subTitle:''  ,//副标题 数字交通
+    data() {
+      return {
+        systemTitle: {
+          title: '', //标题
+          subTitle: '', //副标题 数字交通
         },
-				visited: '',
-				navbar: [
-				  {
-						name: '交通云图',
-						path: '/forest',
-					},
+        visited: '',
+        navbar: [{
+            name: '交通云图',
+            path: '/forest',
+          },
           {
             name: '监控中心',
             path: '/monitor',
           },
-					{
-						name: '巡路任务',
-						path: '/leader',
-					},
-					{
-						name: '交通资源',
-						path: '/resources',
-					},
-					{
-						name: '统计分析',
-						path: '/bigdata',
-					},
-				],
+          {
+            name: '巡路任务',
+            path: '/leader',
+          },
+          {
+            name: '交通资源',
+            path: '/resources',
+          },
+          {
+            name: '统计分析',
+            path: '/bigdata',
+          },
+        ],
         total: 0, //事件总数
-        file:0,// 事件-归档
-        signIn:0,// 事件-签收
-        conclude:0,// 事件-办结
+        file: 0, // 事件-归档
+        signIn: 0, // 事件-签收
+        conclude: 0, // 事件-办结
 
         /** ------------------------------------图标参数开始 -----------------------------*/
         /** ------------------------------------图标参数结束 -----------------------------*/
-			}
-		},
+      }
+    },
     methods: {
-			rlt() {
-				let that = this
-				getRlt().then(resp => {
-					setTimeout(() => {
-						//事件分布
-						that.$refs.bigdataSupermap.loadHeatMap(resp.data)
-					}, 5000)
-				})
-			},
-      fontConfig(){
+      rlt() {
+        let that = this
+        let param = {
+          day: new Date().getFullYear(),
+          eventTypeId: Cookies.get("eventType").split(",")
+        }
+        getRlt(param).then(resp => {
+          setTimeout(() => {
+            //事件分布
+            that.$refs.bigdataSupermap.loadHeatMap(resp.data)
+          }, 5000)
+        })
+      },
+      fontConfig() {
         fontConfig().then(res => {
           this.systemTitle.title = res.data.fontTitle;
           this.systemTitle.subTitle = res.data.subTitle;
@@ -205,35 +217,42 @@
       },
       /**饼图 统计*/
       initPieChartData() {
-        initPieChartData({}).then(res => {
+        let param = {
+          day: new Date().getFullYear(),
+          eventTypeId: Cookies.get("eventType").split(",")
+        }
+        initPieChartData(param).then(res => {
           for (let i in res.data) {
             const seriesData = [];
-            seriesData.push({value: this.total, name: '事件总量'});
+            seriesData.push({
+              value: this.total,
+              name: '事件总量'
+            });
             if (res.data[i].id == '819') {
               seriesData.push(res.data[i]);
               this.$refs.chartPit_dlls.myEcharts(seriesData);
-            }else if (res.data[i].id == '218') {
+            } else if (res.data[i].id == '218') {
               seriesData.push(res.data[i]);
               this.$refs.chartPit_gcc.myEcharts(seriesData);
-            }else if (res.data[i].id == '806') {
+            } else if (res.data[i].id == '806') {
               seriesData.push(res.data[i]);
               this.$refs.chartPit_dc.myEcharts(seriesData);
-            }else if (res.data[i].id == '802') {
+            } else if (res.data[i].id == '802') {
               seriesData.push(res.data[i]);
               this.$refs.chartPit_cs.myEcharts(seriesData);
-            }else if (res.data[i].id == '809') {
+            } else if (res.data[i].id == '809') {
               seriesData.push(res.data[i]);
               this.$refs.chartPit_pm.myEcharts(seriesData);
-            }else if (res.data[i].id == '812') {
+            } else if (res.data[i].id == '812') {
               seriesData.push(res.data[i]);
               this.$refs.chartPit_yx.myEcharts(seriesData);
-            }else if (res.data[i].id == '803') {
+            } else if (res.data[i].id == '803') {
               seriesData.push(res.data[i]);
               this.$refs.chartPit_jtsg.myEcharts(seriesData);
-            }else if (res.data[i].id == '805') {
+            } else if (res.data[i].id == '805') {
               seriesData.push(res.data[i]);
               this.$refs.chartPit_lz.myEcharts(seriesData);
-            }else if (res.data[i].id == '804') {
+            } else if (res.data[i].id == '804') {
               seriesData.push(res.data[i]);
               this.$refs.chartPit_sg.myEcharts(seriesData);
             }
@@ -242,251 +261,257 @@
       },
       /**事件类型、分布统计*/
       eventcatalogueBigData() {
-        eventcatalogueBigData().then(res => {
-          this.total = res.data.total;
-          for (let index in res.data.list) {
-            if(res.data.list[index].dictValue == 'forest_event_status_2'){
-              this.signIn=res.data.list[index].value;
-            }else if(res.data.list[index].dictValue == 'forest_event_status_5'){
-              this.conclude=res.data.list[index].value;
-            }else if(res.data.list[index].dictValue == 'forest_event_status_6'){
-              this.file=res.data.list[index].value;
+        let param = {
+          day: new Date().getFullYear(),
+          eventTypeId: Cookies.get("eventType").split(",")
+        }
+        getTotal(param).then(req => {
+          this.total = req.data[0].value
+        })
+        getEventStatusStatistics(param).then(res => {
+          for (let index in res.data) {
+              if(res.data[index].dictValue == 'forest_event_status_2'){
+                this.signIn=res.data[index].value;
+              }else if(res.data[index].dictValue == 'forest_event_status_5'){
+                this.conclude=res.data[index].value;
+              }else if(res.data[index].dictValue == 'forest_event_status_6'){
+                this.file=res.data[index].value;
+              }
             }
-          }
-          this.$refs.chartEvent.myEcharts(res.data.list);
-          this.initPieChartData();
+            this.$refs.chartEvent.myEcharts(res.data);
+            this.initPieChartData();
         })
-        deptBigData().then(res => {
+        deptBigData(param).then(res => {
           this.$refs.chartEvent.myEcharts2(res.data);
         })
       },
     },
-	}
+  }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-	@import '@/assets/styles/base.scss';
+  @import '@/assets/styles/base.scss';
 
 
-	.bigdata-con {
+  .bigdata-con {
     width: -webkit-fit-content;
-		height: 100%;
-		background: #01020c;
-
-		.el-loading-mask {
-			background: none;
-		}
-
-		.header {
-			height: 3rem;
-			display: flex;
-			align-items: center;
-
-			.header-left {
-				position: fixed;
-				left: 10px;
-				top: 5px;
-				display: flex;
-				align-items: center;
-				color: $inBlue;
-				font-family: $fontFk;
-
-				.title {
-					margin: 0 auto;
-					text-align: center;
-					background-image: -webkit-linear-gradient(bottom, rgba($color: #00f6ff, $alpha: 1.0), rgba($color: #005aff, $alpha: 1.0));
-					-webkit-background-clip: text;
-					-webkit-text-fill-color: transparent;
-					color: #fff;
-					font-size: 28px;
-				}
-			}
-
-			.bignav {
-				height: 40px;
-				position: fixed;
-				left: 50%;
-				transform: translateX(-50%);
-				top: 0;
-				z-index: 1000;
-				border-radius: 5px;
-				display: flex;
-				justify-content: cetner;
-				align-items: center;
-
-				.bignav-list {
-					background: url(../../assets/images/integrated/bigdata-header-nav-re.png) repeat-x center;
-					float: left;
-					display: flex;
-					justify-content: cetner;
-					align-items: center;
-					color: #fff;
-					height: 40px;
-					font-size: 12px;
-					padding: 0 23px;
-					cursor: pointer;
-					-webkit-transform: translateY(0);
-					transform: translateY(0);
-					transition: all 0.3s ease-in-out;
-				}
-
-				.router-link-active,
-				.bignav-list:hover {
-					filter: brightness(2.3);
-					-webkit-transform: translateY(2px);
-					transform: translateY(2px);
-					color: $inBlueHover;
-					border-bottom: 1px solid $inBlueHover;
-					transition: all 0.3s ease-in-out;
-
-				}
-			}
-
-
-		}
-
-		.bigdata-body {
-			margin: 15px;
-			display: flex;
-			align-items: top;
-			// justify-content: center;
-
-		}
-
-		.bigdata-list {
-			display: flex;
-			flex-direction: column;
-			flex-wrap: wrap;
-
-			.twins-con {
-				width: 100% !important;
-			}
-
-			.b-con {
-				width: 100%;
-				height: 28.5vh;
-
-				box-shadow: 0 0 1px rgba($color: #163696, $alpha: .1),
-					-0 -0 30px rgba($color: #163696, $alpha: .5) inset;
-
-				// display: flex;
-				// flex-direction: column;
-				.b-tit {
-					width: 100%;
-					display: flex;
-					align-items: center;
-					padding: 10px;
-
-					span {
-						font-size: 15px;
-						color: #00ceec;
-						margin-left: 5px;
-						text-shadow: 0 0 3px rgba($color: #41ff84, $alpha: .5),
-							-0 -0 10px rgba($color: #41fff8, $alpha: .9);
-					}
-				}
-
-				.twins {
-					width: 100%;
-					display: flex;
-					position: relative;
-
-					.count {
-						width: 100%;
-						color: #fff;
-						font-size: 12px;
-						position: absolute;
-						display: flex;
-						align-items: center;
-						left: 1rem;
-						top: 9px;
-						z-index: 100;
-
-						.count-z {
-							display: flex;
-							margin: 0 .5rem;
-
-							span {
-								margin-left: .4rem;
-								font-size: 1rem;
-								color: #2ee0fb !important;
-								font-weight: bolder;
-							}
-						}
-
-
-					}
-				}
-
-			}
-
-			.tall {
-				height: 59vh !important;
-			}
-
-			.taller {
-				height: 89.5vh !important;
-			}
-
-			.three {
-				display: flex;
-				flex-direction: column;
-			}
-
-			.el-row {
-				width: 100%;
-			}
-
-
-			.bigdata-map {
-				width: 100%;
-				height: 59vh;
-				position: relative;
-				background: #00101f;
-
-				.event-count {
-					color: #fff;
-					font-size: 14px;
-					font-weight: bolder;
-					padding: 10px;
-					background-color: #000000;
-					position: absolute;
-					top: 10px;
-					left: 10px;
-					z-index: 1000;
-
-					span {
-						font-size: 16px;
-						color: #d50000;
-					}
-				}
-
-			}
-
-		}
-
-		.wid-li-1 {
+    height: 100%;
+    background: #01020c;
+
+    .el-loading-mask {
+      background: none;
+    }
+
+    .header {
+      height: 3rem;
+      display: flex;
+      align-items: center;
+
+      .header-left {
+        position: fixed;
+        left: 10px;
+        top: 5px;
+        display: flex;
+        align-items: center;
+        color: $inBlue;
+        font-family: $fontFk;
+
+        .title {
+          margin: 0 auto;
+          text-align: center;
+          background-image: -webkit-linear-gradient(bottom, rgba($color: #00f6ff, $alpha: 1.0), rgba($color: #005aff, $alpha: 1.0));
+          -webkit-background-clip: text;
+          -webkit-text-fill-color: transparent;
+          color: #fff;
+          font-size: 28px;
+        }
+      }
+
+      .bignav {
+        height: 40px;
+        position: fixed;
+        left: 50%;
+        transform: translateX(-50%);
+        top: 0;
+        z-index: 1000;
+        border-radius: 5px;
+        display: flex;
+        justify-content: cetner;
+        align-items: center;
+
+        .bignav-list {
+          background: url(../../assets/images/integrated/bigdata-header-nav-re.png) repeat-x center;
+          float: left;
+          display: flex;
+          justify-content: cetner;
+          align-items: center;
+          color: #fff;
+          height: 40px;
+          font-size: 12px;
+          padding: 0 23px;
+          cursor: pointer;
+          -webkit-transform: translateY(0);
+          transform: translateY(0);
+          transition: all 0.3s ease-in-out;
+        }
+
+        .router-link-active,
+        .bignav-list:hover {
+          filter: brightness(2.3);
+          -webkit-transform: translateY(2px);
+          transform: translateY(2px);
+          color: $inBlueHover;
+          border-bottom: 1px solid $inBlueHover;
+          transition: all 0.3s ease-in-out;
+
+        }
+      }
+
+
+    }
+
+    .bigdata-body {
+      margin: 15px;
+      display: flex;
+      align-items: top;
+      // justify-content: center;
+
+    }
+
+    .bigdata-list {
+      display: flex;
+      flex-direction: column;
+      flex-wrap: wrap;
+
+      .twins-con {
+        width: 100% !important;
+      }
+
+      .b-con {
+        width: 100%;
+        height: 28.5vh;
+
+        box-shadow: 0 0 1px rgba($color: #163696, $alpha: .1),
+          -0 -0 30px rgba($color: #163696, $alpha: .5) inset;
+
+        // display: flex;
+        // flex-direction: column;
+        .b-tit {
+          width: 100%;
+          display: flex;
+          align-items: center;
+          padding: 10px;
+
+          span {
+            font-size: 15px;
+            color: #00ceec;
+            margin-left: 5px;
+            text-shadow: 0 0 3px rgba($color: #41ff84, $alpha: .5),
+              -0 -0 10px rgba($color: #41fff8, $alpha: .9);
+          }
+        }
+
+        .twins {
+          width: 100%;
+          display: flex;
+          position: relative;
+
+          .count {
+            width: 100%;
+            color: #fff;
+            font-size: 12px;
+            position: absolute;
+            display: flex;
+            align-items: center;
+            left: 1rem;
+            top: 9px;
+            z-index: 100;
+
+            .count-z {
+              display: flex;
+              margin: 0 .5rem;
+
+              span {
+                margin-left: .4rem;
+                font-size: 1rem;
+                color: #2ee0fb !important;
+                font-weight: bolder;
+              }
+            }
+
+
+          }
+        }
+
+      }
+
+      .tall {
+        height: 59vh !important;
+      }
+
+      .taller {
+        height: 89.5vh !important;
+      }
+
+      .three {
+        display: flex;
+        flex-direction: column;
+      }
+
+      .el-row {
+        width: 100%;
+      }
+
+
+      .bigdata-map {
+        width: 100%;
+        height: 59vh;
+        position: relative;
+        background: #00101f;
+
+        .event-count {
+          color: #fff;
+          font-size: 14px;
+          font-weight: bolder;
+          padding: 10px;
+          background-color: #000000;
+          position: absolute;
+          top: 10px;
+          left: 10px;
+          z-index: 1000;
+
+          span {
+            font-size: 16px;
+            color: #d50000;
+          }
+        }
+
+      }
+
+    }
+
+    .wid-li-1 {
       width: 396px;
-		}
+    }
 
-		.wid-li-2 {
-			width: 760px;
-		}
+    .wid-li-2 {
+      width: 760px;
+    }
 
-		.wid-li-3 {
-			width: 850px;
-		}
+    .wid-li-3 {
+      width: 850px;
+    }
 
-		.wid-li-4 {
-			width: 304px;
-		}
+    .wid-li-4 {
+      width: 304px;
+    }
 
-		.mg-b-20 {
-			margin-bottom: 2vh;
-		}
+    .mg-b-20 {
+      margin-bottom: 2vh;
+    }
 
-		.m-l-15 {
-			margin-left: .5%;
-		}
-	}
+    .m-l-15 {
+      margin-left: .5%;
+    }
+  }
 </style>

+ 19 - 16
src/views/eventdetailsdialog.vue

@@ -3449,22 +3449,25 @@
       Meeting() {
         //弹出发送会议短信弹窗
         let that = this;
-        that.$alert(
-          "如您已经安装请点击【确定】,如未安装可<a style='text-decoration:underline;color:blue;' href='http://172.18.1.37:15001/CLOUDMeeting_Win.exe'>点击此处</a>进行下载",
-          "该功能需要使用云会议客户端", {
-            confirmButtonText: "确定",
-            dangerouslyUseHTMLString: true,
-            callback: (action) => {
-              let param = {
-                eventCode: that.eventCode,
-              };
-              centereventtdepteventList(param).then((res) => {
-                that.depteventList = res.data;
-                that.showMeetingMsgDialog = true;
-              });
-            },
-          }
-        );
+        selectConfigKey('meeting_plugin_url').then(response => {
+          that.$alert(
+            "如您已经安装请点击【确定】,如未安装可<a style='text-decoration:underline;color:blue;' href='"+response.data+"'>点击此处</ a>进行下载",
+            "该功能需要使用云会议客户端",
+            {
+              confirmButtonText: "确定",
+              dangerouslyUseHTMLString: true,
+              callback: (action) => {
+                let param = {
+                  eventCode: that.eventCode,
+                };
+                centereventtdepteventList(param).then((res) => {
+                  that.depteventList = res.data;
+                  that.showMeetingMsgDialog = true;
+                });
+              },
+            }
+          );
+        })
       },
       /** ----------------------------------视频会议结束------------------------------------- */
     },

+ 18 - 15
src/views/firespread.vue

@@ -3010,22 +3010,25 @@
       },
       Meeting() { //弹出发送会议短信弹窗
         let that = this;
-        that.$alert(
-          "如您已经安装请点击【确定】,如未安装可<a style='text-decoration:underline;color:blue;' href='http://172.18.1.37:15001/CLOUDMeeting_Win.exe'>点击此处</a>进行下载",
-          '该功能需要使用云会议客户端', {
-            confirmButtonText: '确定',
-            dangerouslyUseHTMLString: true,
-            callback: action => {
-              let param = {
-                eventCode: that.eventCode
-              }
-              centereventtdepteventList(param).then(res => {
-                that.depteventList = res.data
-                that.showMeetingMsgDialog = true
-                that.initDutysystemTableData();
-              })
+        selectConfigKey('meeting_plugin_url').then(response => {
+          that.$alert(
+            "如您已经安装请点击【确定】,如未安装可<a style='text-decoration:underline;color:blue;' href='"+response.data+"'>点击此处</ a>进行下载",
+            "该功能需要使用云会议客户端",
+            {
+              confirmButtonText: "确定",
+              dangerouslyUseHTMLString: true,
+              callback: (action) => {
+                let param = {
+                  eventCode: that.eventCode,
+                };
+                centereventtdepteventList(param).then((res) => {
+                  that.depteventList = res.data;
+                  that.showMeetingMsgDialog = true;
+                });
+              },
             }
-          });
+          );
+        })
       },
       /** ----------------------------------视频会议结束------------------------------------- */
       /** ----------------------------------海康摄像头预览结束------------------------------------- */

+ 1 - 3
src/views/forest.vue

@@ -521,7 +521,6 @@
       setTimeout(() => {
         this.getResourcesCount();
         this.getTodayEvents(this.getCurrentDataStr())
-
         this.getWeather(this.getCurrentDataStr())
         this.getEventList(this.getCurrentDataStr(), this.pageSize, this.pageNum)
         this.getEventByEventType(this.getCurrentDataStr())
@@ -753,7 +752,7 @@
               }
             }
           }
-          that.$refs.supermap.clearM(false);
+          that.$refs.supermap.clearM();
           that.$refs.supermap.setMarkers(that.markersList);
         });
       },
@@ -814,7 +813,6 @@
           "                </div>" +
           "                </div>" +
           "                </span></div>";
-        let that = this
         return markersMap;
       },
       sewageOutletClick(data) {