@@ -384,6 +400,11 @@ export default {
},
computed: {
+ showIcon (showNum, level) {
+
+
+
+ },
rowHeight () {
return this.$store.state.inIframe ? this.clientHeight - 160 + this.iframeHeight + 'px' : this.clientHeight - 160 + 'px'
@@ -564,6 +585,9 @@ export default {
this.openNodes.push(data[0].id)
this.treeData = data
+ this.handleTreeData(this.treeData)
+
+
if (!isRefresh && data.length > 0) {
this.selTreeObj = data[0]
@@ -581,6 +605,27 @@ export default {
}
},
+ handleTreeData (treeData) {
+ for (let i in treeData) {
+ treeData[i].showIcon = false
+ if (treeData[i].level === 'building') {
+
+
+ let array = treeData[i].showNum.split('/')
+ if (array.length === 2) {
+ let a = parseInt(array[0])
+ let b = parseInt(array[1])
+ treeData[i].showIcon = a < b
+ }
+
+ }
+
+ if (treeData[i].children) { //存在子节点就递归
+ this.handleTreeData(treeData[i].children);
+ }
+ }
+ },
+
//加载组织数据
async loadOrgData () {
const url = "/gov/org/agency/maporg"
@@ -858,6 +903,9 @@ export default {
.div_tree {
margin: 7px 8px 7px 7px;
+ width: 30%;
+ max-width: 304px;
+ min-width: 240px;
/deep/ .el-scrollbar__wrap {
overflow-x: hidden !important;
}
diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue
index 4443e7e14..4cac6081f 100644
--- a/src/views/modules/base/community/communityTable.vue
+++ b/src/views/modules/base/community/communityTable.vue
@@ -380,7 +380,7 @@ export default {
},
computed: {
tableHeight () {
- return this.$store.state.inIframe ? this.clientHeight - 425 + this.iframeHeight : this.clientHeight - 425
+ return this.$store.state.inIframe ? this.clientHeight - 465 + this.iframeHeight : this.clientHeight - 465
},
diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue
index 2644e6995..37927746f 100644
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@@ -380,8 +380,8 @@ export default {
computed: {
tableHeight () {
return this.$store.state.inIframe
- ? this.clientHeight - 425 + this.iframeHeight
- : this.clientHeight - 425;
+ ? this.clientHeight - 465 + this.iframeHeight
+ : this.clientHeight - 465;
},
...mapGetters(["clientHeight", "iframeHeight"]),
diff --git a/src/views/modules/base/smartImport.vue b/src/views/modules/base/smartImport.vue
new file mode 100644
index 000000000..4ab3789ae
--- /dev/null
+++ b/src/views/modules/base/smartImport.vue
@@ -0,0 +1,488 @@
+
+
+
+
+
+
+
+ 表格导入
+
+ 下载模板
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 配置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取 消
+ 确 定
+
+
+
+
+
+
+
+
+