diff --git a/src/views/property/main-gis/index.js b/src/views/property/main-gis/index.js
index 0eb54b4..e6079e9 100644
--- a/src/views/property/main-gis/index.js
+++ b/src/views/property/main-gis/index.js
@@ -1,8 +1,5 @@
import GisUtils from '@/utils/gis.js';
-import {
- fromLonLat
-} from 'ol/proj'
import { treeselect, getDept, listDeptExcludeChild } from "@/api/system/dept";
import { getInfo } from "@/api/login";
import { getConfigKey } from "@/api/system/config";
@@ -10,11 +7,43 @@ import { getPermanentListByDeptId, listPermanent } from "@/api/asset/permanent.j
import { getResourceListByDeptId, listResource } from "@/api/asset/resource.js";
import { attachmentList } from "@/api/common/uploadAttachment.js";
let gis = null;
+import Legend from '@/components/legend/index.vue';
export default {
components: {
+ Legend
},
data () {
return {
+ LegendData: [
+ {
+ iconStyle: {
+ background: 'rgba(38,252,128,0.45)',
+ border: '2px solid #26FC80'
+ },
+ name: '自用'
+ },
+ {
+ iconStyle: {
+ background: 'rgba(232,246,0,0.45)',
+ border: '2px solid #E8F600'
+ },
+ name: '闲置'
+ },
+ {
+ iconStyle: {
+ background: 'rgba(16,252,252,0.45)',
+ border: '2px solid #10FCFC'
+ },
+ name: '出租'
+ },
+ {
+ iconStyle: {
+ background: 'rgba(198,0,255,0.45)',
+ border: '2px solid #C600FF'
+ },
+ name: '其他'
+ }
+ ],
dialogImageUrl: '',
dialogVisible: false,
showInfoDetail: false,
diff --git a/src/views/property/main-gis/index.scss b/src/views/property/main-gis/index.scss
index 5ed64ed..4a58c43 100644
--- a/src/views/property/main-gis/index.scss
+++ b/src/views/property/main-gis/index.scss
@@ -5,6 +5,36 @@
right: 0;
bottom: 0;
+ .legend_pos {
+ z-index: 21 !important;
+ position: absolute;
+ top: 100px;
+ right: 480px;
+
+ .legend_full {
+ width: 100%;
+ height: 100%;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+
+ .legend_item {
+ display: flex;
+ justify-content: center;
+ // border: 1px solid red;
+ align-items: center;
+
+ .icon {
+ width: 16px;
+ height: 16px;
+ border-radius: 50%;
+ margin-right: 10px;
+ }
+ }
+
+ }
+ }
+
.mask {
z-index: 1;
width: 100%;
diff --git a/src/views/resources/main-gis/index.html b/src/views/resources/main-gis/index.html
index ca52d5d..4daf291 100644
--- a/src/views/resources/main-gis/index.html
+++ b/src/views/resources/main-gis/index.html
@@ -1,4 +1,12 @@