bug
This commit is contained in:
commit
f246d6e7f8
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because one or more lines are too long
Binary file not shown.
|
@ -0,0 +1 @@
|
||||||
|
http://172.16.1.168:5000
|
|
@ -0,0 +1,20 @@
|
||||||
|
{
|
||||||
|
"code": 200,
|
||||||
|
"msg": "成功",
|
||||||
|
"data": [{
|
||||||
|
"graphicId": "35fb0709596841e5b005fb1bc33a0fa4",
|
||||||
|
"graphicName": "测试区域",
|
||||||
|
"graphicType": "区域",
|
||||||
|
"coordinate": "218.6106 984.2285,453.5649 994.1006,267.9708 820.3528,218.6106 984.2285"
|
||||||
|
}, {
|
||||||
|
"graphicId": "957eb7cba61240f5a099ee6080bd29f0",
|
||||||
|
"graphicName": "测试路线2",
|
||||||
|
"graphicType": "轨迹",
|
||||||
|
"coordinate": "157.404 236.9287,179.1225 260.6216,192.9433 300.1097,202.8154 329.7258,214.6618 357.3675,222.5594 392.9068,236.3803 424.4973,258.0987 446.2157,289.6892 465.9598,317.3309 485.7039,350.8958 503.4735,382.4863 509.3967,420 517.2943,467.3858 521.2432,508.8483 525.192,556.234 525.192,599.671 525.192,631.2614 525.192,662.8519 513.3455,690.4936 499.5247,712.2121 477.8062,724.0585 444.2413,728.0073 412.6508,745.777 386.9836,775.3931 377.1115,806.9836 379.0859"
|
||||||
|
}, {
|
||||||
|
"graphicId": "7c24aa16e12840859164780d71827f5f",
|
||||||
|
"graphicName": "测试线2",
|
||||||
|
"graphicType": "断面",
|
||||||
|
"coordinate": "437.7697 642.6563,880.0366 737.4278"
|
||||||
|
}]
|
||||||
|
}
|
|
@ -0,0 +1 @@
|
||||||
|
{"Keys":["com.unity.services.core.version"],"Values":[{"m_Value":"1.3.1","m_IsReadOnly":true}]}
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -1 +1 @@
|
||||||
http://127.0.0.1:5000
|
ws://172.16.1.168:10087/
|
|
@ -131,6 +131,13 @@
|
||||||
function getDianwei(string){
|
function getDianwei(string){
|
||||||
unityInstanceA.SendMessage('GameManager','ReceptionVideoIdSececeTwo',JSON.stringify(string));
|
unityInstanceA.SendMessage('GameManager','ReceptionVideoIdSececeTwo',JSON.stringify(string));
|
||||||
}
|
}
|
||||||
|
//获取ip
|
||||||
|
function getIpData(string){
|
||||||
|
console.log("获取ip",string)
|
||||||
|
if(unityInstanceA!=null){
|
||||||
|
unityInstanceA.SendMessage('GameManager','SetIP', string);
|
||||||
|
}
|
||||||
|
}
|
||||||
function setPOS(string){
|
function setPOS(string){
|
||||||
console.log(string,'123');
|
console.log(string,'123');
|
||||||
unityInstanceA.SendMessage('GameManager','WebToUnityDot',JSON.stringify(string));
|
unityInstanceA.SendMessage('GameManager','WebToUnityDot',JSON.stringify(string));
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
<span
|
<span
|
||||||
style="width: 10px;height:10px;border-radius: 50%;background-color: #3297ff;display: inline-block;vertical-align: middle;margin-right: 8px;"
|
style="width: 10px;height:10px;border-radius: 50%;background-color: #3297ff;display: inline-block;vertical-align: middle;margin-right: 8px;"
|
||||||
></span>
|
></span>
|
||||||
<span style="font-size:18px;">{{ componentName + '-' + chartName + '-' + '均值图' }}</span>
|
<span style="font-size:18px;">{{ componentName + '-' + chartName + '-' + '均值图'+'-'+status }}</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div id="barChart" ref="barChart" style="width: 100%; height: 300px"></div>
|
<div id="barChart" ref="barChart" style="width: 100%; height: 300px"></div>
|
||||||
|
@ -31,7 +31,10 @@ export default {
|
||||||
},
|
},
|
||||||
chartName: {
|
chartName: {
|
||||||
type: String
|
type: String
|
||||||
}
|
},
|
||||||
|
status: {
|
||||||
|
type: String
|
||||||
|
},
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {};
|
return {};
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
<span
|
<span
|
||||||
style="width: 10px;height:10px;border-radius: 50%;background-color: #3297ff;display: inline-block;vertical-align: middle;margin-right: 8px;"
|
style="width: 10px;height:10px;border-radius: 50%;background-color: #3297ff;display: inline-block;vertical-align: middle;margin-right: 8px;"
|
||||||
></span>
|
></span>
|
||||||
<span style="font-size:18px;">{{ componentName + '-' + chartName + '-' + '柱状图' }}</span>
|
<span style="font-size:18px;">{{ componentName + '-' + chartName + '-' + '柱状图'+'-'+status }}</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div id="barChart" ref="barChart" style="width:100%;height:300px;"></div>
|
<div id="barChart" ref="barChart" style="width:100%;height:300px;"></div>
|
||||||
|
@ -125,13 +125,13 @@ export default {
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
// this.xData = this.typeValue.type_data.map(ele => {
|
this.xData = this.typeValue.type_data.map(ele => {
|
||||||
// return ele.name;
|
return ele.name;
|
||||||
// });
|
});
|
||||||
// this.yData = this.typeValue.type_data.map(ele => {
|
this.yData = this.typeValue.type_data.map(ele => {
|
||||||
// return ele.quantity;
|
return ele.quantity;
|
||||||
// });
|
});
|
||||||
// this.drawBar();
|
this.drawBar();
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
typeValue: {
|
typeValue: {
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
<span
|
<span
|
||||||
style="width: 10px;height:10px;border-radius: 50%;background-color: #3297ff;display: inline-block;vertical-align: middle;margin-right: 8px;"
|
style="width: 10px;height:10px;border-radius: 50%;background-color: #3297ff;display: inline-block;vertical-align: middle;margin-right: 8px;"
|
||||||
></span>
|
></span>
|
||||||
<span style="font-size:18px;">{{this.componentName + '-' + this.chartName + '-' + '曲线图', }}</span>
|
<span style="font-size:18px;">{{this.componentName + '-' + this.chartName + '-' + '曲线图'+'-'+status, }}</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div id="lineChart" ref="lineChart" style="width: 100%; height: 300px"></div>
|
<div id="lineChart" ref="lineChart" style="width: 100%; height: 300px"></div>
|
||||||
|
@ -147,12 +147,13 @@ export default {
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
this.drawLine();
|
// this.drawLine();
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
list: {
|
list: {
|
||||||
handler(newVal) {
|
handler(newVal) {
|
||||||
if (newVal ) {
|
if (newVal ) {
|
||||||
|
|
||||||
// x轴的数据
|
// x轴的数据
|
||||||
this.xData = newVal.map(val => {
|
this.xData = newVal.map(val => {
|
||||||
return val.time;
|
return val.time;
|
||||||
|
@ -241,7 +242,7 @@ export default {
|
||||||
show: true,
|
show: true,
|
||||||
confine: true
|
confine: true
|
||||||
};
|
};
|
||||||
console.log("newVal",newVal)
|
// console.log("newVal",newVal)
|
||||||
this.series[0].data = newVal.map(val => {
|
this.series[0].data = newVal.map(val => {
|
||||||
return val.speed;
|
return val.speed;
|
||||||
});
|
});
|
||||||
|
@ -288,9 +289,6 @@ export default {
|
||||||
},
|
},
|
||||||
immediate: true
|
immediate: true
|
||||||
},
|
},
|
||||||
typeValue: {
|
|
||||||
handler(newVal) {}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
<span
|
<span
|
||||||
style="width: 10px;height:10px;border-radius: 50%;background-color: #3297ff;display: inline-block;vertical-align: middle;margin-right: 8px;"
|
style="width: 10px;height:10px;border-radius: 50%;background-color: #3297ff;display: inline-block;vertical-align: middle;margin-right: 8px;"
|
||||||
></span>
|
></span>
|
||||||
<span style="font-size:18px;">{{this.componentName + '-' + this.chartName + '-' + '饼状图', }}</span>
|
<span style="font-size:18px;">{{this.componentName + '-' + this.chartName + '-' + '饼状图'+'-'+status, }}</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div id="pieChart" ref="pieChart" style="width:100%;height:300px;"></div>
|
<div id="pieChart" ref="pieChart" style="width:100%;height:300px;"></div>
|
||||||
|
@ -30,6 +30,9 @@ export default {
|
||||||
},
|
},
|
||||||
typeValue: {
|
typeValue: {
|
||||||
type: Object
|
type: Object
|
||||||
|
},
|
||||||
|
status:{
|
||||||
|
type:String
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
|
@ -121,15 +124,15 @@ export default {
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
// if (this.typeValue) {
|
if (this.typeValue) {
|
||||||
// this.typeValue.type_data.forEach(ele => {
|
this.typeValue.type_data.forEach(ele => {
|
||||||
// this.seriesData.push({
|
this.seriesData.push({
|
||||||
// name: ele.name,
|
name: ele.name,
|
||||||
// value: ele.quantity
|
value: ele.quantity
|
||||||
// });
|
});
|
||||||
// });
|
});
|
||||||
// this.drawPie();
|
this.drawPie();
|
||||||
// }
|
}
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
// 监听单个的数据
|
// 监听单个的数据
|
||||||
|
@ -146,9 +149,10 @@ export default {
|
||||||
value: ele.quantity
|
value: ele.quantity
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
// this.drawPie();
|
this.drawPie();
|
||||||
}
|
}
|
||||||
}
|
},
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
|
@ -24,6 +24,18 @@
|
||||||
<span v-if="scope.row.type == 'Person'">行人</span>
|
<span v-if="scope.row.type == 'Person'">行人</span>
|
||||||
<span v-if="scope.row.type == 'Motor Vehicle'">机动车</span>
|
<span v-if="scope.row.type == 'Motor Vehicle'">机动车</span>
|
||||||
<span v-if="scope.row.type == 'Non_Motor'">非机动车</span>
|
<span v-if="scope.row.type == 'Non_Motor'">非机动车</span>
|
||||||
|
<span v-if="scope.row.type == 'Motor Vehicle|Non_Motor'">机动车|非机动车</span>
|
||||||
|
<span v-if="scope.row.type == 'Motor Vehicle|Person'">机动车|行人</span>
|
||||||
|
<span v-if="scope.row.type == 'Person|Non_Motor'">行人|非机动车</span>
|
||||||
|
<span v-if="scope.row.type == 'Person|Non_Motor|Motor Vehicle'">行人|非机动车|机动车</span>
|
||||||
|
<span v-if="scope.row.type == 'Person|Motor Vehicle|Non_Motor'">行人|非机动车|机动车</span>
|
||||||
|
<span v-if="scope.row.type == 'Non_Motor|Person|Motor Vehicle'">行人|非机动车|机动车</span>
|
||||||
|
<span v-if="scope.row.type == 'Non_Motor|Motor Vehicle|Person'">行人|非机动车|机动车</span>
|
||||||
|
<span v-if="scope.row.type == 'Motor Vehicle|Non_Motor|Person'">行人|非机动车|机动车</span>
|
||||||
|
<span v-if="scope.row.type == 'Motor Vehicle|Person|Non_Motor'">行人|非机动车|机动车</span>
|
||||||
|
<!-- <span v-if="scope.row.type == 'Motor Vehicle|Motor Vehicle|Person'">行人|非机动车|机动车</span> -->
|
||||||
|
<span v-if="scope.row.type == 'Non_Motor|Motor Vehicle'">非机动车|机动车</span>
|
||||||
|
<span v-if="scope.row.type == 'Non_Motor|Person'">非机动车|行人</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column align="center" prop="n_stay" label="存车数"></el-table-column>
|
<el-table-column align="center" prop="n_stay" label="存车数"></el-table-column>
|
||||||
|
@ -46,6 +58,18 @@
|
||||||
<span v-if="scope.row.type == 'Person'">行人</span>
|
<span v-if="scope.row.type == 'Person'">行人</span>
|
||||||
<span v-if="scope.row.type == 'Motor Vehicle'">机动车</span>
|
<span v-if="scope.row.type == 'Motor Vehicle'">机动车</span>
|
||||||
<span v-if="scope.row.type == 'Non_Motor'">非机动车</span>
|
<span v-if="scope.row.type == 'Non_Motor'">非机动车</span>
|
||||||
|
<span v-if="scope.row.type == 'Motor Vehicle|Non_Motor'">机动车|非机动车</span>
|
||||||
|
<span v-if="scope.row.type == 'Motor Vehicle|Person'">机动车|行人</span>
|
||||||
|
<span v-if="scope.row.type == 'Person|Non_Motor'">行人|非机动车</span>
|
||||||
|
<span v-if="scope.row.type == 'Person|Non_Motor|Motor Vehicle'">行人|非机动车|机动车</span>
|
||||||
|
<span v-if="scope.row.type == 'Person|Motor Vehicle|Non_Motor'">行人|非机动车|机动车</span>
|
||||||
|
<span v-if="scope.row.type == 'Non_Motor|Person|Motor Vehicle'">行人|非机动车|机动车</span>
|
||||||
|
<span v-if="scope.row.type == 'Non_Motor|Motor Vehicle|Person'">行人|非机动车|机动车</span>
|
||||||
|
<span v-if="scope.row.type == 'Motor Vehicle|Non_Motor|Person'">行人|非机动车|机动车</span>
|
||||||
|
<span v-if="scope.row.type == 'Motor Vehicle|Person|Non_Motor'">行人|非机动车|机动车</span>
|
||||||
|
<!-- <span v-if="scope.row.type == 'Motor Vehicle|Motor Vehicle|Person'">行人|非机动车|机动车</span> -->
|
||||||
|
<span v-if="scope.row.type == 'Non_Motor|Motor Vehicle'">非机动车|机动车</span>
|
||||||
|
<span v-if="scope.row.type == 'Non_Motor|Person'">非机动车|行人</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column align="center" prop="n_stay" label="存车数"></el-table-column>
|
<el-table-column align="center" prop="n_stay" label="存车数"></el-table-column>
|
||||||
|
@ -68,6 +92,18 @@
|
||||||
<span v-if="scope.row.type == 'Person'">行人</span>
|
<span v-if="scope.row.type == 'Person'">行人</span>
|
||||||
<span v-if="scope.row.type == 'Motor Vehicle'">机动车</span>
|
<span v-if="scope.row.type == 'Motor Vehicle'">机动车</span>
|
||||||
<span v-if="scope.row.type == 'Non_Motor'">非机动车</span>
|
<span v-if="scope.row.type == 'Non_Motor'">非机动车</span>
|
||||||
|
<span v-if="scope.row.type == 'Motor Vehicle|Non_Motor'">机动车|非机动车</span>
|
||||||
|
<span v-if="scope.row.type == 'Motor Vehicle|Person'">机动车|行人</span>
|
||||||
|
<span v-if="scope.row.type == 'Person|Non_Motor'">行人|非机动车</span>
|
||||||
|
<span v-if="scope.row.type == 'Person|Non_Motor|Motor Vehicle'">行人|非机动车|机动车</span>
|
||||||
|
<span v-if="scope.row.type == 'Person|Motor Vehicle|Non_Motor'">行人|非机动车|机动车</span>
|
||||||
|
<span v-if="scope.row.type == 'Non_Motor|Person|Motor Vehicle'">行人|非机动车|机动车</span>
|
||||||
|
<span v-if="scope.row.type == 'Non_Motor|Motor Vehicle|Person'">行人|非机动车|机动车</span>
|
||||||
|
<span v-if="scope.row.type == 'Motor Vehicle|Non_Motor|Person'">行人|非机动车|机动车</span>
|
||||||
|
<span v-if="scope.row.type == 'Motor Vehicle|Person|Non_Motor'">行人|非机动车|机动车</span>
|
||||||
|
<!-- <span v-if="scope.row.type == 'Motor Vehicle|Motor Vehicle|Person'">行人|非机动车|机动车</span> -->
|
||||||
|
<span v-if="scope.row.type == 'Non_Motor|Motor Vehicle'">非机动车|机动车</span>
|
||||||
|
<span v-if="scope.row.type == 'Non_Motor|Person'">非机动车|行人</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column align="center" prop="in_flow" label="驶入流量"></el-table-column>
|
<el-table-column align="center" prop="in_flow" label="驶入流量"></el-table-column>
|
||||||
|
|
|
@ -24,6 +24,18 @@
|
||||||
<span v-if="scope.row.type == 'Person'">行人</span>
|
<span v-if="scope.row.type == 'Person'">行人</span>
|
||||||
<span v-if="scope.row.type == 'Motor Vehicle'">机动车</span>
|
<span v-if="scope.row.type == 'Motor Vehicle'">机动车</span>
|
||||||
<span v-if="scope.row.type == 'Non_Motor'">非机动车</span>
|
<span v-if="scope.row.type == 'Non_Motor'">非机动车</span>
|
||||||
|
<span v-if="scope.row.type == 'Motor Vehicle|Non_Motor'">机动车|非机动车</span>
|
||||||
|
<span v-if="scope.row.type == 'Motor Vehicle|Person'">机动车|行人</span>
|
||||||
|
<span v-if="scope.row.type == 'Person|Non_Motor'">行人|非机动车</span>
|
||||||
|
<span v-if="scope.row.type == 'Person|Non_Motor|Motor Vehicle'">行人|非机动车|机动车</span>
|
||||||
|
<span v-if="scope.row.type == 'Person|Motor Vehicle|Non_Motor'">行人|非机动车|机动车</span>
|
||||||
|
<span v-if="scope.row.type == 'Non_Motor|Person|Motor Vehicle'">行人|非机动车|机动车</span>
|
||||||
|
<span v-if="scope.row.type == 'Non_Motor|Motor Vehicle|Person'">行人|非机动车|机动车</span>
|
||||||
|
<span v-if="scope.row.type == 'Motor Vehicle|Non_Motor|Person'">行人|非机动车|机动车</span>
|
||||||
|
<span v-if="scope.row.type == 'Motor Vehicle|Person|Non_Motor'">行人|非机动车|机动车</span>
|
||||||
|
<!-- <span v-if="scope.row.type == 'Motor Vehicle|Motor Vehicle|Person'">行人|非机动车|机动车</span> -->
|
||||||
|
<span v-if="scope.row.type == 'Non_Motor|Motor Vehicle'">非机动车|机动车</span>
|
||||||
|
<span v-if="scope.row.type == 'Non_Motor|Person'">非机动车|行人</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column align="center" prop="n_stay" label="存车数"></el-table-column>
|
<el-table-column align="center" prop="n_stay" label="存车数"></el-table-column>
|
||||||
|
@ -45,6 +57,18 @@
|
||||||
<span v-if="scope.row.type == 'Person'">行人</span>
|
<span v-if="scope.row.type == 'Person'">行人</span>
|
||||||
<span v-if="scope.row.type == 'Motor Vehicle'">机动车</span>
|
<span v-if="scope.row.type == 'Motor Vehicle'">机动车</span>
|
||||||
<span v-if="scope.row.type == 'Non_Motor'">非机动车</span>
|
<span v-if="scope.row.type == 'Non_Motor'">非机动车</span>
|
||||||
|
<span v-if="scope.row.type == 'Motor Vehicle|Non_Motor'">机动车|非机动车</span>
|
||||||
|
<span v-if="scope.row.type == 'Motor Vehicle|Person'">机动车|行人</span>
|
||||||
|
<span v-if="scope.row.type == 'Person|Non_Motor'">行人|非机动车</span>
|
||||||
|
<span v-if="scope.row.type == 'Person|Non_Motor|Motor Vehicle'">行人|非机动车|机动车</span>
|
||||||
|
<span v-if="scope.row.type == 'Person|Motor Vehicle|Non_Motor'">行人|非机动车|机动车</span>
|
||||||
|
<span v-if="scope.row.type == 'Non_Motor|Person|Motor Vehicle'">行人|非机动车|机动车</span>
|
||||||
|
<span v-if="scope.row.type == 'Non_Motor|Motor Vehicle|Person'">行人|非机动车|机动车</span>
|
||||||
|
<span v-if="scope.row.type == 'Motor Vehicle|Non_Motor|Person'">行人|非机动车|机动车</span>
|
||||||
|
<span v-if="scope.row.type == 'Motor Vehicle|Person|Non_Motor'">行人|非机动车|机动车</span>
|
||||||
|
<!-- <span v-if="scope.row.type == 'Motor Vehicle|Motor Vehicle|Person'">行人|非机动车|机动车</span> -->
|
||||||
|
<span v-if="scope.row.type == 'Non_Motor|Motor Vehicle'">非机动车|机动车</span>
|
||||||
|
<span v-if="scope.row.type == 'Non_Motor|Person'">非机动车|行人</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column align="center" prop="in_flow" label="入流流量"></el-table-column>
|
<el-table-column align="center" prop="in_flow" label="入流流量"></el-table-column>
|
||||||
|
|
|
@ -67,7 +67,7 @@ export default {
|
||||||
splitLine: { show: false },
|
splitLine: { show: false },
|
||||||
axisLine: { lineStyle: { color: '#c8c8c8', width: 1 }, show: true },
|
axisLine: { lineStyle: { color: '#c8c8c8', width: 1 }, show: true },
|
||||||
type: 'category',
|
type: 'category',
|
||||||
data: this.startData
|
data: ['gate1','gate2']
|
||||||
},
|
},
|
||||||
visualMap: [
|
visualMap: [
|
||||||
{
|
{
|
||||||
|
|
|
@ -70,7 +70,7 @@
|
||||||
<span
|
<span
|
||||||
style="width: 10px;height:10px;border-radius: 50%;background-color: #3297ff;display: inline-block;vertical-align: middle;margin-right: 8px;"
|
style="width: 10px;height:10px;border-radius: 50%;background-color: #3297ff;display: inline-block;vertical-align: middle;margin-right: 8px;"
|
||||||
></span>
|
></span>
|
||||||
<span style="font-size:18px;">{{ this.chartName + '-' + this.componentName + '-' + '表格' }}</span>
|
<span style="font-size:18px;">{{ this.chartName + '-' + this.componentName + '-' + '表格'+'-'+triggerType }}</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="tableTime">
|
<div class="tableTime">
|
||||||
{{ dataArr[0].time }}
|
{{ dataArr[0].time }}
|
||||||
|
@ -179,7 +179,9 @@ export default {
|
||||||
watch: {
|
watch: {
|
||||||
// 监听触发数据
|
// 监听触发数据
|
||||||
dataArr: {
|
dataArr: {
|
||||||
handler(newVal) {},
|
handler(newVal) {
|
||||||
|
console.log("dataArr",newVal)
|
||||||
|
},
|
||||||
|
|
||||||
immediate: true
|
immediate: true
|
||||||
},
|
},
|
||||||
|
|
|
@ -735,7 +735,11 @@ export default {
|
||||||
// this.$set(this.coordinateTableData, index, row);
|
// this.$set(this.coordinateTableData, index, row);
|
||||||
},
|
},
|
||||||
OnSceneload(newV) {
|
OnSceneload(newV) {
|
||||||
this.$refs.analysisWeb.contentWindow.getDianwei(this.$route.query.id);
|
var ip = window.location.host;
|
||||||
|
this.ipData = 'http://' + ip.split(':')[0] + ':5000';
|
||||||
|
document.getElementById('mapModule').contentWindow.getIpData(this.ipData);
|
||||||
|
this.$refs.analysisWeb.contentWindow.getIpData('http://172.16.1.168:5000');
|
||||||
|
// this.$refs.analysisWeb.contentWindow.getDianwei(this.$route.query.id);
|
||||||
this.unityDone = true;
|
this.unityDone = true;
|
||||||
},
|
},
|
||||||
handleDeleteDian(row, idx) {
|
handleDeleteDian(row, idx) {
|
||||||
|
@ -1040,7 +1044,10 @@ export default {
|
||||||
// document.getElementById("mapModule").contentWindow.getDestination(1)
|
// document.getElementById("mapModule").contentWindow.getDestination(1)
|
||||||
const clientId = 'test_id_' + String(new Date().getTime()); // 用户名
|
const clientId = 'test_id_' + String(new Date().getTime()); // 用户名
|
||||||
// const host = 'ws://49.234.27.18:10087/'; // 一个测试用url,改成给的,ws://broker.emqx.io:8083/mqtt
|
// const host = 'ws://49.234.27.18:10087/'; // 一个测试用url,改成给的,ws://broker.emqx.io:8083/mqtt
|
||||||
const host = 'ws://172.16.1.168:10087/';
|
var ip = window.location.host.split(":")[0];
|
||||||
|
console.log("ip",ip)
|
||||||
|
const host = `ws://${ip}:10087`;
|
||||||
|
// const host = 'ws://172.16.1.168:10087/';
|
||||||
const options = {
|
const options = {
|
||||||
// 配置
|
// 配置
|
||||||
// 测试:订阅本机IP
|
// 测试:订阅本机IP
|
||||||
|
|
|
@ -65,6 +65,9 @@ export default {
|
||||||
|
|
||||||
const clientId = "test_id_" + String(new Date().getTime()); // 用户名
|
const clientId = "test_id_" + String(new Date().getTime()); // 用户名
|
||||||
// const host = 'ws://49.234.27.18:10087/'; // 一个测试用url,改成给的,ws://broker.emqx.io:8083/mqtt
|
// const host = 'ws://49.234.27.18:10087/'; // 一个测试用url,改成给的,ws://broker.emqx.io:8083/mqtt
|
||||||
|
var ip = window.location.host.split(":")[0];
|
||||||
|
console.log("ip",ip)
|
||||||
|
// const host = `ws://${ip}:10087`;
|
||||||
const host = 'ws://172.16.1.168:10087/';
|
const host = 'ws://172.16.1.168:10087/';
|
||||||
|
|
||||||
const options = {
|
const options = {
|
||||||
|
|
|
@ -409,7 +409,10 @@ export default {
|
||||||
getDataByMqtt(url, topic, cIdNum) {
|
getDataByMqtt(url, topic, cIdNum) {
|
||||||
const clientId = "test_id_" + String(new Date().getTime()); // 用户名
|
const clientId = "test_id_" + String(new Date().getTime()); // 用户名
|
||||||
// const host = 'ws://49.234.27.18:10087/'; // 一个测试用url,改成给的,ws://broker.emqx.io:8083/mqtt
|
// const host = 'ws://49.234.27.18:10087/'; // 一个测试用url,改成给的,ws://broker.emqx.io:8083/mqtt
|
||||||
const host = 'ws://172.16.1.168:10087/';
|
var ip = window.location.host.split(":")[0];
|
||||||
|
console.log("ip",ip)
|
||||||
|
const host = `ws://${ip}:10087`;
|
||||||
|
// const host = 'ws://172.16.1.168:10087/';
|
||||||
|
|
||||||
const options = {
|
const options = {
|
||||||
// 配置
|
// 配置
|
||||||
|
|
|
@ -172,7 +172,7 @@
|
||||||
<el-checkbox label="时间曲线图" name="type"></el-checkbox>
|
<el-checkbox label="时间曲线图" name="type"></el-checkbox>
|
||||||
<el-checkbox label="直方图" name="presentation" v-if="componentForm.componentType == '类型'"></el-checkbox>
|
<el-checkbox label="直方图" name="presentation" v-if="componentForm.componentType == '类型'"></el-checkbox>
|
||||||
<el-checkbox label="饼状图" name="presentation" v-if="componentForm.componentType == '类型'"></el-checkbox>
|
<el-checkbox label="饼状图" name="presentation" v-if="componentForm.componentType == '类型'"></el-checkbox>
|
||||||
<el-checkbox label="均值图" name="presentation" v-if="componentForm.componentType != '拥堵'"></el-checkbox>
|
<el-checkbox label="均值图" name="presentation" v-if="componentForm.componentType != '拥堵'||componentForm.componentType != '流量'||componentForm.componentType != '类型'||componentForm.componentType != '延误'"></el-checkbox>
|
||||||
</el-checkbox-group>
|
</el-checkbox-group>
|
||||||
<!-- <el-checkbox-group v-model="componentForm.presentation" @change="handlePresentation">
|
<!-- <el-checkbox-group v-model="componentForm.presentation" @change="handlePresentation">
|
||||||
<el-checkbox v-for="item in sectionals" :label="item.graphicName" :key="item.graphicId" >{{item.graphicName}}</el-checkbox>
|
<el-checkbox v-for="item in sectionals" :label="item.graphicName" :key="item.graphicId" >{{item.graphicName}}</el-checkbox>
|
||||||
|
@ -623,6 +623,7 @@ export default {
|
||||||
const temp = utf8decoder.decode(u8arr); // 将二进制数据转为字符串
|
const temp = utf8decoder.decode(u8arr); // 将二进制数据转为字符串
|
||||||
var detId = [];
|
var detId = [];
|
||||||
const msgN = JSON.parse(temp);
|
const msgN = JSON.parse(temp);
|
||||||
|
// console.log("trigger_msgN",msgN)
|
||||||
this.triggerListData = msgN;
|
this.triggerListData = msgN;
|
||||||
} catch (error) {}
|
} catch (error) {}
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in New Issue