qimaohong
/
deepChartBack
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'milestone-20260317-token打通' into dev

milestone-20260404-后台整改需求
songjie 4 weeks ago
parent
9e8755c353 cb075e7d26
commit
c5179a61b8
3 changed files with 60 additions and 30 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      src/api/userPermissions.js
  2. 14
      src/views/UserPermissions/LogDeepMate.vue
  3. 59
      src/views/UserPermissions/Module.vue

9
src/api/userPermissions.js
View File

@ -47,6 +47,15 @@ export function logMListApi(params) {
});
}
// deepMate操作日志
export function logDeepMateApi(params) {
return request({
url: base_url + "/admin/deepMate/operation/record/list",
method: "post",
data: params,
});
}
// 行情期限--获取用户列表
export function userMListApi(params) {
return request({

14
src/views/UserPermissions/LogDeepMate.vue
View File

@ -23,7 +23,8 @@
<el-table-column prop="dccode" label="账号" align="center" header-align="center"/>
<el-table-column prop="name" label="姓名" align="center" header-align="center"/>
<el-table-column prop="module_name" label="模块名称" align="center" header-align="center"/>
<el-table-column prop="token_change_num" label="token数量" align="center" header-align="center"/>
<el-table-column prop="type" label="类型" align="center" header-align="center"/>
<el-table-column prop="num" label="数量" align="center" header-align="center"/>
<el-table-column prop="created_at" label="操作时间" align="center" header-align="center" sortable="custom"/>
<el-table-column prop="remark" label="备注" align="center" header-align="center">
<template #default="scope">
@ -53,7 +54,7 @@
<script setup>
import { ref, onMounted } from 'vue';
import { logMListApi } from '../../api/userPermissions'
import { logDeepMateApi } from '../../api/userPermissions'
import { useRoute, useRouter } from 'vue-router';
// token
@ -86,19 +87,16 @@ const currentPage = ref(1);
const pageSize = ref(10);
// 获取表格数据
const logTableData = async (dccode) => {
const logTableData = async (jwcode) => {
try {
tableLoading.value = true;
const requestParams = {
token: token,
dccode: dccode,
type: 2,
sort_field: sortProp.value,
sort_order: sortOrder.value,
jwcode: jwcode,
page: currentPage.value,
page_size: pageSize.value
};
const data = await logMListApi(requestParams);
const data = await logDeepMateApi(requestParams);
tableData.value = data.list
datatotal.value = data.total
} catch (error) {

59
src/views/UserPermissions/Module.vue
View File

@ -35,7 +35,7 @@
</div>
</div>
<div class="search-group2">
<div class="search-item">
<!-- <div class="search-item">
<span class="form-label">是否登录过</span>
<el-select
v-model="searchFormDM.is_login"
@ -46,7 +46,7 @@
<el-option label="登录过" value="1" />
<el-option label="未登录过" value="0" />
</el-select>
</div>
</div> -->
<div class="search-item">
<span class="form-label">客户类型</span>
<el-select
@ -125,7 +125,7 @@
<el-table-column prop="dccode" label="账号" align="center" header-align="center"/>
<el-table-column prop="dcname" label="姓名" align="center" header-align="center"/>
<el-table-column prop="inviter" label="归属" align="center" header-align="center"/>
<el-table-column prop="is_login" label="是否登录" align="center" header-align="center">
<!-- <el-table-column prop="is_login" label="是否登录" align="center" header-align="center">
<template #default="scope">
<el-tag
v-if="scope.row.is_login === 1"
@ -144,9 +144,11 @@
没登录过
</el-tag>
</template>
</el-table-column>
</el-table-column> -->
<el-table-column prop="module_name" label="模块名称" align="center" header-align="center"/>
<el-table-column prop="token_num" label="token数量" align="center" header-align="center"/>
<el-table-column prop="remain_num" label="token数量" align="center" header-align="center"/>
<el-table-column prop="remain_free_num" label="免费token" align="center" header-align="center"/>
<el-table-column prop="remain_pay_num" label="付费token" align="center" header-align="center"/>
<el-table-column prop="updated_at" label="操作时间" align="center" header-align="center" sortable="custom"/>
<el-table-column label="操作" align="center" header-align="center">
<template #default="scope">
@ -188,6 +190,8 @@
<div class="info-container" v-if="addOrUpdataDM === 0">
<span class="info-item">HLid: {{ hlidsInput }}</span>
<span class="info-item">剩余次数：{{ deadtoken }}</span>
<span class="info-item">免费token：{{ deadtokenFree }}</span>
<span class="info-item">付费token：{{ deadtokenPay }}</span>
</div>
<!-- 设置数量 -->
@ -195,9 +199,14 @@
<label class="form-label">设置用户次数</label>
<div class="count-group">
<!-- Deep Mate：不可编辑文本框 -->
<el-input v-model="dmText" disabled style="width: 160px; margin-right: 16px;"/>
<el-input v-model="dmText" disabled style="width: 120px; margin-right: 16px;"/>
<!-- token类型下拉框 -->
<el-select v-model="token_type" style="width: 100px; margin-right: 16px;">
<el-option label="免费token" value="free_num" />
<el-option label="付费token" value="pay_num" />
</el-select>
<!-- token数量：只能正整数 -->
<el-input v-model.number="token_num" type="number" style="width: 210px;" placeholder="请输入次数(只能为正)"/>
<el-input v-model.number="token_num" type="number" style="width: 140px;" placeholder="请输入次数(只能为正)"/>
</div>
</div>
@ -205,9 +214,14 @@
<label class="form-label">修改用户次数</label>
<div class="count-group">
<!-- Deep Mate：不可编辑文本框 -->
<el-input v-model="dmText" disabled style="width: 160px; margin-right: 16px;"/>
<el-input v-model="dmText" disabled style="width: 120px; margin-right: 16px;"/>
<!-- token类型下拉框 -->
<el-select v-model="token_type" style="width: 120px; margin-right: 16px;">
<el-option label="免费token" value="free_num" />
<el-option label="付费token" value="pay_num" />
</el-select>
<!-- token数量：支持正负整数 -->
<el-input v-model.number="token_num" type="number" style="width: 210px;" placeholder="请输入次数(可正负)"/>
<el-input v-model.number="token_num" type="number" style="width: 140px;" placeholder="请输入次数(可正负)"/>
</div>
</div>
@ -273,7 +287,7 @@
</div>
</div>
<div class="search-groupDE2">
<div class="search-itemDE">
<!-- <div class="search-itemDE">
<span class="form-labelDE">是否登录过</span>
<el-select
v-model="searchFormDE.is_login"
@ -284,7 +298,7 @@
<el-option label="登录过" value="1" />
<el-option label="未登录过" value="0" />
</el-select>
</div>
</div> -->
<div class="search-itemDE">
<span class="form-labelDE">客户类型</span>
<el-select
@ -381,7 +395,7 @@
<el-table-column prop="dccode" label="账号" align="center" header-align="center"/>
<el-table-column prop="dcname" label="姓名" align="center" header-align="center"/>
<el-table-column prop="inviter" label="归属" align="center" header-align="center"/>
<el-table-column prop="is_login" label="是否登录" align="center" header-align="center">
<!-- <el-table-column prop="is_login" label="是否登录" align="center" header-align="center">
<template #default="scope">
<el-tag
v-if="scope.row.is_login === 1"
@ -400,7 +414,7 @@
没登录过
</el-tag>
</template>
</el-table-column>
</el-table-column> -->
<el-table-column prop="name" label="指标名称" align="center" header-align="center" width="200">
<template #default="scope">
<el-tooltip
@ -746,7 +760,9 @@ const exportListDM = () => {
const handleEditDM = (row) => {
dialogVisibleDM.value = true;
hlidsInput.value = row.dccode;
deadtoken.value = row.token_num;
deadtoken.value = row.remain_num;
deadtokenFree.value = row.remain_free_num;
deadtokenPay.value = row.remain_pay_num;
};
// DeepMate操作日志按钮
@ -764,9 +780,12 @@ const dialogVisibleDM = ref(false);
const hlidsInput = ref('');
const dmText = ref('Deep Mate');
const token_num = ref('');
const token_type = ref('free_num'); // token类型：free_num-免费token, pay_num-付费token
// DeepMate编辑回显内容
const deadtoken = ref('');
const deadtokenFree = ref('');
const deadtokenPay = ref('');
// DeepMate判断开通还是编辑
const addOrUpdataDM = ref(0);
@ -853,8 +872,10 @@ const submitFormDM = async () => {
.map(item => item.trim())
.filter(item => item)
.join('\n'),
// token数量
token_num: token_num.value,
// token数量根据类型分别传递
...(token_type.value === 'free_num'
? { free_num: token_num.value }
: { pay_num: token_num.value }),
// 备注
remark: remark.value.trim(),
// 操作人
@ -891,6 +912,7 @@ const cancelDM = () => {
const resetFormDM = () => {
hlidsInput.value = '';
token_num.value = '';
token_type.value = 'free_num';
remark.value = '';
operator.value = '';
};
@ -1477,10 +1499,11 @@ const openDetail = async(dccode) => {
.info-container {
display: flex;
align-items: center;
gap: 40px;
gap: 20px;
padding: 0 20px 18px;
color: #333;
font-size: 16px;
font-size: 14px;
flex-wrap: wrap;
}
.info-item {

Write Preview
Loading…
Cancel
Save