From 2e7f4273b77823b11829ea20375f199c63c513c2 Mon Sep 17 00:00:00 2001
From: lvxiu_ext <lvxiu_ext@cop.cmsoft.com.cn>
Date: Mon, 8 May 2023 21:10:01 +0800
Subject: [PATCH] =?UTF-8?q?apiToken=E6=B7=BB=E5=8A=A0=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E5=99=A8=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/cert/apiToken/index.vue | 82 +++++++++++++++++++++----------
 1 file changed, 56 insertions(+), 26 deletions(-)

diff --git a/src/views/cert/apiToken/index.vue b/src/views/cert/apiToken/index.vue
index 7ee9f20..81f0c5a 100644
--- a/src/views/cert/apiToken/index.vue
+++ b/src/views/cert/apiToken/index.vue
@@ -1,14 +1,6 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="Key" prop="id">
-        <el-input
-          v-model="queryParams.id"
-          placeholder="请输入Key"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="用户名" prop="name">
         <el-input
           v-model="queryParams.name"
@@ -25,8 +17,40 @@
           @keyup.enter="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="是否默认" prop="isDefault">
-        <el-select v-model="queryParams.isDefault" placeholder="请选择是否默认" clearable>
+      <el-form-item label="服务器ID" prop="serverId">
+        <el-input
+          v-model="queryParams.serverId"
+          placeholder="请输入服务器ID"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="开始时间" prop="startDate">
+        <el-date-picker clearable
+          v-model="queryParams.startDate"
+          type="date"
+          value-format="YYYY-MM-DD"
+          placeholder="请选择开始时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="结束时间" prop="endDate">
+        <el-date-picker clearable
+          v-model="queryParams.endDate"
+          type="date"
+          value-format="YYYY-MM-DD"
+          placeholder="请选择结束时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="最后使用时间" prop="lastUsed">
+        <el-date-picker clearable
+          v-model="queryParams.lastUsed"
+          type="date"
+          value-format="YYYY-MM-DD"
+          placeholder="请选择最后使用时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="默认" prop="isDefault">
+        <el-select v-model="queryParams.isDefault" placeholder="请选择默认" clearable>
           <el-option
             v-for="dict in sys_yes_no"
             :key="dict.value"
@@ -104,9 +128,10 @@
 
     <el-table v-loading="loading" :data="apiTokenList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="Key" align="center" prop="id" />
+      <el-table-column label="id" align="center" prop="id" />
       <el-table-column label="用户名" align="center" prop="name" />
       <el-table-column label="用户ID" align="center" prop="userId" />
+      <el-table-column label="服务器ID" align="center" prop="serverId" />
       <el-table-column label="开始时间" align="center" prop="startDate" width="180">
         <template #default="scope">
           <span>{{ parseTime(scope.row.startDate, '{y}-{m}-{d}') }}</span>
@@ -117,12 +142,12 @@
           <span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="最后使用" align="center" prop="lastUsed" width="180">
+      <el-table-column label="最后使用时间" align="center" prop="lastUsed" width="180">
         <template #default="scope">
           <span>{{ parseTime(scope.row.lastUsed, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="是否默认" align="center" prop="isDefault">
+      <el-table-column label="默认" align="center" prop="isDefault">
         <template #default="scope">
           <dict-tag :options="sys_yes_no" :value="scope.row.isDefault"/>
         </template>
@@ -132,6 +157,7 @@
           <dict-tag :options="sys_normal_disable" :value="scope.row.status"/>
         </template>
       </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['cert:apiToken:edit']">修改</el-button>
@@ -157,6 +183,9 @@
         <el-form-item label="用户ID" prop="userId">
           <el-input v-model="form.userId" placeholder="请输入用户ID" />
         </el-form-item>
+        <el-form-item label="服务器ID" prop="serverId">
+          <el-input v-model="form.serverId" placeholder="请输入服务器ID" />
+        </el-form-item>
         <el-form-item label="开始时间" prop="startDate">
           <el-date-picker clearable
             v-model="form.startDate"
@@ -173,15 +202,15 @@
             placeholder="请选择结束时间">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="最后使用" prop="lastUsed">
+        <el-form-item label="最后使用时间" prop="lastUsed">
           <el-date-picker clearable
             v-model="form.lastUsed"
             type="date"
             value-format="YYYY-MM-DD"
-            placeholder="请选择最后使用">
+            placeholder="请选择最后使用时间">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="是否默认" prop="isDefault">
+        <el-form-item label="默认" prop="isDefault">
           <el-radio-group v-model="form.isDefault">
             <el-radio
               v-for="dict in sys_yes_no"
@@ -243,9 +272,12 @@ const data = reactive({
   queryParams: {
     pageNum: 1,
     pageSize: 10,
-    id: null,
     name: null,
     userId: null,
+    serverId: null,
+    startDate: null,
+    endDate: null,
+    lastUsed: null,
     isDefault: null,
     status: null,
   },
@@ -256,8 +288,11 @@ const data = reactive({
     userId: [
       { required: true, message: "用户ID不能为空", trigger: "blur" }
     ],
+    serverId: [
+      { required: true, message: "服务器ID不能为空", trigger: "blur" }
+    ],
     isDefault: [
-      { required: true, message: "是否默认不能为空", trigger: "change" }
+      { required: true, message: "默认不能为空", trigger: "change" }
     ],
     status: [
       { required: true, message: "状态不能为空", trigger: "change" }
@@ -265,12 +300,6 @@ const data = reactive({
     delFlag: [
       { required: true, message: "删除标志不能为空", trigger: "change" }
     ],
-    createBy: [
-      { required: true, message: "不能为空", trigger: "blur" }
-    ],
-    updateBy: [
-      { required: true, message: "不能为空", trigger: "blur" }
-    ],
   }
 });
 
@@ -298,17 +327,18 @@ function reset() {
     id: null,
     name: null,
     userId: null,
+    serverId: null,
     startDate: null,
     endDate: null,
     lastUsed: null,
     isDefault: null,
     status: null,
     delFlag: null,
+    remark: null,
     createBy: null,
     createTime: null,
     updateBy: null,
-    updateTime: null,
-    remark: null
+    updateTime: null
   };
   proxy.resetForm("apiTokenRef");
 }