diff --git a/src/assets/css/iconfont.styl b/src/assets/css/iconfont.styl index f4c4bae..3b75b12 100644 --- a/src/assets/css/iconfont.styl +++ b/src/assets/css/iconfont.styl @@ -1,8 +1,8 @@ @font-face { - font-family: "iconfont"; /* Project id 1255596 */ - src: url('iconfont/iconfont.woff2?t=1620977303191') format('woff2'), - url('iconfont/iconfont.woff?t=1620977303191') format('woff'), - url('iconfont/iconfont.ttf?t=1620977303191') format('truetype'); + font-family: "iconfont"; + src: url('iconfont/iconfont.woff2') format('woff2'), + url('iconfont/iconfont.woff') format('woff'), + url('iconfont/iconfont.ttf') format('truetype'); } @font-face { @@ -25,4 +25,8 @@ .icon-guanbi:before { content: "\e60f"; +} + +.icon_arrow:before { + content: '\e601' } \ No newline at end of file diff --git a/src/assets/css/iconfont/iconfont.json b/src/assets/css/iconfont/iconfont.json deleted file mode 100644 index 34ac18f..0000000 --- a/src/assets/css/iconfont/iconfont.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "id": "1255596", - "name": "nl-hht-hl", - "font_family": "iconfont", - "css_prefix_text": "icon-", - "description": "", - "glyphs": [ - { - "icon_id": "2229060", - "name": "无信号", - "font_class": "no-signal", - "unicode": "e76b", - "unicode_decimal": 59243 - }, - { - "icon_id": "400034", - "name": "下拉", - "font_class": "htmal5icon03", - "unicode": "e626", - "unicode_decimal": 58918 - }, - { - "icon_id": "731140", - "name": "选择", - "font_class": "guanbi1", - "unicode": "e608", - "unicode_decimal": 58888 - }, - { - "icon_id": "4736203", - "name": "关闭", - "font_class": "guanbi", - "unicode": "e60f", - "unicode_decimal": 58895 - } - ] -} diff --git a/src/assets/css/iconfont/iconfont.ttf b/src/assets/css/iconfont/iconfont.ttf index d19ae0d..a0a4398 100644 Binary files a/src/assets/css/iconfont/iconfont.ttf and b/src/assets/css/iconfont/iconfont.ttf differ diff --git a/src/assets/css/iconfont/iconfont.woff b/src/assets/css/iconfont/iconfont.woff index 31debf3..efd303d 100644 Binary files a/src/assets/css/iconfont/iconfont.woff and b/src/assets/css/iconfont/iconfont.woff differ diff --git a/src/assets/css/iconfont/iconfont.woff2 b/src/assets/css/iconfont/iconfont.woff2 index f9b361d..9bf1700 100644 Binary files a/src/assets/css/iconfont/iconfont.woff2 and b/src/assets/css/iconfont/iconfont.woff2 differ diff --git a/src/assets/css/mixin.styl b/src/assets/css/mixin.styl index d940186..60b45f3 100644 --- a/src/assets/css/mixin.styl +++ b/src/assets/css/mixin.styl @@ -6,6 +6,14 @@ $blue = #6798ef $gray = #c9c9c9 $fc1 = #323232 +.green + background-color #11ff0d +.yellow + background-color #fdfd0f +.gray + background-color #bfbfbf +.red + background-color #ff1016 //宽高 _wh(w, h) diff --git a/src/assets/js/getData2.js b/src/assets/js/getData2.js index 39acfde..80289e0 100644 --- a/src/assets/js/getData2.js +++ b/src/assets/js/getData2.js @@ -4,25 +4,112 @@ import {post, post1} from '@js/http.js' export const queryDevice = (url) => post1(url + '/api/screen/pdm/queryDevice', {}) /** 1.1大屏左一 */ -export const planReached = (id) => post('api/bigscreen/product/planReached', {}) +// export const planReached = (id) => post('api/bigscreen/product/planReached', {}) +export const planReached = (id) => { + let res = { + code: '1', + dayResult: { + jo1: {plan_qty: '100', real_qty: '200', finish_rate: '200'}, + jo2: {plan_qty: '100', real_qty: '200', finish_rate: '200'}, + jo3: {plan_qty: '100', real_qty: '200', finish_rate: '200'} + }, + monthResult: { + joo1: {plan_qty: '100', real_qty: '200', finish_rate: '200'}, + joo2: {plan_qty: '100', real_qty: '200', finish_rate: '200'}, + joo3: {plan_qty: '100', real_qty: '200', finish_rate: '200'} + } + } + return res +} /** 1.2大屏左二 */ -export const worksectionHarvest = (id) => post('api/bigscreen/product/worksectionHarvest', {}) +// export const worksectionHarvest = (id) => post('api/bigscreen/product/worksectionHarvest', {}) +export const worksectionHarvest = (id) => { + let res = { + code: '1', + result: [ + { + 'device_name': '运行', + 'failure': 0, + 'shutdown': 0, + 'standby': 0, + 'running': 5 + }, + { + 'device_name': '暂停', + 'failure': 0, + 'shutdown': 0, + 'standby': 1, + 'running': 0 + }, + { + 'device_name': '停机', + 'failure': 0, + 'shutdown': 2, + 'standby': 0, + 'running': 0 + }, + { + 'device_name': '故障', + 'failure': 1, + 'shutdown': 0, + 'standby': 0, + 'running': 0 + } + ] + } + return res +} /** 1.3大屏左三 */ -export const monthHarvest = (id) => post('api/bigscreen/product/monthHarvest', {}) +// export const monthHarvest = (id) => post('api/bigscreen/product/monthHarvest', {}) +export const monthHarvest = (id) => { + let res = { + code: '1', + result: [{date: '混料', real_qty: '10', rate: '10'}, {date: '压制', real_qty: '8', rate: '15'}, {date: '干燥', real_qty: '3', rate: '2'}, {date: '分拣', real_qty: '7', rate: '5'}] + } + return res +} /** 1.4大屏右一 */ -export const output = (id) => post('api/bigscreen/product/output', {}) +// export const output = (id) => post('api/bigscreen/product/output', {}) +export const output = (id) => { + let res = { + code: '1', + result: {finish_rate: '80', plan_qty: '10', real_qty: '20', sum_qty: '100', normal_qty: '20', delayed_qty: '10'} + } + return res +} /** 1.5大屏右二 */ -export const topHarvest = (id) => post('api/bigscreen/product/topHarvest', {}) +// export const topHarvest = (id) => post('api/bigscreen/product/topHarvest', {}) +export const topHarvest = (id) => { + let res = { + code: '1', + result: [{sort: '1', material_spec: 'aa', real_qty: '10'}, {sort: '1', material_spec: 'aa', real_qty: '10'}, {sort: '1', material_spec: 'aa', real_qty: '10'}] + } + return res +} /** 1.6大屏右三 */ -export const monthOrder = (id) => post('api/bigscreen/product/monthOrder', {}) +// export const monthOrder = (id) => post('api/bigscreen/product/monthOrder', {}) +export const monthOrder = (id) => { + let res = { + code: '1', + result: [{material_spec: '1', real_qty: '10'}] + } + return res +} /** 1.7大屏中一 */ -export const productSchedule = (id) => post('api/bigscreen/product/productSchedule', {}) +// export const productSchedule = (id) => post('api/bigscreen/product/productSchedule', {}) +export const productSchedule = (id) => { + let res = { + code: '1', + result: [{a1: 'hn01', a2: 'wl01', a3: '1号混料', a4: '1.05吨'}, {a1: 'hn01', a2: 'wl01', a3: '2号混料', a4: '1.05吨'}, {a1: 'hn01', a2: 'wl01', a3: '1号砖', a4: '1.05吨'}, {a1: 'hn01', a2: 'wl01', a3: '2号砖', a4: '1.05吨'}, {a1: 'hn01', a2: 'wl01', a3: '3号砖', a4: '1.05吨'}, {a1: 'hn01', a2: 'wl01', a3: '1号砖', a4: '1.05吨'}, {a1: 'hn01', a2: 'wl01', a3: '2号砖', a4: '1.05吨'}, {a1: 'hn01', a2: 'wl01', a3: '3号砖', a4: '1.05吨'}] + } + return res +} /** 1.8大屏中二 */ export const unfinishOrder = (id) => post('api/bigscreen/product/unfinishOrder', {}) diff --git a/src/pages/shunhe/LogisticsProcess.vue b/src/pages/shunhe/LogisticsProcess.vue index cec78a4..8166a3f 100644 --- a/src/pages/shunhe/LogisticsProcess.vue +++ b/src/pages/shunhe/LogisticsProcess.vue @@ -1,121 +1,17 @@