铲车改挖机

src/axios/api.js

@@ -48,8 +48,8 @@ export const dispatchFinishQuery = '/api/Dispatch/finish'; //获取智能调度
 export const apiCpointQuery = '/api/Cpoint'; //获取关键控制点坐标
 export const apiPathmapNavigationQuery = '/api/Pathmap/navigation'; //获取关键控制点坐标
 export const apiManmadesRealCarQuery = '/api/Manmades/RealCar'; //点击车辆小弹框
-export const apiManmadesChanJxQuery = '/api/Manmades/ChanJx'; //铲车绩效上面
-export const apiManmadesChanCheRealQuery = '/api/Manmades/ChanCheReal'; //铲车车辆信息实时数据
+export const apiManmadesChanJxQuery = '/api/Manmades/ChanJx'; //挖机绩效上面
+export const apiManmadesChanCheRealQuery = '/api/Manmades/ChanCheReal'; //挖机车辆信息实时数据
 export const apiEquipmentQuery = '/api/Equipment'; //获取设备表
 export const ajReportModel = '/api/anjian/getAnjianByFormId'; //获取安检项目模板
 export const ajReportSubmit = '/api/anjian'; //提交安检报告
@@ -60,8 +60,8 @@ export const changeJinJiReadStatus = '/api/Notice/changeJinJiReadStatus'; //终
 export const crossingFence = '/api/crossingFence'; //终端围栏出入消息回传
 export const tRealTimeOrder = '/api/tRealTimeOrder'; //获取当前车辆的订单
 export const arriveCaiDian = '/api/tRealTimeOrder/arriveCaiDian'; //判断车辆到达采点后，提供订单id，使进入待装车状态
-export const getAllLoadableKC = '/api/tRealTimeOrder/getAllLoadableKC'; //铲车界面展示可装车的卡车
-export const chooseKCZC = '/api/tRealTimeOrder/chooseKCZC'; //铲车界面点击给卡车装车
+export const getAllLoadableKC = '/api/tRealTimeOrder/getAllLoadableKC'; //挖机界面展示可装车的卡车
+export const chooseKCZC = '/api/tRealTimeOrder/chooseKCZC'; //挖机界面点击给卡车装车
 export const completeZC = '/api/tRealTimeOrder/completeZC'; //卡车界面点击完成装车
 export const crossDB = '/api/tRealTimeOrder/crossDB'; //卡车界面点击到达卸点
 export const completeXC = '/api/tRealTimeOrder/completeXC'; //卡车界面点击完成装车

src/views/Login_.vue

