1

public/index.html

@@ -8,7 +8,7 @@
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
     <script src="https://cdn.bootcss.com/eruda/1.5.8/eruda.min.js"></script>
     <script>
-      eruda.init();
+      //eruda.init();
     </script>
 
 

src/views/MLargeScreen/components/carInformation/index.vue

@@ -14,23 +14,23 @@
 				</div>
 				<div class="carInFrom_content">
 					<div>车辆年限：</div>
-					<div class="carInFrom_input">{{vehicleInformationData.year}}</div>
+					<div class="carInFrom_input">{{vehicleInformationData.year ? vehicleInformationData.year : '无'}}</div>
 				</div>
 				<div class="carInFrom_content">
 					<div>保养时间：</div>
-					<div class="carInFrom_input">{{currentTime(vehicleInformationData.time)}}</div>
+					<div class="carInFrom_input">{{vehicleInformationData.time ? currentTime(vehicleInformationData.time) : '无'}}</div>
 				</div>
 				<div class="carInFrom_content">
 					<div>超速预警值：</div>
-					<div class="carInFrom_input">{{vehicleInformationData.alarm}}</div>
+					<div class="carInFrom_input">{{vehicleInformationData.alarm ? vehicleInformationData.alarm : '无'}}</div>
 				</div>
 				<div class="carInFrom_content">
 					<div>终端设备号：</div>
-					<div class="carInFrom_input">{{vehicleInformationData.equipmentName}}</div>
+					<div class="carInFrom_input">{{vehicleInformationData.equipmentName ? vehicleInformationData.equipmentName : '无'}}</div>
 				</div>
 				<div class="carInFrom_content">
 					<div>运重：</div>
-					<div class="carInFrom_input">{{vehicleInformationData.weight}}</div>
+					<div class="carInFrom_input">{{vehicleInformationData.weight ? vehicleInformationData.weight : '无'}}</div>
 				</div>
 			</div>
 			<div>
@@ -40,27 +40,27 @@
 				</div>
 				<div class="carInFrom_content">
 					<div>运行状态：</div>
-					<div class="carInFrom_input">{{realTimeData.status}}</div>
+					<div class="carInFrom_input">{{realTimeData.status == 0 ? '运行中' : realTimeData.status == 1 ? '空闲' : '暂无状态'}}</div>
 				</div>
 				<div class="carInFrom_content">
 					<div>运行时长：</div>
-					<div class="carInFrom_input">{{realTimeData.runTime}}</div>
+					<div class="carInFrom_input">{{realTimeData.runTime ? realTimeData.runTime : '无'}}</div>
 				</div>
 				<div class="carInFrom_content">
 					<div>开始时间：</div>
-					<div class="carInFrom_input">{{realTimeData.startTime}}</div>
+					<div class="carInFrom_input">{{realTimeData.startTime ? realTimeData.startTime : '无'}}</div>
 				</div>
 				<div class="carInFrom_content">
 					<div>运输效率：</div>
-					<div class="carInFrom_input">{{realTimeData.effic}}</div>
+					<div class="carInFrom_input">{{realTimeData.effic ? realTimeData.effic + '%' : '无'}}</div>
 				</div>
 				<div class="carInFrom_content">
 					<div>当日行驶里程：</div>
-					<div class="carInFrom_input">{{realTimeData.mil}}</div>
+					<div class="carInFrom_input">{{realTimeData.mil ? realTimeData.mil : '无'}}</div>
 				</div>
 				<div class="carInFrom_content">
 					<div>车次：</div>
-					<div class="carInFrom_input">{{realTimeData.carnum}}</div>
+					<div class="carInFrom_input">{{realTimeData.carnum ? realTimeData.carnum : '无'}}</div>
 				</div>
 			</div>
 		</div>

src/views/MLargeScreen/components/personalCenter/index.vue

@@ -16,59 +16,58 @@
 					</div>
 					<div class="personalCenFrom_content">
 						<div>头像：</div>
-						<!-- <img :src="user.avatarName ? baseApi + '/avatar/' + user.avatarName : Avatar" class="user-avatar" width="80" style="margin-right:6vw;"> -->
 						<img :src="Avatar" class="user-avatar" width="80" style="margin-right:6vw;">
 					</div>
 					<div class="personalCenFrom_content">
 						<div>驾龄：</div>
-						<div class="personalCenFrom_input">{{personalInformationData.age}}</div>
+						<div class="personalCenFrom_input">{{personalInformationData.age ? personalInformationData.age + '年' : '无'}}</div>
 					</div>
 					<div class="personalCenFrom_content">
 						<div>车次：</div>
-						<div class="personalCenFrom_input">{{personalInformationData.jiedan}}</div>
+						<div class="personalCenFrom_input">{{personalInformationData.jiedan ? personalInformationData.jiedan : '无'}}</div>
 					</div>
 					<div class="personalCenFrom_content">
 						<div>开始时间：</div>
-						<div class="personalCenFrom_input">{{personalInformationData.createTime}}</div>
+						<div class="personalCenFrom_input">{{personalInformationData.createTime ? personalInformationData.createTime : '无'}}</div>
 					</div>
 					<div class="personalCenFrom_content">
 						<div>工作时长：</div>
