Merge branch 'main' of http://39.101.199.1:8888/gongjiale/gangkou
This commit is contained in:
commit
aff024c6f9
|
@ -49,20 +49,17 @@ export default {
|
||||||
watch: {
|
watch: {
|
||||||
queryParam: {
|
queryParam: {
|
||||||
handler: function (newVal, oldVal) {
|
handler: function (newVal, oldVal) {
|
||||||
this.refreshDebounce();
|
this.refresh();
|
||||||
},
|
},
|
||||||
deep: true,
|
deep: true,
|
||||||
},
|
},
|
||||||
selectedDept: {
|
selectedDept: {
|
||||||
handler: function (newVal, oldVal) {
|
handler: function (newVal, oldVal) {
|
||||||
this.refreshDebounce();
|
this.refresh();
|
||||||
},
|
},
|
||||||
deep: true,
|
deep: true,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
mounted() {
|
|
||||||
this.refreshDebounce = debounce(this.refresh, 100);
|
|
||||||
},
|
|
||||||
methods: {
|
methods: {
|
||||||
refresh() {
|
refresh() {
|
||||||
if (this.selectedDept && this.selectedDept.sn && this.queryParam) {
|
if (this.selectedDept && this.selectedDept.sn && this.queryParam) {
|
||||||
|
@ -81,12 +78,17 @@ export default {
|
||||||
this.chartData.Xdata = axisData;
|
this.chartData.Xdata = axisData;
|
||||||
this.chartData.Ydata = seriesData;
|
this.chartData.Ydata = seriesData;
|
||||||
} else {
|
} else {
|
||||||
this.chartData.Xdata = [];
|
this.resetChart();
|
||||||
this.chartData.Ydata = [];
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
} else {
|
||||||
|
this.resetChart();
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
resetChart() {
|
||||||
|
this.chartData.Xdata = [];
|
||||||
|
this.chartData.Ydata = [];
|
||||||
|
},
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
:center="position"
|
:center="position"
|
||||||
:zoom="16" :scroll-wheel-zoom=true
|
:zoom="16" :scroll-wheel-zoom=true
|
||||||
style="width: auto; height: 40vh;"
|
style="width: auto; height: 40vh;"
|
||||||
:map-type="currentMapType"
|
:map-type="currentMapType"
|
||||||
>
|
>
|
||||||
<bm-map-type
|
<bm-map-type
|
||||||
:map-types="['BMAP_NORMAL_MAP', 'BMAP_HYBRID_MAP']"
|
:map-types="['BMAP_NORMAL_MAP', 'BMAP_HYBRID_MAP']"
|
||||||
|
@ -32,15 +32,15 @@ export default {
|
||||||
computed: {
|
computed: {
|
||||||
position() {
|
position() {
|
||||||
return {
|
return {
|
||||||
lng: parseFloat(this.selectedDept.longitude),
|
lng: parseFloat(this.selectedDept?.longitude),
|
||||||
lat: parseFloat(this.selectedDept.latitude),
|
lat: parseFloat(this.selectedDept?.latitude),
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
currentMapType: 'BMAP_HYBRID_MAP',
|
currentMapType: 'BMAP_HYBRID_MAP',
|
||||||
|
|
||||||
}}
|
}}
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
|
@ -87,7 +87,12 @@ export default {
|
||||||
refresh() {
|
refresh() {
|
||||||
if (this.queryParam.deptId) {
|
if (this.queryParam.deptId) {
|
||||||
getDeviceList(this.queryParam.deptId, this.pager).then((res) => {
|
getDeviceList(this.queryParam.deptId, this.pager).then((res) => {
|
||||||
if (res.code === 200 && res.rows.length > 0) {
|
if (res.code === 200) {
|
||||||
|
if (res.rows.length === 0) {
|
||||||
|
this.tableData = [];
|
||||||
|
this.deptSelect(null);
|
||||||
|
return;
|
||||||
|
}
|
||||||
this.tableData = res.rows;
|
this.tableData = res.rows;
|
||||||
this.radio = res.rows[0].id;
|
this.radio = res.rows[0].id;
|
||||||
this.pager.total = res.total;
|
this.pager.total = res.total;
|
||||||
|
|
Loading…
Reference in New Issue