From 0a257b3bb9916a6ec34033d16667741f3dbd6ec6 Mon Sep 17 00:00:00 2001 From: douzhuo <17611323298@163.com> Date: Wed, 22 Jun 2022 13:45:12 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=90=88=E5=B9=B6yun?= =?UTF-8?q?=E5=88=86=E6=94=AF=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../center/Piabodata/Employeesstatistics.vue | 101 ---- pages/index/customer.vue | 15 - pages/login/index.vue | 7 - pages/mine/registerForm.vue | 556 ------------------ 4 files changed, 679 deletions(-) diff --git a/pages/center/Piabodata/Employeesstatistics.vue b/pages/center/Piabodata/Employeesstatistics.vue index ca2eb17..041f38e 100644 --- a/pages/center/Piabodata/Employeesstatistics.vue +++ b/pages/center/Piabodata/Employeesstatistics.vue @@ -24,26 +24,6 @@ {{newlisttabinfo1.total}} 合计接待次数 -<<<<<<< HEAD - - 顾问 - {{newlisttabinfo1.count}}人 - - - 人均接待量 - {{newlisttabinfo1.avg}}次 - - - - - - - {{item.name.substring(0,4)}} - - -======= {{newlisttabinfo1.count}} 顾问人数 @@ -68,7 +48,6 @@ ->>>>>>> 142fe40c9bd7bb5931fb58af05a7f99bc705e816 {{item.zxl==null?0:item.zxl}}次 @@ -82,17 +61,6 @@ -<<<<<<< HEAD - 销讲执行率排行(TOP10) - - - - 顾问 - {{newlisttabinfo3.count}}人 - - - 人均执行率 -======= 平均执行率排行(TOP10) @@ -101,21 +69,10 @@ 顾问人数 ->>>>>>> 142fe40c9bd7bb5931fb58af05a7f99bc705e816 {{newlisttabinfo3.avg}}% 人均执行率 -<<<<<<< HEAD - - - - {{item.name.substring(0,4)}} - - -======= @@ -134,7 +91,6 @@ ->>>>>>> 142fe40c9bd7bb5931fb58af05a7f99bc705e816 {{item.zxl==null?0:item.zxl}}% @@ -144,11 +100,6 @@ -<<<<<<< HEAD - - -======= ->>>>>>> 142fe40c9bd7bb5931fb58af05a7f99bc705e816 @@ -159,25 +110,6 @@ {{newlisttabinfo2.total}} 合计时长/分钟 -<<<<<<< HEAD - - 顾问 - {{newlisttabinfo2.count}}人 - - - 人均录音时长 - {{newlisttabinfo2.avg}}分钟 - - - - - - {{item.name.substring(0,4)}} - - -======= {{newlisttabinfo2.count}} 顾问人数 @@ -201,7 +133,6 @@ ->>>>>>> 142fe40c9bd7bb5931fb58af05a7f99bc705e816 -<<<<<<< HEAD - @@ -183,13 +175,6 @@ }, }; }, -<<<<<<< HEAD - onLoad() {}, -======= - onLoad() { - // uni.hideTabBar(); - }, ->>>>>>> 142fe40c9bd7bb5931fb58af05a7f99bc705e816 computed: { timestamp() { return (e) => { diff --git a/pages/login/index.vue b/pages/login/index.vue index 2a4ab7a..851c466 100644 --- a/pages/login/index.vue +++ b/pages/login/index.vue @@ -56,15 +56,8 @@ export default { data() { return { -<<<<<<< HEAD username: '',//用户名 password: '',//密码 -======= - // username: '13388881113',//用户名-测试 13388881113 1234567 - // password: '1234567',//密码 - username: '13033782199',//用户名-生产 13033782199 654321 - password: '654321',//密码 ->>>>>>> 142fe40c9bd7bb5931fb58af05a7f99bc705e816 passwordType: true, agreeChecked: true }; diff --git a/pages/mine/registerForm.vue b/pages/mine/registerForm.vue index b1283ca..c3ed227 100644 --- a/pages/mine/registerForm.vue +++ b/pages/mine/registerForm.vue @@ -1,558 +1,3 @@ -<<<<<<< HEAD - - - -