diff --git a/src/components/headerBox/header2.vue b/src/components/headerBox/header2.vue index 1dde50f..9dd6831 100644 --- a/src/components/headerBox/header2.vue +++ b/src/components/headerBox/header2.vue @@ -160,6 +160,8 @@ let props = defineProps<{ typeFun: any[]; alarmType: any[]; }>(); + +window.document.title = props.title; const typeObj = reactive({ comback: false, AbnormalData: false, @@ -541,7 +543,7 @@ h1 { } .time { position: absolute; - width: 20rem; + width: 350px; height: 2rem; bottom: 30%; left: 4.2rem; diff --git a/src/locales/lang/en.ts b/src/locales/lang/en.ts index e19e8f2..ad15579 100644 --- a/src/locales/lang/en.ts +++ b/src/locales/lang/en.ts @@ -294,7 +294,8 @@ export default { '数据监测':'数据监测', '进水':'进水', '出水':'出水', - '消耗':'消耗', + '消耗':'消耗', + '储水':'储水', '用电':'用电', '总体趋势图':'总体趋势图', '近一周':'Last Week', diff --git a/src/locales/lang/zh.ts b/src/locales/lang/zh.ts index 5ce53a1..cee755d 100644 --- a/src/locales/lang/zh.ts +++ b/src/locales/lang/zh.ts @@ -295,6 +295,7 @@ export default { '进水':'进水', '出水':'出水', '消耗':'消耗', + '储水':'储水', '用电':'用电', '总体趋势图':'总体趋势图', '近一周':'近一周', diff --git a/src/router/index.ts b/src/router/index.ts index f235240..19c09ba 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -267,8 +267,7 @@ const routes: Array = [ name: "MicroExhibitionChild", component: () => import("../views/MicroExhibition/child/index.vue"), }, - ] - + ] }, { @@ -281,6 +280,16 @@ const routes: Array = [ name: "Hazardous", component: () => import("../views/Hazardous/index.vue"), }, + { + path: "/stuffCrownBlock", + name: "stuffCrownBlock", + component: () => import("../views/CrownBlock/stuffCrownBlock/index.vue"), + }, + { + path: "/SewingBift", + name: "SewingBift", + component: () => import("../views/SewingBift/index.vue"), + }, @@ -348,6 +357,7 @@ const router = createRouter({ routes, }); + router.beforeEach(async (to: any, from, next) => { // ... let address = to.name @@ -380,4 +390,16 @@ router.beforeEach(async (to: any, from, next) => { } }) + +// router.beforeEach(async (to: any, from, next) => { + +// // 返回 false 以取消导航 +// if (to.path !== "/SewingBift") { + +// return false; +// } else { +// next(); +// } + +// }) export default router; diff --git a/src/store/moduleSocketMechanics.ts b/src/store/moduleSocketMechanics.ts index bcb2b07..c1297f3 100644 --- a/src/store/moduleSocketMechanics.ts +++ b/src/store/moduleSocketMechanics.ts @@ -72,6 +72,9 @@ export const useSocketStore = defineStore(Names.socketMechanics, { "pm10": "7" } ], + pmcq: [ + {} + ], newVerticalNum: [ { "type": "TVOC", diff --git a/src/views/CrownBlock/stuffCrownBlock/index.vue b/src/views/CrownBlock/stuffCrownBlock/index.vue new file mode 100644 index 0000000..f8df6f3 --- /dev/null +++ b/src/views/CrownBlock/stuffCrownBlock/index.vue @@ -0,0 +1,123 @@ + + + + + diff --git a/src/views/Hazardous/components/Card.vue b/src/views/Hazardous/components/Card.vue index 9b168d3..2f67cce 100644 --- a/src/views/Hazardous/components/Card.vue +++ b/src/views/Hazardous/components/Card.vue @@ -17,10 +17,10 @@
-
+
diff --git a/src/views/Hazardous/index.vue b/src/views/Hazardous/index.vue index 364b479..c34b8dc 100644 --- a/src/views/Hazardous/index.vue +++ b/src/views/Hazardous/index.vue @@ -2,7 +2,7 @@
-
@@ -94,7 +94,7 @@ const config = reactive({ type: 1, classArr: [], value: 0, - limit: 80, + limit: 120, unit: '%RH' }, wendu: { @@ -148,7 +148,7 @@ const config = reactive({ type: 3, classArr: [], value: 0, - limit: 1, + limit: 5, unit: '' }, }) @@ -184,6 +184,10 @@ const getGuoJian24TrendData = async () => { config.yanwu.value = data.top.yanwu config.ranqi.value = data.top.ranqi + config.ranqi.limit = data.limit.ranqi + config.xielou.limit = data.limit.xielou + config.yanwu.limit = data.limit.yanwu + calc.math = [ { key: '湿度%RH', diff --git a/src/views/Mechanics/components/devStatusTip.vue b/src/views/Mechanics/components/devStatusTip.vue index a137a3b..5ec6411 100644 --- a/src/views/Mechanics/components/devStatusTip.vue +++ b/src/views/Mechanics/components/devStatusTip.vue @@ -29,7 +29,7 @@ -

{{ label.name }} :{{ res.name }}

+

{{ label.name }}:{{ res.name }}

{{ label.date }}:{{ res.date }}   {{ label.duration }}:{{ res.duration }} @@ -49,7 +49,7 @@ -

{{ label.name }} :{{ res.name }}

+

{{ label.name }}:{{ res.name }}

{{ label.date }}:{{ res.date }}   {{ label.duration }}:{{ res.duration }} @@ -148,7 +148,7 @@ const onSlideChange = (e) => { }; .col-flex { display: flex; - justify-content: center; + justify-content: space-around; align-items: center; } @@ -158,5 +158,18 @@ swiper-container { height: 100%; display: inline-block !important; } + +.item-name { + display: flex; + flex-direction: row; + align-items: center; +} +.item-name-key { + width: 92px; +} +.item-name-value { + flex: 1; + text-align: left; +} \ No newline at end of file diff --git a/src/views/PaintShopView/View1/bottom.vue b/src/views/PaintShopView/View1/bottom.vue index 0c43297..51c0985 100644 --- a/src/views/PaintShopView/View1/bottom.vue +++ b/src/views/PaintShopView/View1/bottom.vue @@ -208,7 +208,7 @@ function setcontentData(val) { color: function (params) { // 通过返回值的下标一一对应将颜色赋给柱子上,return出去什么颜色就是什么颜色,这里可以写判断 // console.log(params) - let color = ['#1089e7', '#f57474', '#56d0e3', '#f8b448', '#73c0de', '#3ba272', '#fc8452', '#9a60b4', '#ea7ccc'] + let color = ['#1089e7', '#f57474', '#56d0e3', '#f8b448', '#73c0de', '#3ba272', '#fc8452', '#9a60b4', '#ea7ccc','#4992FF','#7CFFB2','#FDDD60'] // return colors[params.dataIndex]; return color[params.dataIndex]; } @@ -252,7 +252,7 @@ function setcontentData(val) { color: function (params) { // 通过返回值的下标一一对应将颜色赋给柱子上,return出去什么颜色就是什么颜色,这里可以写判断 // console.log(params) - let color = ['#1089e7', '#f57474', '#56d0e3', '#f8b448', '#73c0de', '#3ba272', '#fc8452', '#9a60b4', '#ea7ccc'] + let color = ['#1089e7', '#f57474', '#56d0e3', '#f8b448', '#73c0de', '#3ba272', '#fc8452', '#9a60b4', '#ea7ccc','#4992FF','#7CFFB2','#FDDD60'] // return colors[params.dataIndex]; return color[params.dataIndex]; } diff --git a/src/views/PaintShopView/View1/top.vue b/src/views/PaintShopView/View1/top.vue index 9d06f5b..9e44e29 100644 --- a/src/views/PaintShopView/View1/top.vue +++ b/src/views/PaintShopView/View1/top.vue @@ -12,7 +12,7 @@

- + @@ -84,7 +84,7 @@ function reset(val: any) { const powerBox = (width: any, height: any) => { let a = calcWH(height, width, 1, 24, 0); //修改高度 - verticalNum3.value.setchartWH(a.oWidth * 3.42 - 20, a.oHeight - 20) + // verticalNum3.value.setchartWH(a.oWidth * 3.42 - 20, a.oHeight - 20) verticalNum4.value.setchartWH(a.oWidth * 3.42 - 20, a.oHeight - 20) verticalNum5.value.setchartWH(a.oWidth * 3.42 - 20, a.oHeight - 20) verticalNum6.value.setchartWH(a.oWidth * 3.42 - 20, a.oHeight - 20) @@ -267,7 +267,7 @@ function setcontentData(val) { let noise = val.noise.map((item) => { return { name: item.name, val: item.data,status:item.status }; }); - verticalNum3.value.setData(val.FIRE, 'icon-weibiaoti1', 0, "") + // verticalNum3.value.setData(val.FIRE, 'icon-weibiaoti1', 0, "") verticalNum4.value.setData(noise, 'icon-shengyin', 85, "dB") verticalNum5.value.setData(Smoke, 'icon-yanwubaojingqi', 100, "PPM") verticalNum6.value.setData(CH2O, 'icon-app_icons--', 0.08, "mg/m3") diff --git a/src/views/PaintShopView/finishView/bottom.vue b/src/views/PaintShopView/finishView/bottom.vue index a297d6f..2243bc6 100644 --- a/src/views/PaintShopView/finishView/bottom.vue +++ b/src/views/PaintShopView/finishView/bottom.vue @@ -206,7 +206,7 @@ function setcontentData(val) { color: function (params) { // 通过返回值的下标一一对应将颜色赋给柱子上,return出去什么颜色就是什么颜色,这里可以写判断 // console.log(params) - let color = ['#1089e7', '#f57474', '#56d0e3', '#f8b448', '#73c0de', '#3ba272', '#fc8452', '#9a60b4', '#ea7ccc'] + let color = ['#1089e7', '#f57474', '#56d0e3', '#f8b448', '#73c0de', '#3ba272', '#fc8452', '#9a60b4', '#ea7ccc','#4992FF','#7CFFB2','#FDDD60'] // return colors[params.dataIndex]; return color[params.dataIndex]; } @@ -249,7 +249,7 @@ function setcontentData(val) { color: function (params) { // 通过返回值的下标一一对应将颜色赋给柱子上,return出去什么颜色就是什么颜色,这里可以写判断 // console.log(params) - let color = ['#1089e7', '#f57474', '#56d0e3', '#f8b448', '#73c0de', '#3ba272', '#fc8452', '#9a60b4', '#ea7ccc'] + let color = ['#1089e7', '#f57474', '#56d0e3', '#f8b448', '#73c0de', '#3ba272', '#fc8452', '#9a60b4', '#ea7ccc','#4992FF','#7CFFB2','#FDDD60'] // return colors[params.dataIndex]; return color[params.dataIndex]; } diff --git a/src/views/PaintShopView/machiningView/bottom.vue b/src/views/PaintShopView/machiningView/bottom.vue index 5a79152..23c4115 100644 --- a/src/views/PaintShopView/machiningView/bottom.vue +++ b/src/views/PaintShopView/machiningView/bottom.vue @@ -207,7 +207,7 @@ function setcontentData(val) { color: function (params) { // 通过返回值的下标一一对应将颜色赋给柱子上,return出去什么颜色就是什么颜色,这里可以写判断 // console.log(params) - let color = ['#1089e7', '#f57474', '#56d0e3', '#f8b448', '#73c0de', '#3ba272', '#fc8452', '#9a60b4', '#ea7ccc'] + let color = ['#1089e7', '#f57474', '#56d0e3', '#f8b448', '#73c0de', '#3ba272', '#fc8452', '#9a60b4', '#ea7ccc','#4992FF','#7CFFB2','#FDDD60'] // return colors[params.dataIndex]; return color[params.dataIndex]; } @@ -250,7 +250,7 @@ function setcontentData(val) { color: function (params) { // 通过返回值的下标一一对应将颜色赋给柱子上,return出去什么颜色就是什么颜色,这里可以写判断 // console.log(params) - let color = ['#1089e7', '#f57474', '#56d0e3', '#f8b448', '#73c0de', '#3ba272', '#fc8452', '#9a60b4', '#ea7ccc'] + let color = ['#1089e7', '#f57474', '#56d0e3', '#f8b448', '#73c0de', '#3ba272', '#fc8452', '#9a60b4', '#ea7ccc','#4992FF','#7CFFB2','#FDDD60'] // return colors[params.dataIndex]; return color[params.dataIndex]; } diff --git a/src/views/PaintShopView/stuffView/bottom.vue b/src/views/PaintShopView/stuffView/bottom.vue index 3f68cec..7db814b 100644 --- a/src/views/PaintShopView/stuffView/bottom.vue +++ b/src/views/PaintShopView/stuffView/bottom.vue @@ -207,7 +207,7 @@ function setcontentData(val) { color: function (params) { // 通过返回值的下标一一对应将颜色赋给柱子上,return出去什么颜色就是什么颜色,这里可以写判断 // console.log(params) - let color = ['#1089e7', '#f57474', '#56d0e3', '#f8b448', '#73c0de', '#3ba272', '#fc8452', '#9a60b4', '#ea7ccc'] + let color = ['#1089e7', '#f57474', '#56d0e3', '#f8b448', '#73c0de', '#3ba272', '#fc8452', '#9a60b4', '#ea7ccc','#4992FF','#7CFFB2','#FDDD60'] // return colors[params.dataIndex]; return color[params.dataIndex]; } @@ -251,7 +251,7 @@ function setcontentData(val) { color: function (params) { // 通过返回值的下标一一对应将颜色赋给柱子上,return出去什么颜色就是什么颜色,这里可以写判断 // console.log(params) - let color = ['#1089e7', '#f57474', '#56d0e3', '#f8b448', '#73c0de', '#3ba272', '#fc8452', '#9a60b4', '#ea7ccc'] + let color = ['#1089e7', '#f57474', '#56d0e3', '#f8b448', '#73c0de', '#3ba272', '#fc8452', '#9a60b4', '#ea7ccc','#4992FF','#7CFFB2','#FDDD60'] // return colors[params.dataIndex]; return color[params.dataIndex]; } diff --git a/src/views/PaintShopView/weldView/bottom.vue b/src/views/PaintShopView/weldView/bottom.vue index 231ba37..33c34b8 100644 --- a/src/views/PaintShopView/weldView/bottom.vue +++ b/src/views/PaintShopView/weldView/bottom.vue @@ -207,7 +207,7 @@ function setcontentData(val) { color: function (params) { // 通过返回值的下标一一对应将颜色赋给柱子上,return出去什么颜色就是什么颜色,这里可以写判断 // console.log(params) - let color = ['#1089e7', '#f57474', '#56d0e3', '#f8b448', '#73c0de', '#3ba272', '#fc8452', '#9a60b4', '#ea7ccc'] + let color = ['#1089e7', '#f57474', '#56d0e3', '#f8b448', '#73c0de', '#3ba272', '#fc8452', '#9a60b4', '#ea7ccc','#4992FF','#7CFFB2','#FDDD60'] // return colors[params.dataIndex]; return color[params.dataIndex]; } @@ -251,7 +251,7 @@ function setcontentData(val) { color: function (params) { // 通过返回值的下标一一对应将颜色赋给柱子上,return出去什么颜色就是什么颜色,这里可以写判断 // console.log(params) - let color = ['#1089e7', '#f57474', '#56d0e3', '#f8b448', '#73c0de', '#3ba272', '#fc8452', '#9a60b4', '#ea7ccc'] + let color = ['#1089e7', '#f57474', '#56d0e3', '#f8b448', '#73c0de', '#3ba272', '#fc8452', '#9a60b4', '#ea7ccc','#4992FF','#7CFFB2','#FDDD60'] // return colors[params.dataIndex]; return color[params.dataIndex]; } diff --git a/src/views/SewingBift/component/swiper.vue b/src/views/SewingBift/component/swiper.vue new file mode 100644 index 0000000..676d0c8 --- /dev/null +++ b/src/views/SewingBift/component/swiper.vue @@ -0,0 +1,185 @@ + + + + + + + diff --git a/src/views/SewingBift/content/bottom.vue b/src/views/SewingBift/content/bottom.vue new file mode 100644 index 0000000..f457736 --- /dev/null +++ b/src/views/SewingBift/content/bottom.vue @@ -0,0 +1,486 @@ + + + + + + diff --git a/src/views/SewingBift/content/top.vue b/src/views/SewingBift/content/top.vue new file mode 100644 index 0000000..b85dffe --- /dev/null +++ b/src/views/SewingBift/content/top.vue @@ -0,0 +1,204 @@ + + + + + + diff --git a/src/views/SewingBift/index.vue b/src/views/SewingBift/index.vue new file mode 100644 index 0000000..fae20a8 --- /dev/null +++ b/src/views/SewingBift/index.vue @@ -0,0 +1,259 @@ + + + + + + + + diff --git a/src/views/SewingBift/status/js/result.js b/src/views/SewingBift/status/js/result.js new file mode 100644 index 0000000..ec1f92a --- /dev/null +++ b/src/views/SewingBift/status/js/result.js @@ -0,0 +1,635 @@ +/** + * 1 + */ +export const getStatusCountsOfMiniatureFactoryData = { + "code": 200, + "msg": null, + "data": [ + { + "deptId": "12f5d2a0-1593-11ee-b4df-a9653aef169c", + "name": "false", + "counts": 0, + "gatewayStatus": "true" + }, + { + "deptId": "12f5d2a0-1593-11ee-b4df-a9653aef169c", + "name": "true", + "counts": 10, + "gatewayStatus": "true" + } + ] +} + +/** + * 设备信息 + */ +export const getInfoOfMiniatureFactoryData = { + "code": 200, + "msg": null, + "data": [ + { + "id": "0ccacd50-1592-11ee-b4df-a9653aef169c", + "label": null, + "name": "高速平台式双针双重环缝缝纫机", + "belongTo": null, + "deviceStatus": "true", + "deliveryDate": null, + "progress": null, + "runTime": 2661.53, + "image": "g.png", + "speed": 0, + "pins": 39499, + "model": null, + "type": null, + "typeName": null, + "prtDeliveryDate": null, + "realityTime": null, + "status": null, + "inspector": null, + "assemblyGroup": null, + "electricGroup": null + }, + { + "id": "26ce8020-1592-11ee-b4df-a9653aef169c", + "label": null, + "name": "半干机头双针平缝机", + "belongTo": null, + "deviceStatus": "true", + "deliveryDate": null, + "progress": null, + "runTime": 133.43, + "image": "b.png", + "speed": 0, + "pins": 0, + "model": null, + "type": null, + "typeName": null, + "prtDeliveryDate": null, + "realityTime": null, + "status": null, + "inspector": null, + "assemblyGroup": null, + "electricGroup": null + }, + { + "id": "2fb7b080-1592-11ee-b4df-a9653aef169c", + "label": null, + "name": "半干式高速包缝机", + "belongTo": null, + "deviceStatus": "true", + "deliveryDate": null, + "progress": null, + "runTime": 7350.0, + "image": "c.png", + "speed": 0, + "pins": 379066, + "model": null, + "type": null, + "typeName": null, + "prtDeliveryDate": null, + "realityTime": null, + "status": null, + "inspector": null, + "assemblyGroup": null, + "electricGroup": null + }, + { + "id": "3b49e0d0-1592-11ee-b4df-a9653aef169c", + "label": null, + "name": "电脑数控花样珠边机", + "belongTo": null, + "deviceStatus": "true", + "deliveryDate": null, + "progress": null, + "runTime": 899.66, + "image": "e.png", + "speed": 0, + "pins": 0, + "model": null, + "type": null, + "typeName": null, + "prtDeliveryDate": null, + "realityTime": null, + "status": null, + "inspector": null, + "assemblyGroup": null, + "electricGroup": null + }, + { + "id": "620e31d0-1592-11ee-b4df-a9653aef169c", + "label": null, + "name": "小方头式偏平缝绷缝机", + "belongTo": null, + "deviceStatus": "true", + "deliveryDate": null, + "progress": null, + "runTime": 8160.2, + "image": "i.png", + "speed": 0, + "pins": 410440, + "model": null, + "type": null, + "typeName": null, + "prtDeliveryDate": null, + "realityTime": null, + "status": null, + "inspector": null, + "assemblyGroup": null, + "electricGroup": null + }, + { + "id": "6f495730-1592-11ee-b4df-a9653aef169c", + "label": null, + "name": "人字缝缝纫机", + "belongTo": null, + "deviceStatus": "true", + "deliveryDate": null, + "progress": null, + "runTime": 805.54, + "image": "h.png", + "speed": 0, + "pins": 0, + "model": null, + "type": null, + "typeName": null, + "prtDeliveryDate": null, + "realityTime": null, + "status": null, + "inspector": null, + "assemblyGroup": null, + "electricGroup": null + }, + { + "id": "7ca216b0-1592-11ee-b4df-a9653aef169c", + "label": null, + "name": "暗缝机", + "belongTo": null, + "deviceStatus": "true", + "deliveryDate": null, + "progress": null, + "runTime": 1089.38, + "image": "a.png", + "speed": 0, + "pins": 30037, + "model": null, + "type": null, + "typeName": null, + "prtDeliveryDate": null, + "realityTime": null, + "status": null, + "inspector": null, + "assemblyGroup": null, + "electricGroup": null + }, + { + "id": "93fc0640-1592-11ee-b4df-a9653aef169c", + "label": null, + "name": "单针平缝缝纫机1", + "belongTo": null, + "deviceStatus": "true", + "deliveryDate": null, + "progress": null, + "runTime": 2203.81, + "image": "d.png", + "speed": 0, + "pins": 44497, + "model": null, + "type": null, + "typeName": null, + "prtDeliveryDate": null, + "realityTime": null, + "status": null, + "inspector": null, + "assemblyGroup": null, + "electricGroup": null + }, + { + "id": "9b11f2b0-1591-11ee-b4df-a9653aef169c", + "label": null, + "name": "单针平缝缝纫机2", + "belongTo": null, + "deviceStatus": "true", + "deliveryDate": null, + "progress": null, + "runTime": 3089.73, + "image": "d.png", + "speed": 0, + "pins": 122849, + "model": null, + "type": null, + "typeName": null, + "prtDeliveryDate": null, + "realityTime": null, + "status": null, + "inspector": null, + "assemblyGroup": null, + "electricGroup": null + }, + { + "id": "b2a9e030-1592-11ee-b4df-a9653aef169c", + "label": null, + "name": "高速电子锁眼机", + "belongTo": null, + "deviceStatus": "true", + "deliveryDate": null, + "progress": null, + "runTime": 1574.59, + "image": "f.png", + "speed": 0, + "pins": 11128, + "model": null, + "type": null, + "typeName": null, + "prtDeliveryDate": null, + "realityTime": null, + "status": null, + "inspector": null, + "assemblyGroup": null, + "electricGroup": null + }, + ] +} + +/** + * 缝纫时间 + */ +export const getSewingTimeData = { + "code": 200, + "msg": null, + "data": [ + { + "deviceId": "620e31d0-1592-11ee-b4df-a9653aef169c", + "name": "小方头式偏平缝绷缝机", + "firstRunTime": "2023-08-11 09:42:39", + "lastStartTime": "2023-10-13 07:56:46", + "lastEndTime": "2023-10-13 13:15:46", + "usageDate": 52, + "runTime": 8160.2, + "workTime": 847.74, + "in2Count": 0, + "in2TodayCount": 0, + "in2ClearCount": 0, + "in3Count": 115, + "in3TodayCount": 113, + "in3ClearCount": 0, + "in4Count": 410440 + }, + { + "deviceId": "9b11f2b0-1591-11ee-b4df-a9653aef169c", + "name": "单针平缝缝纫机2", + "firstRunTime": "2023-07-21 17:51:45", + "lastStartTime": "2023-10-13 13:15:50", + "lastEndTime": "2023-10-13 13:15:50", + "usageDate": 59, + "runTime": 3089.73, + "workTime": 144.17, + "in2Count": 4863, + "in2TodayCount": 2147, + "in2ClearCount": 0, + "in3Count": 287, + "in3TodayCount": 369, + "in3ClearCount": 0, + "in4Count": 122849 + }, + { + "deviceId": "2fb7b080-1592-11ee-b4df-a9653aef169c", + "name": "半干式高速包缝机", + "firstRunTime": "2023-07-21 17:51:45", + "lastStartTime": "2023-10-10 07:59:25", + "lastEndTime": "2023-10-10 11:05:56", + "usageDate": 58, + "runTime": 3263.84, + "workTime": 173.91, + "in2Count": 24231, + "in2TodayCount": 7008, + "in2ClearCount": 9, + "in3Count": 2199, + "in3TodayCount": 1451, + "in3ClearCount": 5, + "in4Count": 105683 + }, + { + "deviceId": "2fb7b080-1592-11ee-b4df-a965fgsf169c", + "name": "高速平台式双针双重环缝缝纫机", + "firstRunTime": "2023-07-21 17:51:45", + "lastStartTime": "2023-10-10 07:59:25", + "lastEndTime": "2023-10-10 11:05:56", + "usageDate": 58, + "runTime": 3263.84, + "workTime": 245.32, + "in2Count": 24231, + "in2TodayCount": 7008, + "in2ClearCount": 9, + "in3Count": 2199, + "in3TodayCount": 1451, + "in3ClearCount": 5, + "in4Count": 105683 + }, + { + "deviceId": "2fb7b080-1592-11ee-b4df-a9699aef169c", + "name": "半干机头双针平缝机", + "firstRunTime": "2023-07-21 17:51:45", + "lastStartTime": "2023-10-10 07:59:25", + "lastEndTime": "2023-10-10 11:05:56", + "usageDate": 58, + "runTime": 3263.84, + "workTime": 195.32, + "in2Count": 24231, + "in2TodayCount": 7008, + "in2ClearCount": 9, + "in3Count": 2199, + "in3TodayCount": 1451, + "in3ClearCount": 5, + "in4Count": 105683 + }, + { + "deviceId": "2fb7b080-1592-11ee-b4df-a96480ef169c", + "name": "电脑数控花样珠边机", + "firstRunTime": "2023-07-21 17:51:45", + "lastStartTime": "2023-10-10 07:59:25", + "lastEndTime": "2023-10-10 11:05:56", + "usageDate": 58, + "runTime": 3263.84, + "workTime": 220.55, + "in2Count": 24231, + "in2TodayCount": 7008, + "in2ClearCount": 9, + "in3Count": 2199, + "in3TodayCount": 1451, + "in3ClearCount": 5, + "in4Count": 105683 + }, + { + "deviceId": "2fb7b080-1592-11ee-aa25-a9653aef169c", + "name": "高速电子锁眼机", + "firstRunTime": "2023-07-21 17:51:45", + "lastStartTime": "2023-10-10 07:59:25", + "lastEndTime": "2023-10-10 11:05:56", + "usageDate": 58, + "runTime": 3263.84, + "workTime": 279.84, + "in2Count": 24231, + "in2TodayCount": 7008, + "in2ClearCount": 9, + "in3Count": 2199, + "in3TodayCount": 1451, + "in3ClearCount": 5, + "in4Count": 105683 + }, + { + "deviceId": "2fb7b080-9854-11ee-b4df-a9653aef169c", + "name": "人字缝缝纫机", + "firstRunTime": "2023-07-21 17:51:45", + "lastStartTime": "2023-10-10 07:59:25", + "lastEndTime": "2023-10-10 11:05:56", + "usageDate": 58, + "runTime": 3263.84, + "workTime": 152.00, + "in2Count": 24231, + "in2TodayCount": 7008, + "in2ClearCount": 9, + "in3Count": 2199, + "in3TodayCount": 1451, + "in3ClearCount": 5, + "in4Count": 105683 + }, + { + "deviceId": "2fb7b080-1193-11ee-b4df-a9653aef169c", + "name": "暗缝机", + "firstRunTime": "2023-07-21 17:51:45", + "lastStartTime": "2023-10-10 07:59:25", + "lastEndTime": "2023-10-10 11:05:56", + "usageDate": 58, + "runTime": 3263.84, + "workTime": 425.98, + "in2Count": 24231, + "in2TodayCount": 7008, + "in2ClearCount": 9, + "in3Count": 2199, + "in3TodayCount": 1451, + "in3ClearCount": 5, + "in4Count": 105683 + } + ] +} +/** + * 压脚 + */ +export const getPresserFootHistogramData = { + "code": 200, + "msg": null, + "data": [ + { + "id": "2fb7b080-1592-11ee-b4df-a9653aef169c", + "name": "半干式高速包缝机", + "reality": 5283, + "average": 2671, + "ratio": 198 + }, + { + "id": "93fc0640-1592-11ee-b4df-a9653aef169c", + "name": "单针平缝缝纫机", + "reality": 4414, + "average": 3233, + "ratio": 136 + }, + { + "id": "9b11f2b0-1591-11ee-b4df-a9653aef169c", + "name": "单针平缝缝纫机2", + "reality": 3147, + "average": 2982, + "ratio": 105 + }, + { + "id": "0ccacd50-1592-11ee-b4df-a9653aef169c", + "name": "高速平台式双针双重环缝缝纫机", + "reality": 4126, + "average": 4223, + "ratio": 98 + }, + { + "id": "26ce8020-1592-11ee-b4df-a9653aef169c", + "name": "半干机头双针平缝机", + "reality": 1283, + "average": 951, + "ratio": 134 + }, + { + "id": "3b49e0d0-1592-11ee-b4df-a9653aef169c", + "name": "电脑数控花样珠边机", + "reality": 4974, + "average": 3429, + "ratio": 145 + }, + { + "id": "b2a9e030-1592-11ee-b4df-a9653aef169c", + "name": "高速电子锁眼机", + "reality": 2140, + "average": 1145, + "ratio": 186 + }, + { + "id": "620e31d0-1592-11ee-b4df-a9653aef169c", + "name": "小方头式偏平缝绷缝机", + "reality": 5008, + "average": 3417, + "ratio": 147 + }, + { + "id": "6f495730-1592-11ee-b4df-a9653aef169c", + "name": "人字缝缝纫机", + "reality": 3511, + "average": 2111, + "ratio": 166 + }, + { + "id": "7ca216b0-1592-11ee-b4df-a9653aef169c", + "name": "暗缝机", + "reality": 2103, + "average": 1551, + "ratio": 136 + }, + ] +} + +/** + * 剪线 + */ +export const getCuttingLineHistogramData = { + "code": 200, + "msg": null, + "data": [ + { + "id": "620e31d0-1592-11ee-b4df-a9653aef169c", + "name": "小方头式偏平缝绷缝机", + "reality": 113, + "average": 52, + "ratio": 217 + }, + { + "id": "9b11f2b0-1591-11ee-b4df-a9653aef169c", + "name": "单针平缝缝纫机2", + "reality": 369, + "average": 114, + "ratio": 323 + }, + { + "id": "93fc0640-1592-11ee-b4df-a9653aef169c", + "name": "单针平缝缝纫机1", + "reality": 625, + "average": 325, + "ratio": 192 + }, + { + "id": "0ccacd50-1592-11ee-b4df-a9653aef169c", + "name": "高速平台式双针双重环缝缝纫机", + "reality": 445, + "average": 207, + "ratio": 215 + }, + { + "id": "2fb7b080-1592-11ee-b4df-a9653aef169c", + "name": "半干式高速包缝机", + "reality": 263, + "average": 93, + "ratio": 283 + },//----- + { + "id": "9b11f2b0-1591-11ee-b4df-a9653avf169c", + "name": "半干机头双针平缝机", + "reality": 369, + "average": 104, + "ratio": 355 + }, + { + "id": "93fc0640-1592-11ee-b4df-a9698lef169c", + "name": "电脑数控花样珠边机", + "reality": 541, + "average": 205, + "ratio": 264 + }, + { + "id": "0ccacd50-1592-11ee-b4df-a9653aef4561", + "name": "高速电子锁眼机", + "reality": 445, + "average": 237, + "ratio": 188 + }, + { + "id": "2fb7b080-1592-11ee-b4df-a965465769c", + "name": "人字缝缝纫机", + "reality": 263, + "average": 153, + "ratio": 172 + }, + { + "id": "2fb7qa80-1592-11ee-b4df-a965465769c", + "name": "暗缝机", + "reality": 263, + "average": 123, + "ratio": 214 + } + ] +} + + +/** + * 稼动率 + */ +export const getActivationData = { + "code": 200, + "msg": null, + "data": [ + { + "id": "2fb7b080-1592-11ee-b4df-a9653aef169c", + "name": "半干式高速包缝机", + "activation": 8 + }, + { + "id": "620e31d0-1592-11ee-b4df-a9653aef169c", + "name": "小方头式偏平缝绷缝机", + "activation": 10 + }, + { + "id": "7ca216b0-1592-11ee-b4df-a9653aef169c", + "name": "暗缝机", + "activation": 2 + }, + { + "id": "93fc0640-1592-11ee-b4df-a9653aef169c", + "name": "单针平缝缝纫机", + "activation": 5 + }, + { + "id": "9b11f2b0-1591-11ee-b4df-a9653aef169c", + "name": "单针平缝缝纫机2", + "activation": 4 + }, + { + "id": "0ccacd50-1592-11ee-b4df-a9653aef169c", + "name": "高速平台式双针双重环缝缝纫机", + "activation": 4 + }, + { + "id": "26ce8020-1592-11ee-b4df-a9653aef169c", + "name": "半干机头双针平缝机", + "activation": 3 + }, + { + "id": "3b49e0d0-1592-11ee-b4df-a9653aef169c", + "name": "电脑数控花样珠边机", + "activation": 5 + }, + { + "id": "b2a9e030-1592-11ee-b4df-a9653aef169c", + "name": "高速电子锁眼机", + "activation": 2 + }, + { + "id": "6f495730-1592-11ee-b4df-a9653aef169c", + "name": "人字缝缝纫机", + "activation": 1 + } + ] +} + diff --git a/src/views/generalEnvironmentMechanical/index.vue b/src/views/generalEnvironmentMechanical/index.vue index 169c476..3fffbb7 100644 --- a/src/views/generalEnvironmentMechanical/index.vue +++ b/src/views/generalEnvironmentMechanical/index.vue @@ -13,6 +13,9 @@
+
@@ -224,8 +227,8 @@ watch(() => store.humiture, (newVal, oldVal) => { let pmindex = ref(0); async function getPmData() { - let resulttwo: any = await getPmtwoData({ deptIds: '6,7,9,10,11' }) - let resultten: any = await getPmtenData({ deptIds: '6,7,9,10,11' }) + let resulttwo: any = await getPmtwoData({ deptIds: '6,7,9,10,11,23' }) + let resultten: any = await getPmtenData({ deptIds: '6,7,9,10,11,23' }) let data = {} if (resulttwo) { resulttwo.data.forEach(ele => { diff --git a/src/views/realtimeSecurity/content/content.vue b/src/views/realtimeSecurity/content/content.vue index 4d8fba8..531740a 100644 --- a/src/views/realtimeSecurity/content/content.vue +++ b/src/views/realtimeSecurity/content/content.vue @@ -3,7 +3,7 @@ -
+