caoliancun/LSM_OIL_SITE
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改

Browse Source
This commit is contained in:
caolc
2022-11-09 16:24:13 +08:00
parent cb4a3f1a2e 46768fe668
commit ddae05ffde
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pages/escalation/escalation.vue
View File

@@ -126,7 +126,6 @@
onShow() { onShow() {
this.start = this.datefn(); this.start = this.datefn();
this.single = this.datefn() this.single = this.datefn()
console.log(this.start),'+++++++++++++++++++'
this.getByPage() this.getByPage()
}, },
methods: { methods: {

2
pages/home/home.vue
View File

@@ -416,6 +416,7 @@
}, },
// 获取油站信息 // 获取油站信息
getSiteInfo(channelId) { getSiteInfo(channelId) {
console.log('获取油站信息')
oliSiteApi.getSiteDetail(channelId).then(res => { oliSiteApi.getSiteDetail(channelId).then(res => {
// //console.log(res) // //console.log(res)
if (res.code === 20000) { if (res.code === 20000) {
@@ -472,6 +473,7 @@
}, },
//获取油站基本资料 //获取油站基本资料
getUserInfo(id) { getUserInfo(id) {
console.log('获取油站基本资料')
// 获取云站当前登录用户的基础资料 // 获取云站当前登录用户的基础资料
oliSiteApi.getSiteBasicData(id).then(res => { oliSiteApi.getSiteBasicData(id).then(res => {
//console.log('用户资料', res) //console.log('用户资料', res)

10
utils/request.js
View File

@@ -2,16 +2,16 @@ import axios from 'axios'
import utils from '@/utils/encode' import utils from '@/utils/encode'
// const env = 'test' /* */ // const env = 'test' /* */
// const env = 'test'// 仅用于测试、 const env = 'test'// 仅用于测试、
const env = 'production' // const env = 'production'
//42 洛超 /29 孙志华 /40 阿浩 //42 洛超 /29 孙志华 /40 阿浩
// 测试日日顺时需要连阿浩 // 测试日日顺时需要连阿浩
const testUrl = 'http://192.168.110.208:38080' const testUrl = 'http://192.168.54:38080'
// const productionUrl = 'https://www.51xingka.net/oilApp' // 生产，加密 old // const productionUrl = 'https://www.51xingka.net/oilApp' // 生产，加密 old
// const productionUrl = 'https://www.xingoil.com/adminapi' // 生产，加密 new // const productionUrl = 'https://www.xingoil.com/adminapi' // 生产，加密 new
const productionUrl = 'http://uat.xingoil.com/adminapi' // 生产，加密 new // const productionUrl = 'https://www.xingoil.com/adminapi' // 生产，加密 new
// const productionUrl = 'http://121.196.213.68/adminapi' //预生产 const productionUrl = 'http://uat.xingoil.com/adminapi'
// const env = process.env.NODE_ENV // 环境 // const env = process.env.NODE_ENV // 环境
const service = axios.create({ const service = axios.create({
baseURL: env=='production'?productionUrl:testUrl, // baseURL: env=='production'?productionUrl:testUrl, //