diff --git a/src/api/board/cs3.js b/src/api/board/cs3.js new file mode 100644 index 0000000..31b2eae --- /dev/null +++ b/src/api/board/cs3.js @@ -0,0 +1,61 @@ +import request from '@/utils/request' + +// 查询产量 +export function dryRoomDataCarousel(query) { + return request({ + url: '/mes/wcsInterface/dryRoomDataCarousel', + method: 'post', + data: { + "factory": "999" + } + }); +} + +// 查询产量 +export function getHourProductionList(query) { + return request({ + url: '/mes/reportWork/getHourProductionList', + method: 'get', + params: query + }); +} + +export function EnergyExpend(query) { + return request({ + url: '/mes/h5/EnergyExpend', + method: 'get', + params: query + }); +} + +export function agvdata(query) { + return request({ + url: 'http://192.168.202.25:9001/api/scada/agvdata', + method: 'get', + params: query + }); +} + +export function PlanAchievementRate(query) { + return request({ + url: '/mes/reportWork/PlanAchievementRate', + method: 'get', + params: query + }); +} + +export function getHfChartDatas(query) { + return request({ + url: '/quality/qcProCheck/getHfChartDatas', + method: 'get', + params: query + }); +} + +export function getHourProductionLists(query) { + return request({ + url: '/mes/reportWork/getHourProductionLists', + method: 'get', + params: query + }); +} diff --git a/src/assets/board/cs3/bg.jpg b/src/assets/board/cs3/bg.jpg new file mode 100644 index 0000000..527d30c Binary files /dev/null and b/src/assets/board/cs3/bg.jpg differ diff --git a/src/views/cs/index2.vue b/src/views/cs/index2.vue index 1b32fbf..f2b5bc9 100644 --- a/src/views/cs/index2.vue +++ b/src/views/cs/index2.vue @@ -101,7 +101,7 @@
-
@@ -300,7 +300,7 @@ export default { x: (v.X - 126061) / this.siteData.x, y: (71313 - (v.Y - 116722)) / this.siteData.y, rotate: v.Angle, - isGoods: false, + IsLoad: v.IsLoad, show: v.X < 245000 && v.X > 126000 && v.Y < 187000 && v.Y > 116000 // show: true }) @@ -320,7 +320,8 @@ export default { let f2 = new TWEEN.Tween(this.agvData.find(r => r.id === v.AgvId)).to({ x: (v.X - 126061) / this.siteData.x, y: (71313 - (v.Y - 116722)) / this.siteData.y, - show: v.X < 245000 && v.X > 126000 && v.Y < 187000 && v.Y > 116000 + show: v.X < 245000 && v.X > 126000 && v.Y < 187000 && v.Y > 116000, + IsLoad: v.IsLoad, // show: true }, time - 100).start().onComplete(()=>{ f2 = null @@ -331,7 +332,7 @@ export default { x: (v.X - 126061) / this.siteData.x, y: (71313 - (v.Y - 116722)) / this.siteData.y, rotate: v.Angle, - isGoods: false, + IsLoad: v.IsLoad, show: v.X < 245000 && v.X > 126000 && v.Y < 187000 && v.Y > 116000 // show: true }) diff --git a/src/views/cs/index3.vue b/src/views/cs/index3.vue index 1eead17..5a7bf92 100644 --- a/src/views/cs/index3.vue +++ b/src/views/cs/index3.vue @@ -1,63 +1,102 @@