@@ -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,
diff --git a/src/components/content/usedEle/UsedEle.vue b/src/components/content/usedEle/UsedEle.vue
index b390ecc..fc0e7af 100644
--- a/src/components/content/usedEle/UsedEle.vue
+++ b/src/components/content/usedEle/UsedEle.vue
@@ -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;
diff --git a/src/views/edit/edit.vue b/src/views/edit/edit.vue
index 37753e0..548fee6 100644
--- a/src/views/edit/edit.vue
+++ b/src/views/edit/edit.vue
@@ -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,
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 3c5eb24..b93c23c 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -47,7 +47,7 @@ const authStore = useAuthStore();
const loginForm = reactive({
// username: "admin",
password: "123456",
- username: "admin",
+ username: "administrator",
// password: "",
code: "",
uuid: "",
diff --git a/src/views/tunnel/index.vue b/src/views/tunnel/index.vue
index 41f9839..6d5d3d8 100644
--- a/src/views/tunnel/index.vue
+++ b/src/views/tunnel/index.vue
@@ -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();