diff --git a/pages/index/countEmployees.vue b/pages/index/countEmployees.vue index 7617614..050b90e 100644 --- a/pages/index/countEmployees.vue +++ b/pages/index/countEmployees.vue @@ -29,7 +29,6 @@ > - @@ -41,7 +40,10 @@ - {{ index + 1 }} + {{ index + 1 }} + {{ index + 1 }} + {{ index + 1 }} + {{ index + 1 }} diff --git a/pages/index/newindex.vue b/pages/index/newindex.vue index 7303219..ad5f25a 100644 --- a/pages/index/newindex.vue +++ b/pages/index/newindex.vue @@ -97,11 +97,11 @@ - + 员工统计 - + 当日订单统计 diff --git a/pages/manage/workReport/reportDetals.vue b/pages/manage/workReport/reportDetals.vue index dabeef6..6595960 100644 --- a/pages/manage/workReport/reportDetals.vue +++ b/pages/manage/workReport/reportDetals.vue @@ -224,7 +224,7 @@ export default { }).then(res => { if (res.code === 200) { uni.showToast({ - title: '操作成功', + title: '提交成功', icon: 'none', duration: 2000 }); diff --git a/pages/statistics/business.vue b/pages/statistics/business.vue index 580dfa6..309e737 100644 --- a/pages/statistics/business.vue +++ b/pages/statistics/business.vue @@ -111,6 +111,11 @@ 已收款金额 + + {{ item.text }} + + @@ -139,6 +144,14 @@ export default { unit: 'week', unit1: 'week', unit2: 'week', + qhindex2: 0, + zilist: [ + {text: '日', unit: 'day'}, + {text: '周', unit: 'week'}, + {text: '月', unit: 'month'}, + {text: '年', unit: 'year'}, + + ], titles: "业务统计", value1: Number(new Date()), @@ -471,8 +484,8 @@ export default { }, gbindex2(index, unit) { this.qhindex2 = index - this.unit2 = unit - this.getServerData3() + this.unit = unit + this.getServerData1() }, getback() { uni.navigateBack() @@ -810,4 +823,28 @@ export default { width: 100%; height: 452rpx; } + +.yi { + font-size: 15px; + font-weight: 400; + color: #666666; + line-height: 15px; + margin-right: 15px; +} + +.er { + width: 25px; + height: 25px; + background: #1890FF; + border-radius: 3px; + display: flex; + align-items: center; + justify-content: center; + color: white !important; +} + +.lan-you { + display: flex; + align-items: center; +} diff --git a/static/imgs/dayorder.png b/static/imgs/dayorder.png new file mode 100644 index 0000000..a7db1cc Binary files /dev/null and b/static/imgs/dayorder.png differ diff --git a/static/imgs/newHome.png b/static/imgs/newHome.png new file mode 100644 index 0000000..a447582 Binary files /dev/null and b/static/imgs/newHome.png differ diff --git a/static/imgs/oneStaff.png b/static/imgs/oneStaff.png new file mode 100644 index 0000000..3e1bb96 Binary files /dev/null and b/static/imgs/oneStaff.png differ diff --git a/static/imgs/staffcounnt.png b/static/imgs/staffcounnt.png new file mode 100644 index 0000000..f56abc1 Binary files /dev/null and b/static/imgs/staffcounnt.png differ diff --git a/static/imgs/threeStaff.png b/static/imgs/threeStaff.png new file mode 100644 index 0000000..8a91a08 Binary files /dev/null and b/static/imgs/threeStaff.png differ diff --git a/static/imgs/twoStaff.png b/static/imgs/twoStaff.png new file mode 100644 index 0000000..b6533e9 Binary files /dev/null and b/static/imgs/twoStaff.png differ