铲车改挖机

src/assets/js/common.js

@@ -2047,7 +2047,7 @@ var HttpReq = function(){
 					params:param,
 				})
 			},
-			//大屏——数据总览——卡车铲车排行榜
+			//大屏——数据总览——卡车挖机排行榜
 			kaChanRankListDayQuery: function(param){
 				return request({
 					url: '/api/Manmades/jiedanDay',
@@ -2094,7 +2094,7 @@ var HttpReq = function(){
 					params:param,
 				})
 			},
-			//大屏——车辆管理——卡车铲车排行榜day
+			//大屏——车辆管理——卡车挖机排行榜day
 			apiManmadesDay1Query: function(param){
 				return request({
 					// url: '/api/Manmades/Day',
@@ -2103,7 +2103,7 @@ var HttpReq = function(){
 					params:param,
 				})
 			},
-			//大屏——车辆管理——卡车铲车排行榜week
+			//大屏——车辆管理——卡车挖机排行榜week
 			apiManmadesZhou1Query: function(param){
 				return request({
 					url: '/api/Manmades/Zhou',
@@ -2112,7 +2112,7 @@ var HttpReq = function(){
 					params:param,
 				})
 			},
-			//大屏——车辆管理——卡车铲车排行榜month
+			//大屏——车辆管理——卡车挖机排行榜month
 			apiManmadesMou1Query: function(param){
 				return request({
 					url: '/api/Manmades/Mou',
@@ -2208,7 +2208,7 @@ var HttpReq = function(){
 					params:param,
 				})
 			},
-			//大屏——车辆信息弹框——车辆实时数据(使用,铲车)
+			//大屏——车辆信息弹框——车辆实时数据(使用,挖机)
 			apiManmadesChancheRealQuery1: function(param){
 				return request({
 					url: '/api/Manmades/ChanCheReal',
@@ -2528,7 +2528,7 @@ var HttpReq = function(){
 					data:data,
 				})
 			},
-			//采点管理中没有绑定的铲车
+			//采点管理中没有绑定的挖机
 			apiCarPeopZhanyongQuery: function(param){
 				return request({
 					url: '/api/CarPeop/zhanyong',
@@ -2568,7 +2568,7 @@ var HttpReq = function(){
 					params:param,
 				})
 			},
-			//大屏组件4铲车排行榜接口
+			//大屏组件4挖机排行榜接口
 			apiManmadeschanjiedanDayQuery: function(param){
 				return request({
 					// url: '/api/Manmades/chanjiedanDay',
@@ -3123,7 +3123,7 @@ var HttpReq = function(){
           params:param,
         })
       },
-      //大屏铲车动态
+      //大屏挖机动态
       dpCcDynamics: function(param){
         return request({
           url: '/api/carManager/ccDynamics',

src/components/mars3d/Map.vue

@@ -205,8 +205,8 @@ export default {
       //模型配置
       const graphic = new mars3d.graphic.ModelPrimitive({
         style: {
-          //url: carclass == '铲车' ? '//data.mars3d.cn/gltf/mars/car/wajueji.glb' : '//data.mars3d.cn/gltf/imap/1d4f63111fc9499dac5cee2286ad7bb3/gltf/gltf2.gltf',
-          url: carclass == '铲车' ? '//data.mars3d.cn/gltf/mars/car/wajueji.glb' : '//data.mars3d.cn/gltf/mars/car/tufangche.glb',
+          //url: carclass == '挖机' ? '//data.mars3d.cn/gltf/mars/car/wajueji.glb' : '//data.mars3d.cn/gltf/imap/1d4f63111fc9499dac5cee2286ad7bb3/gltf/gltf2.gltf',
+          url: carclass == '挖机' ? '//data.mars3d.cn/gltf/mars/car/wajueji.glb' : '//data.mars3d.cn/gltf/mars/car/tufangche.glb',
           scale: 2,
           minimumPixelSize: 50,
           // 高亮时的样式（默认为鼠标移入，也可以指定type:'click'单击高亮），构造后也可以openHighlight、closeHighlight方法来手动调用

src/views/IntelligentDispatchManagement/carManualScheduling/index.vue

@@ -126,7 +126,7 @@ export default {
 					this.carInformationData = res;
 				})
 				//获取总的车辆信息
-				HttpReq.truckDispatching.carInformationQuery({size:9999,carclass:'铲车'}).then((res) => {
+				HttpReq.truckDispatching.carInformationQuery({size:9999,carclass:'挖机'}).then((res) => {
 					if(res.code == 200){
 						this.carInformationDataAll = res.data.content;
 						// let aa1 = [];

src/views/IntelligentDispatchManagement/carVoiceSupplement/index.vue

@@ -310,7 +310,7 @@ export default {
 						this.carInformationDataAdd = res.data.content;
 						let array1 = [];
 						res.data.content.forEach((item,index)=>{
-							if(item.carclass == '铲车'){
+							if(item.carclass == '挖机'){
 								array1.push(item);
 							}
 						})

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

@@ -31,7 +31,7 @@
                             <span style="color:#2195FD;margin-left: 13vw;">{{carWorkingStateData.chancheoffline}}</span>
                         </div>
                         <div style="display: flex;">
-                            <div style="color:#A6F6F9;font-size: 15px;">铲车状态</div>
+                            <div style="color:#A6F6F9;font-size: 15px;">挖机状态</div>
                             <div style="display: flex;width: 80%;margin-left: 0.5vw;border: #02F7EF 0.5px solid;border-radius: 3px;">
                                 <div :style="'height:1.7vh;border-top-left-radius: 3px;border-bottom-left-radius: 3px;background-color: #14F3C5;width:' + (carWorkingStateData.chancheonline/(carWorkingStateData.chancheonline + carWorkingStateData.chancheoffline)) * 100  + '%;'"></div>
                                 <div :style="'height:1.7vh;border-top-right-radius: 3px;border-bottom-right-radius: 3px;background-color: #2195FD;width:' + (carWorkingStateData.chancheoffline/(carWorkingStateData.chancheonline + carWorkingStateData.chancheoffline)) * 100  + '%;'"></div>
@@ -74,10 +74,10 @@
                     <div class="carManScrView_leftView_content_views3" id="carManScrView_leftView_content_views3_1"></div>
                 </div>
             </div>
-            <!-- 铲车排行榜-->
+            <!-- 挖机排行榜-->
             <div>
                 <div class="carManScrView_leftView_title truck_titleStyle">
-                    <div>铲车排行榜</div>
+                    <div>挖机排行榜</div>
                     <div class="driverTitleDateStyle">
                         <div :class="forkLiftRankListData.selectTimeText == 'day' ? 'driverTitleDateStyle_son1' : 'driverTitleDateStyle_son2' " @click="forkLiftChangeTime('day')">日</div>
                         <div :class="forkLiftRankListData.selectTimeText == 'week' ? 'driverTitleDateStyle_son1' : 'driverTitleDateStyle_son2' " @click="forkLiftChangeTime('week')">周</div>
@@ -170,9 +170,9 @@
                     </div>
                 </div>
             </div>
-            <!-- 铲车动态-->
+            <!-- 挖机动态-->
             <div>
-                <div class="carManScrView_rightView_title">铲车动态</div>
+                <div class="carManScrView_rightView_title">挖机动态</div>
                 <div class="carManScrView_rightView_content">
                     <div class="carDynamicTitleStyle">
                         <img src="../../../../assets/images/cutGraph/huoche11.png" height="28">
@@ -300,7 +300,7 @@ export default {
                         },
                     },
                     {
-                        name: "铲车",
+                        name: "挖机",
                         value: 0,
                         itemStyle: {
                             opacity: 0.2,
@@ -320,9 +320,9 @@ export default {
                 driverName1:['kfdfdf','dsdsd1','dsdsd55'],
                 driverSeriesData1:[20,50,10],
             },
-            //铲车排行榜
+            //挖机排行榜
             forkLiftRankListData:{
-                carclass:'铲车',
+                carclass:'挖机',
                 selectTimeText:'day',
                 selectFieldText:'time',
                 listData:[],
@@ -341,7 +341,7 @@ export default {
                 loadArea:'无',
                 unloadArea:'无',
             },
-            //铲车动态
+            //挖机动态
             forkliftkDynamicListData:{
                 data:[],
                 num2:0,
@@ -395,7 +395,7 @@ export default {
                             res.data.content.forEach((item)=>{
                                 if(item.carclass == '卡车'){
                                     kache1.push(item);
-                                }else if(item.carclass == '铲车'){
+                                }else if(item.carclass == '挖机'){
                                     dianchan1.push(item);
                                 }else{
                                     qitache1.push(item);
@@ -482,7 +482,7 @@ export default {
                             })
                         }
                     })
-                    //获取铲车排行榜
+                    //获取挖机排行榜
                     let forkLiftQuery1 = {};
                     forkLiftQuery1.size = 5;
                     forkLiftQuery1.sort = this.forkLiftRankListData.selectFieldText + ',desc';
@@ -511,7 +511,7 @@ export default {
                             res.data.content.forEach((item,index)=>{
                                 if(item.carclass == '卡车'){
                                     arr1.push(item);
-                                }else if(item.carclass == '铲车'){
+                                }else if(item.carclass == '挖机'){
                                     arr2.push(item);
                                 }else{
                                     arr3.push(item);
@@ -546,7 +546,7 @@ export default {
                                     res.data.content.forEach((item)=>{
                                         if(item.carclass == '卡车'){
                                             kache1.push(item);
-                                        }else if(item.carclass == '铲车'){
+                                        }else if(item.carclass == '挖机'){
                                             dianchan1.push(item);
                                         }else{
                                             qitache1.push(item);
@@ -633,7 +633,7 @@ export default {
                                     })
                                 }
                             })
-                            //获取铲车排行榜
+                            //获取挖机排行榜
                             let forkLiftQuery1 = {};
                             forkLiftQuery1.size = 5;
                             forkLiftQuery1.sort = this.forkLiftRankListData.selectFieldText + ',desc';
@@ -927,7 +927,7 @@ export default {
 
             option && myChart.setOption(option);
         },
-        //铲车切换时间
+        //挖机切换时间
         forkLiftChangeTime(text){
             this.forkLiftRankListData.selectTimeText = text;
             let forkLiftQuery1 = {};
@@ -950,7 +950,7 @@ export default {
                 })
             }
         },
-        //铲车切换字段排序
+        //挖机切换字段排序
         forkLiftChangeField(text){
             this.forkLiftRankListData.selectFieldText = text;
             let forkLiftQuery1 = {};
@@ -1080,7 +1080,7 @@ export default {
 			};
 			pipe.setOption(option);
         },
-        //铲车动态
+        //挖机动态
         dianchandongtai(){
             let num1 =  parseInt(this.forkliftkDynamicListData.data.length) - 1;
             //获取车辆实时数据

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

@@ -105,10 +105,10 @@
                     <div class="dataScrView_leftView_content_views3" id="dataScrView_leftView_content_views3_1"></div>
                 </div>
             </div>
-            <!-- 铲车司机排行榜-->
+            <!-- 挖机司机排行榜-->
             <div>
                 <div class="dataScrView_leftView_title truck_titleStyle">
-                    <div>铲车司机排行榜</div>
+                    <div>挖机司机排行榜</div>
                     <div class="driverTitleDateStyle">
                         <div :class="forkLiftRankListData.selectTimeText == 'day' ? 'driverTitleDateStyle_son1' : 'driverTitleDateStyle_son2' " @click="forkLiftChangeTime('day')">日</div>
                         <div :class="forkLiftRankListData.selectTimeText == 'week' ? 'driverTitleDateStyle_son1' : 'driverTitleDateStyle_son2' " @click="forkLiftChangeTime('week')">周</div>
@@ -447,9 +447,9 @@ export default {
                 driverName:[],
                 driverSeriesData:[],
             },
-            //铲车排行榜
+            //挖机排行榜
             forkLiftRankListData:{
-                carclass:'铲车',
+                carclass:'挖机',
                 selectTimeText:'day',
                 selectFieldText:'time',
                 listData:[],
@@ -635,7 +635,7 @@ export default {
                             })
                         }
                     })
-                    //获取铲车排行榜
+                    //获取挖机排行榜
                     let forkLiftQuery1 = {};
                     forkLiftQuery1.size = 5;
                     forkLiftQuery1.sort = this.forkLiftRankListData.selectFieldText + ',desc';
@@ -698,7 +698,7 @@ export default {
                             if(res.data.totalElements == 0){
                                 this.carWorkTimeData.listData = [
                                     {cartype:'卡车',gongshi:0,xianzhi:0},
-                                    {cartype:'铲车',gongshi:0,xianzhi:0},
+                                    {cartype:'挖机',gongshi:0,xianzhi:0},
                                     {cartype:'其他车辆',gongshi:0,xianzhi:0},
                                 ];
                             }else{
@@ -857,7 +857,7 @@ export default {
                                 })
                             }
                         })
-                        //获取铲车排行榜
+                        //获取挖机排行榜
                         let forkLiftQuery1 = {};
                         forkLiftQuery1.size = 5;
                         forkLiftQuery1.sort = this.forkLiftRankListData.selectFieldText + ',desc';
@@ -920,7 +920,7 @@ export default {
                                 if(res.data.totalElements == 0){
                                     this.carWorkTimeData.listData = [
                                         {cartype:'卡车',gongshi:0,xianzhi:0},
-                                        {cartype:'铲车',gongshi:0,xianzhi:0},
+                                        {cartype:'挖机',gongshi:0,xianzhi:0},
                                         {cartype:'其他车辆',gongshi:0,xianzhi:0},
                                     ];
                                 }else{
@@ -1123,7 +1123,7 @@ export default {
 
             option && myChart.setOption(option);
         },
-        //铲车切换时间
+        //挖机切换时间
         forkLiftChangeTime(text){
             this.forkLiftRankListData.selectTimeText = text;
             let forkLiftQuery1 = {};
@@ -1146,7 +1146,7 @@ export default {
                 })
             }
         },
-        //铲车切换字段排序
+        //挖机切换字段排序
         forkLiftChangeField(text){
             this.forkLiftRankListData.selectFieldText = text;
             let forkLiftQuery1 = {};
@@ -1269,7 +1269,7 @@ export default {
                     if(res.data.totalElements == 0){
                         this.carWorkTimeData.listData = [
                             {cartype:'卡车',gongshi:0,xianzhi:0},
-                            {cartype:'铲车',gongshi:0,xianzhi:0},
+                            {cartype:'挖机',gongshi:0,xianzhi:0},
                             {cartype:'其他车辆',gongshi:0,xianzhi:0},
                         ];
                     }else{

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

@@ -830,7 +830,7 @@ export default {
 						},
                     },
                     {
-                        name: '铲车',
+                        name: '挖机',
                         type: 'bar',
                         stack: 'total',
                         label: {

src/views/MLargeScreen/components/smallComponents/DPcomputer10.vue

@@ -30,7 +30,7 @@
           <span style="color:#2195FD;margin-left: 13vw;">{{ carWorkingStateData.chancheonline }}</span>
         </div>
         <div style="display: flex;">
-          <div style="color:#A6F6F9;font-size: 15px;">铲车状态</div>
+          <div style="color:#A6F6F9;font-size: 15px;">挖机状态</div>
           <div style="display: flex;width: 80%;margin-left: 0.5vw;border: #02F7EF 0.5px solid;border-radius: 3px;">
             <div
               :style="'height:1.7vh;border-top-left-radius: 3px;border-bottom-left-radius: 3px;background-color: #14F3C5;width:' + (carWorkingStateData.chancheoffline/(carWorkingStateData.chancheonline + carWorkingStateData.chancheoffline)) * 100  + '%;'"></div>
@@ -89,7 +89,7 @@ export default {
             },
           },
           {
-            name: "铲车",
+            name: "挖机",
             value: 0,
             itemStyle: {
               opacity: 0.2,
@@ -120,7 +120,7 @@ export default {
           res.data.content.forEach((item) => {
             if (item.carclass == '卡车') {
               kache1.push(item);
-            } else if (item.carclass == '铲车') {
+            } else if (item.carclass == '挖机') {
               dianchan1.push(item);
             } else {
               qitache1.push(item);
@@ -180,7 +180,7 @@ export default {
             res.data.content.forEach((item) => {
               if (item.carclass == '卡车') {
                 kache1.push(item);
-              } else if (item.carclass == '铲车') {
+              } else if (item.carclass == '挖机') {
                 dianchan1.push(item);
               } else {
                 qitache1.push(item);

src/views/MLargeScreen/components/smallComponents/DPcomputer12.vue

 <template>
   <div class="DPcomputer12Box">
-    <!-- 铲车排行榜-->
+    <!-- 挖机排行榜-->
     <div class="carManScrView_leftView_title truck_titleStyle">
-      <div>铲车排行榜</div>
+      <div>挖机排行榜</div>
       <div class="driverTitleDateStyle">
         <div
           :class="forkLiftRankListData.selectTimeText == 'day' ? 'driverTitleDateStyle_son1' : 'driverTitleDateStyle_son2' "
@@ -77,9 +77,9 @@ export default {
   data() {
     return {
       DPcomputer12BoxTimer: null,
-      //铲车排行榜
+      //挖机排行榜
       forkLiftRankListData: {
-        carclass: '铲车',
+        carclass: '挖机',
         selectTimeText: 'day',
         selectFieldText: 'workTime',
         listData: [
@@ -100,7 +100,7 @@ export default {
   },
   methods: {
     loadData() {
-      //获取铲车排行榜
+      //获取挖机排行榜
       let forkLiftQuery1 = {};
       forkLiftQuery1.size = 5;
       forkLiftQuery1.sort = this.forkLiftRankListData.selectFieldText;
@@ -116,12 +116,12 @@ export default {
         })
       })
     },
-    //铲车切换时间
+    //挖机切换时间
     forkLiftChangeTime(text) {
       this.forkLiftRankListData.selectTimeText = text;
       this.loadData();
     },
-    //铲车切换字段排序
+    //挖机切换字段排序
     forkLiftChangeField(text) {
       this.forkLiftRankListData.selectFieldText = text;
       this.loadData();

src/views/MLargeScreen/components/smallComponents/DPcomputer14.vue

 <template>
   <div class="DPcomputer14Box">
-    <!-- 铲车动态-->
-    <div class="carManScrView_rightView_title">铲车动态</div>
+    <!-- 挖机动态-->
+    <div class="carManScrView_rightView_title">挖机动态</div>
     <div class="carManScrView_rightView_content">
       <div class="carDynamicTitleStyle">
         <img src="../../../../assets/images/cutGraph/huoche11.png" height="28">
@@ -78,7 +78,7 @@ export default {
     return {
       DPcomputer14BoxTimer: null,
       xuanzekuangValue: '',
-      //铲车动态
+      //挖机动态
       forkliftkDynamicListData: {
         data: [],
         num2: 0,
@@ -104,7 +104,7 @@ export default {
         let arr2 = [];
         if (res.code == 200) {
           res.data.content.forEach((item, index) => {
-            if (item.carclass == '铲车') {
+            if (item.carclass == '挖机') {
               arr2.push(item);
             }
           })
@@ -117,7 +117,7 @@ export default {
         }, 20000)
       })
     },
-    //铲车动态
+    //挖机动态
     dianchandongtai() {
       let num1 = parseInt(this.forkliftkDynamicListData.data.length) - 1;
       //获取车辆实时数据

src/views/MLargeScreen/components/smallComponents/DPcomputer15.vue

@@ -90,7 +90,7 @@ export default {
                     res.data.content.forEach((item,index)=>{
                         if(item.carclass == '卡车'){
                             arr1.push(item);
-                        }else if(item.carclass == '铲车'){
+                        }else if(item.carclass == '挖机'){
                             arr2.push(item);
                         }else{
                             arr3.push(item);

src/views/MLargeScreen/components/smallComponents/DPcomputer16.vue

@@ -68,7 +68,7 @@
                 </div>
               </div>
               <div style="color:white;align-items:center;">
-                <div class="editCarListBtn" @click="openCarListView('铲车')">分配</div>
+                <div class="editCarListBtn" @click="openCarListView('挖机')">分配</div>
               </div>
             </div>
             <div class="tbListBox" style="height:4vh">

src/views/MLargeScreen/components/smallComponents/DPcomputer19.vue

@@ -142,7 +142,7 @@ export default {
             },
           },
           {
-            name: '铲车',
+            name: '挖机',
             type: 'bar',
             data: this.carsAreaDistributionData.chanche,
 

src/views/MLargeScreen/components/smallComponents/DPcomputer4.vue

 <template>
     <div class="DPcomputer4Box">
-        <!-- 铲车司机排行榜-->
+        <!-- 挖机司机排行榜-->
         <div class="dataScrView_leftView_title truck_titleStyle">
-            <div>铲车司机排行榜</div>
+            <div>挖机司机排行榜</div>
             <div class="driverTitleDateStyle">
                 <div :class="forkLiftRankListData.selectTimeText == 'day' ? 'driverTitleDateStyle_son1' : 'driverTitleDateStyle_son2' " @click="forkLiftChangeTime('day')">日</div>
                 <div :class="forkLiftRankListData.selectTimeText == 'week' ? 'driverTitleDateStyle_son1' : 'driverTitleDateStyle_son2' " @click="forkLiftChangeTime('week')">周</div>
@@ -56,9 +56,9 @@ export default {
     data(){
         return {
             DPcomputer4BoxTimer:null,
-            //铲车排行榜
+            //挖机排行榜
             forkLiftRankListData:{
-                carclass:'铲车',
+                carclass:'挖机',
                 selectTimeText:'day',
                 selectFieldText:'time',
                 listData:[],
@@ -71,7 +71,7 @@ export default {
     methods:{
         loadData(){
             let that = this;
-            //获取铲车排行榜
+            //获取挖机排行榜
             let forkLiftQuery1 = {};
             forkLiftQuery1.size = 5;
             forkLiftQuery1.sort = this.forkLiftRankListData.selectFieldText;
@@ -105,7 +105,7 @@ export default {
             })
 
             this.DPcomputer4BoxTimer = setInterval(() => {
-                //获取铲车排行榜
+                //获取挖机排行榜
                 let forkLiftQuery1 = {};
                 forkLiftQuery1.size = 5;
                 forkLiftQuery1.sort = this.forkLiftRankListData.selectFieldText;
@@ -139,7 +139,7 @@ export default {
                 })
             },10000)
         },
-        //铲车切换时间
+        //挖机切换时间
         forkLiftChangeTime(text){
             let that = this;
             this.forkLiftRankListData.selectTimeText = text;
@@ -175,7 +175,7 @@ export default {
                 })
             }
         },
-        //铲车切换字段排序
+        //挖机切换字段排序
         forkLiftChangeField(text){
             let that = this;
             this.forkLiftRankListData.selectFieldText = text;

src/views/MLargeScreen/components/smallComponents/DPcomputer7.vue

@@ -45,7 +45,7 @@ export default {
                 selectTimeText:'day',
                 listData:[
                     {cartype:'卡车',gongshi:0,xianzhi:100},
-                    {cartype:'铲车',gongshi:0,xianzhi:100},
+                    {cartype:'挖机',gongshi:0,xianzhi:100},
                     {cartype:'其他车辆',gongshi:0,xianzhi:100}
                 ],
                 selectTimeDate:'',

src/views/MLargeScreen/components/smallComponents/DPcomputer8.vue

@@ -75,7 +75,7 @@ export default {
 					}
 					this.exploitationEfficiencyData.rate1 = transitArr1;
 					this.exploitationEfficiencyData.dayYield2 = text1;
-					HttpReq.truckDispatching.apiManmadeschanjiedanDayQuery({carclass:'铲车'}).then((reschanche) => {
+					HttpReq.truckDispatching.apiManmadeschanjiedanDayQuery({carclass:'挖机'}).then((reschanche) => {
 						reschanche.forEach((itemchanche,indexchanche)=>{
 							text3 = text3 + (itemchanche.time ? parseFloat(itemchanche.time) : 0);
 						});
@@ -113,7 +113,7 @@ export default {
 						}
 						this.exploitationEfficiencyData.rate1 = transitArr1;
 						this.exploitationEfficiencyData.dayYield2 = text1;
-						HttpReq.truckDispatching.apiManmadeschanjiedanDayQuery({carclass:'铲车'}).then((reschanche) => {
+						HttpReq.truckDispatching.apiManmadeschanjiedanDayQuery({carclass:'挖机'}).then((reschanche) => {
 							reschanche.forEach((itemchanche,indexchanche)=>{
 								text3 = text3 + (itemchanche.time ? parseFloat(itemchanche.time) : 0);
 							});

src/views/carManagement/carInformation/index.vue

@@ -250,10 +250,10 @@ export default {
 		},
 		toDelete(item) {
 			var id = item.id;
-			this.$confirm( item.carclass == '铲车' ? '该车为铲车，如要删除，请在删除以后为采点管理中对应的采点分配新的铲车！' : '确认删除该条数据吗?', '提示', {
+			this.$confirm( item.carclass == '挖机' ? '该车为挖机，如要删除，请在删除以后为采点管理中对应的采点分配新的挖机！' : '确认删除该条数据吗?', '提示', {
 				confirmButtonText: '确定',
 				cancelButtonText: '取消',
-				type: item.carclass == '铲车' ? 'error' : 'warning'
+				type: item.carclass == '挖机' ? 'error' : 'warning'
 			}).then((e) => {
 				this.reqRemoveProject([id],item)
 			}).catch((e) => {})
@@ -348,12 +348,12 @@ export default {
 				this.loadData();
 			})
 
-			if(items.carclass == '铲车'){
+			if(items.carclass == '挖机'){
 				HttpReq.truckDispatching.RegionalCaiDianQuery({areashovel:items.number}).then((res) => {
 					if(res.code == 200 && res.data.totalElements != 0){
 						this.$nextTick(()=>{
 							this.$notify({
-								title: '请在采点管理中为 ' + res.data.content[0].areaName + '/' + res.data.content[0].name + ' 添加新的铲车！',
+								title: '请在采点管理中为 ' + res.data.content[0].areaName + '/' + res.data.content[0].name + ' 添加新的挖机！',
 								type: 'warning',
 								duration: 20000
 							});

src/views/performanceStatistics/caiquOutput/day/index.vue

@@ -26,8 +26,8 @@
                 <el-table-column prop="plan" label="日计划量" align="center"></el-table-column>
                 <el-table-column prop="actualProd" label="实际日产量" align="center"></el-table-column>
                 <el-table-column prop="rate" label="完成率" align="center"></el-table-column>
-                <el-table-column prop="timeOfWork" label="铲车工作时间(h)" align="center"></el-table-column>
-                <el-table-column prop="numberOfCC" label="铲车车数" align="center"></el-table-column>
+                <el-table-column prop="timeOfWork" label="挖机工作时间(h)" align="center"></el-table-column>
+                <el-table-column prop="numberOfCC" label="挖机车数" align="center"></el-table-column>
                 <el-table-column prop="numberOfKC" label="卡车车数" align="center"></el-table-column>
               </el-table>
               <!--分页组件-->

src/views/performanceStatistics/caiquOutput/month/index.vue

@@ -26,8 +26,8 @@
                 <el-table-column prop="plan" label="月计划量" align="center"></el-table-column>
                 <el-table-column prop="actualProd" label="实际月产量" align="center"></el-table-column>
                 <el-table-column prop="rate" label="完成率" align="center"></el-table-column>
-                <el-table-column prop="timeOfWork" label="铲车工作时间(h)" align="center"></el-table-column>
-                <el-table-column prop="numberOfCC" label="铲车车数" align="center"></el-table-column>
+                <el-table-column prop="timeOfWork" label="挖机工作时间(h)" align="center"></el-table-column>
+                <el-table-column prop="numberOfCC" label="挖机车数" align="center"></el-table-column>
                 <el-table-column prop="numberOfKC" label="卡车车数" align="center"></el-table-column>
 							</el-table>
 							<!--分页组件-->

src/views/performanceStatistics/caiquOutput/year/index.vue

@@ -26,8 +26,8 @@
                 <el-table-column prop="plan" label="年计划量" align="center"></el-table-column>
                 <el-table-column prop="actualProd" label="实际年产量" align="center"></el-table-column>
                 <el-table-column prop="rate" label="完成率" align="center"></el-table-column>
-                <el-table-column prop="timeOfWork" label="铲车工作时间(h)" align="center"></el-table-column>
-                <el-table-column prop="numberOfCC" label="铲车车数" align="center"></el-table-column>
+                <el-table-column prop="timeOfWork" label="挖机工作时间(h)" align="center"></el-table-column>
+                <el-table-column prop="numberOfCC" label="挖机车数" align="center"></el-table-column>
                 <el-table-column prop="numberOfKC" label="卡车车数" align="center"></el-table-column>
 							</el-table>
 							<!--分页组件-->

src/views/performanceStatistics/xiedianOutput/day/index.vue

@@ -26,8 +26,8 @@
                 <el-table-column prop="plan" label="日计划量" align="center"></el-table-column>
                 <el-table-column prop="actualProd" label="实际日产量" align="center"></el-table-column>
                 <el-table-column prop="rate" label="完成率" align="center"></el-table-column>
-                <el-table-column prop="timeOfWork" label="铲车工作时间(h)" align="center"></el-table-column>
-                <el-table-column prop="numberOfCC" label="铲车车数" align="center"></el-table-column>
+                <el-table-column prop="timeOfWork" label="挖机工作时间(h)" align="center"></el-table-column>
+                <el-table-column prop="numberOfCC" label="挖机车数" align="center"></el-table-column>
                 <el-table-column prop="numberOfKC" label="卡车车数" align="center"></el-table-column>
 							</el-table>
 							<!--分页组件-->

src/views/performanceStatistics/xiedianOutput/month/index.vue

@@ -26,8 +26,8 @@
 								<el-table-column prop="plan" label="月计划量" align="center"></el-table-column>
 								<el-table-column prop="actualProd" label="实际月产量" align="center"></el-table-column>
 								<el-table-column prop="rate" label="完成率" align="center"></el-table-column>
-								<el-table-column prop="timeOfWork" label="铲车工作时间(h)" align="center"></el-table-column>
-								<el-table-column prop="numberOfCC" label="铲车车数" align="center"></el-table-column>
+								<el-table-column prop="timeOfWork" label="挖机工作时间(h)" align="center"></el-table-column>
+								<el-table-column prop="numberOfCC" label="挖机车数" align="center"></el-table-column>
 								<el-table-column prop="numberOfKC" label="卡车车数" align="center"></el-table-column>
 							</el-table>
 							<!--分页组件-->

src/views/performanceStatistics/xiedianOutput/year/index.vue

@@ -26,8 +26,8 @@
                 <el-table-column prop="plan" label="年计划量" align="center"></el-table-column>
                 <el-table-column prop="actualProd" label="实际年产量" align="center"></el-table-column>
                 <el-table-column prop="rate" label="完成率" align="center"></el-table-column>
-                <el-table-column prop="timeOfWork" label="铲车工作时间(h)" align="center"></el-table-column>
-                <el-table-column prop="numberOfCC" label="铲车车数" align="center"></el-table-column>
+                <el-table-column prop="timeOfWork" label="挖机工作时间(h)" align="center"></el-table-column>
+                <el-table-column prop="numberOfCC" label="挖机车数" align="center"></el-table-column>
                 <el-table-column prop="numberOfKC" label="卡车车数" align="center"></el-table-column>
 							</el-table>
 							<!--分页组件-->

src/views/regionalManagement/regionalCaiDian/index.vue

@@ -14,7 +14,7 @@
 							<el-table :data="tableData" v-loading="loading" border style="width:auto" :row-class-name="tableRowClassName">
 								<el-table-column prop="name" label="采点名称" align="center"></el-table-column>
 								<el-table-column prop="areaName" label="所属采区" align="center"></el-table-column>
-<!--								<el-table-column prop="areashovel" label="铲车名称" align="center"></el-table-column>-->
+<!--								<el-table-column prop="areashovel" label="挖机名称" align="center"></el-table-column>-->
 								<el-table-column prop="arearesources" label="矿种" align="center"></el-table-column>
 								<el-table-column prop="areaore" label="是否配矿" align="center"></el-table-column>
 								<el-table-column prop="areapriority" label="优先级" align="center"></el-table-column>
@@ -45,8 +45,8 @@
 						<el-option v-for="(obj,index) in caidianAreaInformationData" :label="obj.name" :value="obj.name" :key="index"></el-option>
 					</el-select>
 				</el-form-item>
-<!--				<el-form-item label="铲车" prop="areashovel">-->
-<!--					<el-select v-model="form.item.areashovel" multiple placeholder="请选择铲车" style="width:280px;">-->
+<!--				<el-form-item label="挖机" prop="areashovel">-->
+<!--					<el-select v-model="form.item.areashovel" multiple placeholder="请选择挖机" style="width:280px;">-->
 <!--						<el-option v-for="(obj,index) in dianchanCarInformationData" :label="obj.number" :value="obj.number" :key="index">{{obj.number}}</el-option>-->
 <!--					</el-select>-->
 <!--				</el-form-item>-->
@@ -142,7 +142,7 @@ export default {
 					{required: true, message: '请输入采点名称', trigger: 'blur' }
 				],
 				// areashovel: [
-				// 	{required: true, message: '请选择铲车', trigger: 'change' }
+				// 	{required: true, message: '请选择挖机', trigger: 'change' }
 				// ],
 				areaName: [
 					{required: true, message: '请选择所属采区', trigger: 'change' }
@@ -193,7 +193,7 @@ export default {
 				HttpReq.truckDispatching.onlyGetMiningAreaQuery({size:9999}).then((res) => {
 					this.caidianAreaInformationData = res;
 				})
-				//获取铲车车辆信息
+				//获取挖机车辆信息
 				HttpReq.truckDispatching.apiCarPeopZhanyongQuery({size:9999}).then((res) => {
 					if(res.code == 200){
 						this.dianchanCarInformationData = res.data;

src/views/safetyManagement/checkLog/index.vue

@@ -161,7 +161,7 @@ export default {
       this.$confirm( '确认删除该条数据吗?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: item.carclass == '铲车' ? 'error' : 'warning'
+        type: item.carclass == '挖机' ? 'error' : 'warning'
       }).then((e) => {
         this.reqRemoveProject([id],item)
       }).catch((e) => {})