Merge remote-tracking branch 'origin/master'

src/views/AIStation/VoiceCommandPage.vue

@@ -58,6 +58,14 @@ function loadData(){
     ipAddress: queryParams.value.ipAddress,
     macAddress: queryParams.value.macAddress,
   }
+  if(item.stationId === undefined || item.beginTime == null || item.endTime == null || item.ipAddress === undefined || item.macAddress === undefined){
+    item.stationId = ''
+    item.endTime = ''
+    item.beginTime = ''
+    item.ipAddress = ''
+    item.macAddress= ''
+  }
+
   console.log('item:',item)
   //查询数据
   getVoiceCommandsData(item).then(res => {
@@ -173,6 +181,7 @@ const handleCurrentChange = (val) => {
 };
 
 function handleDetail(row) {
+  singleDetails={}
   console.log('row:',row)
   singleDetails = row
   detailOpen.value = true
@@ -252,7 +261,7 @@ watch(
             :data="VoiceCommandData"
             border
             style="width: 98%;margin-left: 15px"
-            height="calc(85vh - 170px)"
+            height="calc(86.5vh - 170px)"
             :header-cell-class-name="tableHeaderClass"
             :row-class-name="tableBodyClass"
         >