diff --git a/src/api/index.js b/src/api/index.js index 78c061e..0e87bfb 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -34,4 +34,14 @@ export function getEqpList() { method: 'post', }) } +// 注塑车间 +export function getZSJList(day) { + return request({ + url: '/api/bi/zhu-su-bi-data', + method: 'post', + data:{ + day + } +}) +} diff --git a/src/assets/scss/index.scss b/src/assets/scss/index.scss index 9d45766..ecc2176 100644 --- a/src/assets/scss/index.scss +++ b/src/assets/scss/index.scss @@ -19,6 +19,7 @@ } .host-body { + height: 100%; .dv-dec-10, .dv-dec-10-s { @@ -132,6 +133,7 @@ } .body-box { + // height: 100%; margin-top: 16px; display: flex; flex-direction: column; diff --git a/src/assets/scss/tianyi.scss b/src/assets/scss/tianyi.scss index 0f4e133..913cd83 100644 --- a/src/assets/scss/tianyi.scss +++ b/src/assets/scss/tianyi.scss @@ -18,18 +18,97 @@ .type0 { background-image: linear-gradient(#849384, darken(#849384, 20%)); } + .type1 { background-image: linear-gradient(#6acbf0, darken(#6acbf0, 20%)); } + .type2 { background-image: linear-gradient(#35ff39, darken(#35ff39, 20%)); } + .type3 { background-image: linear-gradient(#d3ff33, darken(#d3ff33, 20%)); } + .type4 { background-image: linear-gradient(#ff7db7, darken(#ff7db7, 20%)); } + .type5 { background-image: linear-gradient(red, darken(red, 20%)); +} + +// 加载动画 +.loadbox { + position: relative; + width: 90px; + height: 50px; + // margin: 50px auto; + position: fixed; + top: 40px; + right: 20px; +} + +.loadbox span { + position: absolute; + width: 20px; + height: 20px; + background: #3498db; + opacity: 0.5; + border-radius: 100%; + animation: anim 1s infinite ease-in-out; +} + +.loadbox> :nth-child(2) { + left: 20px; + animation-delay: 0.2s; +} + +.loadbox> :nth-child(3) { + left: 40px; + animation-delay: 0.4s; +} + +.loadbox> :nth-child(4) { + left: 60px; + animation-delay: 0.6s; +} + +.loadbox> :nth-child(5) { + left: 80px; + animation-delay: 0.8s; +} + +@keyframes anim { + 0% { + opacity: 0.3; + transform: translateY(0px); + } + + 50% { + opacity: 1; + transform: translateY(-10px); + background: #64dbe3; + } + + 100% { + opacity: 0.3; + transform: translateY(0px); + } +} + +.hongyuan { + width: 20px; + height: 20px; + background-color: rgba(255, 0, 0); + border-radius: 50%; + margin-right: 5px; +} +.lvyuan { + width: 20px; + height: 20px; + background-color: rgb(64, 229, 73); + border-radius: 50%; + margin-right: 5px; } \ No newline at end of file diff --git a/src/assets/zsj.png b/src/assets/zsj.png new file mode 100644 index 0000000..32b5028 Binary files /dev/null and b/src/assets/zsj.png differ diff --git a/src/components/echart/pieEchart/index.vue b/src/components/echart/pieEchart/index.vue new file mode 100644 index 0000000..477a132 --- /dev/null +++ b/src/components/echart/pieEchart/index.vue @@ -0,0 +1,53 @@ + + + + + \ No newline at end of file diff --git a/src/views/cpcView/index.vue b/src/views/cpcView/index.vue index 5829067..0eb3be6 100644 --- a/src/views/cpcView/index.vue +++ b/src/views/cpcView/index.vue @@ -28,7 +28,7 @@ import { getCpcList } from '@/api/index' export default { - name: 'yclView', + name: 'cpcView', data() { return { data: [], diff --git a/src/views/eqpView/index.vue b/src/views/eqpView/index.vue index 9932841..462d128 100644 --- a/src/views/eqpView/index.vue +++ b/src/views/eqpView/index.vue @@ -22,7 +22,7 @@ import { getEqpList } from '@/api/index' export default { - name: 'yclView', + name: 'eqpView', data() { return { data: [] diff --git a/src/views/index.vue b/src/views/index.vue index 05a7f56..f9d8c1d 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -35,19 +35,23 @@
中储仓 -
+
成品仓
-
设备数采 -
-
--> +
生产任务 -
+
+
@@ -118,6 +122,9 @@ + + +
@@ -139,6 +146,7 @@ import taskView from './taskView' import cpcView from './cpcView' import yclView from './yclView' import zccView from './zccView' +import zscjView from './zscjView' export default { mixins: [drawMixin], @@ -151,7 +159,7 @@ export default { dateWeek: null, weekday: ['周日', '周一', '周二', '周三', '周四', '周五', '周六'], decorationColor: ['#568aea', '#000000'], - type: 1, + type: 6, } }, components: { @@ -167,6 +175,7 @@ export default { cpcView, yclView, zccView, + zscjView, }, mounted() { this.timeFn() diff --git a/src/views/taskView/index.vue b/src/views/taskView/index.vue index 1cb18fb..743de9d 100644 --- a/src/views/taskView/index.vue +++ b/src/views/taskView/index.vue @@ -1,5 +1,12 @@