diff --git a/.env.development b/.env.development index 65bdf2296..139b67286 100644 --- a/.env.development +++ b/.env.development @@ -1,6 +1,6 @@ NODE_ENV=development -VUE_APP_API_SERVER = http://192.168.1.144/api +VUE_APP_API_SERVER = http://dcommunity-dev.elinkservice.cn:30801/api # VUE_APP_API_SERVER = http://118.190.150.119:41080/api # VUE_APP_API_SERVER = https://epmet-yantai.elinkservice.cn/api # VUE_APP_API_SERVER = https://epmet-test.elinkservice.cn/api diff --git a/src/views/modules/base/community/buildDetail.vue b/src/views/modules/base/community/buildDetail.vue index de00c50a1..d72f159f1 100644 --- a/src/views/modules/base/community/buildDetail.vue +++ b/src/views/modules/base/community/buildDetail.vue @@ -7,7 +7,7 @@
所属小区： - {{ agencyObj.agencyName }}—{{ agencyObj.gridName }}—{{ agencyObj.label }} + {{ dataForm.agencyName }}—{{ agencyObj.gridName }}—{{ agencyObj.label }}
@@ -247,7 +247,7 @@ export default { { required: true, message: '单元数不能为空', trigger: 'blur' } ], coding: [ - { required: true, message: '楼栋编码不能为空', trigger: 'blur' } + { required: true, message: '楼栋编码不能为空', trigger: 'change' } ] // totalFloorNum: [ // { required: true, message: '层数不能为空', trigger: 'blur' } diff --git a/src/views/modules/base/community/buildForm.vue b/src/views/modules/base/community/buildForm.vue index bf1e06316..36ccb1f5e 100644 --- a/src/views/modules/base/community/buildForm.vue +++ b/src/views/modules/base/community/buildForm.vue @@ -2,46 +2,24 @@
- - + + {{ agencyObj.agencyName }}—{{ agencyObj.gridName }}—{{ agencyObj.label }} - - + + - - + + - 生成 + 生成 - + 商品房 @@ -57,103 +35,55 @@ v-model="dataForm.sort" label="排序"> --> - - + + - - + + - - + + - - + + - - + + - - + + - +
- - + + -
+
- + - +
- 取 消 - 保 存 + 取 消 + 保 + 存
@@ -169,7 +99,7 @@ var markers var infoWindowList let loading // 加载动画 export default { - data () { + data() { return { formType: 'add', //表单操作类型 add新增，edit编辑，detail详情 searchOptions: [], @@ -208,12 +138,12 @@ export default { } }, components: {}, - mounted () { + mounted() { }, methods: { - async initForm (type, row, agencyObj) { + async initForm(type, row, agencyObj) { this.$refs.ref_form.resetFields(); let { latitude, longitude } = this.$store.state.user; this.agencyObj = agencyObj @@ -233,16 +163,11 @@ export default { this.dataForm.longitude = longitude } this.$nextTick(() => { - if (!map) { - this.initMap(this.dataForm.latitude, this.dataForm.longitude); - } else { - map.setCenter(this.dataForm.latitude, this.dataForm.longitude); - map.setMarker(this.dataForm.latitude, this.dataForm.longitude); - } + this.initMap(this.dataForm.latitude, this.dataForm.longitude); }) }, - async handleComfirm () { + async handleComfirm() { this.btnDisable = true setTimeout(() => { this.btnDisable = false @@ -258,19 +183,16 @@ export default { }) }, - async handleCode () { + async handleCode() { const { data, code, msg } = await requestPost( "/actual/base/communityBuilding/getBuildingCoding/" + this.dataForm.neighborHoodId); - console.log('data----', data) - console.log('code----', code) - console.log('msg----', msg) if (msg == "success" && code == 0) { this.dataForm.coding = data.coding this.dataForm.sysCoding = data.sysCoding } }, - async addBuild () { + async addBuild() { if (this.dataForm.buildingLeaderMobile) { const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //联系电话 if (this.dataForm.buildingLeaderMobile && regPhone.test(this.dataForm.buildingLeaderMobile) === false) { @@ -288,7 +210,6 @@ export default { url = '/actual/base/communityBuilding/saveCommunityBuilding' } else { url = '/actual/base/communityBuilding/updateCommunityBuilding' - this.dataForm.buildingId = this.buildingId } @@ -310,14 +231,13 @@ export default { }, - handleCancle () { + handleCancle() { this.resetData() this.$emit('dialogCancle') }, // 地图初始化函数，本例取名为init，开发者可根据实际情况定义 - initMap (latitude, longitude) { - + initMap(latitude, longitude) { map = new daiMap( document.getElementById("app_build"), { latitude, longitude }, @@ -339,7 +259,7 @@ export default { }, - async handleMoveCenter () { + async handleMoveCenter() { //修改地图中心点 const { lat, lng } = map.getCenter(); this.dataForm.latitude = lat; @@ -355,7 +275,7 @@ export default { } }, - async remoteMethod (query) { + async remoteMethod(query) { if (query !== '') { this.loading = true; @@ -386,7 +306,7 @@ export default { } }, - handleClickKey (index) { + handleClickKey(index) { let selPosition = this.resultList[index] let lonlat = selPosition.lonlat.split(" ") map.setCenter(lonlat[1], lonlat[0]); @@ -397,7 +317,7 @@ export default { }, - resetData () { + resetData() { this.searchValue = '' this.searchOptions = [] this.resultList = [] @@ -426,7 +346,7 @@ export default { } }, // 开启加载动画 - startLoading () { + startLoading() { loading = Loading.service({ lock: true, // 是否锁定 text: '正在加载……', // 加载中需要显示的文字 @@ -434,7 +354,7 @@ export default { }) }, // 结束加载动画 - endLoading () { + endLoading() { // clearTimeout(timer); if (loading) { loading.close() @@ -442,7 +362,7 @@ export default { } }, computed: { - dataRule () { + dataRule() { return { buildingName: [ { required: true, message: '楼栋名称不能为空', trigger: 'blur' }, @@ -460,7 +380,7 @@ export default { { required: true, message: '单元数不能为空', trigger: 'blur' } ], coding: [ - { required: true, message: '楼栋编码不能为空', trigger: 'blur' } + { required: true, message: '楼栋编码不能为空', trigger: 'change' } ] // totalFloorNum: [ // { required: true, message: '层数不能为空', trigger: 'blur' } diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue index a936bfe93..848ea83a0 100644 --- a/src/views/modules/base/community/buildTable.vue +++ b/src/views/modules/base/community/buildTable.vue @@ -233,15 +233,15 @@ class="div-table-button--blue" size="small" @click="handleDetail(scope.row)">查看 - 编辑 查看 - * 根据数据分析结果，建议重点关注 + 根据数据分析结果，建议重点关注 {{ resiCategory.list[0].name }}、{{ resiCategory.list[1].name diff --git a/src/views/modules/shequzhili/tuceng/anquan/yinhuan/index.vue b/src/views/modules/shequzhili/tuceng/anquan/yinhuan/index.vue index a947a5d60..abf092032 100644 --- a/src/views/modules/shequzhili/tuceng/anquan/yinhuan/index.vue +++ b/src/views/modules/shequzhili/tuceng/anquan/yinhuan/index.vue @@ -1,10 +1,10 @@