qinhouyu 2 anos atrás
pai
commit
f342ba44b1
3 arquivos alterados com 5 adições e 1 exclusões
  1. 1 0
      package.json
  2. 1 1
      src/components/supermap-2.5d.vue
  3. 3 0
      src/views/bigdata/bigdata.vue

+ 1 - 0
package.json

@@ -46,6 +46,7 @@
     "element-ui": "2.15.6",
     "file-saver": "2.0.5",
     "fuse.js": "6.4.3",
+    "highcharts-vue": "^1.4.3",
     "highlight.js": "9.18.5",
     "html2canvas": "^1.4.1",
     "js-beautify": "1.13.0",

+ 1 - 1
src/components/supermap-2.5d.vue

@@ -10,7 +10,7 @@
           </div>
           <div class="map-txt" v-html="bindPopupHtml">
           </div>
-          <el-button size="mini" type="primary"
+          <el-button size="mini" type="primary" v-if="clickName!=''"
                      class="sj-icon-btn" @click="openTvwall"
           >查看
           </el-button>

+ 3 - 0
src/views/bigdata/bigdata.vue

@@ -57,6 +57,7 @@
           <div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
             <span>仓库信息</span>
           </div>
+          <chartenterprises/>
         </div>
         <div class="b-con mg-b-20 b-49">
           <div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
@@ -149,6 +150,7 @@ import bigdataSupermap from '@/components/supermap' //超图
 import chartEvent from './chart-event.vue' //1  隐患整改情况
 import chartteam from './chart-team.vue'
 import chartwarehouse from './chart-warehouse.vue'
+import chartenterprises from './chart-enterprises.vue'
 import chartForestFarm from './chart-forestFarm.vue' //2  行业高危企业
 import chartEquipmentType from './chart-equipmentType.vue' //3  从业人员分布情况
 import chartFireCause from './chart-fireCause.vue' //4  应急物资、、
@@ -172,6 +174,7 @@ export default {
     tabbar,
     chartEvent,
     chartForestFarm,
+    chartenterprises,
     chartEquipmentType,
     chartFireCause,
     chartDeviceReportingEvents,