-						<div class="personalCenFrom_input">{{personalInformationData.time}}</div>
+						<div class="personalCenFrom_input">{{personalInformationData.time ? personalInformationData.time : '无'}}</div>
 					</div>
 					<div class="personalCenFrom_content">
 						<div>疲劳驾驶：</div>
-						<div class="personalCenFrom_input">{{personalInformationData.status}}</div>
+						<div class="personalCenFrom_input">{{personalInformationData.status ? (personalInformationData.status == 0 ? '疲劳驾驶中' : '未疲劳驾驶') : '无'}}</div>
 					</div>
 				</div>
 				<div>
 					<div style="height:2.5vh"></div>
 					<div class="personalCenFrom_content">
 						<div>姓名：</div>
-						<div class="personalCenFrom_input">{{personalInformationData.name}}</div>
+						<div class="personalCenFrom_input">{{personalInformationData.name ? personalInformationData.name : '无'}}</div>
 					</div>
 					<div class="personalCenFrom_content">
 						<div>部门：</div>
-						<div class="personalCenFrom_input">{{personalInformationData.depart}}</div>
+						<div class="personalCenFrom_input">{{personalInformationData.depart ? personalInformationData.depart : '无'}}</div>
 					</div>
 					<div class="personalCenFrom_content">
 						<div>岗位：</div>
-						<div class="personalCenFrom_input">{{personalInformationData.post}}</div>
+						<div class="personalCenFrom_input">{{personalInformationData.post ? personalInformationData.post : '无'}}</div>
 					</div>
 					<div class="personalCenFrom_content">
 						<div>用户名：</div>
-						<div class="personalCenFrom_input">{{personalInformationData.userName}}</div>
+						<div class="personalCenFrom_input">{{personalInformationData.userName ? personalInformationData.userName : '无'}}</div>
 					</div>
 					<div class="personalCenFrom_content">
 						<div>手机号：</div>
-						<div class="personalCenFrom_input">{{personalInformationData.phone}}</div>
+						<div class="personalCenFrom_input">{{personalInformationData.phone ? personalInformationData.phone : '无'}}</div>
 					</div>
 					<div class="personalCenFrom_content">
 						<div>公司名称：</div>
-						<div class="personalCenFrom_input">{{personalInformationData.company}}</div>
+						<div class="personalCenFrom_input">{{personalInformationData.company ? personalInformationData.company : '无'}}</div>
 					</div>
 					<div class="personalCenFrom_content">
 						<div>现有住址：</div>
-						<div class="personalCenFrom_input">{{personalInformationData.adr}}</div>
+						<div class="personalCenFrom_input">{{personalInformationData.adr ? personalInformationData.adr : '无'}}</div>
 					</div>
 				</div>
 			</div>

src/views/MLargeScreen/components/smallWindow/index.vue

@@ -9,19 +9,19 @@
 				<span>车牌号：</span><span style="color: rgb(24,228,240);">{{carnumber}}</span>
 			</div>
 			<div>
-				<span>车辆运行公里数：</span><span style="color: rgb(24,228,240);">{{carInformationData2.mil}}</span>
+				<span>车辆运行公里数：</span><span style="color: rgb(24,228,240);">{{carInformationData2.mil ? carInformationData2.mil : '无'}}</span>
 			</div>
 			<div>
-				<span>车辆运行时长：</span><span style="color: rgb(24,228,240);">{{carInformationData2.runTime}}</span>
+				<span>车辆运行时长：</span><span style="color: rgb(24,228,240);">{{carInformationData2.runTime ? carInformationData2.runTime : '无'}}</span>
 			</div>
 			<div>
-				<span>今日装车次数：</span><span style="color: rgb(24,228,240);">{{carInformationData2.carnum}}</span>
+				<span>今日装车次数：</span><span style="color: rgb(24,228,240);">{{carInformationData2.carnum ? carInformationData2.carnum : '无'}}</span>
 			</div>
 			<div>
-				<span>运重状态：</span><span style="color: rgb(24,228,240);">{{carInformationData2.status}}</span>
+				<span>运重状态：</span><span style="color: rgb(24,228,240);">{{carInformationData2.status ? carInformationData2.status : '无'}}</span>
 			</div>
 			<div>
-				<span>运载种类：</span><span style="color: rgb(24,228,240);">{{carInformationData2.carclass}}</span>
+				<span>运载种类：</span><span style="color: rgb(24,228,240);">{{carInformationData2.carclass ? carInformationData2.carclass : '无'}}</span>
 			</div>
 		</div>
 	</div>

src/views/MLargeScreen/index.vue

@@ -236,7 +236,7 @@ export default {
             let sec = String(myDate.getSeconds() < 10 ? '0' + myDate.getSeconds() : myDate.getSeconds());
             let weeks = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'];
             let week = weeks[wk];
-            this.currentTime = yy + '-' + mm + '-' + dd + ' ' + hou + ':' + min + ':' + sec + ' ' + week;
+            this.currentTime = yy + '-' + mm + '-' + dd + ' ' + hou + ':' + min + ' ' + week;
 			//电量
 			navigator.getBattery().then(function(battery) {
 				that.batteryEnegy = parseInt(battery.level * 100);