diff --git a/package.json b/package.json
index 3deef137..fc76c39c 100644
--- a/package.json
+++ b/package.json
@@ -45,6 +45,7 @@
"throttle-debounce": "^3.0.1",
"v-distpicker": "^1.2.2",
"vue": "^2.6.11",
+ "vue-baidu-map": "^0.21.22",
"vue-i18n": "^8.12.0",
"vue-quill-editor": "^3.0.6",
"vue-router": "^3.0.7",
diff --git a/public/index.html b/public/index.html
index 37b08883..78c1d2b2 100644
--- a/public/index.html
+++ b/public/index.html
@@ -8,6 +8,7 @@
+
diff --git a/src/assets/img/shuju/measure/jijin.png b/src/assets/img/shuju/measure/jijin.png
new file mode 100644
index 00000000..b051139c
Binary files /dev/null and b/src/assets/img/shuju/measure/jijin.png differ
diff --git a/src/assets/img/shuju/measure/minban.png b/src/assets/img/shuju/measure/minban.png
new file mode 100644
index 00000000..735fea83
Binary files /dev/null and b/src/assets/img/shuju/measure/minban.png differ
diff --git a/src/assets/img/shuju/measure/other.png b/src/assets/img/shuju/measure/other.png
new file mode 100644
index 00000000..d5791f0e
Binary files /dev/null and b/src/assets/img/shuju/measure/other.png differ
diff --git a/src/assets/scss/modules/visual/people.scss b/src/assets/scss/modules/visual/people.scss
index b18adc62..f9379e7f 100644
--- a/src/assets/scss/modules/visual/people.scss
+++ b/src/assets/scss/modules/visual/people.scss
@@ -263,9 +263,10 @@
}
.tab {
+ @include toe;
margin: 0 5px;
min-width: 80px;
- padding: 0 10px;
+ padding: 0 8px;
height: 36px;
background: rgba(255, 255, 255, 0);
border: 1px solid #1257c9;
diff --git a/src/assets/scss/people-info.scss b/src/assets/scss/people-info.scss
index 12bfae15..f54b2e24 100644
--- a/src/assets/scss/people-info.scss
+++ b/src/assets/scss/people-info.scss
@@ -104,9 +104,10 @@
}
.tab {
+ @include toe;
margin: 0 5px;
min-width: 80px;
- padding: 0 10px;
+ padding: 0 8px;
height: 36px;
background: #fff;
border: 1px solid #eee;
diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue
index 5d0c5375..70066d41 100644
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@@ -244,7 +244,7 @@ export default {
this.ownerPhone = null
this.rentFlag = null
} else if (source === 'search') {//来源于查询
-
+ this.agencyObj = treeObj
this.ownerName = ownerName
this.ownerPhone = ownerPhone
this.rentFlag = rentFlag
diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
new file mode 100644
index 00000000..0e42a655
--- /dev/null
+++ b/src/views/modules/base/organization/organization.vue
@@ -0,0 +1,2195 @@
+
+
+
+
+
+
+ {{ breadcrumb.name }}
+ {{ breadcrumb.name }}
+ 修改
+
+
+
+
+
+
+
+
+
+
+
+
+ 新增
+
+
+ 进入
+
+
+
+
+
+
+
+
+
+
+
+ 新增
+
+
+ 进入
+
+
+
+
+
+
+
+
+
+
+
+
+ 新增
+
+
+ 进入
+
+
+
+
+
+
+
+
+
+ {{ role }}
+
+
+
+
+ 新增
+
+
+ 修改
+ 查看
+ 调动
+ 禁用
+
+
+
+
+
+
+
+
+
+ {{ role }}
+
+
+
+
+ 新增
+
+
+ 修改
+ 查看
+ 调动
+ 禁用
+
+
+
+
+
+
+
+
+
+ {{ role }}
+
+
+
+
+ 新增
+
+
+ 修改
+ 查看
+ 调动
+ 禁用
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取 消
+ 确 定
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 当前点击坐标为：
+
+
+
+
+
+ 取 消
+ 确 定
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取 消
+ 确 定
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取 消
+ 确 定
+
+
+
+
+
+ 禁用后该用户将无法登录系统，是否继续？
+
+ 取 消
+ 确 定
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 关 闭
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取 消
+ 确 定
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取 消
+ 确 定
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取 消
+ 确 定
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取 消
+ 确 定
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取 消
+ 确 定
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取 消
+ 确 定
+
+
+
+