@@ -57,7 +57,7 @@ export default {
   data() {
     return {
       loginForm: {
-        username: "testkc",
+        username: "111",
         password: "123456",
         uuid: "",
       },
@@ -66,7 +66,7 @@ export default {
       keyboardShowType: "",
       //设备OAID  testkc  test999
       //testcc        deviceOAID: "test888",
-      deviceOAID: "test999",
+      deviceOAID: "1f086401c217bae5",
       // deviceOAID: "140945db5f9b8e04",
       //判断设备是否与车绑定
       bindingStatus: false,
@@ -615,4 +615,4 @@ export default {
   left: 0;
   z-index: 100;
 }
-</style>
+</style>
\ No newline at end of file

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

@@ -99,7 +99,7 @@ export default {
           }
         }
       });
-      if (carclass == '铲车') {
+      if (carclass == '挖机') {
         httpGet(apiManmadesChanCheRealQuery, {number: byValue}).then((res) => {
           if (res.code == 200 && res.data.length != 0) {
             this.realTimeData = res.data[0];

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

@@ -23,7 +23,7 @@
 					<div class="checkFrom_input">{{checkFromData.startTime ? checkFromData.startTime : '无'}}</div>
 				</div>
 				<div class="checkFrom_content">
-					<div>{{carclass != '铲车' ? '今日车数：' : '今日装车数：'}}</div>
+					<div>{{carclass != '挖机' ? '今日车数：' : '今日装车数：'}}</div>
 					<div class="checkFrom_input">{{checkFromData.carNum ? checkFromData.carNum + '次' : '无'}}</div>
 				</div>
 				<div class="checkFrom_content">
@@ -42,7 +42,7 @@
 					<div>已完成单数：</div>
 					<div class="checkFrom_input">{{checkFromData.finish ? checkFromData.finish + '单' : '无'}}</div>
 				</div>
-				<div class="checkFrom_content" v-if="carclass != '铲车'">
+				<div class="checkFrom_content" v-if="carclass != '挖机'">
 					<div>今日里程数：</div>
 					<div class="checkFrom_input">{{checkFromData.odo ? checkFromData.odo + 'km' : '无'}}</div>
 				</div>
@@ -64,7 +64,7 @@
 				<span>跑单记录：</span>
 			</div>
 			<!-- 卡车列表 -->
-			<div class="co-table" v-if="carclass != '铲车'">
+			<div class="co-table" v-if="carclass != '挖机'">
 				<div class="rolling">
 					<div class="table-box">
 						<dl>
@@ -90,8 +90,8 @@
 					</div>
 				</div>
 			</div>
-			<!-- 铲车列表 -->
-			<div class="co-table" v-if="carclass == '铲车'">
+			<!-- 挖机列表 -->
+			<div class="co-table" v-if="carclass == '挖机'">
 				<div class="rolling">
 					<div class="table-box">
 						<dl>
@@ -146,7 +146,7 @@ export default {
 		getintelligentDisData(){
 			if(this.carclass == ''){
 				return
-			}else if(this.carclass == "铲车"){
+			}else if(this.carclass == "挖机"){
 				let query2 = {};
 				query2.size = 50;
 				query2.page = 0;
@@ -212,7 +212,7 @@ export default {
 			var day = date.getDate();             //日 ,从 Date 对象返回一个月中的某一天 (1 ~ 31)
 			var hours = date.getHours();          //小时 ,返回 Date 对象的小时 (0 ~ 23)
 			var minutes = date.getMinutes();      //分钟 ,返回 Date 对象的分钟 (0 ~ 59)
-			var seconds = date.getSeconds();      //秒 ,返回 Date 对象的秒数 (0 ~ 59)   
+			var seconds = date.getSeconds();      //秒 ,返回 Date 对象的秒数 (0 ~ 59)
 			//修改月份格式
 			if (month >= 1 && month <= 9) {
 				month = "0" + month;
@@ -362,7 +362,7 @@ export default {
 		word-break: break-all;
 	}
 	.co-table{
-		text-align: center;			
+		text-align: center;
 	}
 	.table-box{
 		margin-top: 0px;
@@ -544,7 +544,7 @@ export default {
 		word-break: break-all;
 	}
 	.co-table{
-		text-align: center;			
+		text-align: center;
 	}
 	.table-box{
 		margin-top: 0px;
@@ -606,4 +606,4 @@ export default {
 	}
 }
 
-</style>
+</style>
\ No newline at end of file

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

@@ -26,7 +26,7 @@
 			<div v-show="carclass == '卡车'">
 				<span>运载种类：</span><span style="color: rgb(24,228,240);">{{carInformationData2.arearesources ? carInformationData2.arearesources : '无'}}</span>
 			</div>
-			<div v-show="carclass == '铲车'">
+			<div v-show="carclass == '挖机'">
 				<span>电铲状态：</span><span style="color: rgb(24,228,240);">{{carInformationData2.workStatus == 0 ? '空闲' : carInformationData2.workStatus == 1 ? '忙碌' : '暂无状态'}}</span>
 			</div>
 		</div>
@@ -146,4 +146,4 @@ export default {
 	}
 }
 
-</style>
+</style>
\ No newline at end of file

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

@@ -152,7 +152,7 @@ export default {
         if(res.code===200){
           if(res.data>0){
             this.navStu = 0;
-            if (this.$parent.carclass != "铲车") {
+            if (this.$parent.carclass != "挖机") {
               this.audioPlayByUrl(ddcd);
             }
             this.$parent.clearNavigation();
@@ -164,7 +164,7 @@ export default {
               duration: 5000,
               dangerouslyUseHTMLString: true,
             });
-            if (this.$parent.carclass != "铲车") {
+            if (this.$parent.carclass != "挖机") {
               this.audioPlayByUrl(qkjwj);
             }
           }

src/views/MLargeScreen/index.vue

@@ -97,8 +97,8 @@
     </div>
     <!-- 左下角logo -->
 <!--    <img src="../../assets/images/truckTuPian/maplogo1.jpg" class="mapLogo1"/>-->
-    <!-- 铲车待装车辆列表 -->
-    <div class="waitingtrucksView" v-if="kcListView && carclass == '铲车'">
+    <!-- 挖机待装车辆列表 -->
+    <div class="waitingtrucksView" v-if="kcListView && carclass == '挖机'">
       <div class="waitingtrucksView_title">待装卡车列表</div>
       <div class="waitingtrucksView_content">
         <div v-for="(item, index) in daizhangCar" :key="index">
@@ -264,7 +264,7 @@ export default {
         return;
       }
       //判断车辆类型
-      if (this.carclass == "铲车") {
+      if (this.carclass == "挖机") {
         this.loadData1();
       }
       //获取报警记录
@@ -284,7 +284,7 @@ export default {
                       this.notifyPromise = this.notifyPromise
                           .then(this.$nextTick)
                           .then(() => {
-                            if (this.carclass == "铲车" && item.type != 3) {
+                            if (this.carclass == "挖机" && item.type != 3) {
                               this.$notify({
                                 title:
                                     (item.type == 1
@@ -303,14 +303,14 @@ export default {
                                 dangerouslyUseHTMLString: true,
                               });
                               this.audioBjFn(item.type, item.areaName);
-                            } else if (this.carclass != "铲车") {
+                            } else if (this.carclass != "挖机") {
                               this.$notify({
                                 title:
                                     (item.type == 1
                                         ? "限入"
                                         : item.type == 2
                                             ? "限出"
-                                            : item.type == 3 && this.carclass != "铲车"
+                                            : item.type == 3 && this.carclass != "挖机"
                                                 ? "无故停车"
                                                 : item.type == 4
                                                     ? "防碰撞"
@@ -660,10 +660,10 @@ export default {
         return;
       }
       const cont = await window.SerialPort.receive();
-      this.$message({
-        message: cont,
-        type: "warning",
-      });
+      // this.$message({
+      //   message: cont,
+      //   type: "warning",
+      // });
       if(cont){
         let strArr = cont.split(',');
         // let wgLat = this.dmsTransform(strArr[2]), wgLon = this.dmsTransform(strArr[4]), h = Number(strArr[9] || 0), p = Number(strArr[6]);
@@ -781,9 +781,9 @@ export default {
                     }).then((res2) => {
                     });
                     this.carclass = res1.data.content[0].carclass;
-                    if (this.carclass == "铲车") {
+                    if (this.carclass == "挖机") {
                       this.loadData1();
-                      this.systemTitle = "卡车调度系统铲车终端";
+                      this.systemTitle = "卡车调度系统挖机终端";
                     }
                     this.equipmentName = res1.data.content[0].equipmentName;
                     //执行获取位置