From 9304911139d5b712ccb39f84ae10bb842bf46e1b Mon Sep 17 00:00:00 2001
From: blp <2962632571@qq.com>
Date: Wed, 1 Feb 2023 18:15:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9page-container?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/iot-card/CardManagement/Detail/index.vue |  6 +++---
 src/views/iot-card/CardManagement/index.vue        | 11 ++++-------
 src/views/iot-card/Dashboard/index.vue             |  6 +++---
 src/views/iot-card/Home/index.vue                  |  4 ++--
 src/views/iot-card/Recharge/index.vue              |  6 +++---
 5 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/src/views/iot-card/CardManagement/Detail/index.vue b/src/views/iot-card/CardManagement/Detail/index.vue
index 3e1a330d..fffa20e5 100644
--- a/src/views/iot-card/CardManagement/Detail/index.vue
+++ b/src/views/iot-card/CardManagement/Detail/index.vue
@@ -1,6 +1,6 @@
 <!-- 物联卡查看 -->
 <template>
-    <div class="page-container">
+    <page-container>
         <!-- 新增、编辑 -->
         <Save
             v-if="visible"
@@ -117,7 +117,7 @@
                 </a-row>
             </a-col>
         </a-row>
-    </div>
+    </page-container>
 </template>
 
 <script setup lang="ts">
@@ -138,7 +138,7 @@ const detail = ref<any>({});
 const flowData = ref<any[]>([]);
 
 const getDetail = () => {
-    queryDetail(route.query.id).then((resp: any) => {
+    queryDetail(route.params.id).then((resp: any) => {
         if (resp.status === 200) {
             detail.value = resp.result;
         }
diff --git a/src/views/iot-card/CardManagement/index.vue b/src/views/iot-card/CardManagement/index.vue
index 1ac18f80..f2eaa60a 100644
--- a/src/views/iot-card/CardManagement/index.vue
+++ b/src/views/iot-card/CardManagement/index.vue
@@ -1,6 +1,6 @@
 <!-- 物联卡管理 -->
 <template>
-    <div class="page-container">
+    <page-container class="container">
         <Search
             :columns="columns"
             target="iot-card-management-search"
@@ -323,7 +323,7 @@
             :data="current"
             @change="saveChange"
         />
-    </div>
+    </page-container>
 </template>
 
 <script setup lang="ts">
@@ -539,10 +539,7 @@ const getActions = (
             icon: 'EyeOutlined',
             onClick: () => {
                 router.push({
-                    path: '/iot-card/CardManagement/Detail',
-                    query: {
-                        id: data.id,
-                    },
+                    path: `/iot-card/CardManagement/detail/${data.id}`,
                 });
             },
         },
@@ -795,7 +792,7 @@ const handelRemove = async () => {
 </script>
 
 <style scoped lang="less">
-.page-container {
+.container {
     .search {
         width: calc(100% - 330px);
     }
diff --git a/src/views/iot-card/Dashboard/index.vue b/src/views/iot-card/Dashboard/index.vue
index 93bc1cfa..0f14238e 100644
--- a/src/views/iot-card/Dashboard/index.vue
+++ b/src/views/iot-card/Dashboard/index.vue
@@ -1,6 +1,6 @@
 <!-- 物联卡-仪表盘 -->
 <template>
-    <div class="page-container">
+    <page-container class="container">
         <a-card>
             <a-row :gutter="20" :style="{ marginBottom: '20px' }">
                 <a-col :span="24"><Guide title="数据统计" /></a-col>
@@ -104,7 +104,7 @@
                 </a-col>
             </a-row>
         </a-card>
-    </div>
+    </page-container>
 </template>
 
 <script setup lang="ts">
@@ -229,7 +229,7 @@ const dTime = [
 getTopRang(dTime[0], dTime[1]);
 </script>
 <style scoped lang="less">
-.page-container {
+.container {
     .data-statistics-item {
         height: 140px;
         background: #fcfcfc;
diff --git a/src/views/iot-card/Home/index.vue b/src/views/iot-card/Home/index.vue
index be552656..ee739310 100644
--- a/src/views/iot-card/Home/index.vue
+++ b/src/views/iot-card/Home/index.vue
@@ -1,6 +1,6 @@
 <!-- 物联卡-首页 -->
 <template>
-  <div class="page-container">
+  <page-container>
     <a-row :gutter="24">
       <a-col :span="14">
         <div class="home-guide">
@@ -79,7 +79,7 @@
         </div>
       </a-col>
     </a-row>
-  </div>
+  </page-container>
 </template>
 
 <script setup lang="ts">
diff --git a/src/views/iot-card/Recharge/index.vue b/src/views/iot-card/Recharge/index.vue
index 33813bcf..8bb0bc21 100644
--- a/src/views/iot-card/Recharge/index.vue
+++ b/src/views/iot-card/Recharge/index.vue
@@ -1,9 +1,9 @@
 <!-- 充值管理 -->
 <template>
-    <div class="page-container">
+    <page-container>
         <Search
             :columns="columns"
-            target="iot-card-management-search"
+            target="recharge-search"
             @search="handleSearch"
         />
         <JTable
@@ -71,7 +71,7 @@
         <!-- 充值 -->
         <Save v-if="visible" @change="saveChange" />
         <Detail v-if="detailVisible" :data="current" @close="close" />
-    </div>
+    </page-container>
 </template>
 
 <script setup lang="ts">