api调整

src/api/mes/productionSchedule.js

@@ -1,10 +1,10 @@
 import request from '@/utils/request'
 //获取头部统计数据
-export async function count(query) {
+export async function count(body) {
   const res = await request({
     url: '/mes/index/count',
-    method: 'get',
-    params: query
+    method: 'post',
+    data: body
   })
   if (res.data.code == 0) {
     return res.data.data;
@@ -16,8 +16,8 @@ export async function count(query) {
 export async function getSalesFinishListAPI(query) {
   const res = await request({
     url: '/mes/index/getOrderList',
-    method: 'get',
-    params: query
+    method: 'post',
+    data: query
   })
   if (res.data.code == 0) {
     return res.data.data;
@@ -26,14 +26,14 @@ export async function getSalesFinishListAPI(query) {
 }
 
 //获取工单完成统计
-export async function completionCount(query) {
+export async function completionCount(body) {
   const res = await request({
     url: '/mes/index/completionCount',
-    method: 'get',
-    params: query
+    method: 'post',
+    data: body
   })
   if (res.data.code == 0) {
     return res.data.data;
   }
   return Promise.reject(new Error(res.data.message));
-}
+}

src/views/bpm/vis-page/productionSchedule.vue

@@ -464,16 +464,24 @@
       },
       //获取头部统计
       async getAllAmount() {
-        let rest = await count({ factoriesId: 0 });
+        let rest = await count({
+          factoriesId: null,
+          createTimeStart: new Date().getFullYear() + '-01',
+          createTimeEnd: new Date().getFullYear() + '-12'
+        });
         this.borderData.forEach(async (item) => {
           if (item.titleName === '生产总数') {
-            item.value = rest.formingNum || 0;
+            item.value = rest.formingNum ? Number(rest.formingNum) : 0;
           } else if (item.titleName === '待生产数量') {
-            item.value = rest.pendingProductionCount || 0;
+            item.value = rest.pendingProductionCount
+              ? Number(rest.pendingProductionCount)
+              : 0;
           } else if (item.titleName === '已完成数量') {
-            item.value = rest.formedNum || 0;
+            item.value = rest.formedNum ? Number(rest.formedNum) : 0;
           } else if (item.titleName === '生产中数量') {
-            item.value = rest.inProgressWorkOrderCount || 0;
+            item.value = rest.inProgressWorkOrderCount
+              ? Number(rest.inProgressWorkOrderCount)
+              : 0;
           }
         });
         // console.log(rest, 'rest');
@@ -481,9 +489,9 @@
       //获取合格数统计
       async getMonthlySalesStatistic() {
         let params = {
-          startDate: new Date().getFullYear() + '-01-01',
-          endDate: new Date().getFullYear() + '-12-31',
-          factoriesId: 0
+          createTimeStart: new Date().getFullYear() + '-01',
+          createTimeEnd: new Date().getFullYear() + '-12',
+          factoriesId: null
         };
         let data = await completionCount(params);
         let series = [
@@ -530,9 +538,9 @@
       //获取月度产量统计
       async getMonthlyProduceStatistic() {
         let params = {
-          startDate: new Date().getFullYear() + '-01-01',
-          endDate: new Date().getFullYear() + '-12-31',
-          factoriesId: 0
+          createTimeStart: new Date().getFullYear() + '-01',
+          createTimeEnd: new Date().getFullYear() + '-12',
+          factoriesId: null
         };
         let data = await completionCount(params);
         let series = [
@@ -572,7 +580,11 @@
   productCode	设备编码 1未采购2已采购3已入库	integer(int32)
   code	工单号	string
   taskName 当前工序	*/
-        let data = await getSalesFinishListAPI({ factoriesId: 0 });
+        let data = await getSalesFinishListAPI({
+          factoriesId: null,
+          createTimeStart: new Date().getFullYear() + '-01',
+          createTimeEnd: new Date().getFullYear() + '-12'
+        });
         this.config = {
           header: this.tableHeader.map(
             (item) =>

vue.config.js

@@ -36,7 +36,8 @@ module.exports = {
         // target: 'http://192.168.1.139:18086', // 粟
         // target: 'http://192.168.1.132:18086', // 徐1
         // target: 'http://192.168.1.134:18086', //徐2
-        target: 'http://192.168.1.125:18086',
+        // target: 'http://192.168.1.125:18086',
+        target: 'http://192.168.1.251:18186', // 测试环境
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {
           '^/api': ''