diff --git a/src/assets/css/reset.css b/src/assets/css/reset.css index fac4484..f8ac1ee 100644 --- a/src/assets/css/reset.css +++ b/src/assets/css/reset.css @@ -79,10 +79,10 @@ li { } html, body { - width: 100%; - max-width: 1920px; - min-width: 1550px; - height: 1040px; + /* width: 100%; */ + width: 1920px; + /* min-width: 1550px; */ + height: 1060px; /* width: 1920px; height: 1040px; */ } diff --git a/src/assets/images/devmoni/zbcd.jpg b/src/assets/images/devmoni/BZX.jpg similarity index 100% rename from src/assets/images/devmoni/zbcd.jpg rename to src/assets/images/devmoni/BZX.jpg diff --git a/src/assets/images/devmoni/1hy.jpg b/src/assets/images/devmoni/CPJ.jpg similarity index 100% rename from src/assets/images/devmoni/1hy.jpg rename to src/assets/images/devmoni/CPJ.jpg diff --git a/src/assets/images/devmoni/2hy.jpg b/src/assets/images/devmoni/CPX.jpg similarity index 100% rename from src/assets/images/devmoni/2hy.jpg rename to src/assets/images/devmoni/CPX.jpg diff --git a/src/assets/images/devmoni/dtj.jpg b/src/assets/images/devmoni/DPJ.jpg similarity index 100% rename from src/assets/images/devmoni/dtj.jpg rename to src/assets/images/devmoni/DPJ.jpg diff --git a/src/assets/images/devmoni/jxs.jpg b/src/assets/images/devmoni/FJJXS.jpg similarity index 100% rename from src/assets/images/devmoni/jxs.jpg rename to src/assets/images/devmoni/FJJXS.jpg diff --git a/src/assets/images/devmoni/HLJ_S.jpg b/src/assets/images/devmoni/HLJ_S.jpg new file mode 100644 index 0000000..fce8441 Binary files /dev/null and b/src/assets/images/devmoni/HLJ_S.jpg differ diff --git a/src/assets/images/devmoni/MDJQR.jpg b/src/assets/images/devmoni/MDJXS.jpg similarity index 100% rename from src/assets/images/devmoni/MDJQR.jpg rename to src/assets/images/devmoni/MDJXS.jpg diff --git a/src/assets/images/devmoni/1hyw.jpg b/src/assets/images/devmoni/YAO.jpg similarity index 100% rename from src/assets/images/devmoni/1hyw.jpg rename to src/assets/images/devmoni/YAO.jpg diff --git a/src/assets/images/devmoni/ylj.jpg b/src/assets/images/devmoni/YZJ_S.jpg similarity index 100% rename from src/assets/images/devmoni/ylj.jpg rename to src/assets/images/devmoni/YZJ_S.jpg diff --git a/src/assets/js/getData2.js b/src/assets/js/getData2.js index d1c4777..732230f 100644 --- a/src/assets/js/getData2.js +++ b/src/assets/js/getData2.js @@ -8,34 +8,354 @@ export const findDeviceById = (id) => post('api/cockpit/findDeviceById', { }) // export const deviceMonitor = () => { // let res = { -// result: [ +// 'result': [ // { -// 'point_id': '1', -// 'point_code': 'HLJDJW01', -// 'point_name': '混料机1对接位', -// 'point_status': '3', -// 'material_id': 1556534702800769024, -// 'material_name': '木质花纹2cm', -// 'ivt_weight': 29.500000, -// 'work_time': '50', -// 'ivt_qty': 600.000000, -// 'vehicle_qty': 15, -// 'vehicle_max_qty': '', -// 'device_url': 'hlj' +// 'device_code': 'HLJ01', +// 'device_name': '混料机1', +// 'device_model': '1', +// 'device_status': '1', +// 'material_name': '', +// 'work_time': '3.5', +// 'device_url': 'HLJ' // }, // { -// 'point_id': '1518105008862793728', -// 'point_code': 'YZJ02XL01', -// 'point_name': '压制机2下料位1', -// 'point_status': '3', -// 'material_id': 1556534702800769024, +// 'device_code': 'HLJ02', +// 'device_name': '混料机2', +// 'device_model': '1', +// 'device_status': '1', +// 'material_name': '', +// 'work_time': '3.5', +// 'device_url': 'HLJ' +// }, +// { +// 'device_code': 'HLJ03', +// 'device_name': '混料机3', +// 'device_model': '1', +// 'device_status': '1', +// 'material_name': '', +// 'work_time': '3.5', +// 'device_url': 'HLJ' +// }, +// { +// 'device_code': 'HLJ04', +// 'device_name': '混料机4', +// 'device_model': '1', +// 'device_status': '1', +// 'material_name': '', +// 'work_time': '3.5', +// 'device_url': 'HLJ' +// }, +// { +// 'device_code': 'HLJ05', +// 'device_name': '混料机5', +// 'device_model': '1', +// 'device_status': '1', +// 'material_name': '', +// 'work_time': '3.5', +// 'device_url': 'HLJ' +// }, +// { +// 'device_code': 'HLJ06', +// 'device_name': '混料机6', +// 'device_model': '1', +// 'device_status': '1', +// 'material_name': '', +// 'work_time': '3.5', +// 'device_url': 'HLJ' +// }, +// { +// 'device_code': 'HLJ07', +// 'device_name': '混料机7', +// 'device_model': '1', +// 'device_status': '1', +// 'material_name': '', +// 'work_time': '3.5', +// 'device_url': 'HLJ' +// }, +// { +// 'device_code': 'HLJ08', +// 'device_name': '混料机8', +// 'device_model': '1', +// 'device_status': '1', +// 'material_name': '', +// 'work_time': '3.5', +// 'device_url': 'HLJ' +// }, +// { +// 'device_code': 'HLJ09', +// 'device_name': '混料机9', +// 'device_model': '1', +// 'device_status': '1', +// 'material_name': '', +// 'work_time': '3.5', +// 'device_url': 'HLJ' +// }, +// { +// 'device_code': 'HLJ10', +// 'device_name': '混料机10', +// 'device_model': '1', +// 'device_status': '1', +// 'material_name': '', +// 'work_time': '3.5', +// 'device_url': 'HLJ' +// }, +// { +// 'device_code': 'HLJ11', +// 'device_name': '混料机11', +// 'device_model': '1', +// 'device_status': '1', +// 'material_name': '', +// 'work_time': '3.5', +// 'device_url': 'HLJ' +// }, +// { +// 'device_code': 'HLJ12', +// 'device_name': '混料机12', +// 'device_model': '1', +// 'device_status': '1', +// 'material_name': '', +// 'work_time': '3.5', +// 'device_url': 'HLJ' +// }, +// { +// 'device_code': 'MDJXS01', +// 'device_name': '码垛机械手1', +// 'device_model': '10', +// 'device_status': '1', +// 'material_name': '', +// 'work_time': '3.5', +// 'device_url': 'MDJXS' +// }, +// { +// 'device_code': 'MDJXS02', +// 'device_name': '码垛机械手2', +// 'device_model': '10', +// 'device_status': '1', +// 'material_name': '', +// 'work_time': '3.5', +// 'device_url': 'MDJXS' +// }, +// { +// 'device_code': 'MDJXS09', +// 'device_name': '码垛机械手9', +// 'device_model': '10', +// 'device_status': '1', // 'material_name': '木质花纹2cm', -// 'ivt_weight': 29.500000, -// 'work_time': '50', -// 'ivt_qty': 600.000000, +// 'work_time': '3.5', +// 'real_qty': 0, +// 'device_url': 'MDJXS' +// }, +// { +// 'device_code': 'RGV', +// 'device_name': 'RGV', +// 'device_model': '11', +// 'device_status': '1', +// 'device_status_name': '空车位无车,满车位有车', +// 'material_name': '', +// 'work_time': '3.5', +// 'device_url': 'RGV' +// }, +// { +// 'device_code': 'HLJ13', +// 'device_name': '混料机13', +// 'device_model': '2', +// 'device_status': '1', +// 'material_name': '', +// 'work_time': '3.5', +// 'device_url': 'HLJ_S' +// }, +// { +// 'device_code': 'HLJ14', +// 'device_name': '混料机14', +// 'device_model': '2', +// 'device_status': '1', +// 'material_name': '', +// 'work_time': '3.5', +// 'device_url': 'HLJ_S' +// }, +// { +// 'device_code': 'HLJ15', +// 'device_name': '混料机15', +// 'device_model': '2', +// 'device_status': '1', +// 'material_name': '', +// 'work_time': '3.5', +// 'device_url': 'HLJ_S' +// }, +// { +// 'device_code': 'HLJ16', +// 'device_name': '混料机16', +// 'device_model': '2', +// 'device_status': '1', +// 'material_name': '', +// 'work_time': '3.5', +// 'device_url': 'HLJ_S' +// }, +// { +// 'device_code': 'YZJ01', +// 'device_name': '压制机1', +// 'device_model': '3', +// 'device_status': '1', +// 'material_name': '木质花纹2cm', +// 'work_time': '3.5', +// 'real_qty': 0, +// 'device_url': 'YZJ' +// }, +// { +// 'device_code': 'YZJ02', +// 'device_name': '压制机2', +// 'device_model': '3', +// 'device_status': '1', +// 'material_name': '', +// 'work_time': '3.5', +// 'device_url': 'YZJ' +// }, +// { +// 'device_code': 'YZJ03', +// 'device_name': '压制机3', +// 'device_model': '3', +// 'device_status': '1', +// 'material_name': '', +// 'work_time': '3.5', +// 'device_url': 'YZJ' +// }, +// { +// 'device_code': 'YZJ04', +// 'device_name': '压制机4', +// 'device_model': '3', +// 'device_status': '1', +// 'material_name': '', +// 'work_time': '3.5', +// 'device_url': 'YZJ' +// }, +// { +// 'device_code': 'YZJ05', +// 'device_name': '压制机5', +// 'device_model': '3', +// 'device_status': '1', +// 'material_name': '', +// 'work_time': '3.5', +// 'device_url': 'YZJ' +// }, +// { +// 'device_code': 'YZJ06', +// 'device_name': '压制机6', +// 'device_model': '3', +// 'device_status': '1', +// 'material_name': '', +// 'work_time': '3.5', +// 'device_url': 'YZJ' +// }, +// { +// 'device_code': 'YZJ07', +// 'device_name': '压制机7', +// 'device_model': '3', +// 'device_status': '1', +// 'material_name': '', +// 'work_time': '3.5', +// 'device_url': 'YZJ' +// }, +// { +// 'device_code': 'YZJ08', +// 'device_name': '压制机8', +// 'device_model': '3', +// 'device_status': '1', +// 'material_name': '', +// 'work_time': '3.5', +// 'device_url': 'YZJ' +// }, +// { +// 'device_code': 'YZJ09', +// 'device_name': '压制机9', +// 'device_model': '4', +// 'device_status': '1', +// 'material_name': '木质花纹2cm', +// 'work_time': '3.5', +// 'real_qty': 0, +// 'device_url': 'YZJ_S' +// }, +// { +// 'device_code': 'YZJ10', +// 'device_name': '压制机10', +// 'device_model': '4', +// 'device_status': '1', +// 'material_name': '', +// 'work_time': '3.5', +// 'device_url': 'YZJ_S' +// }, +// { +// 'device_code': 'FJCDJXS', +// 'device_name': '分拣拆垛机械手', +// 'device_model': '5', +// 'device_status': '1', +// 'material_name': '', +// 'work_time': '3.5', +// 'device_url': 'FJJXS' +// }, +// { +// 'device_code': 'FJMDJXS', +// 'device_name': '分拣码垛机械手', +// 'device_model': '5', +// 'device_status': '1', +// 'material_name': '', +// 'work_time': '3.5', +// 'device_url': 'FJJXS' +// }, +// { +// 'device_code': 'BZX', +// 'device_name': '包装线', +// 'device_model': '6', +// 'device_status': '1', +// 'material_name': '', +// 'work_time': '3.5', +// 'device_url': 'BZX' +// }, +// { +// 'device_code': 'CPX01', +// 'device_name': '拆盘线01', +// 'device_model': '6', +// 'device_status': '1', +// 'material_name': '', +// 'work_time': '3.5', +// 'device_url': 'CPX' +// }, +// { +// 'device_code': 'CPX02', +// 'device_name': '拆盘线02', +// 'device_model': '6', +// 'device_status': '1', +// 'material_name': '', +// 'work_time': '3.5', +// 'device_url': 'CPX' +// }, +// { +// 'device_code': 'KILN', +// 'device_name': '窑设备', +// 'device_model': '7', +// 'device_status': '1', +// 'material_name': '', +// 'work_time': '3.5', // 'vehicle_qty': 15, // 'vehicle_max_qty': 20, -// 'device_url': 'yzj' +// 'device_url': 'YAO' +// }, +// { +// 'device_code': 'DPJ', +// 'device_name': '叠盘机', +// 'device_model': '8', +// 'device_status': '1', +// 'material_name': '', +// 'work_time': '3.5', +// 'device_url': 'DPJ' +// }, +// { +// 'device_code': 'CPJ', +// 'device_name': '拆盘机', +// 'device_model': '9', +// 'device_status': '1', +// 'material_name': '', +// 'work_time': '3.5', +// 'device_url': 'CPJ' // } // ] // } diff --git a/src/assets/js/rem.js b/src/assets/js/rem.js index 610185f..ceaa606 100644 --- a/src/assets/js/rem.js +++ b/src/assets/js/rem.js @@ -1,34 +1,12 @@ -// (function (doc, win) { -// var docEl = doc.documentElement -// var resizeEvt = 'orientationchange' in window ? 'orientationchange' : 'resize' -// var recalc = function () { -// var clientWidth = docEl.clientWidth -// if (!clientWidth) return -// docEl.style.fontSize = 100 * (clientWidth / 1920) + 'px' -// document.body.style.display = 'block' -// } -// if (!doc.addEventListener) return win.addEventListener(resizeEvt, recalc, false) -// doc.addEventListener('DOMContentLoaded', recalc, false) -// })(document, window) - -(function () { - var _self = this - _self.width = 1920 - _self.fontSize = 100 - _self.widthProportion = function () { - var p = ((document.body && document.body.clientWidth) || document.getElementsByTagName('html')[0].offsetWidth) / _self.width - return p +(function (doc, win) { + var docEl = doc.documentElement + var resizeEvt = 'orientationchange' in window ? 'orientationchange' : 'resize' + var recalc = function () { + var clientWidth = docEl.clientWidth + if (!clientWidth) return + docEl.style.fontSize = 100 * (clientWidth / 1920) + 'px' + document.body.style.display = 'block' } - _self.changePage = function () { - document.getElementsByTagName('html')[0].setAttribute('style', 'font-size:' + _self.widthProportion() * _self.fontSize + 'px') - } - _self.changePage() - window.addEventListener('resize', function () { - let clientWidth = ((document.body && document.body.clientWidth) || document.getElementsByTagName('html')[0].offsetWidth) - if (clientWidth >= 1550) { - _self.changePage() - } else { - document.getElementsByTagName('html')[0].setAttribute('style', 'font-size:' + 1550 / _self.width * _self.fontSize + 'px') - } - }, false) -})() + if (!doc.addEventListener) return win.addEventListener(resizeEvt, recalc, false) + doc.addEventListener('DOMContentLoaded', recalc, false) +})(document, window) diff --git a/src/pages/DeviceMonitor.vue b/src/pages/DeviceMonitor.vue index 5deb423..d49d172 100644 --- a/src/pages/DeviceMonitor.vue +++ b/src/pages/DeviceMonitor.vue @@ -3,41 +3,41 @@
-
+
- +
-
-
-
{{e.point_name}}
+
+
+
{{e.device_name}}
-

