From 8aa076543752a9cd16fe6d72a6ba804a0d23dc58 Mon Sep 17 00:00:00 2001 From: caill <815519168@qq.com> Date: Thu, 4 Jan 2024 18:58:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=B3=E4=BE=A7=E5=A4=A7=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/getData2.js | 4 +- src/config/mork2.js | 82 ++- src/images/bg-title_3.png | Bin 0 -> 6016 bytes src/images/bg1.png | Bin 0 -> 1262 bytes src/images/bg2.png | Bin 0 -> 1335 bytes src/images/bg3.png | Bin 0 -> 1244 bytes src/images/bg4.png | Bin 0 -> 166 bytes src/images/fk_6.png | Bin 0 -> 1209 bytes src/images/fk_7.png | Bin 0 -> 1192 bytes src/images/pointer.png | Bin 0 -> 2241 bytes src/images/state_0.png | Bin 0 -> 489 bytes src/images/state_1.png | Bin 0 -> 459 bytes src/images/state_2.png | Bin 0 -> 482 bytes src/images/state_3.png | Bin 0 -> 461 bytes src/images/table-bg_1.png | Bin 0 -> 13684 bytes src/pages/modules/home/left/left.vue | 103 +-- src/pages/modules/home/right/left.vue | 168 ++++- src/pages/modules/home/right/right.vue | 903 ++++++++++++++++++++++++- src/style/layout.styl | 11 +- 19 files changed, 1197 insertions(+), 74 deletions(-) create mode 100644 src/images/bg-title_3.png create mode 100644 src/images/bg1.png create mode 100644 src/images/bg2.png create mode 100644 src/images/bg3.png create mode 100644 src/images/bg4.png create mode 100755 src/images/fk_6.png create mode 100755 src/images/fk_7.png create mode 100644 src/images/pointer.png create mode 100644 src/images/state_0.png create mode 100644 src/images/state_1.png create mode 100644 src/images/state_2.png create mode 100644 src/images/state_3.png create mode 100644 src/images/table-bg_1.png diff --git a/src/config/getData2.js b/src/config/getData2.js index d0a38b7..23a71e3 100644 --- a/src/config/getData2.js +++ b/src/config/getData2.js @@ -3875,6 +3875,8 @@ export const sortingAndPackaging = () => post('api/cockpit/sortingAndPackaging', // } /** - * 新版大屏首页左侧报表 + * 新版大屏首页 */ export const homepageDataLeft = () => post('api/dashboard/homepageDataLeft', {}) +export const homepageDataRight = () => post('api/dashboard/homepageDataRight', {}) +export const homepageEquipment = () => post('api/dashboard/homepageEquipment', {}) diff --git a/src/config/mork2.js b/src/config/mork2.js index b65fdfa..96c1ab2 100644 --- a/src/config/mork2.js +++ b/src/config/mork2.js @@ -252,6 +252,20 @@ export const homepageDataLeft = () => { 'materialName': '物料五', // 数量 'qty': 100 + }, + { + // 物料编码 + 'materialCode': 'GBMCZ3027L323217GM003ZX22-30', + 'materialName': '物料6', + // 数量 + 'qty': 100 + }, + { + // 物料编码 + 'materialCode': 'GBMCZ3027L323217GM003ZX22-30', + 'materialName': '物料7', + // 数量 + 'qty': 100 } ] } @@ -263,18 +277,10 @@ export const homepageDataLeft = () => { */ export const homepageDataRight = () => { let res = { - 'capacityRate': { - 'mix': 65.1543659, - 'press': 75.12341242, - 'dry': 55.13421, - 'sort': 70.124352521 - }, + 'capacityRate': [{'device_name': '混料设备', 'numerical': '60'}, {'device_name': '压制设备', 'numerical': '60'}, {'device_name': '压制设备2', 'numerical': '60'}, {'device_name': '压制设备3', 'numerical': '60'}], 'stateStatistics': { - 'count': 110, - 'running': 50, - 'pausing': 30, - 'shutdown': 20, - 'inTrouble': 10 + count: '20', + fourState: [{'status': '5', 'stateName': '正常运行'}, {'status': '5', 'stateName': '暂未生产'}, {'status': '5', 'stateName': '空闲设备'}, {'status': '5', 'stateName': '故障设备'}] }, 'areaDeviceStatus': { 'mix': { @@ -349,7 +355,51 @@ export const homepageDataRight = () => { 'process': '压制', 'deviceCode': 'YJ01', 'deviceName': '压机1', - 'status': '运行', + 'status': '0', + 'workOrder': 'GD0001', + 'bom': '1001C1', + 'material': 'ZLMCZ1001C122211GM001BD20-8', + 'qty': '1000块', + 'startTime': '2023-11-20 14:32:32' + }, + { + 'process': '压制', + 'deviceCode': 'YJ01', + 'deviceName': '压机1', + 'status': '0', + 'workOrder': 'GD0001', + 'bom': '1001C1', + 'material': 'ZLMCZ1001C122211GM001BD20-8', + 'qty': '1000块', + 'startTime': '2023-11-20 14:32:32' + }, + { + 'process': '压制', + 'deviceCode': 'YJ01', + 'deviceName': '压机1', + 'status': '1', + 'workOrder': 'GD0001', + 'bom': '1001C1', + 'material': 'ZLMCZ1001C122211GM001BD20-8', + 'qty': '1000块', + 'startTime': '2023-11-20 14:32:32' + }, + { + 'process': '压制', + 'deviceCode': 'YJ01', + 'deviceName': '压机1', + 'status': '1', + 'workOrder': 'GD0001', + 'bom': '1001C1', + 'material': 'ZLMCZ1001C122211GM001BD20-8', + 'qty': '1000块', + 'startTime': '2023-11-20 14:32:32' + }, + { + 'process': '压制', + 'deviceCode': 'YJ01', + 'deviceName': '压机1', + 'status': '1', 'workOrder': 'GD0001', 'bom': '1001C1', 'material': 'ZLMCZ1001C122211GM001BD20-8', @@ -360,3 +410,11 @@ export const homepageDataRight = () => { } return res } + +/** + * 大屏首页设备 + */ +export const homepageEquipment = () => { + let res = {'productReport': [{'number': '192块', 'create_time': '2023-11-18 13:33:52', 'material_code': 'GBMAC3019C123270GM005BB20-30'}, {'number': '324块', 'create_time': '2023-11-11 15:45:02', 'material_code': 'GBMAC3003C123268GM002BB19-8'}, {'number': '240块', 'create_time': '2023-11-11 13:19:43', 'material_code': 'GBMAC3038C223271GM016BB25-30'}, {'number': '324块', 'create_time': '2023-11-11 10:58:42', 'material_code': 'GBMAC3003C123268GM002BB19-8'}, {'number': '240块', 'create_time': '2023-11-08 09:19:05', 'material_code': 'GBMCZ3059L323288GM029ZJTH21-10'}, {'number': '126块', 'create_time': '2023-11-06 16:04:40', 'material_code': 'GBMCZ3053M223268GM002ZJTH-201'}, {'number': '270块', 'create_time': '2023-11-06 15:41:37', 'material_code': 'GBMCZ3053M223268GM002ZJTH-201'}, {'number': '270块', 'create_time': '2023-11-06 14:57:32', 'material_code': 'GBMCZ3053M223268GM002ZJTH-201'}, {'number': '270块', 'create_time': '2023-11-06 14:12:48', 'material_code': 'GBMCZ3053M223268GM002ZJTH-201'}, {'number': '270块', 'create_time': '2023-11-06 13:28:01', 'material_code': 'GBMCZ3053M223268GM002ZJTH-201'}, {'number': '270块', 'create_time': '2023-11-06 12:41:13', 'material_code': 'GBMCZ3053M223268GM002ZJTH-201'}, {'number': '270块', 'create_time': '2023-11-06 11:03:33', 'material_code': 'GBMCZ3053M223268GM002ZJTH-201'}, {'number': '270块', 'create_time': '2023-11-06 10:16:51', 'material_code': 'GBMCZ3053M223268GM002ZJTH-201'}, {'number': '246块', 'create_time': '2023-11-04 15:44:12', 'material_code': 'GBMCZ3053M223268GM002ZJTH-201'}, {'number': '210块', 'create_time': '2023-11-04 13:09:49', 'material_code': 'GBMCZ3053M223268GM002ZJTH-201'}, {'number': '210块', 'create_time': '2023-11-04 12:35:26', 'material_code': 'GBMCZ3053M223268GM002ZJTH-201'}, {'number': '210块', 'create_time': '2023-11-04 11:11:36', 'material_code': 'GBMCZ3053M223268GM002ZJTH-201'}, {'number': '240块', 'create_time': '2023-11-04 10:36:37', 'material_code': 'GBMCZ3059L323288GM029ZJTH21-10'}, {'number': '210块', 'create_time': '2023-11-04 10:35:52', 'material_code': 'GBMCZ3053M223268GM002ZJTH-201'}, {'number': '210块', 'create_time': '2023-11-04 10:09:29', 'material_code': 'GBMCZ3053M223268GM002ZJTH-201'}], 'deviceReport': [{'failure_info': '99', 'device_code': 'FJMDJXS01', 'failure_time': '2023-11-27 09:33:21'}, {'failure_info': '1', 'device_code': 'MDJXS01', 'failure_time': '2023-11-25 16:02:40'}, {'failure_info': '-', 'device_code': 'MDJXS02', 'failure_time': '2023-11-25 14:02:22'}, {'failure_info': '1', 'device_code': 'BZJ01', 'failure_time': '2023-11-25 08:01:38'}, {'failure_info': '-', 'device_code': 'JYHJ01', 'failure_time': '2023-11-22 13:24:07'}, {'failure_info': '-', 'device_code': 'CPJ01', 'failure_time': '2023-11-20 11:03:01'}, {'failure_info': '-', 'device_code': 'RGV01', 'failure_time': '2023-11-17 13:59:38'}, {'failure_info': '-', 'device_code': 'MDJXS03', 'failure_time': '2023-11-15 15:02:08'}, {'failure_info': '-', 'device_code': 'MDJXS04', 'failure_time': '2023-11-03 07:37:52'}, {'failure_info': '-', 'device_code': 'CYHJ01', 'failure_time': '2023-10-25 11:47:21'}]} + return res +} diff --git a/src/images/bg-title_3.png b/src/images/bg-title_3.png new file mode 100644 index 0000000000000000000000000000000000000000..d74e26abf496f07e52a2d6f1a434c1bfacb1712f GIT binary patch literal 6016 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 literal 0 HcmV?d00001 diff --git a/src/images/bg4.png b/src/images/bg4.png new file mode 100644 index 0000000000000000000000000000000000000000..bf04d8b6e8dc7137b7ad104476e38761c945c1f9 GIT binary patch literal 166 zcmeAS@N?(olHy`uVBq!ia0vp^Wt$=-9(9bUP3-TOpVzpZObRI2u}to6A%1scJqv0UKY?U N22WQ%mvv4FO#lR~Iwt@C literal 0 HcmV?d00001 diff --git a/src/images/fk_6.png b/src/images/fk_6.png new file mode 100755 index 0000000000000000000000000000000000000000..1ef1c8ee81c2d51d157f9882b184460cdfe0fc40 GIT binary patch literal 1209 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%xak-5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8+HtGS7@qp>keuSMv>2~2MaLa!N4y`bcfTL84#CABECEH%ZgC_h&L>}RV? z+-@<(X&zK>3U0TU;MA)Rbc{YIW|3kVCIn1AASOKN0y*%+pPC0u@kPL-9WvEOhk=1n z)6>N#VpV;#6Ms}zKFRuWjn%4nFkGf?pml}4cYMfwk-JGa&MnObX zHFdvXjO4nFc^;*jx1`+;yRW@6SxQ6WsCnDkh2|xq7ta|?I2F9xD|c(arnk>;FIV{J zcg|(n7o!)qnYUKCEV&jFSl{{NcUWJ#ZBg`of$1lVU!_=D&59S<6(_f2okEZj=b9Jy z1y9bk*|YS+o+n?o-u$-X(b5}=*H8L&3C)Q*V>U&5-;sp$^&c*E%zEOla`>6BjP%3F z_j!Ky-QnDNbMhRGfYpx=2}^c*Y?0b>yUy*=Ece+vO~a2anXkQX;u+&d{@Q{U=i6=5 bXJlje_Pu-Rm4&ZML4}E@tDnm{r-UW|l#;9} literal 0 HcmV?d00001 diff --git a/src/images/fk_7.png b/src/images/fk_7.png new file mode 100755 index 0000000000000000000000000000000000000000..98be382fec876fc01b0cfc1f84abb55bfecbe2dd GIT binary patch literal 1192 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 literal 0 HcmV?d00001 diff --git a/src/images/state_1.png b/src/images/state_1.png new file mode 100644 index 0000000000000000000000000000000000000000..42b3465d717ac4d0b5772ae2057b91b3b76c97c2 GIT binary patch literal 459 zcmV;+0W|)JP)Px$g-Jv~R5(wyl)rAT#mdWe)tajL%5h3jqU>oD-gCIEI`Px$oJmAMR5(wylrd}FFc8OeC&_-QUt&y~LPN7WN*52AO4qLa0RBGuJbfRaYuD1L zgO^g?l9E8uVw^ljPu59S>=5Wu=-?iR`y(B{V0+ZJw4YIuEg37t8e z?;ovlm;CMSluvG2uA7>zuspwknEgXA3uv|tR+|bh${f#nFO^Z)XA<>ZqLF@%b1~%;Q<_Q@88Vw%Mi$I&o*1sB8K1xR=)l(nX(T%AgvvgW`}R1i(43<^&pJ zHm-mC+A8{2TTgIN}0?wPZ%lZaxlgK5O9nm zYIPuDM+Cll2EP1W2K&xNux#=3$6xxzX2^oiOfFP`pw~%Jfk_(x%2NV00TG#)l}{KP zk{S|+y%#j-d~{d4Vto7lX@KTKBa1hMHh0DZR)tjJSg>sWY{XwR#5$6=)j)$ga&GuC zJOHarl^>!uT8lM2QKcmK`Y*t!_?+*l4?*l#GPrKn`Tql4wB*H`viR66KiG?Zy@i*< YZ}j$=eBv%fD*ylh07*qoM6N<$g5z`B+5i9m literal 0 HcmV?d00001 diff --git a/src/images/state_3.png b/src/images/state_3.png new file mode 100644 index 0000000000000000000000000000000000000000..03c2480f742c3b6623be247b190258552551ecf0 GIT binary patch literal 461 zcmV;;0W$uHP)Px$hemz* zfdcW;TDZ(5Hpeb!z!fr?CI>O5fJ*?Mn^*OHg`-HQz zgr-T@Y!ccwycPf~D`7^PI{12~F0f=v>sQieVh%5Q1Jl zJw>e75x2MT6{UCV0gxJyPg!Q&;gHouVVtUAK*)QZ!59I}MZ#emLtfXX-=~v50D1-J zgiheijr?dDTX~<`7<13O5|JVR8LL_XWC8(=BHjQeRUK`NN6+kfYu(qb^SHZHN^Q%J z_xJX*wV8^niV(`kT!}~-fmKW?C&0{LU?RuBQB?55bVuL-;*K(`3^ylygI>2_&2x%R@00000NkvXXu0mjf DThG?) literal 0 HcmV?d00001 diff --git a/src/images/table-bg_1.png b/src/images/table-bg_1.png new file mode 100644 index 0000000000000000000000000000000000000000..4d28ce0929b4ad19cb2c00c7a78f48ed743616d5 GIT binary patch literal 13684 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 import { homepageDataLeft } from '@js/mork2.js' +// import { homepageDataLeft } from '@js/getData2.js' import symbol1 from '@img/symbol_1.png' import symbol2 from '@img/symbol_2.png' import symbol3 from '@img/symbol_3.png' @@ -665,7 +666,7 @@ export default { }) }) let option = { - color: ['#1980EA', '#67D470', '#B4C9EF', '#BCBF5C', '#EF5252'], + color: ['#1980EA', '#67D470', '#B4C9EF', '#BCBF5C', '#EF5252', '#6d5edd', '#bf41bb'], grid: { top: 0, left: 0, @@ -737,17 +738,19 @@ export default { imgSrc2: symbol4, imgSrc3: lineSelected } + let total = 0 + this.history.map(el => { + total = Math.max(total, Number(el.press), Number(el.sort)) + }) let barName = [] let barData1 = [] let barData2 = [] + let totalDate = [] this.history.map(el => { barName.push(el.date) barData1.push(el.press) barData2.push(el.sort) - }) - let total = 0 - this.history.map(el => { - total = Math.max(total, Number(el.press), Number(el.sort)) + totalDate.push(total) }) let option = { grid: { @@ -773,10 +776,10 @@ export default { y2: 1, colorStops: [{ offset: 0, - color: 'rgba(254,254,254,0)' + color: 'rgba(254,254,254,0.1)' }, { offset: 1, - color: 'rgba(254,254,254,0)' + color: 'rgba(254,254,254,0.8)' }], global: false } @@ -926,38 +929,41 @@ export default { data: barData2 }, { - // name: '阴影', - // type: 'bar', - // barWidth: '38px', - // itemStyle: { - // normal: { - // color: { - // type: 'linear', - // x: 0, - // y: 0, - // x2: 0, - // y2: 1, - // colorStops: [ - // { - // offset: 0.1, - // color: 'rgba(254,254,254,0.1)' - // }, - // { - // offset: 1, - // color: 'rgba(254,254,254,0.1)' - // } - // ] - // } - // } - // }, - // data: [total], - // z: -1 name: '阴影', - type: 'pictorialBar', + type: 'bar', barWidth: '38px', - symbol: 'image://' + img.imgSrc3, - data: [total], + itemStyle: { + normal: { + color: { + type: 'linear', + x: 0, + y: 0, + x2: 0, + y2: 1, + colorStops: [ + { + offset: 0.1, + color: 'rgba(254,254,254,0.1)' + }, + { + offset: 1, + color: 'rgba(254,254,254,0.1)' + } + ] + } + } + }, + data: totalDate, z: -1 + // name: '阴影', + // type: 'pictorialBar', + // barWidth: '38px', + // symbol: 'image://' + img.imgSrc3, + // data: totalDate, + // itemStyle: { + // opacity: itemOpacity + // }, + // z: -1 } ] } @@ -988,8 +994,8 @@ export default { .left_wraper _wh(100%, 100%) .item_wraper - _wh(100%, calc((100% - 50px) / 3)) - margin-bottom 25px + _wh(100%, calc((100% - 40px) / 3)) + margin-bottom 20px &:last-child margin-bottom 0 .title_wraper @@ -1049,11 +1055,10 @@ export default { .pie_legend _wh(calc(100% - 195px), 100%) margin-left 195px - // _fj(row, flex-start) - // flex-wrap: wrap + _fj(, center) .pie_legend_item width 100% - padding 0 0px 5px 20px + padding 0 0px 2px 20px .pie_legend_item_bg_1 background top left / 18px auto url('../../../../images/fk_1.png') no-repeat .pie_legend_item_bg_2 @@ -1064,18 +1069,22 @@ export default { background top left / 18px auto url('../../../../images/fk_4.png') no-repeat .pie_legend_item_bg_5 background top left / 18px auto url('../../../../images/fk_5.png') no-repeat +.pie_legend_item_bg_6 + background top left / 18px auto url('../../../../images/fk_6.png') no-repeat +.pie_legend_item_bg_7 + background top left / 18px auto url('../../../../images/fk_7.png') no-repeat .pie_legend_txt_1 font-size: 12px; - line-height: 18px + line-height: 14px font-family: 'SourceHanSansCN-Regular'; color: #9BB9DD; word-wrap: break-word; .pie_legend_txt_wraper - _wh(100%, 20px) + _wh(100%, 18px) _fj(row) .pie_legend_txt_2 - font-size 20px - line-height: 20px + font-size 18px + line-height: 18px font-family: 'YouSheBiaoTiHei' color: transparent; background: linear-gradient(0deg, #E5F2FC 0%, #CDEAFC 53.3154296875%, #A0DBFC 100%); @@ -1083,8 +1092,8 @@ export default { -webkit-background-clip: text; background-clip: text; .pie_legend_txt_3 - font-size: 16px; - line-height: 20px + font-size: 14px; + line-height: 18px font-family: 'SourceHanSansCN-Regular'; color: #9BB9DD; opacity: 0.5; diff --git a/src/pages/modules/home/right/left.vue b/src/pages/modules/home/right/left.vue index de06441..cdc450e 100644 --- a/src/pages/modules/home/right/left.vue +++ b/src/pages/modules/home/right/left.vue @@ -1,10 +1,176 @@ + + diff --git a/src/pages/modules/home/right/right.vue b/src/pages/modules/home/right/right.vue index 765ace7..c932b65 100644 --- a/src/pages/modules/home/right/right.vue +++ b/src/pages/modules/home/right/right.vue @@ -15,9 +15,20 @@

设备运行统计

-
-
+
+
+
+
+
+
+
+

{{ e.stateName }}

+
+

{{ e.status }}

+

{{ e.rate }}

+
+
@@ -29,7 +40,7 @@
-
+
@@ -37,9 +48,9 @@

30天故障-TOP10

-
+
-
+
@@ -49,27 +60,86 @@

设备工单生产

+
+
    +
  • 工序
    • +
  • 设备号
    • +
  • 设备名称
    • +
  • 状态
    • +
  • 生产工单
    • +
  • BOM号
    • +
  • 物料
    • +
  • 数量
    • +
  • 开始时间
    • +
+
+ +
    +
  • +
    {{e.process}}
    +
    {{e.deviceCode}}
    +
    {{e.deviceName}}
    +
    + +

    {{['关机', '待机', '生产中', '故障'][Number(e.status)]}}

    +
    +
    {{e.workOrder}}
    +
    {{e.bom}}
    +
    {{e.material}}
    +
    {{e.qty}}
    +
    {{e.startTime}}
    +
    • +
+ +
+