邓洁: 修改bug

This commit is contained in:
邓洁
2023-12-30 21:42:08 +08:00
parent a5602f03cd
commit 043a22cabb
5 changed files with 37 additions and 22 deletions

View File

@@ -6,18 +6,19 @@
<div class="input-fan"><span>风速</span>{{ windSpeed }}m/s</div>
</div>
</div>
<item-info
v-for="item in airList"
:key="item.equipmentId"
:wp="item"
:icon="item.icon"
:name="item.name"
:unit="item.unit"
@click="handleOpenAirChart(item)"
/>
<item-info
v-for="item in airList"
:key="item.equipmentId"
:wp="item"
:icon="item.icon"
:name="item.name"
:unit="item.unit"
@click="handleOpenAirChart(item)"
/>
<div class="digital-tunnel">
<el-dialog :close-on-click-modal="false" v-model="isWindSpeedVisited" :title="'风速监控数据'" width="2175px" :modal="false">
<el-dialog :close-on-click-modal="false" v-model="isWindSpeedVisited" :title="'风速监控数据'" width="2175px"
:modal="false">
<div class="left-top-icon"></div>
<div class="right-top-icon"></div>
<div class="chat-dialog">
@@ -36,7 +37,8 @@
</el-dialog>
</div>
<div class="digital-tunnel">
<el-dialog :close-on-click-modal="false" v-model="isAirVisited" :title="airTitle+'监控数据'" width="2175px" :modal="false">
<el-dialog :close-on-click-modal="false" v-model="isAirVisited" :title="airTitle+'监控数据'" width="2175px"
:modal="false">
<div class="left-top-icon"></div>
<div class="right-top-icon"></div>
<div class="chat-dialog">
@@ -88,10 +90,12 @@ watch(() => props.list, (now) => {
})
}, {deep: true});
watch(() => props.airData, (now) => {
if(now.sensorList.length===0){
airList.value=[]
}else {
getAirInfo(now.sensorList)
if (now.sensorList !== null) {
if (now.sensorList.length === 0) {
airList.value = []
} else {
getAirInfo(now.sensorList)
}
}
}, {deep: true});
const getChartInfo = (equipmentId) => {
@@ -236,7 +240,7 @@ const initChart = (type, values) => {
xAxis: {
type: 'category',
// data: ['00:00', '01:00', '02:00', '03:00', '04:00', '05:00', '06:00', '07:00', '08:00', '09:00', '10:00', '11:00', '12:00', '13:00', '14:00', '15:00', '16:00', '17:00', '18:00', '19:00', '20:00', '21:00', '22:00', '23:00', '24:00'],
data:type,
data: type,
axisLabel: {
textStyle: {
fontSize: 45,
@@ -258,7 +262,7 @@ const initChart = (type, values) => {
series: [
{
// data: [3, 85, 47, 92, 17, 76, 69, 25, 56, 12, 89, 34, 71, 43, 67, 20, 98, 72, 19, 61, 31, 49, 81, 63],
data:values,
data: values,
type: 'line',
smooth: true,
symbolSize: 24,
@@ -331,7 +335,7 @@ const initAirChart = (type, values) => {
xAxis: {
type: 'category',
// data: ['00:00', '01:00', '02:00', '03:00', '04:00', '05:00', '06:00', '07:00', '08:00', '09:00', '10:00', '11:00', '12:00', '13:00', '14:00', '15:00', '16:00', '17:00', '18:00', '19:00', '20:00', '21:00', '22:00', '23:00', '24:00'],
data:type,
data: type,
axisLabel: {
textStyle: {
fontSize: 45,
@@ -353,7 +357,7 @@ const initAirChart = (type, values) => {
series: [
{
// data: [56, 12, 89, 34, 71, 43, 67, 20, 98, 72, 19, 61, 3, 85, 47, 92, 17, 76, 69, 25, 31, 49, 81, 63],
data:values,
data: values,
type: 'line',
smooth: true,
symbolSize: 24,

View File

@@ -234,9 +234,10 @@ const getImageUrl = (name) => {
}
#used-ele {
//flex:1;
cursor: pointer;
width: 830px;
height: 373px;
//height: 373px;
color: aliceblue;
position: absolute;
top: 1220px;

View File

@@ -80,6 +80,9 @@ const handleGoTunnelMgr = () => {
router.push("/tunnel/" + form.value.siteId + "/" + type + "/" + userId);
};
const handleSave = async () => {
if(form.value.constructionLength==null){
form.value.constructionLength=0
}
const data = {
tunnelId: tunnelId,
tunnelName: form.value.tunnelName,

View File

@@ -47,7 +47,7 @@ const authStore = useAuthStore();
const loginForm = reactive({
// username: "admin",
password: "123456",
username: "admin",
username: "administrator",
// password: "",
code: "",
uuid: "",

View File

@@ -237,7 +237,7 @@ const manageSelect = (index) => {
}
} else if (index == '隧道管理') {
if (currentSiteId.value && currentUserId.value) {
router.push("/tunnel/" + currentSiteId.value + '/i/' + currentUserId.value);
router.push("/tunnel/" + currentSiteId.value + '/i'+'/' + currentUserId.value);
}
} else if (index == '用户管理') {
if (currentSiteId.value) {
@@ -340,6 +340,13 @@ initWebSocket();
// getTunnelPreview();
</script>
<style lang="scss">
//.el-drawer__body{
// width: 100%;
// display: flex!important;
// flex-direction: column!important;
// flex: 1;
// height: 100%;
//}
.el-dropdown__popper.el-popper {
background: transparent;
//border: none;