diff --git a/src/api/index.js b/src/api/index.js index 3bba8ba..b930926 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -1,7 +1,36 @@ import request from '../utils/request' +// 生产任务 export function gettaskList() { return request({ url: '/api/production/prd-mo/prd-task', method: 'post', }) } +// 原材料 +export function getYclList() { + return request({ + url: '/api/wms/location-definition/yc-llocation', + method: 'post', +}) +} +// 中储仓 +export function getZccList() { + return request({ + url: '/api/wms/location-definition/ct-ulocation', + method: 'post', +}) +} +// 成品仓 +export function getCpcList() { + return request({ + url: '/api/wms/location-definition/c-plocation', + method: 'post', +}) +} +// 设备 +export function getEqpList() { + return request({ + url: '/api/wms/location-definition/zsj-data', + method: 'post', +}) +} diff --git a/src/assets/scss/index.scss b/src/assets/scss/index.scss index 3847f50..9d45766 100644 --- a/src/assets/scss/index.scss +++ b/src/assets/scss/index.scss @@ -8,7 +8,7 @@ transform: translate(-50%, -50%); transform-origin: left top; overflow: hidden; - + .bg { width: 100%; height: 100%; @@ -19,18 +19,22 @@ } .host-body { + .dv-dec-10, .dv-dec-10-s { width: 33.3%; height: 5px; } + .dv-dec-10-s { transform: rotateY(180deg); } + .dv-dec-8 { width: 200px; height: 50px; } + .title { position: relative; width: 500px; @@ -39,7 +43,7 @@ background-repeat: no-repeat; .title-text { - font-size: 24px; + font-size: 35px; position: absolute; bottom: 0; left: 50%; @@ -60,6 +64,7 @@ .aside-width { width: 40%; } + .react-r-s, .react-l-s { background-color: #0f1325; @@ -71,6 +76,7 @@ text-align: right; width: 500px; } + font-size: 18px; width: 300px; line-height: 50px; @@ -94,10 +100,13 @@ } .react-left { + user-select: none; + &.react-l-s { width: 500px; text-align: left; } + font-size: 18px; width: 300px; height: 50px; @@ -141,4 +150,4 @@ } } } -} +} \ No newline at end of file diff --git a/src/assets/scss/tianyi.scss b/src/assets/scss/tianyi.scss new file mode 100644 index 0000000..c8495bc --- /dev/null +++ b/src/assets/scss/tianyi.scss @@ -0,0 +1,15 @@ +.typeOne { + background-image: linear-gradient(#35ff39, darken(#35ff39, 20%)); +} + +.typeTwo { + background-image: linear-gradient(#849384, darken(#849384, 20%)); +} + +.typeTh { + background-image: linear-gradient(#6acbf0, darken(#6acbf0, 20%)); +} + +.typeFo { + background-image: linear-gradient(red, darken(red, 20%)); +} \ No newline at end of file diff --git a/src/utils/fontSize.js b/src/utils/fontSize.js index cd2f0cb..f650384 100644 --- a/src/utils/fontSize.js +++ b/src/utils/fontSize.js @@ -5,7 +5,7 @@ function setBodyFontSize() { if (document.body) { // 1.body 字体大小默认为 16px - document.body.style.fontSize = 16 * dpr + "px"; + document.body.style.fontSize = 14 * dpr + "px"; } else { document.addEventListener("DOMContentLoaded", setBodyFontSize); } diff --git a/src/utils/request.js b/src/utils/request.js index 91c96b6..8f78ac4 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -1,6 +1,7 @@ import axios from 'axios' const server = axios.create({ baseURL: "http://192.168.11.109", //配置请求的url + // baseURL: "http://tnb.tuotong-tech.com", //配置请求的url timeout: 6000, //配置超时时间 headers:{}//配置请求头 }) diff --git a/src/views/cpcView/index.vue b/src/views/cpcView/index.vue index fdabc0e..ad40712 100644 --- a/src/views/cpcView/index.vue +++ b/src/views/cpcView/index.vue @@ -1,223 +1,85 @@ \ No newline at end of file diff --git a/src/views/eqpView/index.vue b/src/views/eqpView/index.vue index 0366f0c..9932841 100644 --- a/src/views/eqpView/index.vue +++ b/src/views/eqpView/index.vue @@ -1,83 +1,61 @@ - + - + \ No newline at end of file diff --git a/src/views/taskView/index.vue b/src/views/taskView/index.vue index 8637e17..1cb18fb 100644 --- a/src/views/taskView/index.vue +++ b/src/views/taskView/index.vue @@ -1,6 +1,6 @@