This commit is contained in:
chengdandan 2023-02-24 16:31:29 +08:00
parent 780ae53f5a
commit d7d816578a
5 changed files with 39 additions and 36 deletions

View File

@ -7,31 +7,31 @@ export default {
// addFigure: "http://172.16.1.22:8080/api/AddJianktx", // addFigure: "http://172.16.1.22:8080/api/AddJianktx",
// //编辑图形名称 // //编辑图形名称
// editFigure: "http://172.16.1.22:8080/api/EditTuxmc", // editFigure: "http://172.16.1.22:8080/api/EditTuxmc",
dataUrl: 'http://172.16.1.168:5000/api/AddShipjk', // dataUrl: 'http://172.16.1.168:5000/api/AddShipjk',
getSpareElementOrder: 'http://172.16.1.168:5000/api/Upload', // getSpareElementOrder: 'http://172.16.1.168:5000/api/Upload',
postSetQuanjsz: 'http://172.16.1.168:5000/api/SetQuanjsz', // postSetQuanjsz: 'http://172.16.1.168:5000/api/SetQuanjsz',
saveRoleApi: 'http://172.16.1.168:5000/api/AddZhangh', // saveRoleApi: 'http://172.16.1.168:5000/api/AddZhangh',
saveSetFtppz: 'http://172.16.1.168:5000/api/SetFtppz', // saveSetFtppz: 'http://172.16.1.168:5000/api/SetFtppz',
//编辑保存组件弹窗传参 // //编辑保存组件弹窗传参
editComponent: 'http://172.16.1.22:8080/api/SetMonqjkzjcs', // editComponent: 'http://172.16.1.168:5000/api/SetMonqjkzjcs',
//保存主机名称 // //保存主机名称
editRoleApi: 'http://172.16.1.168:5000/api/EditZhangh', // editRoleApi: 'http://172.16.1.168:5000/api/EditZhangh',
//新增图形接口 // //新增图形接口
addFigure: 'http://172.16.1.168:5000/api/AddJianktx', // addFigure: 'http://172.16.1.168:5000/api/AddJianktx',
//编辑图形名称 // //编辑图形名称
editFigure: 'http://172.16.1.168:5000/api/EditTuxmc', // editFigure: 'http://172.16.1.168:5000/api/EditTuxmc',
//编辑保存组件弹窗传参 // //编辑保存组件弹窗传参
setHostName: 'http://172.16.1.168:5000/api/SetHostName', // setHostName: 'http://172.16.1.168:5000/api/SetHostName',
setHostTime: 'http://172.16.1.168:5000/api/SetHostTime' // setHostTime: 'http://172.16.1.168:5000/api/SetHostTime'
// `http://${ipUurl}:5000/api/AddShipjk` // `http://${ipUurl}:5000/api/AddShipjk`
// dataUrl: `http://${ipUurl}:5000/api/AddShipjk`, dataUrl: `http://${ipUurl}:5000/api/AddShipjk`,
// getSpareElementOrder: `http://${ipUurl}:5000/api/Upload`, getSpareElementOrder: `http://${ipUurl}:5000/api/Upload`,
// postSetQuanjsz: `http://${ipUurl}:5000/api/SetQuanjsz`, postSetQuanjsz: `http://${ipUurl}:5000/api/SetQuanjsz`,
// //新增图形接口 //新增图形接口
// addFigure: `http://${ipUurl}:5000/api/AddJianktx`, addFigure: `http://${ipUurl}:5000/api/AddJianktx`,
// //编辑图形名称 //编辑图形名称
// editFigure: `http://${ipUurl}:5000/api/EditTuxmc`, editFigure: `http://${ipUurl}:5000/api/EditTuxmc`,
// //编辑保存组件弹窗传参 //编辑保存组件弹窗传参
// editComponent: `http://${ipUurl}:5000/api/SetMonqjkzjcs`, editComponent: `http://${ipUurl}:5000/api/SetMonqjkzjcs`,
}; };

View File

