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] =?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
---
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