diff --git a/packages/3.0.0/AppConvenienceAddressBook/components/Add.vue b/packages/3.0.0/AppConvenienceAddressBook/components/Add.vue
index 3500a7f2..635fc48c 100644
--- a/packages/3.0.0/AppConvenienceAddressBook/components/Add.vue
+++ b/packages/3.0.0/AppConvenienceAddressBook/components/Add.vue
@@ -72,13 +72,10 @@
},
id: '',
regPhone,
- areaList: []
}
},
created () {
- this.getAreaList()
-
if (this.params && this.params.areaId && !this.params.id) {
this.form.areaId = this.params.areaId
this.form.areaName = this.params.areaName
@@ -99,19 +96,6 @@
})
},
- getAreaList() {
- this.instance.post(`/admin/area/queryAreaByParentId?id=341021104000`).then(res => {
- if (res.code == 0) {
- this.areaList = res.data.map(item => {
- item.dictName = item.name
- item.dictValue = item.id
-
- return item
- })
- }
- })
- },
-
onClose () {
this.form.explain = ''
},
diff --git a/packages/3.0.0/AppConvenienceAddressBook/components/List.vue b/packages/3.0.0/AppConvenienceAddressBook/components/List.vue
index 06ade647..bfe44ddb 100644
--- a/packages/3.0.0/AppConvenienceAddressBook/components/List.vue
+++ b/packages/3.0.0/AppConvenienceAddressBook/components/List.vue
@@ -120,7 +120,6 @@ export default {
label: 'name'
},
currIndex: -1,
- areaList: [],
total: 10,
colConfigs: [
{prop: 'name', label: '名称', align: 'left'},
@@ -153,7 +152,6 @@ export default {
this.search.areaId = this.user.info.areaId
this.areaName = this.user.info.areaName
this.getTree()
- this.getAreaList()
this.getList()
this.$nextTick(() => {
@@ -232,14 +230,6 @@ export default {
}
},
- getAreaList() {
- this.instance.post(`/admin/area/queryAreaByParentId?id=341021104000`).then(res => {
- if (res.code == 0) {
- this.areaList = res.data
- }
- })
- },
-
remove(id) {
this.$confirm('确定删除该数据？').then(() => {
this.instance.post(`/app/appconvenientaddressbook/delete?ids=${id}`).then(res => {
diff --git a/packages/3.0.0/AppNavConfig/components/List.vue b/packages/3.0.0/AppNavConfig/components/List.vue
index 394ec788..603c7e84 100644
--- a/packages/3.0.0/AppNavConfig/components/List.vue
+++ b/packages/3.0.0/AppNavConfig/components/List.vue
@@ -37,6 +37,13 @@
{{ item.name }}
+
@@ -93,8 +100,34 @@
+
+
+
+ 选择地区
+
+
+
+
+
+
+
+
+
@@ -121,6 +154,12 @@
isEdit: false,
isRemove: false,
isRest: true,
+ isShowArea: false,
+ defaultProps: {
+ children: "girdList",
+ label: "girdName",
+ },
+ treeList: [],
form: {
type: '',
pictureUrl: [],
@@ -144,7 +183,9 @@
dictValue: '4'
}],
isShowAdd: false,
- list: []
+ list: [],
+ defaultExpanded: [],
+ defaultChecked: []
}
},
@@ -152,6 +193,7 @@
this.dict.load('homeConfigMenuType', 'miniConfigCheckType').then(() => {
this.getList()
})
+ this.getTree()
},
methods: {
@@ -169,6 +211,54 @@
})
},
+ getTree() {
+ this.instance.post(`/admin/area/queryAllArea?id=${this.user.info.areaId}`).then(res => {
+ if (res.code === 0) {
+ let parent = res.data.map(v => {
+ v.label = v.name
+ v.children = []
+
+ return v
+ }).filter(e => !e.parentid)[0]
+ this.defaultExpanded = [parent.id]
+ this.defaultChecked = [parent.id]
+ this.search.areaId = parent.id
+ this.addChild(parent, res.data)
+ this.areaTree = [parent]
+
+ this.$nextTick(() => {
+ this.$refs.tree.setCurrentKey(parent.id)
+ })
+ }
+ })
+ },
+
+ format (list) {
+ return list.map(item => {
+ if (item.girdLevel !== '2') {
+ item.disabled = true
+ }
+
+ if (item.girdList && item.girdList.length) {
+ item.girdList = this.format(item.girdList)
+ }
+
+ return item
+ })
+ },
+
+ editApp (e) {
+ console.log(e)
+ this.form = {
+ ...e,
+ pictureUrl: [{
+ url: e.pictureUrl
+ }]
+ }
+
+ this.isShowAdd = true
+ },
+
isCanAdd (item) {
const isHas = this.picked.map(v => v.id).indexOf(item.id) > -1
@@ -328,6 +418,53 @@
position: relative;
margin: 0 16px 16px 0;
text-align: center;
+ cursor: pointer;
+
+ .item-setting {
+ position: absolute;
+ top: 0;
+ left: 0;
+ z-index: 0;
+ opacity: 0;
+ width: 100%;
+ height: 100%;
+ transition: all ease 0.3s;
+
+ .item-wrapper__icon {
+ position: relative;
+ z-index: 1;
+ width: 100%;
+ height: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ flex-direction: column;
+
+ div {
+ margin-top: 6px;
+ font-size: 16px;
+ }
+ }
+
+ i, div {
+ font-size: 16px;
+ color: #fff;
+ }
+
+ .item-mask {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ background: rgba(0, 0, 0, 0.6);
+ }
+
+ &:hover {
+ z-index: 1;
+ opacity: 1;
+ }
+ }
img {
width: 60px;
diff --git a/packages/3.0.0/AppVillageActivity/components/Statistics.vue b/packages/3.0.0/AppVillageActivity/components/Statistics.vue
index 92b0bdfa..2a35b4f1 100644
--- a/packages/3.0.0/AppVillageActivity/components/Statistics.vue
+++ b/packages/3.0.0/AppVillageActivity/components/Statistics.vue
@@ -153,7 +153,6 @@
chart2: '',
currIndex: -1,
list: [],
- areaList: [],
unitName: '',
areaId: ''
}
@@ -175,7 +174,6 @@
this.areaId = this.user.info.areaId
this.areaName = this.user.info.areaName
this.getTree()
- this.getAreaList()
this.loading = true
this.$nextTick(() => {
this.chart1 = echarts.init(document.querySelector('.chart1'))
@@ -245,14 +243,6 @@
}
},
- getAreaList() {
- this.instance.post(`/admin/area/queryAreaByParentId?id=341021104000`).then(res => {
- if (res.code == 0) {
- this.areaList = res.data
- }
- })
- },
-
getInfo () {
this.loading = true
this.instance.post(`/app/appvillageactivityinfo/statistic?areaId=${this.areaId}&time1=${this.time1 || ''}&time2=${this.time2 || '-'}`).then(res => {
diff --git a/packages/3.0.0/AppVillageAuxiliarPolice/components/Add.vue b/packages/3.0.0/AppVillageAuxiliarPolice/components/Add.vue
index f414220f..42a82792 100644
--- a/packages/3.0.0/AppVillageAuxiliarPolice/components/Add.vue
+++ b/packages/3.0.0/AppVillageAuxiliarPolice/components/Add.vue
@@ -63,14 +63,11 @@
picture: [],
isPublic: '1'
},
- id: '',
- areaList: []
+ id: ''
}
},
created () {
- this.getAreaList()
-
if (this.params && this.params.areaId && !this.params.id) {
this.form.areaId = this.params.areaId
this.form.areaName = this.params.areaName
@@ -92,19 +89,6 @@
})
},
- getAreaList() {
- this.instance.post(`/admin/area/queryAreaByParentId?id=341021104000`).then(res => {
- if (res.code == 0) {
- this.areaList = res.data.map(item => {
- item.dictName = item.name
- item.dictValue = item.id
-
- return item
- })
- }
- })
- },
-
onClose () {
this.form.explain = ''
},
diff --git a/packages/3.0.0/AppVillageAuxiliarPolice/components/List.vue b/packages/3.0.0/AppVillageAuxiliarPolice/components/List.vue
index 43a76483..a2068d8d 100644
--- a/packages/3.0.0/AppVillageAuxiliarPolice/components/List.vue
+++ b/packages/3.0.0/AppVillageAuxiliarPolice/components/List.vue
@@ -110,7 +110,6 @@
label: 'name'
},
currIndex: -1,
- areaList: [],
total: 10,
colConfigs: [
{prop: 'name', label: '姓名', align: 'left'},
@@ -140,7 +139,6 @@
this.search.areaId = this.user.info.areaId
this.areaName = this.user.info.areaName
this.getTree()
- this.getAreaList()
this.getList()
this.$nextTick(() => {
@@ -219,14 +217,6 @@
}
},
- getAreaList() {
- this.instance.post(`/admin/area/queryAreaByParentId?id=341021104000`).then(res => {
- if (res.code == 0) {
- this.areaList = res.data
- }
- })
- },
-
remove(id) {
this.$confirm('确定删除该数据？').then(() => {
this.instance.post(`/app/appvillageauxiliarypolice/delete?ids=${id}`).then(res => {
diff --git a/packages/wechat/AppAddressBook/components/Add.vue b/packages/wechat/AppAddressBook/components/Add.vue
index cc91403c..3c869875 100644
--- a/packages/wechat/AppAddressBook/components/Add.vue
+++ b/packages/wechat/AppAddressBook/components/Add.vue
@@ -106,13 +106,11 @@
id: ''
},
id: '',
- tagsList: [],
- areaList: []
+ tagsList: []
}
},
created () {
- this.getAreaList()
this.getTags()
if (this.params && this.params.departmentId && !this.params.id) {
@@ -169,19 +167,6 @@
})
},
- getAreaList() {
- this.instance.post(`/admin/area/queryAreaByParentId?id=341021104000`).then(res => {
- if (res.code == 0) {
- this.areaList = res.data.map(item => {
- item.dictName = item.name
- item.dictValue = item.id
-
- return item
- })
- }
- })
- },
-
onClose () {
this.form.explain = ''
},
diff --git a/packages/wechat/AppVillageCode/components/Add.vue b/packages/wechat/AppVillageCode/components/Add.vue
index 299235c3..3f5caf68 100644
--- a/packages/wechat/AppVillageCode/components/Add.vue
+++ b/packages/wechat/AppVillageCode/components/Add.vue
@@ -55,14 +55,11 @@
codeUrl: [],
type: '',
},
- id: '',
- areaList: []
+ id: ''
}
},
created () {
- this.getAreaList()
-
if (this.params && this.params.areaId && !this.params.id) {
this.form.areaId = this.params.areaId
this.form.areaName = this.params.areaName
@@ -86,19 +83,6 @@
})
},
- getAreaList() {
- this.instance.post(`/admin/area/queryAreaByParentId?id=341021104000`).then(res => {
- if (res.code == 0) {
- this.areaList = res.data.map(item => {
- item.dictName = item.name
- item.dictValue = item.id
-
- return item
- })
- }
- })
- },
-
onClose () {
this.form.explain = ''
},
diff --git a/packages/wechat/AppVillageCode/components/List.vue b/packages/wechat/AppVillageCode/components/List.vue
index eee818c7..9f0aa0cc 100644
--- a/packages/wechat/AppVillageCode/components/List.vue
+++ b/packages/wechat/AppVillageCode/components/List.vue
@@ -106,7 +106,6 @@
label: 'name'
},
currIndex: -1,
- areaList: [],
total: 10,
colConfigs: [
{prop: 'codeName', label: '名称', align: 'left'},
@@ -141,7 +140,6 @@
this.search.areaId = this.user.info.areaId
this.areaName = this.user.info.areaName
this.getTree()
- this.getAreaList()
this.getList()
this.$nextTick(() => {
@@ -211,14 +209,6 @@
}
},
- getAreaList() {
- this.instance.post(`/admin/area/queryAreaByParentId?id=341021104000`).then(res => {
- if (res.code == 0) {
- this.areaList = res.data
- }
- })
- },
-
remove(id) {
this.$confirm('确定删除该数据？').then(() => {
this.instance.post(`/app/appeveryvillagecode/delete?ids=${id}`).then(res => {
diff --git a/project/sass/apps/AppAddressBook/components/Add.vue b/project/sass/apps/AppAddressBook/components/Add.vue
index 90f56987..d13bd75a 100644
--- a/project/sass/apps/AppAddressBook/components/Add.vue
+++ b/project/sass/apps/AppAddressBook/components/Add.vue
@@ -106,13 +106,11 @@
id: ''
},
id: '',
- tagsList: [],
- areaList: []
+ tagsList: []
}
},
created () {
- this.getAreaList()
this.getTags()
if (this.params && this.params.departmentId && !this.params.id) {
@@ -162,19 +160,6 @@
})
},
- getAreaList() {
- this.instance.post(`/admin/area/queryAreaByParentId?id=341021104000`).then(res => {
- if (res.code == 0) {
- this.areaList = res.data.map(item => {
- item.dictName = item.name
- item.dictValue = item.id
-
- return item
- })
- }
- })
- },
-
onClose () {
this.form.explain = ''
},
diff --git a/project/shandong10086/apps/shandong/AppVillageCode/components/Add.vue b/project/shandong10086/apps/shandong/AppVillageCode/components/Add.vue
index 299235c3..3f5caf68 100644
--- a/project/shandong10086/apps/shandong/AppVillageCode/components/Add.vue
+++ b/project/shandong10086/apps/shandong/AppVillageCode/components/Add.vue
@@ -55,14 +55,11 @@
codeUrl: [],
type: '',
},
- id: '',
- areaList: []
+ id: ''
}
},
created () {
- this.getAreaList()
-
if (this.params && this.params.areaId && !this.params.id) {
this.form.areaId = this.params.areaId
this.form.areaName = this.params.areaName
@@ -86,19 +83,6 @@
})
},
- getAreaList() {
- this.instance.post(`/admin/area/queryAreaByParentId?id=341021104000`).then(res => {
- if (res.code == 0) {
- this.areaList = res.data.map(item => {
- item.dictName = item.name
- item.dictValue = item.id
-
- return item
- })
- }
- })
- },
-
onClose () {
this.form.explain = ''
},
diff --git a/project/shandong10086/apps/shandong/AppVillageCode/components/List.vue b/project/shandong10086/apps/shandong/AppVillageCode/components/List.vue
index 31ff5d6b..c5e45bca 100644
--- a/project/shandong10086/apps/shandong/AppVillageCode/components/List.vue
+++ b/project/shandong10086/apps/shandong/AppVillageCode/components/List.vue
@@ -105,7 +105,6 @@
label: 'name'
},
currIndex: -1,
- areaList: [],
total: 10,
colConfigs: [
{prop: 'codeName', label: '名称', align: 'left'},
@@ -140,7 +139,6 @@
this.search.areaId = this.user.info.areaId
this.areaName = this.user.info.areaName
this.getTree()
- this.getAreaList()
this.getList()
this.$nextTick(() => {
@@ -210,14 +208,6 @@
}
},
- getAreaList() {
- this.instance.post(`/admin/area/queryAreaByParentId?id=341021104000`).then(res => {
- if (res.code == 0) {
- this.areaList = res.data
- }
- })
- },
-
remove(id) {
this.$confirm('确定删除该数据？').then(() => {
this.instance.post(`/app/appeveryvillagecode/delete?ids=${id}`).then(res => {