diff --git a/.babelrc b/.babelrc index 142a0ab..441847f 100644 --- a/.babelrc +++ b/.babelrc @@ -1,6 +1,8 @@ { "presets": [ - ["env", { + ["es2015", { "modules": false }], + [ + "env", { "modules": false, "targets": { "browsers": ["> 1%", "last 2 versions", "not ie <= 8"] @@ -11,9 +13,12 @@ "plugins": [ "transform-vue-jsx", "transform-runtime", - ["import", { - "libraryName": "vant", - "libraryDirectory": "es", - "style": true - }]] -} + [ + "component", + { + "libraryName": "element-ui", + "styleLibraryName": "theme-chalk" + } + ] + ] +} \ No newline at end of file diff --git a/package.json b/package.json index e64ac2f..8c87777 100644 --- a/package.json +++ b/package.json @@ -12,8 +12,11 @@ }, "dependencies": { "axios": "^0.18.0", + "babel-plugin-component": "^1.1.1", "babel-polyfill": "^6.26.0", + "babel-preset-es2015": "^6.24.1", "echarts": "^5.1.1", + "element-ui": "^2.15.14", "stylus": "^0.54.5", "stylus-loader": "^3.0.2", "vue": "^2.5.2", diff --git a/src/config/mork2.js b/src/config/mork2.js index 1bd2559..8a163d6 100644 --- a/src/config/mork2.js +++ b/src/config/mork2.js @@ -12,7 +12,7 @@ export const homepageDataLeft = () => { // 需生产 'plan': 14, // 已生产 - 'real': 16 + 'real': 17 }, { // 物料编码 @@ -28,7 +28,7 @@ export const homepageDataLeft = () => { 'materialCode': 'GBMCZ3027L323217GM003ZX22-30', 'materialName': '物料三', // 需生产 - 'plan': 14, + 'plan': 20, // 已生产 'real': 16 }, @@ -52,8 +52,8 @@ export const homepageDataLeft = () => { }, { // 物料编码 - 'materialCode': 'GBMCZ3027L323217GM003ZX22-30', - 'materialName': '物料六', + 'materialCode': 'GBMCZ3027L323217GM003ZX22-31', + 'materialName': '物料6', // 需生产 'plan': 14, // 已生产 @@ -61,8 +61,8 @@ export const homepageDataLeft = () => { }, { // 物料编码 - 'materialCode': 'GBMCZ3027L323217GM003ZX22-30', - 'materialName': '物料七', + 'materialCode': 'GBMCZ3027L323217GM003ZX22-32', + 'materialName': '物料7', // 需生产 'plan': 14, // 已生产 @@ -71,6 +71,66 @@ export const homepageDataLeft = () => { ], // 当日成品 最多7个元素 'todaySort': [ + { + // 物料编码 + 'materialCode': 'GBMCZ3027L323217GM003ZX22-30', + // 需生产 + 'plan': 10, + // 已压制 + 'press': 20, + // 已完成 + 'real': 30 + }, + { + // 物料编码 + 'materialCode': 'GBMCZ3027L323217GM003ZX22-30', + // 需生产 + 'plan': 10, + // 已压制 + 'press': 20, + // 已完成 + 'real': 30 + }, + { + // 物料编码 + 'materialCode': 'GBMCZ3027L323217GM003ZX22-30', + // 需生产 + 'plan': 10, + // 已压制 + 'press': 20, + // 已完成 + 'real': 30 + }, + { + // 物料编码 + 'materialCode': 'GBMCZ3027L323217GM003ZX22-30', + // 需生产 + 'plan': 10, + // 已压制 + 'press': 20, + // 已完成 + 'real': 30 + }, + { + // 物料编码 + 'materialCode': 'GBMCZ3027L323217GM003ZX22-30', + // 需生产 + 'plan': 10, + // 已压制 + 'press': 20, + // 已完成 + 'real': 30 + }, + { + // 物料编码 + 'materialCode': 'GBMCZ3027L323217GM003ZX22-30', + // 需生产 + 'plan': 10, + // 已压制 + 'press': 20, + // 已完成 + 'real': 30 + }, { // 物料编码 'materialCode': 'GBMCZ3027L323217GM003ZX22-30', @@ -113,7 +173,7 @@ export const homepageDataLeft = () => { 'plan': 0.0 }, // 信息 - 'message': '今日共需生产8400块,物料种类2种,已完成包装11托,共900块,1个物料,完成率25%。' + 'message': '今日共需生产8400块,物料种类2种,已完成包装11托,共900块,1个物料,完成率25%。' }, // 历史分析 固定7个元素 'history': [ diff --git a/src/images/bg-m_2.png b/src/images/bg-m_2.png new file mode 100644 index 0000000..81b5cdf Binary files /dev/null and b/src/images/bg-m_2.png differ diff --git a/src/images/bg-title_2.png b/src/images/bg-title_2.png new file mode 100644 index 0000000..6796ac9 Binary files /dev/null and b/src/images/bg-title_2.png differ diff --git a/src/images/fk_1.png b/src/images/fk_1.png new file mode 100644 index 0000000..18e2657 Binary files /dev/null and b/src/images/fk_1.png differ diff --git a/src/images/fk_2.png b/src/images/fk_2.png new file mode 100644 index 0000000..7cf0bde Binary files /dev/null and b/src/images/fk_2.png differ diff --git a/src/images/fk_3.png b/src/images/fk_3.png new file mode 100644 index 0000000..4bc510f Binary files /dev/null and b/src/images/fk_3.png differ diff --git a/src/images/fk_4.png b/src/images/fk_4.png new file mode 100644 index 0000000..d415780 Binary files /dev/null and b/src/images/fk_4.png differ diff --git a/src/images/fk_5.png b/src/images/fk_5.png new file mode 100644 index 0000000..091b7b6 Binary files /dev/null and b/src/images/fk_5.png differ diff --git a/src/images/gl-bg_1.png b/src/images/gl-bg_1.png new file mode 100644 index 0000000..b214fa7 Binary files /dev/null and b/src/images/gl-bg_1.png differ diff --git a/src/images/gl-bg_2.png b/src/images/gl-bg_2.png new file mode 100644 index 0000000..acd54aa Binary files /dev/null and b/src/images/gl-bg_2.png differ diff --git a/src/images/gl-bg_3.png b/src/images/gl-bg_3.png new file mode 100644 index 0000000..1d84749 Binary files /dev/null and b/src/images/gl-bg_3.png differ diff --git a/src/images/light_1.png b/src/images/light_1.png new file mode 100644 index 0000000..4bd2887 Binary files /dev/null and b/src/images/light_1.png differ diff --git a/src/images/message-bg.png b/src/images/message-bg.png new file mode 100644 index 0000000..23e2d5e Binary files /dev/null and b/src/images/message-bg.png differ diff --git a/src/images/pie-bg_1.png b/src/images/pie-bg_1.png new file mode 100644 index 0000000..6017ef6 Binary files /dev/null and b/src/images/pie-bg_1.png differ diff --git a/src/images/pie-bg_2.png b/src/images/pie-bg_2.png new file mode 100644 index 0000000..0fee0f6 Binary files /dev/null and b/src/images/pie-bg_2.png differ diff --git a/src/images/pie_1.png b/src/images/pie_1.png new file mode 100644 index 0000000..d50866d Binary files /dev/null and b/src/images/pie_1.png differ diff --git a/src/images/symbol_1.png b/src/images/symbol_1.png new file mode 100644 index 0000000..b381662 Binary files /dev/null and b/src/images/symbol_1.png differ diff --git a/src/images/symbol_2.png b/src/images/symbol_2.png new file mode 100644 index 0000000..11cc95d Binary files /dev/null and b/src/images/symbol_2.png differ diff --git a/src/pages/modules/home/left/index.vue b/src/pages/modules/home/left/index.vue index bef6143..6c3dfd5 100644 --- a/src/pages/modules/home/left/index.vue +++ b/src/pages/modules/home/left/index.vue @@ -11,6 +11,9 @@
库存量监控
{{ e.materialCode }}
+{{ e.qty }}
+{{ e.rate }}
+