Home Explore Help
Sign In
wangtao
/
mh_fire
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

接口对接修复

wangtao 3 years ago
parent
9c325094b8
commit
88e72dd5af
28 changed files with 787 additions and 708 deletions
Split View Show Diff Stats
  1. 2 2
      proxy-dev.js
  2. 6 3
      proxy-pro.js
  3. 3 3
      public/index.html
  4. BIN
      src/assets/img/home/home_bg.jpg
  5. BIN
      src/assets/img/home/home_bg4.jpg
  6. BIN
      src/assets/img/home/home_bg5.jpg
  7. 16 0
      src/assets/js/common.js
  8. 3 5
      src/components/category-enterprise/index.vue
  9. 3 1
      src/components/category-line/index.vue
  10. 3 6
      src/components/category/index.vue
  11. 5 8
      src/components/category/index2.vue
  12. 78 78
      src/components/mixins/map-data.js
  13. 41 27
      src/components/mixins/map-gaodecom.js
  14. 314 225
      src/components/scatter/index.vue
  15. 27 5
      src/components/se-table/index2.vue
  16. 96 0
      src/components/se-table/index3.vue
  17. 3 3
      src/http/api.js
  18. 2 2
      src/store/index.js
  19. 8 8
      src/views/comprehensive-disposal.vue
  20. 5 5
      src/views/enforcement-dynamic.vue
  21. 46 47
      src/views/fire-data-analysis.vue
  22. 4 4
      src/views/fire-signs.vue
  23. 2 2
      src/views/head.vue
  24. 102 254
      src/views/rescue-station.vue
  25. 2 2
      src/views/security-plan.vue
  26. 2 2
      src/views/self-management.vue
  27. 10 12
      src/views/water-sources.vue
  28. 4 4
      vue.config.js

+ 2 - 2
proxy-dev.js
View File 

