Merge branch 'master' of http://h.gemho.cn:7099/caicaicai/truckDispatching

src/assets/js/common.js

@@ -1168,6 +1168,7 @@ var HttpReq = function(){
 					data:data,
 				})
 			},
+
 			//绩效统计——日报——区域产量报表采区
 			caiquAreaQueryDay: function(param){
 				return request({
@@ -1943,6 +1944,30 @@ var HttpReq = function(){
 					data:data,
 				})
 			},
+			//大屏——数据总览——采区产量统计——日产量
+			apiPlanDayQuery: function(param){
+				return request({
+					url: '/api/Plan/Day',
+					method: 'get',
+					params:param,
+				})
+			},
+			//大屏——数据总览——采区产量统计——月产量
+			apiPlanMonthQuery: function(param){
+				return request({
+					url: '/api/Plan/Month',
+					method: 'get',
+					params:param,
+				})
+			},
+			//大屏——数据总览——采区产量统计——年产量
+			apiPlanYearQuery: function(param){
+				return request({
+					url: '/api/Plan/Year',
+					method: 'get',
+					params:param,
+				})
+			},
 			//大屏——数据总览——司机信息
 			screenDriverInformationQuery: function(param){
 				return request({

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

@@ -197,7 +197,6 @@ export default {
                     })
                     //各采区当月完成率 和 月生产完成效率
                     HttpReq.truckDispatching.caiquAreaQueryMonth().then((res) => {
-                        console.log(res);
                         let eh2_1_arr1 = [];
                         let eh2_1_arr2 = [];
                         let eh2_1_arr3 = [];
@@ -440,7 +439,6 @@ export default {
                         })
                         //各采区当月完成率 和 月生产完成效率
                         HttpReq.truckDispatching.caiquAreaQueryMonth().then((res) => {
-                            console.log(res);
                             let eh2_1_arr1 = [];
                             let eh2_1_arr2 = [];
                             let eh2_1_arr3 = [];

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

@@ -478,12 +478,12 @@ export default {
             },
             //矿石开采效率
             exploitationEfficiencyData:{
-                rate1:[0.4],
-                dayYield1:51,
-                dayMil1:32,
-                rate2:[0.2],
+                rate1:[0.5],
+                dayYield1:50,
+                dayMil1:30,
+                rate2:[0.5],
                 dayWorkTime2:8,
-                dayYield2:51,
+                dayYield2:50,
             },
             //实时报警
             realAlarmStyleData:{
@@ -501,7 +501,7 @@ export default {
 
                 this.$nextTick(()=>{
                     //获取采区当前日产量
-                    HttpReq.truckDispatching.caiquAreaQueryDay().then((res) => {
+                    HttpReq.truckDispatching.apiPlanDayQuery().then((res) => {
                         let undueArray = {};
                         if(res.length == 0 || JSON.stringify(res[0]) == '{}'){
                             undueArray.eff = 0;
@@ -525,7 +525,7 @@ export default {
                         this.outputMineData.day = undueArray; 
                     })
                     //获取采区当前月产量
-                    HttpReq.truckDispatching.caiquAreaQueryMonth().then((res) => {
+                    HttpReq.truckDispatching.apiPlanMonthQuery().then((res) => {
                         let undueArray = {};
                         if(res.length == 0 || JSON.stringify(res[0]) == '{}'){
                             undueArray.eff = 0;
@@ -549,7 +549,7 @@ export default {
                         this.outputMineData.month = undueArray;
                     })
                     //获取采区当前年产量
-                    HttpReq.truckDispatching.caiquAreaQueryYear().then((res) => {
+                    HttpReq.truckDispatching.apiPlanYearQuery().then((res) => {
                         let undueArray = {};
                         if(res.length == 0 || JSON.stringify(res[0]) == '{}'){
                             undueArray.eff = 0;
@@ -723,7 +723,7 @@ export default {
                     //定时刷新数据
                     this.dataScreeningTimer = setInterval(() => {
                         //获取采区当前日产量
-                        HttpReq.truckDispatching.caiquAreaQueryDay().then((res) => {
+                        HttpReq.truckDispatching.apiPlanDayQuery().then((res) => {
                             let undueArray = {};
                             if(res.length == 0 || JSON.stringify(res[0]) == '{}'){
                                 undueArray.eff = 0;
@@ -747,7 +747,7 @@ export default {
                             this.outputMineData.day = undueArray; 
                         })
                         //获取采区当前月产量
-                        HttpReq.truckDispatching.caiquAreaQueryMonth().then((res) => {
+                        HttpReq.truckDispatching.apiPlanMonthQuery().then((res) => {
                             let undueArray = {};
                             if(res.length == 0 || JSON.stringify(res[0]) == '{}'){
                                 undueArray.eff = 0;
@@ -771,7 +771,7 @@ export default {
                             this.outputMineData.month = undueArray;
                         })
                         //获取采区当前年产量
-                        HttpReq.truckDispatching.caiquAreaQueryYear().then((res) => {
+                        HttpReq.truckDispatching.apiPlanYearQuery().then((res) => {
                             let undueArray = {};
                             if(res.length == 0 || JSON.stringify(res[0]) == '{}'){
                                 undueArray.eff = 0;