diff --git a/admin-web-master/dist.zip b/admin-web-master/dist.zip
index 5a97b77..1f2347b 100644
--- a/admin-web-master/dist.zip
+++ b/admin-web-master/dist.zip
diff --git a/admin-web-master/src/api/information.js b/admin-web-master/src/api/information.js
index 6c98018..361cf63 100644
--- a/admin-web-master/src/api/information.js
+++ b/admin-web-master/src/api/information.js
@@ -53,7 +53,7 @@ export function lvdaoduan(data) {
data
})
}
-// 获取公园
+// 获取步道
export function gongyuan(data) {
return request({
url: '/queryTheJunYi/searchTrail',
@@ -61,7 +61,14 @@ export function gongyuan(data) {
data
})
}
-
+// 获取公园
+export function parkTrails(data) {
+ return request({
+ url: '/queryTheJunYi/searchParkTrails',
+ method: 'post',
+ data
+ })
+}
//场地查询列表
export function changAlls(data) {
return request({
diff --git a/admin-web-master/src/components/add/addcd copy.vue b/admin-web-master/src/components/add/addcd copy.vue
index 524e04e..f70b9ee 100644
--- a/admin-web-master/src/components/add/addcd copy.vue
+++ b/admin-web-master/src/components/add/addcd copy.vue
@@ -115,7 +115,6 @@
} from '../../api/commodityLease.js'
import {
gongyuan,
- lvdaoduan,
addList,
editList
} from '../../api/map1.js';
diff --git a/admin-web-master/src/components/add/addcd.vue b/admin-web-master/src/components/add/addcd.vue
index 5c2f351..2ccfc5b 100644
--- a/admin-web-master/src/components/add/addcd.vue
+++ b/admin-web-master/src/components/add/addcd.vue
@@ -113,7 +113,6 @@
} from '../../api/commodityLease.js'
import {
gongyuan,
- lvdaoduan,
addList,
editList
} from '../../api/map1.js';
diff --git a/admin-web-master/src/components/add/addinformation.vue b/admin-web-master/src/components/add/addinformation.vue
index d904abe..f48bc61 100644
--- a/admin-web-master/src/components/add/addinformation.vue
+++ b/admin-web-master/src/components/add/addinformation.vue
@@ -159,7 +159,8 @@
gongyuan,
lvdaoduan,
addList,
- editList
+ editList,
+ parkTrails
} from '@/api/information.js';
import newmap from "@/components/newmap/index";
export default {
@@ -274,8 +275,9 @@
this.lng = Number(this.ruleForm.mapPunctuation.split(',')[1])
}
}
- const lvdao = await lvdaoduan()
- this.lvdaoList = lvdao.data
+ const lvdao = await lvdaoduan()
+ const gongyua = await parkTrails()
+ this.lvdaoList = lvdao.data.concat(gongyua.data)
},
methods: {
validateNumber(field, value) {
@@ -320,8 +322,10 @@
this.gongyuan(vaule)
},
async gongyuan(value) {
- const gongyaun = await gongyuan()
- this.gongyuanList = gongyaun.data.filter(item => item.superior == value);
+ const budao = await gongyuan()
+ const gongyua = await parkTrails()
+ const allgong= budao.data.concat(gongyua.data)
+ this.gongyuanList = allgong.filter(item => item.superior == value);
},
add() {
console.log({
diff --git a/admin-web-master/src/components/add/addmap.vue b/admin-web-master/src/components/add/addmap.vue
index 5b78a8b..1452f4f 100644
--- a/admin-web-master/src/components/add/addmap.vue
+++ b/admin-web-master/src/components/add/addmap.vue
@@ -129,7 +129,6 @@
} from '../../api/commodityLease.js'
import {
gongyuan,
- lvdaoduan,
addList,
editList
} from '../../api/map1.js';
diff --git a/admin-web-master/src/components/add/addyx.vue b/admin-web-master/src/components/add/addyx.vue
index 8a86e9f..731e16f 100644
--- a/admin-web-master/src/components/add/addyx.vue
+++ b/admin-web-master/src/components/add/addyx.vue
@@ -103,7 +103,6 @@
} from '../../api/commodityLease.js'
import {
gongyuan,
- lvdaoduan,
addList,
editList
} from '../../api/map1.js';
diff --git a/admin-web-master/src/utils/request.js b/admin-web-master/src/utils/request.js
index 940f3cb..590f3d9 100644
--- a/admin-web-master/src/utils/request.js
+++ b/admin-web-master/src/utils/request.js
@@ -16,9 +16,9 @@ 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 = process.env.VUE_APP_DOMAIN_PREFIX_1;
- baseURL = 'http://128.10.249.26:9003';
+ // baseURL = 'http://128.10.249.22:9003';
} else {
console.error('---------------------')
diff --git a/admin-web-master/src/views/activity/index.vue b/admin-web-master/src/views/activity/index.vue
index 66f44ea..98f83aa 100644
--- a/admin-web-master/src/views/activity/index.vue
+++ b/admin-web-master/src/views/activity/index.vue
@@ -85,8 +85,8 @@
@selection-change="handleSelectionChange" tooltip-effect="dark" align="left"
:header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
ref="mulTable">
-
-
+
diff --git a/admin-web-master/src/views/ads/fangAudit/index.vue b/admin-web-master/src/views/ads/fangAudit/index.vue
index 1643f6b..dc0b8f1 100644
--- a/admin-web-master/src/views/ads/fangAudit/index.vue
+++ b/admin-web-master/src/views/ads/fangAudit/index.vue
@@ -128,7 +128,6 @@
import {
delList,
editList,
- lvdaoduan,
getAlls
} from '@/api/information';
import add from '@/components/add/addfa'
@@ -180,8 +179,6 @@
},
async created() {
this.getAll()
- // const lvdao = await lvdaoduan()
- // this.lvdaoList = lvdao.data
},
methods: {
minSev(e) {
diff --git a/admin-web-master/src/views/ads/fangli/index.vue b/admin-web-master/src/views/ads/fangli/index.vue
index 8fd0186..61f4b95 100644
--- a/admin-web-master/src/views/ads/fangli/index.vue
+++ b/admin-web-master/src/views/ads/fangli/index.vue
@@ -137,7 +137,6 @@
import {
delList,
editList,
- lvdaoduan,
getAlls
} from '@/api/information';
import add from '@/components/add/addfa'
@@ -191,8 +190,6 @@
},
async created() {
this.getAll()
- // const lvdao = await lvdaoduan()
- // this.lvdaoList = lvdao.data
},
methods: {
minSev(e) {
diff --git a/admin-web-master/src/views/atmosphere/atmosphereGl.vue b/admin-web-master/src/views/atmosphere/atmosphereGl.vue
index d4a5201..56dd384 100644
--- a/admin-web-master/src/views/atmosphere/atmosphereGl.vue
+++ b/admin-web-master/src/views/atmosphere/atmosphereGl.vue
@@ -84,8 +84,8 @@
@selection-change="handleSelectionChange" tooltip-effect="dark"
:header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
ref="mulTable">
-
-
+
diff --git a/admin-web-master/src/views/detect copy/addziyuan.vue b/admin-web-master/src/views/detect copy/addziyuan.vue
index 05123e2..d3334cf 100644
--- a/admin-web-master/src/views/detect copy/addziyuan.vue
+++ b/admin-web-master/src/views/detect copy/addziyuan.vue
@@ -730,8 +730,8 @@
//查询全数据
async getAll() {
const lvdao = await lvdaoduan()
- this.lvdaoList = lvdao.data
-
+ const gongyua = await parkTrails()
+ this.lvdaoList = lvdao.data.concat(gongyua.data)
},
async gongyuan(value){
const gongyaun = await gongyuan()
diff --git a/admin-web-master/src/views/detect/addziyuan.vue b/admin-web-master/src/views/detect/addziyuan.vue
index 97a28ef..30fcfa4 100644
--- a/admin-web-master/src/views/detect/addziyuan.vue
+++ b/admin-web-master/src/views/detect/addziyuan.vue
@@ -759,12 +759,15 @@
//查询全数据
async getAll() {
const lvdao = await lvdaoduan()
- this.lvdaoList = lvdao.data
+ const gongyua = await parkTrails()
+ this.lvdaoList = lvdao.data.concat(gongyua.data)
},
async gongyuan(value) {
- const gongyaun = await gongyuan()
- this.gongyuanList = gongyaun.data.filter(item => item.superior == value);
+ const budao = await gongyuan()
+ const gongyua = await parkTrails()
+ const allgong= budao.data.concat(gongyua.data)
+ this.gongyuanList = allgong.filter(item => item.superior == value);
},
closeFn() {
this.fileData = []
diff --git a/admin-web-master/src/views/detect/information/index.vue b/admin-web-master/src/views/detect/information/index.vue
index 4879b56..18ea714 100644
--- a/admin-web-master/src/views/detect/information/index.vue
+++ b/admin-web-master/src/views/detect/information/index.vue
@@ -142,8 +142,8 @@
import {
delList,
editList,
- lvdaoduan,
- getAlls
+ getAlls,
+ parkTrails
} from '@/api/information';
import add from '@/components/add/addinformation'
import resourceCommodity from '@/components/resourceCommodity/index'
@@ -190,8 +190,7 @@
},
async created() {
this.getAll()
- const lvdao = await lvdaoduan()
- this.lvdaoList = lvdao.data
+
},
methods: {
minSev(e) {
diff --git a/admin-web-master/src/views/detect/ziyuanList.vue b/admin-web-master/src/views/detect/ziyuanList.vue
index cbf3e95..1a2b56f 100644
--- a/admin-web-master/src/views/detect/ziyuanList.vue
+++ b/admin-web-master/src/views/detect/ziyuanList.vue
@@ -550,13 +550,16 @@
//查询全数据
async getAll() {
const lvdao = await lvdaoduan()
- const gongyaun = await gongyuan()
- this.lvdaoList = lvdao.data
- this.biangongyuanList = gongyaun.data
+ const gongyaun = await gongyuan()
+ const gongyua = await parkTrails()
+ this.lvdaoList = lvdao.data.concat(gongyua.data)
+ this.biangongyuanList = gongyaun.data
},
async gongyuan1(value){
- const gongyaun = await gongyuan()
- this.biangongyuanList = gongyaun.data.filter(item => item.superior == value);
+ const budao = await gongyuan()
+ const gongyua = await parkTrails()
+ const allgong= budao.data.concat(gongyua.data)
+ this.biangongyuanList = allgong.filter(item => item.superior == value);
},
closeFn() {
this.$emit('bianClose', false);
diff --git a/admin-web-master/src/views/media/mediaMana.vue b/admin-web-master/src/views/media/mediaMana.vue
index 9513f10..017a210 100644
--- a/admin-web-master/src/views/media/mediaMana.vue
+++ b/admin-web-master/src/views/media/mediaMana.vue
@@ -72,25 +72,22 @@
-
-
-
- {{scope.row.state == ''?'待提交':scope.row.state == '1'?'待审批':scope.row.state == '2'?'部门领导审批':scope.row.state == '3'?'公司领导审批':scope.row.state == '4'?'其他审批':scope.row.state == '5'?'审核通过':'已驳回'}}
+ {{scope.row.state == '1'?'待提交':scope.row.state == '2'?'待审批':scope.row.state == '5'?'审核通过':'已驳回'}}
-
+
-
+
查看
- 修改
+ 修改
- 提交审核
+ 提交审核
@@ -1088,7 +1085,7 @@ this.$refs.mulTable.clearSelection(); // 清除所有选项
if (action === 'confirm') {
editTui({
id: item.id,
- state: '1'
+ state: '2'
}).then(res => {
this.getAll()
})
diff --git a/admin-web-master/src/views/media/mediaMannaAdd.vue b/admin-web-master/src/views/media/mediaMannaAdd.vue
index 327df54..fda2728 100644
--- a/admin-web-master/src/views/media/mediaMannaAdd.vue
+++ b/admin-web-master/src/views/media/mediaMannaAdd.vue
@@ -21,8 +21,8 @@
-
-
+
+
@@ -93,10 +93,11 @@
planName:'',
classificationCode:'',
schemeTitle:'',
- promotionContent:'媒体推广管理',
+ promotionContent:'',
updateUser:'',
coverImage:'',
createDate:'',//创建时间
+ state:'1',
},
mingFrom:{
detailLtemName:'',
@@ -208,10 +209,11 @@ handleChange(file, fileList) {
planName:'',
classificationCode:'',
schemeTitle:'',
- promotionContent:'媒体推广管理',
+ promotionContent:'',
updateUser:'',
coverImage:'',
createDate:'',//创建时间
+ state:'1',
}
}).catch(err => {
console.log(err)
@@ -285,10 +287,11 @@ handleChange(file, fileList) {
planName:'',
classificationCode:'',
schemeTitle:'',
- promotionContent:'媒体推广管理',
+ promotionContent:'',
updateUser:'',
coverImage:'',
createDate:'',//创建时间
+ state:'1',
}
},
fenleiChange(value){
diff --git a/admin-web-master/src/views/online/summaryQuery/index.vue b/admin-web-master/src/views/online/summaryQuery/index.vue
index dda149b..1c8a82e 100644
--- a/admin-web-master/src/views/online/summaryQuery/index.vue
+++ b/admin-web-master/src/views/online/summaryQuery/index.vue
@@ -164,7 +164,7 @@