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] =?UTF-8?q?=E9=9C=80=E6=B1=82=E6=8C=96=E6=8E=98=E5=8A=9F?= =?UTF-8?q?=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