From af2136a033c3440a62af91a7b92d1e494c0d4750 Mon Sep 17 00:00:00 2001
From: blp <2962632571@qq.com>
Date: Thu, 2 Feb 2023 14:32:29 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E4=BC=A0=E5=8F=82=E3=80=81=E5=BC=B9=E7=AA=97=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E4=B8=AD=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iot-card/CardManagement/BindDevice.vue    | 10 ++--
 src/views/iot-card/CardManagement/Export.vue  |  2 +
 src/views/iot-card/CardManagement/Import.vue  |  2 +
 src/views/iot-card/CardManagement/Save.vue    |  2 +
 src/views/iot-card/CardManagement/index.vue   | 59 ++++++++-----------
 src/views/iot-card/Platform/index.vue         |  5 +-
 src/views/iot-card/Recharge/Save.vue          |  2 +
 src/views/iot-card/Recharge/index.vue         |  5 +-
 8 files changed, 42 insertions(+), 45 deletions(-)

diff --git a/src/views/iot-card/CardManagement/BindDevice.vue b/src/views/iot-card/CardManagement/BindDevice.vue
index acdba8df..1861c0dd 100644
--- a/src/views/iot-card/CardManagement/BindDevice.vue
+++ b/src/views/iot-card/CardManagement/BindDevice.vue
@@ -5,6 +5,8 @@
         width="1100px"
         :visible="true"
         title="选择设备"
+        okText="确定"
+        cancelText="取消"
         @ok="handleOk"
         @cancel="handleCancel"
         :confirmLoading="btnLoading"
@@ -12,8 +14,9 @@
         <div style="margin-top: 10px">
             <Search
                 :columns="columns"
-                target="iot-card-management-search"
+                target="iot-card-bind-device"
                 @search="handleSearch"
+                type="simple"
             />
             <JTable
                 ref="bindDeviceRef"
@@ -121,9 +124,8 @@ const columns = [
     },
 ];
 
