Browse Source

feat(general): 更新地区数据获取接口

zhangrenyuan/feature-20250714163943-金币前端二期
lihui 2 weeks ago
parent
commit
2ba78a88e2
  1. 6
      src/views/audit/rechargeAudit.vue
  2. 4
      src/views/audit/refundAudit.vue
  3. 4
      src/views/consume/coinConsumeDetail.vue
  4. 4
      src/views/home.vue
  5. 87
      src/views/recharge/coinRechargeDetail.vue
  6. 4
      src/views/refund/coinRefundDetail.vue
  7. 3
      src/views/usergold/clientCountBalance.vue
  8. 80
      src/views/usergold/clientCountDetail.vue
  9. 8
      src/views/workspace/index.vue

6
src/views/audit/rechargeAudit.vue

@ -479,8 +479,10 @@ const getActivity = async function () {
const getMarket = async function () { const getMarket = async function () {
try { try {
const result = await request({ const result = await request({
url: '/general/market',
data: {}
url: '/general/roleMarkets',
data: {
account: adminData.value.account
}
}) })
market.value = result.data market.value = result.data
console.log('地区', market.value) console.log('地区', market.value)

4
src/views/audit/refundAudit.vue

@ -268,7 +268,9 @@ const showRejectDialog = (row) => {
// //
const getmarkets = async () => { const getmarkets = async () => {
try { try {
const result = await API({ url: 'general/market' })
const result = await API({ url: '/general/roleMarkets', data: {
account: adminInfo.value.account,
} })
marketOptions.value = result.data || [] marketOptions.value = result.data || []
} catch (error) { } catch (error) {
console.error('获取地区列表失败', error) console.error('获取地区列表失败', error)

4
src/views/consume/coinConsumeDetail.vue

@ -362,8 +362,8 @@ const getMarket = async function () {
// //
const result = await request({ const result = await request({
// url: '/general/market', // url: '/general/market',
url: '/general/market', // todo
data: {}
url: '/general/roleMarkets', // todo
data: {account:adminData.value.account}
}) })
console.log('请求地区列表成功', result) console.log('请求地区列表成功', result)
// //

4
src/views/home.vue

@ -36,7 +36,9 @@ const currentArea = ref('全部')
const getAreas = async function () { const getAreas = async function () {
try { try {
const result = await API({ url: '/general/market', data: {} })
const result = await API({ url: '/general/roleMarkets', data: {
account: adminData.value.account,
} })
areas.value = result.data areas.value = result.data
console.log('请求成功', result) console.log('请求成功', result)
} catch (error) { } catch (error) {

87
src/views/recharge/coinRechargeDetail.vue

@ -1,8 +1,8 @@
<script setup> <script setup>
import { ref, onMounted, reactive, computed } from 'vue'
import {ref, onMounted, reactive, computed} from 'vue'
import ElementPlus from 'element-plus' import ElementPlus from 'element-plus'
import { ElMessage, ElMessageBox } from 'element-plus'
import { AiFillRead } from 'vue-icons-plus/ai'
import {ElMessage, ElMessageBox} from 'element-plus'
import {AiFillRead} from 'vue-icons-plus/ai'
import axios from 'axios' import axios from 'axios'
import moment from 'moment' import moment from 'moment'
import API from '@/util/http' import API from '@/util/http'
@ -10,7 +10,7 @@ import API from '@/util/http'
const adminData = ref({}) const adminData = ref({})
const getAdminData = async function () { const getAdminData = async function () {
try { try {
const result = await API({ url: '/admin/userinfo', data: {} })
const result = await API({url: '/admin/userinfo', data: {}})
adminData.value = result adminData.value = result
rechargeUser.value.adminId = adminData.value.id rechargeUser.value.adminId = adminData.value.id
console.log('请求成功', result) console.log('请求成功', result)
@ -96,7 +96,7 @@ const delObj = ref({})
const getActivity = async function () { const getActivity = async function () {
try { try {
// POST // POST
const result = await API({ url: '/general/activity', data: {} })
const result = await API({url: '/general/activity', data: {}})
// //
console.log('请求成功', result) console.log('请求成功', result)
@ -104,7 +104,7 @@ const getActivity = async function () {
// //
if (Array.isArray(result.data)) { if (Array.isArray(result.data)) {
// { value, label } // { value, label }
activity.value = result.data.map(item => ({ value: item, label: item }));
activity.value = result.data.map(item => ({value: item, label: item}));
} else { } else {
console.error('活动数据格式错误', result) console.error('活动数据格式错误', result)
ElMessage.error('活动数据格式错误,请联系管理员') ElMessage.error('活动数据格式错误,请联系管理员')
@ -119,9 +119,14 @@ const getActivity = async function () {
// //
// //
const getArea = async function () { const getArea = async function () {
console.log('获取地区adminid', adminData.value)
try { try {
// POST // POST
const result = await API({ url: '/general/market', data: {} })
const result = await API({
url: '/general/roleMarkets',
data: {account: adminData.value.account}
});
// //
console.log('请求成功', result) console.log('请求成功', result)
// //
@ -148,7 +153,7 @@ const getPlatform = async () => {
}) })
// { value, label } // { value, label }
if (Array.isArray(result.data)) { if (Array.isArray(result.data)) {
platform.value = result.data.map(item => ({ value: item, label: item }));
platform.value = result.data.map(item => ({value: item, label: item}));
} else { } else {
console.error('充值方式格式错误', result) console.error('充值方式格式错误', result)
ElMessage.error('充值方式格式错误,请联系管理员') ElMessage.error('充值方式格式错误,请联系管理员')
@ -188,7 +193,7 @@ const get = async function (val) {
url: '/recharge/selectBy', url: '/recharge/selectBy',
data: { data: {
...getObj.value, ...getObj.value,
rechargeUser: { ...rechargeUser.value }
rechargeUser: {...rechargeUser.value}
} }
}) })
// rechargeUser.value // rechargeUser.value
@ -333,6 +338,7 @@ const get7Days = function () {
onMounted(async function () { onMounted(async function () {
await get() await get()
await getActivity() await getActivity()
await getAdminData()
await getArea() await getArea()
await getPlatform() await getPlatform()
}) })
@ -375,7 +381,7 @@ const exportExcel = async function () {
size: total.value size: total.value
} }
try { try {
const res = await API({ url: '/export/exportRecharge', data: params })
const res = await API({url: '/export/exportRecharge', data: params})
if (res.code === 200) { if (res.code === 200) {
ElMessage.success('导出成功') ElMessage.success('导出成功')
} else { } else {
@ -403,7 +409,7 @@ const exportListLoading = ref(false)
const getExportList = async () => { const getExportList = async () => {
exportListLoading.value = true exportListLoading.value = true
try { try {
const result = await API({ url: '/export/export' })
const result = await API({url: '/export/export'})
if (result.code === 200) { if (result.code === 200) {
const filteredData = result.data.filter(item => { const filteredData = result.data.filter(item => {
return item.type === 2; //2 return item.type === 2; //2
@ -438,7 +444,7 @@ const getTagType = (state) => {
case 1: case 1:
return 'primary'; return 'primary';
case 2: case 2:
return'success';
return 'success';
case 3: case 3:
return 'danger'; return 'danger';
default: default:
@ -453,7 +459,7 @@ const getTagText = (state) => {
case 1: case 1:
return '执行中'; return '执行中';
case 2: case 2:
return'执行完成';
return '执行完成';
case 3: case 3:
return '执行出错'; return '执行出错';
default: default:
@ -470,14 +476,14 @@ const getTagText = (state) => {
<el-col :span="5"> <el-col :span="5">
<div class="head-card-element"> <div class="head-card-element">
<el-text class="mx-1" size="large">精网号</el-text> <el-text class="mx-1" size="large">精网号</el-text>
<el-input v-model="rechargeUser.jwcode" placeholder="请输入精网号" style="width: 150px" clearable />
<el-input v-model="rechargeUser.jwcode" placeholder="请输入精网号" style="width: 150px" clearable/>
</div> </div>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<div class="head-card-element"> <div class="head-card-element">
<el-text class="mx-1" size="large">活动名称</el-text> <el-text class="mx-1" size="large">活动名称</el-text>
<el-select v-model="rechargeUser.activity" placeholder="请选择活动名称" style="width: 180px" clearable> <el-select v-model="rechargeUser.activity" placeholder="请选择活动名称" style="width: 180px" clearable>
<el-option v-for="item in activity" :key="item.value" :label="item.label" :value="item.value" />
<el-option v-for="item in activity" :key="item.value" :label="item.label" :value="item.value"/>
</el-select> </el-select>
</div> </div>
</el-col> </el-col>
@ -485,7 +491,7 @@ const getTagText = (state) => {
<div class="head-card-element"> <div class="head-card-element">
<el-text class="mx-1" size="large">所属地区</el-text> <el-text class="mx-1" size="large">所属地区</el-text>
<el-select v-model="rechargeUser.market" placeholder="请选择所属地区" style="width: 180px" clearable> <el-select v-model="rechargeUser.market" placeholder="请选择所属地区" style="width: 180px" clearable>
<el-option v-for="item in market" :key="item" :label="item" :value="item" />
<el-option v-for="item in market" :key="item" :label="item" :value="item"/>
</el-select> </el-select>
</div> </div>
</el-col> </el-col>
@ -493,7 +499,7 @@ const getTagText = (state) => {
<div class="head-card-element"> <div class="head-card-element">
<el-text class="mx-1" size="large">充值方式</el-text> <el-text class="mx-1" size="large">充值方式</el-text>
<el-select v-model="rechargeUser.payPlatform" placeholder="请选择充值方式" style="width: 180px" clearable> <el-select v-model="rechargeUser.payPlatform" placeholder="请选择充值方式" style="width: 180px" clearable>
<el-option v-for="item in platform" :key="item.value" :label="item.label" :value="item.value" />
<el-option v-for="item in platform" :key="item.value" :label="item.label" :value="item.value"/>
</el-select> </el-select>
</div> </div>
</el-col> </el-col>
@ -505,9 +511,15 @@ const getTagText = (state) => {
<el-text class="mx-1" size="large">充值时间</el-text> <el-text class="mx-1" size="large">充值时间</el-text>
<el-date-picker v-model="getTime" type="datetimerange" range-separator="" start-placeholder="起始时间" <el-date-picker v-model="getTime" type="datetimerange" range-separator="" start-placeholder="起始时间"
end-placeholder="结束时间" style="width: 400px" @change="handleDatePickerChange"/> end-placeholder="结束时间" style="width: 400px" @change="handleDatePickerChange"/>
<el-button @click="getToday()" style="margin-left: 10px" :type="activeTimeRange === 'today' ? 'primary' : ''"> </el-button>
<el-button @click="getYesterday()" style="margin-left: 10px" :type="activeTimeRange === 'yesterday' ? 'primary' : ''"> </el-button>
<el-button @click="get7Days()" style="margin-left: 10px" :type="activeTimeRange === '7days' ? 'primary' : ''"> 近7天</el-button>
<el-button @click="getToday()" style="margin-left: 10px"
:type="activeTimeRange === 'today' ? 'primary' : ''">
</el-button>
<el-button @click="getYesterday()" style="margin-left: 10px"
:type="activeTimeRange === 'yesterday' ? 'primary' : ''">
</el-button>
<el-button @click="get7Days()" style="margin-left: 10px"
:type="activeTimeRange === '7days' ? 'primary' : ''"> 近7天
</el-button>
<el-button type="success" @click="reset()">重置</el-button> <el-button type="success" @click="reset()">重置</el-button>
<el-button type="primary" @click="search()">查询</el-button> <el-button type="primary" @click="search()">查询</el-button>
<el-button type="primary" @click="exportExcel()">导出Excel</el-button> <el-button type="primary" @click="exportExcel()">导出Excel</el-button>
@ -522,9 +534,9 @@ const getTagText = (state) => {
<el-col> <el-col>
<el-card> <el-card>
<div> <div>
充值金额{{ (permanentGolds ) /100 }}新币永久金币{{
permanentGolds /100
}}金币免费金币{{ freeGolds /100 }}金币
充值金额{{ (permanentGolds) / 100 }}新币永久金币{{
permanentGolds / 100
}}金币免费金币{{ freeGolds / 100 }}金币
</div> </div>
<!-- 设置表格容器的高度和滚动样式 --> <!-- 设置表格容器的高度和滚动样式 -->
<div style="height: 520px; overflow-y: auto;margin-top: 10px;"> <div style="height: 520px; overflow-y: auto;margin-top: 10px;">
@ -536,18 +548,18 @@ const getTagText = (state) => {
}}</span> }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column fixed="left" prop="name" label="姓名" width="150px" />
<el-table-column fixed="left" prop="jwcode" label="精网号" width="110px" />
<el-table-column prop="market" label="所属地区" width="100px" />
<el-table-column fixed="left" prop="name" label="姓名" width="150px"/>
<el-table-column fixed="left" prop="jwcode" label="精网号" width="110px"/>
<el-table-column prop="market" label="所属地区" width="100px"/>
<el-table-column prop="activity" label="活动名称" width="110px" show-overflow-tooltip/> <el-table-column prop="activity" label="活动名称" width="110px" show-overflow-tooltip/>
<el-table-column prop="rateName" label="货币名称" width="110px" />
<el-table-column prop="money" sortable="custom" label="充值金额" width="110px" />
<el-table-column prop="permanentGold" label="永久金币" sortable="custom" width="110px" />
<el-table-column prop="freeGold" label="免费金币" sortable="custom" width="110px" />
<el-table-column prop="payPlatform" label="充值方式" width="100px" />
<el-table-column prop="payModel" label="支付方式" width="100px" />
<el-table-column prop="remark" label="备注" width="150px" show-overflow-tooltip />
<el-table-column prop="adminName" label="提交人" width="100px" />
<el-table-column prop="rateName" label="货币名称" width="110px"/>
<el-table-column prop="money" sortable="custom" label="充值金额" width="110px"/>
<el-table-column prop="permanentGold" label="永久金币" sortable="custom" width="110px"/>
<el-table-column prop="freeGold" label="免费金币" sortable="custom" width="110px"/>
<el-table-column prop="payPlatform" label="充值方式" width="100px"/>
<el-table-column prop="payModel" label="支付方式" width="100px"/>
<el-table-column prop="remark" label="备注" width="150px" show-overflow-tooltip/>
<el-table-column prop="adminName" label="提交人" width="100px"/>
<el-table-column prop="payTime" sortable label="充值时间" width="200px"> <el-table-column prop="payTime" sortable label="充值时间" width="200px">
<template #default="scope"> <template #default="scope">
{{ moment(scope.row.payTime).format('YYYY-MM-DD HH:mm:ss') }} {{ moment(scope.row.payTime).format('YYYY-MM-DD HH:mm:ss') }}
@ -559,16 +571,17 @@ const getTagText = (state) => {
<!-- 分页 --> <!-- 分页 -->
<div class="pagination" style="margin-top: 20px"> <div class="pagination" style="margin-top: 20px">
<el-pagination background :page-size="getObj.pageSize" :page-sizes="[5, 10, 20, 50, 100]" <el-pagination background :page-size="getObj.pageSize" :page-sizes="[5, 10, 20, 50, 100]"
layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="handlePageSizeChange"
layout="total, sizes, prev, pager, next, jumper" :total="total"
@size-change="handlePageSizeChange"
@current-change="handleCurrentChange"></el-pagination> @current-change="handleCurrentChange"></el-pagination>
</div> </div>
</el-card> </el-card>
</el-col> </el-col>
</el-row> </el-row>
<!-- 导出弹窗 -->
<!-- 导出弹窗 -->
<el-dialog v-model="exportListVisible" title="导出列表" width="80%"> <el-dialog v-model="exportListVisible" title="导出列表" width="80%">
<el-table :data="exportList" style="width: 100%" :loading="exportListLoading"> <el-table :data="exportList" style="width: 100%" :loading="exportListLoading">
<el-table-column prop="fileName" label="文件名" />
<el-table-column prop="fileName" label="文件名"/>
<el-table-column prop="state" label="状态"> <el-table-column prop="state" label="状态">
<template #default="scope"> <template #default="scope">
<el-tag :type="getTagType(scope.row.state)" <el-tag :type="getTagType(scope.row.state)"

4
src/views/refund/coinRefundDetail.vue

@ -270,7 +270,9 @@ const handleClick = function (tab, event) {
const getMarket = async function () { const getMarket = async function () {
try { try {
// POST // POST
const result = await API({ url: '/general/market', data: {} })
const result = await API({ url: '/general/roleMarkets', data: {
account:adminData.value.account,
} })
// //
console.log('请求成功', result) console.log('请求成功', result)
// //

3
src/views/usergold/clientCountBalance.vue

@ -30,7 +30,8 @@ const getmarket = async () => {
isLoadingmarket.value = true; isLoadingmarket.value = true;
try { try {
const result = await API({ const result = await API({
url: '/general/market'
url: '/general/roleMarkets',
data: {account: adminData.value.account}
}); });
console.log('获取地区数据成功', result) console.log('获取地区数据成功', result)
// { value, label } // { value, label }

80
src/views/usergold/clientCountDetail.vue

@ -1,11 +1,11 @@
<script setup> <script setup>
import {ref, onMounted, computed, nextTick, watch} from 'vue' import {ref, onMounted, computed, nextTick, watch} from 'vue'
import { ElMessage } from 'element-plus'
import {ElMessage} from 'element-plus'
import axios from 'axios' import axios from 'axios'
import moment from 'moment' import moment from 'moment'
import API from '@/util/http' import API from '@/util/http'
import { writeFile, utils } from 'xlsx'
import {writeFile, utils} from 'xlsx'
import request from "@/util/request.js"; import request from "@/util/request.js";
// //
@ -25,16 +25,12 @@ const totalGoldTotal = ref(0)
const adminData = ref({}) const adminData = ref({})
const getAdminData = async function () { const getAdminData = async function () {
try { try {
const result = await API({
url: '/admin/userinfo',
method: 'post',
data: {}
})
const result = await API({ url: '/admin/userinfo', data: {} })
adminData.value = result adminData.value = result
// console.log('', result)
console.log('请求成功', result)
console.log('管理员用户信息', adminData.value) console.log('管理员用户信息', adminData.value)
} catch (error) { } catch (error) {
console.log('管理员用户信息请求失败', error)
console.log('请求失败', error)
} }
} }
@ -61,7 +57,7 @@ const getPlatform = async () => {
}) })
// { value, label } // { value, label }
if (Array.isArray(result.data)) { if (Array.isArray(result.data)) {
platform.value = result.data.map(item => ({ value: item, label: item }));
platform.value = result.data.map(item => ({value: item, label: item}));
} else { } else {
console.error('平台信息格式错误', result) console.error('平台信息格式错误', result)
ElMessage.error('平台信息格式错误,请联系管理员') ElMessage.error('平台信息格式错误,请联系管理员')
@ -91,14 +87,19 @@ const type = [
] ]
// //
const isLoadingArea = ref(false);
//
const isLoadingmarket = ref(false);
const market = ref([]) const market = ref([])
const getArea = async () => {
isLoadingArea.value = true;
const getmarket = async () => {
isLoadingmarket.value = true;
try { try {
const result = await API({ const result = await API({
url: '/general/market'
url: '/general/roleMarkets',
data: {account: adminData.value.account}
}); });
console.log('获取地区数据成功', result)
// { value, label } // { value, label }
if (Array.isArray(result.data) && typeof result.data[0] === 'string') { if (Array.isArray(result.data) && typeof result.data[0] === 'string') {
market.value = result.data market.value = result.data
@ -113,10 +114,9 @@ const getArea = async () => {
// //
market.value = []; market.value = [];
} finally { } finally {
isLoadingArea.value = false;
isLoadingmarket.value = false;
} }
}; };
/*// 地区下拉框 /*// 地区下拉框
const getMarket = async function () { const getMarket = async function () {
try { try {
@ -179,12 +179,12 @@ const get = async function (val) {
console.log('jwcode 类型:', typeof goldDetail.value.jwcode); console.log('jwcode 类型:', typeof goldDetail.value.jwcode);
console.log('jwcode 值:', goldDetail.value.jwcode); console.log('jwcode 值:', goldDetail.value.jwcode);
const requestData = { ...getObj.value, goldDetail: { ...goldDetail.value } };
const requestData = {...getObj.value, goldDetail: {...goldDetail.value}};
console.log('最终请求参数', JSON.stringify(requestData, null, 2)); // console.log('最终请求参数', JSON.stringify(requestData, null, 2)); //
const result = await API({ const result = await API({
url: '/goldDetail/getGoldDetail', url: '/goldDetail/getGoldDetail',
method: 'post', method: 'post',
data: { ...getObj.value, goldDetail: { ...goldDetail.value } }
data: {...getObj.value, goldDetail: {...goldDetail.value}}
}) })
console.log('响应数据', result) console.log('响应数据', result)
tableData.value = result.data.list tableData.value = result.data.list
@ -205,7 +205,7 @@ const get = async function (val) {
url: '/goldDetail/getTotal', url: '/goldDetail/getTotal',
method: 'post', method: 'post',
data: { data: {
goldDetail: { ...goldDetail.value },
goldDetail: {...goldDetail.value},
/* jwcode: goldDetail.value.jwcode || '', /* jwcode: goldDetail.value.jwcode || '',
payPlatform: goldDetail.value.payPlatform || '', payPlatform: goldDetail.value.payPlatform || '',
type: goldDetail.value.type || '', type: goldDetail.value.type || '',
@ -346,7 +346,7 @@ const exportExcel = async function () {
}, },
} }
const res = await API({ url: '/goldDetail/export', data: params })
const res = await API({url: '/goldDetail/export', data: params})
if (res.code === 200) { if (res.code === 200) {
ElMessage.success('导出成功') ElMessage.success('导出成功')
} }
@ -365,9 +365,10 @@ const handleCurrentChange = function (val) {
// //
onMounted(async function () { onMounted(async function () {
await get()
await getArea()
await getAdminData() await getAdminData()
await get()
await getmarket()
await getPlatform() // await getPlatform() //
}) })
@ -387,7 +388,7 @@ const exportListLoading = ref(false)
const getExportList = async () => { const getExportList = async () => {
exportListLoading.value = true exportListLoading.value = true
try { try {
const result = await API({ url: '/export/export' })
const result = await API({url: '/export/export'})
if (result.code === 200) { if (result.code === 200) {
const filteredData = result.data.filter(item => { const filteredData = result.data.filter(item => {
return item.type === 0; //0 return item.type === 0; //0
@ -473,7 +474,7 @@ const handleMarketChange = (val) => {
<el-col :span="5"> <el-col :span="5">
<div class="head-card-element"> <div class="head-card-element">
<el-text class="mx-1" size="large">精网号</el-text> <el-text class="mx-1" size="large">精网号</el-text>
<el-input v-model="goldDetail.jwcode" style="width: 150px" placeholder="请输入精网号" clearable />
<el-input v-model="goldDetail.jwcode" style="width: 150px" placeholder="请输入精网号" clearable/>
</div> </div>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
@ -481,7 +482,7 @@ const handleMarketChange = (val) => {
<el-text class="mx-1" size="large">平台信息</el-text> <el-text class="mx-1" size="large">平台信息</el-text>
<el-select v-model="goldDetail.payPlatform" placeholder="请选择平台信息" style="width: 160px" clearable <el-select v-model="goldDetail.payPlatform" placeholder="请选择平台信息" style="width: 160px" clearable
:loading="isLoadingPlatform"> :loading="isLoadingPlatform">
<el-option v-for="item in platform" :key="item.value" :label="item.label" :value="item.value" />
<el-option v-for="item in platform" :key="item.value" :label="item.label" :value="item.value"/>
</el-select> </el-select>
</div> </div>
</el-col> </el-col>
@ -489,14 +490,15 @@ const handleMarketChange = (val) => {
<div class="head-card-element"> <div class="head-card-element">
<el-text class="mx-1" size="large">数量更新类型</el-text> <el-text class="mx-1" size="large">数量更新类型</el-text>
<el-select v-model="goldDetail.type" placeholder="请选择更新类型" style="width: 160px" clearable> <el-select v-model="goldDetail.type" placeholder="请选择更新类型" style="width: 160px" clearable>
<el-option v-for="item in type" :key="item.value" :label="item.label" :value="item.value" />
<el-option v-for="item in type" :key="item.value" :label="item.label" :value="item.value"/>
</el-select> </el-select>
</div> </div>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<div class="head-card-element"> <div class="head-card-element">
<el-text class="mx-1" size="large">所属地区</el-text> <el-text class="mx-1" size="large">所属地区</el-text>
<el-select v-model="goldDetail.markets" placeholder="请选择所属地区" style="width: 180px" clearable multiple
<el-select v-model="goldDetail.markets" placeholder="请选择所属地区" style="width: 180px" clearable
multiple
:loading="isLoadingArea" @change="handleMarketChange"> :loading="isLoadingArea" @change="handleMarketChange">
<el-option v-for="item in market" <el-option v-for="item in market"
:key="item.value || item" :key="item.value || item"
@ -512,13 +514,16 @@ const handleMarketChange = (val) => {
<div class="head-card-element"> <div class="head-card-element">
<el-text class="mx-1" size="large">更新时间</el-text> <el-text class="mx-1" size="large">更新时间</el-text>
<el-date-picker v-model="getTime" type="datetimerange" range-separator="" start-placeholder="起始时间" <el-date-picker v-model="getTime" type="datetimerange" range-separator="" start-placeholder="起始时间"
end-placeholder="结束时间" style="width: 400px" @change="handleDatePickerChange" />
end-placeholder="结束时间" style="width: 400px" @change="handleDatePickerChange"/>
<el-button @click="getToday()" style="margin-left: 10px" <el-button @click="getToday()" style="margin-left: 10px"
:type="activeTimeRange === 'today' ? 'primary' : ''"> </el-button>
:type="activeTimeRange === 'today' ? 'primary' : ''">
</el-button>
<el-button @click="getYesterday()" style="margin-left: 10px" <el-button @click="getYesterday()" style="margin-left: 10px"
:type="activeTimeRange === 'yesterday' ? 'primary' : ''"> </el-button>
:type="activeTimeRange === 'yesterday' ? 'primary' : ''">
</el-button>
<el-button @click="get7Days()" style="margin-left: 10px" <el-button @click="get7Days()" style="margin-left: 10px"
:type="activeTimeRange === '7days' ? 'primary' : ''"> 近7天</el-button>
:type="activeTimeRange === '7days' ? 'primary' : ''"> 近7天
</el-button>
<el-button type="success" @click="reset()">重置</el-button> <el-button type="success" @click="reset()">重置</el-button>
<el-button type="primary" @click="search()">查询</el-button> <el-button type="primary" @click="search()">查询</el-button>
@ -546,9 +551,9 @@ const handleMarketChange = (val) => {
}}</span> }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column fixed="left" prop="name" label="姓名" width="150" />
<el-table-column fixed="left" prop="jwcode" label="精网号" width="120" />
<el-table-column prop="market" label="所属地区" width="120" />
<el-table-column fixed="left" prop="name" label="姓名" width="150"/>
<el-table-column fixed="left" prop="jwcode" label="精网号" width="120"/>
<el-table-column prop="market" label="所属地区" width="120"/>
<el-table-column prop="payPlatform" label="平台信息" width="140"> <el-table-column prop="payPlatform" label="平台信息" width="140">
</el-table-column> </el-table-column>
@ -591,7 +596,7 @@ const handleMarketChange = (val) => {
<span>{{ scope.row.taskGold / 100 }}</span> <span>{{ scope.row.taskGold / 100 }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="adminName" label="提交人" width="110" />
<el-table-column prop="adminName" label="提交人" width="110"/>
<el-table-column prop="auditTime" sortable="custom" label="更新时间" width="210" show-overflow-tooltip> <el-table-column prop="auditTime" sortable="custom" label="更新时间" width="210" show-overflow-tooltip>
<template #default="scope"> <template #default="scope">
<span>{{ <span>{{
@ -605,7 +610,8 @@ const handleMarketChange = (val) => {
<!-- 此处分页 --> <!-- 此处分页 -->
<div class="pagination" style="margin-top: 20px"> <div class="pagination" style="margin-top: 20px">
<el-pagination background :page-size="getObj.pageSize" :page-sizes="[5, 10, 20, 50, 100]" <el-pagination background :page-size="getObj.pageSize" :page-sizes="[5, 10, 20, 50, 100]"
layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="handlePageSizeChange"
layout="total, sizes, prev, pager, next, jumper" :total="total"
@size-change="handlePageSizeChange"
@current-change="handleCurrentChange"></el-pagination> @current-change="handleCurrentChange"></el-pagination>
</div> </div>
</el-card> </el-card>
@ -615,7 +621,7 @@ const handleMarketChange = (val) => {
<!-- 导出列表弹窗 --> <!-- 导出列表弹窗 -->
<el-dialog v-model="exportListVisible" title="导出列表" width="80%"> <el-dialog v-model="exportListVisible" title="导出列表" width="80%">
<el-table :data="exportList" style="width: 100%" :loading="exportListLoading"> <el-table :data="exportList" style="width: 100%" :loading="exportListLoading">
<el-table-column prop="fileName" label="文件名" />
<el-table-column prop="fileName" label="文件名"/>
<el-table-column prop="state" label="状态"> <el-table-column prop="state" label="状态">
<template #default="scope"> <template #default="scope">
<el-tag :type="getTagType(scope.row.state)" :effect="scope.row.state === 3 ? 'light' : 'plain'"> <el-tag :type="getTagType(scope.row.state)" :effect="scope.row.state === 3 ? 'light' : 'plain'">

8
src/views/workspace/index.vue

@ -420,8 +420,14 @@ const processData = (data) => {
// //
const getMarkets = async () => { const getMarkets = async () => {
console.log("adminData",adminData.value.account)
try { try {
const response = await API({ url: '/general/market', data: {} })
const response = await API({
url: '/general/roleMarkets',
data: {
account: adminData.value.account
}
})
if (Array.isArray(response.data)) { if (Array.isArray(response.data)) {
markets.value = response.data markets.value = response.data
console.log('市场列表获取成功:', markets.value) console.log('市场列表获取成功:', markets.value)

Loading…
Cancel
Save