From d2c70e8ce8f5eaca5b5a827fbc172a78ab4b67a9 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Tue, 20 Sep 2022 13:24:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=8E=E5=B8=82=E7=AE=A1=E7=90=86=E3=80=81?= =?UTF-8?q?=E5=85=AC=E5=85=B1=E6=9C=8D=E5=8A=A1=E8=AF=A6=E6=83=85=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scss/modules/management/detail-main.scss | 9 +- .../activivityList/yearplanList.vue | 3 +- .../regionalParty/activitysDetail.vue | 4 +- .../regionalParty/unitsDetail.vue | 4 +- src/views/modules/shequzhili/csgltc/csgl.vue | 24 +-- .../modules/shequzhili/csgltc/csglDetail.vue | 149 ++++++++---------- src/views/modules/shequzhili/ggfwtc/ggfw.vue | 26 +-- .../modules/shequzhili/ggfwtc/ggfwDetail.vue | 146 ++++++++--------- 8 files changed, 170 insertions(+), 195 deletions(-) diff --git a/src/assets/scss/modules/management/detail-main.scss b/src/assets/scss/modules/management/detail-main.scss index fdea6a5bd..1484110ac 100644 --- a/src/assets/scss/modules/management/detail-main.scss +++ b/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; diff --git a/src/views/modules/communityParty/orgActivity/activivityList/yearplanList.vue b/src/views/modules/communityParty/orgActivity/activivityList/yearplanList.vue index 681757bd9..db33c74b3 100644 --- a/src/views/modules/communityParty/orgActivity/activivityList/yearplanList.vue +++ b/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 diff --git a/src/views/modules/communityParty/regionalParty/activitysDetail.vue b/src/views/modules/communityParty/regionalParty/activitysDetail.vue index d54cc8df2..a97a1c177 100644 --- a/src/views/modules/communityParty/regionalParty/activitysDetail.vue +++ b/src/views/modules/communityParty/regionalParty/activitysDetail.vue @@ -58,11 +58,11 @@ -
+
diff --git a/src/views/modules/communityParty/regionalParty/unitsDetail.vue b/src/views/modules/communityParty/regionalParty/unitsDetail.vue index 86da1433a..3ada72d35 100644 --- a/src/views/modules/communityParty/regionalParty/unitsDetail.vue +++ b/src/views/modules/communityParty/regionalParty/unitsDetail.vue @@ -54,11 +54,11 @@ -
+
diff --git a/src/views/modules/shequzhili/csgltc/csgl.vue b/src/views/modules/shequzhili/csgltc/csgl.vue index e092c32c3..d775eb822 100644 --- a/src/views/modules/shequzhili/csgltc/csgl.vue +++ b/src/views/modules/shequzhili/csgltc/csgl.vue @@ -205,9 +205,9 @@ width="950px" top="5vh" class="dialog-h" - @closed="diaClose"> + @closed="diaDetailClose"> + @diaDetailClose="diaDetailClose"> @@ -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 () { diff --git a/src/views/modules/shequzhili/csgltc/csglDetail.vue b/src/views/modules/shequzhili/csgltc/csglDetail.vue index 047a5c602..6220087e6 100644 --- a/src/views/modules/shequzhili/csgltc/csglDetail.vue +++ b/src/views/modules/shequzhili/csgltc/csglDetail.vue @@ -1,72 +1,60 @@ @@ -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 { } diff --git a/src/views/modules/shequzhili/ggfwtc/ggfw.vue b/src/views/modules/shequzhili/ggfwtc/ggfw.vue index 1d6813839..64e326205 100644 --- a/src/views/modules/shequzhili/ggfwtc/ggfw.vue +++ b/src/views/modules/shequzhili/ggfwtc/ggfw.vue @@ -201,9 +201,9 @@ width="950px" top="5vh" class="dialog-h" - @closed="diaClose"> + @closed="diaDetailClose"> + @diaDetailClose="diaDetailClose"> @@ -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) + // }) }, //完成情况 diff --git a/src/views/modules/shequzhili/ggfwtc/ggfwDetail.vue b/src/views/modules/shequzhili/ggfwtc/ggfwDetail.vue index 7888dad9f..d486aa828 100644 --- a/src/views/modules/shequzhili/ggfwtc/ggfwDetail.vue +++ b/src/views/modules/shequzhili/ggfwtc/ggfwDetail.vue @@ -2,69 +2,60 @@
- - - - {{formData.name}} - - - - - {{formData.categoryName}} - - - - {{formData.areaCovered}} - - - - {{formData.capacity}} - - - {{formData.principal}} - - - {{formData.mobile}} - - -
- {{formData.address}} -
+
+
+
+ 场所名称： + {{ formData.name }}
- - + +
+ 场所类别： + {{ formData.categoryName }} +
+ +
+ 占地面积： + {{ formData.areaCovered+'平方公里'}} +
+ +
+ 容纳人数： + {{ formData.capacity +'人'}} +
+
+ 负责人： + {{ formData.principal?formData.principal:'--'}} +
+
+ 联系电话： + {{formData.mobile?formData.mobile:'--' }} +
+ +
+ 地理位置： + {{ formData.address }} +
+ +
+ 地图位置： +
+ +
+ +
+
+ +
+
-
+
@@ -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 { }