diff --git a/package.json b/package.json index 840ad1a86..dbb18e32c 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,8 @@ "et:list": "gulp themes" }, "dependencies": { - "@tinymce/tinymce-vue": "^3.2.8", + "@riophae/vue-treeselect": "^0.4.0", + "@tinymce/tinymce-vue": "^4.0.4", "axios": "^0.19.0", "babel-eslint": "^8.0.1", "babel-plugin-component": "^1.1.1", diff --git a/src/assets/img/plugins/close.png b/src/assets/img/plugins/close.png new file mode 100644 index 000000000..c0ad64a07 Binary files /dev/null and b/src/assets/img/plugins/close.png differ diff --git a/src/assets/img/plugins/danghui.png b/src/assets/img/plugins/danghui.png new file mode 100644 index 000000000..aa88a94a1 Binary files /dev/null and b/src/assets/img/plugins/danghui.png differ diff --git a/src/assets/img/plugins/dangqi.png b/src/assets/img/plugins/dangqi.png new file mode 100644 index 000000000..b3bdd208b Binary files /dev/null and b/src/assets/img/plugins/dangqi.png differ diff --git a/src/assets/img/plugins/dangwei-by.png b/src/assets/img/plugins/dangwei-by.png new file mode 100644 index 000000000..0a1a45287 Binary files /dev/null and b/src/assets/img/plugins/dangwei-by.png differ diff --git a/src/assets/img/plugins/dangyuanzhongxinhu.png b/src/assets/img/plugins/dangyuanzhongxinhu.png new file mode 100644 index 000000000..c63335284 Binary files /dev/null and b/src/assets/img/plugins/dangyuanzhongxinhu.png differ diff --git a/src/assets/img/plugins/dian.png b/src/assets/img/plugins/dian.png new file mode 100644 index 000000000..a86b46b80 Binary files /dev/null and b/src/assets/img/plugins/dian.png differ diff --git a/src/assets/img/plugins/faguang.png b/src/assets/img/plugins/faguang.png new file mode 100644 index 000000000..fda60c082 Binary files /dev/null and b/src/assets/img/plugins/faguang.png differ diff --git a/src/assets/img/plugins/jiantou-A.png b/src/assets/img/plugins/jiantou-A.png new file mode 100644 index 000000000..716d3046b Binary files /dev/null and b/src/assets/img/plugins/jiantou-A.png differ diff --git a/src/assets/img/plugins/jiantou-D.png b/src/assets/img/plugins/jiantou-D.png new file mode 100644 index 000000000..ce4e1c676 Binary files /dev/null and b/src/assets/img/plugins/jiantou-D.png differ diff --git a/src/assets/img/plugins/jiantou-X.png b/src/assets/img/plugins/jiantou-X.png new file mode 100644 index 000000000..75199e994 Binary files /dev/null and b/src/assets/img/plugins/jiantou-X.png differ diff --git a/src/assets/img/plugins/louyuanxiaozu.png b/src/assets/img/plugins/louyuanxiaozu.png new file mode 100644 index 000000000..9066182ad Binary files /dev/null and b/src/assets/img/plugins/louyuanxiaozu.png differ diff --git a/src/assets/img/plugins/shuoming-X.png b/src/assets/img/plugins/shuoming-X.png new file mode 100644 index 000000000..72aea366a Binary files /dev/null and b/src/assets/img/plugins/shuoming-X.png differ diff --git a/src/assets/img/plugins/tanchuang.png b/src/assets/img/plugins/tanchuang.png new file mode 100644 index 000000000..f6cfc8dc1 Binary files /dev/null and b/src/assets/img/plugins/tanchuang.png differ diff --git a/src/assets/img/plugins/xiaozu-by.png b/src/assets/img/plugins/xiaozu-by.png new file mode 100644 index 000000000..6da3bf207 Binary files /dev/null and b/src/assets/img/plugins/xiaozu-by.png differ diff --git a/src/assets/img/plugins/you.png b/src/assets/img/plugins/you.png new file mode 100644 index 000000000..b8f6004c6 Binary files /dev/null and b/src/assets/img/plugins/you.png differ diff --git a/src/assets/img/plugins/zhibu-by.png b/src/assets/img/plugins/zhibu-by.png new file mode 100644 index 000000000..b509e7878 Binary files /dev/null and b/src/assets/img/plugins/zhibu-by.png differ diff --git a/src/assets/img/plugins/zuo.png b/src/assets/img/plugins/zuo.png new file mode 100644 index 000000000..6eec5eb06 Binary files /dev/null and b/src/assets/img/plugins/zuo.png differ diff --git a/src/router/index.js b/src/router/index.js index 866ee5f0e..51d5f0763 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -224,7 +224,11 @@ router.beforeEach((to, from, next) => { // }); window.SITE_CONFIG["menuShujuList"] = [ { - icon: "icon-setting", + url: "/visual/plugin/power/organization", + name: "组织架构", + id: "5feawfwaefwa577", + }, + { id: "22213213", name: "基础信息", // url: "visual/basicinfo/basicInfoMain", diff --git a/src/utils/treeSelect.js b/src/utils/treeSelect.js new file mode 100644 index 000000000..4ff8cfd0c --- /dev/null +++ b/src/utils/treeSelect.js @@ -0,0 +1,50 @@ +/** + * 构造树型结构数据 + * @param {*} data 数据源 + * @param {*} id id字段 默认 'id' + * @param {*} parentId 父节点字段 默认 'parentId' + * @param {*} children 孩子节点字段 默认 'children' + */ + export function handleTree(data, id, parentId, children) { + let config = { + id: id || 'id', + parentId: parentId || 'parentId', + childrenList: children || 'children' + }; + + var childrenListMap = {}; + var nodeIds = {}; + var tree = []; + + for (let d of data) { + let parentId = d[config.parentId]; + if (childrenListMap[parentId] == null) { + childrenListMap[parentId] = []; + } + nodeIds[d[config.id]] = d; + childrenListMap[parentId].push(d); + } + + for (let d of data) { + let parentId = d[config.parentId]; + if (nodeIds[parentId] == null) { + tree.push(d); + } + } + + for (let t of tree) { + adaptToChildrenList(t); + } + + function adaptToChildrenList(o) { + if (childrenListMap[o[config.id]] !== null) { + o[config.childrenList] = childrenListMap[o[config.id]]; + } + if (o[config.childrenList]) { + for (let c of o[config.childrenList]) { + adaptToChildrenList(c); + } + } + } + return tree; +} diff --git a/src/views/modules/plugins/.gitkeep b/src/views/modules/plugins/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/src/views/modules/plugins/power/kernelhousehold.vue b/src/views/modules/plugins/power/kernelhousehold.vue new file mode 100644 index 000000000..a694fd47f --- /dev/null +++ b/src/views/modules/plugins/power/kernelhousehold.vue @@ -0,0 +1,242 @@ + + + + + + + diff --git a/src/views/modules/plugins/power/kernelhouseholdForm.vue b/src/views/modules/plugins/power/kernelhouseholdForm.vue new file mode 100644 index 000000000..917a0ea6c --- /dev/null +++ b/src/views/modules/plugins/power/kernelhouseholdForm.vue @@ -0,0 +1,182 @@ + + + + + + + + diff --git a/src/views/modules/plugins/power/kernelhouseholdTable.vue b/src/views/modules/plugins/power/kernelhouseholdTable.vue new file mode 100644 index 000000000..66ea920f4 --- /dev/null +++ b/src/views/modules/plugins/power/kernelhouseholdTable.vue @@ -0,0 +1,230 @@ + + + + + + + diff --git a/src/views/modules/plugins/power/poweraxis-add-or-update.vue b/src/views/modules/plugins/power/poweraxis-add-or-update.vue new file mode 100644 index 000000000..ac35c2cb8 --- /dev/null +++ b/src/views/modules/plugins/power/poweraxis-add-or-update.vue @@ -0,0 +1,496 @@ + + + + + \ No newline at end of file diff --git a/src/views/modules/plugins/power/poweraxis.vue b/src/views/modules/plugins/power/poweraxis.vue new file mode 100644 index 000000000..649f2bb74 --- /dev/null +++ b/src/views/modules/plugins/power/poweraxis.vue @@ -0,0 +1,349 @@ + + + + + \ No newline at end of file diff --git a/src/views/modules/plugins/power/poweraxisForm.vue b/src/views/modules/plugins/power/poweraxisForm.vue new file mode 100644 index 000000000..9b2b2941e --- /dev/null +++ b/src/views/modules/plugins/power/poweraxisForm.vue @@ -0,0 +1,472 @@ + + + + + + + diff --git a/src/views/modules/plugins/power/poweraxis_add_leader.vue b/src/views/modules/plugins/power/poweraxis_add_leader.vue new file mode 100644 index 000000000..22ad049f2 --- /dev/null +++ b/src/views/modules/plugins/power/poweraxis_add_leader.vue @@ -0,0 +1,358 @@ + + + + + diff --git a/src/views/modules/plugins/power/poweraxistag-add-or-update.vue b/src/views/modules/plugins/power/poweraxistag-add-or-update.vue new file mode 100644 index 000000000..cf029a4ee --- /dev/null +++ b/src/views/modules/plugins/power/poweraxistag-add-or-update.vue @@ -0,0 +1,127 @@ + + + diff --git a/src/views/modules/plugins/power/poweraxistag.vue b/src/views/modules/plugins/power/poweraxistag.vue new file mode 100644 index 000000000..70f08291d --- /dev/null +++ b/src/views/modules/plugins/power/poweraxistag.vue @@ -0,0 +1,82 @@ + + + diff --git a/src/views/modules/plugins/power/servicestation.vue b/src/views/modules/plugins/power/servicestation.vue new file mode 100644 index 000000000..eb68fc23d --- /dev/null +++ b/src/views/modules/plugins/power/servicestation.vue @@ -0,0 +1,242 @@ + + + + + + + diff --git a/src/views/modules/plugins/power/servicestationForm.vue b/src/views/modules/plugins/power/servicestationForm.vue new file mode 100644 index 000000000..9075e983d --- /dev/null +++ b/src/views/modules/plugins/power/servicestationForm.vue @@ -0,0 +1,303 @@ + + + + + + + diff --git a/src/views/modules/plugins/power/servicestationTable.vue b/src/views/modules/plugins/power/servicestationTable.vue new file mode 100644 index 000000000..26f5c4216 --- /dev/null +++ b/src/views/modules/plugins/power/servicestationTable.vue @@ -0,0 +1,240 @@ + + + + + + + diff --git a/src/views/modules/visual/basicinfo/basicInfoMain.vue b/src/views/modules/visual/basicinfo/basicInfoMain.vue index a9edec041..89d28b686 100644 --- a/src/views/modules/visual/basicinfo/basicInfoMain.vue +++ b/src/views/modules/visual/basicinfo/basicInfoMain.vue @@ -702,12 +702,10 @@ const vueGis = { 'features': featureData }; let feature = (new GeoJSON()).readFeatures(geojsonObject) - polygonSource.addFeatures(feature) let iconFeatures = []; feature.forEach(oneIcon => { - var extent = boundingExtent(oneIcon.getGeometry().getCoordinates()[0]); //获取一个坐标数组的边界,格式为[minx,miny,maxx,maxy] // var center = getCenter(extent); //获取边界区域的中心位置 //添加标注 diff --git a/src/views/modules/visual/basicinfo/cpts/people-more.vue b/src/views/modules/visual/basicinfo/cpts/people-more.vue index bd8bb9f04..6eb8d1e3f 100644 --- a/src/views/modules/visual/basicinfo/cpts/people-more.vue +++ b/src/views/modules/visual/basicinfo/cpts/people-more.vue @@ -16,7 +16,7 @@ v-for="(fieldSubList, index) in fieldList">
+ v-if="index == 0 && gridName"> 所属网格: {{ gridName }}
diff --git a/src/views/modules/visual/plugin/power/components/house-dialog.vue b/src/views/modules/visual/plugin/power/components/house-dialog.vue new file mode 100644 index 000000000..9cf8ef066 --- /dev/null +++ b/src/views/modules/visual/plugin/power/components/house-dialog.vue @@ -0,0 +1,176 @@ + + + + + diff --git a/src/views/modules/visual/plugin/power/components/info-dialog.vue b/src/views/modules/visual/plugin/power/components/info-dialog.vue new file mode 100644 index 000000000..eff5c9410 --- /dev/null +++ b/src/views/modules/visual/plugin/power/components/info-dialog.vue @@ -0,0 +1,161 @@ + + + + + diff --git a/src/views/modules/visual/plugin/power/components/screen-org-map.vue b/src/views/modules/visual/plugin/power/components/screen-org-map.vue new file mode 100644 index 000000000..dbec75ded --- /dev/null +++ b/src/views/modules/visual/plugin/power/components/screen-org-map.vue @@ -0,0 +1,171 @@ + + + + + + + \ No newline at end of file diff --git a/src/views/modules/visual/plugin/power/components/screen-org-tree.vue b/src/views/modules/visual/plugin/power/components/screen-org-tree.vue new file mode 100644 index 000000000..aee878e2b --- /dev/null +++ b/src/views/modules/visual/plugin/power/components/screen-org-tree.vue @@ -0,0 +1,406 @@ + + + + + \ No newline at end of file diff --git a/src/views/modules/visual/plugin/power/components/screen-top-count.vue b/src/views/modules/visual/plugin/power/components/screen-top-count.vue new file mode 100644 index 000000000..f7c28b338 --- /dev/null +++ b/src/views/modules/visual/plugin/power/components/screen-top-count.vue @@ -0,0 +1,74 @@ + + + + + diff --git a/src/views/modules/visual/plugin/power/organization.vue b/src/views/modules/visual/plugin/power/organization.vue new file mode 100644 index 000000000..a12788fb9 --- /dev/null +++ b/src/views/modules/visual/plugin/power/organization.vue @@ -0,0 +1,564 @@ + + + + + + +