Переглянути джерело

应急可视化 应急资源

彭宇 2 роки тому
батько
коміт
f2bd1ce4f3
3 змінених файлів з 23 додано та 402 видалено
  1. 0 17
      src/api/components/supermap.js
  2. 3 3
      src/api/datacenter.js
  3. 20 382
      src/views/datacenter.vue

+ 0 - 17
src/api/components/supermap.js

@@ -23,26 +23,9 @@ export const iconList = {
   'sj-icon-map-slfh': require('@/assets/icons/sj-icon-map/sj-icon-map-slfh.png'),
   'sj-icon-map-syqd': require('@/assets/icons/sj-icon-map/sj-icon-map-syqd.png'),
   'sj-icon-map-xhs': require('@/assets/icons/sj-icon-map/sj-icon-map-xhs.png'),
-  //今日事件图标
-  'sj-icon-map-wcl': require('@/assets/icons/sj-icon-map/sj-icon-map-wcl.png'),
-  'sj-icon-map-clz': require('@/assets/icons/sj-icon-map/sj-icon-map-clz.png'),
-  'sj-icon-map-ywc': require('@/assets/icons/sj-icon-map/sj-icon-map-ywc.png'),
-  'sj-icon-map-rg': require('@/assets/icons/sj-icon-map/sj-icon-map-rg.png'),
-  'sj-icon-map-hx': require('@/assets/icons/sj-icon-map/sj-icon-map-hx.png'),
-  'sj-icon-map-kk': require('@/assets/icons/sj-icon-map/sj-icon-map-kk.png'),
 
 
 
-  //首页事件弹窗资源
-  'sj-icon-waterintake': require('@/assets/icons/sj-icon-map/sj-icon-map-qsk.png'),//取水口
-  'sj-icon-watercrane': require('@/assets/icons/sj-icon-map/sj-icon-map-sh.png'),//水鹤
-  'sj-icon-firehydrant': require('@/assets/icons/sj-icon-map/sj-icon-map-xhs.png'),//消防栓
-  'sj-icon-landing': require('@/assets/icons/sj-icon-map/sj-icon-map-qjd.png'),//起降点
-  'sj-icon-checkpoint': require('@/assets/icons/sj-icon-map/sj-icon-map-fhjcz.png'),//检查站
-  'sj-icon-fireteam': require('@/assets/icons/sj-icon-map/sj-icon-map-slfh.png'),//防火队
-  'sj-icon-tcqh': require('@/assets/icons/sj-icon-map/sj-icon-map-syqd.png'),//重点区域
-
-
   //首页事件上报状态
   'sj-icon-map-xinshangbao': require('@/assets/icons/sj-icon-map/sj-icon-map-xinshangbao.png'),//新上报
   'sj-icon-map-cuiban': require('@/assets/icons/sj-icon-map/sj-icon-map-cuiban.png'),//催办

+ 3 - 3
src/api/datacenter.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 获取左侧菜单列表
 export function getResource() {
   return request({
-    url: '/center-emergency/VisuForestDataCenterController/getResource',
+    url: '/center-emergency/VisuEmergencyCenterDataController/getResource',
     method: 'post',
   })
 }
@@ -11,7 +11,7 @@ export function getResource() {
 //点击左侧菜单列表查询落点
 export function getResourcePoint(resourceTable) {
   return request({
-    url: '/center-emergency/VisuForestDataCenterController/getResourcePoint',
+    url: '/center-emergency/VisuEmergencyCenterDataController/getResourcePoint',
     method: 'post',
     data:{"resourceTable":resourceTable}
   })
@@ -19,7 +19,7 @@ export function getResourcePoint(resourceTable) {
 //点击右侧菜单列表查询落点
 export function getResourcePointByDeptId(resourceTable,deptId) {
   return request({
-    url: '/center-emergency/VisuForestDataCenterController/getResourcePoint',
+    url: '/center-emergency/VisuEmergencyCenterDataController/getResourcePoint',
     method: 'post',
     data:{"resourceTable":resourceTable,"deptId":deptId}
   })

+ 20 - 382
src/views/datacenter.vue

@@ -31,34 +31,6 @@
                 :mapSite="{doubleClickZoom:false}" :codes="['9fa5']" :isSideBySide="false"></supermap>
       <!--      <button @click="showEventInfo1" style="position: absolute; right: 50%;top: 45%;z-index: 1000;">弹层事件演示用按钮-->
       <!--      </button>-->
-      <!-- 右侧 -->
-      <div class="rightbar" :class="indentright" ref="right">
-        <div class="forthis">
-          <dv-border-box-13 backgroundColor="rgba(12, 19, 38, .90)" style="padding-bottom: 1rem;">
-            <img src="../assets/images/integrated/light.png" style="width: 100%; margin-top: .4rem;"/>
-            <div class="this-title">
-              <span>数据分布</span>
-              <dv-decoration-3 style="width:150px;height:15px;margin-right: 1rem;"/>
-            </div>
-            <div class="i-list-con h-73">
-              <div class="overflow-y" style="height: 39vh">
-                <div class="d-l-con" :class="{on:listCurrentIndex==item.deptId}"
-                     v-for="(item,index) in deptGroupList"
-                     v-on:click="indentleftByDeptIdSetMarkers(item.deptId)">
-                  <div class="d-l-l-text">
-                    <i class="i-small"></i>
-                    <h4>{{ item.deptName }}</h4>
-                  </div>
-                  <div class="d-l-l-count">{{ item.count }}</div>
-                </div>
-              </div>
-              <div class="overflow-y" style="height: 34vh;">
-                <div id="data-chart" style="width: 100%;height:34vh;"></div>
-              </div>
-            </div>
-          </dv-border-box-13>
-        </div>
-      </div>
       <vBottomMenu ref="bottomMenu"></vBottomMenu>
 <!--      <el-tooltip :content="indentText" placement="top" :disabled="indentdisabled">-->
 <!--        <div class="mascot" ref="mascot" :class="indentStyle" @click="indent"><img-->
@@ -200,104 +172,6 @@ export default {
       this.$refs.supermap.layerSwitchingList(urlList)
     },
     /** ----------------------------------底部按钮公用组件结束------------------------------------- */
-    //数据分布chart
-    dataChat() {
-      // 基于准备好的dom,初始化echarts实例
-      let myChart = echarts.init(document.getElementById('data-chart'))
-      // 绘制图表
-      const dfColor = ['#92E1FF', '#0097FB', '#30ECA6', '#FFC227', '#FF4848']
-      myChart.setOption({
-        dataset: {
-          source: this.source
-        },
-        tooltip: {
-          trigger: 'item'
-
-        },
-        grid: {
-          top: '5%',
-          left: '2%',
-          // right: "4%",
-          bottom: '-15%',
-          width: '75%',
-          containLabel: true
-        },
-        xAxis: {
-          show: false,
-          type: 'value'
-        },
-        yAxis: {
-          type: 'category', // 不设置类目轴,抽离的dataset数据展示不出来
-          inverse: true,
-          axisLabel: {
-            show: true,
-            textStyle: {
-              color: '#5deaff',
-              fontSize: '12'
-            }
-          },
-          splitLine: {
-            show: false
-          },
-          axisTick: {
-            show: false
-          },
-          axisLine: {
-            show: false
-          }
-        },
-
-        series: [{
-
-          type: 'bar',
-          animationCurve: 'easeOutBack',
-          barWidth: 5,
-          label: {
-            show: true,
-            position: 'right',
-            offset: [0, 0],
-            color: '#88dfd5',
-            // fontSize: "12",
-            style: {
-              fill: '#fff'
-            }
-          },
-          backgroundBar: {
-            show: true,
-            style: {
-              fill: 'rgba(97,152,255,0.20)'
-            }
-          },
-          barStyle: {
-            stroke: 'rgba(41,244,236,1)'
-          },
-          gradient: {
-            color: ['rgba(41,244,236,1)', 'rgba(41,244,236,0)']
-          },
-          itemStyle: {
-            label: {
-              show: true
-            },
-            labelLine: {
-              show: false
-            },
-            color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [{
-              offset: 0,
-              color: 'rgba(41,244,236,0)'
-            },
-              {
-                offset: 1,
-                color: 'rgba(41,244,236,.5)'
-              }
-            ]),
-            borderColor: '#a2f9f7',
-            shadowBlur: 16,
-            shadowColor: '#a2f9f7'
-          }
-        }]
-      })
-
-    },
 
     //吉祥物收起左右框
     indent() {
@@ -334,7 +208,6 @@ export default {
           that.$set(that.resourcesList[index], 'icon', 'sj' + '-' + 'icon' + '-' + data
             .resourceTable.split('_').slice(-1))
         })
-        console.log(that.resourcesList)
 
       })
     },
@@ -364,151 +237,8 @@ export default {
               keepBindPopup: false,
               isAggregation: false
             }
-            if (resourceTable == 'centerdata_t_forest_weatherstation') { //气象站
-              markersMap.icon = 'sj-icon-map-centerdata-t-forest-weatherstation'
-              markersMap.lng = res.data.resourceList[i].longitude
-              markersMap.lat = res.data.resourceList[i].latitude
-              markersMap.bindPopupHtml = '<div class="map-tip">' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>经纬度:' + res.data.resourceList[i].longitude + ',' + res
-                  .data.resourceList[i].latitude + '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>地址:' + res.data.resourceList[i].weatherstationAddress +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>联系人:' + res.data.resourceList[i].weatherstationPerson +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>电话:' + res.data.resourceList[i].weatherstationTel +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span></div>'
-            } else if (resourceTable == 'centerdata_t_forest_farm') { //林场
-              markersMap.icon = 'sj-icon-map-centerdata-t-forest-farm'
-              markersMap.lng = res.data.resourceList[i].longitude
-              markersMap.lat = res.data.resourceList[i].latitude
-              markersMap.bindPopupHtml = '<div class="map-tip">' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>经纬度:' + res.data.resourceList[i].longitude + ',' + res
-                  .data.resourceList[i].latitude + '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>林场名称:' + res.data.resourceList[i].farmName + '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>联系人:' + res.data.resourceList[i].farmPerson + '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>电话:' + res.data.resourceList[i].farmTel + '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span></div>'
-            } else if (resourceTable == 'centerdata_t_forest_landing') { //起降点
-              markersMap.icon = 'sj-icon-map-centerdata-t-forest-landing'
-              markersMap.lng = res.data.resourceList[i].longitude
-              markersMap.lat = res.data.resourceList[i].latitude
-              markersMap.bindPopupHtml = '<div class="map-tip">' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>经纬度:' + res.data.resourceList[i].longitude + ',' + res
-                  .data.resourceList[i].latitude + '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>起降点名称:' + res.data.resourceList[i].landingName +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>联系人:' + res.data.resourceList[i].landingPerson +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>电话:' + res.data.resourceList[i].landingTel + '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span></div>'
-            } else if (resourceTable == 'centerdata_t_forest_channel') { //水源渠道
-              markersMap.icon = 'sj-icon-map-centerdata-t-forest-channel'
-              markersMap.lng = res.data.resourceList[i].longitude
-              markersMap.lat = res.data.resourceList[i].latitude
-              markersMap.bindPopupHtml = '<div class="map-tip">' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>经纬度:' + res.data.resourceList[i].longitude + ',' + res
-                  .data.resourceList[i].latitude + '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>渠道名称:' + res.data.resourceList[i].channelName +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>联系人:' + res.data.resourceList[i].channelPerson +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>电话:' + res.data.resourceList[i].channelTel + '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span></div>'
-            } else if (resourceTable == 'centerdata_t_forest_checkpoint') { //防火检查站
-              markersMap.icon = 'sj-icon-map-centerdata-t-forest-checkpoint'
+            if (resourceTable == 'centerdata_t_emergency_warehouse') { //仓库
+              markersMap.icon = 'marker'
               markersMap.lng = res.data.resourceList[i].longitude
               markersMap.lat = res.data.resourceList[i].latitude
               markersMap.bindPopupHtml = '<div class="map-tip">' +
@@ -523,37 +253,14 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>检查站名称:' + res.data.resourceList[i].checkpointName +
+                '                  <h4>仓库名称:' + res.data.resourceList[i].warehouseName +
                 '</h4>' +
                 '                </div>' +
                 '                </div>' +
                 '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>地址:' + res.data.resourceList[i].checkpointAddress +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>联系人:' + res.data.resourceList[i].checkpointPerson +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>电话:' + res.data.resourceList[i].checkpointTel +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span></div>'
-            } else if (resourceTable == 'centerdata_t_forest_waterintake') { //取水口
-              markersMap.icon = 'sj-icon-map-centerdata-t-forest-waterintake'
+                '</div>'
+            } else if (resourceTable == 'centerdata_t_emergency_team') { //队伍
+              markersMap.icon = 'marker'
               markersMap.lng = res.data.resourceList[i].longitude
               markersMap.lat = res.data.resourceList[i].latitude
               markersMap.bindPopupHtml = '<div class="map-tip">' +
@@ -568,66 +275,35 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>取水口名称:' + res.data.resourceList[i].waterintakeName +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>联系人:' + res.data.resourceList[i].waterintakePerson +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>电话:' + res.data.resourceList[i].waterintakeTel +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span></div>'
-            } else if (resourceTable == 'centerdata_t_forest_watercrane') { //水鹤
-              markersMap.icon = 'sj-icon-map-centerdata-t-forest-watercrane'
-              markersMap.lng = res.data.resourceList[i].longitude
-              markersMap.lat = res.data.resourceList[i].latitude
-              markersMap.bindPopupHtml = '<div class="map-tip">' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>经纬度:' + res.data.resourceList[i].longitude + ',' + res
-                  .data.resourceList[i].latitude + '</h4>' +
+                '                  <h4>队伍名称:' + res.data.resourceList[i].teamName + '</h4>' +
                 '                </div>' +
                 '                </div>' +
                 '                </span>' +
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>水鹤名称:' + res.data.resourceList[i].watercraneName +
-                '</h4>' +
+                '                  <h4>擅长领域:' + res.data.resourceList[i].expertiseAreas + '</h4>' +
                 '                </div>' +
                 '                </div>' +
                 '                </span>' +
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>联系人:' + res.data.resourceList[i].watercranePerson +
-                '</h4>' +
+                '                  <h4>队伍人数(正式):' + res.data.resourceList[i].personnumberZ + '</h4>' +
                 '                </div>' +
                 '                </div>' +
                 '                </span>' +
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>电话:' + res.data.resourceList[i].watercraneTel +
-                '</h4>' +
+                '                  <h4>队伍人数(合同):' + res.data.resourceList[i].personnumberH + '</h4>' +
                 '                </div>' +
                 '                </div>' +
-                '                </span></div>'
-            } else if (resourceTable == 'centerdata_t_forest_firehydrant') { //消火栓
-              markersMap.icon = 'sj-icon-map-centerdata-t-forest-firehydrant'
+                '                </span>'+
+                '</div>'
+            } else if (resourceTable == 'centerdata_t_emergency_patrolpoint') { //巡更点
+              markersMap.icon = 'marker'
+              markersMap.isAggregation = true
               markersMap.lng = res.data.resourceList[i].longitude
               markersMap.lat = res.data.resourceList[i].latitude
               markersMap.bindPopupHtml = '<div class="map-tip">' +
@@ -642,7 +318,7 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>消火栓名称:' + res.data.resourceList[i].firehydrantName +
+                '                  <h4>巡更点名称:' + res.data.resourceList[i].patrolpointName +
                 '</h4>' +
                 '                </div>' +
                 '                </div>' +
@@ -650,7 +326,7 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>地址:' + res.data.resourceList[i].firehydrantAddress +
+                '                  <h4>隶属企业:' + res.data.resourceList[i].enterpriseName +
                 '</h4>' +
                 '                </div>' +
                 '                </div>' +
@@ -658,60 +334,22 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>联系人:' + res.data.resourceList[i].firehydrantPerson +
-                '</h4>' +
+                '                  <h4>负责人:' + res.data.resourceList[i].charger + '</h4>' +
                 '                </div>' +
                 '                </div>' +
                 '                </span>' +
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>电话:' + res.data.resourceList[i].firehydrantTel +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span></div>'
-            } else if (resourceTable == 'centerdata_t_forest_fireteam') { //森林防火队
-              markersMap.icon = 'sj-icon-map-centerdata-t-forest-fireteam'
-              markersMap.lng = res.data.resourceList[i].longitude
-              markersMap.lat = res.data.resourceList[i].latitude
-              markersMap.bindPopupHtml = '<div class="map-tip">' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>经纬度:' + res.data.resourceList[i].longitude + ',' + res
-                  .data.resourceList[i].latitude + '</h4>' +
+                '                  <h4>负责人电话:' + res.data.resourceList[i].chargerPhone + '</h4>' +
                 '                </div>' +
                 '                </div>' +
                 '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>森林防火队名称:' + res.data.resourceList[i].fireteamName +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>联系人:' + res.data.resourceList[i].fireteamPerson +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>电话:' + res.data.resourceList[i].fireteamTel + '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span></div>'
+                '</div>'
             }
             that.markersList.push(markersMap)
           }
         }
-        this.dataChat()
         that.$refs.supermap.clearM(false)
         that.$refs.supermap.setMarkers(that.markersList)
       })