diff --git a/package.json b/package.json index 0b90b1d..6036dad 100644 --- a/package.json +++ b/package.json @@ -6,6 +6,7 @@ "license": "MIT", "scripts": { "###": "高版本node请使用如下配置启动 SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve", + "run": "vue-cli-service serve", "dev": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve", "build:prod": "vue-cli-service build", "build:stage": "vue-cli-service build --mode staging", @@ -35,9 +36,10 @@ "dependencies": { "@jiaminghi/data-view": "^2.10.0", "@riophae/vue-treeselect": "0.4.0", + "@tweenjs/tween.js": "23.1.3", "axios": "0.24.0", "clipboard": "2.0.8", - "core-js": "3.25.3", + "core-js": "^3.38.1", "echarts": "5.4.0", "echarts-gl": "^2.0.9", "element-ui": "2.15.12", @@ -46,12 +48,14 @@ "highlight.js": "9.18.5", "js-beautify": "1.13.0", "js-cookie": "3.0.1", + "jsbarcode": "^3.11.6", "jsencrypt": "3.0.0-rc.1", "less": "^3.9.0", "less-loader": "^5.0.0", "moment": "^2.29.4", "nprogress": "0.2.0", "print-js": "^1.6.0", + "qrcode": "^1.5.4", "quill": "1.3.7", "screenfull": "5.0.2", "sortablejs": "1.10.2", @@ -62,6 +66,7 @@ "vue-cropper": "0.5.5", "vue-meta": "2.4.0", "vue-router": "3.4.9", + "vue-seamless-scroll": "^1.1.23", "vuedraggable": "2.24.3", "vuex": "3.6.0", "xlsx": "^0.17.0" diff --git a/src/api/board/cs2.js b/src/api/board/cs2.js new file mode 100644 index 0000000..a1dc289 --- /dev/null +++ b/src/api/board/cs2.js @@ -0,0 +1,10 @@ +import request from '@/utils/request' + +// 查询产量 +export function getHourProductionList(query) { + return request({ + url: '/mes/reportWork/getHourProductionList', + method: 'get', + params: query + }); +} diff --git a/src/assets/board/车间监控系统 - 04.jpg b/src/assets/board/车间监控系统 - 04.jpg deleted file mode 100644 index 8831238..0000000 Binary files a/src/assets/board/车间监控系统 - 04.jpg and /dev/null differ diff --git a/src/views/cs/index2.vue b/src/views/cs/index2.vue index f6510fe..de8b4a7 100644 --- a/src/views/cs/index2.vue +++ b/src/views/cs/index2.vue @@ -1,6 +1,7 @@