From 892c84f32a12f10b0b21b74801fd28ccdf248e06 Mon Sep 17 00:00:00 2001
From: Michelle.Chung <1242874891@qq.com>
Date: 星期二, 27 六月 2023 09:03:51 +0800
Subject: [PATCH] update 更新字段命名 activityTimeout -> activeTimeout ; update 新增字段设备类型 deviceType ;
---
src/views/system/client/index.vue | 29 ++++++++++++++++++++++++-----
src/api/system/client/types.ts | 21 ++++++++++++++++++---
2 files changed, 42 insertions(+), 8 deletions(-)
diff --git a/src/api/system/client/types.ts b/src/api/system/client/types.ts
index 1c505ac..e67f95f 100644
--- a/src/api/system/client/types.ts
+++ b/src/api/system/client/types.ts
@@ -25,9 +25,14 @@
grantTypeList: string[];
/**
+ * 璁惧绫诲瀷
+ */
+ deviceType: string;
+
+ /**
* token娲昏穬瓒呮椂鏃堕棿
*/
- activityTimeout: number;
+ activeTimeout: number;
/**
* token鍥哄畾瓒呮椂
@@ -68,9 +73,14 @@
grantTypeList?: string[];
/**
+ * 璁惧绫诲瀷
+ */
+ deviceType?: string;
+
+ /**
* token娲昏穬瓒呮椂鏃堕棿
*/
- activityTimeout?: number;
+ activeTimeout?: number;
/**
* token鍥哄畾瓒呮椂
@@ -106,9 +116,14 @@
grantType?: string;
/**
+ * 璁惧绫诲瀷
+ */
+ deviceType?: string;
+
+ /**
* token娲昏穬瓒呮椂鏃堕棿
*/
- activityTimeout?: number;
+ activeTimeout?: number;
/**
* token鍥哄畾瓒呮椂
diff --git a/src/views/system/client/index.vue b/src/views/system/client/index.vue
index 5191108..2130d03 100644
--- a/src/views/system/client/index.vue
+++ b/src/views/system/client/index.vue
@@ -56,7 +56,12 @@
</div>
</template>
</el-table-column>
- <el-table-column label="Token娲昏穬瓒呮椂鏃堕棿" align="center" prop="activityTimeout" />
+ <el-table-column label="璁惧绫诲瀷" align="center">
+ <template #default="scope">
+ <dict-tag :options="sys_device_type" :value="scope.row.deviceType" />
+ </template>
+ </el-table-column>
+ <el-table-column label="Token娲昏穬瓒呮椂鏃堕棿" align="center" prop="activeTimeout" />
<el-table-column label="Token鍥哄畾瓒呮椂鏃堕棿" align="center" prop="timeout" />
<el-table-column label="鐘舵��" align="center" key="status">
<template #default="scope">
@@ -100,7 +105,15 @@
></el-option>
</el-select>
</el-form-item>
- <el-form-item prop="activityTimeout" label-width="auto">
+ <el-form-item label="璁惧绫诲瀷" prop="deviceType">
+ <el-select v-model="form.deviceType" placeholder="璇疯緭鍏ヨ澶囩被鍨�">
+ <el-option
+ v-for="dict in sys_device_type"
+ :key="dict.value" :label="dict.label" :value="dict.value"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item prop="activeTimeout" label-width="auto">
<template #label>
<span>
<el-tooltip content="鎸囧畾鏃堕棿鏃犳搷浣滃垯杩囨湡锛堝崟浣嶏細绉掞級锛岄粯璁�30鍒嗛挓锛�1800绉掞級" placement="top">
@@ -109,7 +122,7 @@
Token娲昏穬瓒呮椂鏃堕棿
</span>
</template>
- <el-input v-model="form.activityTimeout" placeholder="璇疯緭鍏oken娲昏穬瓒呮椂鏃堕棿" />
+ <el-input v-model="form.activeTimeout" placeholder="璇疯緭鍏oken娲昏穬瓒呮椂鏃堕棿" />
</el-form-item>
<el-form-item prop="timeout" label-width="auto">
<template #label>
@@ -149,6 +162,7 @@
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { sys_normal_disable } = toRefs<any>(proxy?.useDict("sys_normal_disable"));
const { sys_grant_type } = toRefs<any>(proxy?.useDict("sys_grant_type"));
+const { sys_device_type } = toRefs<any>(proxy?.useDict("sys_device_type"));
const clientList = ref<ClientVO[]>([]);
const buttonLoading = ref(false);
@@ -173,7 +187,8 @@
clientKey: undefined,
clientSecret: undefined,
grantTypeList: undefined,
- activityTimeout: undefined,
+ deviceType: undefined,
+ activeTimeout: undefined,
timeout: undefined,
status: undefined,
}
@@ -186,7 +201,8 @@
clientKey: undefined,
clientSecret: undefined,
grantType: undefined,
- activityTimeout: undefined,
+ deviceType: undefined,
+ activeTimeout: undefined,
timeout: undefined,
status: undefined,
},
@@ -206,6 +222,9 @@
grantTypeList: [
{ required: true, message: "鎺堟潈绫诲瀷涓嶈兘涓虹┖", trigger: "change" }
],
+ deviceType: [
+ { required: true, message: "璁惧绫诲瀷涓嶈兘涓虹┖", trigger: "change" }
+ ],
}
});
--
Gitblit v1.9.3