1

src/assets/js/common.js

@@ -2125,7 +2125,7 @@ var HttpReq = function(){
 					params:param,
 				})
 			},
-			//大屏——车辆信息弹框——车辆实时数据
+			//大屏——车辆信息弹框——车辆实时数据(不用)
 			screenCarInforCarRealQuery: function(param){
 				return request({
 					url: '/api/CarReal',
@@ -2133,7 +2133,7 @@ var HttpReq = function(){
 					params:param,
 				})
 			},
-			//大屏——车辆信息弹框——车辆实时数据
+			//大屏——车辆信息弹框——车辆实时数据(不用)
 			screenCarInforCarRealQuery2: function(param){
 				return request({
 					url: '/api/CarPeop/realtime',
@@ -2141,6 +2141,14 @@ var HttpReq = function(){
 					params:param,
 				})
 			},
+			//大屏——车辆信息弹框——车辆实时数据(使用)
+			apiManmadesRealQuery1: function(param){
+				return request({
+					url: '/api/Manmades/Real',
+					method: 'get',
+					params:param,
+				})
+			},
 			//大屏——地图的增删改查
 			screenMapSetUpQuery: function(param){
 				return request({

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

@@ -148,7 +148,7 @@
                             <div style="font-size:14px;color:white;">今日完成度</div>
                             <div style="font-size:20px;color:#05F7FC;">{{truckDynamicListData.rate ? truckDynamicListData.rate : 0}}<span style="font-size:14px;">%</span></div>
                             <div style="font-size:14px;color:white;">今日里程</div>
-                            <div style="font-size:20px;color:#05F7FC;">{{truckDynamicListData.mileage ? truckDynamicListData.mileage : 0}}<span style="font-size:14px;">km</span></div>
+                            <div style="font-size:20px;color:#05F7FC;">{{truckDynamicListData.mil ? truckDynamicListData.mil : 0}}<span style="font-size:14px;">km</span></div>
                         </div>
                     </div>
                     <div class="carDynamicContent1">
@@ -193,7 +193,7 @@
                         </div>
                         <div>
                             <div>今日里程/Km</div>
-                            <div class="ForkliftDynamicContent1_son1">{{forkliftkDynamicListData.mileage ? forkliftkDynamicListData.mileage : 0}}</div>
+                            <div class="ForkliftDynamicContent1_son1">{{forkliftkDynamicListData.mil ? forkliftkDynamicListData.mil : 0}}</div>
                         </div>
                     </div>
                     <div class="carDynamicContent1">
@@ -238,7 +238,7 @@
                         </div>
                         <div>
                             <div>今日里程/Km</div>
-                            <div class="otherCarDynamicContent1_son1">{{otherCarDynamicListData.mileage ? otherCarDynamicListData.mileage : 0}}</div>
+                            <div class="otherCarDynamicContent1_son1">{{otherCarDynamicListData.mil ? otherCarDynamicListData.mil : 0}}</div>
                         </div>
                     </div>
                     <div class="carDynamicContent1">
@@ -339,7 +339,7 @@ export default {
                 rate:0,
                 carry:0,
                 workTime:0,
-                mileage:0,
+                mil:0,
                 startTime:'无',
                 endTime:'无',
                 loadArea:'无',
@@ -352,7 +352,7 @@ export default {
                 number:'无',
                 rate:0,
                 workTime:0,
-                mileage:0,
+                mil:0,
                 startTime:'无',
                 endTime:'无',
                 loadArea:'无',
@@ -365,7 +365,7 @@ export default {
                 number:'无',
                 rate:0,
                 workTime:0,
-                mileage:0,
+                mil:0,
                 startTime:'无',
                 endTime:'无',
                 loadArea:'无',
@@ -988,12 +988,12 @@ export default {
                 return
             }
             this.truckDynamicListData.number = this.truckDynamicListData.data[this.truckDynamicListData.num2].number;
-            HttpReq.truckDispatching.screenCarInforCarRealQuery2({number:this.truckDynamicListData.number}).then((res) => {
+            HttpReq.truckDispatching.apiManmadesRealQuery1({number:this.truckDynamicListData.number}).then((res) => {
                 if(res.code == 200){
                     this.truckDynamicListData.rate = res.data.rate;
                     this.truckDynamicListData.carry = res.data.carry;
                     this.truckDynamicListData.workTime = res.data.workTime;
-                    this.truckDynamicListData.mileage = res.data.mileage;
+                    this.truckDynamicListData.mil = res.data.mil;
                     this.truckDynamicListData.startTime = res.data.startTime;
                     this.truckDynamicListData.endTime = res.data.endTime;
                     this.truckDynamicListData.loadArea = res.data.loadArea;
@@ -1015,12 +1015,12 @@ export default {
                 return
             }
             this.forkliftkDynamicListData.number = this.forkliftkDynamicListData.data[this.forkliftkDynamicListData.num2].number;
-            HttpReq.truckDispatching.screenCarInforCarRealQuery2({number:this.forkliftkDynamicListData.number}).then((res) => {
+            HttpReq.truckDispatching.apiManmadesRealQuery1({number:this.forkliftkDynamicListData.number}).then((res) => {
                 if(res.code == 200){
                     this.forkliftkDynamicListData.rate = res.data.rate;
                     this.forkliftkDynamicListData.carry = res.data.carry;
                     this.forkliftkDynamicListData.workTime = res.data.workTime;
-                    this.forkliftkDynamicListData.mileage = res.data.mileage;
+                    this.forkliftkDynamicListData.mil = res.data.mil;
                     this.forkliftkDynamicListData.startTime = res.data.startTime;
                     this.forkliftkDynamicListData.endTime = res.data.endTime;
                     this.forkliftkDynamicListData.loadArea = res.data.loadArea;
@@ -1042,12 +1042,12 @@ export default {
                 return
             }
             this.otherCarDynamicListData.number = this.otherCarDynamicListData.data[this.otherCarDynamicListData.num2].number;
-            HttpReq.truckDispatching.screenCarInforCarRealQuery2({number:this.otherCarDynamicListData.number}).then((res) => {
+            HttpReq.truckDispatching.apiManmadesRealQuery1({number:this.otherCarDynamicListData.number}).then((res) => {
                 if(res.code == 200){
                     this.otherCarDynamicListData.rate = res.data.rate;
                     this.otherCarDynamicListData.carry = res.data.carry;
                     this.otherCarDynamicListData.workTime = res.data.workTime;
-                    this.otherCarDynamicListData.mileage = res.data.mileage;
+                    this.otherCarDynamicListData.mil = res.data.mil;
                     this.otherCarDynamicListData.startTime = res.data.startTime;
                     this.otherCarDynamicListData.endTime = res.data.endTime;
                     this.otherCarDynamicListData.loadArea = res.data.loadArea;

src/views/MLargeScreen/index.vue

@@ -34,8 +34,7 @@
 			<kaungEZUIKitJs  v-if="kaungEZUIKitJsShow"/>
 		</div>
 		<!-- 嵌入三维地图页面 -->
-		<!-- <iframe src="http://8.143.203.103:9092/#/Index" frameborder="0" class="mapcontainer1"></iframe> -->
-		<!-- <iframe src="http://192.168.0.101:3003/#/Index" frameborder="0" class="mapcontainer1"></iframe> -->
+		<iframe src="http://8.143.203.103:9092/#/Index" frameborder="0" class="mapcontainer1"></iframe>
 		<!-- 单个车辆视频监控 -->
 		<div class="monitorCover1" v-show="monitorCover1Show">
 			<div class="monitorCover1_closePic" @click="closeMonitorCoverFn"></div>
@@ -97,7 +96,7 @@ export default {
 		this.timer = setInterval(() => {
             this.setNowTimes();
         }, 1000)
-		//window.addEventListener('message', this.handleMessage);
+		window.addEventListener('message', this.handleMessage);
 	},
 	methods: {
 		loadData() {