Merge pull request '邓洁: 修改bug' (#213) from dengjie into dev

Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/213

src/components/content/airInfo/AirInfo.vue

@@ -17,7 +17,8 @@
     />
 
     <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,11 +90,13 @@ watch(() => props.list, (now) => {
   })
 }, {deep: true});
 watch(() => props.airData, (now) => {
+  if (now.sensorList !== null) {
     if (now.sensorList.length === 0) {
       airList.value = []
     } else {
       getAirInfo(now.sensorList)
     }
+  }
 }, {deep: true});
 const getChartInfo = (equipmentId) => {
   getEchartsInfo(equipmentId).then(res => {

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;

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,

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: "",

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();
 </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;