提交修改

pages/index/personal.vue

@@ -15,9 +15,9 @@
 		</view>
 		<view class="settingGroup">
 			<navigator class="line" url="/pages/mine/messageList">
-				<view class="title" style="width: 19%;">
-					<image src="/static/images/studyhot.png" mode=""></image>
-					消息
+				<view class="title">
+					<image src="/static/images/studyhots.png" mode=""></image>
+					消息通知
 					<template v-if="count > 0">
 						<view class="count">
 							{{ count }}
@@ -284,16 +284,16 @@
 				
 				.count {
 					position: absolute;
-					right: 24rpx;
-					width: 50rpx;
-					height: 50rpx;
+					right: 34rpx;
+					width: 44rpx;
+					height: 44rpx;
 					border-radius: 50%;
 					background: red;
 					display: flex;
 					justify-content: center;
 					align-items: center;
 					color: #fff;
-					font-size: 20rpx;
+					font-size: 26rpx;
 				}
 			}
 

pages/mine/equipmentLog.vue

@@ -18,10 +18,10 @@
 			<view class="noInfo">
 				<view class="left">
 					<text style="font-weight: 500;">设备编号：{{ info.imei || '' }}</text>
-					<text>录音说明：{{ info.recordExplain || '' }}</text>
+					<text>{{state(info.recording)}}</text>
 				</view>
 				<view class="right">
-					<text>{{state(info.recording)}}</text>
+					<text>录音说明：{{ info.recordExplain || '' }}</text>
 				</view>
 			</view>
 		</view>
@@ -35,7 +35,7 @@
 				<view class="line"></view>
 				<view class="items">
 					<text>待上传文件</text>
-					<text class="font" :style="{color: info.fileCount==0?'#333':'red'}">{{info.fileCount}}个</text>
+					<text class="font" :style="{color: info.fileCount==0?'#333':'red'}">{{info.fileCount || 0}}个</text>
 				</view>
 			</view>
 			<view class="recording">
@@ -84,7 +84,7 @@
 				</view>
 			</view>
 			<view class="offlineRec">
-				<text style="font-size:36rpx">离线记录</text>
+				<text style="font-size:32rpx;font-weight: 700;">离线记录</text>
 				<view class="recMain">
 					<block v-for="(item,index) in info.offLineList" :key="index">
 						<text>{{index+1}}、 {{item}}</text>
@@ -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,21 +209,24 @@
 				margin: 24rpx auto 0;
 				padding: 24rpx;
 				width: 690rpx;
-				height: 152rpx;
+				min-height: 152rpx;
 				background: #FFFFFF;
 				border-radius: 8rpx;
 				display: flex;
-				justify-content: space-between;
+				flex-direction: column;
+				
 
 				.left {
+					width: 100%;
 					display: flex;
-					flex-direction: column;
 					justify-content: space-between;
 					font-size: 32rpx;
 					font-weight: 400;
+					
 				}
 
 				.right {
+					width: 100%;
 					font-size: 32rpx;
 					font-weight: 400;
 				}
