1

src/assets/js/common.js

@@ -1171,14 +1171,14 @@ var HttpReq = function(){
 			//绩效统计——日报——区域产量报表采区
 			caiquAreaQueryDay: function(param){
 				return request({
-					url: '/api/Panel',
+					url: 'api/Plan/Day',
 					method: 'get',
 					params:param,
 				})
 			},
 			caiquAreaAddDay: function(data){
 				return request({
-					url: '/api/Panel',
+					url: 'api/Plan/Day',
 					method: 'POST',
 					data:data,
 				}).then((res) => {
@@ -1187,14 +1187,14 @@ var HttpReq = function(){
 			},
 			caiquAreaUpdateDay: function(data){
 				return request({
-					url: '/api/Panel',
+					url: 'api/Plan/Day',
 					method: 'PUT',
 					data:data,
 				})
 			},
 			caiquAreaDelDay: function(data){
 				return request({
-					url: '/api/Panel',
+					url: 'api/Plan/Day',
 					method: 'Delete',
 					data:data,
 				})
@@ -1419,14 +1419,14 @@ var HttpReq = function(){
 			//绩效统计——月报——区域产量报表采区
 			caiquAreaQueryMonth: function(param){
 				return request({
-					url: '/api/PanelMonth',
+					url: '/api/Plan/Month',
 					method: 'get',
 					params:param,
 				})
 			},
 			caiquAreaAddMonth: function(data){
 				return request({
-					url: '/api/PanelMonth',
+					url: '/api/Plan/Month',
 					method: 'POST',
 					data:data,
 				}).then((res) => {
@@ -1435,14 +1435,14 @@ var HttpReq = function(){
 			},
 			caiquAreaUpdateMonth: function(data){
 				return request({
-					url: '/api/PanelMonth',
+					url: '/api/Plan/Month',
 					method: 'PUT',
 					data:data,
 				})
 			},
 			caiquAreaDelMonth: function(data){
 				return request({
-					url: '/api/PanelMonth',
+					url: '/api/Plan/Month',
 					method: 'Delete',
 					data:data,
 				})
@@ -1667,14 +1667,14 @@ var HttpReq = function(){
 			//绩效统计——年报——区域产量报表采区
 			caiquAreaQueryYear: function(param){
 				return request({
-					url: '/api/PanelYear',
+					url: 'api/Plan/Year',
 					method: 'get',
 					params:param,
 				})
 			},
 			caiquAreaAddYear: function(data){
 				return request({
-					url: '/api/PanelYear',
+					url: 'api/Plan/Year',
 					method: 'POST',
 					data:data,
 				}).then((res) => {
@@ -1683,14 +1683,14 @@ var HttpReq = function(){
 			},
 			caiquAreaUpdateYear: function(data){
 				return request({
-					url: '/api/PanelYear',
+					url: 'api/Plan/Year',
 					method: 'PUT',
 					data:data,
 				})
 			},
 			caiquAreaDelYear: function(data){
 				return request({
-					url: '/api/PanelYear',
+					url: 'api/Plan/Year',
 					method: 'Delete',
 					data:data,
 				})

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

@@ -154,30 +154,26 @@ export default {
                     //采取产量统计图表
                     this.echarts1Fn();
                     //各采区日产量排名
-                    HttpReq.truckDispatching.caiquAreaQueryDay({size:10,createTime:this.currentTime.day,sort:'output,desc',}).then((res) => {
-                        if(res.code == 200){
-                            this.outputRankData = res.data.content;
-                        }
+                    HttpReq.truckDispatching.caiquAreaQueryDay({size:10}).then((res) => {
+                            this.outputRankData = res;
                     })
                     //各采区当月完成率
-                    HttpReq.truckDispatching.caiquAreaQueryMonth({size:9999,createTime:this.currentTime.month,}).then((res) => {
-                        if(res.code == 200){
-                            let caiquName = [];
-                            let wanchengNum = [];
-                            let jihuaNum = [];
-                            let wanchengRate = [];
-                            res.data.content.forEach((item,index)=>{
-                                caiquName.push(item.name);
-                                wanchengNum.push(item.output);
-                                jihuaNum.push(item.dayPlan);
-                                wanchengRate.push(parseFloat(item.rate) * 100);
-                            })
-                            this.echarts2Data.caiquName = caiquName;
-                            this.echarts2Data.wanchengNum = wanchengNum;
-                            this.echarts2Data.jihuaNum = jihuaNum;
-                            this.echarts2Data.wanchengRate = wanchengRate;
-                            this.echarts2Fn();
-                        }
+                    HttpReq.truckDispatching.caiquAreaQueryMonth({size:9999}).then((res) => {
+                        let caiquName = [];
+                        let wanchengNum = [];
+                        let jihuaNum = [];
+                        let wanchengRate = [];
+                        res.forEach((item,index)=>{
+                            caiquName.push(item.name);
+                            wanchengNum.push(item.finish);
+                            jihuaNum.push(item.plan);
+                            wanchengRate.push(parseFloat(item.eff) * 100);
+                        })
+                        this.echarts2Data.caiquName = caiquName;
+                        this.echarts2Data.wanchengNum = wanchengNum;
+                        this.echarts2Data.jihuaNum = jihuaNum;
+                        this.echarts2Data.wanchengRate = wanchengRate;
+                        this.echarts2Fn();
                     })
                     //月生产完成效率
                     this.echarts3Fn();

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

@@ -77,11 +77,9 @@ export default {
 			
 			this.$nextTick(()=>{
 				HttpReq.truckDispatching.caiquAreaQueryDay(param).then((res) => {
-					if(res.code == 200){
-						this.loading = false;
-						this.tableData = res.data.content;
-						this.total = res.data.totalElements;
-					}
+					this.loading = false;
+					this.tableData = res;
+					this.total = res.length;
 				})
 			})
 

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

@@ -77,11 +77,9 @@ export default {
 			
 			this.$nextTick(()=>{
 				HttpReq.truckDispatching.caiquAreaQueryMonth(param).then((res) => {
-					if(res.code == 200){
-						this.loading = false;
-						this.tableData = res.data.content;
-						this.total = res.data.totalElements;
-					}
+					this.loading = false;
+					this.tableData = res;
+					this.total = res.length;
 				})
 			})
 

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

@@ -77,11 +77,9 @@ export default {
 			
 			this.$nextTick(()=>{
 				HttpReq.truckDispatching.caiquAreaQueryYear(param).then((res) => {
-					if(res.code == 200){
-						this.loading = false;
-						this.tableData = res.data.content;
-						this.total = res.data.totalElements;
-					}
+					this.loading = false;
+					this.tableData = res;
+					this.total = res.length;
 				})
 			})