当前生产:

-

已工作:

-

已生产:

-

当前窑车数:

-

容 量:

+

当前生产:

+

已工作:

+

已生产:

+

当前窑车数:

+

容 量:

-

{{e.material_name}}

-

{{e.work_time}}小时

-

{{e.ivt_qty | numFixed(2)}}KG

-

{{e.vehicle_qty}}车

-

{{e.vehicle_max_qty}}车

+

{{e.material_name}}

+

{{e.work_time}}小时

+

{{e.real_qty}}KG

+

{{e.vehicle_qty}}车

+

{{e.vehicle_max_qty}}车

-
+
-
{{form.point_name}}
+
{{form.device_name}}
-
-
{{['待机', '生产中', '故障', '关机'][Number(form.point_status) - 1]}}
+
+
{{['待机', '生产中', '故障', '关机'][Number(form.device_status) - 1]}}
当前生产:{{form.material_name}}
已生产:{{form.real_qty}}KG
@@ -98,15 +98,15 @@
-
+
-
{{form.point_name}}
+
{{form.device_name}}
-
-
{{['待机', '生产中', '故障', '关机'][Number(form.point_status) - 1]}}
+
+
{{['待机', '生产中', '故障', '关机'][Number(form.device_status) - 1]}}
本周用电:{{form.week_electricity}}kw.h
本月用电:{{form.mouth_electricity}}kw.h
@@ -129,15 +129,15 @@
-
+
-
{{form.point_name}}
+
{{form.device_name}}
-
-
{{['待机', '生产中', '故障', '关机'][Number(form.point_status) - 1]}}
+
+
{{['待机', '生产中', '故障', '关机'][Number(form.device_status) - 1]}}
本周用电:{{form.week_electricity}}kw.h
本月用电:{{form.mouth_electricity}}kw.h
@@ -160,15 +160,15 @@
-
+
-
{{form.point_name}}
+
{{form.device_name}}
-
-
{{['待机', '生产中', '故障', '关机'][Number(form.point_status) - 1]}}
+
+
{{['待机', '生产中', '故障', '关机'][Number(form.device_status) - 1]}}
本周用电:{{form.week_electricity}}kw.h
本月用电:{{form.mouth_electricity}}kw.h
@@ -183,15 +183,15 @@
-
+
-
{{form.point_name}}
+
{{form.device_name}}
-
-
{{['待机', '生产中', '故障', '关机'][Number(form.point_status) - 1]}}
+
+
{{['待机', '生产中', '故障', '关机'][Number(form.device_status) - 1]}}
本周用电:{{form.week_electricity}}kw.h
本月用电:{{form.mouth_electricity}}kw.h
@@ -202,15 +202,15 @@
-
+
-
{{form.point_name}}
+
{{form.device_name}}
-
-
{{['待机', '生产中', '故障', '关机'][Number(form.point_status) - 1]}}
+
+
{{['待机', '生产中', '故障', '关机'][Number(form.device_status) - 1]}}
本周用电/气:{{form.week_electricity}}kw.h / {{form.week_gas}} Nm
本月用电/气:{{form.mouth_electricity}}kw.h / {{form.month_gas}} Nm
@@ -233,15 +233,15 @@
-
+
-
{{form.point_name}}
+
{{form.device_name}}
-
-
{{['待机', '生产中', '故障', '关机'][Number(form.point_status) - 1]}}
+
+
{{['待机', '生产中', '故障', '关机'][Number(form.device_status) - 1]}}
本周用电:{{form.week_electricity}}kw.h
本月用电:{{form.mouth_electricity}}kw.h
@@ -253,15 +253,15 @@
-
+
-
{{form.point_name}}
+
{{form.device_name}}
-
-
{{['待机', '生产中', '故障', '关机'][Number(form.point_status) - 1]}}
+
+
{{['待机', '生产中', '故障', '关机'][Number(form.device_status) - 1]}}
本周用电:{{form.week_electricity}}kw.h
本月用电:{{form.mouth_electricity}}kw.h
@@ -274,15 +274,15 @@
-
+
-
{{form.point_name}}
+
{{form.device_name}}
-
-
{{['待机', '生产中', '故障', '关机'][Number(form.point_status) - 1]}}
+
+
{{['待机', '生产中', '故障', '关机'][Number(form.device_status) - 1]}}
本周用电:{{form.week_electricity}}kw.h
本月用电:{{form.mouth_electricity}}kw.h
@@ -295,15 +295,15 @@
-
+
-
{{form.point_name}}
+
{{form.device_name}}
-
-
{{['待机', '生产中', '故障', '关机'][Number(form.point_status) - 1]}}
+
+
{{['待机', '生产中', '故障', '关机'][Number(form.device_status) - 1]}}
已完成搬运:0个
故障信息:{{form.error_info}}
@@ -412,15 +412,15 @@ export default { } }, getInfo (e) { - if (this.uid === e.point_id) { - this.uid = '' - } else { - this.form = {} - this.allrows1 = [] - this.allrows2 = [] - this.allrowsw3 = [] - this._findDeviceById(e.point_id) - } + // if (this.uid === e.device_code) { + // this.uid = '' + // } else { + // this.form = {} + // this.allrows1 = [] + // this.allrows2 = [] + // this.allrowsw3 = [] + // this._findDeviceById(e.device_code) + // } }, closebtn () { this.uid = '' @@ -442,16 +442,16 @@ export default { cursor pointer .content width 100% - padding 10px 1rem 0 - height calc(100% - 134px) + height calc(100% - 135px) overflow-y auto + padding 10px 1rem 0 .item_tr width 100% .item_block position relative - _wh(180px,219px) + _wh(180px,209px) padding 8px 4px - margin-bottom 11px + margin-bottom 21px margin-right calc((100% - 180px * 9) / 8) background center center / 100% 100% url(../assets/images/bg_item.png) no-repeat &:nth-child(9n) @@ -465,14 +465,14 @@ export default { background-color $gray img _wh(100%,100%) -.point_name_tag +.device_name_tag _wh(10px,10px) border-radius 50% margin 2px background-color #ffffff -.point_name_text +.device_name_text _font(14px,14px,,,left) -.point_name, .info_block +.device_name, .info_block width 100% padding 4px 0 .info_table_block @@ -627,7 +627,7 @@ export default { border-bottom none .tag_block position fixed - bottom 30px + bottom 25px right 54px .tag_type display inline-block @@ -640,16 +640,6 @@ export default { .tag_text display inline-block _font(14px,20px,,,left) -@media screen and (max-width:1800px) - .content - width 100% - padding 10px 14px 0 - .item_block - _wh(160px,219px) - margin-bottom 20px - margin-right calc((100% - 160px * 9) / 8) - .item_img - _wh(100%,80px) .green background-color $green .yellow