修改前段页面bug

imcs-ui/src/views/zuihou/largeScreen/twoDatasModel/Index.vue

@@ -501,9 +501,7 @@
 	  	initDatas(){	  		
 	  		
 	  		// [预警信息]
-	  		this.yujingList = [
-	  			{itemname: '[设备离线]柔性线打标机离线', time: '2021-11-04 08:41'},
-	  			{itemname: '[设备离线]柔性线机器人离线', time: '2021-11-04 08:57'}	  			
+	  		this.yujingList = [	  			  			
 	  		];
 	  	},
 	  	
@@ -589,7 +587,12 @@
 						    let msg = data.feedback ? data.feedback : " 响应超时 ";
 							let arr = data.createTime;                            							 
 							let time = arr[0] + "-" + arr[1] + "-" + arr[2] + "\t" + arr[3] + ":" + arr[4];	
-                            let itemname = "["+ data.resourceName +"] "+data.procedureName+"("+data.instructionName+")" + msg; 	
+							let itemname = ""
+							if(data.taskNodeId){
+                                itemname = "["+ data.resourceName +"] "+data.procedureName+"("+data.instructionName+")" + msg; 
+							}else{
+                                itemname = "[监控推送]" + msg;
+							}                            	
                             if(data.status == '0'){
 							    setTimeout(function(){
 								    that.$notify({

imcs-ui/src/views/zuihou/prepareProductMgr/bomMgr/components/Edit.vue

@@ -302,7 +302,16 @@ export default {
     		console.log("动态表单的数据：", res)
     		if(res.isSuccess){
     			// 初始化，表单的数据
-    			this.commList[fieldObj.identifier] = res.data
+				if(fieldObj.identifier=="meterial_id" || fieldObj.identifier=="tray_id"){
+				   //数据权限过滤	
+				   let role = this.$store.state.account.user.roles.indexOf('舱体')<0 ? "舱体" : (this.$store.state.account.user.roles.indexOf('框体')<0 ? "框体": null);
+                    if(role!=null){						
+						res.data = res.data.filter(item=>{							
+							return item.name.indexOf(role) < 0;
+						}) 						
+					} 
+				}
+				this.commList[fieldObj.identifier] = res.data				
     		}
     	})
     	if(this.isEnd){

imcs-ui/src/views/zuihou/runManageCenter/productionScheduling/components/ViewResult.vue

@@ -149,6 +149,8 @@
 <script>
 // 【夹具管理】-API
 import inspectionApi from "@/api/runManageCenter/inspection"
+//检测报告-API
+import qualityResultApi from "@/api/machiningClient/qualityResultMgr"
 // 【分页】组件
 import Pagination from "@/components/Pagination"
 // 【共通】函数
@@ -267,7 +269,7 @@ export default {
     downloadFile(row) {
         this.queryParams.map.fileName = '下载抽检报表'+row.report
         this.queryParams.model.id = row.id
-        inspectionApi.export(this.queryParams).then(response => {
+        qualityResultApi.download(this.queryParams).then(response => {
           downloadFile(response);
        });
     },