From 3b0d2b53f1f32c8df3d592715c57bfd40750a3f3 Mon Sep 17 00:00:00 2001 From: jyt <1592211625@qq.com> Date: Wed, 22 Jun 2022 22:41:32 +0800 Subject: [PATCH 01/31] =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/center/Piabodata/Userinsightinto.vue | 4 ++-- pages/center/consumer/consumerDetail.vue | 2 +- pages/center/records/index.vue | 2 +- pages/mine/details2.vue | 2 +- utils/domain.js | 5 ++--- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/pages/center/Piabodata/Userinsightinto.vue b/pages/center/Piabodata/Userinsightinto.vue index c4e3090..60b021a 100644 --- a/pages/center/Piabodata/Userinsightinto.vue +++ b/pages/center/Piabodata/Userinsightinto.vue @@ -147,11 +147,11 @@ }); }else if(i==2){ uni.navigateTo({ - url: '/pages/center/records/index?refresh='+'refresh'+'&activeTotal='+this.activeTotal+'&markAdvisor=1'+'&staTime='+this.timeobj.statDateStart+'&endtime='+this.timeobj.statDateEnd + url: '/pages/center/records/index?refresh='+'refresh'+'&activeTotal='+this.activeTotal+'&markAdvisor=1&validInvalid=0'+'&staTime='+this.timeobj.statDateStart+'&endtime='+this.timeobj.statDateEnd }); }else{ uni.navigateTo({ - url: '/pages/center/records/index?refresh='+'refresh'+'&activeTotal='+this.activeTotal+'&markAdvisor=0'+'&staTime='+this.timeobj.statDateStart+'&endtime='+this.timeobj.statDateEnd + url: '/pages/center/records/index?refresh='+'refresh'+'&activeTotal='+this.activeTotal+'&markAdvisor=0&validInvalid=0'+'&staTime='+this.timeobj.statDateStart+'&endtime='+this.timeobj.statDateEnd }); } }, diff --git a/pages/center/consumer/consumerDetail.vue b/pages/center/consumer/consumerDetail.vue index 053b325..1205e50 100644 --- a/pages/center/consumer/consumerDetail.vue +++ b/pages/center/consumer/consumerDetail.vue @@ -33,7 +33,7 @@ - 顾问姓名：{{customerInfo.agentName}} + 顾问姓名：{{customerInfo.ownerName}} 添加时间：{{customerInfo.createTime}} diff --git a/pages/center/records/index.vue b/pages/center/records/index.vue index b1b79e1..7f98da5 100644 --- a/pages/center/records/index.vue +++ b/pages/center/records/index.vue @@ -343,7 +343,7 @@ } if (options.staTime) { this.staTime = options.staTime; - this.endtime = options.endtime; + this.endtime = options.endtime+' 23:59:59'; } }, diff --git a/pages/mine/details2.vue b/pages/mine/details2.vue index 438ead9..4b47e4f 100644 --- a/pages/mine/details2.vue +++ b/pages/mine/details2.vue @@ -283,7 +283,7 @@ 话术内容 - {{inc+1}}.{{che.name}} + {{inc+1}}.{{che.name}} diff --git a/utils/domain.js b/utils/domain.js index 656f1a7..3bdd840 100644 --- a/utils/domain.js +++ b/utils/domain.js @@ -1,10 +1,9 @@ // http.js使用域名 -const baseUrl = 'http://81.70.55.170:9090/autoSR/api';// 最新测试 +// const baseUrl = 'http://81.70.55.170:9090/autoSR/api';// 最新测试 // const baseUrl = 'http://192.168.31.211:8080/api';// 泽明 // const baseUrl = 'http://localhost:8080/autoSR/api'; // 本地 // const baseUrl = 'http://192.168.31.161:8080/autoSR/api'; // 长龙 -// const baseUrl = 'http://192.168.31.86:9090/api'; // 盛浩 -// const baseUrl = 'https://zkgj.quhouse.com/api'; // 质控正式 +const baseUrl = 'https://zkgj.quhouse.com/api'; // 质控正式 // const baseUrl = 'https://hfju.com/api'; // 数智正式 From 603e484728f926948e822beb5cd75b93bdce9ea0 Mon Sep 17 00:00:00 2001 From: jyt <1592211625@qq.com> Date: Thu, 23 Jun 2022 10:20:58 +0800 Subject: [PATCH 02/31] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=94=BB=E5=83=8F?= =?UTF-8?q?=E7=A9=BF=E9=80=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/center/records/index.vue | 3 +++ pages/mine/details2.vue | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pages/center/records/index.vue b/pages/center/records/index.vue index 7f98da5..36329b9 100644 --- a/pages/center/records/index.vue +++ b/pages/center/records/index.vue @@ -342,6 +342,7 @@ this.screen.validInvalid = options.validInvalid } if (options.staTime) { + this.staTime = options.staTime; this.endtime = options.endtime+' 23:59:59'; } @@ -555,6 +556,8 @@ let orderBy = 0; if (this.activeTotal == 5) { dateType = null; + } else if (this.activeTotal == 3) { + dateType = null; } else if (this.activeTotal == 4) { dateType = null; } else { diff --git a/pages/mine/details2.vue b/pages/mine/details2.vue index 4b47e4f..438ead9 100644 --- a/pages/mine/details2.vue +++ b/pages/mine/details2.vue @@ -283,7 +283,7 @@ 话术内容 - {{inc+1}}.{{che.name}} + {{inc+1}}.{{che.name}} From d05ef27e7fde629a72461e15a9f7a4165f07ed40 Mon Sep 17 00:00:00 2001 From: douzhuo <17611323298@163.com> Date: Mon, 27 Jun 2022 18:48:12 +0800 Subject: [PATCH 03/31] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=9D=E7=A6=81?= =?UTF-8?q?=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/mine/reception/addreception.vue | 35 +++++++----- utils/domain.js | 4 +- utils/http.js | 79 ++++++++++++++------------- 3 files changed, 64 insertions(+), 54 deletions(-) diff --git a/pages/mine/reception/addreception.vue b/pages/mine/reception/addreception.vue index 171def5..4852c86 100644 --- a/pages/mine/reception/addreception.vue +++ b/pages/mine/reception/addreception.vue @@ -54,21 +54,25 @@ - 顾问 - - - 接待顾问 - - - {{text}} - 请选择接待顾问 - - - + + + 确定 @@ -126,6 +130,11 @@ fdFlag:null }; }, + + computed: { + + }, + onShow() { this.parames.projectId = uni.getStorageSync('buildingID').id; console.log(this.$u) diff --git a/utils/domain.js b/utils/domain.js index 656f1a7..4c3a409 100644 --- a/utils/domain.js +++ b/utils/domain.js @@ -1,8 +1,8 @@ // http.js使用域名 -const baseUrl = 'http://81.70.55.170:9090/autoSR/api';// 最新测试 +// const baseUrl = 'http://81.70.55.170:9090/autoSR/api';// 最新测试 // const baseUrl = 'http://192.168.31.211:8080/api';// 泽明 // const baseUrl = 'http://localhost:8080/autoSR/api'; // 本地 -// const baseUrl = 'http://192.168.31.161:8080/autoSR/api'; // 长龙 +const baseUrl = 'http://192.168.31.161:8080/autoSR/api'; // 长龙 // const baseUrl = 'http://192.168.31.86:9090/api'; // 盛浩 // const baseUrl = 'https://zkgj.quhouse.com/api'; // 质控正式 // const baseUrl = 'https://hfju.com/api'; // 数智正式 diff --git a/utils/http.js b/utils/http.js index d61de6b..5babc8b 100644 --- a/utils/http.js +++ b/utils/http.js @@ -1,5 +1,6 @@ - -import { baseUrl } from './domain.js' +import { + baseUrl +} from './domain.js' const install = (Vue, vm) => { Vue.prototype.$u.http.setConfig({ @@ -7,44 +8,44 @@ const install = (Vue, vm) => { loadingText: '加载中~', loadingTime: 800, }); - // 请求拦截,如果有token,携带token - Vue.prototype.$u.http.interceptor.request = (config) => { - const token = uni.getStorageSync('weapp_session_login_data'); - if(token){ - config.header['Access-Token'] = token.token; - } - return config - } - // 响应拦截，公共错误处理 - Vue.prototype.$u.http.interceptor.response = (res) => { - if(res.code == 10000) { - return res.data; - }else if(res.code == 10003 || res.code == 20006){ - uni.hideToast(); - uni.showToast({ - icon:"none", - title:"您的登录已失效，请重新登录", - duration: 2000 - }) - uni.clearStorageSync(); - setTimeout(function () { - uni.reLaunch({ - url: '/pages/login/index' - }); - },2000); - return false; - }else{ - uni.hideLoading(); - uni.showToast({ - icon:"none", - title:res.message, - duration: 3000 - }) - return false; - } - } + // 请求拦截,如果有token,携带token + Vue.prototype.$u.http.interceptor.request = (config) => { + const token = uni.getStorageSync('weapp_session_login_data'); + if (token) { + config.header['Access-Token'] = token.token; + } + return config + } + // 响应拦截，公共错误处理 + Vue.prototype.$u.http.interceptor.response = (res) => { + if (res.code == 10000) { + return res.data; + } else if (res.code == 10003 || res.code == 20006) { + uni.hideToast(); + uni.showToast({ + icon: "none", + title: "您的登录已失效，请重新登录", + duration: 2000 + }) + uni.clearStorageSync(); + setTimeout(function() { + uni.reLaunch({ + url: '/pages/login/index' + }); + }, 2000); + return false; + } else { + uni.hideLoading(); + uni.showToast({ + icon: "none", + title: res.message, + duration: 3000 + }) + return false; + } + } } export default { install -} \ No newline at end of file +} From 479c0b46b6b476f4ece9a4aa45dc7f1c75f5a04c Mon Sep 17 00:00:00 2001 From: douzhuo <17611323298@163.com> Date: Tue, 28 Jun 2022 13:46:54 +0800 Subject: [PATCH 04/31] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=9D=83=E9=99=90?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E8=8F=9C=E5=8D=95=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 2 +- pages/index/index.vue | 487 +++++++++++++++----------- pages/mine/reception/addreception.vue | 10 +- utils/domain.js | 4 +- 4 files changed, 287 insertions(+), 216 deletions(-) diff --git a/App.vue b/App.vue index 4188216..dc6f904 100644 --- a/App.vue +++ b/App.vue @@ -87,7 +87,7 @@ str = String.fromCharCode(num + 64) } return str - } + }, } }); } diff --git a/pages/index/index.vue b/pages/index/index.vue index c237af6..7ef6c2d 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -60,7 +60,7 @@ 设备 - + {{equipmentobj.totalNum || 0}} 设备总数 @@ -90,7 +90,7 @@ --> - + @@ -102,13 +102,13 @@ 有效接待 - {{realtimeobj.receivingCustomer || 0}} + {{realtimeobj.receivingCustomer || 0}} 正在接待 {{realtimeobj.tagCustomer || 0}} 未标顾问 - + @@ -119,31 +119,36 @@ {{realtimeobj.fraction || 0}}% 平均执行率 - - {{realtimeobj.prohibitedCustomer || 0}} + + + {{realtimeobj.prohibitedCustomer || 0}} + 违禁预警 - + - + 概览 - 近7天 - 近30天 - 自定义 + 近7天 + + + 近30天 + 自定义 + - + {{Thisweekobj.receptionCount || 0}} 接待量 @@ -151,18 +156,18 @@ {{Thisweekobj.activeCustomer|| 0}} 有效接待 - - {{Thisweekobj.fraction || 0}}% + + {{Thisweekobj.fraction || 0}}% 平均执行率 - + {{Thisweekobj.avgDuration|| 0}} 平均接待时长 - {{Thisweekobj.prohibitedCustomer || 0}} + {{Thisweekobj.prohibitedCustomer || 0}} 违禁预警 @@ -175,26 +180,14 @@ - + 常用功能 - + - - - - - - - + {{item.name}} @@ -214,7 +207,7 @@ {{tit}} - + 查看详情 @@ -223,8 +216,8 @@ - - + + @@ -237,11 +230,11 @@ export default { data() { return { - id:"", - isShowUpdate:false, - tit:"", - content:"", - tabbarList:tabbarList, + id: "", + isShowUpdate: false, + tit: "", + content: "", + tabbarList: tabbarList, current: 0, userInfo: {}, Showhiddenunits: false, @@ -270,7 +263,7 @@ prohibitedCustomer: '', tagCustomer: '', fraction: '', - receptionCount:'' + receptionCount: '' }, Thisweekobj: { sumCustomer: '', @@ -279,38 +272,41 @@ prohibitedCustomer: '', tagCustomer: '', fraction: '', - receptionCount:'' + receptionCount: '' }, - methodsisshow:false, - zhixingcenterindex:2, + methodsisshow: false, + zhixingcenterindex: 2, totalTimeShow: false, - statDateStart:'', - statDateEnd:'', + statDateStart: '', + statDateEnd: '', + needShow: ['客户管理', '接待记录', '销讲数据', '设备管理', '值班顾问', '违禁记录'], // 权限配置需要展示出来的功能入口 }; }, + + computed: { showMenu() { return name => { - if (name == '标记有效无效接待' || name == '结束接待' || name == '客户编辑') { - return false - } else { + if (this.needShow.findIndex(item => item == name) != -1) { return true + } else { + return false } } } }, components: { - uParse + uParse }, onShow() { this.getMenu() - + this.userInfo = uni.getStorageSync('weapp_session_userInfo_data'); - - if(this.userInfo.dataCode==6 || this.userInfo.dataCode==3){ - this.methodsisshow=false; - }else{ - this.methodsisshow=true; + + if (this.userInfo.dataCode == 6 || this.userInfo.dataCode == 3) { + this.methodsisshow = false; + } else { + this.methodsisshow = true; } if (this.userInfo.zkProperties.length == 1) { this.buildingID = uni.getStorageSync('buildingID').id; @@ -341,7 +337,7 @@ }, onPullDownRefresh() { this.getMenu() - + this.userInfo = uni.getStorageSync('weapp_session_userInfo_data'); if (this.userInfo.dataCode == 6 || this.userInfo.dataCode == 3) { this.methodsisshow = false; @@ -382,10 +378,10 @@ this.initPopup() }, methods: { - close(){ + close() { this.isShowUpdate = false; }, - lookDetail(){ + lookDetail() { let datas = { id: this.id, title: this.tit, @@ -396,8 +392,8 @@ url: "../mine/messageDetail" }) let data = { - id:this.id, - accountId:uni.getStorageSync('weapp_session_userInfo_data').accountId + id: this.id, + accountId: uni.getStorageSync('weapp_session_userInfo_data').accountId } uni.request({ url: config.service.updateRead, @@ -413,7 +409,7 @@ }) this.isShowUpdate = false; }, - initPopup(){ + initPopup() { uni.request({ url: config.service.updatePopup, method: "GET", @@ -421,9 +417,9 @@ 'content-type': 'application/json', 'Access-Token': uni.getStorageSync('weapp_session_login_data').token }, - + data: { - + }, success: (res) => { this.first(res.data.data.id) @@ -431,11 +427,11 @@ this.tit = res.data.data.title this.aid = res.data.data.accountId this.id = res.data.data.id - this.isShowUpdate = res.data.data.readFlag==0?true:false; + this.isShowUpdate = res.data.data.readFlag == 0 ? true : false; } }) }, - first(id){ + first(id) { uni.request({ url: config.service.firstShowPopup, method: "GET", @@ -443,7 +439,9 @@ 'content-type': 'application/json', 'Access-Token': uni.getStorageSync('weapp_session_login_data').token }, - data:{id}, + data: { + id + }, success: (res) => {} }) }, @@ -453,7 +451,7 @@ method: "GET", data: { id: uni.getStorageSync('weapp_session_userInfo_data').accountId, - projectId: uni.getStorageSync('buildingID').id, + projectId: uni.getStorageSync('buildingID').id, }, header: { 'content-type': 'application/json', @@ -465,28 +463,28 @@ } }) }, - + //获取权限 - getMenu(){ + getMenu() { this.$u.get("/user/getMenu").then(data => { uni.setStorageSync("weapp_session_Menu_data", data) this.Menulist = uni.getStorageSync('weapp_session_Menu_data'); console.log(this.Menulist, 'adasdasds123') - }) + }) }, //自定义时间 totalTimeChange(e) { - this.statDateStart=e.startDate; - this.statDateEnd=e.endDate; - this.zhixingcenterindex=7; + this.statDateStart = e.startDate; + this.statDateEnd = e.endDate; + this.zhixingcenterindex = 7; this.initworkThisWeek() }, //时间选择 - tabtimeclick(i){ - if(i==7){ + tabtimeclick(i) { + if (i == 7) { this.totalTimeShow = true; - }else{ - this.zhixingcenterindex=i; + } else { + this.zhixingcenterindex = i; this.initworkThisWeek() } }, @@ -501,9 +499,9 @@ }, data: { houseId: this.buildingID, - dateType:this.zhixingcenterindex==7?null:this.zhixingcenterindex, - statDateStart:this.statDateStart, - statDateEnd:this.statDateEnd + dateType: this.zhixingcenterindex == 7 ? null : this.zhixingcenterindex, + statDateStart: this.statDateStart, + statDateEnd: this.statDateEnd }, success: (data) => { if (data.data.data == null) { @@ -514,10 +512,10 @@ receivingCustomer: data.data.data.receivingCustomer, activeCustomer: data.data.data.activeCustomer, prohibitedCustomer: data.data.data.prohibitedCustomer, - avgDuration: Math.floor(data.data.data.avgDuration/60) ||0, + avgDuration: Math.floor(data.data.data.avgDuration / 60) || 0, tagCustomer: data.data.data.tagCustomer, fraction: data.data.data.fraction, - receptionCount:data.data.data.receptionCount + receptionCount: data.data.data.receptionCount } } } @@ -544,16 +542,16 @@ receivingCustomer: data.data.data.receivingCustomer, activeCustomer: data.data.data.activeCustomer, prohibitedCustomer: data.data.data.prohibitedCustomer, - avgDuration: Math.floor(data.data.data.avgDuration/60) ||0, + avgDuration: Math.floor(data.data.data.avgDuration / 60) || 0, tagCustomer: data.data.data.tagCustomer, fraction: data.data.data.fraction, - receptionCount:data.data.data.receptionCount + receptionCount: data.data.data.receptionCount } } } }) }, - + //设备 initequipment() { uni.request({ @@ -625,7 +623,7 @@ piskbuilding() { // this.Showhiddenunits = true; uni.navigateTo({ - url:"../mine/selectBuilding" + url: "../mine/selectBuilding" }) }, // 项目选择确认 @@ -641,127 +639,153 @@ this.initrealTimeStatistics() this.initequipment() this.iniodianloang() - + }, // 项目选择取消 cancel() { this.Showhiddenunits = false; }, - tapjumpequipment(i){ - this.Menulist.forEach(item=>{ - if(item.name=='设备管理'){ + tapjumpequipment(i) { + this.Menulist.forEach(item => { + if (item.name == '设备管理') { uni.navigateTo({ - url: '/pages/mine/equipment/index?active='+i + url: '/pages/mine/equipment/index?active=' + i }); } }) }, - prohibitedtap(i){ - if(i==1){ + prohibitedtap(i) { + if (i == 1) { uni.navigateTo({ - url: '/pages/center/prohibited/index?refresh='+'refresh'+'&activeTotal='+'0'+'&violatedStatus=1' + url: '/pages/center/prohibited/index?refresh=' + 'refresh' + '&activeTotal=' + '0' + + '&violatedStatus=1' }); - }else{ - if(this.zhixingcenterindex==2){ + } else { + if (this.zhixingcenterindex == 2) { uni.navigateTo({ - url: '/pages/center/prohibited/index?refresh='+'refresh'+'&activeTotal='+'2'+'&violatedStatus=1' + url: '/pages/center/prohibited/index?refresh=' + 'refresh' + '&activeTotal=' + '2' + + '&violatedStatus=1' }); - }else if(this.zhixingcenterindex==6){ + } else if (this.zhixingcenterindex == 6) { uni.navigateTo({ - url: '/pages/center/prohibited/index?refresh='+'refresh'+'&activeTotal='+'3'+'&violatedStatus=1' + url: '/pages/center/prohibited/index?refresh=' + 'refresh' + '&activeTotal=' + '3' + + '&violatedStatus=1' }); - }else{ + } else { uni.navigateTo({ - url: '/pages/center/prohibited/index?refresh='+'refresh'+'&activeTotal='+'4'+'&staTime='+this.statDateStart+'&endtime='+this.statDateEnd+'&violatedStatus=1' + url: '/pages/center/prohibited/index?refresh=' + 'refresh' + '&activeTotal=' + '4' + + '&staTime=' + this.statDateStart + '&endtime=' + this.statDateEnd + + '&violatedStatus=1' }); } } }, - tapjumpreception(i){ - this.Menulist.forEach(item=>{ - if(item.name=='接待记录'){ - if(i==1){ + tapjumpreception(i) { + this.Menulist.forEach(item => { + if (item.name == '接待记录') { + if (i == 1) { uni.navigateTo({ - url: '/pages/center/records/index?refresh='+'refresh'+'&activeTotal='+'0' + url: '/pages/center/records/index?refresh=' + 'refresh' + '&activeTotal=' + + '0' }); } else if (i == 'auth') { uni.navigateTo({ - url: '/pages/center/records/index?refresh='+'refresh'+'&activeTotal='+'0'+'&validInvalid=0' + url: '/pages/center/records/index?refresh=' + 'refresh' + '&activeTotal=' + + '0' + '&validInvalid=0' }); - }else if(i==2){ + } else if (i == 2) { uni.switchTab({ url: '/pages/index/customer' }); - }else if(i==3){ - if(this.zhixingcenterindex==2){ + } else if (i == 3) { + if (this.zhixingcenterindex == 2) { uni.navigateTo({ - url: '/pages/center/records/index?refresh='+'refresh'+'&activeTotal='+'2' + url: '/pages/center/records/index?refresh=' + 'refresh' + + '&activeTotal=' + '2' }); - }else if(this.zhixingcenterindex==6){ + } else if (this.zhixingcenterindex == 6) { uni.navigateTo({ - url: '/pages/center/records/index?refresh='+'refresh'+'&activeTotal='+'3' + url: '/pages/center/records/index?refresh=' + 'refresh' + + '&activeTotal=' + '3' }); - }else{ + } else { uni.navigateTo({ - url: '/pages/center/records/index?refresh='+'refresh'+'&activeTotal='+'4'+'&staTime='+this.statDateStart+'&endtime='+this.statDateEnd + url: '/pages/center/records/index?refresh=' + 'refresh' + + '&activeTotal=' + '4' + '&staTime=' + this.statDateStart + + '&endtime=' + this.statDateEnd }); } - - }else if(i==333){ - if(this.zhixingcenterindex==2){ + + } else if (i == 333) { + if (this.zhixingcenterindex == 2) { uni.navigateTo({ - url: '/pages/center/records/index?refresh='+'refresh'+'&activeTotal='+'2'+'&validInvalid=0' + url: '/pages/center/records/index?refresh=' + 'refresh' + + '&activeTotal=' + '2' + '&validInvalid=0' }); - }else if(this.zhixingcenterindex==6){ + } else if (this.zhixingcenterindex == 6) { uni.navigateTo({ - url: '/pages/center/records/index?refresh='+'refresh'+'&activeTotal='+'3'+'&validInvalid=0' + url: '/pages/center/records/index?refresh=' + 'refresh' + + '&activeTotal=' + '3' + '&validInvalid=0' }); - }else{ + } else { uni.navigateTo({ - url: '/pages/center/records/index?refresh='+'refresh'+'&activeTotal='+'4'+'&staTime='+this.statDateStart+'&endtime='+this.statDateEnd+'&validInvalid=0' + url: '/pages/center/records/index?refresh=' + 'refresh' + + '&activeTotal=' + '4' + '&staTime=' + this.statDateStart + + '&endtime=' + this.statDateEnd + '&validInvalid=0' }); } - - }else if(i==3){ - if(this.zhixingcenterindex==2){ + + } else if (i == 3) { + if (this.zhixingcenterindex == 2) { uni.navigateTo({ - url: '/pages/center/records/index?refresh='+'refresh'+'&activeTotal='+'2' + url: '/pages/center/records/index?refresh=' + 'refresh' + + '&activeTotal=' + '2' }); - }else if(this.zhixingcenterindex==6){ + } else if (this.zhixingcenterindex == 6) { uni.navigateTo({ - url: '/pages/center/records/index?refresh='+'refresh'+'&activeTotal='+'3' + url: '/pages/center/records/index?refresh=' + 'refresh' + + '&activeTotal=' + '3' }); - }else{ + } else { uni.navigateTo({ - url: '/pages/center/records/index?refresh='+'refresh'+'&activeTotal='+'4'+'&staTime='+this.statDateStart+'&endtime='+this.statDateEnd + url: '/pages/center/records/index?refresh=' + 'refresh' + + '&activeTotal=' + '4' + '&staTime=' + this.statDateStart + + '&endtime=' + this.statDateEnd }); } - - }else if(i==6){ + + } else if (i == 6) { uni.navigateTo({ - url: '/pages/center/records/index?refresh='+'refresh'+'&activeTotal='+'0'+'&validInvalid=0' + url: '/pages/center/records/index?refresh=' + 'refresh' + '&activeTotal=' + + '0' + '&validInvalid=0' }); - }else if(i==7){ - if(this.zhixingcenterindex==2){ + } else if (i == 7) { + if (this.zhixingcenterindex == 2) { uni.navigateTo({ - url: '/pages/center/records/index?refresh='+'refresh'+'&activeTotal='+'2'+'&validInvalid=0' + url: '/pages/center/records/index?refresh=' + 'refresh' + + '&activeTotal=' + '2' + '&validInvalid=0' }); - }else if(this.zhixingcenterindex==6){ + } else if (this.zhixingcenterindex == 6) { uni.navigateTo({ - url: '/pages/center/records/index?refresh='+'refresh'+'&activeTotal='+'3'+'&validInvalid=0' + url: '/pages/center/records/index?refresh=' + 'refresh' + + '&activeTotal=' + '3' + '&validInvalid=0' }); - }else{ + } else { uni.navigateTo({ - url: '/pages/center/records/index?refresh='+'refresh'+'&activeTotal='+'4'+'&staTime='+this.statDateStart+'&endtime='+this.statDateEnd+'&validInvalid=0' + url: '/pages/center/records/index?refresh=' + 'refresh' + + '&activeTotal=' + '4' + '&staTime=' + this.statDateStart + + '&endtime=' + this.statDateEnd + '&validInvalid=0' }); } - }else if (i == 4) { + } else if (i == 4) { uni.navigateTo({ - url: '/pages/center/records/index?refresh='+'refresh'+'&activeTotal=0'+'&markAdvisor=0'+'&validInvalid=0' + url: '/pages/center/records/index?refresh=' + 'refresh' + + '&activeTotal=0' + '&markAdvisor=0' + '&validInvalid=0' }); - }else{ + } else { uni.navigateTo({ - url: '/pages/center/records/index?refresh='+'refresh'+'&activeTotal=0'+'&markAdvisor=0' + url: '/pages/center/records/index?refresh=' + 'refresh' + + '&activeTotal=0' + '&markAdvisor=0' }); } } @@ -774,7 +798,7 @@ }); } else if (item == '接待记录') { uni.navigateTo({ - url: '/pages/center/records/index?refresh='+'refresh' + url: '/pages/center/records/index?refresh=' + 'refresh' }); } else if (item == '值班顾问') { uni.navigateTo({ @@ -784,97 +808,140 @@ uni.navigateTo({ url: '/pages/mine/equipment/index' }); - } else if(item == '顾问排名') { + } else if (item == '顾问排名') { uni.navigateTo({ url: '/pages/center/Piabodata/Employeesstatistics' }); - }else if(item == '违禁记录'){ + } else if (item == '违禁记录') { uni.navigateTo({ - url: '/pages/center/prohibited/index?refresh='+'refresh' + url: '/pages/center/prohibited/index?refresh=' + 'refresh' }); - }else{ + } else { uni.navigateTo({ - url: '/pages/center/consumer/index?refresh='+'refresh' + url: '/pages/center/consumer/index?refresh=' + 'refresh' }); } }, }, + filters: { + imgFilter(type) { + let path = '' + switch (type) { + case '客户管理': + path = '../../static/images/function1.png' + break + case '接待记录': + path = '../../static/images/function2.png' + break + case '销讲数据': + path = '../../static/images/function4.png' + break + case '设备管理': + path = '../../static/images/function5.png' + break + case '值班顾问': + path = '../../static/images/function6.png' + break + case '顾问排名': + path = '../../static/images/rankingguwen.png' + break + case '违禁记录': + path = '../../static/images/prohibited.png' + break + } + + console.log(path) + return path + } + } + }; From 9f6d4b9e26628b5d83b0c1aff20df9ef0b459a73 Mon Sep 17 00:00:00 2001 From: douzhuo <17611323298@163.com> Date: Wed, 29 Jun 2022 11:00:39 +0800 Subject: [PATCH 06/31] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9C=AC=E5=9C=B0api?= =?UTF-8?q?=E5=9F=9F=E5=90=8D=E4=BF=AE=E6=94=B9=E6=97=A5=E6=8A=A5=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/index/index.vue | 4 +--- pages/reportExcel/dayReport.vue | 8 +++++++- utils/domain.js | 8 ++++---- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/pages/index/index.vue b/pages/index/index.vue index 7ef6c2d..b4fcc21 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -279,7 +279,7 @@ totalTimeShow: false, statDateStart: '', statDateEnd: '', - needShow: ['客户管理', '接待记录', '销讲数据', '设备管理', '值班顾问', '违禁记录'], // 权限配置需要展示出来的功能入口 + needShow: ['客户管理', '接待记录', '销讲数据', '设备管理', '值班顾问', '顾问排名', '违禁记录'], // 权限配置需要展示出来的功能入口 }; }, @@ -850,8 +850,6 @@ path = '../../static/images/prohibited.png' break } - - console.log(path) return path } } diff --git a/pages/reportExcel/dayReport.vue b/pages/reportExcel/dayReport.vue index f6e12fc..3db0938 100644 --- a/pages/reportExcel/dayReport.vue +++ b/pages/reportExcel/dayReport.vue @@ -443,8 +443,14 @@ // 分割数组排名前三，倒三 getTopThree() { if (this.weekObj.XJTopList && this.weekObj.XJTopList.length > 0) { - this.carryOutLast = this.weekObj.XJTopList.slice(0, 3) + this.carryOutLast = this.weekObj.XJTopList.slice(0, 3).reverse() + this.carryOutLast.map((item, index) => { + if (item.value == 100) { + this.carryOutLast.splice(index, 1) + } + }) this.carryOutTop = this.weekObj.XJTopList.reverse().slice(0, 3) + console.log(this.weekObj.XJTopList) } if (this.weekObj.ZXLTopList && this.weekObj.ZXLTopList.length > 0) { this.consultant = this.weekObj.ZXLTopList.reverse().slice(0, 3) diff --git a/utils/domain.js b/utils/domain.js index 656f1a7..abe75ea 100644 --- a/utils/domain.js +++ b/utils/domain.js @@ -1,10 +1,10 @@ // http.js使用域名 -const baseUrl = 'http://81.70.55.170:9090/autoSR/api';// 最新测试 -// const baseUrl = 'http://192.168.31.211:8080/api';// 泽明 -// const baseUrl = 'http://localhost:8080/autoSR/api'; // 本地 +// const baseUrl = 'http://81.70.55.170:9090/autoSR/api';// 最新测试 +// const baseUrl = 'http://192.168.31.148:8080/api';// 泽明 +// const baseUrl = 'http://127.0.0.1:8080/autoSR/api'; // 本地 // const baseUrl = 'http://192.168.31.161:8080/autoSR/api'; // 长龙 // const baseUrl = 'http://192.168.31.86:9090/api'; // 盛浩 -// const baseUrl = 'https://zkgj.quhouse.com/api'; // 质控正式 +const baseUrl = 'https://zkgj.quhouse.com/api'; // 质控正式 // const baseUrl = 'https://hfju.com/api'; // 数智正式 From f308bdd8c6b9d80e209306bdd833bf442dcb680a Mon Sep 17 00:00:00 2001 From: jyt <1592211625@qq.com> Date: Wed, 29 Jun 2022 11:43:54 +0800 Subject: [PATCH 07/31] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/mine/details.vue | 6 +++++- pages/mine/details2.vue | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/pages/mine/details.vue b/pages/mine/details.vue index 67dcaae..65d61b0 100644 --- a/pages/mine/details.vue +++ b/pages/mine/details.vue @@ -116,7 +116,7 @@ - + 设备日志 @@ -282,10 +282,14 @@ ACTION: Symbol('zaudio'), // 唯一值区分每个页面的方法 isPageHide: false, // 是否息屏 duration: '', // 总时长 + eqLog:0, }; }, onLoad(options) { + let menu = uni.getStorageSync('weapp_session_Menu_data'); + this.eqLog = menu.findIndex(item=>item.name=='设备日志'); + this.status = options.status; this.customerId = options.customerId; this.itemobj = uni.getStorageSync('searchobj'); diff --git a/pages/mine/details2.vue b/pages/mine/details2.vue index eebd19a..390197d 100644 --- a/pages/mine/details2.vue +++ b/pages/mine/details2.vue @@ -97,7 +97,7 @@ mode=""> 更多 - 设备日志 + 设备日志 接待信息 {{userlistobj.validInvalidName}} @@ -541,6 +541,7 @@ isPageHide: false, // 是否息屏 duration: '', // 总时长 isBand: false, // 阻止二次提交 + eqLog:0 }; }, computed: { @@ -551,6 +552,9 @@ }, }, onLoad(options) { + let menu = uni.getStorageSync('weapp_session_Menu_data'); + this.eqLog = menu.findIndex(item=>item.name=='设备日志'); + this.status = options.status; this.customerId = options.customerId; this.itemobj = uni.getStorageSync('searchobj'); From 9567466e67ddb0e2c55f197a61313541504cd2a9 Mon Sep 17 00:00:00 2001 From: douzhuo <17611323298@163.com> Date: Wed, 29 Jun 2022 11:56:33 +0800 Subject: [PATCH 08/31] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/reportExcel/dayReport.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pages/reportExcel/dayReport.vue b/pages/reportExcel/dayReport.vue index 3db0938..4111ccf 100644 --- a/pages/reportExcel/dayReport.vue +++ b/pages/reportExcel/dayReport.vue @@ -443,12 +443,12 @@ // 分割数组排名前三，倒三 getTopThree() { if (this.weekObj.XJTopList && this.weekObj.XJTopList.length > 0) { - this.carryOutLast = this.weekObj.XJTopList.slice(0, 3).reverse() - this.carryOutLast.map((item, index) => { - if (item.value == 100) { - this.carryOutLast.splice(index, 1) - } - }) + let arr = this.weekObj.XJTopList.slice(0, 3).reverse() + arr.forEach(item => { + if (item.value != 100) { + this.carryOutLast.push(item) + } + }) this.carryOutTop = this.weekObj.XJTopList.reverse().slice(0, 3) console.log(this.weekObj.XJTopList) } From d03648c7e7f5dd1eda76f6a9666180d2db6547c1 Mon Sep 17 00:00:00 2001 From: jyt <1592211625@qq.com> Date: Wed, 29 Jun 2022 14:53:32 +0800 Subject: [PATCH 09/31] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/mine/details.vue | 4 ++-- pages/mine/details2.vue | 4 ++-- utils/domain.js | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pages/mine/details.vue b/pages/mine/details.vue index 65d61b0..92c9bb2 100644 --- a/pages/mine/details.vue +++ b/pages/mine/details.vue @@ -116,7 +116,7 @@ - + 设备日志 @@ -373,7 +373,7 @@ } }, methods: { - eqLog(){ + eqLogClick(){ uni.navigateTo({ url:`./equipmentLog?id=${this.customerId}` }) diff --git a/pages/mine/details2.vue b/pages/mine/details2.vue index 390197d..59af298 100644 --- a/pages/mine/details2.vue +++ b/pages/mine/details2.vue @@ -97,7 +97,7 @@ mode=""> 更多 - 设备日志 + 设备日志 接待信息 {{userlistobj.validInvalidName}} @@ -632,7 +632,7 @@ }, methods: { - eqLog(){ + eqLogClick(){ uni.navigateTo({ url:`./equipmentLog?id=${this.customerId}` }) diff --git a/utils/domain.js b/utils/domain.js index abe75ea..ac78767 100644 --- a/utils/domain.js +++ b/utils/domain.js @@ -1,10 +1,10 @@ // http.js使用域名 -// const baseUrl = 'http://81.70.55.170:9090/autoSR/api';// 最新测试 +const baseUrl = 'http://81.70.55.170:9090/autoSR/api';// 最新测试 // const baseUrl = 'http://192.168.31.148:8080/api';// 泽明 // const baseUrl = 'http://127.0.0.1:8080/autoSR/api'; // 本地 // const baseUrl = 'http://192.168.31.161:8080/autoSR/api'; // 长龙 // const baseUrl = 'http://192.168.31.86:9090/api'; // 盛浩 -const baseUrl = 'https://zkgj.quhouse.com/api'; // 质控正式 +// const baseUrl = 'https://zkgj.quhouse.com/api'; // 质控正式 // const baseUrl = 'https://hfju.com/api'; // 数智正式 From b68dbc11db4d4e160ca348e720b9ce9eec863470 Mon Sep 17 00:00:00 2001 From: douzhuo <17611323298@163.com> Date: Wed, 29 Jun 2022 16:47:53 +0800 Subject: [PATCH 10/31] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/reportExcel/dayReport.vue | 2 +- utils/domain.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pages/reportExcel/dayReport.vue b/pages/reportExcel/dayReport.vue index 4111ccf..a7ad9f5 100644 --- a/pages/reportExcel/dayReport.vue +++ b/pages/reportExcel/dayReport.vue @@ -443,7 +443,7 @@ // 分割数组排名前三，倒三 getTopThree() { if (this.weekObj.XJTopList && this.weekObj.XJTopList.length > 0) { - let arr = this.weekObj.XJTopList.slice(0, 3).reverse() + let arr = this.weekObj.XJTopList.slice(0, 3) arr.forEach(item => { if (item.value != 100) { this.carryOutLast.push(item) diff --git a/utils/domain.js b/utils/domain.js index abe75ea..9db6d74 100644 --- a/utils/domain.js +++ b/utils/domain.js @@ -4,8 +4,8 @@ // const baseUrl = 'http://127.0.0.1:8080/autoSR/api'; // 本地 // const baseUrl = 'http://192.168.31.161:8080/autoSR/api'; // 长龙 // const baseUrl = 'http://192.168.31.86:9090/api'; // 盛浩 -const baseUrl = 'https://zkgj.quhouse.com/api'; // 质控正式 -// const baseUrl = 'https://hfju.com/api'; // 数智正式 +// const baseUrl = 'https://zkgj.quhouse.com/api'; // 质控正式 +const baseUrl = 'https://hfju.com/api'; // 数智正式 // config使用域名 From 97c12b8ef523358bb01f802125586a08281c27f3 Mon Sep 17 00:00:00 2001 From: jyt <1592211625@qq.com> Date: Wed, 29 Jun 2022 18:15:00 +0800 Subject: [PATCH 11/31] =?UTF-8?q?=E6=A0=87=E7=BA=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/mine/equipmentLog.vue | 76 +++++++++++++++++++++---------------- 1 file changed, 43 insertions(+), 33 deletions(-) diff --git a/pages/mine/equipmentLog.vue b/pages/mine/equipmentLog.vue index 8984241..bf171a7 100644 --- a/pages/mine/equipmentLog.vue +++ b/pages/mine/equipmentLog.vue @@ -13,7 +13,8 @@ - 录音开启用时：{{info.startActionTime}}min + 录音开启用时：{{info.startActionTime}}min + 待上传文件：{{info.fileCount}}个 @@ -24,7 +25,11 @@ 指派时间： {{info.assignTime}} 录音开始时间： - {{info.recordStartTime}} + + + {{info.recordStartTime}} + + 录音关闭 @@ -33,14 +38,18 @@ 结束时间： {{info.assignEndTime}} 录音结束时间： - {{info.recordEndTime}} + + + {{info.recordEndTime}} + + 离线记录 - + - {{index+1}}. {{item}} + {{index+1}}. {{item}} @@ -52,31 +61,31 @@ export default { data() { return { - info:{} + info: {} + } + }, + computed: { + state() { + return (e => { + switch (e) { + case 0: + return "接待中"; + case 1: + return "部分录音"; + default: + return "完整录音"; + } + }) } - }, - computed:{ - state(){ - return (e=>{ - switch(e){ - case 0: - return "接待中"; - case 1: - return "部分录音"; - default: - return "完整录音"; - } - }) - } - }, - onLoad(options) { - console.log(options.id) - this.$u.get("/equipment/equipmentLog", { - id: options.id - }).then(res => { - // console.log(res) - this.info = res - }) + }, + onLoad(options) { + console.log(options.id) + this.$u.get("/equipment/equipmentLog", { + id: options.id + }).then(res => { + // console.log(res) + this.info = res + }) }, methods: { @@ -122,10 +131,11 @@ padding: 20rpx 12rpx; margin-top: 20rpx; border-radius: 8rpx; - align-items: center; - view{ - width: 50%; - font-size: 30rpx; + align-items: center; + + view { + width: 50%; + font-size: 30rpx; } } From c7cf35c3dcc55ba89f6e027fe419b005410dea8a Mon Sep 17 00:00:00 2001 From: douzhuo <17611323298@163.com> Date: Tue, 5 Jul 2022 11:19:32 +0800 Subject: [PATCH 12/31] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 4 +-- pages/index/guide.vue | 11 +++++++- pages/index/index.vue | 24 +++++++++++++---- pages/index/personal.vue | 58 +++++++++++++++++++++++----------------- utils/domain.js | 3 ++- 5 files changed, 66 insertions(+), 34 deletions(-) diff --git a/manifest.json b/manifest.json index ba7df5a..f572967 100644 --- a/manifest.json +++ b/manifest.json @@ -1,5 +1,5 @@ { - "name" : "数智工牌", + "name" : "AI营销辅助", "appid" : "__UNI__7A1611D", "description" : "AI营销助理", "versionName" : "1.1.0", @@ -91,7 +91,7 @@ }, "quickapp" : {}, "mp-weixin" : { - "appid" : "wxe044603515ff2cb5", + "appid" : "wx5700a3ff66ea4e4c", "setting" : { "urlCheck" : false, "es6" : true, diff --git a/pages/index/guide.vue b/pages/index/guide.vue index d49a2f4..2393bd8 100644 --- a/pages/index/guide.vue +++ b/pages/index/guide.vue @@ -1,7 +1,7 @@ @@ -215,7 +219,11 @@ var app = getApp(); var util = require("../../../utils/util.js"); var config = require("../../../config"); + import loading from "@/components/loading/index.vue" export default { + components: { + loading + }, data() { return { activeTotal: 4, @@ -312,6 +320,7 @@ }; }, onLoad() { + this.LOADING = true let that = this uni.$on('updateGroup', function(data) { console.log(data) @@ -354,7 +363,6 @@ this.getdata() // console.log(this.staffList,this.staffList,this.houseId) }) - }, //指标执行率分析tab tapspagek2(index) { @@ -437,6 +445,7 @@ lastStartDate: this.lastStartDate }) .then(res => { + this.LOADING = false // console.log(res,123) // 处理数据 // return @@ -467,6 +476,8 @@ this.opts.extra.radar.max = max + 25 this.chartData = allobj this.$forceUpdate() + }).catch(e => { + this.LOADING = false }) }, //自定义时间 diff --git a/pages/center/Piabodata/StaffAnalysis.vue b/pages/center/Piabodata/StaffAnalysis.vue index cf3cedf..0d38586 100644 --- a/pages/center/Piabodata/StaffAnalysis.vue +++ b/pages/center/Piabodata/StaffAnalysis.vue @@ -120,10 +120,17 @@ + + + diff --git a/pages/center/consumer/consumerDetail.vue b/pages/center/consumer/consumerDetail.vue index f970072..0da4d2e 100644 --- a/pages/center/consumer/consumerDetail.vue +++ b/pages/center/consumer/consumerDetail.vue @@ -35,7 +35,10 @@ - 顾问姓名：{{customerInfo.ownerName}} + 顾问姓名：{{customerInfo.ownerName||'--'}} + + + 需求挖掘：{{customerInfo.wordFraction||0}}% 添加时间：{{customerInfo.createTime}} @@ -141,7 +144,12 @@ - 执行总览 + + 销讲执行率 + 需求挖掘执行率 + + +执行总览 {{customerInfo.visitRecord || '--'}}次 @@ -193,7 +201,7 @@ - {{subitem.name}} + {{subitem.name}} 已执行 未执行 @@ -211,12 +219,113 @@ + - + + + 执行总览 + + + {{customerInfo.visitRecord || '--'}}次 + 到访次数 + + + + + {{customerInfo.wordFraction||0}}% + + + 需求挖掘执行率 + + + {{customerInfo.mm}}min + 接待时长 + + + + 指标 + 执行率 + + + + + + + + + 暂无数据 + + + + + + {{item.name}} + + + + {{item.fraction||0}}% + + + + + + + + + + + 话术内容 + + {{inc+1}}.{{che.question}} + + + + + + + + + + + + {{subitem.name}} + + 已执行 + 未执行 + + + + + + + + 话术内容 + + {{inc+1}}.{{che.question}} + + + + + + + + + + @@ -249,6 +358,7 @@ }, data() { return { + tabactive: 0, activeTotal: 0, customerId: '', tipshow: false, @@ -261,6 +371,7 @@ totalRate: [], ratelist: [], fllowList: [], + KeyWordsfractionList: [],//需求挖掘话术list userInfo: {}, buttonisshow: false } @@ -288,6 +399,37 @@ this.tabtimetap(0) }, methods: { + changeshowlevel1(item,type){ + console.log(item) + item.show = !item.show + }, + // 客户详情需求挖掘话术 + getfindKeyWordsBycusId() { + this.$u.get("/cusLvStatistics/findKeyWordsBycusId?cusId=" + this.customerId).then(res => { + console.log(res) + if(res.length){ + res.forEach(item=>{ + item.show = false + item.children.forEach(obj=>{ + obj.show = false + if(obj.questionList.length){ + obj.questionList.forEach(subobj=>{ + subobj.show =false + }) + } + }) + if(item.questionList.length){ + item.questionList.forEach(obj=>{ + obj.show =false + }) + } + }) + this.KeyWordsfractionList = res + }else{ + this.KeyWordsfractionList = [] + } + }) + }, // 获取到访记录 getVisitList() { this.$u.get("/customer/findByPhoneAndProject?id=" + this.customerId, ).then(res => { @@ -328,10 +470,10 @@ this.getFollowList() } else { this.getRatelist() + this.getfindKeyWordsBycusId() } }, tapThevisiting(item) { - console.log("11111111111111") uni.showLoading({ title: '加载中', mask: true @@ -678,7 +820,7 @@ align-items: center; .title1 { - flex: 2; + flex: 3; font-size: 28rpx; color: #333333; font-weight: 400; @@ -798,6 +940,32 @@ background-color: #FFFFFF; padding-bottom: 30rpx; width: 100%; + .my-tab{ + padding: 20rpx 0; + display: flex; + justify-content: space-around; + align-items: center; + border-bottom: 1px solid #E0E0E0; + .tab-item{ + padding: 0 30rpx; + height: 56rpx; + font-size: 28rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #666666; + line-height: 56rpx; + text-shadow: 0px 1px 0px #E0E0E0; + } + .tabactive{ + height: 56rpx; + background: rgba(38, 113, 226, 0.1); + box-shadow: 0px 1px 0px 0px #E0E0E0; + border-radius: 28rpx; + font-weight: 600; + color: #2671E2; + } + + } .ratetetle { padding: 30rpx; @@ -841,7 +1009,7 @@ .tab { height: 88rpx; - border-bottom: 1px solid #E0E0E0; + // border-bottom: 1px solid #E0E0E0; background: #FFFFFF; display: flex; align-items: center; @@ -941,7 +1109,6 @@ .content-sec { border-top: 1px solid #E0E0E0; padding: 0 30rpx; - height: 270rpx; position: relative; .content-sec-lab { @@ -984,7 +1151,7 @@ font-weight: 400; color: #2671E2; line-height: 45rpx; - bottom: 15rpx; + bottom: 100rpx; right: 30rpx; text-align: center; } diff --git a/pages/center/consumer/index.vue b/pages/center/consumer/index.vue index 02ada5b..cd8dc0a 100644 --- a/pages/center/consumer/index.vue +++ b/pages/center/consumer/index.vue @@ -72,14 +72,17 @@ - 顾问姓名：{{item.agentName}} + 顾问姓名：{{item.agentName||'--'}} + + + 需求挖掘：{{item.wordFraction||0}}% 添加时间：{{item.createTime}} {{item.visitRecord || '--'}}次到访 - {{item.fraction || '0'}}% | {{item.mm || '0'}}{{item.fraction || 0}}% | {{item.mm || 0}}min diff --git a/pages/center/records/index.vue b/pages/center/records/index.vue index fedf43d..91826b9 100644 --- a/pages/center/records/index.vue +++ b/pages/center/records/index.vue @@ -78,10 +78,12 @@ 第{{item.visitRecord || "--"}}次接待 - {{item.fraction || '0'}}% + + 需求挖掘：{{item.wordFraction|| 0}}% + {{item.createTime}} | {{item.mm || '0'}} min diff --git a/pages/index/index.vue b/pages/index/index.vue index f2ab4a6..c789ac2 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -119,31 +119,25 @@ {{realtimeobj.fraction || 0}}% 平均执行率 + + {{realtimeobj.wordFraction || 0}}% + 平均挖掘率 + {{realtimeobj.prohibitedCustomer || 0}} 违禁预警 - - - - - - - 概览 - 近7天 - - - 近30天 - 自定义 - + 近7天 + 近30天 + 自定义 @@ -166,6 +160,10 @@ {{Thisweekobj.avgDuration|| 0}} 平均接待时长 + + {{Thisweekobj.wordFraction || 0}}% + 平均挖掘率 + {{Thisweekobj.prohibitedCustomer || 0}} 违禁预警 @@ -174,10 +172,6 @@ - - - - @@ -193,7 +187,6 @@ - - 销讲总执行率{{totalRate}}% - - 禁忌执行 + 销讲总执行率{{totalRate}}% + 禁忌执行 + 需求挖掘率 + @@ -301,6 +302,75 @@ 暂无数据 + + + 指标 + 执行率 + + + + + {{item.name}} + + + + {{item.fraction||0}}% + + + + + + + + + + + 话术内容 + + {{inc+1}}.{{che.question}} + + + + + + + + + + + + {{subitem.name}} + + 已执行 + 未执行 + + + + + + + + 话术内容 + + {{inc+1}}.{{che.question}} + + + + + + + + + + @@ -445,6 +515,7 @@ data() { return { + KeyWordsfractionList: [], noClick: true, kehuyixiangcenterindex: 0, Acquirecustomerintentlist2: [], @@ -698,9 +769,10 @@ this.zhixingcenterindex = i; if (i == 0) { this.getRatelist() - } else { - console.log('999') + } else if(i==1) { this.huoqujinji() + }else{ + this.getfindKeyWordsBycusId() } }, //获取禁忌 @@ -1528,6 +1600,33 @@ changeshow2(item, type) { item.show = !item.show; }, + // 客户详情需求挖掘话术 + getfindKeyWordsBycusId() { + this.$u.get("/cusLvStatistics/findKeyWordsBycusId?cusId=" + this.customerId).then(res => { + console.log(res) + if(res.length){ + res.forEach(item=>{ + item.show = false + item.children.forEach(obj=>{ + obj.show = false + if(obj.questionList.length){ + obj.questionList.forEach(subobj=>{ + subobj.show =false + }) + } + }) + if(item.questionList.length){ + item.questionList.forEach(obj=>{ + obj.show =false + }) + } + }) + this.KeyWordsfractionList = res + }else{ + this.KeyWordsfractionList = [] + } + }) + }, getRatelist() { this.$u.get("/customer/findzkMByCusId", { cusId: this.customerId diff --git a/utils/domain.js b/utils/domain.js index 1603e0c..567f886 100644 --- a/utils/domain.js +++ b/utils/domain.js @@ -1,10 +1,10 @@ // http.js使用域名 -// const baseUrl = 'http://81.70.55.170:9090/autoSR/api';// 最新测试 +const baseUrl = 'http://81.70.55.170:9090/autoSR/api';// 最新测试 // const baseUrl = 'http://192.168.31.148:8080/api';// 泽明 // const baseUrl = 'http://127.0.0.1:8080/autoSR/api'; // 本地 -// const baseUrl = 'http://192.168.31.161:8080/autoSR/api'; // 长龙 +// const baseUrl = 'http://192.168.31.169:8080/autoSR/api'; // 长龙 // const baseUrl = 'http://192.168.31.90:8080/api'; // 盛浩 -const baseUrl = 'https://zkgj.quhouse.com/api'; // 质控正式 +// const baseUrl = 'https://zkgj.quhouse.com/api'; // 质控正式 // const baseUrl = 'https://hfju.com/api'; // 数智正式 // const baseUrl = 'https://xitong.pachira.cn/api'; // AI营销辅助 普强使用 From cdd3bc0e35bc667fe5b9cebf7624eb254a4718fa Mon Sep 17 00:00:00 2001 From: corala <18339694416@163.com> Date: Wed, 20 Jul 2022 11:13:01 +0800 Subject: [PATCH 22/31] =?UTF-8?q?=E9=9C=80=E6=B1=82=E6=8C=96=E6=8E=98?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/index/index.vue | 2 ++ pages/mine/details2.vue | 35 ++++++++++------------------------- utils/domain.js | 5 ++--- 3 files changed, 14 insertions(+), 28 deletions(-) diff --git a/pages/index/index.vue b/pages/index/index.vue index c789ac2..48f744b 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -262,6 +262,7 @@ prohibitedCustomer: '', tagCustomer: '', fraction: '', + wordFraction: '', receptionCount: '' }, Thisweekobj: { @@ -271,6 +272,7 @@ prohibitedCustomer: '', tagCustomer: '', fraction: '', + wordFraction: '', receptionCount: '' }, methodsisshow: false, diff --git a/pages/mine/details2.vue b/pages/mine/details2.vue index 08a79b4..c69f8cb 100644 --- a/pages/mine/details2.vue +++ b/pages/mine/details2.vue @@ -241,9 +241,9 @@ - 销讲总执行率{{totalRate}}% + 销讲总执行率{{totalRate||0}}% 禁忌执行 - 需求挖掘率 + 需求挖掘率{{KeyWordsfraction||0}}% - + {{item.name.substring(0,8)}} @@ -267,7 +267,7 @@ - + {{subitem.name.substring(0,8)}} 已执行 @@ -310,7 +310,7 @@ - + {{item.name}} @@ -342,7 +342,7 @@ - + {{subitem.name}} 已执行 @@ -515,6 +515,7 @@ data() { return { + KeyWordsfraction: 0, KeyWordsfractionList: [], noClick: true, kehuyixiangcenterindex: 0, @@ -1119,7 +1120,6 @@ } else { tempRoleIndex = this.roleindex } - console.log() uni.request({ url: config.service.getCorpusAnal + '?corpusId=' + this.luyinList[this.csdFileindex].id + "&bg=" + bgcd + "&speaker=" + tempRoleIndex + "&voFlag=" + voFlagValue + @@ -1575,7 +1575,6 @@ this.messagelisy = this.dialogList[i].message this.argtextindex1 = i; this.argtextindex2 = index; - }, //回到顶部 gotoTop() { @@ -1584,28 +1583,14 @@ this.scrollId = "top"; }) }, - //切换tab - changeTab(type) { - if (type == 0) { - this.tab = 0 - } else { - this.tab = 1; - this.getRatelist(); - } - }, - //评分上下显隐 - changeshow(item, type) { - item.show = !item.show; - }, - changeshow2(item, type) { - item.show = !item.show; - }, // 客户详情需求挖掘话术 getfindKeyWordsBycusId() { this.$u.get("/cusLvStatistics/findKeyWordsBycusId?cusId=" + this.customerId).then(res => { - console.log(res) + // console.log(res) if(res.length){ + this.KeyWordsfraction = 0 res.forEach(item=>{ + this.KeyWordsfraction += +item.fraction // 总执行率 item.show = false item.children.forEach(obj=>{ obj.show = false diff --git a/utils/domain.js b/utils/domain.js index 567f886..d7111f3 100644 --- a/utils/domain.js +++ b/utils/domain.js @@ -1,8 +1,7 @@ // http.js使用域名 -const baseUrl = 'http://81.70.55.170:9090/autoSR/api';// 最新测试 -// const baseUrl = 'http://192.168.31.148:8080/api';// 泽明 +// const baseUrl = 'http://81.70.55.170:9090/autoSR/api';// 最新测试 // const baseUrl = 'http://127.0.0.1:8080/autoSR/api'; // 本地 -// const baseUrl = 'http://192.168.31.169:8080/autoSR/api'; // 长龙 +const baseUrl = 'http://192.168.31.169:8080/autoSR/api'; // 长龙 // const baseUrl = 'http://192.168.31.90:8080/api'; // 盛浩 // const baseUrl = 'https://zkgj.quhouse.com/api'; // 质控正式 // const baseUrl = 'https://hfju.com/api'; // 数智正式 From 8e1bc8d804f06c0f8f0e52dfbd0afc39f8dabcd7 Mon Sep 17 00:00:00 2001 From: corala <18339694416@163.com> Date: Wed, 20 Jul 2022 14:13:16 +0800 Subject: [PATCH 23/31] =?UTF-8?q?=E9=9C=80=E6=B1=82=E6=8C=96=E6=8E=98?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Piabodata/requireminingAnalysis.vue | 97 +++++++++++++++---- pages/center/records/index.vue | 1 + pages/index/index.vue | 2 + pages/login/index.vue | 4 +- utils/domain.js | 5 +- 5 files changed, 86 insertions(+), 23 deletions(-) diff --git a/pages/center/Piabodata/requireminingAnalysis.vue b/pages/center/Piabodata/requireminingAnalysis.vue index fc8e024..b961e38 100644 --- a/pages/center/Piabodata/requireminingAnalysis.vue +++ b/pages/center/Piabodata/requireminingAnalysis.vue @@ -26,9 +26,16 @@ 简报 统计说明 - + {{item.name}} - {{item.num}} + {{item.firstnum||0}} + + 对比：{{item.endnum||0}} + {{item.duibinum||0}} + + + + @@ -50,10 +57,10 @@ 平均需求挖掘率趋势 - + @@ -196,21 +203,29 @@ activeTab: 0, numlist: [{ name: '平均需求挖掘率', - num: '', + firstnum: '', + endnum: '', + duibinum: '', setName: 'wordFraction' }, { name: '未挖掘需求', - num: '', + firstnum: '', + endnum: '', + duibinum: '', setName: 'noFinishWord' }, { name: '有效接待', - num: '', + firstnum: '', + endnum: '', + duibinum: '', setName: 'activeCustomer' }, { name: '未标记', - num: '', + firstnum: '', + endnum: '', + duibinum: '', setName: 'markAdvisor' }, ], @@ -249,7 +264,7 @@ this.getdata() }, onReady: function(){ - this.getRingData() + // this.getRingData() }, onPullDownRefresh() { }, @@ -258,14 +273,18 @@ // 需求挖掘分析-简报 this.wordMiningAnalyze() // 挖掘趋势图 - this.getwordMiningAnalyzePercentage() - //需求挖掘排行 - this.getwordMiningRank() + // this.getwordMiningAnalyzePercentage() + // //需求挖掘排行 + // this.getwordMiningRank() + // // 需求挖掘f分布图 + // this.getRingData() }, // 需求挖掘排行 getwordMiningRank(){ this.$u.post('/cusLvStatistics/wordMiningRank', { houseId: this.houseId, + deptId: this.deptVal, + createUser: this.guwenVal, "dateType":this.activeTotal, "firstStartDate":!this.activeTotal?this.startDate:'', "firstEndDate":!this.activeTotal?this.endDate:'' @@ -288,6 +307,8 @@ getRingData(){ this.$u.post('/cusLvStatistics/wordMiningAnalyzeFenbu', { houseId: this.houseId, + deptId: this.deptVal, + createUser: this.guwenVal, "firstStartDate":!this.activeTotal?this.startDate:'', "firstEndDate":!this.activeTotal?this.endDate:'', "dateType":this.activeTotal @@ -316,17 +337,19 @@ wordMiningAnalyze() { let params = { "houseId":this.houseId, - "deptId":this.deptVal, - "userId":this.guwenVal, + deptId: this.deptVal, + createUser: this.guwenVal, "dateType": this.activeTotal, "firstStartDate":!this.activeTotal?this.startDate:'', "firstEndDate":!this.activeTotal?this.endDate:'' } this.$u.post("/cusLvStatistics/wordMiningAnalyze",params).then(res => { - console.log(res.contrast) + // console.log(res.contrast) res.contrast.wordFraction = (res.contrast.fraction || 0) + '%' this.numlist.forEach(item => { - item.num = res.contrast[item.setName] + item.duibinum = res.contrast[item.setName] + item.endnum = res.end[item.setName] + item.firstnum = res.first[item.setName] }) }) }, @@ -351,6 +374,8 @@ getwordMiningAnalyzePercentage() { this.$u.post('/cusLvStatistics/wordMiningAnalyzePercentage', { houseId: this.houseId, + deptId: this.deptVal, + createUser: this.guwenVal, "dateType": this.activeTotal, "firstStartDate":!this.activeTotal?this.startDate:'', "firstEndDate":!this.activeTotal?this.endDate:'' @@ -408,9 +433,9 @@ this.endDate = '' this.startDate = '' this.time = text + this.getdata() } this.timeshow = false - this.getdata() }, staffSelectCallback(e, idx) { if (idx == 0) { @@ -517,7 +542,7 @@ font-weight: bold; } } - + .grid:nth-child(1) { border-right: none; border-bottom: none; @@ -530,6 +555,42 @@ .grid:nth-child(3) { border-right: none; } + .grid .bottom{ + display: flex; + align-items: center; + padding-left: 20rpx; + margin: 10rpx 0 20rpx; + .leftnum{ + height: 36rpx; + font-size: 26rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #666666; + line-height: 36rpx; + margin-right: 20rpx; + } + .rightnum{ + height: 36rpx; + font-size: 26rpx; + font-family: PingFangSC-Semibold, PingFang SC; + font-weight: 600; + color: #666; + line-height: 36rpx; + display: flex; + align-items: center; + &.red{ + color: #E6273A; + } + &.green{ + color: #43CD80; + } + image{ + width: 18rpx; + height: 14rpx; + margin-left: 6rpx; + } + } + } .zonglantitle{ display: flex; justify-content: space-between; diff --git a/pages/center/records/index.vue b/pages/center/records/index.vue index 91826b9..cf734e9 100644 --- a/pages/center/records/index.vue +++ b/pages/center/records/index.vue @@ -435,6 +435,7 @@ this.$u.post("/customer/lifeTrackDefineList", { houseId: this.buildingID }).then(res => { + this.LOADING = false let tempArr = [] res.forEach(item => { let tempObj = {} diff --git a/pages/index/index.vue b/pages/index/index.vue index 48f744b..e92cfa0 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -533,6 +533,7 @@ avgDuration: Math.floor(data.data.data.avgDuration / 60) || 0, tagCustomer: data.data.data.tagCustomer, fraction: data.data.data.fraction, + wordFraction: data.data.data.wordFraction, receptionCount: data.data.data.receptionCount } } @@ -564,6 +565,7 @@ avgDuration: Math.floor(data.data.data.avgDuration / 60) || 0, tagCustomer: data.data.data.tagCustomer, fraction: data.data.data.fraction, + wordFraction: data.data.data.wordFraction, receptionCount: data.data.data.receptionCount } } diff --git a/pages/login/index.vue b/pages/login/index.vue index 374b14e..5981190 100644 --- a/pages/login/index.vue +++ b/pages/login/index.vue @@ -41,9 +41,9 @@ export default { data() { return { - username: '18831048327',//18831048327 ,18888888800 + username: '',//18831048327 ,18888888800 //获取到的用户名的值 - password: '123456',//123456 + password: '',//123456 //获取到的密码栏中的值 passwordType: true, agreeChecked: true diff --git a/utils/domain.js b/utils/domain.js index d7111f3..2c543da 100644 --- a/utils/domain.js +++ b/utils/domain.js @@ -1,7 +1,7 @@ // http.js使用域名 -// const baseUrl = 'http://81.70.55.170:9090/autoSR/api';// 最新测试 +const baseUrl = 'http://81.70.55.170:9090/autoSR/api';// 最新测试 // const baseUrl = 'http://127.0.0.1:8080/autoSR/api'; // 本地 -const baseUrl = 'http://192.168.31.169:8080/autoSR/api'; // 长龙 +// const baseUrl = 'http://192.168.31.169:8080/autoSR/api'; // 长龙 // const baseUrl = 'http://192.168.31.90:8080/api'; // 盛浩 // const baseUrl = 'https://zkgj.quhouse.com/api'; // 质控正式 // const baseUrl = 'https://hfju.com/api'; // 数智正式 @@ -16,7 +16,6 @@ const baseUrl = 'http://192.168.31.169:8080/autoSR/api'; // 长龙 // const host = 'http://192.168.31.57:8080/autoSR/api';// 本地 const host = baseUrl; // 测试站 // const host = 'http://192.168.31.167:8080/autoSR/api'; // 长龙 -// const host = 'http://192.168.31.134:8080/autoSR/api'; // 佳豪 // const host = 'http://10.2.1.104:8081/autoSR/api'; // 刘敏 // const host = 'https://zkgj.quhouse.com/api'; // 质控正式 // const host = 'https://hfju.com/api'; // 数智正式 From 2f375b9a6016fd104ff82bd3917fd059c367a2d5 Mon Sep 17 00:00:00 2001 From: corala <18339694416@163.com> Date: Wed, 20 Jul 2022 16:41:16 +0800 Subject: [PATCH 24/31] =?UTF-8?q?=E9=9C=80=E6=B1=82=E6=8C=96=E6=8E=98?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Piabodata/requireminingAnalysis.vue | 22 +++++++++---------- pages/center/consumer/consumerDetail.vue | 5 +++-- pages/login/index.vue | 13 +++++------ pages/mine/details2.vue | 19 +++++++++++----- 4 files changed, 33 insertions(+), 26 deletions(-) diff --git a/pages/center/Piabodata/requireminingAnalysis.vue b/pages/center/Piabodata/requireminingAnalysis.vue index b961e38..922a8cf 100644 --- a/pages/center/Piabodata/requireminingAnalysis.vue +++ b/pages/center/Piabodata/requireminingAnalysis.vue @@ -57,10 +57,10 @@ 平均需求挖掘率趋势 - + @@ -264,7 +264,7 @@ this.getdata() }, onReady: function(){ - // this.getRingData() + this.getRingData() }, onPullDownRefresh() { }, @@ -273,11 +273,11 @@ // 需求挖掘分析-简报 this.wordMiningAnalyze() // 挖掘趋势图 - // this.getwordMiningAnalyzePercentage() - // //需求挖掘排行 - // this.getwordMiningRank() - // // 需求挖掘f分布图 - // this.getRingData() + this.getwordMiningAnalyzePercentage() + //需求挖掘排行 + this.getwordMiningRank() + // 需求挖掘f分布图 + this.getRingData() }, // 需求挖掘排行 getwordMiningRank(){ @@ -310,7 +310,7 @@ deptId: this.deptVal, createUser: this.guwenVal, "firstStartDate":!this.activeTotal?this.startDate:'', - "firstEndDate":!this.activeTotal?this.endDate:'', + "firstEndDate":!this.activeTotal?this.endDate:'', "dateType":this.activeTotal }) .then(res => { @@ -345,7 +345,7 @@ } this.$u.post("/cusLvStatistics/wordMiningAnalyze",params).then(res => { // console.log(res.contrast) - res.contrast.wordFraction = (res.contrast.fraction || 0) + '%' + res.contrast.wordFraction = (res.contrast.wordFraction || 0) + '%' this.numlist.forEach(item => { item.duibinum = res.contrast[item.setName] item.endnum = res.end[item.setName] @@ -399,7 +399,7 @@ let categories3 =[] categories1.forEach(item1=>{ categories2.forEach(item2=>{ - categories3.push(item1+ 'vs' + item2) + categories3.push(item1+ '/' + item2) }) }) this.lineOptsect.categories = categories3 diff --git a/pages/center/consumer/consumerDetail.vue b/pages/center/consumer/consumerDetail.vue index 0da4d2e..8ab402f 100644 --- a/pages/center/consumer/consumerDetail.vue +++ b/pages/center/consumer/consumerDetail.vue @@ -269,8 +269,9 @@ {{item.name}} - - {{item.fraction||0}}% + + + {{item.selected==0?item.fraction:0}}% diff --git a/pages/login/index.vue b/pages/login/index.vue index 5981190..ef77ae6 100644 --- a/pages/login/index.vue +++ b/pages/login/index.vue @@ -8,15 +8,15 @@ - + - - + + @@ -42,9 +42,7 @@ data() { return { username: '',//18831048327 ,18888888800 - //获取到的用户名的值 password: '',//123456 - //获取到的密码栏中的值 passwordType: true, agreeChecked: true }; @@ -94,7 +92,8 @@ method: "POST", data: loginParams, success: function(result) { - var data = result.data; //console.log("登陆信息", data); + var data = result.data; + //console.log("登陆信息", data); if (data && data.code == 10000) { var res = data.data; if (res) { @@ -149,8 +148,6 @@ uni.setStorageSync("weapp_session_Menu_data", data) }) } - - } }; diff --git a/pages/mine/details2.vue b/pages/mine/details2.vue index c69f8cb..815b138 100644 --- a/pages/mine/details2.vue +++ b/pages/mine/details2.vue @@ -310,12 +310,15 @@ - + {{item.name}} - - {{item.fraction||0}}% + + + + {{item.selected==0?item.fraction:0}}% + @@ -342,7 +345,7 @@ - + {{subitem.name}} 已执行 @@ -710,6 +713,9 @@ }, methods: { + hangeshow2(item,type){ + item.show = !item.show; + }, eqLogClick(){ uni.navigateTo({ url:`./equipmentLog?id=${this.customerId}` @@ -1020,6 +1026,7 @@ this.gituserlist() } else if (stringa == 'Pinspeak') { this.getRatelist() + this.getfindKeyWordsBycusId() this.Pinspeak = true; } else { if (this.kehuyixiangcenterindex == 0) { @@ -1590,7 +1597,9 @@ if(res.length){ this.KeyWordsfraction = 0 res.forEach(item=>{ - this.KeyWordsfraction += +item.fraction // 总执行率 + if(item.selected==0){ + this.KeyWordsfraction += +item.fraction // 总执行率 + } item.show = false item.children.forEach(obj=>{ obj.show = false From 8fed6b37e86814997027ed91989a94ba632f77d0 Mon Sep 17 00:00:00 2001 From: corala <18339694416@163.com> Date: Wed, 20 Jul 2022 18:08:22 +0800 Subject: [PATCH 25/31] =?UTF-8?q?=E9=9C=80=E6=B1=82=E6=8C=96=E6=8E=98?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/center/consumer/consumerDetail.vue | 8 ++++---- pages/index/index.vue | 4 ++-- pages/mine/details2.vue | 16 +++++++--------- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/pages/center/consumer/consumerDetail.vue b/pages/center/consumer/consumerDetail.vue index 8ab402f..1ab8180 100644 --- a/pages/center/consumer/consumerDetail.vue +++ b/pages/center/consumer/consumerDetail.vue @@ -269,9 +269,9 @@ {{item.name}} - + - {{item.selected==0?item.fraction:0}}% + {{item.selected==0?100:0}}% @@ -283,7 +283,7 @@ 话术内容 - {{inc+1}}.{{che.question}} @@ -312,7 +312,7 @@ 话术内容 - {{inc+1}}.{{che.question}} diff --git a/pages/index/index.vue b/pages/index/index.vue index e92cfa0..a828cc4 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -119,7 +119,7 @@ {{realtimeobj.fraction || 0}}% 平均执行率 - + {{realtimeobj.wordFraction || 0}}% 平均挖掘率 @@ -160,7 +160,7 @@ {{Thisweekobj.avgDuration|| 0}} 平均接待时长 - + {{Thisweekobj.wordFraction || 0}}% 平均挖掘率 diff --git a/pages/mine/details2.vue b/pages/mine/details2.vue index 815b138..651190c 100644 --- a/pages/mine/details2.vue +++ b/pages/mine/details2.vue @@ -253,7 +253,7 @@ - + {{item.name.substring(0,8)}} @@ -267,7 +267,7 @@ - + {{subitem.name.substring(0,8)}} 已执行 @@ -314,11 +314,9 @@ {{item.name}} - + - - {{item.selected==0?item.fraction:0}}% - + {{item.selected==0?100:0}}% @@ -330,7 +328,7 @@ 话术内容 - {{inc+1}}.{{che.question}} @@ -359,7 +357,7 @@ 话术内容 - {{inc+1}}.{{che.question}} @@ -801,7 +799,7 @@ //评分点击 clickaudeopal(item) { if (item.selected == 0 && item.viewFlag != 1) { - console.log(item) + // console.log(item) this.Pinspeak = false uni.navigateTo({ url: '/pages/mine/ScoringPlaylist?customerId=' + this.customerId + "&id=" + item From ae631d4f217b866a5c7d70a0bad357b9ff209943 Mon Sep 17 00:00:00 2001 From: corala <18339694416@163.com> Date: Thu, 21 Jul 2022 00:43:56 +0800 Subject: [PATCH 26/31] =?UTF-8?q?=E9=9C=80=E6=B1=82=E6=8C=96=E6=8E=98?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 2 +- pages.json | 39 ++++++++++++------------ pages/center/consumer/consumerDetail.vue | 4 +-- pages/center/records/index.vue | 3 +- pages/mine/details2.vue | 13 ++++---- 5 files changed, 32 insertions(+), 29 deletions(-) diff --git a/manifest.json b/manifest.json index 16c8fd4..4735546 100644 --- a/manifest.json +++ b/manifest.json @@ -96,7 +96,7 @@ "urlCheck" : false, "es6" : true, "postcss" : true, - "minified" : true + "minified" : false }, "usingComponents" : true, "permission" : {}, diff --git a/pages.json b/pages.json index 742b52e..f73a7c3 100644 --- a/pages.json +++ b/pages.json @@ -60,25 +60,6 @@ "navigationBarBackgroundColor": "#2671E2", "navigationBarTextStyle": "white" } - }, - - { - "path": "pages/reportExcel/dayReport", - "style": { - "navigationBarTitleText": "数智工牌日报", - "navigationBarBackgroundColor": "#ffffff", - "navigationBarTextStyle": "black" - } - - }, - { - "path": "pages/reportExcel/weekReport", - "style": { - "navigationBarTitleText": "数智工牌周报", - "navigationBarBackgroundColor": "#ffffff", - "navigationBarTextStyle": "black" - } - } ], //这下面是分包 @@ -377,6 +358,26 @@ ] }, + { + "root": "pages/reportExcel", //中心逻辑的模块都放到这里 + "name": "reportExcel", + "pages": [{ + "path": "weekReport", + "style": { + "navigationBarTitleText": "数智工牌周报", + "navigationBarBackgroundColor": "#ffffff", + "navigationBarTextStyle": "black" + } + },{ + "path": "dayReport", + "style": { + "navigationBarTitleText": "数智工牌日报", + "navigationBarBackgroundColor": "#ffffff", + "navigationBarTextStyle": "black" + } + } + ] + }, { "root": "pages/center", //中心逻辑的模块都放到这里 "name": "center", diff --git a/pages/center/consumer/consumerDetail.vue b/pages/center/consumer/consumerDetail.vue index 1ab8180..6f154e0 100644 --- a/pages/center/consumer/consumerDetail.vue +++ b/pages/center/consumer/consumerDetail.vue @@ -269,9 +269,9 @@ {{item.name}} - + - {{item.selected==0?100:0}}% + {{item.selected==0?item.fraction:0}}% diff --git a/pages/center/records/index.vue b/pages/center/records/index.vue index cf734e9..3d2c6f2 100644 --- a/pages/center/records/index.vue +++ b/pages/center/records/index.vue @@ -529,6 +529,7 @@ var item = { bg: 0, customerId: item.id, + wordFraction: item.wordFraction } uni.setStorageSync("searchobj", item); //写入缓存 uni.setStorageSync("entrance", 1); //写入缓存 @@ -549,7 +550,7 @@ let newobj = res[0]; if (res[0].merge == 0) { uni.navigateTo({ - url: `/pages/mine/details2?customerId=${newobj.customerId}&status=${newobj.status}&stateisshow=${"2"}` + url: `/pages/mine/details2?customerId=${newobj.customerId}&status=${newobj.status}&stateisshow=${"2"}&wordFraction=${item.wordFraction}` }) } else { uni.navigateTo({ diff --git a/pages/mine/details2.vue b/pages/mine/details2.vue index 651190c..076e2f6 100644 --- a/pages/mine/details2.vue +++ b/pages/mine/details2.vue @@ -314,9 +314,9 @@ {{item.name}} - + - {{item.selected==0?100:0}}% + {{item.selected==0?item.fraction:0}}% @@ -636,6 +636,7 @@ this.status = options.status; this.customerId = options.customerId; + this.KeyWordsfraction = options.wordFraction||0; this.itemobj = uni.getStorageSync('searchobj'); console.log(this.itemobj) this.stateisshow = options.stateisshow; @@ -1593,11 +1594,11 @@ this.$u.get("/cusLvStatistics/findKeyWordsBycusId?cusId=" + this.customerId).then(res => { // console.log(res) if(res.length){ - this.KeyWordsfraction = 0 + // this.KeyWordsfraction = 0 res.forEach(item=>{ - if(item.selected==0){ - this.KeyWordsfraction += +item.fraction // 总执行率 - } + // if(item.selected==0){ + // this.KeyWordsfraction += +item.fraction // 总执行率 + // } item.show = false item.children.forEach(obj=>{ obj.show = false From 82d2a408d10f41cc2b998ddadb010eddd974b87b Mon Sep 17 00:00:00 2001 From: douzhuo <17611323298@163.com> Date: Thu, 21 Jul 2022 17:56:56 +0800 Subject: [PATCH 27/31] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B6=8B=E5=8A=BF?= =?UTF-8?q?=E5=88=86=E6=9E=90=E9=A1=B5=E9=9D=A2=E5=88=87=E6=8D=A2=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE/=E9=A1=BE=E9=97=AE=E6=97=B6=E5=88=B7=E6=96=B0?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 2 +- pages/center/Piabodata/TrendAnalysis.vue | 2 +- pages/index/personal.vue | 2 +- pages/mine/details.vue | 4 +--- pages/mine/details2.vue | 2 +- pages/mine/equipmentLog.vue | 27 +++++++++++++----------- utils/domain.js | 4 ++-- 7 files changed, 22 insertions(+), 21 deletions(-) diff --git a/App.vue b/App.vue index ac4bfb4..428d50d 100644 --- a/App.vue +++ b/App.vue @@ -83,7 +83,7 @@ // ASCII码转换 大写字母A是65 演讲人是从1开始所以num+64 toCapital(num) { let str = '' - str = String.fromCharCode(Number(num) + 65) + str = String.fromCharCode(Number(num) + 64) return str }, } diff --git a/pages/center/Piabodata/TrendAnalysis.vue b/pages/center/Piabodata/TrendAnalysis.vue index 1144dd3..22e45dd 100644 --- a/pages/center/Piabodata/TrendAnalysis.vue +++ b/pages/center/Piabodata/TrendAnalysis.vue @@ -613,7 +613,7 @@ // this.pamect.marketingId = ''; // this.pamect.deptId = "" // this.activeTotal = 0; - this.timepickpickisshow = false; + // this.timepickpickisshow = false; this.init() if (index == 1) { diff --git a/pages/index/personal.vue b/pages/index/personal.vue index 8658a46..966d545 100644 --- a/pages/index/personal.vue +++ b/pages/index/personal.vue @@ -310,4 +310,4 @@ } } } - + \ No newline at end of file diff --git a/pages/mine/details.vue b/pages/mine/details.vue index 92c9bb2..3c0e8fc 100644 --- a/pages/mine/details.vue +++ b/pages/mine/details.vue @@ -51,9 +51,7 @@ v-for="(item,index) in dialog.message" :key="index" :data-speaker="item.speaker"> - - 顾 - {{ item.speaker | toCapital }} + {{ item.speaker | toCapital }} diff --git a/pages/mine/details2.vue b/pages/mine/details2.vue index 1d90fa6..1347172 100644 --- a/pages/mine/details2.vue +++ b/pages/mine/details2.vue @@ -971,7 +971,7 @@ // 添加角色 addRole() { this.tablist.push({ - name: String.fromCharCode(this.tablist.length + 65) + name: String.fromCharCode(this.tablist.length + 64) }) }, diff --git a/pages/mine/equipmentLog.vue b/pages/mine/equipmentLog.vue index 2e5ea1b..1b0c5fd 100644 --- a/pages/mine/equipmentLog.vue +++ b/pages/mine/equipmentLog.vue @@ -35,7 +35,7 @@ 待上传文件 - {{info.fileCount}}个 + {{info.fileCount || 0}}个 @@ -84,7 +84,7 @@ - 离线记录 + 离线记录 {{index+1}}、 {{item}} @@ -118,8 +118,6 @@ }, onLoad(options) { - console.log(this.cusTHeight) - console.log(options.id) this.$u.get("/equipment/equipmentLog", { id: options.id }).then(res => { @@ -174,8 +172,8 @@ .backs { margin-left: 24rpx; - width: 32rpx; - height: 32rpx; + width: 48rpx; + height: 48rpx; } .middle { @@ -211,7 +209,7 @@ margin: 24rpx auto 0; padding: 24rpx; width: 690rpx; - height: 152rpx; + min-height: 152rpx; background: #FFFFFF; border-radius: 8rpx; display: flex; @@ -226,6 +224,7 @@ } .right { + flex-shrink: 0; font-size: 32rpx; font-weight: 400; } @@ -235,7 +234,7 @@ .eqMain { position: relative; z-index: 1; - padding: 0 20rpx; + padding: 0 30rpx; .recordingStart { margin-top: 20rpx; @@ -257,7 +256,7 @@ .font { margin-top: 20rpx; - font-weight: 500; + font-weight: 700; } } @@ -299,7 +298,7 @@ .point { flex-grow: 1; - border-left: 1rpx dotted #2671E2; + border-left: 5rpx dotted #2671E2; } @@ -312,7 +311,7 @@ .recordingBoxItem-title { font-size: 32rpx; - font-weight: 500; + font-weight: 700; } .recordingBoxItem { @@ -320,6 +319,7 @@ display: flex; .left { + flex-shrink: 0; width: 210rpx; color: #505050; font-size: 30rpx; @@ -328,6 +328,9 @@ .right { flex-grow: 1; font-size: 30rpx !important; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; } } } @@ -351,4 +354,4 @@ } } } - + diff --git a/utils/domain.js b/utils/domain.js index 1603e0c..7072a4e 100644 --- a/utils/domain.js +++ b/utils/domain.js @@ -1,10 +1,10 @@ // http.js使用域名 -// const baseUrl = 'http://81.70.55.170:9090/autoSR/api';// 最新测试 +const baseUrl = 'http://81.70.55.170:9090/autoSR/api';// 最新测试 // const baseUrl = 'http://192.168.31.148:8080/api';// 泽明 // const baseUrl = 'http://127.0.0.1:8080/autoSR/api'; // 本地 // const baseUrl = 'http://192.168.31.161:8080/autoSR/api'; // 长龙 // const baseUrl = 'http://192.168.31.90:8080/api'; // 盛浩 -const baseUrl = 'https://zkgj.quhouse.com/api'; // 质控正式 +// const baseUrl = 'https://zkgj.quhouse.com/api'; // 质控正式 // const baseUrl = 'https://hfju.com/api'; // 数智正式 // const baseUrl = 'https://xitong.pachira.cn/api'; // AI营销辅助 普强使用 From 48bd0d4343b8e82e1c6b24eff093cc2181ba6885 Mon Sep 17 00:00:00 2001 From: douzhuo <17611323298@163.com> Date: Mon, 25 Jul 2022 16:36:06 +0800 Subject: [PATCH 28/31] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 7 ++ .../Customerportrait/Receivedetailabout.vue | 17 ++-- pages/index/customer.vue | 39 +------- pages/mine/details2.vue | 1 - pages/mine/reception/addreception.vue | 98 +++++++++++++------ 5 files changed, 89 insertions(+), 73 deletions(-) diff --git a/App.vue b/App.vue index 428d50d..af4e312 100644 --- a/App.vue +++ b/App.vue @@ -77,6 +77,13 @@ } return obj }, + + + // 检测权限 + checkAuthority(name = '') { + let menu = uni.getStorageSync('weapp_session_Menu_data') + return menu.findIndex(item => item.name == name) != -1 + }, }, filters: { diff --git a/pages/center/Piabodata/Customerportrait/Receivedetailabout.vue b/pages/center/Piabodata/Customerportrait/Receivedetailabout.vue index b1a5570..9b4a934 100644 --- a/pages/center/Piabodata/Customerportrait/Receivedetailabout.vue +++ b/pages/center/Piabodata/Customerportrait/Receivedetailabout.vue @@ -42,17 +42,21 @@ v-for="(item,index) in dialog.message" :key="index" :data-speaker="item.speaker"> - - 顾 - {{ item.speaker | toCapital }} + {{ item.speaker | toCapital }} - {{ item.username }} - {{ item.speaker | toCapital }} + + + + {{conversionTiame(item.bg/1000)}} @@ -535,14 +539,11 @@ }, onHide() { - this.isAudio = 0 - this.info = {} this.isPageHide = true }, // 销毁实例 onUnload() { - this.isAudio = 0 this.info = {} //卸载不需要的业务和获取播放状态的业务,提高页面性能 this.$zaudio.off('seek', this.ACTION); diff --git a/pages/index/customer.vue b/pages/index/customer.vue index 56d5308..5d1e1b9 100644 --- a/pages/index/customer.vue +++ b/pages/index/customer.vue @@ -59,7 +59,7 @@ - @@ -87,7 +87,6 @@ current: 0, buildingID: '', waitCustomList: [], - isAdd: '', dataCode: '', addAccount: '', endReception: true, @@ -109,7 +108,6 @@ this.addAccount = addAccount; this.dataCode = dataCode; this.init() - this.queryHaveDept() this.updateInit() }, methods: { @@ -182,14 +180,6 @@ } }, - queryHaveDept() { - return new Promise((resolve, reject) => { - this.$u.get("/user/queryHaveDept?houseId=" + this.buildingID).then(res => { - this.isAdd = res; - resolve(); - }) - }) - }, init() { this.waitCustomList = [] let parames = { @@ -267,29 +257,10 @@ }); return } - if (this.waitCustomList.length == 0) { - uni.navigateTo({ - url: '/pages/mine/reception/addreception' - }) - return - } else { - for (var i = 0; i < this.waitCustomList.length; i++) { - if (this.waitCustomList[i].status == 1) { - uni.showLoading({ - title: '当前还有未完成的客户项' - }); - setTimeout(function() { - uni.hideLoading(); - }, 1000); - return - } else { - uni.navigateTo({ - url: '/pages/mine/reception/addreception' - }) - return - } - } - } + uni.navigateTo({ + url: '/pages/mine/reception/addreception' + }); + } else { uni.navigateTo({ url: '/pages/mine/reception/addreception' diff --git a/pages/mine/details2.vue b/pages/mine/details2.vue index 9223880..e51998b 100644 --- a/pages/mine/details2.vue +++ b/pages/mine/details2.vue @@ -42,7 +42,6 @@ -