From d62a7921aecc7c697219a91b1b9eb6bb59d93428 Mon Sep 17 00:00:00 2001
From: douzhuo <17611323298@163.com>
Date: Tue, 19 Jul 2022 18:01:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/personal.vue         |  14 ++++++-------
 pages/mine/equipmentLog.vue      |  35 ++++++++++++++++++-------------
 pages/reportExcel/weekReport.vue |  22 +++++++++----------
 static/images/studyhots.png      | Bin 0 -> 3135 bytes
 utils/domain.js                  |   4 ++--
 5 files changed, 39 insertions(+), 36 deletions(-)
 create mode 100644 static/images/studyhots.png

diff --git a/pages/index/personal.vue b/pages/index/personal.vue
index 8d7eaea..5309de2 100644
--- a/pages/index/personal.vue
+++ b/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;
 				}
 			}
 
diff --git a/pages/mine/equipmentLog.vue b/pages/mine/equipmentLog.vue
index 32f6001..36e3d7e 100644
--- a/pages/mine/equipmentLog.vue
+++ b/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;
 						}
 					}
 				}
diff --git a/pages/reportExcel/weekReport.vue b/pages/reportExcel/weekReport.vue
index 511c336..add69d8 100644
--- a/pages/reportExcel/weekReport.vue
+++ b/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]
 			},
 
 			// 跳转首页
diff --git a/static/images/studyhots.png b/static/images/studyhots.png
new file mode 100644
index 0000000000000000000000000000000000000000..ae11c9806cccec27c26998afea18cf5549bdcd1b
GIT binary patch
literal 3135
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
RR5%asCWZ)u20gcg{{U=-(U1TD

literal 0
HcmV?d00001

diff --git a/utils/domain.js b/utils/domain.js
index 62a9597..6f8962d 100644
--- a/utils/domain.js
+++ b/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销讲助手