diff --git a/project/sass/apps/AppGridBlock/AppGridBlock.vue b/project/sass/apps/AppGridBlock/AppGridBlock.vue deleted file mode 100644 index bbca78be..00000000 --- a/project/sass/apps/AppGridBlock/AppGridBlock.vue +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - diff --git a/project/sass/apps/AppGridBlock/index.js b/project/sass/apps/AppGridBlock/index.js deleted file mode 100644 index 99041895..00000000 --- a/project/sass/apps/AppGridBlock/index.js +++ /dev/null @@ -1,6 +0,0 @@ -import component from './AppGridBlock.vue' - -component.install = function (Vue) { - Vue.component(component.name, component) -} -export default component \ No newline at end of file diff --git a/project/sass/apps/AppGridMember/components/list.vue b/project/sass/apps/AppGridMember/components/list.vue deleted file mode 100644 index e597d3a9..00000000 --- a/project/sass/apps/AppGridMember/components/list.vue +++ /dev/null @@ -1,199 +0,0 @@ - - - - - - - - - - - - - - - - - - 添加 - 删除 - - - (ids = v.map((e) => e.id))" - @getList="getList()"> - - - - 责任家庭 - 查看 - 删除 - - - - - - - - - - - \ No newline at end of file diff --git a/project/sass/apps/grid/AppGridBlock/AppGridBlock.vue b/project/sass/apps/grid/AppGridBlock/AppGridBlock.vue new file mode 100644 index 00000000..238346d7 --- /dev/null +++ b/project/sass/apps/grid/AppGridBlock/AppGridBlock.vue @@ -0,0 +1,39 @@ + + + + + + + + + diff --git a/project/sass/apps/AppGridBlock/components/add.vue b/project/sass/apps/grid/AppGridBlock/components/add.vue similarity index 63% rename from project/sass/apps/AppGridBlock/components/add.vue rename to project/sass/apps/grid/AppGridBlock/components/add.vue index f7fda227..4c13d10a 100644 --- a/project/sass/apps/AppGridBlock/components/add.vue +++ b/project/sass/apps/grid/AppGridBlock/components/add.vue @@ -3,150 +3,53 @@ + /> - - - - {{ forms.parentGirdName }} - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + - - - - + + - + style="width: 100%;"/> - - + - + - + - + - + 地图标绘 @@ -181,41 +84,26 @@ id="tipinput" size="medium" style="width: 200px" - > + /> - + - - 开始编辑 - - 结束编辑 - + + 开始编辑 + 结束编辑 - 开始绘制多边形 - + 开始绘制多边形 清除绘制 @@ -231,27 +119,12 @@ export default { instance: Function, dict: Object, params: Object, - isEdit: Boolean }, data() { return { forms: { - address: "", - area: "", - points: [], - endDate: "", - eventReportUnit: "", - eventReportUnitId: "", - girdCode: "", - girdLevel: "", - girdList: [], - girdName: "", - girdType: "", - isLastLevel: "", - parentGirdId: "", - parentGirdName: "", - startDate: "", - plottingStatus: "0", + girdMemberManageList: [], + girdMemberList: [] }, showMap: false, map: "", @@ -265,7 +138,6 @@ export default { polyEditor: "", title: "添加网格区块", parentGirdInfo: {}, - isAddLastLevel: false }; }, computed: { @@ -297,28 +169,24 @@ export default { ops.map((e) => this.addChild(e, initData)); return ops; }, + pageTitle() { + return this.isEdit ? "编辑网格区块" : "添加网格区块" + }, + isEdit() { + return !!this.$route.query.id; + } }, created() { this.getCorpLocation() if (this.isEdit) { - this.title = "编辑网格区块"; this.searchDetail(); } else { - this.forms.parentGirdId = this.params.id; - this.forms.parentGirdName = this.params.girdName; - this.isAddLastLevel = this.params.girdLevel === '1' - // this.forms.girdLevel = Number(this.info.girdLevel) + 1 +''; - // this.forms.isLastLevel = ['0','1'].includes(this.forms.girdLevel)?'0':'1'; - this.title = "添加网格区块"; + this.forms = this.$route.query } - // this.getAllUnit(this.user.info.areaId); }, methods: { - cancel(isRefresh) { - this.$emit('change', { - type: 'list', - isRefresh: !!isRefresh, - }) + cancel() { + this.$router.push({}) }, // 获取所有单位 getAllUnit(data) { @@ -389,7 +257,7 @@ export default { }, getCorpLocation() { this.instance.post("/app/appdvcpconfig/getCorpLocation").then(res => { - if (res.code == 0) { + if (res?.data) { this.location = res.data } }) @@ -499,8 +367,9 @@ export default { }); }, searchDetail() { + let {id} = this.$route.query this.instance.post(`/app/appgirdinfo/queryDetailById`, null, { - params: {id: this.params.id}, + params: {id}, }).then((res) => { if (res?.data) { this.forms = {...res.data}; @@ -526,21 +395,6 @@ export default { display: none !important; } - .above { - overflow: hidden; - padding: 8px 0; - - .left { - width: 380px; - float: left; - } - - .right { - width: 380px; - float: right; - } - } - .footer-btn { width: 92px; } diff --git a/project/sass/apps/AppGridBlock/components/list.vue b/project/sass/apps/grid/AppGridBlock/components/list.vue similarity index 97% rename from project/sass/apps/AppGridBlock/components/list.vue rename to project/sass/apps/grid/AppGridBlock/components/list.vue index 2f02e890..053832ad 100644 --- a/project/sass/apps/AppGridBlock/components/list.vue +++ b/project/sass/apps/grid/AppGridBlock/components/list.vue @@ -116,8 +116,8 @@ width="160"> - 编辑 - 标绘 + 编辑 + 标绘 删除 @@ -184,7 +184,7 @@ :isShowPagination="false" :show-header="false"> - {{ row.tags || '标签' }} + {{ row.label }} @@ -374,10 +374,9 @@ export default { this.toAdd() }, toAdd() { - this.$emit('change', { - type: 'Add', - params: this.info, - isEdit: this.isEdit + let {id: parentGirdId, girdName: parentGirdName} = this.info + this.$router.push({ + hash: "#add", query: {parentGirdId, parentGirdName} }) }, goBack() { @@ -442,10 +441,8 @@ export default { console.log(e); }); }, - see(row) { - this.info = {...row}; - this.isEdit = true; - this.toAdd() + showEdit(id) { + this.$router.push({hash: "#add", query: {id}}) }, draw(type) { switch (type) { diff --git a/project/sass/apps/AppGridMap/AppGridMap.vue b/project/sass/apps/grid/AppGridMap/AppGridMap.vue similarity index 100% rename from project/sass/apps/AppGridMap/AppGridMap.vue rename to project/sass/apps/grid/AppGridMap/AppGridMap.vue diff --git a/project/sass/apps/AppGridMap/components/list.vue b/project/sass/apps/grid/AppGridMap/components/list.vue similarity index 100% rename from project/sass/apps/AppGridMap/components/list.vue rename to project/sass/apps/grid/AppGridMap/components/list.vue diff --git a/project/sass/apps/AppGridMember/AppGridMember.vue b/project/sass/apps/grid/AppGridMember/AppGridMember.vue similarity index 98% rename from project/sass/apps/AppGridMember/AppGridMember.vue rename to project/sass/apps/grid/AppGridMember/AppGridMember.vue index 2d1a53f7..60b249fe 100644 --- a/project/sass/apps/AppGridMember/AppGridMember.vue +++ b/project/sass/apps/grid/AppGridMember/AppGridMember.vue @@ -8,7 +8,7 @@ :params="params" :instance="instance" :dict="dict" - > + /> diff --git a/project/sass/apps/AppGridMember/components/Family.vue b/project/sass/apps/grid/AppGridMember/components/Family.vue similarity index 100% rename from project/sass/apps/AppGridMember/components/Family.vue rename to project/sass/apps/grid/AppGridMember/components/Family.vue diff --git a/project/sass/apps/AppGridMember/components/add.vue b/project/sass/apps/grid/AppGridMember/components/add.vue similarity index 100% rename from project/sass/apps/AppGridMember/components/add.vue rename to project/sass/apps/grid/AppGridMember/components/add.vue diff --git a/project/sass/apps/grid/AppGridMember/components/list.vue b/project/sass/apps/grid/AppGridMember/components/list.vue new file mode 100644 index 00000000..964d78d5 --- /dev/null +++ b/project/sass/apps/grid/AppGridMember/components/list.vue @@ -0,0 +1,216 @@ + + + + + + + + + + + + + + + + + + 添加 + + 删除 + + + + (ids = v.map((e) => e.id))" + @getList="getList()"> + + + + 标签 + 责任家庭 + 查看 + 删除 + + + + + + + + + + + + + + + + + +