From 671dd5350518557acb385ead1dad1a65905abe7d Mon Sep 17 00:00:00 2001 From: xiangxy Date: Thu, 4 Dec 2025 17:14:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E4=B8=A4=E4=BE=A7=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 +- src/config/mork2.js | 211 +++++- src/pages/Setup2.vue | 166 +++++ src/pages/modules/home/index.vue | 994 +++++++++++++++++++++++------ src/style/iconfont.styl | 21 +- src/style/iconfont2/iconfont.ttf | Bin 0 -> 1932 bytes src/style/iconfont2/iconfont.woff | Bin 0 -> 1288 bytes src/style/iconfont2/iconfont.woff2 | Bin 0 -> 920 bytes 8 files changed, 1206 insertions(+), 189 deletions(-) create mode 100644 src/pages/Setup2.vue create mode 100644 src/style/iconfont2/iconfont.ttf create mode 100644 src/style/iconfont2/iconfont.woff create mode 100644 src/style/iconfont2/iconfont.woff2 diff --git a/README.md b/README.md index 40b3a2a..ad48946 100644 --- a/README.md +++ b/README.md @@ -21,4 +21,5 @@ npm run build --report For a detailed explanation on how things work, check out the [guide](http://vuejs-templates.github.io/webpack/) and [docs for vue-loader](http://vuejs.github.io/vue-loader). # 注意事项 -+ 华祥大屏分辨率都为 1920 * 1080 \ No newline at end of file ++ 华祥大屏分辨率都为 1920 * 1080 ++ 用到iconfont2-x:用电量，用气量 diff --git a/src/config/mork2.js b/src/config/mork2.js index 5e418f5..f4da880 100644 --- a/src/config/mork2.js +++ b/src/config/mork2.js @@ -486,7 +486,43 @@ export const deviceCondition = () => { */ export const screenTableData = () => { let res = { - "mixingList": [], + "devicekwhList": [ + { + "device_code": "设备名称1", + "today_kwh": "12", + "month_kwh": "300" + } + ], + "devicekqiList": [ + { + "device_code": "设备名称1", + "today_qi": "15", + "month_qi": "450" + } + ], + "todayproductList": [ + { + "customer": "收货单位1", + "material_name": "产品名称1", + "material_model": "规格型号", + "material_qty": "1000", + "product_time": "2025-11-27" + } + ], + "mixingList": [ + { + "start_point_code": "混碾机1", + "material_code": "配方号1", + "finish_point_code": "压机1", + "weight": "1000" + }, + { + "start_point_code": "混碾机2", + "material_code": "配方号2", + "finish_point_code": "压机2", + "weight": "1500" + } + ], "historyList": [ { "produceDate": "09-21", @@ -524,47 +560,206 @@ export const screenTableData = () => { "finishedNum": "16.4" } ], + "historymonthList": [ + { + "produceDate": "09-21", + "suppressedNum": "8.4", + "finishedNum": "7.9" + }, + { + "produceDate": "09-22", + "suppressedNum": "8.9", + "finishedNum": "9.9" + }, + { + "produceDate": "09-23", + "suppressedNum": "10.4", + "finishedNum": "11" + }, + { + "produceDate": "09-24", + "suppressedNum": "9.5", + "finishedNum": "12.3" + }, + { + "produceDate": "09-25", + "suppressedNum": "13.4", + "finishedNum": "11.9" + }, + { + "produceDate": "09-26", + "suppressedNum": "10.2", + "finishedNum": "14.6" + }, + { + "produceDate": "09-27", + "suppressedNum": "18.4", + "finishedNum": "16.4" + }, + { + "produceDate": "09-28", + "suppressedNum": "8.4", + "finishedNum": "7.9" + }, + { + "produceDate": "09-29", + "suppressedNum": "8.9", + "finishedNum": "9.9" + }, + { + "produceDate": "09-30", + "suppressedNum": "10.4", + "finishedNum": "11" + }, + { + "produceDate": "10-01", + "suppressedNum": "9.5", + "finishedNum": "12.3" + }, + { + "produceDate": "10-02", + "suppressedNum": "13.4", + "finishedNum": "11.9" + }, + { + "produceDate": "10-03", + "suppressedNum": "10.2", + "finishedNum": "14.6" + }, + { + "produceDate": "10-04", + "suppressedNum": "18.4", + "finishedNum": "16.4" + }, + { + "produceDate": "10-05", + "suppressedNum": "8.4", + "finishedNum": "7.9" + }, + { + "produceDate": "10-06", + "suppressedNum": "8.9", + "finishedNum": "9.9" + }, + { + "produceDate": "10-07", + "suppressedNum": "10.4", + "finishedNum": "11" + }, + { + "produceDate": "10-08", + "suppressedNum": "9.5", + "finishedNum": "12.3" + }, + { + "produceDate": "10-09", + "suppressedNum": "13.4", + "finishedNum": "11.9" + }, + { + "produceDate": "10-10", + "suppressedNum": "10.2", + "finishedNum": "14.6" + }, + { + "produceDate": "10-11", + "suppressedNum": "18.4", + "finishedNum": "16.4" + }, + { + "produceDate": "10-12", + "suppressedNum": "8.4", + "finishedNum": "7.9" + }, + { + "produceDate": "10-13", + "suppressedNum": "8.9", + "finishedNum": "9.9" + }, + { + "produceDate": "10-14", + "suppressedNum": "10.4", + "finishedNum": "11" + }, + { + "produceDate": "10-15", + "suppressedNum": "9.5", + "finishedNum": "12.3" + }, + { + "produceDate": "10-16", + "suppressedNum": "13.4", + "finishedNum": "11.9" + }, + { + "produceDate": "10-17", + "suppressedNum": "10.2", + "finishedNum": "14.6" + }, + { + "produceDate": "10-18", + "suppressedNum": "18.4", + "finishedNum": "16.4" + }, + { + "produceDate": "10-19", + "suppressedNum": "10.2", + "finishedNum": "14.6" + }, + { + "produceDate": "10-20", + "suppressedNum": "18.4", + "finishedNum": "16.4" + } + ], "pressdayList": [ { "devicecode": "YJ09", "planqty": "0", - "realqty": "851", + "qualified_qty": "100", + "unqualified_qty": "5", "materialCode": "ML-60BT" }, { "devicecode": "YJ07", "planqty": "0", - "realqty": "120", + "qualified_qty": "140", + "unqualified_qty": "10", "materialCode": "MT-14AT" }, { "devicecode": "YJ08", "planqty": "0", - "realqty": "2", + "qualified_qty": "103", + "unqualified_qty": "2", "materialCode": "ML-60BT" }, { "devicecode": "YJ06", "planqty": "0", - "realqty": "60", + "qualified_qty": "160", + "unqualified_qty": "5", "materialCode": "MT-14AT" }, { "devicecode": "YJ05", "planqty": "0", - "realqty": "14", + "qualified_qty": "180", + "unqualified_qty": "5", "materialCode": "ML-60BT" }, { "devicecode": "YJ02", "planqty": "0", - "realqty": "0", + "qualified_qty": "100", + "unqualified_qty": "7", "materialCode": "AP-70A" }, { "devicecode": "YJ01", "planqty": "0", - "realqty": "0", + "qualified_qty": "120", + "unqualified_qty": "8", "materialCode": "MT-14AT" } ], diff --git a/src/pages/Setup2.vue b/src/pages/Setup2.vue new file mode 100644 index 0000000..2fad477 --- /dev/null +++ b/src/pages/Setup2.vue @@ -0,0 +1,166 @@ + + + + + diff --git a/src/pages/modules/home/index.vue b/src/pages/modules/home/index.vue index acbede5..b47d9e8 100644 --- a/src/pages/modules/home/index.vue +++ b/src/pages/modules/home/index.vue @@ -9,17 +9,34 @@
-

当日混料

+

当日混碾记录

-
-
-
+
+
+
    +
  • 混碾机
    • +
  • 配方号
    • +
  • 压机
    • +
  • 重量
    • +
+
+ +
    +
  • +
    {{e.start_point_code}}
    +
    {{e.material_code}}
    +
    {{e.finish_point_code}}
    +
    {{e.weight}}
    +
    • +
+ +
-

当日成品

+

当日成品

@@ -29,7 +46,7 @@
-

历史分析

+

历史分析

@@ -46,6 +63,9 @@
生产中
故障
+ +
+
@@ -77,20 +97,22 @@
-
    -
  • 设备编号
    • -
  • 物料编号
    • -
  • 计划数量
    • -
  • 实际数量
    • +
      +
    • 设备号
      • +
    • 物料号
      • +
    • 计划数
      • +
    • 合格数
      • +
    • 不合格数
    -
    +
    -
      +
      • -
        {{e.devicecode}}
        -
        {{e.materialCode}}
        -
        {{e.planqty}}
        -
        {{e.realqty}}
        +
        {{e.devicecode}}
        +
        {{e.materialCode}}
        +
        {{e.planqty}}
        +
        {{e.qualified_qty}}
        +
        {{e.unqualified_qty}}
      @@ -105,10 +127,10 @@
        -
      • 设备编号
        • -
      • 物料编号
        • -
      • 计划数量
        • -
      • 实际数量
        • +
      • 设备号
        • +
      • 物料号
        • +
      • 计划数
        • +
      • 实际数
      @@ -128,14 +150,122 @@
      + +
      + +
      + +
      +
      +

      当天入库信息

      +
      +
      +
      +
        +
      • 收货单位
        • +
      • 产品名称
        • +
      • 规格型号
        • +
      • 包装数量
        • +
      • 生产日期
        • +
      +
      + +
        +
      • +
        {{e.customer}}
        +
        {{e.material_name}}
        +
        {{e.material_model}}
        +
        {{e.material_qty}}
        +
        {{e.product_time}}
        +
        • +
      +       +
      +
      +
      +
      +
      + +
      + +
      +
      +

      月历史分析

      +
      +
      +
      +
      +
      +
      +
      +
      + +
      + +
      +
      +

      设备用电情况

      +
      +
      +
      +
        +
      • 设备名称
        • +
      • 当日用电量
        • +
      • 当月用电量
        • +
      +
      + +
        +
      • +
        {{e.device_code}}
        +
        {{e.today_kwh}}
        +
        {{e.month_kwh}}
        +
        • +
      +       +
      +
      +
      +
      +
      + +
      + +
      +
      +

      设备用气情况

      +
      +
      +
      +
        +
      • 设备名称
        • +
      • 当日用气量
        • +
      • 当月用气量
        • +
      +
      + +
        +
      • +
        {{e.device_code}}
        +
        {{e.today_qi}}
        +
        {{e.month_qi}}
        +
        • +
      +       +
      +
      +
      +
      +
      +
    diff --git a/src/style/iconfont.styl b/src/style/iconfont.styl index e9d5e14..ed12baf 100644 --- a/src/style/iconfont.styl +++ b/src/style/iconfont.styl @@ -4,6 +4,12 @@ url('iconfont/iconfont.woff') format('woff'), url('iconfont/iconfont.ttf') format('truetype'); } +@font-face { + font-family: 'iconfont2'; + src: url('iconfont2/iconfont.woff2') format('woff2'), + url('iconfont2/iconfont.woff') format('woff'), + url('iconfont2/iconfont.ttf') format('truetype'); +} @font-face { font-family: "YouSheBiaoTiHei"; src: url('font/YouSheBiaoTiHei.ttf') format('truetype'); @@ -27,7 +33,20 @@ -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } - +.iconfont2 { + font-family: "iconfont2" !important; + font-size: 16px; + font-style: normal; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} .icon-guanbi:before { content: "\e60f"; +} +.icon-elec:before { + content: "\e600"; +} +.icon-qi:before { + content: "\e805"; + color: "#f4ea2a"; } \ No newline at end of file diff --git a/src/style/iconfont2/iconfont.ttf b/src/style/iconfont2/iconfont.ttf new file mode 100644 index 0000000000000000000000000000000000000000..bd8c3597cf4ea59e0d9c8bbc7c82b242b6a2d672 GIT binary patch literal 1932 zcmd^A&u<$=6n?X_wwuIp0&e2Sgm&|zPH1B%*~CfHCM_aqTxe2C5`sknc;l=cr)#g- zY^sKnB@hCERJg(g2?+^Ka0GGSmIDYOeh3Lw6$dCqAPyiTE{XYOJ*HLK|A1M|%=f9!QbFA`>S=+JbGwLsY%P-$+Ar zhLoAvxg`o&hFhYj*o4_o)Bwc0C=WYO%w1R6%6ypzSvoYkRxn-q%W34*jd)*7dav$$(pM@5@LZ6`$p~W zjE0(%Bk7fISJER%9@Ck6dLf{OJDY>5qNYy{b%cG2!aDRu7FoS`AwI}hLonEKG@6R3 z+^5_Z8IJI9TU?)4TcWN0U`MyAj3)XoD-osbcuY^kH&@f6V`HP~mCKh>Yqr|FI@PPi z$A@Mf%0!i}Gsz35=LQ~~))q2*pR+`K?&3;McW-aJ=g5QnSZ2aJzp8g=PtQL!J{3|I zpXlw^6O%I!Z^uvQC@_E9_iBC#L*p2Ur`%$g-` zq8Q6gJEq~9>)P6mR><0=oLzG3^MaY*whX6k*5_r@*(%s2Z8$Mhr&4Cgbn0oguH<#s z&1pHuE^4#LXIhr6l^uK2%({sU*DaqK92DyaK9RMHG))efcuBe#*GZ!_+QC?$EZJ0| zoHx36*$YtTX`3uWI(K;wMlVC{&=zzer-r|M0DZ%-9ckze zG8KVl<^D|U!~)jv0}9_J@?@b-(1sUPrc*SCr+%KgKH;4cpR4*eLwq0Z)i_faXDT)C X*roh>!6;ei`Owa`DTwC_o=NmC;aCt) literal 0 HcmV?d00001 diff --git a/src/style/iconfont2/iconfont.woff b/src/style/iconfont2/iconfont.woff new file mode 100644 index 0000000000000000000000000000000000000000..45f7c7849aa07386c812cd10ae43f55a3ef70a6e GIT binary patch literal 1288 zcmY+Cc~DbV7{%{P2#Js&8nq5?ID)cBHWUX9mQ9EY1}f1Jq`bVagpmZ0ph+8r7{V@- zNEq3Q1RXR|V-!Sjp&^JGS+r;s#3G;~xG*D>7A#YG)7n3JXMXQ~-C`e#hNIXF)9(_Eu2#;vK&TMEq2!_RAqI!~uM^P$ZE; z4SE6DiuIG6BCz`4Ily`!5?BN-i1k{p~9lzBL?b_;<6tZVsvw8~_9U@|?iNOBYk-Ks$EmIMa&8WgaMEN_&6BpKYv z#A@a(G+sRY(quBpa}f@UQR{}`fWU#AD6RUa?x18b$U(6^4-qDbXghpo`h0Yw*e)6! zYcD7%QQ%zC3dn~AyJB{DP25=`D?aV9X;xP{FqCeQ)DIaVX0G024|F9)7xpE4+RH)V zRthGqaxLoEZ4O_W{V=mzN2yyB<|T4^9Tk16(d;e~IWjdilv8eNpZC%(r}_Tk+EO`t$R9ZPH0PivjGuM|3FV@O-FXM#R&Y=&A$bu zy$Iul2M=zWt~*h?cI3diqGPp>((+rg4%e|u3w#xrQ?(DzUCBJ3Y_FBF8h3*$$JO+M zc;!j*KtzY|@eTC$$$okKU;-Z~&b3feR*%k6){{Fa{xl+<%2@=$4ECx2WB}&J z`fnZE%mC+qQiCjJ;6dm-T(S)e*?+(iShM8y;hhhM6v=Fk%(sd&1S zD!wAP>rkE9{-f#$fBv;;N5i1)X*2I#taX<4)RS-XC#VfnjkBWCk2W^fQZvIl)w4)% zNy3X9q|duLj5-k|an#0R;d+LBSEn!+-nz zZ=acY_q#PQYkzgos3?$W6soRE3&eZyAidSS1@JETeEf%u z@CHdO1K;K7NwppxeueKIc&8gc{t8AV!0?0`GUhkti0fwO6&xk!Va-)Kf(t7}NRvj~ zZUTiEsxANV5>Wv!Zw1qkO8f#P5d862A%P64DE$=pfVtjnL#i@Tw-^F?%>KjSH`kn{ zM__07xZwASlRTOb?n1s#$7uYj^NWrN#}Eo1YkSyrvFk{8_o@lO*d#*lV@XK~N7tSj z-||bGKz+J*u7VrF0Vm=t|6e*3IGv#xb%O}YfOLe94LTQXDcKL3m>qeo)XMY`>8RKqIL7>DYh z;!S$H&v0Z`KQu2itXb2T(hPlR*Oe>3za6cK?;uOaa6Zxp*GBdumFjv!o5F?X@l64Q z1a`!<{Shy1i^G*knS5@uDIG=t>ac)!2I;YcM}E(5oP0d|`6j67U!xxZ_}RQ~1_E^i zx;r$Uw=?(|`hkwbLPF$HrKl=_>~3H@p;<(z$GzPah8uc1mlGQGBuE;JAZs*A6>b(a zEml!!bbw}as#mw@;ebW)0VeH12%SzLY4-_Prx#S=CQ;Mx8!DatquE6SY}aBknxI17897}GD3u=r=;aGwamt}F=n{ds~MatRMG5KTH~C? zEEYR;Xm%5md5VE^M?q?;QuUG)*=~hO8b-n~deo>*C?lDjjbg|=`+Xf4)jAduts^BQ zH7-WbPNhqc)`6LNGZAI01gBS}7JIYZ#$b^w`DGUSR4h2#L uN$ILfS>9lMd$QXB-yw$%VML(qwcV!bjgrlx5^CV4bu4Fd8eJ;@0001JXPl7$ literal 0 HcmV?d00001