diff --git a/admin-web-master/src/components/chakan/cd.vue b/admin-web-master/src/components/chakan/cd.vue
index 8664bec..b54a369 100644
--- a/admin-web-master/src/components/chakan/cd.vue
+++ b/admin-web-master/src/components/chakan/cd.vue
@@ -37,7 +37,7 @@
- {{editbgid.belongingParkTrail || '无'}}
+ {{editbgid.responsiblePerson || '无'}}
@@ -49,7 +49,7 @@
- {{editbgid.belongingParkTrail || '无'}}
+ {{editbgid.phoneNumber || '无'}}
diff --git a/admin-web-master/src/components/change/cl.vue b/admin-web-master/src/components/change/cl.vue
index 2a3962e..33ba0eb 100644
--- a/admin-web-master/src/components/change/cl.vue
+++ b/admin-web-master/src/components/change/cl.vue
@@ -25,7 +25,11 @@
-
+
+
+ {{scope.row.rentalPrice}}/M²
+
+
diff --git a/admin-web-master/src/components/resourceCommodity/index.vue b/admin-web-master/src/components/resourceCommodity/index.vue
index c23cbc5..875102d 100644
--- a/admin-web-master/src/components/resourceCommodity/index.vue
+++ b/admin-web-master/src/components/resourceCommodity/index.vue
@@ -6,7 +6,7 @@
-
+
@@ -49,9 +49,14 @@
- {{editbgid.belongingGreenwaySection || '无'}}
+ {{getLvdaoNameByCode(editbgid.belongingGreenwaySection)}}
+
+
+ {{getLvdaoNameByCode(editbgid.belongingParkTrail)}}
+
+
{{editbgid.houseNumber || '无'}}
@@ -303,7 +308,10 @@
} from '@/api/newly';
import newmap from "@/components/newmap/index";
import {
- editList
+ editList,
+ gongyuan,
+ parkTrails,
+ lvdaoduan,
} from '@/api/information.js';
import allimg from '@/components/chakan/allimg.vue';
export default {
@@ -351,7 +359,8 @@
parentMessage: {},
datalist: [],
datalist1:[],
- datalistxsj:[]
+ datalistxsj:[],
+ lvdaoList:[]
}
},
created() {
@@ -364,7 +373,6 @@
resourcesId: 'sp' + this.editbgid.id
}
cereResourceStrategylist(c1).then(res => {
- console.error(res)
if (!Array.isArray(res.data)) {
this.datalist = [];
return;
@@ -372,7 +380,6 @@
this.datalist = res.data
})
cereBusinessPlan(c1).then(res => {
- console.error(res)
if (!Array.isArray(res.data)) {
this.datalist1 = [];
return;
@@ -382,11 +389,37 @@
this.getAllxsj()
this.getAllzl()
}
+ this.getAll()
},
+
computed: {
},
methods: {
+ async getAll(){
+ const lvdao = await lvdaoduan()
+ const gongyua = await parkTrails()
+ const budao = await gongyuan()
+ const lvList = lvdao.data.concat(gongyua.data)
+
+ this.lvdaoList = lvList.concat(budao.data)
+ },
+ getLvdaoNameByCode(code) {
+ // 若传入的 code 为空，直接返回空字符串
+ if (!code) {
+ return '';
+ }
+ // 遍历 this.lvdaoList 数组
+ for (let i = 0; i < this.lvdaoList.length; i++) {
+ const item = this.lvdaoList[i];
+ // 当传入的 code 等于 item 的 code 时，返回 item 的 name
+ if (item.code === code) {
+ return item.name;
+ }
+ }
+ // 若遍历完数组都没找到匹配的 code，返回空字符串
+ return '无';
+ },
open(row) {
console.error(row)
this.xiangTab= 'first'
diff --git a/admin-web-master/src/utils/request.js b/admin-web-master/src/utils/request.js
index af6d24e..1c44d31 100644
--- a/admin-web-master/src/utils/request.js
+++ b/admin-web-master/src/utils/request.js
@@ -16,12 +16,12 @@ let hostall = window.location.href;
let baseURL = ''
if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) {
- // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
+ baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
// baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server';
// baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
- baseURL = 'http://128.10.249.23:9003';
+ // baseURL = 'http://128.10.249.23:9003';
} else {
console.error('---------------------')
diff --git a/admin-web-master/src/views/analysis/ranking/index.vue b/admin-web-master/src/views/analysis/ranking/index.vue
index 2ff2295..cc672e2 100644
--- a/admin-web-master/src/views/analysis/ranking/index.vue
+++ b/admin-web-master/src/views/analysis/ranking/index.vue
@@ -135,6 +135,7 @@ export default {
this.pageIndex.startTime = this.list[0]
this.pageIndex.endTime = this.list[1]
}
+ this.currentPage = 1
this.getAll()
},
extractAndDeduplicateTicketChannels(arr) {
@@ -155,6 +156,7 @@ export default {
ticketChannel:"",
ticketType:""
}
+ this.currentPage = 1
this.list= []
this.getAll()
},
diff --git a/admin-web-master/src/views/analysis/refund/index.vue b/admin-web-master/src/views/analysis/refund/index.vue
index 9bc3912..7900459 100644
--- a/admin-web-master/src/views/analysis/refund/index.vue
+++ b/admin-web-master/src/views/analysis/refund/index.vue
@@ -214,6 +214,7 @@ export default {
this.pageIndex.startTime = this.pageIndex.list[0]
this.pageIndex.endTime = this.pageIndex.list[1]
}
+ this.currentPage = 1
this.getAll()
},
clear(){
@@ -227,7 +228,7 @@ export default {
ticketType: "",
type:""
}
-
+this.currentPage = 1
this.getAll()
},
changepiao(){
diff --git a/admin-web-master/src/views/analysis/statistics/index.vue b/admin-web-master/src/views/analysis/statistics/index.vue
index 531403a..6a2679f 100644
--- a/admin-web-master/src/views/analysis/statistics/index.vue
+++ b/admin-web-master/src/views/analysis/statistics/index.vue
@@ -184,6 +184,7 @@
this.pageIndex.startTime = this.pageIndex.list[0]
this.pageIndex.endTime = this.pageIndex.list[1]
}
+ this.currentPage = 1
this.getAll()
},
extractAndDeduplicateTicketChannels(arr) {
@@ -214,6 +215,7 @@
ticketChannel: "",
ticketType: ""
}
+ this.currentPage = 1
this.getAll()
},
changepiao() {
diff --git a/admin-web-master/src/views/detect copy/addziyuan.vue b/admin-web-master/src/views/detect copy/addziyuan.vue
index d3334cf..a7cb565 100644
--- a/admin-web-master/src/views/detect copy/addziyuan.vue
+++ b/admin-web-master/src/views/detect copy/addziyuan.vue
@@ -417,10 +417,11 @@
-
+
+
diff --git a/admin-web-master/src/views/detect/addziyuan.vue b/admin-web-master/src/views/detect/addziyuan.vue
index 30fcfa4..92b9f09 100644
--- a/admin-web-master/src/views/detect/addziyuan.vue
+++ b/admin-web-master/src/views/detect/addziyuan.vue
@@ -431,10 +431,7 @@
-
-
-
-
+
diff --git a/admin-web-master/src/views/detect/admap.vue b/admin-web-master/src/views/detect/admap.vue
index d69262b..c0e2920 100644
--- a/admin-web-master/src/views/detect/admap.vue
+++ b/admin-web-master/src/views/detect/admap.vue
@@ -155,7 +155,10 @@
-
+
+
+ {{scope.row.actualArea}}/M²
+
diff --git a/admin-web-master/src/views/detect/map.vue b/admin-web-master/src/views/detect/map.vue
index 3fe2c80..2aeac16 100644
--- a/admin-web-master/src/views/detect/map.vue
+++ b/admin-web-master/src/views/detect/map.vue
@@ -23,9 +23,7 @@
-
-
-
+