From 5982895a342af91d10e09e4fab7c47d0bbef36c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A3=8E=E7=BB=A7=E7=BB=AD=E5=90=B9?= <17611323298@163.com>
Date: Wed, 27 Dec 2023 18:19:05 +0800
Subject: [PATCH] xiugai
---
manifest.json | 2 +-
pages.json | 20 +++-
pages/center/prohibited/first.vue | 128 +++++++++++++++++++++++++
pages/center/prohibited/firsts.vue | 146 +++++++++++++++++++++++++++++
pages/center/prohibited/index.vue | 6 ++
pages/center/records/index.vue | 3 +-
pages/index/index.vue | 3 +-
pages/reportExcel/dayReport.vue | 11 ++-
pages/reportExcel/weekReport.vue | 9 ++
9 files changed, 323 insertions(+), 5 deletions(-)
create mode 100644 pages/center/prohibited/first.vue
create mode 100644 pages/center/prohibited/firsts.vue
diff --git a/manifest.json b/manifest.json
index 374cacc..7660590 100644
--- a/manifest.json
+++ b/manifest.json
@@ -72,7 +72,7 @@
},
"quickapp" : {},
"mp-weixin" : {
- "appid" : "wx83fec12ec03d9349",
+ "appid" : "wx5700a3ff66ea4e4c",
"setting" : {
"urlCheck" : false,
"es6" : true,
diff --git a/pages.json b/pages.json
index c1c82ff..e9b3a93 100644
--- a/pages.json
+++ b/pages.json
@@ -546,6 +546,24 @@
"enablePullDownRefresh": true
}
},
+ {
+ "path": "prohibited/firsts",
+ "style": {
+ "navigationBarTitleText": "未标记项目",
+ "navigationBarBackgroundColor": "#FFFFFF",
+ "navigationBarTextStyle": "black",
+ "enablePullDownRefresh": true
+ }
+ },
+ {
+ "path": "prohibited/first",
+ "style": {
+ "navigationBarTitleText": "违禁词分析",
+ "navigationBarBackgroundColor": "#FFFFFF",
+ "navigationBarTextStyle": "black",
+ "enablePullDownRefresh": true
+ }
+ },
{
"path": "prohibited/details",
"style": {
@@ -624,7 +642,7 @@
}
}
- ]
+ ]
}
],
diff --git a/pages/center/prohibited/first.vue b/pages/center/prohibited/first.vue
new file mode 100644
index 0000000..310f7c0
--- /dev/null
+++ b/pages/center/prohibited/first.vue
@@ -0,0 +1,128 @@
+
+
+
+
+
+
+
+ {{ data.words }}
+ {{ data.sumNum }}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/center/prohibited/firsts.vue b/pages/center/prohibited/firsts.vue
new file mode 100644
index 0000000..0bd5bc3
--- /dev/null
+++ b/pages/center/prohibited/firsts.vue
@@ -0,0 +1,146 @@
+
+
+
+
+
+
+
+ {{ data.houseName }}
+ {{ data.unTagCustomer || 0 }}
+ {{ data.tagCustomer || 0 }}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/center/prohibited/index.vue b/pages/center/prohibited/index.vue
index 394dbdf..60e35c6 100644
--- a/pages/center/prohibited/index.vue
+++ b/pages/center/prohibited/index.vue
@@ -169,6 +169,7 @@
guwenText: '顾问', //
steyStatus: '处理状态', //
weijinTag: '违禁标识', // 违禁标识
+ words: '', // 违禁词
}
},
@@ -196,6 +197,10 @@
this.getFreeList();
this.isnorefresh = '';
}
+
+ if (options.words) {
+ this.words = options.words
+ }
},
onShow() {
this.userInfo = uni.getStorageSync('weapp_session_userInfo_data');
@@ -395,6 +400,7 @@
disposeStatus: this.orderBy, // 处理状态
violatedStatus: this.violatedStatus, // 违禁状态
validInvalid: 0, // 有效
+ sensitiveWords: this.words,
}
};
if (this.screen.agentId) {
diff --git a/pages/center/records/index.vue b/pages/center/records/index.vue
index 521420b..e976f87 100644
--- a/pages/center/records/index.vue
+++ b/pages/center/records/index.vue
@@ -502,6 +502,7 @@
this.activeTotal = options.activeTotal
this.screen.markAdvisor = options.markAdvisor
this.screen.validInvalid = options.validInvalid
+ if (options.houseId) this.buildingID = options.houseId
if (options.staTime) {
this.staTime = options.staTime;
this.endtime = options.endtime + ' 23:59:59';
@@ -521,7 +522,7 @@
}
if (this.isnorefresh == 'refresh') {
- this.buildingID = uni.getStorageSync('buildingID').id;
+ if (!this.buildingID) this.buildingID = uni.getStorageSync('buildingID').id;
this.recordList = [];
this.nextPage = 1;
this.isRefresh = false;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 51e82c9..202a4bc 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1237,7 +1237,8 @@
});
} else if (item == '违禁记录') {
uni.navigateTo({
- url: '/pages/center/prohibited/index?refresh=refresh'
+ url: '/pages/center/prohibited/first?refresh=refresh'
+ // pages/center/prohibited/index
});
} else if (item == '日报') {
uni.navigateTo({
diff --git a/pages/reportExcel/dayReport.vue b/pages/reportExcel/dayReport.vue
index 5954400..3df176c 100644
--- a/pages/reportExcel/dayReport.vue
+++ b/pages/reportExcel/dayReport.vue
@@ -410,7 +410,7 @@
-
+
未标记接待数:
{{ weekObj.unlabelledReceptionNum || 0 }}
@@ -509,6 +509,15 @@
}
},
+ //
+ jumpPage() {
+ console.log(this.weekObj)
+ if (this.weekObj.orgCode) {
+ uni.navigateTo({
+ url: `/pages/center/records/index?refresh=refresh&markAdvisor=0&validInvalid=0&messageType=${this.weekObj.messageType}&houseId=${this.building.id}&staTime=${this.weekObj.createTime.split(' ')[0]}&endtime=${this.weekObj.createTime.split(' ')[0]}`
+ });
+ }
+ },
// 项目拷贝
diff --git a/pages/reportExcel/weekReport.vue b/pages/reportExcel/weekReport.vue
index 7545469..79a3572 100644
--- a/pages/reportExcel/weekReport.vue
+++ b/pages/reportExcel/weekReport.vue
@@ -488,6 +488,7 @@
preNumName: 'unlabelledReceptionNum2', //
class: 'down',
path: '/pages/center/records/index',
+ path1: '/pages/center/prohibited/firsts',
pathParms: '?activeTotal=4&refresh=refresh&markAdvisor=0&validInvalid=0', // 参数
auth: 'jdjl', //
},
@@ -665,6 +666,7 @@
// 跳转对应页面
toAuthPage(data) {
+ console.log(data, this.weekObj)
if (!uni.getStorageSync('weapp_session_login_data').token) {
this.toHome()
return
@@ -672,6 +674,13 @@
if (this.isPassWatch(data.auth)) {
let time = this.weekObj.weekDate.split('~')
data.pathParms = `${data.pathParms}&staTime=${time[0]}&endtime=${time[1]}`
+ // 判断为项目周报
+ if (this.weekObj.orgCode && data.name == '未标记') {
+ uni.navigateTo({
+ url: `${data.path1}${data.pathParms}&orgCode=${this.weekObj.orgCode}&messageType=${this.weekObj.messageType}`
+ })
+ return
+ }
uni.navigateTo({
url: `${data.path}${data.pathParms}`
})