-const handleSearch = (params: any) => {
-    console.log(params);
-    params.value = params;
+const handleSearch = (e: any) => {
+    params.value = e;
 };
 
 const onSelectChange = (record: any) => {
diff --git a/src/views/iot-card/CardManagement/Export.vue b/src/views/iot-card/CardManagement/Export.vue
index 5f20c55f..2ac09933 100644
--- a/src/views/iot-card/CardManagement/Export.vue
+++ b/src/views/iot-card/CardManagement/Export.vue
@@ -4,6 +4,8 @@
         :maskClosable="false"
         :visible="true"
         title="导出"
+        okText="确定"
+        cancelText="取消"
         @ok="handleOk"
         @cancel="handleCancel"
     >
diff --git a/src/views/iot-card/CardManagement/Import.vue b/src/views/iot-card/CardManagement/Import.vue
index 0ca75bca..85b18cbb 100644
--- a/src/views/iot-card/CardManagement/Import.vue
+++ b/src/views/iot-card/CardManagement/Import.vue
@@ -4,6 +4,8 @@
         :maskClosable="false"
         :visible="true"
         title="导入"
+        okText="确定"
+        cancelText="取消"
         @ok="handleCancel"
         @cancel="handleCancel"
     >
diff --git a/src/views/iot-card/CardManagement/Save.vue b/src/views/iot-card/CardManagement/Save.vue
index 9e62a69f..1ae255a5 100644
--- a/src/views/iot-card/CardManagement/Save.vue
+++ b/src/views/iot-card/CardManagement/Save.vue
@@ -4,6 +4,8 @@
         width="600px"
         :visible="true"
         :title="type === 'add' ? '新增' : '编辑'"
+        okText="确定"
+        cancelText="取消"
         @ok="handleOk"
         @cancel="handleCancel"
         :confirmLoading="btnLoading"
diff --git a/src/views/iot-card/CardManagement/index.vue b/src/views/iot-card/CardManagement/index.vue
index f2eaa60a..14419388 100644
--- a/src/views/iot-card/CardManagement/index.vue
+++ b/src/views/iot-card/CardManagement/index.vue
@@ -1,6 +1,6 @@
 <!-- 物联卡管理 -->
 <template>
-    <page-container class="container">
+    <page-container>
         <Search
             :columns="columns"
             target="iot-card-management-search"
@@ -124,10 +124,7 @@
                         </slot>
                     </template>
                     <template #content>
-                        <h3
-                            class="card-item-content-title"
-                            @click.stop="handleView(slotProps.id)"
-                        >
+                        <h3 class="card-item-content-title">
                             {{ slotProps.id }}
                         </h3>
                         <a-row>
@@ -553,6 +550,8 @@ const getActions = (
             popConfirm: data.deviceId
                 ? {
                       title: '确认解绑设备？',
+                      okText: '确定',
+                      cancelText: '取消',
                       onConfirm: async () => {
                           unbind(data.id).then((resp: any) => {
                               if (resp.status === 200) {
@@ -599,6 +598,8 @@ const getActions = (
                         : data.cardStateType?.value === 'deactivate'
                         ? '确认复机？'
                         : '确认停用?',
+                okText: '确定',
+                cancelText: '取消',
                 onConfirm: async () => {
                     if (data.cardStateType?.value === 'toBeActivated') {
                         changeDeploy(data.id).then((resp) => {
@@ -633,6 +634,8 @@ const getActions = (
             },
             popConfirm: {
                 title: '确认删除?',
+                okText: '确定',
+                cancelText: '取消',
                 onConfirm: async () => {
                     const resp: any = await del(data.id);
                     if (resp.status === 200) {
@@ -648,9 +651,8 @@ const getActions = (
     ];
 };
 
-const handleSearch = (params: any) => {
-    console.log(params);
-    params.value = params;
+const handleSearch = (e: any) => {
+    params.value = e;
 };
 
 const onSelectChange = (keys: string[], rows: []) => {
@@ -671,13 +673,6 @@ const handleClick = (dt: any) => {
     }
 };
 
-/**
- * 查看
- */
-const handleView = (id: string) => {
-    message.warn(id + '暂未开发');
-};
-
 /**
  * 新增
  */
@@ -792,25 +787,19 @@ const handelRemove = async () => {
 </script>
 
 <style scoped lang="less">
-.container {
-    .search {
-        width: calc(100% - 330px);
-    }
-    .flow-text {
-        font-size: 20px;
-        font-weight: 600;
-    }
-
-    .progress-text {
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-    }
-    :deep(.ant-progress-inner) {
-        border-radius: 0px;
-    }
-    :deep(.ant-progress-bg) {
-        border-radius: 0px;
-    }
+.flow-text {
+    font-size: 20px;
+    font-weight: 600;
+}
+.progress-text {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+}
+:deep(.ant-progress-inner) {
+    border-radius: 0px;
+}
+:deep(.ant-progress-bg) {
+    border-radius: 0px;
 }
 </style>
diff --git a/src/views/iot-card/Platform/index.vue b/src/views/iot-card/Platform/index.vue
index 6a611705..7097b902 100644
--- a/src/views/iot-card/Platform/index.vue
+++ b/src/views/iot-card/Platform/index.vue
@@ -289,9 +289,8 @@ const getActions = (
     ];
 };
 
-const handleSearch = (params: any) => {
-    console.log(params);
-    params.value = params;
+const handleSearch = (e: any) => {
+    params.value = e;
 };
 
 /**
diff --git a/src/views/iot-card/Recharge/Save.vue b/src/views/iot-card/Recharge/Save.vue
index 4199d358..1605e761 100644
--- a/src/views/iot-card/Recharge/Save.vue
+++ b/src/views/iot-card/Recharge/Save.vue
@@ -4,6 +4,8 @@
         width="600px"
         :visible="true"
         title="充值"
+        okText="确定"
+        cancelText="取消"
         @ok="handleOk"
         @cancel="handleCancel"
         :confirmLoading="btnLoading"
diff --git a/src/views/iot-card/Recharge/index.vue b/src/views/iot-card/Recharge/index.vue
index 8bb0bc21..8506501b 100644
--- a/src/views/iot-card/Recharge/index.vue
+++ b/src/views/iot-card/Recharge/index.vue
@@ -151,9 +151,8 @@ const getActions = (data: Partial<Record<string, any>>): ActionsType[] => {
     ];
 };
 
-const handleSearch = (params: any) => {
-    console.log(params);
-    params.value = params;
+const handleSearch = (e: any) => {
+    params.value = e;
 };
 
 /**