修改所有图表X、Y轴字体、刻度、轴线等样式颜色 警情时段分布：修改X轴显示内容，增加旋转角度 火灾数据分析： 修改实时警情模块为火灾情况分析 增加气泡图图表，完成数据对接和样式展示 词云模块增加mock数据来填充数据以形成相应的图形 消防教育模块数据填充完成 修改消防执法动态中内容的样式，增加圆角 调整地图模块标记位置和样式错位问题 修改表格表头部分缺角和展示样式同设计图差异问题

src/assets/scss/common.scss

@@ -189,7 +189,7 @@ body {
             z-index: 9;
             width: min-content;
             .el-col {
-                width: 1.5rem;
+                width: 1.6875rem;
                 height: .6875rem;
                 margin-bottom: .0625rem;
                 line-height: .6875rem;
@@ -211,15 +211,15 @@ body {
                 background: url('~@a/img/icon/tip4.png') no-repeat;
             }
             &>.blueImageTip {
-                width: 2rem;
+                width: 2.1875rem;
                 background: url('~@a/img/icon/tip11.png') no-repeat;
             }
             &>.yellowImageTip {
-                width: 2rem;
+                width: 2.1875rem;
                 background: url('~@a/img/icon/tip12.png') no-repeat;
             }
             &>.redImageTip {
-                width: 2rem;
+                width: 2.1875rem;
                 background: url('~@a/img/icon/tip13.png') no-repeat;
             }
         }

src/assets/scss/element-ui.scss

@@ -5,7 +5,7 @@
         display: table-cell!important;
     }
     table {
-        // flex-shrink: 0;
+        flex-shrink: 0;
         width: 100% !important;
     }
     table {

src/components/bar/index.vue

@@ -78,13 +78,16 @@ export default {
           },
         },
         yAxis: {
+          axisTick: {
+            show: false,
+          },
           type: "value",
           axisLabel: {
             color: "#FFFFFF",
           },
           splitLine: {
             lineStyle: {
-              color: "#ccc",
+              color: "rgba(255,255,255,.4)",
             },
           },
         },

src/components/category-line/index.vue