@ -37,8 +37,8 @@ class mqttHandle {
const { host, port, endpoint, ...options } = this.connect; const { host, port, endpoint, ...options } = this.connect;
console.log("this.connect.host",this.connect.host) console.log("this.connect.host",this.connect.host)
// const connectUrl = `ws://${this.connect.host}:${this.connect.port}${this.connect.endpoint}`; // const connectUrl = `ws://${this.connect.host}:${this.connect.port}${this.connect.endpoint}`;
const connectUrl = 'ws://172.16.1.168:10087/'; // const connectUrl = 'ws://172.16.1.168:10087/';
// const connectUrl = `ws://${this.connect.host}:${this.connect.port}`; const connectUrl = `ws://${this.connect.host}:${this.connect.port}`;
// if (!client.connected) { // if (!client.connected) {
// client.on('connect', function () { // client.on('connect', function () {
// console.log('连接成功') // console.log('连接成功')

View File

@ -737,8 +737,8 @@ export default {
OnSceneload(newV) { OnSceneload(newV) {
var ip = window.location.host; var ip = window.location.host;
this.ipData = 'http://' + ip.split(':')[0] + ':5000'; this.ipData = 'http://' + ip.split(':')[0] + ':5000';
this.$refs.analysisWeb.contentWindow.getIpData('http://172.16.1.168:5000'); // this.$refs.analysisWeb.contentWindow.getIpData('http://172.16.1.168:5000');
// this.$refs.analysisWeb.contentWindow.getDianwei(this.$route.query.id); this.$refs.analysisWeb.contentWindow.getDianwei(this.$route.query.id);
this.unityDone = true; this.unityDone = true;
}, },
handleDeleteDian(row, idx) { handleDeleteDian(row, idx) {

View File

@ -254,10 +254,13 @@ export default {
// console.log(_this.$refs.typeChartRef[i], ''); // console.log(_this.$refs.typeChartRef[i], '');
let item = _this.$refs.typeChartRef[i] let item = _this.$refs.typeChartRef[i]
_this.$refs.typeChartRef[i].$refs.lineChartRef.drawLine(_this.$refs.typeChartRef[i].dataArr,_this.$refs.typeChartRef[i].componentName.split('_')[0]) _this.$refs.typeChartRef[i].$refs.lineChartRef.drawLine(_this.$refs.typeChartRef[i].dataArr,_this.$refs.typeChartRef[i].componentName.split('_')[0])
if(item.componentName.split('_')[0]=="类型"){ if(item.componentName.split('_')[0]=="类型"&&item.$refs.barChartRef){
// //
item.$refs.barChartRef.drawBar(item.dataArr[0]) item.$refs.barChartRef.drawBar(item.dataArr[0])
//
}else if(item.componentName.split('_')[0]=="类型"&&item.$refs.pieChartRef){
// //
item.$refs.pieChartRef.drawPie(item.dataArr[0]) item.$refs.pieChartRef.drawPie(item.dataArr[0])
} }
} }

View File

@ -267,7 +267,7 @@ export default {
presentation: [], presentation: [],
startValue: '', startValue: '',
timeMode: '', timeMode: '',
type: [], type: ['机动车', '非机动车', '行人'],
startSection: [], startSection: [],
endSection: [], endSection: [],
componentType: '', componentType: '',
@ -655,8 +655,8 @@ export default {
OnSceneN() { OnSceneN() {
var ip = window.location.host; var ip = window.location.host;
this.ipData = 'http://' + ip.split(':')[0] + ':5000'; this.ipData = 'http://' + ip.split(':')[0] + ':5000';
// document.getElementById('mapModule').contentWindow.getIpData(this.ipData); document.getElementById('mapModule').contentWindow.getIpData(this.ipData);
document.getElementById('mapModule').contentWindow.getIpData('http://172.16.1.168:5000'); // document.getElementById('mapModule').contentWindow.getIpData('http://172.16.1.168:5000');
if (this.$route.query.type == '离线视频') { if (this.$route.query.type == '离线视频') {
document.getElementById('mapModule').contentWindow.lixianVideo(JSON.stringify(this.analysis)); document.getElementById('mapModule').contentWindow.lixianVideo(JSON.stringify(this.analysis));
} }
@ -763,7 +763,7 @@ export default {
arr = res.data.data.type.split(','); arr = res.data.data.type.split(',');
this.componentForm.type = arr; this.componentForm.type = arr;
} else { } else {
this.componentForm.type = []; this.componentForm.type = ['机动车', '非机动车', '行人'];
} }
console.log('this.componentForm', this.componentForm); console.log('this.componentForm', this.componentForm);
} }
@ -863,7 +863,7 @@ export default {
arr = res.data.data.type.split(','); arr = res.data.data.type.split(',');
this.componentForm.type = arr; this.componentForm.type = arr;
} else { } else {
this.componentForm.type = []; // this.componentForm.type = ['', '', ''];
} }
} }
}); });