Merge branch 'master' of http://git.2weisou.com/liumin/NewZkgj

config.js

@@ -79,6 +79,8 @@ var config = {
 	firstShowPopup: `${host}/zkMessage/firstShow`,
 	//消息未读数
 	notReadNum: `${host}/zkMessage/findFlagCount`,
+	//设备日志
+	eqLog: `${host}/equipment/equipmentLog`,
 	}
 };
 module.exports = config;

pages.json

@@ -302,7 +302,17 @@
 					}
 
 				}
-			]
+			    ,{
+                    "path" : "equipmentLog",
+                    "style" :                                                                                    
+                {
+                    "navigationBarTitleText": "设备日志",
+                    "navigationBarBackgroundColor": "#2671E2",
+                    "navigationBarTextStyle": "white"
+                }
+                
+                }
+            ]
 		},
 		{
 			"root": "pages/learning", //学习

pages/mine/details.vue

@@ -115,6 +115,10 @@
 		<view class="backTop" @click="gotoTop">
 			<image src="/static/images/backTop.png" mode=""></image>
 		</view>
+		
+		<view class="eqLog" @click="eqLog()">
+			<view style="width: 78rpx;text-align: center;">设备日志</view>
+		</view>
 		<!-- 加入常错词 -->
 		<view class="zhezhoa" v-if="isshow2" @tap="Cancelout"></view>
 		
@@ -365,6 +369,11 @@
 			}
 		},
 		methods: {
+			eqLog(){
+				uni.navigateTo({
+					url:`./equipmentLog?id=${this.customerId}`
+				})
+			},
 			effectiveAdd() {
 				if (this.effectiveindex == 4) {
 					if (this.effectiveitext.length == 0) {
@@ -1690,6 +1699,20 @@
 			height: 34upx;
 		}
 	}
+	.eqLog {
+		width: 115upx;
+		height: 115upx;
+		background: rgba(211, 235, 253, 1);
+		box-shadow: 0 0 10rpx 7rpx #f1f1f1;;
+		border-radius: 50%;
+		position: fixed;
+		bottom: 300upx;
+		right: 8upx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		color: #008EF2;
+	}
 
 	// 评分
 	.rate-box {

pages/mine/details2.vue

@@ -97,6 +97,7 @@
 						mode=""></image>
 					<view @click="Receivedetailsabouttab('Receivedetailsabout')">更多</view>
 					<view class="allimg" v-if="Thetapeidisshow">
+						<view @click="eqLog()" style="line-height: 70rpx;margin-top: 10rpx;">设备日志</view>
 						<view @click="Receivetap()" style="line-height: 70rpx;margin-top: 10rpx;">接待信息</view>
 						<view @click="alllogo()" style="line-height:70rpx;">{{userlistobj.validInvalidName}}</view>
 					</view>
@@ -627,6 +628,11 @@
 		},
 
 		methods: {
+			eqLog(){
+				uni.navigateTo({
+					url:`./equipmentLog?id=${this.customerId}`
+				})
+			},
 			rolexuanze(index) {
 				this.roleindexrow = index;
 			},

pages/mine/equipmentLog.vue

@@ -0,0 +1,170 @@
+<template>
+	<view class="eqLog">
+		<view class="eqNo">
+			<view class="noInfo">
+				<view class="left">
+					<text>设备编号：{{info.imei}}</text>
+					<text>录音说明：{{info.recordExplain}}</text>
+				</view>
+				<view class="right">
+					<text>{{state(info.recording)}}</text>
+				</view>
+			</view>
+		</view>
+		<view class="eqMain">
+			<view class="recordingStart">
+				<view>录音开启用时：{{info.startActionTime}}min</view>
+				<view>待上传文件：<text :style="{color: info.fileCount==0?'#333':'red'}">{{info.fileCount}}</text>个</view>
+			</view>
+			<view class="recording">
+				<view class="recordingBox">
+					<text style="font-size:36rpx">录音开启</text>
+					<text>指派人：</text>
+					<text>{{info.owenrName}}</text>
+					<text>指派时间：</text>
+					<text>{{info.assignTime}}</text>
+					<text>录音开始时间：</text>
+					<text style="font-weight: bold;font-size: 28rpx;">{{info.recordStartTime}}</text>
+				</view>
+				<view class="recordingBox">
+					<text style="font-size:36rpx">录音关闭</text>
+					<text>结束人：</text>
+					<text>{{info.userName}}</text>
+					<text>结束时间：</text>
+					<text>{{info.assignEndTime}}</text>
+					<text>录音结束时间：</text>
+					<text style="font-weight: bold;font-size: 28rpx;">{{info.recordEndTime}}</text>
+				</view>
+			</view>
+			<view class="offlineRec">
+				<text style="font-size:36rpx">离线记录</text>
+				<view class="recMain">
+					<block v-for="(item,index) in info.offLineList" :key="index">
+						<text>{{index+1}}. {{item}}</text>
+					</block>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				info:{}
+			}
+		},
+		computed:{
+			state(){
+				return (e=>{
+					switch(e){
+						case 0:
+							return "接待中";
+						case 1:
+							return "部分录音";
+						default:
+							return "完整录音";
+					}
+				})
+			}
+		},
+		onLoad(options) {
+			console.log(options.id)
+			this.$u.get("/equipment/equipmentLog", {
+				id: options.id
+			}).then(res => {
+				// console.log(res)
+				this.info = res
+			})
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	.eqLog {
+		width: 100%;
+		height: 100%;
+		position: fixed;
+		background: #F5F5F5;
+
+		.eqNo {
+			background: #2671E2;
+			padding: 20rpx;
+
+			.noInfo {
+				height: 110rpx;
+				background: #FFFFFF;
+				border-radius: 10rpx;
+				padding: 10rpx;
+				display: flex;
+				justify-content: space-between;
+
+				.left {
+					display: flex;
+					flex-direction: column;
+					justify-content: space-between;
+				}
+			}
+		}
+
+		.eqMain {
+			padding: 0 20rpx;
+
+			.recordingStart {
+				background: #FFFFFF;
+				display: flex;
+				width: 100%;
+				border: 1rpx solid #000000;
+				padding: 20rpx 12rpx;
+				margin-top: 20rpx;
+				border-radius: 8rpx;
+				align-items: center;
+				view{
+					width: 50%;
+					font-size: 30rpx;
+				}
+			}
+
+			.recording {
+				margin-top: 30rpx;
+				display: flex;
+				justify-content: space-between;
+
+				.recordingBox {
+					background: #FFFFFF;
+					display: flex;
+					flex-direction: column;
+					width: 48%;
+					border: 1rpx solid #000000;
+					padding: 0 10rpx;
+					border-radius: 8rpx;
+
+					text {
+						margin: 10rpx 0;
+					}
+				}
+			}
+
+			.offlineRec {
+				background: #FFFFFF;
+				padding: 20rpx;
+				border: 1rpx solid #000000;
+				border-radius: 8rpx;
+				margin-top: 30rpx;
+
+				.recMain {
+					display: flex;
+					flex-direction: column;
+
+					text {
+						margin: 14rpx 0;
+					}
+				}
+			}
+		}
+	}
+</style>