From e0f1fb7f0b87d61babdafadd289d42e347c51944 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: Fri, 29 Apr 2022 17:12:01 +0800
Subject: [PATCH] 负责人新增搜索功能
---
src/views/doublePreventAction/riskLevelManage/fourColorMap/index.vue | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/src/views/doublePreventAction/riskLevelManage/fourColorMap/index.vue b/src/views/doublePreventAction/riskLevelManage/fourColorMap/index.vue
index 5ec579a..0383b97 100644
--- a/src/views/doublePreventAction/riskLevelManage/fourColorMap/index.vue
+++ b/src/views/doublePreventAction/riskLevelManage/fourColorMap/index.vue
@@ -1,11 +1,21 @@
<template>
- <div class="map-layout">
- <Map @init="init" :option="option" v-if="option" />
- <Tab v-if="loaded" />
- </div>
+<div style="height:1000px;width:100%;background:#FFFFFF;padding:20px">
+ <el-tabs v-model="activeName">
+ <el-tab-pane label="60万吨" name="first">
+ <sixty></sixty>
+ </el-tab-pane>
+ <el-tab-pane label="130万吨" name="second">
+ <oneHundredAndThirty></oneHundredAndThirty>
+ </el-tab-pane>
+ </el-tabs>
+</div>
+
+
</template>
<script>
+ import sixty from './components/sixty.vue'
+ import oneHundredAndThirty from './components/oneHundredAndThirty.vue'
import Map from '../../../../components/Map';
import Tab from '../../../../components/Tab';
import { global } from '../../../../global';
@@ -19,9 +29,12 @@
components: {
Map,
Tab,
+ oneHundredAndThirty,
+ sixty
},
data() {
return {
+ activeName:'first',
loaded: false,
map: null,
option: null,
@@ -66,7 +79,7 @@
this.loaded = true;
map.addModel({
- link: 'http://222.92.213.21:8006/zhongtaiweb/tileset.json',
+ link: 'http://222.92.213.22:8006/b3dm60/tileset.json',
name: '商业园区',
callback: tileset => {
var boundingSphere = tileset.boundingSphere;
@@ -260,7 +273,7 @@
<style scoped>
.map-layout {
- height: 100%;
+ height: 920px;;
position: relative;
}
--
Gitblit v1.9.2