From 3db69ad0012032cf01c0911d2517135394ec9bea Mon Sep 17 00:00:00 2001
From: quanyawei <401863037@qq.com>
Date: Thu, 27 Jun 2024 14:39:22 +0800
Subject: [PATCH] fix: bug修改
---
pages/actionChange/components/basicInfor.vue | 76 +++++++++++++++++++++----------------
1 files changed, 43 insertions(+), 33 deletions(-)
diff --git a/pages/actionChange/components/basicInfor.vue b/pages/actionChange/components/basicInfor.vue
index 02d62e3..411d2c4 100644
--- a/pages/actionChange/components/basicInfor.vue
+++ b/pages/actionChange/components/basicInfor.vue
@@ -38,7 +38,7 @@
<view class="wholeLine">
<text class="rowTipContenetLabel">������������:</text>
<text class="rowTipContenetAll">
- {{ unitName }}
+ {{ basicInfor.unitName }}
</text>
</view>
</view>
@@ -46,7 +46,7 @@
<view class="wholeLine">
<text class="rowTipContenetLabel">������������:</text>
<text class="rowTipContenetAll">
- {{ polluteType }}
+ {{ basicInfor.polluteTypeName }}
</text>
</view>
</view>
@@ -76,7 +76,7 @@
<view class="wholeLine">
<text class="rowTipContenetLabel">������������:</text>
<text class="rowTipContenetAll">
- {{ escalationUnitName }}
+ {{ basicInfor.escalationUnitName }}
</text>
</view>
</view>
@@ -85,14 +85,36 @@
<view class="wholeLine">
<text class="rowTipContenetLabel">������������:</text>
<text class="rowTipContenetAll">{{ basicInfor.pollutePosition ||'' }}</text>
+ <u-icon name="map" color="#2979ff" size="28" @tap="toNavigation()"
+ v-if="basicInfor.longitude !==null"></u-icon>
+ </view>
+ </p>
+ <p class="rowTip">
+ <view class="rowTipContenet" style="width: 100%;">
+ <view class="wholeLine">
+ <text class="rowTipContenetLabel">������������:</text>
+ <text class="rowTipContenetAll">
+ <text>{{ dictObj.emphasisEnum[basicInfor.keyPoint]||'' }}</text>
+ </text>
+ </view>
+ </view>
+ </p>
+ <p class="rowTip">
+ <view class="rowTipContenet" style="width: 100%;">
+ <view class="wholeLine">
+ <text class="rowTipContenetLabel">������������:</text>
+ <text class="rowTipContenetAll" style="white-space: break-spaces;">
+ {{ basicInfor.problemDescribe }}
+ </text>
+ </view>
</view>
</p>
<view class="formItemContent">
<u--form labelPosition="left" label-width="75" :border-bottom="false" ref="uForm">
<u-form-item border-bottom label="������������:" :border-bottom="false">
<view class="fileBox">
- <cl-upload v-model="fileList" :add="false" :action="`''`" cloud-type="other"
- :remove="false" />
+ <cl-upload v-if="fileList.length>0" v-model="fileList" :add="false" :action="`''`"
+ cloud-type="other" :remove="false" />
</view>
</u-form-item>
</u--form>
@@ -119,34 +141,7 @@
baseUrl: this.$storage.get('baseUrl'),
}
},
- computed: {
- unitName() {
- let data = ''
- if (this.basicInfor.unitId && this.unitList.length > 0) {
- data = this.unitList && this.unitList.find(a => Number(a.unitId) === Number(this.basicInfor.unitId))
- .unitName
- }
- return data
- },
- escalationUnitName() {
- let data = ''
- if (this.basicInfor.unitId && this.unitList.length > 0) {
- data = this.unitList && this.unitList.find(a => Number(a.unitId) === Number(this.basicInfor
- .escalationUnitId)).unitName
- }
- return data
- },
- polluteType() {
- let data = ''
- console.log('this.polluteList', this.polluteList)
- console.log('this.basicInfor.polluteType', this.basicInfor.polluteType)
- if (String(this.basicInfor.polluteType) && this.polluteList.length > 0) {
- data = this.polluteList.find(a => Number(a.dataKey) === Number(this.basicInfor.polluteType)).dataValue
- }
- console.log('data', data)
- return data
- }
- },
+ computed: {},
watch: {
basicInfor: {
handler: function(newValue, oldValue) {
@@ -165,6 +160,7 @@
},
mounted() {
// ������������������list
+ console.log('this.basicInfor.fileBaseList', this.basicInfor.fileBaseList)
if (this.basicInfor.fileBaseList && this.basicInfor.fileBaseList.length > 0) {
this.basicInfor.fileBaseList.forEach(item => {
let name = item.fileType === 1 ? 'name.png' : ''
@@ -175,6 +171,20 @@
}
},
methods: {
+ //������--������������������������
+ toNavigation: function() {
+ //������������������������������������
+ uni.openLocation({
+ longitude: parseFloat(this.basicInfor.longitude), // ������������������-180~180���������������������
+ latitude: parseFloat(this.basicInfor.latitude), // ������������������-90~90���������������������
+ scale: 28, // ������������
+ name: this.basicInfor.name, //������������
+ address: this.basicInfor.address, //������������������
+ success: function(res) {
+ console.log('success:', res)
+ }
+ })
+ },
getUnitList() {
this.$http.httpGet('/allocation/unit').then(res => {
this.unitList = res.data
--
Gitblit v1.8.0