update

src/api/cert/admin.js

@@ -16,3 +16,11 @@ export function listUserBalance(query) {
       params: query
     })
 }
+
+//查询模型消费列表
+export function getModelList(beginTime,endTime) {
+    return request({
+      url: '/cert/admin/modelList?beginDate='+beginTime+'&endDate='+endTime,
+      method: 'get'
+    })
+}

src/views/cert/admin/index.vue

@@ -21,6 +21,28 @@
         <el-col :span="6">所有消费：￥<el-text class="mx-1" >{{ NumFilter(balanceDayAll) }}</el-text></el-col>
       </el-row>
     </el-card>
+    <div class="main2">
+      <el-card class="box-card">
+        <el-row :gutter="20" class="info" style="margin-bottom: 20px;">
+          <el-col :span="8">
+            <el-date-picker
+              v-model="daterangeCreateTime"
+              value-format="YYYY-MM-DD"
+              type="daterange"
+              range-separator="-"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+            ></el-date-picker>
+          </el-col>
+          <el-col :span="8">
+            <el-button style="margin-right: 10px;" @click="query()">查询</el-button>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20" class="info" v-for="model in modelList" :key="model.model">
+          <el-col :span="6">{{model.model}}：￥<el-text class="mx-1" >{{ NumFilter(model.fee) }}</el-text></el-col>
+        </el-row>
+      </el-card>
+    </div>
     <div class="main2">
       <el-table v-loading="loading" :data="userBalanceList" >
           <el-table-column type="selection" width="55" align="center" />
@@ -41,16 +63,18 @@
   </template>
   
   <script setup name="Admin">
-  import { getAdminIndex, listUserBalance } from '@/api/cert/admin'
+  import { getAdminIndex, listUserBalance, getModelList } from '@/api/cert/admin'
   import { refreshUserBalance } from "@/api/cert/userBalance";
   import { ref } from 'vue';
   
+  const daterangeCreateTime = ref([]);
   const { proxy } = getCurrentInstance();
   const userBalance = ref(0);
   const balanceDay = ref(0);
   const balanceDayMonth = ref(0);
   const balanceDayAll = ref(0);
   
+  const modelList = ref([]);
   const userBalanceList = ref([]);
   const loading = ref(true);
   const model = ref('');
@@ -63,6 +87,7 @@
       },
   });
   
+  
   const { queryParams } = toRefs(data);
 
    /** 查询用户余额列表 */
@@ -73,6 +98,17 @@
         total.value = response.total;
         loading.value = false;
       });
+      const start = '';  
+      if(daterangeCreateTime.value[0]){
+        start = daterangeCreateTime.value[0];
+      }
+      const end = '';
+      if(daterangeCreateTime.value[1]){
+        end = daterangeCreateTime.value[1];
+      }
+      getModelList(start, end).then(response => {
+        modelList.value = response.data;
+      });
     }
   
   function getIndex() {
@@ -103,6 +139,11 @@
     proxy.$modal.msgSuccess("刷新成功")
   }
 
+  function query(){
+    getModelList(daterangeCreateTime.value[0], daterangeCreateTime.value[1]).then(response => {
+      modelList.value = response.data;
+    });
+  }
   getIndex()
   </script>
   

src/views/cert/apiToken/index.vue

@@ -132,6 +132,8 @@
       <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="RPM" align="center" prop="rpm" />
+      <el-table-column label="TPM" align="center" prop="tpm" />
       <el-table-column label="开始时间" align="center" prop="startDate" width="180">
         <template #default="scope">
           <span>{{ parseTime(scope.row.startDate, '{y}-{m}-{d}') }}</span>
@@ -157,6 +159,11 @@
           <dict-tag :options="sys_normal_disable" :value="scope.row.status"/>
         </template>
       </el-table-column>
+      <el-table-column label="删除状态" align="center" prop="status">
+        <template #default="scope">
+          <dict-tag :options="sys_del_flag" :value="scope.row.delFlag"/>
+        </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">
@@ -186,6 +193,12 @@
         <el-form-item label="服务器ID" prop="serverId">
           <el-input v-model="form.serverId" placeholder="请输入服务器ID" />
         </el-form-item>
+        <el-form-item label="RPM" prop="rpm">
+          <el-input-number v-model="form.rpm" placeholder="请输入RPM" />
+        </el-form-item>
+        <el-form-item label="TPM" prop="tpm">
+          <el-input-number v-model="form.tpm" placeholder="请输入TPM" />
+        </el-form-item>
         <el-form-item label="开始时间" prop="startDate">
           <el-date-picker clearable
             v-model="form.startDate"