diff --git a/yanzhu-bigscreen/package.json b/yanzhu-bigscreen/package.json index c5061d8a..8770ecea 100644 --- a/yanzhu-bigscreen/package.json +++ b/yanzhu-bigscreen/package.json @@ -3,6 +3,7 @@ "version": "0.1.0", "private": true, "scripts": { + "inst":"yarn --ignore-engines", "serve": "vue-cli-service serve", "serve:prod": "vue-cli-service serve --mode production", "build": "vue-cli-service build", diff --git a/yanzhu-bigscreen/src/views/machmater/materialManage.vue b/yanzhu-bigscreen/src/views/machmater/materialManage.vue index 372ba36c..58aaa369 100644 --- a/yanzhu-bigscreen/src/views/machmater/materialManage.vue +++ b/yanzhu-bigscreen/src/views/machmater/materialManage.vue @@ -417,6 +417,7 @@ export default { result = result.data; this.workerOrderLoading = false if (result && result.code == '000000' && result.data) { + console.log("result", result) let moreDataTemp = [] result.data.forEach(item => { if (moreDataTemp.length <= 0) { @@ -827,6 +828,7 @@ export default { } .xhz-concrete-chart { + height: calc(100% - 40px); &.no-data { height: 100%; justify-content: center;