diff --git a/src/views/modules/board/SORoutingBoard.vue b/src/views/modules/board/SORoutingBoard.vue index 6900b7a..76ea6a7 100644 --- a/src/views/modules/board/SORoutingBoard.vue +++ b/src/views/modules/board/SORoutingBoard.vue @@ -132,7 +132,8 @@ return '' }, search () { - let inData= {number:this.pageIndex}; + let inData= {number:this.pageIndex, + text1:this.lineNo}; SORoutingBoard(inData).then(({data}) => { this.tableData = data.rows; this.totalPage= data.maxPage; diff --git a/src/views/modules/schedule/generateReport.vue b/src/views/modules/schedule/generateReport.vue index 2a41ab3..40edc84 100644 --- a/src/views/modules/schedule/generateReport.vue +++ b/src/views/modules/schedule/generateReport.vue @@ -413,7 +413,7 @@ operatorIdName2: '', scrapReason: '', preparationTime: 0, - manufacturingTime: 0, + manufacturingTime: 1, cleaningTime: 0, shutdownReason: '', remark: '', @@ -691,7 +691,7 @@ this.saveHeaderData.operatorName=currentData.operatorName; this.saveHeaderData.qtyRequire=currentData.qtyRequired; this.saveHeaderData.userId=this.$store.state.user.name; - this.saveHeaderData.manufacturingTime=''; + this.saveHeaderData.manufacturingTime=1; this.qty1=''; this.qty2 =''; this.saveHeaderData.planStartTime = this.dayjs(new Date()).format('YYYY-MM-DD 00:00:00') diff --git a/static/config/init.js b/static/config/init.js index 9c464d6..a354a20 100644 --- a/static/config/init.js +++ b/static/config/init.js @@ -10,7 +10,7 @@ js: [ // 插件, 放置业务之前加载, 以免业务需求依赖插件时, 还未加载出错 // 插件 - echarts - window.SITE_CONFIG.cdnUrl + '/static/plugins/echarts-3.8.5/echarts.common.min.js', + window.SITE_CONFIG.cdnUrl + '/static/plugins/echarts/echarts.min.js', // 插件 - ueditor window.SITE_CONFIG.cdnUrl + '/static/plugins/ueditor-1.4.3.3/ueditor.config.js', window.SITE_CONFIG.cdnUrl + '/static/plugins/ueditor-1.4.3.3/ueditor.all.min.js', @@ -73,4 +73,4 @@ createScripts(); } }; -})(); \ No newline at end of file +})();