Commit ed715e56 by 李金轩

ljx

1 parent 43d045c5
window._baseUrl = ['localhost', '192.168.1.104'].includes(window.location.hostname) ? 'http://mall.keliuyun.com:9998' : '' window._serverHost = ['localhost', '192.168.1.104'].includes(window.location.hostname) ? 'mall.keliuyun.com:9998' : window.location.host
window._host = ['localhost', '192.168.1.104'].includes(window.location.hostname) ? 'mall.keliuyun.com:9998' : window.location.host window._baseUrl = ['localhost', '192.168.1.104'].includes(window.location.hostname) ? 'http://mall.keliuyun.com:9998' : `http://${window._serverHost}`
// window._baseUrl = 'http://36.112.68.214:9999' // window._baseUrl = 'http://36.112.68.214:9999'
const log = console.log.bind(console) const log = console.log.bind(console)
...@@ -15,7 +15,7 @@ axiosInstance.interceptors.request.use( ...@@ -15,7 +15,7 @@ axiosInstance.interceptors.request.use(
config => { config => {
if (['localhost', '192.168.1.104'].includes(window.location.hostname)) if (['localhost', '192.168.1.104'].includes(window.location.hostname))
{ {
config.headers.Authorization = 'a54766a2-96df-43cf-ab78-963a8b7915de' config.headers.Authorization = '0cb1645a-d091-423e-9afa-4724564119a8'
} }
else else
{ {
......
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
</a-form> </a-form>
<div class="result-wrapper-2"> <div class="result-wrapper-2">
<el-row v-for="item in resultList"> <el-row v-for="item in resultList" style="padding: 5px 0">
<el-col :span="3"> <el-col :span="3">
{{ progressMap[item.scheduleType] + ':' }} {{ progressMap[item.scheduleType] + ':' }}
</el-col> </el-col>
...@@ -219,7 +219,7 @@ export default { ...@@ -219,7 +219,7 @@ export default {
webSocketMap[scheduleType].close() webSocketMap[scheduleType].close()
} }
webSocketMap[scheduleType] = new WebSocket(`ws://${window._host}/recal/schedule/${scheduleType}`) webSocketMap[scheduleType] = new WebSocket(`ws://${window._serverHost}/recal/schedule/${scheduleType}`)
webSocketMap[scheduleType].onopen = () => { webSocketMap[scheduleType].onopen = () => {
queryData(scheduleType) queryData(scheduleType)
......
...@@ -177,7 +177,7 @@ export default { ...@@ -177,7 +177,7 @@ export default {
} }
resultList.value = [] resultList.value = []
webSocket = new WebSocket(`ws://${window._host}/recal/schedule/rebuildFeatureLib${queryForm.featureRevisitType}`) webSocket = new WebSocket(`ws://${window._serverHost}/recal/schedule/rebuildFeatureLib${queryForm.featureRevisitType}`)
webSocket.onopen = queryData webSocket.onopen = queryData
......
...@@ -180,7 +180,7 @@ export default { ...@@ -180,7 +180,7 @@ export default {
} }
resultList.value = [] resultList.value = []
webSocket = new WebSocket(`ws://${window._host}/recal/schedule/revisitFeature${queryForm.featureRevisitType}`) webSocket = new WebSocket(`ws://${window._serverHost}/recal/schedule/revisitFeature${queryForm.featureRevisitType}`)
webSocket.onopen = queryData webSocket.onopen = queryData
......
...@@ -177,7 +177,7 @@ export default { ...@@ -177,7 +177,7 @@ export default {
} }
resultList.value = [] resultList.value = []
webSocket = new WebSocket(`ws://${window._host}/recal/schedule/rematchPerson${queryForm.featureRevisitType}`) webSocket = new WebSocket(`ws://${window._serverHost}/recal/schedule/rematchPerson${queryForm.featureRevisitType}`)
webSocket.onopen = queryData webSocket.onopen = queryData
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!