From e05557cccd6f09c0faffaef8e5bf24692ea7b4bb Mon Sep 17 00:00:00 2001 From: caill <815519168@qq.com> Date: Thu, 28 Jul 2022 11:33:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/css/reset.css | 5 +- src/assets/js/getData2.js | 32 +- src/pages/MonitoringScreen1.vue | 1214 +++++++++++++++++++++++++++++++ src/router/index.js | 11 +- 4 files changed, 1238 insertions(+), 24 deletions(-) create mode 100644 src/pages/MonitoringScreen1.vue diff --git a/src/assets/css/reset.css b/src/assets/css/reset.css index a84ff34..0aac29b 100644 --- a/src/assets/css/reset.css +++ b/src/assets/css/reset.css @@ -19,6 +19,7 @@ time, mark, audio, video, input { color: #ffffff; font-weight: normal; vertical-align: baseline; + font-family: "lucida grande", "lucida sans unicode", lucida, helvetica, "Hiragino Sans GB", "Microsoft YaHei", "WenQuanYi Micro Hei", sans-serif; } /* HTML5 display-role reset for older browsers */ @@ -89,8 +90,8 @@ html, body { body { -webkit-text-size-adjust: none; - -webkit-tap-highlight-color: rgba(0, 0, 0, 0); - background: #05032a center center / 100% 100% url(../../assets/images/bg.png) no-repeat; + /* -webkit-tap-highlight-color: rgba(0, 0, 0, 0); */ + /* background: #05032a center center / 100% 100% url(../../assets/images/bg.png) no-repeat; */ } div, p { diff --git a/src/assets/js/getData2.js b/src/assets/js/getData2.js index cafbb57..703be7c 100644 --- a/src/assets/js/getData2.js +++ b/src/assets/js/getData2.js @@ -3,22 +3,26 @@ import {post, post1} from '@js/http.js' /** 1.1配粉设备下拉框 */ export const queryDevice = (url) => post1(url + '/api/screen/pdm/queryDevice', {}) -/** 1.2大屏左一 */ -export const queryInfo1 = (id) => post('api/screen/pdm/queryInfo1', { - device_id: id -}) +/** 1.1大屏左一 */ +export const planReached = (id) => post('api/bigscreen/product/planReached', {}) -/** 1.3大屏左二 */ -export const queryInfo2 = (id) => post('api/screen/pdm/queryInfo2', { - device_id: id -}) +/** 1.2大屏左二 */ +export const worksectionHarvest = (id) => post('api/bigscreen/product/worksectionHarvest', {}) + +/** 1.3大屏左三 */ +export const monthHarvest = (id) => post('api/bigscreen/product/monthHarvest', {}) /** 1.4大屏右一 */ -export const queryInfo3 = (id) => post('api/screen/pdm/queryInfo3', { - device_id: id -}) +export const output = (id) => post('api/bigscreen/product/output', {}) /** 1.5大屏右二 */ -export const queryInfo4 = (id) => post('api/screen/pdm/queryInfo4', { - device_id: id -}) +export const topHarvest = (id) => post('api/bigscreen/product/topHarvest', {}) + +/** 1.6大屏右三 */ +export const monthOrder = (id) => post('api/bigscreen/product/monthOrder', {}) + +/** 1.7大屏中一 */ +export const productSchedule = (id) => post('api/bigscreen/product/productSchedule', {}) + +/** 1.8大屏中二 */ +export const unfinishOrder = (id) => post('api/bigscreen/product/unfinishOrder', {}) diff --git a/src/pages/MonitoringScreen1.vue b/src/pages/MonitoringScreen1.vue new file mode 100644 index 0000000..a40daab --- /dev/null +++ b/src/pages/MonitoringScreen1.vue @@ -0,0 +1,1214 @@ + + + + + diff --git a/src/router/index.js b/src/router/index.js index 19f1c48..3d21f09 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -2,8 +2,7 @@ import Vue from 'vue' import Router from 'vue-router' const Setup = r => require.ensure([], () => r(require('@page/Setup')), 'Setup') -const TaskScreen = r => require.ensure([], () => r(require('@page/TaskScreen')), 'TaskScreen') -const WorkStep = r => require.ensure([], () => r(require('@page/WorkStep')), 'WorkStep') +const MonitoringScreen1 = r => require.ensure([], () => r(require('@page/MonitoringScreen1')), 'MonitoringScreen1') Vue.use(Router) @@ -19,12 +18,8 @@ export default new Router({ component: Setup }, { - path: '/taskscreen', - component: TaskScreen - }, - { - path: '/workstep', - component: WorkStep + path: '/MonitoringScreen1', + component: MonitoringScreen1 } ] })