diff --git a/src/views/modules/shequzhili/csgltc/csgl.vue b/src/views/modules/shequzhili/csgltc/csgl.vue index e617744d..6feeb685 100644 --- a/src/views/modules/shequzhili/csgltc/csgl.vue +++ b/src/views/modules/shequzhili/csgltc/csgl.vue @@ -24,9 +24,9 @@ size="small" clearable> + :key="item.label" + :label="item.value" + :value="item.label"> @@ -202,7 +202,7 @@ export default { return { loading: false, total: 0, - pageSize: 10, + pageSize: 20, pageNo: 0, tableLoading: false, agencyId: '', @@ -428,8 +428,8 @@ export default { async handleExport () { let title = '城市管理图层' - // const url = "/gov/org/icCityManagement/export" - const url = "http://yapi.elinkservice.cn/mock/245/gov/org/icCityManagement/export" + const url = "/gov/org/icCityManagement/export" + // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/icCityManagement/export" let params = { ...this.formData } diff --git a/src/views/modules/shequzhili/csgltc/csglDetail.vue b/src/views/modules/shequzhili/csgltc/csglDetail.vue index f07e1158..b568e532 100644 --- a/src/views/modules/shequzhili/csgltc/csglDetail.vue +++ b/src/views/modules/shequzhili/csgltc/csglDetail.vue @@ -22,15 +22,6 @@ {{formData.categoryName}} - {{formData.address}} - - + @@ -106,8 +94,8 @@ export default { } }, components: {}, - mounted () { - this.initMap() + async mounted () { + await this.initMap() }, methods: { diff --git a/src/views/modules/shequzhili/csgltc/csglForm.vue b/src/views/modules/shequzhili/csgltc/csglForm.vue index 8ddd65b6..2d94ed1f 100644 --- a/src/views/modules/shequzhili/csgltc/csglForm.vue +++ b/src/views/modules/shequzhili/csgltc/csglForm.vue @@ -48,9 +48,9 @@ filterable clearable> + :key="item.label" + :label="item.value" + :value="item.label"> @@ -186,7 +186,7 @@ export default { methods: { - async initForm (type, unitId) { + async initForm (type, icCityManagementId) { this.startLoading() this.$refs.ref_form.resetFields(); @@ -194,9 +194,9 @@ export default { await this.loadService() this.formType = type - if (unitId) { - this.unitId = unitId - this.formData.id = unitId + if (icCityManagementId) { + this.icCityManagementId = icCityManagementId + this.formData.icCityManagementId = icCityManagementId await this.loadFormData() } else { map.setCenter(new TMap.LatLng(36.0722275, 120.38945519)) @@ -268,24 +268,13 @@ export default { }, async addUnit () { - // const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码 - // if (regPhone.test(this.formData.contactMobile) === false) { - // this.btnDisable = false - // this.$message({ - // type: 'warning', - // message: '请输入正确的手机号码' - // }) - // return false; - // } - - let url = '/gov/org/icCityManagement/add' - // let url = "http://yapi.elinkservice.cn/mock/245/gov/org/icCityManagement/add" - // if (this.formType === 'edit') { - // this.formData.id = this.unitId - // } - + let url = '' + if (this.formType === 'add'){ + url = '/gov/org/icCityManagement/add' + }else { + url = '/gov/org/icCityManagement/edit' + } const { data, code, msg } = await requestPost(url, this.formData) - if (code === 0) { this.$message({ type: 'success', @@ -298,7 +287,6 @@ export default { this.btnDisable = false this.$message.error(msg) } - }, handleCancle () { diff --git a/src/views/modules/shequzhili/ggfwtc/ggfw.vue b/src/views/modules/shequzhili/ggfwtc/ggfw.vue index e912a6e2..ee3007d2 100644 --- a/src/views/modules/shequzhili/ggfwtc/ggfw.vue +++ b/src/views/modules/shequzhili/ggfwtc/ggfw.vue @@ -25,9 +25,9 @@ size="small" clearable> + :key="item.label" + :label="item.value" + :value="item.label"> @@ -197,7 +197,7 @@ export default { return { loading: false, total: 0, - pageSize: 10, + pageSize: 20, pageNo: 0, tableLoading: false, agencyId: '', diff --git a/src/views/modules/shequzhili/ggfwtc/ggfwDetail.vue b/src/views/modules/shequzhili/ggfwtc/ggfwDetail.vue index 6cf4af89..42d9d9a1 100644 --- a/src/views/modules/shequzhili/ggfwtc/ggfwDetail.vue +++ b/src/views/modules/shequzhili/ggfwtc/ggfwDetail.vue @@ -41,6 +41,29 @@ label-width="150px"> {{formData.address}} + +
+
+
+ 经度 + + + 纬度 + + +
+
+ diff --git a/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue b/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue index 30c30a8c..6c253542 100644 --- a/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue +++ b/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue @@ -30,9 +30,9 @@ filterable clearable> + :key="item.label" + :label="item.value" + :value="item.label"> @@ -154,7 +154,7 @@ latitude: 120.38945519 //纬度 }, serviceList: [],//服务list - + publicServiceData: {}, } }, components: {}, @@ -210,12 +210,11 @@ let params = { icPublicServiceId: this.icPublicServiceId } - const { data, code, msg } = await requestPost(url, params) - if (code === 0) { - if (!data.serviceMatterList || !Array.isArray(data.serviceMatterList)) { - data.serviceMatterList = [] + console.log(data) + if (null != data) { + data: this.publicServiceData } this.formData = { ...data } @@ -247,24 +246,13 @@ }, async addUnit () { - // const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码 - // if (regPhone.test(this.formData.contactMobile) === false) { - // this.btnDisable = false - // this.$message({ - // type: 'warning', - // message: '请输入正确的手机号码' - // }) - // return false; - // } - - let url = '/gov/org/icPublicService/add' - // let url = "http://yapi.elinkservice.cn/mock/245/gov/org/icPublicService/add" - // if (this.formType === 'edit') { - // this.formData.id = this.unitId - // } - + let url = '' + if (this.formType === 'add'){ + url = '/gov/org/icPublicService/add' + }else { + url = '/gov/org/icPublicService/edit' + } const { data, code, msg } = await requestPost(url, this.formData) - if (code === 0) { this.$message({ type: 'success',