Browse Source

城市管理、公共服务详情修改

dev-map-local
jiangyy 3 years ago
parent
commit
d2c70e8ce8
  1. 9
      src/assets/scss/modules/management/detail-main.scss
  2. 3
      src/views/modules/communityParty/orgActivity/activivityList/yearplanList.vue
  3. 4
      src/views/modules/communityParty/regionalParty/activitysDetail.vue
  4. 4
      src/views/modules/communityParty/regionalParty/unitsDetail.vue
  5. 24
      src/views/modules/shequzhili/csgltc/csgl.vue
  6. 149
      src/views/modules/shequzhili/csgltc/csglDetail.vue
  7. 26
      src/views/modules/shequzhili/ggfwtc/ggfw.vue
  8. 146
      src/views/modules/shequzhili/ggfwtc/ggfwDetail.vue

9
src/assets/scss/modules/management/detail-main.scss

@ -18,6 +18,7 @@
.div-btn{
margin-top:50px;
// margin-bottom:20px;
display: flex;
justify-content: center;
@ -85,7 +86,7 @@
.m-info {
padding-left: 30px;
font-size: 14px;
font-size: 15px;
font-family: PingFang SC;
font-weight: 400;
color: #333;
@ -120,6 +121,8 @@
margin: 10px 0;
display: flex;
padding-left: 15px;
padding-top:10px;
// border-bottom: 1px solid #d8d8d8;
.line{
text-decoration:underline;
@ -131,7 +134,7 @@
.info-title-2 {
flex: 0 0 100px;
font-size: 14px;
font-size: 15px;
}
> span,
@ -144,7 +147,7 @@
content: "";
display: block;
position: absolute;
top: 9px;
top: 19px;
left: 0;
width: 7px;
height: 7px;

3
src/views/modules/communityParty/orgActivity/activivityList/yearplanList.vue

@ -346,7 +346,7 @@ export default {
},
async handleDetail (row) {
this.icPartyActId = row.icPartyActId
this.addDiaTitle = '查看活动计划'
this.editDiaTitle = '查看规则'
this.formType = 'detail'
this.showEdit = true
@ -354,6 +354,7 @@ export default {
async handleEdit (row) {
this.icPartyActId = row.icPartyActId
this.editDiaTitle = '修改规则'
this.formType = 'edit'
this.showEdit = true

4
src/views/modules/communityParty/regionalParty/activitysDetail.vue

@ -58,11 +58,11 @@
</div>
<div class="div-btn">
<!-- <div class="div-btn">
<el-button size="small"
@click="handleCancle"> </el-button>
</div>
</div> -->
</div>
</template>

4
src/views/modules/communityParty/regionalParty/unitsDetail.vue

@ -54,11 +54,11 @@
</div>
</div>
<div class="div-btn">
<!-- <div class="div-btn">
<el-button size="small"
@click="handleCancle"> </el-button>
</div>
</div> -->
</div>
</template>

24
src/views/modules/shequzhili/csgltc/csgl.vue

@ -205,9 +205,9 @@
width="950px"
top="5vh"
class="dialog-h"
@closed="diaClose">
@closed="diaDetailClose">
<csgl-detail ref="ref_detail"
@diaClose="diaClose"></csgl-detail>
@diaDetailClose="diaDetailClose"></csgl-detail>
</el-dialog>
</div>
@ -360,22 +360,22 @@ export default {
this.$refs.ref_form.resetData()
this.formShow = false
},
diaClose () {
diaDetailClose () {
this.$refs.ref_detail.diaDestroy()
this.detailShow = false
this.finishDiaShow = false
this.scoreDiaShow = false
},
handleDetail (row) {
// this.detailShow = true
// this.$nextTick(() => {
// this.$refs.ref_detail.initForm(row)
// })
this.formTitle = '详情'
this.formShow = true
this.detailShow = true
this.$nextTick(() => {
this.$refs.ref_form.initForm('detail', row.icCityManagementId)
this.$refs.ref_detail.initForm(row)
})
// this.formTitle = ''
// this.formShow = true
// this.$nextTick(() => {
// this.$refs.ref_form.initForm('detail', row.icCityManagementId)
// })
},
handleAdd () {

149
src/views/modules/shequzhili/csgltc/csglDetail.vue

@ -1,72 +1,60 @@
<template>
<div>
<div style="padding-bottom:20px">
<div class="dialog-h-content scroll-h">
<div v-if="initLoading"
class="m-row">
<div class="m-info">
<div class="info-prop">
<span class="info-title-2">场所名称</span>
<span>{{ formData.name }}</span>
</div>
<el-form ref="ref_form"
:inline="true"
:model="formData"
:disabled="formType==='detail'"
class="form">
<el-form-item label="场所名称:"
prop="name"
label-width="150px"
style="display: block">
<span>{{formData.name}}</span>
</el-form-item>
<el-form-item label="场所类别:"
prop="categoryName"
label-width="150px"
style="display: block">
<span>{{formData.categoryName}}</span>
</el-form-item>
<el-form-item label="占地面积:"
prop="areaCovered"
label-width="150px"
style="display: block">
<span>{{formData.areaCovered+' '}}</span>平方公里
</el-form-item>
<el-form-item label="容纳人数:"
prop="capacity"
label-width="150px"
style="display: block">
<span>{{formData.capacity+' '}}</span>
</el-form-item>
<el-form-item label="负责人:"
prop="principal"
label-width="150px"
style="display: block">
<span>{{formData.principal?formData.principal:'无'}}</span>
</el-form-item>
<el-form-item label="联系电话:"
prop="mobile"
label-width="150px"
style="display: block">
<span>{{formData.mobile?formData.mobile:'无'}}</span>
</el-form-item>
<el-form-item label="地址:"
style="display: block"
prop="address"
label-width="150px">
<div class="item_width_1">
<span>{{formData.address}}</span>
<div id="app"
class="div_map"></div>
<div class="info-prop">
<span class="info-title-2">场所类别</span>
<span>{{ formData.categoryName }}</span>
</div>
</el-form-item>
</el-form>
<div class="info-prop">
<span class="info-title-2">占地面积</span>
<span>{{ formData.areaCovered+'平方公里'}}</span>
</div>
</div>
<div class="div_btn">
<el-button size="small"
@click="handleCancle"> </el-button>
<div class="info-prop">
<span class="info-title-2">容纳人数</span>
<span>{{ formData.capacity +'人'}}</span>
</div>
<div class="info-prop">
<span class="info-title-2">负责人</span>
<span>{{ formData.principal?formData.principal:'--'}}</span>
</div>
<div class="info-prop">
<span class="info-title-2">联系电话</span>
<span>{{formData.mobile?formData.mobile:'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-2">地理位置</span>
<span>{{ formData.address }}</span>
</div>
<div class="info-prop">
<span class="info-title-2">地图位置</span>
<div class="div_map">
<div id="app_detail"></div>
</div>
</div>
</div>
</div>
<!-- <div class="div-btn">
<el-button size="small"
@click="handleCancle"> </el-button>
</div> -->
</div>
</div>
</template>
@ -85,6 +73,7 @@ export default {
data () {
return {
formData: {},
initLoading: false,
}
},
@ -96,31 +85,38 @@ export default {
methods: {
handleCancle () {
this.diaDestroy()
this.$emit('diaDetailClose')
this.$emit('diaClose')
},
diaDestroy () {
if (map) {
map.destroy()
}
},
async initForm (row) {
this.startLoading()
this.formData = { ...row }
console.log(map)
if (!map) {
this.initLoading = true
this.$nextTick(() => {
this.initMap()
}
map.setCenter(new TMap.LatLng(this.formData.latitude, this.formData.longitude))
this.setMarker(this.formData.latitude, this.formData.longitude)
})
this.endLoading()
},
// init
initMap () {
console.log('initMap')
//
let { latitude, longitude } = this.$store.state.user;
console.log('lat' + latitude + ',lon' + longitude)
if (this.formData.latitude && this.formData.longitude) {
latitude = this.formData.latitude
longitude = this.formData.longitude
}
if (!latitude || latitude == "" || latitude == "0") {
latitude = 39.9088810666821;
longitude = 116.39743841556731;
@ -128,7 +124,7 @@ export default {
//
var center = new window.TMap.LatLng(latitude, longitude);
// map TMap.Map()
map = new window.TMap.Map(document.getElementById('app'), {
map = new window.TMap.Map(document.getElementById('app_detail'), {
center: center, //
zoom: 17.2, //
pitch: 43.5, //
@ -258,20 +254,9 @@ export default {
}
</script>
<style lang="scss" scoped >
@import "@/assets/scss/modules/visual/communityManageForm.scss";
@import "@/assets/scss/modules/management/detail-main.scss";
</style>
<style scoped>
.detail_span {
width: 500px;
font-weight: bold;
text-align: left;
margin: 0 0;
font-size: 16px;
}
.form {
margin-top: 30px;
}
</style>

26
src/views/modules/shequzhili/ggfwtc/ggfw.vue

@ -201,9 +201,9 @@
width="950px"
top="5vh"
class="dialog-h"
@closed="diaClose">
@closed="diaDetailClose">
<ggfw-detail ref="ref_detail"
@diaClose="diaClose"></ggfw-detail>
@diaDetailClose="diaDetailClose"></ggfw-detail>
</el-dialog>
</div>
@ -380,23 +380,23 @@ export default {
this.$refs.ref_form.resetData()
this.formShow = false
},
diaClose () {
diaDetailClose () {
this.$refs.ref_detail.diaDestroy()
this.detailShow = false
this.finishDiaShow = false
this.scoreDiaShow = false
},
handleDetail (row) {
// this.detailShow = true
// this.$nextTick(() => {
// this.$refs.ref_detail.initForm(row)
// })
this.formTitle = '详情'
this.formShow = true
this.detailShow = true
this.$nextTick(() => {
this.$refs.ref_form.initForm('detail', row.icPublicServiceId)
this.$refs.ref_detail.initForm(row)
})
// this.formTitle = ''
// this.formShow = true
// this.$nextTick(() => {
// this.$refs.ref_form.initForm('detail', row.icPublicServiceId)
// })
},
//

146
src/views/modules/shequzhili/ggfwtc/ggfwDetail.vue

@ -2,69 +2,60 @@
<div>
<div class="dialog-h-content scroll-h">
<el-form ref="ref_form"
:inline="true"
:model="formData"
class="form">
<el-form-item label="场所名称:"
prop="name"
label-width="150px"
style="display: block">
<span>{{formData.name}}</span>
</el-form-item>
<el-form-item label="场所类别:"
prop="categoryName"
label-width="150px"
style="display: block">
<span>{{formData.categoryName}}</span>
</el-form-item>
<el-form-item label="占地面积:"
prop="areaCovered"
label-width="150px"
style="display: block">
<span>{{formData.areaCovered}}</span>
</el-form-item>
<el-form-item label="容纳人数:"
prop="capacity"
label-width="150px"
style="display: block">
<span>{{formData.capacity}}</span>
</el-form-item>
<el-form-item label="负责人:"
prop="principal"
label-width="150px"
style="display: block">
<span>{{formData.principal}}</span>
</el-form-item>
<el-form-item label="联系电话:"
prop="mobile"
label-width="150px"
style="display: block">
<span>{{formData.mobile}}</span>
</el-form-item>
<el-form-item label="地址:"
style="display: block"
prop="address"
label-width="150px">
<div class="item_width_1">
<span>{{formData.address}}</span>
<div id="app"
class="div_map"></div>
<div v-if="initLoading"
class="m-row">
<div class="m-info">
<div class="info-prop">
<span class="info-title-2">场所名称</span>
<span>{{ formData.name }}</span>
</div>
</el-form-item>
</el-form>
<div class="info-prop">
<span class="info-title-2">场所类别</span>
<span>{{ formData.categoryName }}</span>
</div>
<div class="info-prop">
<span class="info-title-2">占地面积</span>
<span>{{ formData.areaCovered+'平方公里'}}</span>
</div>
<div class="info-prop">
<span class="info-title-2">容纳人数</span>
<span>{{ formData.capacity +'人'}}</span>
</div>
<div class="info-prop">
<span class="info-title-2">负责人</span>
<span>{{ formData.principal?formData.principal:'--'}}</span>
</div>
<div class="info-prop">
<span class="info-title-2">联系电话</span>
<span>{{formData.mobile?formData.mobile:'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-2">地理位置</span>
<span>{{ formData.address }}</span>
</div>
<div class="info-prop">
<span class="info-title-2">地图位置</span>
<div class="div_map">
<div id="app_detail"></div>
</div>
</div>
</div>
</div>
</div>
<div class="div_btn">
<!-- <div class="div_btn">
<el-button size="small"
@click="handleCancle"> </el-button>
</div>
</div> -->
</div>
</template>
@ -83,34 +74,36 @@ export default {
data () {
return {
formData: {},
initLoading: false,
}
},
components: {},
mounted () {
if (!map) {
this.initMap()
}
},
methods: {
handleCancle () {
this.diaDestroy()
this.$emit('diaDetailClose')
this.$emit('diaClose')
},
diaDestroy () {
if (map) {
map.destroy()
}
},
async initForm (row) {
this.startLoading()
this.formData = { ...row }
debugger
if (!map) {
this.initLoading = true
this.$nextTick(() => {
this.initMap()
}
map.setCenter(new TMap.LatLng(this.formData.latitude, this.formData.longitude))
this.setMarker(this.formData.latitude, this.formData.longitude)
})
this.endLoading()
},
@ -119,6 +112,10 @@ export default {
initMap () {
let { latitude, longitude } = this.$store.state.user;
console.log('lat' + latitude + ',lon' + longitude)
if (this.formData.latitude && this.formData.longitude) {
latitude = this.formData.latitude
longitude = this.formData.longitude
}
if (!latitude || latitude == "" || latitude == "0") {
latitude = 39.9088810666821;
longitude = 116.39743841556731;
@ -126,7 +123,7 @@ export default {
//
var center = new window.TMap.LatLng(latitude, longitude);
// map TMap.Map()
map = new window.TMap.Map(document.getElementById('app'), {
map = new window.TMap.Map(document.getElementById('app_detail'), {
center: center, //
zoom: 17.2, //
pitch: 43.5, //
@ -257,20 +254,9 @@ export default {
}
</script>
<style lang="scss" scoped >
@import "@/assets/scss/modules/visual/communityManageForm.scss";
@import "@/assets/scss/modules/management/detail-main.scss";
</style>
<style scoped>
.detail_span {
width: 500px;
font-weight: bold;
text-align: left;
margin: 0 0;
font-size: 16px;
}
.form {
margin-top: 30px;
}
</style>

Loading…
Cancel
Save