Skip to content

T
traffic-front
Commit b96ffeba authored by jiangjiaxu's avatar jiangjiaxu
Browse files
Options

modify rootAddress

parent ca8aa07c
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 35 deletions
src/config.js
View file @ b96ffeba
......@@ -3,4 +3,11 @@ const address = 'http://152.136.233.116:8083/roadlinks/getCapitalImg?imgName=';
// const address = 'http://127.0.0.1:8088/roadlinks/';
// const address = 'http://193.112.197.170:8080/roadlinks/';
// const address = 'http://172.16.40.196:29980/roadlinks/';
export default address;
const rootAddress = 'http://152.136.233.116:8083/roadlinks/';
// const rootAddress = 'http://127.0.0.1:8088/roadlinks/';
// const rootAddress = '/roadlinks/';
const photoDataAddress = 'http://106.52.130.113:9088/';
export {rootAddress,address};
src/views/Detail.vue
View file @ b96ffeba
......@@ -90,7 +90,7 @@ import axios from 'axios';
import { Message } from 'element-ui';
import echarts from 'echarts';
import moment from 'moment';
import address from '../config';
import { rootAddress, photoDataAddress, address } from '../config';
export default {
name: 'detail',
......@@ -129,7 +129,7 @@ export default {
linkPic(index, row) {
this.getCurrentDate();
var photoDate = row.finalOnlineTime ? row.finalOnlineTime : this.currentdate;
window.open('http://106.52.130.113:9088/'+ photoDate + '/' + row.channelCode + '/' + row.code,'_blank');
window.open(photoDataAddress + photoDate + '/' + row.channelCode + '/' + row.code,'_blank');
},
getCurrentDate() {
var date = new Date();
......@@ -241,7 +241,7 @@ export default {
console.log(this.currentPage) //点击第几页
},
getAllCapitals() {
axios.post(`/roadlinks/getAllCapitals`, {
axios.post(rootAddress + `getAllCapitals`, {
}).then((response) => {
if (response.data.code === 200) {
......@@ -279,7 +279,7 @@ export default {
}
});
}
axios.post(`/roadlinks/getCapitalDetails`, {
axios.post(rootAddress + `getCapitalDetails`, {
capitalName: capitalName
}).then((response) => {
if (response.data.code === 200) {
......@@ -330,7 +330,7 @@ export default {
this.filters.channel = '';
}
axios.post(`/roadlinks/getAllEquipments`, {
axios.post(rootAddress + `getAllEquipments`, {
code: this.filters.equipmentNo,
channelId: this.filters.channel,
plateNo: this.filters.plateNo,
......
src/views/Login.vue
View file @ b96ffeba
......@@ -41,7 +41,7 @@ import axios from 'axios';
import { Message } from 'element-ui';
import { constants } from 'fs';
import Cookies from 'js-cookie';
import address from '../config.js';
import { address, rootAddress } from '../config.js';
export default {
name: 'userlogin',
......@@ -107,7 +107,7 @@ export default {
this.$refs.loginForm.validate((valid) => {
if (valid) {
// 路由跳转到任务页面
axios.post('/roadlinks/login', {
axios.post(rootAddress + 'login', {
username: this.loginForm.username,
password: this.loginForm.password,
})
......
src/views/Overview.vue
View file @ b96ffeba
......@@ -74,7 +74,7 @@ import axios from 'axios';
import { Message } from 'element-ui';
import echarts from 'echarts';
import moment from 'moment';
import address from '../config';
import { rootAddress, address } from '../config';
export default {
name: 'overview',
......@@ -212,7 +212,7 @@ export default {
},
getAllCapitals() {
axios.post(`/roadlinks/getAllCapitals`, {
axios.post(rootAddress + `getAllCapitals`, {
}).then((response) => {
if (response.data.code === 200) {
......@@ -302,7 +302,7 @@ export default {
this.filters.channel = '';
}
axios.post(`/roadlinks/getAllEquipments`, {
axios.post(rootAddress + `getAllEquipments`, {
code: this.filters.equipmentNo,
channelId: this.filters.channel,
plateNo: this.filters.plateNo,
......
src/views/Registered.vue
View file @ b96ffeba
......@@ -35,7 +35,7 @@
import axios from 'axios';
import { Message } from 'element-ui';
import { setTimeout } from 'timers';
import address from '../config.js';
import { rootAddress, address} from '../config.js';
export default {
data() {
......@@ -99,7 +99,7 @@ export default {
this.$refs[formName].validate((valid) => {
if (valid) {
console.log(this.ruleForm2.user + this.ruleForm2.pass);
axios.post('/roadlinks/register', {
axios.post( rootAddress + 'register', {
username: this.ruleForm2.user,
password: this.ruleForm2.pass,
email: this.ruleForm2.mailAddress,
......
src/views/Result.vue
View file @ b96ffeba
......@@ -284,7 +284,7 @@ import axios from 'axios';
import { Message } from 'element-ui';
import gcoord from 'gcoord';
import moment from 'moment';
import address from '../config';
import { address, rootAddress } from '../config';
import { export_json_to_excel } from '@/excel/Export2Excel'
export default {
......@@ -582,7 +582,7 @@ export default {
this.getMapBounds(e);
},
queryAllEquipment() {
axios.post(`/roadlinks/queryAllEquipment`, {
axios.post(rootAddress + `queryAllEquipment`, {
}).then((response) => {
if (response.data.code === 200) {
......@@ -620,7 +620,7 @@ export default {
});
}
axios.post(`/roadlinks/getInspectResult`, {
axios.post(rootAddress + `getInspectResult`, {
startTime: this.filters.dateTime[0],
endTime: this.filters.dateTime[1],
equipment: equipmentCode
......@@ -663,7 +663,7 @@ export default {
}
});
this.allPoints.push({lng: result[0], lat: result[1], markerAnim: '', url: info.status == 1 || info.status == 3 ? require('../assets/img/map-marker_orange.png') : require('../assets/img/jingbao_red.png'), status: info.status, content: this.no, title: '', titleList: ['资产类型:' + info.type2,'资产状态:' + (info.status == 1 ? '正常' : (info.status == 2 ? '异常' : '新增')), '位置:' + info.position]});
this.allImgs.push({url: '/roadlinks/getCapitalImg?imgPath=' + info.imagePath, content: info.info + ' | ' + (info.status == 1 ? '正常' : (info.status == 2 ? '异常' : '新增')) + ' | ' + info.position, number: this.no ,id: 'imageCard' + this.no, vector: info.vector});
this.allImgs.push({url: rootAddress + 'getCapitalImg?imgPath=' + info.imagePath, content: info.info + ' | ' + (info.status == 1 ? '正常' : (info.status == 2 ? '异常' : '新增')) + ' | ' + info.position, number: this.no ,id: 'imageCard' + this.no, vector: info.vector});
}
});
}
......@@ -779,7 +779,7 @@ export default {
}
});
}
axios.post(`/roadlinks/getCapitalDetails`, {
axios.post(rootAddress + `getCapitalDetails`, {
capitalName: capitalName
}).then((response) => {
if (response.data.code === 200) {
......@@ -798,7 +798,7 @@ export default {
);
this.no = ++this.no;
this.allPoints.push({lng: result[0], lat: result[1], markerAnim: '', url: require('../assets/img/map-marker_orange.png'), content: this.no, title: '', titleList: ['资产类型:' + val.capitalType,'资产名称:' + val.capitalName ,'资产状态:正常', '位置:' + val.position]});
this.allImgs.push({url: '/roadlinks/getCapitalImg?imgName=' + val.imgName, content: val.capitalName + ' | 正常 | ' + val.position, number: this.no ,id: 'imageCard' + this.no});
this.allImgs.push({url: rootAddress + 'getCapitalImg?imgName=' + val.imgName, content: val.capitalName + ' | 正常 | ' + val.position, number: this.no ,id: 'imageCard' + this.no});
}
});
......@@ -872,7 +872,7 @@ export default {
level += "," + item;
}
});
axios.post(`/roadlinks/generateTask`, {
axios.post(rootAddress + `generateTask`, {
area: this.form.region,
startTime: this.value4[0],
endTime: this.value4[1],
......
src/views/ResultDetail.vue
View file @ b96ffeba
......@@ -204,7 +204,7 @@ import axios from 'axios';
import { Message } from 'element-ui';
import echarts from 'echarts';
import moment from 'moment';
import address from '../config';
import { rootAddress, address } from '../config';
import { export_json_to_excel } from '@/excel/Export2Excel';
import elDragDialog from "@/components/el-drag-dialog";
......@@ -392,7 +392,7 @@ export default {
},
getImageGroupsByCon(startTime, endTime, equipment) {
axios.post(`/roadlinks/getImageGroupsByCon`, {
axios.post(rootAddress + `getImageGroupsByCon`, {
startTimeMill: startTime,
endTimeMill: endTime,
equipment: equipment
......@@ -426,7 +426,7 @@ export default {
this.filters.dateTime[0] = moment((new Date()).setTime((new Date()).getTime() - 3600 * 1000 * 24)).format("YYYY-MM-DD") + ' 00:00:00';
this.filters.dateTime[1] = moment((new Date()).setTime((new Date()).getTime() - 3600 * 1000 * 24)).format("YYYY-MM-DD") + ' 23:59:59';
}
axios.post(`/roadlinks/getImageGroups`, {
axios.post(rootAddress + `getImageGroups`, {
beginTime: this.filters.dateTime[0],
endTime: this.filters.dateTime[1],
capitalType: this.filters.capitalType,
......@@ -481,7 +481,7 @@ export default {
console.log(this.currentPage) //点击第几页
},
getAllCapitals() {
axios.post(`/roadlinks/getAllCapitals`, {
axios.post(rootAddress + `getAllCapitals`, {
}).then((response) => {
if (response.data.code === 200) {
......@@ -519,7 +519,7 @@ export default {
}
});
}
axios.post(`/roadlinks/getCapitalDetails`, {
axios.post(rootAddress + `getCapitalDetails`, {
capitalName: capitalName
}).then((response) => {
if (response.data.code === 200) {
......@@ -561,7 +561,7 @@ export default {
},
showPicture(index, row) {
this.imgContent = row.info + "|" + row.status + "|" + row.position;
this.bigImgUrl = "/roadlinks/getCapitalImg?imgPath=" + row.imagePath;
this.bigImgUrl = rootAddress + "getCapitalImg?imgPath=" + row.imagePath;
let vectorData = JSON.parse(row.vector);
if (vectorData && vectorData.location) {
let point = vectorData.location;
......@@ -590,7 +590,7 @@ export default {
this.dialogVisible1 = false;
this.dialogVisible2 = false;
this.tableData[this.tableIndex].status = "正常";
axios.post(`/roadlinks/updateImageStatus`, {
axios.post(rootAddress + `updateImageStatus`, {
id: this.groupId
}).then((response) => {
if (response.data.code === 200) {
......
src/views/Task.vue
View file @ b96ffeba
......@@ -223,7 +223,7 @@ import axios from 'axios';
import { Message } from 'element-ui';
import gcoord from 'gcoord';
import moment from 'moment';
import address from '../config';
import { rootAddress, address } from '../config';
import { export_json_to_excel } from '@/excel/Export2Excel'
export default {
......@@ -331,14 +331,14 @@ export default {
this.infos.forEach((item) => {
if(item.lng == e.point.lng && item.lat == e.point.lat){
// 根据坐标信息获取图片
this.bigImgUrl = '/roadlinks/getTrajectImg?channel=' + item.channel + '&equipment=' + item.plateNo + '&createTime=' + item.date + ' ' + item.time;//this.getTrajectImg(item.channel, item.plateNo, item.date + ' ' + item.time);
this.bigImgUrl = rootAddress + 'getTrajectImg?channel=' + item.channel + '&equipment=' + item.plateNo + '&createTime=' + item.date + ' ' + item.time;//this.getTrajectImg(item.channel, item.plateNo, item.date + ' ' + item.time);
}
});
// this.bigImgUrl = require('../assets/img/17615.jpg');
this.isShowPicture = true;
},
getTrajectImg(channel, plateNo, createTime){
axios.post(`/roadlinks/getTrajectImg`, {
axios.post(rootAddress + `getTrajectImg`, {
channel: channel,
equipment: plateNo,
createTime: createTime
......@@ -368,7 +368,7 @@ export default {
});
},
queryAllEquipment() {
axios.post(`/roadlinks/queryAllEquipment`, {
axios.post(rootAddress + `queryAllEquipment`, {
}).then((response) => {
if (response.data.code === 200) {
......@@ -407,7 +407,7 @@ export default {
});
}
axios.post(`/roadlinks/getTravel`, {
axios.post(rootAddress + `getTravel`, {
startTime: this.filters.dateTime[0],
endTime: this.filters.dateTime[1],
equipment: equipmentCode
......
src/views/Video.vue
View file @ b96ffeba
......@@ -135,7 +135,7 @@ import axios from 'axios';
import { Message } from 'element-ui';
import echarts from 'echarts';
import moment from 'moment';
import address from '../config';
import {rootAddress, address} from '../config';
export default {
name: 'detail',
......@@ -170,7 +170,7 @@ export default {
},
methods: {
queryAllEquipment() {
axios.post(`/roadlinks/queryAllEquipment`, {
axios.post(rootAddress + `queryAllEquipment`, {
}).then((response) => {
if (response.data.code === 200) {
......@@ -207,7 +207,7 @@ export default {
}
});
}
axios.post(`/roadlinks/queryVideos`, {
axios.post(rootAddress + `queryVideos`, {
startTime: this.filters.dateTime[0],
endTime: this.filters.dateTime[1],
equipment: equipmentCode
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment