Merge branch 'dev' into dev_zyh

src/views/Booking/src/components/BookingTable/src/BookingTable.vue

@@ -136,33 +136,18 @@ const searchTableData = (data: any) => {
     })
     .then((res: any) => {
       if (res.code === 200) {
-        // 跳转detail页面
-        if (res.data.searchData.length == 1) {
-          router.push({
-            path: '/booking/detail',
-            query: {
-              a: res.data.searchData[0].__serial_no,
-              _schemas: res.data.searchData[0]._schemas
-            }
-          })
-        } else {
-          bookingTable.value.data = res.data.searchData || []
-          pageInfo.value.total = Number(res.data.rc)
-          tempSearch.value = res.data.tmp_search
+        bookingTable.value.data = res.data.searchData || []
+        pageInfo.value.total = Number(res.data.rc)
+        tableLoading.value = false
+        // 拥有所有字段的表格
+        setTimeout(() => {
+          allTable.value.columns = handleColumns(res.data.allColums, 'all')
+          allTable.value.data = res.data.searchData || []
+          // 为了让导出的表格列宽度自适应
           nextTick(() => {
-            tableRef.value && autoWidth(bookingTable.value, tableRef.value)
-            tableLoadingTableData.value = false
+            allTableRef.value && autoWidth(allTable.value, allTableRef.value)
           })
-          // 拥有所有字段的表格
-          setTimeout(() => {
-            allTable.value.columns = handleColumns(res.data.allColums, 'all')
-            allTable.value.data = res.data.searchData || []
-            // 为了让导出的表格列宽度自适应
-            nextTick(() => {
-              allTableRef.value && autoWidth(allTable.value, allTableRef.value)
-            })
-          }, 1000)
-        }
+        }, 1000)
       }
     })
 }

src/views/Dashboard/src/components/TopMap.vue

@@ -110,51 +110,12 @@ const init = () => {
             value: item.value
           })
         })
-      // testList.value.forEach((item: any) => {
-      //   MapDataList.value.push({
-      //     color: item.color,
-      //     name: item.name,
-      //     qandl: item.qandl,
-      //     textcolor: item.textcolor,
-      //     value: item.value
-      //   })
-      // })
 
       // 请求成功后添加标记，并动态添加重置按钮
       addMarkersToMap()
     }
   })
 }
-const testList = ref([
-  {
-    color: '#fff1e6',
-    name: 'CNNSA',
-    qandl: ['127.7', '35.13333333'],
-    textcolor: '#FFF',
-    value: '5'
-  },
-  {
-    color: '#ffe3cc',
-    name: 'CNTAO',
-    qandl: ['129.05', '35.13333333'],
-    textcolor: '#FFF',
-    value: '5'
-  },
-  {
-    color: '#ffd6b3',
-    name: 'CNDLC',
-    qandl: [-76.61666667, 39.28333333],
-    textcolor: '#FFF',
-    value: '5'
-  },
-  {
-    color: '#ffd6b3',
-    name: 'CNDLC',
-    qandl: [-86.61666667, 42.28333333],
-    textcolor: '#FFF',
-    value: '5'
-  }
-])
 onMounted(() => {
   init()
 })

src/views/Tracking/src/components/TrackingTable/src/TrackingTable.vue

@@ -233,33 +233,18 @@ const searchTableData = (data: any) => {
     })
     .then((res: any) => {
       if (res.code === 200) {
-        // 跳转detail页面
-        if (res.data.searchData.length == 1) {
-          router.push({
-            path: '/tracking/detail',
-            query: {
-              a: res.data.searchData[0].__serial_no,
-              _schemas: res.data.searchData[0]._schemas
-            }
-          })
-        } else {
-          trackingTable.value.data = res.data.searchData
-          pageInfo.value.total = Number(res.data.rc)
-          tempSearch.value = res.data.tmp_search
-
+        trackingTable.value.data = res.data.searchData
+        pageInfo.value.total = Number(res.data.rc)
+        tableLoading.value = false
+
+        // 拥有所有字段的表格
+        setTimeout(() => {
+          allTable.value.columns = handleColumns(res.data.allColums, 'all')
+          allTable.value.data = res.data.searchData
           nextTick(() => {
-            tableRef.value && autoWidth(trackingTable.value, tableRef.value)
+            allTableRef.value && autoWidth(allTable.value, allTableRef.value)
           })
-
-          // 拥有所有字段的表格
-          setTimeout(() => {
-            allTable.value.columns = handleColumns(res.data.allColums, 'all')
-            allTable.value.data = res.data.searchData
-            nextTick(() => {
-              allTableRef.value && autoWidth(allTable.value, allTableRef.value)
-            })
-          }, 1000)
-        }
+        }, 1000)
       }
     })
     .finally(() => {