提交 b3b8c170 authored 作者: 宋雄's avatar 宋雄

修改二期bug

上级 35e9c27e
NODE_ENV=development
# VUE_APP_API_BASE_URL='http://192.168.0.100:9999'
VUE_APP_API_BASE_URL='http://220.203.25.212:9998'
VUE_APP_API_BASE_URL='http://192.168.0.101:9999'
# VUE_APP_API_BASE_URL='http://220.203.25.212:9998'
# VUE_APP_API_BASE_URL='http://220.203.25.212:9999'
VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
......
......@@ -30,22 +30,22 @@
</div>
<div class="statistics">
<p style="color:#666;margin-bottom:5px;">总营收</p>
<p style="margin-bottom:0;color:#333;font-size:24px;line-height:1;">¥{{data.totalMoney || 0}}</p>
<p style="margin-bottom:0;color:#333;font-size:24px;line-height:1;">¥{{Number(data.totalMoney || 0).toFixed(2)}}</p>
</div>
<div class="statistics">
<p style="color:#666;margin-bottom:5px;">本月营收</p>
<p style="margin-bottom:0;color:#333;font-size:24px;line-height:1;">¥{{data.monthMoney || 0}}</p>
<p style="margin-bottom:0;color:#333;font-size:24px;line-height:1;">¥{{Number(data.monthMoney || 0).toFixed(2)}}</p>
</div>
<div class="statistics" style="margin-right: 0;">
<p style="color:#666;margin-bottom:5px;">今日营收</p>
<p style="margin-bottom:0;color:#333;font-size:24px;line-height:1;">¥{{data.todayMoney || 0}}</p>
<p style="margin-bottom:0;color:#333;font-size:24px;line-height:1;">¥{{Number(data.todayMoney || 0).toFixed(2)}}</p>
</div>
</div>
<a-row :gutter="24">
<a-col :sm="24" :md="12" :xl="12" :style="{ marginBottom: '20px' }">
<div class="t-box">
<h3 class="box-title">最新成交订单</h3>
<div class="order">
<div class="order" v-if="data.shareOrder && data.shareOrder.length">
<div class="order-title">
<span style="width: 30%;">订单编号</span>
<span>提交时间</span><span>买家名称</span>
......@@ -60,6 +60,9 @@
</div>
</vue-seamless-scroll>
</div>
<div v-else style="margin-top:50px">
<a-empty />
</div>
</div>
</a-col>
<a-col :sm="24" :md="12" :xl="12" :style="{ marginBottom: '20px' }">
......@@ -89,15 +92,23 @@
<a-col :sm="24" :md="12" :xl="12" :style="{ marginBottom: '20px' }">
<div class="t-box">
<h3 class="box-title">巡报订单数量</h3>
<div>
<div v-if="dataList4.length">
<line-chart-multid :dataSource="dataList4" :fields="dayFields4" style="padding: 0;" />
</div>
<div v-else style="margin-top:50px">
<a-empty />
</div>
</div>
</a-col>
<a-col :sm="24" :md="12" :xl="12" :style="{ marginBottom: '20px' }">
<div class="t-box">
<h3 class="box-title">巡报订单金额</h3>
<line-chart-multid :dataSource="dataList5" :fields="dayFields5" style="padding: 0;" />
<div v-if="dataList5.length">
<line-chart-multid :dataSource="dataList5" :fields="dayFields5" style="padding: 0;" />
</div>
<div v-else style="margin-top:50px">
<a-empty />
</div>
</div>
</a-col>
</a-row>
......@@ -155,7 +166,7 @@ export default {
},
methods: {
async getDataStatistics() {
let { result } = await shareBoardApi({ platformType: 'community', date: this.time })
let { result } = await shareBoardApi({ platformType: 'company', date: this.time })
if (result) {
this.data = result
this.dataList1 =
......
......@@ -76,7 +76,7 @@
<script>
import { getRuleDayDetailApi } from '@/api/api'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { filterDictTextByStatic, FENLICENTRAL_AUDIT_STATUS } from '@/assets/static.js'
import { filterDictTextByStatic, FENLICENTRAL_AUDIT_STATUS, PAY_WAY } from '@/assets/static.js'
import PropertyAdvModal from './modules/PropertyAdvModal'
const columns = [
......@@ -114,7 +114,10 @@ const columns = [
title: '支付方式',
dataIndex: 'payWay',
key: 'payWay',
align: 'center'
align: 'center',
customRender: function (text) {
return filterDictTextByStatic(PAY_WAY, text)
}
},
{
title: '订单来源',
......
......@@ -21,8 +21,8 @@
</a-col>
<a-col :md="6" :sm="8">
<a-form-model-item label="收费类型">
<a-select style="width: 100%" v-model="queryParam.chargeTypeName" placeholder="请选择收费类型">
<a-select-option v-for="item in chargeTypeOptions" :key="item.typeCode" :value="item.typeName">{{item.typeName}}</a-select-option>
<a-select style="width: 100%" v-model="queryParam.chargeTypeId" placeholder="请选择收费类型">
<a-select-option v-for="item in chargeTypeOptions" :key="item.typeCode" :value="item.typeCode">{{item.typeName}}</a-select-option>
</a-select>
</a-form-model-item>
</a-col>
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论