Merge branch 'master' into yun

App.vue

@@ -83,7 +83,7 @@
 							// ASCII码转换 大写字母A是65 演讲人是从1开始所以num+64
 							toCapital(num) {
 								let str = ''
-								str = String.fromCharCode(Number(num) + 65)
+								str = String.fromCharCode(Number(num) + 64)
 								return str
 							},
 						}

pages/center/Piabodata/TrendAnalysis.vue

@@ -602,18 +602,6 @@
 				this.guwenshow = false;
 				this.Selectlevel = false;
 				this.Selecttuandui = false;
-				// this.tableDate = []
-				// this.pamect.showStatus = 0;
-				// this.pamect.timeType = "4";
-				// this.pamect.firstStartDate = '';
-				// this.pamect.firstEndDate = '';
-				// this.pamect.lastStartDate = '';
-				// this.pamect.lastEndDate = '';
-				// this.pamect.accountId = '';
-				// this.pamect.marketingId = '';
-				// this.pamect.deptId = ""
-				// this.activeTotal = 0;
-				this.timepickpickisshow = false;
 				this.init()
 
 				if (index == 1) {

pages/index/personal.vue

@@ -310,4 +310,4 @@
 			}
 		}
 	}
-</style>
+</style>

pages/mine/details.vue

@@ -51,9 +51,7 @@
 						v-for="(item,index) in dialog.message" :key="index" :data-speaker="item.speaker">
 						<view class="avatar">
 							<view :style="[SPEAKERSTYLE(item.speaker)]">
-								<!-- <image v-if="item.isShow == 0" :src="Aimg.replace(/[\r\n]/g,'')" mode="widthFix"></image> -->
-								<text v-if="item.speaker == 0">顾</text>
-								<text v-else>{{ item.speaker | toCapital }}</text>
+								<text>{{ item.speaker | toCapital }}</text>
 							</view>
 						</view>
 						<view class="contentInfo">

pages/mine/details2.vue

@@ -1075,7 +1075,7 @@
 			// 添加角色
 			addRole() {
 				this.tablist.push({
-					name: String.fromCharCode(this.tablist.length + 65)
+					name: String.fromCharCode(this.tablist.length + 64)
 				})
 			},
 

pages/mine/equipmentLog.vue

@@ -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,7 +209,7 @@
 				margin: 24rpx auto 0;
 				padding: 24rpx;
 				width: 690rpx;
-				height: 152rpx;
+				min-height: 152rpx;
 				background: #FFFFFF;
 				border-radius: 8rpx;
 				display: flex;
@@ -226,6 +224,7 @@
 				}
 
 				.right {
+					flex-shrink: 0;
 					font-size: 32rpx;
 					font-weight: 400;
 				}
@@ -235,7 +234,7 @@
 		.eqMain {
 			position: relative;
 			z-index: 1;
-			padding: 0 20rpx;
+			padding: 0 30rpx;
 
 			.recordingStart {
 				margin-top: 20rpx;
@@ -257,7 +256,7 @@
 
 					.font {
 						margin-top: 20rpx;
-						font-weight: 500;
+						font-weight: 700;
 					}
 				}
 
@@ -299,7 +298,7 @@
 					
 					.point {
 						flex-grow: 1;
-						border-left: 1rpx dotted #2671E2;
+						border-left: 5rpx dotted #2671E2;
 					}
 					
 					
@@ -312,7 +311,7 @@
 					
 					.recordingBoxItem-title {
 						font-size: 32rpx;
-						font-weight: 500;
+						font-weight: 700;
 					}
 					
 					.recordingBoxItem {
@@ -320,6 +319,7 @@
 						display: flex;
 						
 						.left {
+							flex-shrink: 0;
 							width: 210rpx;
 							color: #505050;
 							font-size: 30rpx;
@@ -328,6 +328,9 @@
 						.right {
 							flex-grow: 1;
 							font-size: 30rpx !important;
+							overflow: hidden;
+							text-overflow: ellipsis;
+							white-space: nowrap;
 						}
 					}
 				}
@@ -351,4 +354,4 @@
 			}
 		}
 	}
-</style>
+</style>