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 0000000..bd8c359 Binary files /dev/null and b/src/style/iconfont2/iconfont.ttf differ diff --git a/src/style/iconfont2/iconfont.woff b/src/style/iconfont2/iconfont.woff new file mode 100644 index 0000000..45f7c78 Binary files /dev/null and b/src/style/iconfont2/iconfont.woff differ diff --git a/src/style/iconfont2/iconfont.woff2 b/src/style/iconfont2/iconfont.woff2 new file mode 100644 index 0000000..18d103a Binary files /dev/null and b/src/style/iconfont2/iconfont.woff2 differ