|
@@ -443,6 +443,7 @@ import { getTradeConfigList } from '@/api/basic_data/sectorAllocation'
|
|
|
import GeographicalPosi from './geographicalPosi.vue'
|
|
|
import FileUpload from '@/components/Common/file-upload.vue'
|
|
|
import { mapGetters } from 'vuex'
|
|
|
+import { getPositionProject } from '@/api/frock'
|
|
|
|
|
|
export default {
|
|
|
components: {
|
|
@@ -503,25 +504,7 @@ export default {
|
|
|
async 'formData.id'(newValue, oldValue) {
|
|
|
if (newValue) {
|
|
|
if (this.isTradeExaminer) {
|
|
|
- if (this.commonData.vicinityMarkers.length) {
|
|
|
- console.log(this.commonData, 8888)
|
|
|
-
|
|
|
- this.markers = this.commonData.vicinityMarkers.map(k => {
|
|
|
- return {
|
|
|
- id: '',
|
|
|
- name: k.projectName,
|
|
|
- center: [k.lnt, k.lat],
|
|
|
- address: k.address,
|
|
|
- no: k.projectNo
|
|
|
- }
|
|
|
- })
|
|
|
- }
|
|
|
- this.markers.push({
|
|
|
- name: this.formData.projectName,
|
|
|
- center: [this.formData.lnt, this.formData.lat],
|
|
|
- address: this.formData.address,
|
|
|
- no: this.formData.projectNo
|
|
|
- })
|
|
|
+ this.getPositionProject()
|
|
|
} else {
|
|
|
this.markers = [
|
|
|
{
|
|
@@ -583,6 +566,26 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
+ getPositionProject() {
|
|
|
+ getPositionProject({ id: this.formData.id }).then(res => {
|
|
|
+ this.commonData.vicinityMarkers = res.data
|
|
|
+ this.markers = this.commonData.vicinityMarkers.map(k => {
|
|
|
+ return {
|
|
|
+ id: '',
|
|
|
+ name: k.projectName,
|
|
|
+ center: [k.lnt, k.lat],
|
|
|
+ address: k.address,
|
|
|
+ no: k.projectNo
|
|
|
+ }
|
|
|
+ })
|
|
|
+ this.markers.push({
|
|
|
+ name: this.formData.projectName,
|
|
|
+ center: [this.formData.lnt, this.formData.lat],
|
|
|
+ address: this.formData.address,
|
|
|
+ no: this.formData.projectNo
|
|
|
+ })
|
|
|
+ })
|
|
|
+ },
|
|
|
handleArea(value, type) {
|
|
|
this.formData[type] = this[type + 'List'].find(k => k.id === value).name
|
|
|
},
|
|
@@ -677,6 +680,7 @@ export default {
|
|
|
}
|
|
|
this.tradeParentList = res.data
|
|
|
if (this.formData.id) {
|
|
|
+ console.log(this.formData.tradeParentId)
|
|
|
const item = this.tradeParentList.find(k => k.id === this.formData.tradeParentId)
|
|
|
if (item.childList && item.childList.length) {
|
|
|
this.tradeList = item.childList
|