Merge branch 'lx-dev' of 47.94.45.65:angelo/web-base-h5 into lx-test
This commit is contained in:
commit
4f558fdcf1
|
@ -2,45 +2,61 @@
|
|||
<view class="width-auto">
|
||||
<view class="flexs">
|
||||
<view class="select-flexs">
|
||||
<picker :range="selYearList" :value="index" range-key="label" @change="changeYear">
|
||||
<view style="display: flex; align-items: center;justify-content: space-between;">
|
||||
<view style="margin-right:40rpx;">{{whatYear}}年</view>
|
||||
<picker
|
||||
:range="selYearList"
|
||||
:value="index"
|
||||
range-key="label"
|
||||
@change="changeYear"
|
||||
>
|
||||
<view
|
||||
style="
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
"
|
||||
>
|
||||
<view style="margin-right: 40rpx">{{ whatYear }}年</view>
|
||||
<u-icon name="arrow-down" color="#999"></u-icon>
|
||||
</view>
|
||||
|
||||
</picker>
|
||||
|
||||
</view>
|
||||
<view class="select-flexs">
|
||||
<picker :range="selMounthList" :value="index" range-key="label" @change="bindPickerChange">
|
||||
<view style="display: flex; align-items: center;justify-content: space-between;">
|
||||
<view style="margin-right:40rpx;">{{whatMounth}}月</view>
|
||||
<picker
|
||||
:range="selMounthList"
|
||||
:value="index"
|
||||
range-key="label"
|
||||
@change="bindPickerChange"
|
||||
>
|
||||
<view
|
||||
style="
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
"
|
||||
>
|
||||
<view style="margin-right: 40rpx">{{ whatMounth }}月</view>
|
||||
<u-icon name="arrow-down" color="#999"></u-icon>
|
||||
</view>
|
||||
|
||||
</picker>
|
||||
|
||||
</view>
|
||||
<view class="select-flexs" style="margin-left: 20rpx;" @click="showType=true">
|
||||
<!-- <view class="select-flexs" style="margin-left: 20rpx;" @click="showType=true">
|
||||
<view style="display: flex; align-items: center;justify-content: space-between;">
|
||||
<view style="margin-right:40rpx;">{{yjName}}</view>
|
||||
<u-icon name="arrow-down" color="#999"></u-icon>
|
||||
</view>
|
||||
<!-- <picker :range="yjTypeList" :value="index2" range-key="label" @confirm="bindType"></picker> -->
|
||||
<u-picker @cancel='showType=false' :show="showType" ref="uPicker" :columns="yjTypeList"
|
||||
@confirm="bindType" keyName='label'></u-picker>
|
||||
</view>
|
||||
</view> -->
|
||||
<!-- <view class="title">
|
||||
导出明细
|
||||
</view> -->
|
||||
</view>
|
||||
<view class="listrefor bg2">
|
||||
|
||||
<view class="flex_item">
|
||||
<view class="text1">左区业绩</view>
|
||||
<view class="text2">{{ achieveData.leftAchieve || 0 }}</view>
|
||||
</view>
|
||||
<view class="flex_item" style="cursor: pointer;" @click="goDetail(1)">
|
||||
<view class="flex_item" style="cursor: pointer" @click="goDetail(1)">
|
||||
<view class="text1">左区血缘业绩</view>
|
||||
<view class="text2">{{ achieveData.leftDirectAchieve || 0 }}</view>
|
||||
</view>
|
||||
|
@ -57,13 +73,12 @@
|
|||
</view>
|
||||
</view>
|
||||
<view class="listrefor bg2">
|
||||
|
||||
<view class="flex_item">
|
||||
<view class="text1">右区业绩</view>
|
||||
<view class="text2">{{ achieveData.rightAchieve || 0 }}</view>
|
||||
</view>
|
||||
|
||||
<view class="flex_item" style="cursor: pointer;" @click="goDetail(2)">
|
||||
<view class="flex_item" style="cursor: pointer" @click="goDetail(2)">
|
||||
<view class="text1">右区血缘业绩</view>
|
||||
<view class="text2">{{ achieveData.rightDirectAchieve || 0 }}</view>
|
||||
</view>
|
||||
|
@ -72,19 +87,12 @@
|
|||
<view class="text2">{{ achieveData.rightCount || 0 }}</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
||||
</view>
|
||||
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import {
|
||||
getPlaceNewAddAchieve,
|
||||
getYjList
|
||||
} from "@/config/distribute.js";
|
||||
import { getPlaceNewAddAchieve, getYjList } from '@/config/distribute.js'
|
||||
export default {
|
||||
|
||||
data() {
|
||||
return {
|
||||
index: 0,
|
||||
|
@ -93,20 +101,24 @@
|
|||
|
||||
whatMounth: '',
|
||||
yjType: 1,
|
||||
yjName: "全部",
|
||||
yjName: '全部',
|
||||
showType: false,
|
||||
selMounthList: [],
|
||||
yjTypeList: [],
|
||||
yearShow: false,
|
||||
whatYear:"",
|
||||
selYearList:[{
|
||||
whatYear: '',
|
||||
selYearList: [
|
||||
{
|
||||
value: 0,
|
||||
label: new Date().getFullYear() - 1,
|
||||
},{
|
||||
},
|
||||
{
|
||||
value: 1,
|
||||
label: new Date().getFullYear(),
|
||||
}],
|
||||
mounthList: [{
|
||||
},
|
||||
],
|
||||
mounthList: [
|
||||
{
|
||||
value: 1,
|
||||
label: 1 + '月',
|
||||
},
|
||||
|
@ -152,13 +164,12 @@
|
|||
},
|
||||
{
|
||||
value: 12,
|
||||
label: 12 + '月'
|
||||
label: 12 + '月',
|
||||
},
|
||||
],
|
||||
}
|
||||
},
|
||||
created() {
|
||||
|
||||
this.getMounth()
|
||||
this.getYjList()
|
||||
setTimeout(() => {
|
||||
|
@ -166,10 +177,9 @@
|
|||
}, 50)
|
||||
},
|
||||
methods: {
|
||||
|
||||
goDetail(index) {
|
||||
uni.navigateTo({
|
||||
url:'/pages/performanceEchart/index?ifDetail='+index
|
||||
url: '/pages/performanceEchart/index?ifDetail=' + index,
|
||||
})
|
||||
},
|
||||
getYjList() {
|
||||
|
@ -195,7 +205,7 @@
|
|||
getMounth() {
|
||||
this.whatMounth = new Date().getMonth() + 1
|
||||
let selMounth = []
|
||||
this.mounthList.forEach((item) => {
|
||||
this.mounthList.forEach(item => {
|
||||
// if (item.value <= this.whatMounth) {
|
||||
// selMounth.push(item)
|
||||
// }
|
||||
|
@ -203,18 +213,16 @@
|
|||
})
|
||||
this.selMounthList = selMounth
|
||||
this.whatYear = new Date().getFullYear()
|
||||
|
||||
},
|
||||
getPlaceNewAddAchieve() {
|
||||
getPlaceNewAddAchieve({
|
||||
monthType: this.whatMounth,
|
||||
achievementType: this.yjType,
|
||||
year:this.whatYear
|
||||
}).then((res) => {
|
||||
this.achieveData = res.data;
|
||||
});
|
||||
}
|
||||
|
||||
year: this.whatYear,
|
||||
}).then(res => {
|
||||
this.achieveData = res.data
|
||||
})
|
||||
},
|
||||
},
|
||||
}
|
||||
</script>
|
||||
|
@ -225,8 +233,7 @@
|
|||
}
|
||||
|
||||
.select-flexs {
|
||||
|
||||
border: 1rpx solid #EEEEEE;
|
||||
border: 1rpx solid #eeeeee;
|
||||
border-radius: 15rpx;
|
||||
// width: 232rpx;
|
||||
padding: 20rpx 19rpx;
|
||||
|
@ -256,7 +263,7 @@
|
|||
}
|
||||
|
||||
.listrefor {
|
||||
color: #FFFFFF;
|
||||
color: #ffffff;
|
||||
border-radius: 10rpx;
|
||||
padding: 32rpx 21rpx;
|
||||
margin-top: 25rpx;
|
||||
|
@ -287,14 +294,14 @@
|
|||
}
|
||||
|
||||
.bg1 {
|
||||
background: linear-gradient(180deg, #FC7C7C 0%, #F65757 100%);
|
||||
background: linear-gradient(180deg, #fc7c7c 0%, #f65757 100%);
|
||||
}
|
||||
|
||||
.bg2 {
|
||||
background: linear-gradient(180deg, #FF9354 0%, #FF7F36 100%);
|
||||
background: linear-gradient(180deg, #ff9354 0%, #ff7f36 100%);
|
||||
}
|
||||
|
||||
.bg3 {
|
||||
background: linear-gradient(180deg, #677AF9 0%, #697BF2 100%);
|
||||
background: linear-gradient(180deg, #677af9 0%, #697bf2 100%);
|
||||
}
|
||||
</style>
|
Loading…
Reference in New Issue