xiugai

manifest.json

@@ -72,7 +72,7 @@
     },
     "quickapp" : {},
     "mp-weixin" : {
-        "appid" : "wx83fec12ec03d9349",
+        "appid" : "wx5700a3ff66ea4e4c",
         "setting" : {
             "urlCheck" : false,
             "es6" : true,

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 @@
 					}
 
 				}
-			]
+            ]
 		}
 	],
 

pages/center/prohibited/first.vue

@@ -0,0 +1,128 @@
+<template>
+	<view class="pages">
+		<view class="header">
+			<view class="items" @tap="totalTimeShow = true">
+				{{ showTimeCalender }}
+				<u-icon name="arrow-down" size="24" style="padding-left: 12rpx;"></u-icon>
+			</view>
+			<view class="items" @tap="jumpPage">
+				明细
+			</view>
+		</view>
+		<view class="wordslist">
+			<!-- block -->
+			<block v-for="(data) in pageData">
+				<view class="item" :key="data.id" @click="jumpPage(data)">
+					<view class="lside">{{ data.words }}</view>
+					<view class="rside">{{ data.sumNum }}</view>
+				</view>
+			</block>
+			
+		</view>
+		
+		<u-calendar v-model="totalTimeShow" mode="range" @change="totalTimeChange"></u-calendar>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				pageParams: {
+					statDateStart: '',//开始时间
+					statDateEnd: '',//结束时间
+					projectId: uni.getStorageSync("buildingID").id,//项目id
+				},
+				showTimeCalender: '选择日期',//
+				totalTimeShow: false, // 自定义时间
+				
+				pageData: [], // 页面数据
+			};
+		},
+		
+		onLoad() {
+			this.findSensitiveWordsData()
+		},
+		
+		methods: {
+			// 
+			jumpPage(data) {
+				uni.navigateTo({
+					url: `/pages/center/prohibited/index?refresh=refresh&staTime=${this.pageParams.statDateStart}&endtime=${this.pageParams.statDateEnd}&words=${data.words}`
+				});
+			},
+
+			// findSensitiveWordsData
+			findSensitiveWordsData() {
+				this.$u.post('/customer/findSensitiveWordsData', this.pageParams).then(res => {
+					console.log(res)
+					res.unshift({
+						words: '违禁词',
+						id: new Date().getTime(),
+						sumNum: '违禁次数'
+					})
+					this.pageData = res
+					console.log(this.pageData, '123321s')
+				})
+			},
+			
+			// 自定义时间
+			totalTimeChange(e) {
+				console.log(e)
+				this.pageParams.statDateStart = startDate
+				this.pageParams.statDateEnd = endDate
+				this.findSensitiveWordsData()
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	.pages {
+		width: 100vw;
+		min-height: 100vh;
+		display: flex;
+		flex-direction: column;
+		
+		.header {
+			width: 100%;
+			height: 90rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			
+			.items {
+				height: 100%;
+				flex-grow: 1;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				color: #666666;
+				font-size: 28rpx;
+			}
+		}
+		
+		.wordslist {
+			width: 100%;
+			padding: 20rpx;
+			
+			.item {
+				width: 100%;
+				height: 90rpx;
+				font-size: 32rpx;
+				display: flex;
+				align-items: center;
+				
+				.lside {
+					flex-grow: 1;
+				}
+				
+				.rside {
+					flex-shrink: 0;
+					width: 125rpx;
+					text-align: center;
+				}
+			}
+		}
+	}
+</style>

pages/center/prohibited/firsts.vue

@@ -0,0 +1,146 @@
+<template>
+	<view class="pages">
+		<view class="header">
+			<view class="items" @tap="jumpPage">
+				项目未标记{{ pageParams.statDateStart }}至{{ pageParams.statDateEnd }}
+			</view>
+		</view>
+		<view class="wordslist">
+			<!-- block -->
+			<block v-for="(data) in pageData">
+				<view class="item" :key="data.id" @click="jumpPage(data)">
+					<view class="items blue">{{ data.houseName }}</view>
+					<view class="items">{{ data.unTagCustomer || 0 }}</view>
+					<view class="items">{{ data.tagCustomer || 0 }}</view>
+				</view>
+			</block>
+
+		</view>
+
+		<u-calendar v-model="totalTimeShow" mode="range" @change="totalTimeChange"></u-calendar>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				pageParams: {
+					statDateStart: '', //开始时间
+					statDateEnd: '', //结束时间
+					orgCode: '', //id
+					messageType: '',
+				},
+				showTimeCalender: '选择日期', //
+				totalTimeShow: false, // 自定义时间
+				inParams: '', // 入参
+				pageData: [], // 页面数据
+			};
+		},
+
+		onLoad(option) {
+			if (option) {
+				this.inParams = this.params(option)
+			}
+			if (option.orgCode) {
+				this.pageParams.orgCode = option.orgCode
+			}
+			if (option.staTime && option.endtime) {
+				this.pageParams.statDateStart = option.staTime
+				this.pageParams.statDateEnd = option.endtime
+			}
+			if (option.messageType) {
+				this.pageParams.messageType = option.messageType
+			}
+			console.log(this.inParams)
+			this.findSensitiveWordsData()
+		},
+
+		methods: {
+			// 对象转url参数
+			params(json) {
+				return Object.keys(json).map(key => key + '=' + json[key]).join('&');
+			},
+
+			// 
+			jumpPage(data) {
+				uni.navigateTo({
+					url: `/pages/center/records/index?${this.inParams}&houseId=${data.houseId}`
+				});
+			},
+
+			// findSensitiveWordsData
+			findSensitiveWordsData() {
+				this.$u.post('/customer/findNotMarkAdvisorCount', this.pageParams).then(res => {
+					console.log(res)
+					res.unshift({
+						houseName: '项目名称',
+						tagCustomer: '对比上一周',
+						unTagCustomer: '未标记数量',
+						id: new Date().getTime()
+					})
+					this.pageData = res
+					console.log(this.pageData, '123321s')
+				})
+			},
+
+			// 自定义时间
+			totalTimeChange(e) {
+				console.log(e)
+				this.pageParams.statDateStart = startDate
+				this.pageParams.statDateEnd = endDate
+				this.findSensitiveWordsData()
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	.pages {
+		width: 100vw;
+		min-height: 100vh;
+		display: flex;
+		flex-direction: column;
+
+		.header {
+			width: 100%;
+			height: 90rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+
+			.items {
+				height: 100%;
+				flex-grow: 1;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				font-size: 32rpx;
+				font-weight: bold;
+				
+				&.blue {
+					color: #1890FF;
+				}
+			}
+		}
+
+		.wordslist {
+			width: 100%;
+			padding: 20rpx;
+
+			.item {
+				width: 100%;
+				height: 90rpx;
+				display: flex;
+				align-items: center;
+
+				.items {
+					flex-grow: 1;
+					width: 125rpx;
+					text-align: center;
+					font-size: 26rpx;
+				}
+			}
+		}
+	}
+</style>

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) {

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;

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({

pages/reportExcel/dayReport.vue

@@ -410,7 +410,7 @@
 								</template>
 							</view>
 							<view class="right">
-								<view class="r-title">
+								<view class="r-title" @tap="jumpPage">
 									<text>未标记接待数：</text>
 									<text class="num value down"
 										style="font-weight: 500;font-size: 34rpx;">{{ weekObj.unlabelledReceptionNum || 0 }}</text>
@@ -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]}`
+					});
+				}
+			},
 
 
 			// 项目拷贝

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}`
 					})