@@ -9,8 +9,8 @@ module.exports = {
 
             //target: 'http://120.55.70.156/api',
 
 
 
-            //target: 'http://172.16.120.104:8083', //本地
 
-            target: 'http://32.0.15.107:8080/api/', //闵行
 
+            target: 'http://172.16.120.104:8083', //本地
 
+            //target: 'http://32.0.15.107:8080/api/', //闵行
 
             //target: 'http://172.200.50.85:8080/api/', //闵行杨强
 
 
             ws: true, // 代理websockets

+ 6 - 3
proxy-pro.js
View File 

@@ -3,9 +3,12 @@
 
 module.exports = {
 
     table: [{
 
         context: ['/'],
 
-        target: 'http://32.0.15.107:8080/api/',
 
-        //target: 'http://101.133.214.75:81/api',
 
-        
+        //target: 'http://32.0.15.107:8080/api/',
 
+        target: 'http://101.133.214.75:81/api',
 
+
 
+
 
+
 
+
 
 
         changeOrigin: true,
 
         pathRewrite: { '': '/' }, // '^/api' 是一个正则表达式，作用：将 /api 提换成为 /

+ 3 - 3
public/index.html
View File 

@@ -10,10 +10,10 @@
 
         <%= htmlWebpackPlugin.options.title %>
 
     </title>
 
     <!-- 高德地图 -->
 
-    <!-- <script type="text/javascript" src="https://webapi.amap.com/maps?v=1.4.15&key=8e266e1ac2ad2383c7773ff504ac248f"></script>
 
-    <script type="text/javascript" src="//webapi.amap.com/ui/1.1/main.js"></script> -->
 
+    <script type="text/javascript" src="https://webapi.amap.com/maps?v=1.4.15&key=8e266e1ac2ad2383c7773ff504ac248f"></script>
 
+    <script type="text/javascript" src="//webapi.amap.com/ui/1.1/main.js"></script>
 
     <!-- 大数据地图 -->
 
-    <script src="http://gis.dcp.shmh.gov.cn/mh_map/js/index_v1.0.js"></script>
 
+    <!-- <script src="http://gis.dcp.shmh.gov.cn/mh_map/js/index_v1.0.js"></script> -->
 
 </head>
 
 
 <body>

BIN
src/assets/img/home/home_bg.jpg
View File


BIN
src/assets/img/home/home_bg4.jpg
View File


BIN
src/assets/img/home/home_bg5.jpg
View File


+ 16 - 0
src/assets/js/common.js
View File 

@@ -0,0 +1,16 @@
 
+/** 
+ * 检索字符出现次数
 
+ * ***/
 
+function frequency(str, retrieval) {
 
+    var index = str.indexOf(retrieval); // 字符出现的位置
 
+    var num = 0; // 这个字符出现的次数
 
+    while (index !== -1) {
 
+        //console.log(index); // 打印字符串出现的位置
 
+        num++; // 每出现一次 次数加一
 
+        index = str.indexOf(retrieval, index + 1); // 从字符串出现的位置的下一位置开始继续查找
 
+    }
 
+    return num
 
+}
 
+export {
 
+    frequency
 
+}

+ 3 - 5
src/components/category-enterprise/index.vue
View File 

@@ -37,7 +37,6 @@ export default {
 
           type: "category",
 
           data:this.xData,
 
           axisLabel: {
 
-            color: "#FFFFFF",
 
             textStyle: {
 
             color: "#FFF",
 
             fontSize:'16'
 
@@ -70,11 +69,10 @@ export default {
 
           },
 
           type: "value",
 
           axisLabel: {
 
-            color: "#FFFFFF",
 
             textStyle: {
 
-            color: "#FFF",
 
-            fontSize:'16'
 
-          },
 
+              color: "#FFF",
 
+              fontSize:'16'
 
+            },
 
           },
 
           splitLine: {
 
             lineStyle: {

+ 3 - 1
src/components/category-line/index.vue
View File 

@@ -1,7 +1,6 @@
 
 <template>
 
   <div ref="echartD" style="width: 100%; height: 100%"></div>
 
 </template>
 
-
 
 <script>
 
 import * as echarts from "echarts";
 
 export default {
 
@@ -31,6 +30,9 @@ export default {
 
             right: 30,
 
             bottom: 30,
 
           },
 
+          legend: {
 
+              data: ['当前', '年平均值', '总年平均值']
 
+          },
 
           xAxis: {
 
             type: "category",
 
             data: [

+ 3 - 6
src/components/category/index.vue
View File 

@@ -44,7 +44,7 @@ export default {
 
       echarts.init(this.$refs.echartD).setOption({
 
         grid: {
 
           top: 30,
 
-          left: 50,
 
+          left: 80,
 
           right: 30,
 
           bottom: 30,
 
         },
 
@@ -83,19 +83,16 @@ export default {
 
           type: "value",
 
           axisLabel: {
 
             textStyle: {
 
-              color: '#fff'
 
+              color: '#fff',
 
+              fontSize:16
 
             }
 
             
           },
 
-          
           splitLine: {
 
             lineStyle: {
 
               // color: "rgba(255,255,255,.4)",
 
               color: "#FFFFFF",
 
             },
 
-          },
 
-          axisLabel: {
 
-            fontSize:16
 
           }
 
         },
 
         series: [

+ 5 - 8
src/components/category/index2.vue
View File 

@@ -87,7 +87,6 @@ export default {
 
               textStyle: {
 
                 color: '#fff'
 
               }
 
-              
             },
 
             
             splitLine: {
 
@@ -127,6 +126,7 @@ export default {
 
             type: "category",
 
             data: this.xData,
 
             axisLabel: {
 
+              color: "#FFFFFF",
 
               textStyle: {
 
                 color: '#fff'
 
               },
 
@@ -155,20 +155,17 @@ export default {
 
             type: "value",
 
             axisLabel: {
 
               textStyle: {
 
-                color: '#fff'
 
-              }
 
-              
+                color: "#FFF",
 
+                fontSize:'16'
 
+              },
 
             },
 
             
             splitLine: {
 
               lineStyle: {
 
-                // color: "rgba(255,255,255,.4)",
 
                 color: "#FFFFFF",
 
               },
 
             },
 
-            axisLabel: {
 
-              fontSize:16
 
-            }
 
+            
           },
 
           series: [
 
             {

+ 78 - 78
src/components/mixins/map-data.js
View File 

@@ -9,9 +9,9 @@ export default {
 
             icon1: require('@a/img/icon/qx.svg'),
 
             icon2: require('@a/img/icon/jy.svg'),
 
             icon3: require('@a/img/icon/hz.svg'),
 
-            img:require('@a/img/icon/close.png'),
 
+            img: require('@a/img/icon/close.png'),
 
             map: null,
 
-            time:false,
 
+            time: false,
 
             mapPolList: [],
 
             colorList: [
 
                 ['#99e', "#F33"],
 
@@ -48,7 +48,7 @@ export default {
 
         window.vue = this;
 
         window.jMap = null;
 
         window.jmapQuery = null;
 
-       
+
 
     },
 
     methods: {
 
         async initMap() {
 
@@ -79,7 +79,7 @@ export default {
 
             window.jMap.createMap("mapF", res.data, window.location.origin, map_params, {});
 
             // 地图样式
 
             window.jMap.switchBaseLayer('dark')
 
-            // window.jMap.switchBaseLayer('light')
 
+                // window.jMap.switchBaseLayer('light')
 
                 // 增加街镇边界
 
             let options = {
 
                 click: (val) => {
 
@@ -102,13 +102,13 @@ export default {
 
                         backgroundColor: 'rgb(0,0,0)',
 
                         showBackground: false
 
                     }
 
-                    
+
 
                 },
 
                 // where:"name != '江川路街道'"
 
             }
 
             window.jMap.addLayer('mh_dyn_district', [1], options)
 
                 // 街镇标题
 
-            if(document.body.clientWidth >1940){
 
+            if (document.body.clientWidth > 1940) {
 
                 var qp = new JMapQueryParam({
 
                     queryMapService: 'mh_dyn_district',
 
                     queryMapLayers: [1],
 
@@ -125,7 +125,7 @@ export default {
 
                         });
 
                     }
 
                 })
 
-            }else{
 
+            } else {
 
                 var qp = new JMapQueryParam({
 
                     queryMapService: 'mh_dyn_district',
 
                     queryMapLayers: [1],
 
@@ -160,73 +160,73 @@ export default {
 
             this.map.remove(lnglats);
 
         },
 
         // 创建标点和点击事件
 
-         addMarker(lnglats, type) {
 
+        addMarker(lnglats, type) {
 
             let icon = ''
 
-            if(type =="selfManagement"){
 
+            if (type == "selfManagement") {
 
                 var lnglats = lnglats[0]
 
             }
 
             var target = lnglats.map((val, ind) => {
 
                 if (type == 'selfManagement') {
 
-                    
-                    if(val.ajlx =="火灾"){
 
+
 
+                    if (val.ajlx == "火灾") {
 
                         icon = this.icon3
 
-                    }else
 
-                    if(val.ajlx =="抢险救援"){
 
+                    } else
 
+                    if (val.ajlx == "抢险救援") {
 
                         icon = this.icon1
 
-                    }else if(val.ajlx =="社会救助"){
 
+                    } else if (val.ajlx == "社会救助") {
 
                         icon = this.icon2
 
-                    }else{
 
+                    } else {
 
                         icon = this.icon2
 
                     }
 
-                    
-                }else{
 
+
 
+                } else {
 
                     icon = val.waterAdministrative === '单位' ? this.icon1 : val.waterAdministrative === '市政' ? this.icon2 : val.waterAdministrative === '社区' || val.waterAdministrative === '居民' ? this.icon3 : this.icon1
 
                 }
 
-                if(type =="selfManagement" || type =="water"){
 
+                if (type == "selfManagement" || type == "water") {
 
                     let marker = {
 
                         id: ind + 1,
 
                         attrbutes: val,
 
                         position: { x: val.gisX, y: val.gisY, z: 0 },
 
-                        image: { url: icon,width:240,height:240 },
 
+                        image: { url: icon, width: 240, height: 240 },
 
                     };
 
                     return marker
 
-               
-                }else{
 
+
 
+                } else {
 
                     let marker = {
 
                         id: ind + 1,
 
                         attrbutes: val,
 
                         position: { x: val.gisBaiDuX, y: val.gisBaiDuY, z: 0 },
 
-                        image: { url: icon,width:240,height:240 },
 
+                        image: { url: icon, width: 240, height: 240 },
 
                     };
 
                     return marker
 
                 }
 
-                
-                
+
 
+
 
             })
 
             window.jMap.Locate.pointLocate(target, {
 
                 isZoom: false,
 
                 scaleByDistance: { minScaling: 0, maxScaling: 1, minDistance: 1000, maxDistance: 30000 },
 
                 click: (val) => {
 
-                    if(type =="selfManagement"){
 
+                    if (type == "selfManagement") {
 
                         this.$axios.get(this.$api.jqzhcz.one +
 
                             "?" +
 
                             this.$qs.stringify({
 
                                 id: val.attrbutes.id,
 
                             })
 
-                        ).then(res =>{
 
+                        ).then(res => {
 
                             console.log(res.data)
 
                             this.$store.commit('ajxq2nr', { ajxq2nr: res.data });
 
-                            
+
 
                             // this.elementInfo(res.data, type)
 
-                            
+
 
                         })
 
-                    }else{
 
+                    } else {
 
                         this.elementInfo(value, type)
 
                     }
 
-                    
-                   
+
 
+
 
                 }
 
-                
+
 
             })
 
         },
 
         // 无经纬度创建标点和点击事件
 
@@ -279,53 +279,53 @@ export default {
 
             // this.timer = setTimeout(() => {
 
             //     window.jMap.Popup.hide()
 
             // }, 8000)
 
-      
+
 
             // setTimeout(()=>{
 
             //     if(this.time){
 
 
             //     }
 
-                
+
 
             // },8000)
 
-            if(!value.ajbh){
 
-                value.ajbh ='--'
 
+            if (!value.ajbh) {
 
+                value.ajbh = '--'
 
             }
 
-            if(!value.tzsj){
 
-                value.tzsj ='--'
 
+            if (!value.tzsj) {
 
+                value.tzsj = '--'
 
             }
 
-            if(!value.bcxx){
 
-                value.bcxx ='--'
 
+            if (!value.bcxx) {
 
+                value.bcxx = '--'
 
             }
 
-            if(!value.ajlx){
 
-                value.ajlx ='--'
 
+            if (!value.ajlx) {
 
+                value.ajlx = '--'
 
             }
 
-            if(!value.afdz){
 
-                value.afdz ='--'
 
+            if (!value.afdz) {
 
+                value.afdz = '--'
 
             }
 
-            if(!value.zhongdui){
 
-                value.zhongdui ='--'
 
+            if (!value.zhongdui) {
 
+                value.zhongdui = '--'
 
             }
 
-            if(!value.ajzt){
 
-                value.ajzt ='--'
 
+            if (!value.ajzt) {
 
+                value.ajzt = '--'
 
             }
 
-            if(!value.dcsj){
 
-                value.dcsj ='--'
 
+            if (!value.dcsj) {
 
+                value.dcsj = '--'
 
             }
 
-            if(!value.cssj){
 
-                value.cssj ='--'
 
+            if (!value.cssj) {
 
+                value.cssj = '--'
 
             }
 
-            if(!value.kzsj){
 
-                value.kzsj ='--'
 
+            if (!value.kzsj) {
 
+                value.kzsj = '--'
 
             }
 
-            if(!value.xmsj){
 
-                value.xmsj ='--'
 
+            if (!value.xmsj) {
 
+                value.xmsj = '--'
 
             }
 
-            if(!value.fdsj){
 
-                value.fdsj ='--'
 
+            if (!value.fdsj) {
 
+                value.fdsj = '--'
 
             }
 
-            if(!value.streettown){
 
-                value.streettown ='--'
 
+            if (!value.streettown) {
 
+                value.streettown = '--'
 
             }
 
-            
+
 
             let element = ''
 
             if (type === 'water') {
 
                 element = `<div class="ysc-dynamic-layer ys-css3-box" onclick="vue.removePopup">
 
@@ -368,7 +368,7 @@ export default {
 
                                 </el-row>
 
                             </div>
 
                         </div>`
 
-            }else{
 
+            } else {
 
                 element = ``
 
             }
 
             // <div class="ysc-dynamic-layer ys-css3-box" onclick="vue.removePopup()">
 
@@ -381,11 +381,11 @@ export default {
 
             //                               <div class="max">案件编号：${value.ajbh}</div>
 
             //                               <div class="max">报警时间：${value.tzsj} </div>
 
             //                               <div class="max">案件描述：${value.bcxx}</div>
 
-                                         
+
 
             //                               <div class="max">案件类型：${value.ajlx}</div>
 
-                                         
+
 
             //                               <div class="max">发生地址：${value.afdz}</div>
 
-                                          
+
 
             //                               <div class="max2">主责中队：${value.zhongdui}</div>
 
             //                               <div class="max2">案件状态：${value.ajzt}</div>
 
             //                               <div class="max2">到场时间：<span>${value.dcsj}</span></div>
 
@@ -399,34 +399,34 @@ export default {
 
             //                           </div>
 
             //                       </div>
 
             // <img src="${img}" alt="" class="close" onclick="tb1()" 
-            this.addMarkerInfo(element, value,type)
 
+            this.addMarkerInfo(element, value, type)
 
         },
 
         // 标点点击弹窗
 
         // addMarkerInfo(element, value, type, isBtn = false) {
 
         addMarkerInfo(element, value, type, isBtn = false) {
 
-            
-                // window.jMap.Popup && window.jMap.Popup.hide([this.oldPopup && this.oldPopup.id]);
 
+
 
+            // window.jMap.Popup && window.jMap.Popup.hide([this.oldPopup && this.oldPopup.id]);
 
             if (this.oldPopup && value.id === this.oldPopup.id) {
 
                 window.jMap.Popup.hide();
 
                 return this.oldPopup = null
 
             }
 
-            if(type =="selfManagement" || type =="water"){
 
+            if (type == "selfManagement" || type == "water") {
 
                 window.jMap.Popup.show({
 
                     id: value.id,
 
                     //position: value.wgs84position, //使用自定义窗体
 
-                    position: { x: value.gisX, y: value.gisY}, //使用自定义窗体
 
-                   
+                    position: { x: value.gisX, y: value.gisY }, //使用自定义窗体
 
+
 
                     element: element,
 
                 }, { isZoom: false, offset: [0, -40] });
 
-            }else{
 
+            } else {
 
                 window.jMap.Popup.show({
 
                     id: value.id,
 
                     //position: value.wgs84position, //使用自定义窗体
 
-                    position: { x: value.gisX, y: value.gisY}, //使用自定义窗体
 
+                    position: { x: value.gisX, y: value.gisY }, //使用自定义窗体
 
                     element: element,
 
                 }, { isZoom: false, offset: [0, -40] });
 
             }
 
-            
+
 
 
 
             if (!isBtn) {
 
@@ -447,7 +447,7 @@ export default {
 
                     distance: 1000
 
                 }, {
 
                     callBack: (el) => {
 
-                        
+
 
                         for (const i in el) {
 
                             var target = {
 
                                 id: i,
 
@@ -468,9 +468,9 @@ export default {
 
         removePopup(e) {
 
             console.log(e)
 
             document.getElementsByClassName("ys-css3-container")[0].remove()
 
-            //window.jMap.Popup.hide()
 
-            
+                //window.jMap.Popup.hide()
 
+
 
         },
 
-       
+
 
     }
 
 }

+ 41 - 27
src/components/mixins/map-gaodecom.js
View File 

@@ -4,6 +4,10 @@ import mapData from '@a/js/map-data.js'
 
 export default {
 
     data() {
 
         return {
 
+            icon1: require('@a/img/icon/qx.svg'),
 
+            icon2: require('@a/img/icon/jy.svg'),
 
+            icon3: require('@a/img/icon/hz.svg'),
 
+            img: require('@a/img/icon/close.png'),
 
             map: null,
 
             mapPolList: [],
 
             colorList: [
 
@@ -27,7 +31,8 @@ export default {
 
     },
 
     mounted() {},
 
     methods: {
 
-        addMarkerInfo(position, value) { //消防水情况
 
+        addMarkerInfo(position, value) {
 
+
 
             // this.map.getIsOpen();
 
             this.map.clearInfoWindow();
 
             var infoWindow = new AMap.InfoWindow({
 
@@ -35,20 +40,7 @@ export default {
 
                 closeWhenClickMap: true,
 
                 content: `
 
                     <div class="tableTooltip mapTab">
 
-                      <div class="tableTitle">
 
-                        <div>${value.type}</div>
 
-                      </div>
 
-                      <el-row class="tableContent">
 
-                        <div class="max">水源位置：${value.address}</div>
 
-                        <div class="max2">电话：${value.phone}</div>
 
-                        <div class="max">支队名称：${value.detachmentName}</div>
 
-                        <div class="max2">管辖机构：${value.jurisdictionalAgency}</div>
 
-                        <div class="max2">水源类型：${value.type}</div>
 
-                        <div class="max2">取水形式：${value.getWaterType}</div>
 
-                        <div class="max2">水源性质：${value.waterAdministrative}</div>
 
-                        <div class="max2">状态：${value.status == 1 ?'可用':'不可用'}</div>
 
-                        <div class="max2">供水单位：${value.waterUnit}</div>
 
-                      </el-row>
 
+                      
                     </div>`,
 
                 offset: new AMap.Pixel(16, -30)
 
             });
 
@@ -137,30 +129,52 @@ export default {
 
             this.map.remove(lnglats);
 
         },
 
         addMarker(lnglats, type) {
 
-            console.log(lnglats)
 
+            console.log(lnglats, type)
 
                 // 创建标点和点击事件
 
             let icon = ''
 
+            if (type == "selfManagement") {
 
+                lnglats = lnglats[0]
 
+            }
 
             let markers = lnglats.map((val, ind) => {
 
-                if (type === 'water') {
 
-                    icon = val.waterAdministrative === '单位' ? 'http://120.55.70.156/image/unitWater.png' : val.waterAdministrative === '市政' ? 'http://120.55.70.156/image/szWater.png' : val.waterAdministrative === '社区' || val.waterAdministrative === '居民' ? 'http://120.55.70.156/image/sqWater.png' : ''
 
-                        //icon = val.waterAdministrative === '单位' ? '' : val.waterAdministrative === '市政' ? '' : val.waterAdministrative === '社区' || val.waterAdministrative === '居民' ? '' : ''
 
+                if (type === 'selfManagement') {
 
+                    if (val.ajlx == "火灾") {
 
+                        icon = this.icon3
 
+                    } else
 
+                    if (val.ajlx == "抢险救援") {
 
+                        icon = this.icon1
 
+                    } else if (val.ajlx == "社会救助") {
 
+                        icon = this.icon2
 
+                    } else {
 
+                        icon = this.icon2
 
+                    }
 
+                    //icon = val.waterAdministrative === '单位' ? 'http://120.55.70.156/image/unitWater.png' : val.waterAdministrative === '市政' ? 'http://120.55.70.156/image/szWater.png' : val.waterAdministrative === '社区' || val.waterAdministrative === '居民' ? 'http://120.55.70.156/image/sqWater.png' : ''
 
+                    //icon = val.waterAdministrative === '单位' ? '' : val.waterAdministrative === '市政' ? '' : val.waterAdministrative === '社区' || val.waterAdministrative === '居民' ? '' : ''
 
                 }
 
+
 
                 let marker = new AMap.Marker({
 
                     position: new AMap.LngLat(val.gisX, val.gisY),
 
-                    icon: icon,
 
+                    icon: new AMap.Icon({
 
+                        image: icon,
 
+                        size: new AMap.Size(40, 40), //图标大小
 
+                        imageSize: new AMap.Size(40, 40)
 
+                    }),
 
                     zIndex: 9,
 
                     extData: {
 
                         id: ind + 1
 
                     }
 
                 });
 
-                if (lnglats.length == 1) {
 
-                    console.log("正常")
 
-                    this.addMarkerInfo([val.gisX, val.gisY], val)
 
-                }
 
-
 
+                // console.log(lnglats.length)
 
+                // if (lnglats.length == 1) {
 
+                //     console.log("正常")
 
+                //     this.addMarkerInfo([val.gisX, val.gisY], val)
 
+                // } else {
 
+                //     console.log("正常2")
 
+                //     this.addMarkerInfo([val.gisX, val.gisY], val)
 
+                // }
 
+                this.addMarkerInfo([val.gisX, val.gisY], val)
 
                 marker.on('click', async() => {
 
-                    console.log(val)
 
-                    await this.addMarkerInfo([val.gisX, val.gisY], val)
 
+                    console.log(val.id)
 
+                    await this.$store.commit('ajxq2nr', { ajxq2nr: res.data });
 
                 })
 
                 return marker
 
             })

+ 314 - 225
src/components/scatter/index.vue
View File 

@@ -58,240 +58,329 @@ export default {
 
   },
 
   methods: {
 
     getData() {
 
-      let data = this.data
 
-    console.log(data)
 
-      // region: "市重点处", deathToll: 0, fireArea: 0, fireCount: 0
 
+      // let data = this.data
 
+      const data = [
 
+        [
 
+          [28604, 77, 17096869, 'Australia', 1990],
 
+          [31163, 77.4, 27662440, 'Canada', 1990],
 
+          [1516, 68, 1154605773, 'China', 1990],
 
+          [13670, 74.7, 10582082, 'Cuba', 1990],
 
+          [28599, 75, 4986705, 'Finland', 1990],
 
+          [29476, 77.1, 56943299, 'France', 1990],
 
+          [31476, 75.4, 78958237, 'Germany', 1990],
 
+          [28666, 78.1, 254830, 'Iceland', 1990],
 
+          [1777, 57.7, 870601776, 'India', 1990],
 
+          [29550, 79.1, 122249285, 'Japan', 1990],
 
+          [2076, 67.9, 20194354, 'North Korea', 1990],
 
+          [12087, 72, 42972254, 'South Korea', 1990],
 
+          [24021, 75.4, 3397534, 'New Zealand', 1990],
 
+          [43296, 76.8, 4240375, 'Norway', 1990],
 
+          [10088, 70.8, 38195258, 'Poland', 1990],
 
+          [19349, 69.6, 147568552, 'Russia', 1990],
 
+          [10670, 67.3, 53994605, 'Turkey', 1990],
 
+          [26424, 75.7, 57110117, 'United Kingdom', 1990],
 
+          [37062, 75.4, 252847810, 'United States', 1990]
 
+        ],
 
+        [
 
+          [44056, 81.8, 23968973, 'Australia', 2015],
 
+          [43294, 81.7, 35939927, 'Canada', 2015],
 
+          [13334, 76.9, 1376048943, 'China', 2015],
 
+          [21291, 78.5, 11389562, 'Cuba', 2015],
 
+          [38923, 80.8, 5503457, 'Finland', 2015],
 
+          [37599, 81.9, 64395345, 'France', 2015],
 
+          [44053, 81.1, 80688545, 'Germany', 2015],
 
+          [42182, 82.8, 329425, 'Iceland', 2015],
 
+          [5903, 66.8, 1311050527, 'India', 2015],
 
+          [36162, 83.5, 126573481, 'Japan', 2015],
 
+          [1390, 71.4, 25155317, 'North Korea', 2015],
 
+          [34644, 80.7, 50293439, 'South Korea', 2015],
 
+          [34186, 80.6, 4528526, 'New Zealand', 2015],
 
+          [64304, 81.6, 5210967, 'Norway', 2015],
 
+          [24787, 77.3, 38611794, 'Poland', 2015],
 
+          [23038, 73.13, 143456918, 'Russia', 2015],
 
+          [19360, 76.5, 78665830, 'Turkey', 2015],
 
+          [38225, 81.4, 64715810, 'United Kingdom', 2015],
 
+          [53354, 79.1, 321773631, 'United States', 2015]
 
+        ]
 
+      ];
 
+
 
       echarts.init(this.$refs.echartD).setOption({
 
-        grid: {
 
-          top: 40,
 
-          left: 40,
 
-          right: 30,
 
-          bottom: 30,
 
-        },
 
-        tooltip: {
 
-          textStyle: {
 
-            color: "#FFF",
 
-          },
 
-          confine: true,
 
+        backgroundColor: new echarts.graphic.RadialGradient(0.3, 0.3, 0.8, [
 
+    {
 
+      offset: 0,
 
+      color: '#f7f8fa'
 
+    },
 
+    {
 
+      offset: 1,
 
+      color: '#cdd0d5'
 
+    }
 
+  ]),
 
+  title: {
 
+    text: 'Life Expectancy and GDP by Country',
 
+    left: '5%',
 
+    top: '3%'
 
+  },
 
+  legend: {
 
+    right: '10%',
 
+    top: '3%',
 
+    data: ['1990', '2015']
 
+  },
 
+  grid: {
 
+    left: '8%',
 
+    top: '10%'
 
+  },
 
+  xAxis: {
 
+    splitLine: {
 
+      lineStyle: {
 
+        type: 'dashed'
 
+      }
 
+    }
 
+  },
 
+  yAxis: {
 
+    splitLine: {
 
+      lineStyle: {
 
+        type: 'dashed'
 
+      }
 
+    },
 
+    scale: true
 
+  },
 
+  series: [
 
+    {
 
+      name: '1990',
 
+      data: data[0],
 
+      type: 'scatter',
 
+      symbolSize: function (data) {
 
+        return Math.sqrt(data[2]) / 5e2;
 
+      },
 
+      emphasis: {
 
+        focus: 'series',
 
+        label: {
 
+          show: true,
 
           formatter: function (param) {
 
-            return `街道：${param.data[4]}<br> 死亡人数：${param.data[3]}<br> 过火面积：${param.data[2]}<br> 火灾数量：${param.data[0]}`;
 
-          },
 
-          backgroundColor: "rgba(11, 12, 72, 0.8)",
 
-          borderColor: "rgba(11, 12, 72, 0.4)",
 
-          position: "top",
 
-        },
 
-        xAxis: {
 
-          name: "",
 
-          type:'log',
 
-          scale: true,
 
-          axisLabel: {
 
-            color: "#FFFFFF",
 
-          },
 
-          axisLine: {
 
-            show: false,
 
-            lineStyle: {
 
-              color: "#6B9DD7",
 
-            },
 
-          },
 
-          splitLine: {
 
-            show: false,
 
+            return param.data[3];
 
           },
 
-          axisTick: {
 
-            show: false,
 
-          },
 
-        },
 
-
 
-        yAxis: {
 
-          name: "过火面积（m²）/ 火灾数量",
 
-          scale: true,
 
-          axisTick: {
 
-            show: false,
 
-          },
 
-          splitLine: {
 
-            // show:false,
 
-            lineStyle: {
 
-              color: "rgba(255,255,255,.4)",
 
-            },
 
-          },
 
-          axisLabel: {
 
-            color: "#FFFFFF",
 
-          },
 
-          axisLine: {
 
-            show: false,
 
-            lineStyle: {
 
-              color: "#6B9DD7",
 
-            },
 
-          },
 
-          nameGap: 20,
 
-          nameTextStyle: {
 
-            color: "#FFFFFF",
 
-            align: "left",
 
-            fontWeight: "bold",
 
-            fontSize: 14,
 
-          },
 
-        },
 
-        series: [
 
+          position: 'top'
 
+        }
 
+      },
 
+      itemStyle: {
 
+        shadowBlur: 10,
 
+        shadowColor: 'rgba(120, 36, 50, 0.5)',
 
+        shadowOffsetY: 5,
 
+        color: new echarts.graphic.RadialGradient(0.4, 0.3, 1, [
 
           {
 
-            name: '火灾数',
 
-            data: data[1],
 
-            type: 'scatter',
 
-            symbolSize: function (data) {//圆直径
 
-              return Math.sqrt(data[0]) +1 *20;
 
-            },
 
-            emphasis: {//街道
 
-              focus: 'series',
 
-              label: {
 
-                show: true,
 
-                formatter: function (param) {
 
-                  return param.data[4];
 
-                },
 
-                position: 'top'
 
-              }
 
-            },
 
-            itemStyle: {
 
-              shadowBlur: 10,
 
-              shadowColor: 'rgba(120, 36, 50, 0.5)',
 
-              shadowOffsetY: 5,
 
-              color: new echarts.graphic.RadialGradient(0.4, 0.3, 1, [
 
-                {
 
-                  offset: 0,
 
-                  color: 'rgb(251, 118, 123)'
 
-                },
 
-                {
 
-                  offset: 1,
 
-                  color: 'rgb(204, 46, 72)'
 
-                }
 
-              ])
 
-            }
 
+            offset: 0,
 
+            color: 'rgb(251, 118, 123)'
 
           },
 
           {
 
-            name: '过火面积',
 
-            data: data[2],
 
-            type: 'scatter',
 
-            symbolSize: function (data) {//圆直径
 
-              return Math.sqrt(data[0]) +1 *20;
 
-            },
 
-            emphasis: {//街道
 
-              focus: 'series',
 
-              label: {
 
-                show: true,
 
-                formatter: function (param) {
 
-                  return param.data[4];
 
-                },
 
-                position: 'top'
 
-              }
 
-            },
 
-            itemStyle: {
 
-              shadowBlur: 10,
 
-              shadowColor: 'rgba(120, 36, 50, 0.5)',
 
-              shadowOffsetY: 5,
 
-              color: new echarts.graphic.RadialGradient(0.4, 0.3, 1, [
 
-                {
 
-                  offset: 0,
 
-                  color: 'rgb(251, 118, 123)'
 
-                },
 
-                {
 
-                  offset: 1,
 
-                  color: 'rgb(204, 46, 72)'
 
-                }
 
-              ])
 
-            }
 
+            offset: 1,
 
+            color: 'rgb(204, 46, 72)'
 
+          }
 
+        ])
 
+      }
 
+    },
 
+    {
 
+      name: '2015',
 
+      data: data[1],
 
+      type: 'scatter',
 
+      symbolSize: function (data) {
 
+        return Math.sqrt(data[2]) / 5e2;
 
+      },
 
+      emphasis: {
 
+        focus: 'series',
 
+        label: {
 
+          show: true,
 
+          formatter: function (param) {
 
+            return param.data[3];
 
           },
 
+          position: 'top'
 
+        }
 
+      },
 
+      itemStyle: {
 
+        shadowBlur: 10,
 
+        shadowColor: 'rgba(25, 100, 150, 0.5)',
 
+        shadowOffsetY: 5,
 
+        color: new echarts.graphic.RadialGradient(0.4, 0.3, 1, [
 
           {
 
-            name: '死亡人数',
 
-            data: data[3],
 
-            type: 'scatter',
 
-            symbolSize: function (data) {//圆直径
 
-              return Math.sqrt(data[0]) +1 *20;
 
-            },
 
-            emphasis: {//街道
 
-              focus: 'series',
 
-              label: {
 
-                show: true,
 
-                formatter: function (param) {
 
-                  return param.data[4];
 
-                },
 
-                position: 'top'
 
-              }
 
-            },
 
-            itemStyle: {
 
-              shadowBlur: 10,
 
-              shadowColor: 'rgba(120, 36, 50, 0.5)',
 
-              shadowOffsetY: 5,
 
-              color: new echarts.graphic.RadialGradient(0.4, 0.3, 1, [
 
-                {
 
-                  offset: 0,
 
-                  color: 'rgb(251, 118, 123)'
 
-                },
 
-                {
 
-                  offset: 1,
 
-                  color: 'rgb(204, 46, 72)'
 
-                }
 
-              ])
 
-            }
 
+            offset: 0,
 
+            color: 'rgb(129, 227, 238)'
 
           },
 
-    // {
 
-    //   name: '2015',
 
-    //   data: data[1],
 
-    //   type: 'scatter',
 
-    //   symbolSize: function (data) {
 
-    //     return Math.sqrt(data[2]) / 5e2;
 
-    //   },
 
-    //   emphasis: {
 
-    //     focus: 'series',
 
-    //     label: {
 
-    //       show: true,
 
-    //       formatter: function (param) {
 
-    //         return param.data[3];
 
-    //       },
 
-    //       position: 'top'
 
-    //     }
 
-    //   },
 
-    //   itemStyle: {
 
-    //     shadowBlur: 10,
 
-    //     shadowColor: 'rgba(25, 100, 150, 0.5)',
 
-    //     shadowOffsetY: 5,
 
-    //     color: new echarts.graphic.RadialGradient(0.4, 0.3, 1, [
 
-    //       {
 
-    //         offset: 0,
 
-    //         color: 'rgb(129, 227, 238)'
 
-    //       },
 
-    //       {
 
-    //         offset: 1,
 
-    //         color: 'rgb(25, 183, 207)'
 
-    //       }
 
-    //     ])
 
-    //   }
 
-    // }
 
-          // {
 
-          //   name: "死亡人数",
 
-          //   width: "100%",
 
-          //   height: "100%",
 
-          //   data: this.dataMap.map((val) => {
 
-          //     return [val.fireCount || '', val.fireArea || '', val.deathToll, val.region];
 
-          //   }),
 
-          //   data: this.data[1],
 
-          //   type: "scatter",
 
-          //   symbolSize: function (data) {
 
-          //     return Math.sqrt(data[2]) + 1 * 20;
 
-          //   },
 
-          //   itemStyle: {
 
-          //     shadowBlur: 10,
 
-          //     shadowColor: "rgba(120, 36, 50, 0.5)",
 
-          //     shadowOffsetY: 5,
 
-          //     color: new echarts.graphic.RadialGradient(0.4, 0.3, 1, [
 
-          //       {
 
-          //         offset: 0,
 
-          //         color: "rgb(251, 118, 123)",
 
-          //       },
 
-          //       {
 
-          //         offset: 1,
 
-          //         color: "rgb(204, 46, 72)",
 
-          //       },
 
-          //     ]),
 
-          //   },
 
-          // },
 
-        ],
 
+          {
 
+            offset: 1,
 
+            color: 'rgb(25, 183, 207)'
 
+          }
 
+        ])
 
+      }
 
+    }
 
+  ]
 
+        // grid: {
 
+        //   top: 40,
 
+        //   left: 40,
 
+        //   right: 30,
 
+        //   bottom: 30,
 
+        // },
 
+        // tooltip: {
 
+        //   textStyle: {
 
+        //     color: "#FFF",
 
+        //   },
 
+        //   confine: true,
 
+        //   formatter: function (param) {
 
+        //     return `街道：${param.data[4]}<br> 死亡人数：${param.data[3]}<br> 过火面积：${param.data[2]}<br> 火灾数量：${param.data[0]}`;
 
+        //   },
 
+        //   backgroundColor: "rgba(11, 12, 72, 0.8)",
 
+        //   borderColor: "rgba(11, 12, 72, 0.4)",
 
+        //   position: "top",
 
+        // },
 
+        // xAxis: {
 
+        //   name: "",
 
+        //   type:'log',
 
+        //   scale: true,
 
+        //   axisLabel: {
 
+        //     color: "#FFFFFF",
 
+        //   },
 
+        //   axisLine: {
 
+        //     show: false,
 
+        //     lineStyle: {
 
+        //       color: "#6B9DD7",
 
+        //     },
 
+        //   },
 
+        //   splitLine: {
 
+        //     show: false,
 
+        //   },
 
+        //   axisTick: {
 
+        //     show: false,
 
+        //   },
 
+        // },
 
+
 
+        // yAxis: {
 
+        //   name: "过火面积（m²）",
 
+        //   scale: true,
 
+        //   axisTick: {
 
+        //     show: false,
 
+        //   },
 
+        //   splitLine: {
 
+        //     // show:false,
 
+        //     lineStyle: {
 
+        //       color: "rgba(255,255,255,.4)",
 
+        //     },
 
+        //   },
 
+        //   axisLabel: {
 
+        //     color: "#FFFFFF",
 
+        //   },
 
+        //   axisLine: {
 
+        //     show: false,
 
+        //     lineStyle: {
 
+        //       color: "#6B9DD7",
 
+        //     },
 
+        //   },
 
+        //   nameGap: 20,
 
+        //   nameTextStyle: {
 
+        //     color: "#FFFFFF",
 
+        //     align: "left",
 
+        //     fontWeight: "bold",
 
+        //     fontSize: 14,
 
+        //   },
 
+        // },
 
+        // series: [
 
+        //   {
 
+        //     name: '火灾数',
 
+        //     data: data[1],
 
+        //     type: 'scatter',
 
+        //     symbolSize: function (data) {//圆直径
 
+        //       return Math.sqrt(data[0]) +1 *20;
 
+        //     },
 
+        //     emphasis: {//街道
 
+        //       focus: 'series',
 
+        //       label: {
 
+        //         show: true,
 
+        //         formatter: function (param) {
 
+        //           return param.data[4];
 
+        //         },
 
+        //         position: 'top'
 
+        //       }
 
+        //     },
 
+        //     itemStyle: {
 
+        //       shadowBlur: 10,
 
+        //       shadowColor: 'rgba(120, 36, 50, 0.5)',
 
+        //       shadowOffsetY: 5,
 
+        //       color: new echarts.graphic.RadialGradient(0.4, 0.3, 1, [
 
+        //         {
 
+        //           offset: 0,
 
+        //           color: 'rgb(251, 118, 123)'
 
+        //         },
 
+        //         {
 
+        //           offset: 1,
 
+        //           color: 'rgb(204, 46, 72)'
 
+        //         }
 
+        //       ])
 
+        //     }
 
+        //   },
 
+        //   {
 
+        //     name: '过火面积',
 
+        //     data: data[2],
 
+        //     type: 'scatter',
 
+        //     symbolSize: function (data) {//圆直径
 
+        //       return Math.sqrt(data[0]) +1 *20;
 
+        //     },
 
+        //     emphasis: {//街道
 
+        //       focus: 'series',
 
+        //       label: {
 
+        //         show: true,
 
+        //         formatter: function (param) {
 
+        //           return param.data[4];
 
+        //         },
 
+        //         position: 'top'
 
+        //       }
 
+        //     },
 
+        //     itemStyle: {
 
+        //       shadowBlur: 10,
 
+        //       shadowColor: 'rgba(120, 36, 50, 0.5)',
 
+        //       shadowOffsetY: 5,
 
+        //       color: new echarts.graphic.RadialGradient(0.4, 0.3, 1, [
 
+        //         {
 
+        //           offset: 0,
 
+        //           color: 'rgb(251, 118, 123)'
 
+        //         },
 
+        //         {
 
+        //           offset: 1,
 
+        //           color: 'rgb(204, 46, 72)'
 
+        //         }
 
+        //       ])
 
+        //     }
 
+        //   },
 
+        //   {
 
+        //     name: '死亡人数',
 
+        //     data: data[3],
 
+        //     type: 'scatter',
 
+        //     symbolSize: function (data) {//圆直径
 
+        //       return Math.sqrt(data[0]) +1 *20;
 
+        //     },
 
+        //     emphasis: {//街道
 
+        //       focus: 'series',
 
+        //       label: {
 
+        //         show: true,
 
+        //         formatter: function (param) {
 
+        //           return param.data[4];
 
+        //         },
 
+        //         position: 'top'
 
+        //       }
 
+        //     },
 
+        //     itemStyle: {
 
+        //       shadowBlur: 10,
 
+        //       shadowColor: 'rgba(120, 36, 50, 0.5)',
 
+        //       shadowOffsetY: 5,
 
+        //       color: new echarts.graphic.RadialGradient(0.4, 0.3, 1, [
 
+        //         {
 
+        //           offset: 0,
 
+        //           color: 'rgb(251, 118, 123)'
 
+        //         },
 
+        //         {
 
+        //           offset: 1,
 
+        //           color: 'rgb(204, 46, 72)'
 
+        //         }
 
+        //       ])
 
+        //     }
 
+        //   },
 
+        // ],
 
       });
 
     },
 
     resize() {

+ 27 - 5
src/components/se-table/index2.vue
View File 

@@ -3,10 +3,12 @@
 
     :data="dataMap"
 
     class="transparentTableRow"
 
     height="100%"
 
-    :row-style="{ height: '.425rem' }"
 
+    :row-style="height"
 
     style="width: 100%; margin: 0 auto"
 
     :cell-class-name="tableRowClassName"
 
     :cell-style="cellStyle"
 
+    :row-class-name="rowClassName"
 
+    ref="table"
 
   >
 
     <el-table-column
 
       show-overflow-tooltip
 
@@ -16,7 +18,7 @@
 
       :prop="item.prop"
 
       align="center"
 
       :label="item.name"
 
-
 
+      
     ></el-table-column>
 
   </el-table>
 
 </template>
 
@@ -29,8 +31,14 @@ export default {
 
   },
 
   data() {
 
     return {
 
-      time:undefined
 
+      time:undefined,
 
+      height:{
 
+        height: '.425rem'
 
+      }
 
     };
 
+  },
 
+  created(){
 
+    
   },
 
   mounted() {},
 
   methods: {
 
@@ -47,16 +55,30 @@ export default {
 
       this.time = month + '-' + day
 
     },
 
     tableRowClassName({row, column, rowIndex, columnIndex}) {
 
+       
       var _this = this
 
       if (column.property === 'deathToll' && row.deathToll > 0) {
 
         return "death";
 
       }
 
       _this.day()
 
       if (row.time == _this.time ) {
 
+        // const table = this.$refs.table
 
+        // // 拿到表格中承载数据的div元素
 
+        // const bodyWrapper = table.bodyWrapper
 
+        // // 拿到元素后，对元素进行定时增加距离顶部距离，实现滚动效果(此配置为每100毫秒移动1像素)
 
+        // this.timer = setInterval(() => {
 
+        //   // 元素自增距离顶部1像素
 
+        //   bodyWrapper.scrollTop++
 
+        //   // 判断元素是否滚动到底部(可视高度+距离顶部=整个高度)
 
+        //   if (bodyWrapper.clientHeight + bodyWrapper.scrollTop == bodyWrapper.scrollHeight) {
 
+        //     // 重置table距离顶部距离
 
+        //     bodyWrapper.scrollTop = 0
 
+        //   }
 
+        // }, 120)
 
         return 'green-row';
 
+
 
       }
 
     },
 
-    
     cellStyle (row, column, rowIndex, columnIndex) {
 
     //列的label的名称
 
       if (row.column.label === "告警" || row.column.label === "离线") {
 
@@ -70,6 +92,6 @@ export default {
 
 
 <style>
 
 .el-table .green-row {
 
-    background: green !important;
 
+    background: #0e6dcc !important;
 
   }
 
 </style>

+ 96 - 0
src/components/se-table/index3.vue
View File 

@@ -0,0 +1,96 @@
 
+<template>
 
+  <el-table
 
+    :data="dataMap"
 
+    class="transparentTableRow"
 
+    height="100%"
 
+    :row-style="height"
 
+    style="width: 100%; margin: 0 auto"
 
+    :cell-class-name="tableRowClassName"
 
+    :cell-style="cellStyle"
 
+    :row-class-name="rowClassName"
 
+    ref="table"
 
+  >
 
+    <el-table-column
 
+      show-overflow-tooltip
 
+      min-width="20"
 
+      v-for="item in headerData"
 
+      :key="item.prop"
 
+      :prop="item.prop"
 
+      align="center"
 
+      :label="item.name"
 
+    ></el-table-column>
 
+  </el-table>
 
+</template>
 
+
 
+<script>
 
+export default {
 
+  props: {
 
+    dataMap: { type: Array, default: () => [] },
 
+    headerData: { type: Array, default: () => [] },
 
+  },
 
+  data() {
 
+    return {
 
+      time:undefined,
 
+      height:{
 
+        height: '.425rem'
 
+      }
 
+    };
 
+  },
 
+  created(){
 
+    console.log(document.getElementsByClassName("el-table__row")[16])
 
+  },
 
+  mounted() {},
 
+  methods: {
 
+    day(){
 
+      var date = new Date();
 
+      var month = date.getMonth() + 1; //获取当前月份(0-11,0代表1月)
 
+      var day = date.getDate(); //获取当前日(1-31)
 
+      if(month<10){
 
+        month = "0" + month
 
+      }
 
+      if(day<10){
 
+        day = "0" + day
 
+      }
 
+      this.time = month + '-' + day
 
+    },
 
+    tableRowClassName({row, column, rowIndex, columnIndex}) {
 
+       
+      var _this = this
 
+      if (column.property === 'deathToll' && row.deathToll > 0) {
 
+        return "death";
 
+      }
 
+      _this.day()
 
+      if (row.time == _this.time ) {
 
+        // const table = this.$refs.table
 
+        // // 拿到表格中承载数据的div元素
 
+        // const bodyWrapper = table.bodyWrapper
 
+        // // 拿到元素后，对元素进行定时增加距离顶部距离，实现滚动效果(此配置为每100毫秒移动1像素)
 
+        // this.timer = setInterval(() => {
 
+        //   // 元素自增距离顶部1像素
 
+        //   bodyWrapper.scrollTop++
 
+        //   // 判断元素是否滚动到底部(可视高度+距离顶部=整个高度)
 
+        //   if (bodyWrapper.clientHeight + bodyWrapper.scrollTop == bodyWrapper.scrollHeight) {
 
+        //     // 重置table距离顶部距离
 
+        //     bodyWrapper.scrollTop = 0
 
+        //   }
 
+        // }, 120)
 
+        return 'green-row';
 
+
 
+      }
 
+    },
 
+    cellStyle (row, column, rowIndex, columnIndex) {
 
+    //列的label的名称
 
+      if (row.column.label === "告警" || row.column.label === "离线") {
 
+        return 'color:#2280D9' //修改的样式
 
+      }
 
+    },
 
+
 
+  },
 
+};
 
+</script>
 
+
 
+<style>
 
+.el-table .green-row {
 
+    background: green !important;
 
+  }
 
+</style>

+ 3 - 3
src/http/api.js
View File 

@@ -48,7 +48,7 @@ let api = {
 
         mapList: '/device/mapList', //撒点
 
         collect: '/device/collect', //设备类型统计信息
 
         collectOne: '/device/collectOne', //设备类型统计信息总量
 
-        
+
 
         one: '/device/one', //查看设备详情 
         elIco: '/deviceInfo/elIco', //电量 
         // fireSiteDuty: '/fireSite/fireSiteDuty',
 
@@ -61,8 +61,8 @@ let api = {
 
         alertStatistics: '/jcjAjxx/alertStatistics', //不同警情
 
         one: '/jcjAjxx/one', //警情详细信息
 
     },
 
-    qyzz:{
 
-        lsaj: '/deviceAj/page',//历史案件
 
+    qyzz: {
 
+        lsaj: '/deviceAj/page', //历史案件
 
     }

+ 2 - 2
src/store/index.js
View File 

@@ -9,7 +9,7 @@ export default createStore({
 
         resizeTime: true,
 
         windowWidth: 0,
 
         typeTime: null,
 
-        ajxq2nr:{},
 
+        ajxq2nr: {},
 
         timeList: [
 
             new Date().getFullYear() + '-' + (new Date().getMonth() + 1 < 10 ? '0' + (new Date().getMonth() + 1) : '' + (new Date().getMonth() + 1)) + '-' + (new Date().getDate() < 10 ? '0' + (new Date().getDate()) : new Date().getDate()) + ' 00:00:00',
 
             new Date().getFullYear() + '-' + (new Date().getMonth() + 1 < 10 ? '0' + (new Date().getMonth() + 1) : '' + (new Date().getMonth() + 1)) + '-' + (new Date().getDate() < 10 ? '0' + (new Date().getDate()) : new Date().getDate()) + ' 23:59:59',
 
@@ -470,7 +470,7 @@ export default createStore({
 
             state.qyzzId = context
 
         },
 
         ajxq2nr(state, context) {
 
-            
+
 
             state.ajxq2nr = context
 
             console.log(state.ajxq2nr)
 
         },

+ 8 - 8
src/views/comprehensive-disposal.vue
View File 

@@ -387,8 +387,8 @@ import barChart from "@c/bar";
 
 import lineSmooth from "@c/line-smooth";
 
 import gauge from "@c/gauge/indexcom";
 
 import linstener from "@c/mixins/linstener";
 
-import map from "@c/mixins/map-data";
 
-// import map from "@c/mixins/map-gaodecom";
 
+// import map from "@c/mixins/map-data";
 
+import map from "@c/mixins/map-gaodecom";
 
 import 'video.js/dist/video-js.css'
 
 import videojs from 'video.js'
 
 import 'videojs-contrib-hls'
 
@@ -528,7 +528,7 @@ export default {
 
   methods: {  
     move(e){
 
       let odiv = document.getElementsByClassName("anxqtk")[0];        //获取目标元素
 
-      console.log(odiv,e)
 
+
 
       //算出鼠标相对元素的位置
 
       let disX = e.clientX - odiv.offsetLeft;
 
       let disY = e.clientY - odiv.offsetTop;
 
@@ -700,10 +700,10 @@ export default {
 
           this.$qs.stringify({
 
             current: 1,
 
             size: 150,
 
-            startTime: startTime,
 
-            endTime: endTime,
 
-            // startTime:"2000-01-01 00:00:00",
 
-            // endTime:"2021-12-31 23:59:59"
 
+            // startTime: startTime,
 
+            // endTime: endTime,
 
+            startTime:"2000-01-01 00:00:00",
 
+            endTime:"2021-12-31 23:59:59"
 
           })
 
       ).then(res =>{
 
        
@@ -716,7 +716,7 @@ export default {
 
             }
 
             var data2 = []
 
             for(let i =0; i<data1.length;i++){
 
-              if(!data1[i].fdsj){
 
+              if(data1[i].fdsj){
 
                 data2.push(data1[i])
 
               }
 
             }

+ 5 - 5
src/views/enforcement-dynamic.vue
View File 

@@ -163,8 +163,8 @@
 
 <script>
 
 import wordCloud from "@c/wordCloud";
 
 import linstener from "@c/mixins/linstener2";
 
-import map from "@c/mixins/map-data";
 
-// import map from "@c/mixins/map-gaode";
 
+// import map from "@c/mixins/map-data";
 
+import map from "@c/mixins/map-gaode";
 
 import category from "@c/category/index2";
 
 import liquidFill from "@c/liquid-fill";
 
 export default {
 
@@ -288,9 +288,9 @@ export default {
 
       align-items: center;
 
       .leftTopContent {
 
         width: 100%;
 
-        // max-height: 100%;
 
-        max-height: 2rem; //大屏
 
-        margin-top: 0.2rem; //大屏
 
+        max-height: 100%;
 
+        // max-height: 2rem; //大屏
 
+        // margin-top: 0.2rem; //大屏
 
         overflow-y: scroll;
 
         display: flex;
 
         flex-wrap: wrap;

+ 46 - 47
src/views/fire-data-analysis.vue
View File 

@@ -11,13 +11,13 @@
 
                 <el-button size="mini" @click="searchTime(3)" :class="{ btnClick: timeArea === 3 }">近三年</el-button>
 
                 <el-button size="mini" @click="searchTime(5)" :class="{ btnClick: timeArea === 5 }">近五年</el-button>
 
               </el-row>
 
-              <el-form :inline="true" size="mini" :model="barForm">
 
+              <el-form :inline="true" size="mini" :model="barForm" class="formTop">
 
                 <el-form-item label="">
 
                   <el-select v-model="barForm.address" @change="getTrend()" filterable clearable placeholder="街道" >
 
                     <el-option :label="item" :value="item" v-for="(item,ind) in fireAddressList" :key="ind"></el-option>
 
                   </el-select>
 
                 </el-form-item>
 
-                <el-form-item label="">
 
+                <el-form-item label="" class="formTop">
 
                   <el-select @change="getTrend()" v-model="barForm.fireType" placeholder="火灾类型" filterable clearable >
 
                     <el-option :value="item"  v-for="(item,ind) in fireTypeList" :key="ind" ></el-option>
 
                   </el-select>
 
@@ -106,22 +106,21 @@
 
           </el-col>
 
           <el-col class="rightBot">
 
             <h4>火灾情况分析</h4>
 
-            <scatter ref="scatter" :dataMap="fireBubbleList"></scatter>
 
+            <!-- <scatter ref="scatter" :dataMap="fireBubbleList"></scatter> -->
 
           </el-col>
 
         </div>
 
       </el-col>
 
     </transition>
 
   </el-row>
 
 </template>
 
-
 
 <script>
 
 import linstener from "@c/mixins/linstener";
 
 import categoryLine from "@c/category-line";
 
 import firePie from "@c/fire-pie";
 
 import scatter from "@c/scatter";
 
 // import AMap from 'AMap'
 
-import map from "@c/mixins/map-data";
 
-// import map from "@c/mixins/map-gaode";
 
+// import map from "@c/mixins/map-data";
 
+import map from "@c/mixins/map-gaode";
 
 
 export default {
 
   components: { categoryLine, firePie, scatter },
 
@@ -129,16 +128,9 @@ export default {
 
   data() {
 
     return {
 
       box:null,
 
-      tableData: [
 
-        {"address":"x街道45号","burnedArea":"2","propertyLoss":"5","deathToll":"0","nonFatal":"1","disasterHome":"2","nature":"居民","fireCause":"家电","fireGoodsOne":"电视机"},
 
-        {"address":"x街道45号","burnedArea":"2","propertyLoss":"5","deathToll":"0","nonFatal":"1","disasterHome":"2","nature":"居民","fireCause":"家电","fireGoodsOne":"电视机"},
 
-        {"address":"x街道45号","burnedArea":"2","propertyLoss":"5","deathToll":"0","nonFatal":"1","disasterHome":"2","nature":"居民","fireCause":"家电","fireGoodsOne":"电视机"},
 
-        {"address":"x街道45号","burnedArea":"2","propertyLoss":"5","deathToll":"0","nonFatal":"1","disasterHome":"2","nature":"居民","fireCause":"家电","fireGoodsOne":"电视机"},
 
-        {"address":"x街道45号","burnedArea":"2","propertyLoss":"5","deathToll":"0","nonFatal":"1","disasterHome":"2","nature":"居民","fireCause":"家电","fireGoodsOne":"电视机"},
 
-        {"address":"x街道45号","burnedArea":"2","propertyLoss":"5","deathToll":"0","nonFatal":"1","disasterHome":"2","nature":"居民","fireCause":"家电","fireGoodsOne":"电视机"},
 
-        {"address":"x街道45号","burnedArea":"2","propertyLoss":"5","deathToll":"0","nonFatal":"1","disasterHome":"2","nature":"居民","fireCause":"家电","fireGoodsOne":"电视机"},
 
-        {"address":"x街道45号","burnedArea":"2","propertyLoss":"5","deathToll":"0","nonFatal":"1","disasterHome":"2","nature":"居民","fireCause":"家电","fireGoodsOne":"电视机"},
 
-      ],
 
+      tableData:[],
 
+      startTime:undefined, //头部时间栏切换时重置滑动加载数据
 
+      endTime:undefined,//头部时间栏切换时重置滑动加载数据
 
       headerData: [
 
         { prop: "address", name: "火灾地址" },
 
         { prop: "burnedArea", name: "过火面积（m²）" },
 
@@ -196,7 +188,7 @@ export default {
 
           this.isScroll = false
 
           ++this.current
 
           this.getFireStatis()
 
-          console.log(scrollHeight - (scrollTop + clientHeight) <= 20)
 
+          // console.log(scrollHeight - (scrollTop + clientHeight) <= 20)
 
         }
 
       }
 
     })
 
@@ -214,9 +206,6 @@ export default {
 
     this.initMap()
 
   },
 
   methods: {
 
-    load(){
 
-      console.log(2)
 
-    },
 
     tableRowClassName({row, column}) {
 
       if (column.property === 'deathToll' && row.deathToll > 0) {
 
         return "death";
 
@@ -279,9 +268,8 @@ export default {
 
             endTime: this.$store.state.timeList[1] || "",
 
           })
 
       );
 
-	  console.log(res.data)
 
+	    console.log(res.data)
 
       if (res) this.fireBubbleList = res.data;
 
-      console.log(this.fireBubbleList)
 
     },
 
     // 火灾趋势图 柱状图
 
     async getTrend() {
 
@@ -291,19 +279,17 @@ export default {
 
           this.$qs.stringify({
 
             address: this.barForm.address,
 
             fireType: this.barForm.fireType,
 
-            // startTime: (new Date().getFullYear() - this.timeArea) + '-' + (new Date().getMonth() + 1) + '-' + new Date().getDate() + ' 00:00:00',
 
-            // endTime: new Date().getFullYear() + '-' + (new Date().getMonth() + 1) + '-' + new Date().getDate() + ' 00:00:00',
 
-
 
-            startTime: "2021-01-01 00:00:00",
 
-            endTime: "2021-12-06 00:00:00",
 
+            startTime: (new Date().getFullYear() - this.timeArea) + '-' + (new Date().getMonth() + 1) + '-' + new Date().getDate() + ' 00:00:00',
 
+            endTime: new Date().getFullYear() + '-' + (new Date().getMonth() + 1) + '-' + new Date().getDate() + ' 00:00:00',
 
+            // startTime: "2021-01-01 00:00:00",
 
+            // endTime: "2021-12-06 00:00:00",
 
           })
 
       );
 
-	  console.log(res.data)
 
+      console.log(res)
 
       if (res) this.timeData = res.data;
 
     },
 
     // 占比图 饼图
 
     async getFireCause(val) {
 
-      console.log(this.$store.state.timeList[0])
 
       let res = await this.$axios.get(
 
         this.$api.fire.fireCauseRatio +
 
           "?" +
 
@@ -313,7 +299,6 @@ export default {
 
             address:val === 1 ? this.fireCauseRatioObj.address :val === 2 ? this.fireCauseRatioObj.address2 : ''
 
           })
 
       );
 
-	  console.log(res)
 
       if (res){
 
         let ratioList = res.data.map((val) => {
 
           return {
 
@@ -336,32 +321,40 @@ export default {
 
     },
 
     // 详细火灾情况，表格val
 
     async getFireStatis() {
 
-      console.log(this.$store.state.timeList[0])
 
       let res = await this.$axios.get(
 
         this.$api.fire.fireStatistics +
 
           "?" +
 
           this.$qs.stringify({
 
             current: this.current,
 
             size: this.size,
 
-            startTime: "2021-01-01 00:00:00",
 
-            endTime: "2021-12-06 00:00:00",
 
+            startTime: this.$store.state.timeList[0] || "",
 
+            endTime: this.$store.state.timeList[1] || "",
 
           })
 
       );
 
-	  console.log(res)
 
-      if (res){ 
+      if (res.data.records){ 
+        let data = res.data.records
 
+        let arr = []
 
         this.isScroll = true
 
-        // if(res.data.records.some(val=> val.propertyLoss > 10 * 10000)){
 
-          // this.headerData[2].name = '财产损失（万元）'
 
-          this.tableData.push(...(res.data.records.map(val=> {
 
-            val.propertyLoss = val.propertyLoss && (val.propertyLoss / 10000) || val.propertyLoss
 
-            return val
 
-          })));
 
-		  console.log(this.tableData)
 
-        // } else{
 
-          // this.tableData.push(res.data.records);
 
-          // this.headerData[3].name = '财产损失（元）'
 
-        // }
 
-        // }
 
+        for(let i = 0; i<data.length; i++){
 
+          data[i].propertyLoss = (data[i].propertyLoss / 10000).toFixed(2)
 
+          data[i].deathToll = Number(data[i].deathToll).toFixed(0)
 
+          data[i].nonFatal = Number(data[i].nonFatal).toFixed(0)
 
+          data[i].disasterHome = Number(data[i].disasterHome).toFixed(0)
 
+          arr.push(data[i])
 
+        }
 
+        //头部时间切换时重置数组
 
+          if(this.startTime){
 
+            if(this.$store.state.timeList[0] != this.startTime || this.$store.state.timeList[1] != this.endTime){
 
+              this.tableData = []
 
+              this.current = 0
 
+              this.startTime = this.$store.state.timeList[0]
 
+              this.endTime = this.$store.state.timeList[1]
 
+            }
 
+          }else{
 
+            this.startTime = this.$store.state.timeList[0]
 
+            this.endTime = this.$store.state.timeList[1]
 
+          }
 
+        this.tableData = this.tableData.concat(arr)
 
       }
 
     },
 
     searchTime(val){
 
@@ -416,6 +409,12 @@ export default {
 
         width: 100%;
 
         height: 100%;
 
         display: block;
 
+        .formTop{
 
+          margin-top:0px;
 
+        }
 
+        .formTop:nth-child(2){
 
+          margin-right:0px;
 
+        }
 
         .selectBar {
 
           width: 100%;
 
           display: flex;

+ 4 - 4
src/views/fire-signs.vue
View File 

@@ -100,7 +100,7 @@
 
           </el-col>
 
           <el-col class="rightTop">
 
             <h4>各街镇单位情况</h4>
 
-             <category ref="category" :dataMap="[223,3323,4213,31341,21312,3123,123,123,123,1212]" color="#33BBFA" :borderRadius="[0,0,0,0]"></category>
 
+             <category ref="category" :dataMap="[223,3323,4213,31341,21312,3123,123,123,123,1212]" color="#33BBFA" :borderRadius="[0,0,0,0]" ></category>
 
           </el-col>
 
           <el-col class="rightBot">
 
             <h4>挂牌督改情况</h4>
 
@@ -123,8 +123,8 @@ import categoryLine from "@c/category-line";
 
 import category from "@c/category";
 
 import seTable from "@c/se-table";
 
 // import AMap from 'AMap'
 
-import map from "@c/mixins/map-data";
 
-// import map from "@c/mixins/map-gaode";
 
+// import map from "@c/mixins/map-data";
 
+import map from "@c/mixins/map-gaode";
 
 import radarChart from "@c/radar";
 
 import wordCloud from "@c/wordCloud";
 
 export default {
 
@@ -518,7 +518,7 @@ export default {
 
       .rightBot{
 
         height: 30%;
 
         flex: none;
 
-        background: url('~@a/img/home/bg2.png') no-repeat;
 
+       background: url('~@a/img/home/box-bg.png') no-repeat;
 
         background-size: 100% 100%;
 
       }
 
     }

+ 2 - 2
src/views/head.vue
View File 

@@ -4,8 +4,8 @@
 
     <div class="day">{{ dateDay }}</div>
 
     <div class="time">{{ dataTime }}</div>
 
     <div class="homeIcon" v-if="$route.fullPath !== '/'">
 
-      <img src="~@a/img/icon/close.png" alt="" class="timeImage2" @click="fanhui"  />
 
-      <!-- <i class="el-icon-s-home" @click="$router.push({ path: '/' })"></i> -->
 
+      <!-- <img src="~@a/img/icon/close.png" alt="" class="timeImage2" @click="fanhui"  /> -->
 
+      <i class="el-icon-s-home" @click="$router.push({ path: '/' })"></i>
 
     </div>
 
     <!-- <div class="weather">
 
       <img

+ 102 - 254
src/views/rescue-station.vue
View File 

@@ -118,46 +118,48 @@
 
         <div class="rightContent">
 
           <el-col class="rightTop">
 
             <h4>各站点执勤实力</h4>
 
+            <!-- @expand-change="getFireSiteDuty" -->
 
             <el-table
 
-              :data="tableData2"
 
+              :data="siteInstance"
 
               class="transparentTableRow"
 
               height="100%"
 
               row-style="height:.425rem;"
 
               cell-style="height:.425rem;box-sizing: border-box;"
 
               style="width: 100%; margin: 0 auto;"
 
-              @expand-change="getFireSiteDuty"
 
+              
             >
 
               <el-table-column type="expand">
 
                 <template #default="props">
 
                   <template v-if="props.row.children">
 
-                    <template v-for="(item,ind) in props.row.children" :key="ind">
 
-                      <el-row class="tableExpendTitle"> {{item.type}}（1辆车，{{item.personNumber}}人） </el-row>
 
+                    <template v-for="(item,id) in props.row.children" :key="id">
 
+                      <el-row class="tableExpendTitle"> {{item.cljc}}（1辆车，{{item.cry}}人） </el-row>
 
                       <el-row class="tableExpendcontent">
 
                         <el-col>
 
                           <img src="~@a/img/test/bg3.png" alt="" />
 
-                          <div>{{ item.carNumber }}</div>
 
-                          <div>车牌号</div>
 
+                          <div class="bs">{{ item.cphm }}</div>
 
+                          <div class="type">车牌号</div>
 
                         </el-col>
 
-                        <el-col v-if="item.correspondent">
 
+                        <el-col v-if="item.zhy">
 
                           <img src="~@a/img/test/bg7.png" alt="" />
 
-                          <div>{{ item.correspondent }}</div>
 
-                          <div>指挥员</div>
 
+                          <div class="bs">{{ item.zhy }}</div>
 
+                          <div class="type">指挥员</div>
 
                         </el-col>
 
-                        <el-col v-if="item.commander">
 
+                        <el-col v-if="item.txy">
 
                           <img src="~@a/img/test/bg7.png" alt="" />
 
-                          <div>{{ item.commander }}</div>
 
-                          <div>通讯员</div>
 
+                          <div class="bs">{{ item.txy }}</div>
 
+                          <div class="type">通讯员</div>
 
                         </el-col>
 
-                        <el-col v-if="item.firemen">
 
+                        <el-col v-if="item.jsy">
 
                           <img src="~@a/img/test/bg7.png" alt="" />
 
-                          <div>{{ item.firemen }}</div>
 
-                          <div>消防员</div>
 
+                          <div class="bs">{{ item.jsy }}</div>
 
+                          <div class="type">驾驶员</div>
 
                         </el-col>
 
-                        <el-col v-if="item.driver">
 
+                        <el-col v-if="item.zsry">
 
                           <img src="~@a/img/test/bg7.png" alt="" />
 
-                          <div>{{ item.driver }}</div>
 
-                          <div>驾驶员</div>
 
+                          <div class="bs">{{ item.zsry }}</div>
 
+                          <div class="type">消防员</div>
 
                         </el-col>
 
+                        
                       </el-row>
 
                     </template>
 
                   </template>
 
@@ -165,7 +167,7 @@
 
               </el-table-column>
 
               <el-table-column
 
                 show-overflow-tooltip
 
-                v-for="item in headerData"
 
+                v-for="item in siteInstanceHeader"
 
                 :key="item.prop"
 
                 :prop="item.prop"
 
                 align="center"
 
@@ -205,9 +207,12 @@
 
 
 <script>
 
 import linstener from "@c/mixins/linstener";
 
-import map from "@c/mixins/map-data";
 
-// import map from "@c/mixins/map-gaode";
 
+// import map from "@c/mixins/map-data";
 
+import map from "@c/mixins/map-gaode";
 
 import seTable from "@c/se-table";
 
+import {
 
+  frequency
 
+} from "../assets/js/common";
 
 export default {
 
   data() {
 
     return {
 
@@ -309,98 +314,11 @@ export default {
 
           driver: "赵六",
 
         },
 
       ],
 
-      tableData2: [
 
-        {
 
-          id:'1',
 
-          address: "闵行支队",
 
-          car: "1辆",
 
-          lochus: "1人",
 
-          children:[
 
-            {type:'备训',carNumber:"沪X5449应急",personNumber:'1', commander: "汪志浩"},
 
-            
-          ]
 
-        },
 
-        {
 
-          id:'2',
 
-          address: "七宝站",
 
-          car: "5辆",
 
-          lochus: "12人",
 
-          children:[
 
-            {type:'调研',carNumber:"沪X5982应急",personNumber:'1', correspondent: "唐爽"},
 
-            {type:'待命',carNumber:"沪X5490应急",personNumber:'4',},
 
-          ]
 
-        },
 
-        {
 
-          id:'222',
 
-          address: "光华站",
 
-          car: "3辆",
 
-          lochus: "12人",
 
-          children:[
 
-            {type:'备训',carNumber:"沪X5477应急",personNumber:'4', correspondent: "张三", commander: "李四", firemen: "王五", driver: "赵六",},
 
-            {type:'跨训',carNumber:"沪X5477应急",personNumber:'4', correspondent: "张三", commander: "李四", firemen: "王五", driver: "赵六",},
 
-            {type:'救助',carNumber:"沪X5477应急",personNumber:'4', correspondent: "张三", commander: "李四", firemen: "王五", driver: "赵六",},
 
-          ]
 
-        },
 
-        {
 
-          id:'222',
 
-          address: "华漕站",
 
-          car: "3辆",
 
-          lochus: "12人",
 
-          children:[
 
-            {type:'备训',carNumber:"沪X5477应急",personNumber:'4', correspondent: "张三", commander: "李四", firemen: "王五", driver: "赵六",},
 
-            {type:'跨训',carNumber:"沪X5477应急",personNumber:'4', correspondent: "张三", commander: "李四", firemen: "王五", driver: "赵六",},
 
-            {type:'救助',carNumber:"沪X5477应急",personNumber:'4', correspondent: "张三", commander: "李四", firemen: "王五", driver: "赵六",},
 
-          ]
 
-        },
 
-        {
 
-          id:'222',
 
-          address: "吴泾站",
 
-          car: "3辆",
 
-          lochus: "12人",
 
-          children:[
 
-            {type:'备训',carNumber:"沪X5477应急",personNumber:'4', correspondent: "张三", commander: "李四", firemen: "王五", driver: "赵六",},
 
-            {type:'跨训',carNumber:"沪X5477应急",personNumber:'4', correspondent: "张三", commander: "李四", firemen: "王五", driver: "赵六",},
 
-            {type:'救助',carNumber:"沪X5477应急",personNumber:'4', correspondent: "张三", commander: "李四", firemen: "王五", driver: "赵六",},
 
-          ]
 
-        },
 
-        {
 
-          id:'222',
 
-          address: "新虹站",
 
-          car: "3辆",
 
-          lochus: "12人",
 
-          children:[
 
-            {type:'备训',carNumber:"沪X5477应急",personNumber:'4', correspondent: "张三", commander: "李四", firemen: "王五", driver: "赵六",},
 
-            {type:'跨训',carNumber:"沪X5477应急",personNumber:'4', correspondent: "张三", commander: "李四", firemen: "王五", driver: "赵六",},
 
-            {type:'救助',carNumber:"沪X5477应急",personNumber:'4', correspondent: "张三", commander: "李四", firemen: "王五", driver: "赵六",},
 
-          ]
 
-        },
 
-        {
 
-          id:'222',
 
-          address: "杜行站",
 
-          car: "3辆",
 
-          lochus: "12人",
 
-          children:[
 
-            {type:'备训',carNumber:"沪X5477应急",personNumber:'4', correspondent: "张三", commander: "李四", firemen: "王五", driver: "赵六",},
 
-            {type:'跨训',carNumber:"沪X5477应急",personNumber:'4', correspondent: "张三", commander: "李四", firemen: "王五", driver: "赵六",},
 
-            {type:'救助',carNumber:"沪X5477应急",personNumber:'4', correspondent: "张三", commander: "李四", firemen: "王五", driver: "赵六",},
 
-          ]
 
-        },
 
-        {
 
-          id:'222',
 
-          address: "浦江站",
 
-          car: "3辆",
 
-          lochus: "12人",
 
-          children:[
 
-            {type:'备训',carNumber:"沪X5477应急",personNumber:'4', correspondent: "张三", commander: "李四", firemen: "王五", driver: "赵六",},
 
-            {type:'跨训',carNumber:"沪X5477应急",personNumber:'4', correspondent: "张三", commander: "李四", firemen: "王五", driver: "赵六",},
 
-            {type:'救助',carNumber:"沪X5477应急",personNumber:'4', correspondent: "张三", commander: "李四", firemen: "王五", driver: "赵六",},
 
-          ]
 
-        },
 
-      ],
 
-      headerData: [
 
-        { prop: "address", name: "站点名称" },
 
-        { prop: "car", name: "站点车辆" },
 
-        { prop: "lochus", name: "人员" },
 
+      siteInstance:[],
 
+      siteInstanceHeader: [
 
+        { prop: "name", name: "站点名称" },
 
+        { prop: "carNum", name: "站点车辆" },
 
+        { prop: "zdryrs", name: "人员" },
 
       ],
 
       headerData2: [
 
         { prop: "type", name: "类型" },
 
@@ -452,16 +370,13 @@ export default {
 
     async getData() {
 
       this.getSiAeAllCollect();
 
       this.getPage();
 
-      this.getFireSiteList();
 
-      this.getFireSiteDuty2()
 
-      
-      this.getFireSiteDutyList()
 
+      this.getFireSiteDuty()
 
       this.getFireSiteDutyPageMap()//撒点
 
       this.getFireSiteDutyOne()//详情
 
     },
 
     // 支队值班情况
 
     async getSiAeAllCollect() {
 
-      console.log(this.timeArea)
 
+     
       let res = await this.$axios.get(this.$api.water[this.timeArea === 'day' ? 'unitBeOnDuty' : 'unitBeOnDutyList'] +
 
           "?" +
 
           this.$qs.stringify({
 
@@ -473,13 +388,10 @@ export default {
 
             // endTime: "2021-12-31 23:59:59",
 
           })
 
       );
 
-      console.log(res)
 
       if (res && this.timeArea === 'day') {
 
-        console.log(res)
 
         this.unitBeOnDutyList = res.data;
 
       }
 
       if (res && this.timeArea === 'month' && res.data[0]){
 
-        console.log(res.data)
 
         this.unitBeOnDutyHeaderList = Array.from(new Set(res.data[0].map(val=>val.postName))).map(val=>{
 
           return {
 
             name:val,
 
@@ -528,24 +440,24 @@ export default {
 
       // let res = await this.$axios.get(this.$api.fireSite.page +
 
       //     "?" +
 
       //     this.$qs.stringify({
 
-      //       startTime: "2020-03-03 00:00:00",
 
-      //       endTime: "2020-03-03 23:59:59",
 
+      //       startTime: this.$store.state.timeList[0] ,
 
+      //       endTime:  this.$store.state.timeList[1] ,
 
       //     })
 
       // );
 
+      // console.log(this.$store.state.timeList[0],res)
 
       // if (res) this.tableData2 = res.data;
 
     },
 
     // 各站点执勤实力
 
     async getFireSiteDuty(row, expandedRows) {
 
-      console.log(1111)
 
-      let res = await this.$axios.get(this.$api.fireSite.fireSiteDuty2 +
 
-          "?" +
 
-          this.$qs.stringify({
 
-            "current":100,
 
-            "page":1
 
-          })
 
-      );
 
-      console.log(res)
 
-      if(!expandedRows || expandedRows.length<1) return
 
+      // let res = await this.$axios.get(this.$api.fireSite.fireSiteDuty2 +
 
+      //     "?" +
 
+      //     this.$qs.stringify({
 
+      //       "current":100,
 
+      //       "page":1
 
+      //     })
 
+      // );
 
+      // console.log(res)
 
+      // if(!expandedRows || expandedRows.length<1) return
 
       // let res = await this.$axios.get(this.$api.fireSite.fireSiteDuty +
 
       //     "?" +
 
       //     this.$qs.stringify({
 
@@ -561,143 +473,77 @@ export default {
 
     },
 
 
     // 各站点执勤实力分页 wt
 
-    async getFireSiteDuty2() {
 
-      
+    async getFireSiteDuty() {
 
       let res = await this.$axios.get(this.$api.fireSite.page +
 
           "?" +
 
           this.$qs.stringify({
 
             "current":1,
 
-            "size":20
 
+            "size":50
 
           })
 
       );
 
-      console.log(res)
 
+      let siteInstanceData = []
 
       if(res.data.records.length>0){
 
         var data = res.data.records
 
+        siteInstanceData = data
 
         for(let i =0;i<data.length;i++){
 
-          data[i].cheliang = []
 
-          let res2 = await this.$axios.get(this.$api.fireSite.list +
 
+          siteInstanceData[i].name = data[i].name
 
+          siteInstanceData[i].id = data[i].id
 
+          siteInstanceData[i].children = []
 
+          await this.$axios.get(this.$api.fireSite.list +
 
               "?" +
 
               this.$qs.stringify({
 
                 "zdCode":data[i].xfjgId,
 
               })
 
-          );
 
-          if(res2.data.length>0){
 
-            // console.log(res2.data)
 
-            data[i].cheliang.push(res2.data)
 
-          }
 
+          ).then(res =>{
 
+            if(res.data.length>0){
 
+              siteInstanceData[i].carNum = res.data.length
 
+              siteInstanceData[i].zdryrs = 0
 
+              for(let ii = 0;ii<res.data.length;ii++){
 
+                siteInstanceData[i].children.push(res.data[ii])
 
+                siteInstanceData[i].children[ii].cry = 0
 
+                if(res.data[ii].zhy){
 
+                  if(frequency(res.data[ii].zhy,',') == 0){
 
+                    siteInstanceData[i].zdryrs += 1
 
+                    siteInstanceData[i].children[ii].cry +=1
 
+                  }else{
 
+                    siteInstanceData[i].zdryrs += 1 + frequency(res.data[ii].zhy,',')
 
+                    siteInstanceData[i].children[ii].cry +=1 + frequency(res.data[ii].zhy,',')
 
+                  }
 
+                }
 
+                if(res.data[ii].txy){
 
+                  if(frequency(res.data[ii].txy,',') == 0){
 
+                    siteInstanceData[i].zdryrs += 1
 
+                    siteInstanceData[i].children[ii].cry +=1
 
+                  }else{
 
+                    siteInstanceData[i].zdryrs += 1 + frequency(res.data[ii].txy,',')
 
+                  }
 
+                }
 
+                if(res.data[ii].jsy){
 
+                  if(frequency(res.data[ii].jsy,',') == 0){
 
+                    siteInstanceData[i].zdryrs += 1
 
+                    siteInstanceData[i].children[ii].cry +=1
 
+                  }else{
 
+                    siteInstanceData[i].zdryrs += 1 + frequency(res.data[ii].zhy,',')
 
+                    siteInstanceData[i].zdryrs += 1 + frequency(res.data[ii].jsy,',')
 
+                  }
 
+                }
 
+                if(res.data[ii].zdryrs){
 
+                  siteInstanceData[i].zdryrs += Number(res.data[ii].zdryrs)
 
+                  siteInstanceData[i].children[ii].cry +=Number(res.data[ii].zdryrs)
 
+                  
+                }
 
+              }
 
+            }
 
+          })
 
         }
 
+        this.siteInstance =  siteInstanceData
 
+        console.log(this.siteInstance)
 
       }
 
-      console.log(res)
 
       
     },
 
-    async getFireSiteDutyList() {//车辆信息整合
 
-      
-      // let res = await this.$axios.get(this.$api.fireSite.list +
 
-      //     "?" +
 
-      //     this.$qs.stringify({
 
-      //       "zdCode":"933ba380d88a40c2ba99dfb4f9114edb",
 
-      //     })
 
-      // );
 
-      // console.log(res)
 
-      // {
 
-      //     "status": "SUCCESS",
 
-      //     "code": "0",
 
-      //     "msg": null,
 
-      //     "data": [
 
-      //         {
 
-      //             "id": "402880a83bd0ec47013bd65365e5144b",
 
-      //             "djzbbm": "210103110K1311112000",
 
-      //             "zbmc": "闵行                              ",
 
-      //             "zbbm": "210103110K199",
 
-      //             "sjzbbm": null,
 
-      //             "zblxdm": "21010311",
 
-      //             "djzbzkdm": "0",
 
-      //             "ssxfjgid": "933ba380d88a40c2ba99dfb4f9114edb",
 
-      //             "gpsbh": "11943802102",
 
-      //             "cldjdm": "01",
 
-      //             "cphm": "沪X5449应急",
 
-      //             "ggxh": "ELW-3",
 
-      //             "zcbh": "000000243156",
 
-      //             "ckj": 1526840,
 
-      //             "sb": null,
 
-      //             "ys": "红色",
 
-      //             "gbdm": "DEU",
 
-      //             "sccjid": "F28AEC729C5C4D1FB00937F54D05F957",
 
-      //             "sccjmc": "(德国)Albert Ziegler GmbH & Co. KG",
 
-      //             "zbrq": "2010-01-15 00:00:00",
 
-      //             "bfrq": null,
 
-      //             "yxqz": "2024-01-01 00:00:00",
 
-      //             "cjh": "WD3YE48129S381337",
 
-      //             "fdjbh": "MHZD0000 ",
 
-      //             "pch": null,
 
-      //             "jldwdm": "2903",
 
-      //             "clzddmMh": "70",
 
-      //             "recordStatus": 1,
 
-      //             "tranStatus": "1",
 
-      //             "timeStamp": "2021-02-21 17:09:16",
 
-      //             "remark": "沪X5449应急 带有通信指挥设备",
 
-      //             "dthh": "闵洞幺",
 
-      //             "ajbh": null,
 
-      //             "sfzp": "0",
 
-      //             "crossDeta": "1",
 
-      //             "crossTeam": "1",
 
-      //             "clbh": null,
 
-      //             "cjsj": "2012-12-26 16:28:08",
 
-      //             "ccrq": "2009-09-28 00:00:00",
 
-      //             "cljc": "闵行                                                ",
 
-      //             "radioChannel": "三频道",
 
-      //             "gisX": null,
 
-      //             "gisY": null,
 
-      //             "zhy": null,
 
-      //             "txy": "汪志浩",
 
-      //             "jsy": "费赛华",
 
-      //             "zdryrs": "0",
 
-      //             "zdbz": "",
 
-      //             "sjjsy": null,
 
-      //             "tczhc": "",
 
-      //             "lxdh": "1440018974454",
 
-      //             "yxx": "1",
 
-      //             "zs": null,
 
-      //             "zp": null,
 
-      //             "bll": null,
 
-      //             "pll": null,
 
-      //             "scalingHegiht": "0.00",
 
-      //             "ledsx": 1,
 
-      //             "xzjgid": "524f014744c54c468069b7028ec6148e",
 
-      //             "zldm": "100400",
 
-      //             "zhyid": null,
 
-      //             "txyid": "5e0e69894ea643c4a747b090b9856f95",
 
-      //             "jsyid": "6230c569de3b4b0ca91288d4e7a926e0",
 
-      //             "zsry": null,
 
-      //             "zsryid": "",
 
-      //             "ledcmsx": 460,
 
-      //             "stbll": "",
 
-      //             "blbz": "0",
 
-      //             "pdabh": "",
 
-      //             "sfdyjg": "0",
 
-      //             "cldtid": null,
 
-      //             "bdpAudtt": "2021-02-21 17:25:56",
 
-      //             "sjc": "2021-11-24 11:09:11",
 
-      //             "carStatus": "待命",
 
-      //             "equipTypeName": "通讯指挥消防车（TZ）",
 
-      //             "orgaName": "闵行区消防救援支队",
 
-      //             "orgaDesc": "闵行支队",
 
-      //             "jgtree": "010000003100000031011000",
 
-      //             "orgaAbbrevia": "闵行",
 
-      //             "orgaSort": 110,
 
-      //             "standardNum": null,
 
-      //             "carUrl": null,
 
-      //             "sjjgid": "5687316efa75479d96c0091a167a3b84",
 
-      //             "zhidui": "上海总队",
 
-      //             "updated": "2021-11-24 11:09:31"
 
-      //         }
 
-      //     ],
 
-      //     "exception": null
 
-      // }
 
-    },
 
     async getFireSiteDutyPageMap() {//撒点\
 
       let res = await this.$axios.get(this.$api.fireSite.pageMap);
 
-      console.log(res)
 
+     
       // 返回data里的一个值
 
       // {
 
       //   bz: null
 
@@ -731,7 +577,7 @@ export default {
 
           this.$qs.stringify({
 
             "id":"1",
 
           }));
 
-      console.log(res)
 
+      
       // {
 
       //     "status": "SUCCESS",
 
       //     "code": "0",
 
@@ -951,16 +797,18 @@ export default {
 
           padding: 0.0625rem;
 
           display: flex;
 
           flex-direction: column;
 
-          justify-content: space-between;
 
+          // justify-content: space-between;
 
           align-items: center;
 
           flex: none;
 
+
 
           img {
 
             width: 100%;
 
           }
 
+          .bs{margin-top:10px;}
 
+          .type{margin-top:10px}
 
         }
 
       }
 
     }
 
   }
 
 }
 
-
 
 </style>

+ 2 - 2
src/views/security-plan.vue
View File 

@@ -165,8 +165,8 @@
 
 
 <script>
 
 import linstener from "@c/mixins/linstener";
 
-import map from "@c/mixins/map-data";
 
-// import map from "@c/mixins/map-gaode";
 
+// import map from "@c/mixins/map-data";
 
+import map from "@c/mixins/map-gaode";
 
 import gauge from "@c/gauge/index5";
 
 export default {
 
   mixins: [linstener, map],

+ 2 - 2
src/views/self-management.vue
View File 

@@ -283,8 +283,8 @@ import seTable from "@c/se-table";
 
 import yw from "@c/yw";
 
 import gauge from "@c/gauge";
 
 import gauge2 from "@c/gauge/index2.vue";
 
-import map from "@c/mixins/map-data";
 
-// import map from "@c/mixins/map-gaode-selfManagement";
 
+// import map from "@c/mixins/map-data";
 
+import map from "@c/mixins/map-gaode-selfManagement";
 
 import radarChart from "@c/radar";
 
 export default {
 
   components: { categoryEnterprise, seTable, shebei1, radarChart, gauge, gauge2, yw},

+ 10 - 12
src/views/water-sources.vue
View File 

@@ -20,13 +20,13 @@
 
                 <el-col class="propName">{{item.name}}</el-col>
 
               </el-col>
 
             </template>
 
-             <se-table
 
+             <se-table2
 
              v-else
 
               ref="seTable"
 
               :dataMap="unitBeOnDutyListData"
 
               :headerData="unitBeOnDutyHeaderList"
 
               :key="windowWidth"
 
-            ></se-table>
 
+            ></se-table2>
 
           </el-row>
 
         </el-col>
 
         <el-col class="leftBot">
 
@@ -176,11 +176,11 @@
 
 
 <script>
 
 import linstener from "@c/mixins/linstener";
 
-import map from "@c/mixins/map-data";
 
-// import map from "@c/mixins/map-gaode";
 
+// import map from "@c/mixins/map-data";
 
+import map from "@c/mixins/map-gaode";
 
 import waterGauge from "@c/water-gauge";
 
 import gauge from "@c/gauge/index4";
 
-import seTable from "@c/se-table/index2";
 
+import seTable2 from "@c/se-table/index2";
 
 import funnel from "@c/funnel";
 
 
 // TODO 高德地图
 
@@ -191,7 +191,7 @@ import {
 
 } from "../assets/js/dataFormate";
 
 export default {
 
   mixins: [linstener,map],
 
-  components: { waterGauge, funnel, gauge,seTable },
 
+  components: { waterGauge, funnel, gauge, seTable2},
 
   data() {
 
     return {
 
       timeArea: "day",
 
@@ -245,13 +245,14 @@ export default {
 
       let res = await this.$axios.get(this.$api.water[this.timeArea === 'day' ? 'unitBeOnDuty' : 'unitBeOnDutyList'] +
 
           "?" +
 
           this.$qs.stringify({
 
-            // startTime: this.timeArea === 'day' ? "2020-03-03 00:00:00" :'2020-03-01 00:00:00',
 
-            // endTime:  this.timeArea === 'day' ? "2020-03-03 23:59:59" :'2020-03-31 23:59:59',
 
             startTime: this.timeArea === 'day' ? new Date().Format("yyyy-MM-dd") + ' 00:00:00' :getMonthStartDate(),
 
             endTime:  this.timeArea === 'day' ? new Date().Format("yyyy-MM-dd") + ' 23:59:59' :getMonthEndDate(),
 
           })
 
       );
 
-      if (res && this.timeArea === 'day') this.unitBeOnDutyList = res.data;
 
+      if (res && this.timeArea === 'day') {
 
+        console.log(res)
 
+        this.unitBeOnDutyList = res.data;
 
+      }
 
       if (res && this.timeArea === 'month' && res.data[0]){
 
         this.unitBeOnDutyHeaderList = Array.from(new Set(res.data[0].map(val=>val.postName))).map(val=>{
 
           return {
 
@@ -293,7 +294,6 @@ export default {
 
              waterGage:( + val.waterGage).toFixed(2) || 0
 
            }
 
          })
 
-         console.log(res.data.records)
 
         //  this.addMarker(res.data.records,'water')
 
       }
 
     },
 
@@ -301,7 +301,6 @@ export default {
 
     FireWaterListClick(row, event, column){
 
       let arr = []
 
       arr.push(row)
 
-      console.log(row)
 
       // this.addMarker(arr,'water')
 
     },
 
     // 消防水源信息
 
@@ -315,7 +314,6 @@ export default {
 
           })
 
       );
 
       if (res){ 
-		  console.log(res)
 
         this.fireWaterStatisticsObj = res.data;
 
         this.fireWaterStatisticsObj.waterIntact = res.data.waterIntact.toFixed(2)
 
         let total = res.data.municipalWater + res.data.residentWater + res.data.unitWater

+ 4 - 4
vue.config.js
View File 

@@ -46,12 +46,12 @@ module.exports = {
 
         Object.assign(config, {
 
             externals: {
 
                 // 大数据地图
 
-                'JMap': 'JMap',
 
-                'JMapQuery': 'JMapQuery',
 
+                // 'JMap': 'JMap',
 
+                // 'JMapQuery': 'JMapQuery',
 
 
                 // 高德地图
 
-                // 'AMap': 'AMap',
 
-                // 'AMapUI': 'AMapUI'
 
+                'AMap': 'AMap',
 
+                'AMapUI': 'AMapUI'
 
             }
 
         })
 
     },