@@ -49,6 +49,9 @@ export default {
           axisLabel: {
             color: "#FFFFFF",
           },
+          axisTick: {
+            show: false,
+          },
         },
         tooltip: {
           trigger: "axis",
@@ -60,13 +63,16 @@ export default {
           position: "bottom",
         },
         yAxis: {
+          axisTick: {
+            show: false,
+          },
           type: "value",
           axisLabel: {
             color: "#FFFFFF",
           },
           splitLine: {
             lineStyle: {
-              color: "#ccc",
+              color: "rgba(255,255,255,.4)",
             },
           },
         },

src/components/category/index.vue

@@ -27,11 +27,14 @@ export default {
       echarts.init(this.$refs.echartD).setOption({
         grid: {
           top: 30,
-          left: 40,
+          left: 50,
           right: 30,
           bottom: 30,
         },
         xAxis: {
+          axisTick: {
+            show: false,
+          },
           type: "category",
           data:this.xData,
           axisLabel: {
@@ -48,13 +51,16 @@ export default {
           position: "bottom",
         },
         yAxis: {
+          axisTick: {
+            show: false,
+          },
           type: "value",
           axisLabel: {
             color: "#FFFFFF",
           },
           splitLine: {
             lineStyle: {
-              color: "#ccc",
+              color: "rgba(255,255,255,.4)",
             },
           },
         },

src/components/line-smooth/index.vue

@@ -76,33 +76,34 @@ export default {
           type: "category",
           boundaryGap: false,
           data: [
-            "0",
-            "1",
-            "2",
-            "3",
-            "4",
-            "5",
-            "6",
-            "7",
-            "8",
-            "9",
-            "10",
-            "11",
-            "12",
-            "13",
-            "14",
-            "15",
-            "16",
-            "17",
-            "18",
-            "19",
-            "20",
-            "21",
-            "22",
-            "23",
+            "0-1",
+            "1-2",
+            "2-3",
+            "3-4",
+            "4-5",
+            "5-6",
+            "6-7",
+            "7-8",
+            "8-9",
+            "9-10",
+            "10-11",
+            "11-12",
+            "12-13",
+            "13-14",
+            "14-15",
+            "15-16",
+            "16-17",
+            "17-18",
+            "18-19",
+            "19-20",
+            "20-21",
+            "21-22",
+            "22-23",
+            "23-0",
           ],
           axisLabel: {
             color: "#FFFFFF",
+            rotate: 50
           },
           axisTick: {
             show: false,

src/components/radar/index.vue

@@ -33,10 +33,6 @@ export default {
       });
       echarts.init(this.$refs.echartD).setOption({
         color: ["#00FFFC"],
-        title: {
-          show: false,
-          text: "基础雷达图",
-        },
         legend: {
           show: false,
         },

src/components/scatter/index.vue

@@ -0,0 +1,130 @@
+<template>
+  <div ref="echartD" style="width: 100%; height: 100%"></div>
+</template>
+
+<script>
+import * as echarts from "echarts";
+export default {
+  props: {
+    dataMap: { type: Array, default: () => [] },
+    name: { type: String, default: () => "" },
+  },
+  data() {
+    return {};
+  },
+  watch: {
+    dataMap(val) {
+      this.getData(val);
+    },
+  },
+  mounted() {
+    this.getData();
+  },
+  methods: {
+    getData() {
+      echarts.init(this.$refs.echartD).setOption({
+        grid: {
+          top: 40,
+          left: 40,
+          right: 30,
+          bottom: 30,
+        },
+        tooltip: {
+          textStyle: {
+            color: "#FFF",
+          },
+          formatter: function (param) {
+            return `${param.data[3]}<br> 过火面积：${param.data[0]}<br> 火灾数量：${param.data[1]}<br> 死亡人数：${param.data[2]}`;
+          },
+          backgroundColor: "rgba(11, 12, 72, 0.8)",
+          borderColor: "rgba(11, 12, 72, 0.4)",
+          position: "top",
+        },
+        xAxis: {
+          name: "",
+          axisLabel: {
+            color: "#FFFFFF",
+          },
+          axisLine: {
+            show: false,
+            lineStyle: {
+              color: "#6B9DD7",
+            },
+          },
+          splitLine: {
+            show: false,
+          },
+          axisTick: {
+            show: false,
+          },
+        },
+        yAxis: {
+          name: "火灾数量/过火面积（m²）",
+          axisTick: {
+            show: false,
+          },
+          splitLine: {
+            // show:false,
+            lineStyle: {
+              color: "rgba(255,255,255,.4)",
+            },
+          },
+          axisLabel: {
+            color: "#FFFFFF",
+          },
+          axisLine: {
+            show: false,
+            lineStyle: {
+              color: "#6B9DD7",
+            },
+          },
+          scale: true,
+          nameGap: 20,
+          nameTextStyle: {
+            color: "#FFFFFF",
+            align: "left",
+            fontWeight: "bold",
+            fontSize: 14,
+          },
+        },
+        series: [
+          {
+            name: "",
+            width: "100%",
+            height: "100%",
+            data: this.dataMap.map((val) => {
+              return [val.fireArea, val.fireCount, val.deathToll, val.region];
+            }),
+            type: "scatter",
+            symbolSize: function (data) {
+              return Math.sqrt(data[2]) + 1 * 10;
+            },
+            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() {
+      // console.log(2)
+      echarts.init(this.$refs.echartD).resize();
+    },
+  },
+};
+</script>
+
+<style scoped>
+</style>

src/components/wordCloud/index.vue

@@ -49,66 +49,6 @@ export default {
           name: "动漫",
           value: 486,
         },
-        {
-          name: "音乐",
-          value: 53,
-        },
-        {
-          name: "电视",
-          value: 825,
-        },
-        {
-          name: "Lover Boy 88",
-          value: 514,
-        },
-        {
-          name: "动漫",
-          value: 486,
-        },
-        {
-          name: "音乐",
-          value: 53,
-        },
-        {
-          name: "电视",
-          value: 825,
-        },
-        {
-          name: "Lover Boy 88",
-          value: 514,
-        },
-        {
-          name: "动漫",
-          value: 486,
-        },
-        {
-          name: "音乐",
-          value: 53,
-        },
-        {
-          name: "直播",
-          value: 163,
-        },
-        {
-          name: "广播电台",
-          value: 86,
-        },
-        {
-          name: "动漫1",
-          value: 486,
-        },
-        {
-          name: "音乐2",
-          value: 53,
-        },
-        {
-          name: "直播3",
-          value: 163,
-        },
-        {
-          name: "广播电台3",
-          value: 86,
-        },
         {
           name: "戏曲曲艺",
           value: 17,
@@ -163,20 +103,8 @@ export default {
         },
       ];
       var color = ['#ff4a4a','#f7b932','#67ff72','#62f6fb','#7770ff','#70ffd8','#fd70ff','#f3ff70','#ffffff']
-      console.log(data);
       maskImage.onload = () => {
         echarts.init(this.$refs.echartD).setOption({
-          // toolbox: {
-          //   feature: {
-          //     saveAsImage: {
-          //       iconStyle: {
-          //         normal: {
-          //           color: "#FFFFFF",
-          //         },
-          //       },
-          //     },
-          //   },
-          // },
           backgroundColor: "transparent",
           tooltip: {
             show: true,
@@ -184,7 +112,7 @@ export default {
           series: [
             {
               type: "wordCloud",
-              sizeRange: [10, 40], //value与图像像素的映射的最大值与最小值
+              sizeRange: [5, 40], //value与图像像素的映射的最大值与最小值
               rotationRange: [0, 0],
               maskImage: maskImage,
               textPadding: 20,
@@ -195,10 +123,15 @@ export default {
               drawOutOfBound: false,
               textStyle: {
                 color:  ()=> {
-                  return color[Math.round(Math.random() * color.length)];
+                  return color[Math.round(Math.random() * (color.length-1))];
                 },
               },
-              data: this.dataMap,
+              data: [...this.dataMap,...data,...this.$store.state.testList,...(data.map((val,ind)=> {
+                return {
+                  name:val.name + this.$store.state.testList[ind].name,
+                  value:this.$store.state.testList[ind].value,
+                }
+              }))],
             },
           ],
         });

src/http/api.js

@@ -5,6 +5,7 @@ let api = {
     },
     fire: {
         trendQuery: '/fireStatistics/fireCountByData',
+        fireBubble: '/fireStatistics/fireBubble',
         fireType: '/fireStatistics/fireType',
         fireAddress: '/fireStatistics/fireAddress',
         fireCauseRatio: '/fireStatistics/fireCauseRatio',

src/store/index.js

@@ -15,6 +15,435 @@ export default createStore({
             '2020-06-01 00:00:00',
             '2021-07-03 23:59:59',
         ],
+        educationHeader: [
+            { prop: "type", name: "消防站" },
+            { prop: "policeTime", name: "成立时间/联系人" },
+            { prop: "alertLevel", name: "站点地址" },
+            { prop: "address", name: "预约电话" },
+        ],
+        educationList: [
+            { type: '闵行消防救援站', policeTime: '1995年', alertLevel: '碧江路370号', address: '021-64880119', },
+            { type: '吴泾消防救援站', policeTime: '1958年', alertLevel: '放鹤路66号', address: '021-64502132', },
+            { type: '莘庄消防救援站', policeTime: '1958年', alertLevel: '莘福路18号', address: '021-64887119', },
+            { type: '七宝消防救援站', policeTime: '2002年', alertLevel: '星中路1000号', address: '021-24201980', },
+            { type: '杜行消防救援站', policeTime: '1977年', alertLevel: '三鲁路2179号', address: '021-64166174', },
+            { type: '华漕消防救援站', policeTime: '2006年', alertLevel: '联友路408号', address: '021-52262131', },
+            { type: '浦江消防救援站', policeTime: '2006年', alertLevel: '北江洲路528号', address: '021-64291071', },
+            { type: '新虹特勤站', policeTime: '2021年', alertLevel: '申昆路251号', address: '021-24287320', },
+            { type: '光华消防救援站', policeTime: '2013年', alertLevel: '光华路885号', address: '021-64938239', },
+            { type: '马桥消防救援站', policeTime: '2018年', alertLevel: '昆阳路1980号', address: '021-62211653', },
+            { type: '颛桥消防救援站', policeTime: '2018年', alertLevel: '都庄路2100号', address: '021-62960119', },
+            { type: '吴泾消防安全科普教育基地', policeTime: '刘老师', alertLevel: '剑川路119号', address: '1340211743', },
+            { type: '纪王学校消防科普馆', policeTime: '凌老师', alertLevel: '纪翟路1655号', address: '62960016-8061', },
+            { type: '古美街道消防安全体验室', policeTime: '刘老师', alertLevel: '万源路580弄1号', address: '18918408252', },
+            { type: '颛桥消防安全体验馆', policeTime: '林老师', alertLevel: '中沟路89号', address: '15901898592', },
+        ],
+        testList: [{
+            name: "Jayfee",
+            value: 666
+        }, {
+            name: "Nancy",
+            value: 520
+        }, {
+            name: "生活资源",
+            value: 999
+        }, {
+            name: "供热管理",
+            value: 888
+        }, {
+            name: "供气质量",
+            value: 777
+        }, {
+            name: "生活用水管理",
+            value: 688
+        }, {
+            name: "一次供水问题",
+            value: 588
+        }, {
+            name: "交通运输",
+            value: 516
+        }, {
+            name: "城市交通",
+            value: 515
+        }, {
+            name: "环境保护",
+            value: 483
+        }, {
+            name: "房地产管理",
+            value: 462
+        }, {
+            name: "城乡建设",
+            value: 449
+        }, {
+            name: "社会保障与福利",
+            value: 429
+        }, {
+            name: "社会保障",
+            value: 407
+        }, {
+            name: "文体与教育管理",
+            value: 406
+        }, {
+            name: "公共安全",
+            value: 406
+        }, {
+            name: "公交运输管理",
+            value: 386
+        }, {
+            name: "出租车运营管理",
+            value: 385
+        }, {
+            name: "供热管理",
+            value: 375
+        }, {
+            name: "市容环卫",
+            value: 355
+        }, {
+            name: "自然资源管理",
+            value: 355
+        }, {
+            name: "粉尘污染",
+            value: 335
+        }, {
+            name: "噪声污染",
+            value: 324
+        }, {
+            name: "土地资源管理",
+            value: 304
+        }, {
+            name: "物业服务与管理",
+            value: 304
+        }, {
+            name: "医疗卫生",
+            value: 284
+        }, {
+            name: "粉煤灰污染",
+            value: 284
+        }, {
+            name: "占道",
+            value: 284
+        }, {
+            name: "供热发展",
+            value: 254
+        }, {
+            name: "农村土地规划管理",
+            value: 254
+        }, {
+            name: "生活噪音",
+            value: 253
+        }, {
+            name: "供热单位影响",
+            value: 253
+        }, {
+            name: "城市供电",
+            value: 223
+        }, {
+            name: "房屋质量与安全",
+            value: 23
+        }, {
+            name: "大气污染",
+            value: 223
+        }, {
+            name: "房屋安全",
+            value: 223
+        }, {
+            name: "文化活动",
+            value: 223
+        }, {
+            name: "拆迁管理",
+            value: 223
+        }, {
+            name: "公共设施",
+            value: 223
+        }, {
+            name: "供气质量",
+            value: 223
+        }, {
+            name: "供电管理",
+            value: 223
+        }, {
+            name: "燃气管理",
+            value: 152
+        }, {
+            name: "教育管理",
+            value: 152
+        }, {
+            name: "医疗纠纷",
+            value: 152
+        }, {
+            name: "执法监督",
+            value: 152
+        }, {
+            name: "设备安全",
+            value: 152
+        }, {
+            name: "政务建设",
+            value: 152
+        }, {
+            name: "县区、开发区",
+            value: 152
+        }, {
+            name: "宏观经济",
+            value: 152
+        }, {
+            name: "教育管理",
+            value: 112
+        }, {
+            name: "社会保障",
+            value: 112
+        }, {
+            name: "生活用水管理",
+            value: 112
+        }, {
+            name: "物业服务与管理",
+            value: 112
+        }, {
+            name: "分类列表",
+            value: 112
+        }, {
+            name: "农业生产",
+            value: 112
+        }, {
+            name: "二次供水问题",
+            value: 112
+        }, {
+            name: "城市公共设施",
+            value: 92
+        }, {
+            name: "拆迁政策咨询",
+            value: 92
+        }, {
+            name: "物业服务",
+            value: "92"
+        }, {
+            name: "物业管理",
+            value: "92"
+        }, {
+            name: "社会保障保险管理",
+            value: "92"
+        }, {
+            name: "低保管理",
+            value: "92"
+        }, {
+            name: "文娱市场管理",
+            value: "72"
+        }, {
+            name: "城市交通秩序管理",
+            value: "72"
+        }, {
+            name: "执法争议",
+            value: "72"
+        }, {
+            name: "商业烟尘污染",
+            value: "72"
+        }, {
+            name: "占道堆放",
+            value: "71"
+        }, {
+            name: "地上设施",
+            value: "71"
+        }, {
+            name: "水质",
+            value: "71"
+        }, {
+            name: "无水",
+            value: "71"
+        }, {
+            name: "供热单位影响",
+            value: "71"
+        }, {
+            name: "人行道管理",
+            value: "71"
+        }, {
+            name: "主网原因",
+            value: "71"
+        }, {
+            name: "集中供热",
+            value: "71"
+        }, {
+            name: "客运管理",
+            value: "71"
+        }, {
+            name: "国有公交（大巴）管理",
+            value: "71"
+        }, {
+            name: "工业粉尘污染",
+            value: "71"
+        }, {
+            name: "治安案件",
+            value: "71"
+        }, {
+            name: "压力容器安全",
+            value: "71"
+        }, {
+            name: "身份证管理",
+            value: "71"
+        }, {
+            name: "群众健身",
+            value: "41"
+        }, {
+            name: "工业排放污染",
+            value: "41"
+        }, {
+            name: "破坏森林资源",
+            value: "41"
+        }, {
+            name: "市场收费",
+            value: "41"
+        }, {
+            name: "生产资金",
+            value: "41"
+        }, {
+            name: "生产噪声",
+            value: "41"
+        }, {
+            name: "农村低保",
+            value: "41"
+        }, {
+            name: "劳动争议",
+            value: "41"
+        }, {
+            name: "劳动合同争议",
+            value: "41"
+        }, {
+            name: "劳动报酬与福利",
+            value: "41"
+        }, {
+            name: "医疗事故",
+            value: "21"
+        }, {
+            name: "停供",
+            value: "21"
+        }, {
+            name: "基础教育",
+            value: "21"
+        }, {
+            name: "职业教育",
+            value: "21"
+        }, {
+            name: "物业资质管理",
+            value: "21"
+        }, {
+            name: "拆迁补偿",
+            value: "21"
+        }, {
+            name: "设施维护",
+            value: "21"
+        }, {
+            name: "市场外溢",
+            value: "11"
+        }, {
+            name: "占道经营",
+            value: "11"
+        }, {
+            name: "树木管理",
+            value: "11"
+        }, {
+            name: "农村基础设施",
+            value: "11"
+        }, {
+            name: "无水",
+            value: "11"
+        }, {
+            name: "供气质量",
+            value: "11"
+        }, {
+            name: "停气",
+            value: "11"
+        }, {
+            name: "市政府工作部门（含部门管理机构、直属单位）",
+            value: "11"
+        }, {
+            name: "燃气管理",
+            value: "11"
+        }, {
+            name: "市容环卫",
+            value: "11"
+        }, {
+            name: "新闻传媒",
+            value: "11"
+        }, {
+            name: "人才招聘",
+            value: "11"
+        }, {
+            name: "市场环境",
+            value: "11"
+        }, {
+            name: "行政事业收费",
+            value: "11"
+        }, {
+            name: "食品安全与卫生",
+            value: "11"
+        }, {
+            name: "城市交通",
+            value: "11"
+        }, {
+            name: "房地产开发",
+            value: "11"
+        }, {
+            name: "房屋配套问题",
+            value: "11"
+        }, {
+            name: "物业服务",
+            value: "11"
+        }, {
+            name: "物业管理",
+            value: "11"
+        }, {
+            name: "占道",
+            value: "11"
+        }, {
+            name: "园林绿化",
+            value: "11"
+        }, {
+            name: "户籍管理及身份证",
+            value: "11"
+        }, {
+            name: "公交运输管理",
+            value: "11"
+        }, {
+            name: "公路（水路）交通",
+            value: "11"
+        }, {
+            name: "房屋与图纸不符",
+            value: "11"
+        }, {
+            name: "有线电视",
+            value: "11"
+        }, {
+            name: "社会治安",
+            value: "11"
+        }, {
+            name: "林业资源",
+            value: "11"
+        }, {
+            name: "其他行政事业收费",
+            value: "11"
+        }, {
+            name: "经营性收费",
+            value: "11"
+        }, {
+            name: "食品安全与卫生",
+            value: "11"
+        }, {
+            name: "体育活动",
+            value: "11"
+        }, {
+            name: "有线电视安装及调试维护",
+            value: "11"
+        }, {
+            name: "低保管理",
+            value: "11"
+        }, {
+            name: "劳动争议",
+            value: "11"
+        }, {
+            name: "社会福利及事务",
+            value: "11"
+        }, {
+            name: "一次供水问题",
+            value: "11"
+        }],
     },
     mutations: {
         changRouterInfo(state, route) {

src/views/enforcement-dynamic.vue

@@ -284,7 +284,7 @@ export default {
         & > .el-col {
           width: 1.9375rem;
           height: 1.3125rem;
-          background: url(~@a/img/enforce/bg3.png) no-repeat;
+          // background: url(~@a/img/enforce/bg3.png) no-repeat;
           box-shadow: inset 0 0 0.2rem 0.0125rem #30cfff;
           background-size: 100% 100%;
           display: flex;
@@ -293,6 +293,7 @@ export default {
           padding: 0.125rem 0.1rem;
           box-sizing: border-box;
           margin-bottom: 0.125rem;
+          border-radius: 10px;
           & > .el-col {
             display: flex;
             justify-content: center;

src/views/fire-data-analysis.vue

@@ -91,8 +91,8 @@
             ></se-table>
           </el-col>
           <el-col class="rightBot">
-            <h4>实时警情处理</h4>
-            <el-table
+            <h4>火灾情况分析</h4>
+            <!-- <el-table
               :data="tableData2"
               :key="windowWidth"
               class="transparentTableRow"
@@ -158,7 +158,9 @@
                     {{ item.prop === 'type' ? '' : (item.prop === 'status' ? (scope.row[item.prop] == 1 ? '可用' : '不可用') : scope.row[item.prop])}}
                 </template>
               </el-table-column>
-            </el-table>
+            </el-table> -->
+
+            <scatter ref="scatter" :dataMap="fireBubbleList"></scatter>
           </el-col>
         </div>
       </el-col>
@@ -171,10 +173,11 @@ import linstener from "@c/mixins/linstener";
 import categoryLine from "@c/category-line";
 import firePie from "@c/fire-pie";
 import seTable from "@c/se-table";
+import scatter from "@c/scatter";
 import AMap from 'AMap'
 import map from "@c/mixins/map";
 export default {
-  components: { categoryLine, firePie, seTable },
+  components: { categoryLine, firePie, seTable, scatter },
   mixins: [linstener,map],
   data() {
     return {
@@ -289,6 +292,7 @@ export default {
         address2:'',
       },
       timeData: [],
+      fireBubbleList: [],
       barForm: {
         fireType: "",
         address: "",
@@ -316,6 +320,7 @@ export default {
           this.$refs.categoryLine,
           this.$refs.firePie1,
           this.$refs.firePie2,
+          this.$refs.scatter,
         ]),
       true
     );
@@ -364,8 +369,23 @@ export default {
       this.getTrend();
       this.getFireCause();
       this.getFireStatis();
+      this.policeInfo();
       // this.getPage();
     },
+    // 火灾情况分析
+    async policeInfo() {
+      let res = await this.$axios.get(
+        this.$api.fire.fireBubble +
+          "?" +
+          this.$qs.stringify({
+            unitId: '',
+            fireType: '',
+            startTime: this.$store.state.timeList[0] || "",
+            endTime: this.$store.state.timeList[1] || "",
+          })
+      );
+      if (res) this.fireBubbleList = res.data;
+    },
     // 火灾趋势图 柱状图
     async getTrend() {
       let res = await this.$axios.get(
@@ -543,7 +563,6 @@ export default {
       padding: 0.375rem 0.45rem 0.1875rem;
       box-sizing: border-box;
       width: 100%;
-      overflow: hidden;
       .threeBox {
         width: 100%;
         height: 100%;

src/views/rescue-station.vue

@@ -168,7 +168,7 @@
           <el-col class="rightBot">
             <h4>消防科普教育基地</h4>
             <el-table
-              :data="tableData3"
+              :data="$store.state.educationList"
               class="transparentTableRow"
               height="100%"
               row-style="height:.425rem;"
@@ -176,7 +176,7 @@
               style="width: 100%; margin: 0 auto"
             >
               <el-table-column
-                v-for="item in headerData3"
+                v-for="item in $store.state.educationHeader"
                 show-overflow-tooltip
                 :key="item.prop"
                 :prop="item.prop"
@@ -380,15 +380,6 @@ export default {
         { prop: "department", name: "所属中队" },
         { prop: "status", name: "状况" },
       ],
-      headerData3: [
-        { prop: "type", name: "消防站" },
-        { prop: "policeTime", name: "成立时间/联系人" },
-        { prop: "alertLevel", name: "站点地址" },
-        { prop: "address", name: "预约电话" },
-      ],
-      tableData3:[
-        {type:'闵行消防救援站',policeTime:'1995年',alertLevel:'碧江路370号',address:'021-64880119',}
-      ],
       unitBeOnDutyList: [],
     };
   },