fix:1,优化
parent
e94808f564
commit
f750cd4434
|
@ -6,4 +6,4 @@ VITE_APP_TITLE = 超管系统
|
||||||
VITE_APP_ENV = 'development'
|
VITE_APP_ENV = 'development'
|
||||||
|
|
||||||
# 代理管理系统/开发环境
|
# 代理管理系统/开发环境
|
||||||
VITE_APP_BASE_API = '/dev-api'
|
VITE_APP_BASE_API = '/ff-api'
|
||||||
|
|
|
@ -67,6 +67,7 @@
|
||||||
data: seriesArr.length == 0 ?[0]:seriesArr,
|
data: seriesArr.length == 0 ?[0]:seriesArr,
|
||||||
type: 'line',
|
type: 'line',
|
||||||
symbol: 'circle',
|
symbol: 'circle',
|
||||||
|
connectNulls: true,
|
||||||
symbolSize: 10,
|
symbolSize: 10,
|
||||||
lineStyle: {
|
lineStyle: {
|
||||||
width: 2
|
width: 2
|
||||||
|
|
|
@ -11,9 +11,9 @@
|
||||||
<dashboard-card v-if="loadings" :cardData="cardData" :currencyType="currencyType" :tenantId="tenantId"></dashboard-card>
|
<dashboard-card v-if="loadings" :cardData="cardData" :currencyType="currencyType" :tenantId="tenantId"></dashboard-card>
|
||||||
|
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="24" style="background:rgb(255,255,255);padding:16px 16px 0px;margin-bottom:32px">
|
<!-- <el-col :span="24" style="background:rgb(255,255,255);padding:16px 16px 0px;margin-bottom:32px">
|
||||||
<today-ranking-card v-if="loadings" :isLoading="isLoading" :currencyType="currencyType" :tenantId="tenantId"></today-ranking-card>
|
<today-ranking-card v-if="loadings" :isLoading="isLoading" :currencyType="currencyType" :tenantId="tenantId"></today-ranking-card>
|
||||||
</el-col>
|
</el-col> -->
|
||||||
<el-col :span="24" style="background:rgb(255,255,255);padding:16px 16px 0px;margin-bottom:32px">
|
<el-col :span="24" style="background:rgb(255,255,255);padding:16px 16px 0px;margin-bottom:32px">
|
||||||
<recently-card v-if="loadings" :isLoading="isLoading" :currencyType="currencyType" :tenantId="tenantId"></recently-card>
|
<recently-card v-if="loadings" :isLoading="isLoading" :currencyType="currencyType" :tenantId="tenantId"></recently-card>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
|
|
@ -72,6 +72,7 @@
|
||||||
<span v-if="row.billStatus == 4">{{ t('未结算') }}</span>
|
<span v-if="row.billStatus == 4">{{ t('未结算') }}</span>
|
||||||
<span v-if="row.billStatus == 5">{{ t('待确认') }}</span>
|
<span v-if="row.billStatus == 5">{{ t('待确认') }}</span>
|
||||||
<span v-if="row.billStatus == 6">{{ t('已结算') }}</span>
|
<span v-if="row.billStatus == 6">{{ t('已结算') }}</span>
|
||||||
|
<span v-if="row.billStatus == 7">{{ t('已取消') }}</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column :label="t('操作')" align="center" width="160">
|
<el-table-column :label="t('操作')" align="center" width="160">
|
||||||
|
|
|
@ -239,13 +239,14 @@ const queryParamsList2 = ref([{
|
||||||
|
|
||||||
}
|
}
|
||||||
]);
|
]);
|
||||||
const dateRange = ref([]),operateTimeType = ref("month");
|
const dateRange = ref([]),operateTimeType = ref("day");
|
||||||
const data = reactive({
|
const data = reactive({
|
||||||
form: {},
|
form: {},
|
||||||
queryParams: {
|
queryParams: {
|
||||||
pageNum: 1,
|
pageNum: 1,
|
||||||
pageSize: 10,
|
pageSize: 10,
|
||||||
timeType:1,
|
timeType:1,
|
||||||
|
currencyType:'VND',
|
||||||
orderByColumn:'createTime',
|
orderByColumn:'createTime',
|
||||||
isAsc:'desc',
|
isAsc:'desc',
|
||||||
searchType:'account',
|
searchType:'account',
|
||||||
|
|
|
@ -24,25 +24,25 @@ export default defineConfig(({ mode, command }) => {
|
||||||
port: 80,
|
port: 80,
|
||||||
host: true,
|
host: true,
|
||||||
open: true,
|
open: true,
|
||||||
proxy: {
|
|
||||||
'/dev-api': {
|
|
||||||
// target: 'http://192.168.50.139:9080',
|
|
||||||
// target: 'http://192.168.50.233:8081',
|
|
||||||
// target: 'http://192.168.50.178:8080',
|
|
||||||
target: 'http://192.168.50.11:8081',
|
|
||||||
changeOrigin: true,
|
|
||||||
rewrite: (p) => p.replace(/^\/dev-api/, '')
|
|
||||||
}
|
|
||||||
},
|
|
||||||
// proxy: {
|
// proxy: {
|
||||||
// '/ff-api': {
|
// '/dev-api': {
|
||||||
// target: 'https://superapi.pgbet188.net', // 线上接口地址
|
// // target: 'http://192.168.50.139:9080',
|
||||||
// changeOrigin: true, // 是否允许跨域
|
// // target: 'http://192.168.50.233:8081',
|
||||||
// pathRewrite: {
|
// // target: 'http://192.168.50.178:8080',
|
||||||
// '^/ff-api': '' // 如果你需要去掉前缀,例如将 /api/xxx 替换为 /xxx
|
// target: 'http://192.168.50.11:8081',
|
||||||
// }
|
// changeOrigin: true,
|
||||||
// }
|
// rewrite: (p) => p.replace(/^\/dev-api/, '')
|
||||||
// }
|
// }
|
||||||
|
// },
|
||||||
|
proxy: {
|
||||||
|
'/ff-api': {
|
||||||
|
target: 'https://superapi.pgbet188.net', // 线上接口地址
|
||||||
|
changeOrigin: true, // 是否允许跨域
|
||||||
|
pathRewrite: {
|
||||||
|
'^/ff-api': '' // 如果你需要去掉前缀,例如将 /api/xxx 替换为 /xxx
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
},
|
},
|
||||||
css: {
|
css: {
|
||||||
postcss: {
|
postcss: {
|
||||||
|
|
Loading…
Reference in New Issue