@@ -235,7 +236,7 @@
 		.eqMain {
 			position: relative;
 			z-index: 1;
-			padding: 0 20rpx;
+			padding: 0 30rpx;
 
 			.recordingStart {
 				margin-top: 20rpx;
@@ -257,7 +258,7 @@
 
 					.font {
 						margin-top: 20rpx;
-						font-weight: 500;
+						font-weight: 700;
 					}
 				}
 
@@ -299,7 +300,7 @@
 					
 					.point {
 						flex-grow: 1;
-						border-left: 1rpx dotted #2671E2;
+						border-left: 5rpx dotted #2671E2;
 					}
 					
 					
@@ -312,7 +313,7 @@
 					
 					.recordingBoxItem-title {
 						font-size: 32rpx;
-						font-weight: 500;
+						font-weight: 700;
 					}
 					
 					.recordingBoxItem {
@@ -320,6 +321,7 @@
 						display: flex;
 						
 						.left {
+							flex-shrink: 0;
 							width: 210rpx;
 							color: #505050;
 							font-size: 30rpx;
@@ -328,6 +330,9 @@
 						.right {
 							flex-grow: 1;
 							font-size: 30rpx !important;
+							overflow: hidden;
+							text-overflow: ellipsis;
+							white-space: nowrap;
 						}
 					}
 				}

pages/reportExcel/weekReport.vue

@@ -289,7 +289,7 @@
 						preNumName: 'receptionCount2', // 
 						path: '/pages/center/records/index',
 						pathParms: '?activeTotal=4&refresh=refresh', // 参数
-						auth: '接待记录', // 
+						auth: 'jdjl', // 
 
 					}, {
 						name: '有效接待 (次)',
@@ -301,7 +301,7 @@
 						preNumName: 'activeCustomer2', // 
 						path: '/pages/center/records/index',
 						pathParms: '?activeTotal=4&refresh=refresh&validInvalid=0', // 参数
-						auth: '接待记录', // 
+						auth: 'jdjl', // 
 					},
 					{
 						name: '平均执行率（%）',
@@ -313,7 +313,7 @@
 						preNumName: 'fraction2', // 
 						path: '/pages/center/records/index',
 						pathParms: '?activeTotal=4&refresh=refresh&validInvalid=0', // 参数
-						auth: '接待记录', // 
+						auth: 'jdjl', // 
 					},
 					{
 						name: '平均接待时长（分）',
@@ -325,7 +325,7 @@
 						preNumName: 'avgDuration2', // 
 						path: '/pages/center/records/index',
 						pathParms: '?activeTotal=4&refresh=refresh&validInvalid=0', // 参数
-						auth: '接待记录', // 
+						auth: 'jdjl', // 
 					},
 					{
 						name: '违禁接待 (次)',
@@ -338,7 +338,7 @@
 						class: 'down',
 						path: '/pages/center/prohibited/index',
 						pathParms: '?activeTotal=4&violatedStatus=1&refresh=refresh', // 参数
-						auth: '违禁记录',
+						auth: 'wjjl',
 					},
 					{
 						name: '客户画像触达 (次)',
@@ -350,7 +350,7 @@
 						preNumName: 'reachSum2', // 
 						path: '/pages/center/Piabodata/Userinsightinto',
 						pathParms: '?activeTotal=3', // 参数
-						auth: '销讲数据',
+						auth: 'xjfx',
 					},
 					{
 						name: '已标记',
@@ -362,7 +362,7 @@
 						preNumName: 'labelledReceptionNum2', // 
 						path: '/pages/center/records/index',
 						pathParms: '?activeTotal=4&refresh=refresh&markAdvisor=1', // 参数
-						auth: '接待记录', // 
+						auth: 'jdjl', // 
 					},
 					{
 						name: '未标记',
@@ -374,8 +374,8 @@
 						preNumName: 'unlabelledReceptionNum2', // 
 						class: 'down',
 						path: '/pages/center/records/index',
-						pathParms: '?activeTotal=4&refresh=refresh&markAdvisor=0', // 参数
-						auth: '接待记录', // 
+						pathParms: '?activeTotal=4&refresh=refresh&markAdvisor=0&validInvalid=0', // 参数
+						auth: 'jdjl', // 
 					},
 				],
 
@@ -554,9 +554,7 @@
 
 			// 是否有权限观看
 			isPassWatch(name) {
-				return this.menuList.findIndex(item => {
-					return item.name == name
-				}) == -1 ? false : true
+				return this.menuList[name]
 			},
 
 			// 跳转首页

utils/domain.js

@@ -1,7 +1,7 @@
-// const base = 'http://81.70.55.170:9999'; // 测试站
+const base = 'http://81.70.55.170:9999'; // 测试站
 // const base = 'http://127.0.0.1:9999'; // 本地
 // const base = 'http://192.168.31.152:9999' ;// 泽明
-const base = 'http://192.168.31.94:9999' ;// 胜浩
+// const base = 'http://192.168.31.94:9999' ;// 胜浩
 // const base = 'http://192.168.31.161:9999' // 长龙
 // const base = 'https://zanyong.hfju.com';// 正式 AI销管// 弃用
 // const base = 'https://hxz.quhouse.com';// 正式 AI销讲助手