Przeglądaj źródła

2022-02-27 10:58

王克恕 3 lat temu
rodzic
commit
46b81472c5

+ 42 - 0
imcs-ui/src/api/largeScreen/index.js

@@ -31,6 +31,24 @@ const apiList = {
     	method: 'POST',
     	url: `/authority/zZone/yunjianResource/v1`
   	},
+  	
+  	// [保障中心]-边线库(2D模式)-type=1;type=2;type=3
+  	baozhangCard: {  
+    	method: 'POST',
+    	url: `/authority/stockInfo/yunjianStock/baozhang/v1`
+  	},
+  	
+  	// [舱体线]-边线库(2D模式)- type=1;type=2
+  	cangtiCard: {  
+    	method: 'POST',
+    	url: `/authority/stockInfo/yunjianStock/cangti/v1`
+  	},
+  	
+  	// [框体线]-边线库(2D模式)- type=1;type=2
+  	kuangtiCard: {  
+    	method: 'POST',
+    	url: `/authority/stockInfo/yunjianStock/kuangti/v1`
+  	}
 }
 
 export default {
@@ -72,5 +90,29 @@ export default {
 	      	...apiList.yunjianResource,
 	      	data
 	    })
+  	},
+  	
+  	// [保障中心]-边线库(2D模式)-type=1;type=2;type=3
+  	baozhangCard  (data) {
+	    return axiosApi({
+	      	...apiList.baozhangCard ,
+	      	data
+	    })
+  	},
+  	
+  	// [舱体线]-边线库(2D模式)- type=1;type=2
+  	cangtiCard  (data) {
+	    return axiosApi({
+	      	...apiList.cangtiCard ,
+	      	data
+	    })
+  	},
+  	
+  	// [框体线]-边线库(2D模式)- type=1;type=2
+  	kuangtiCard  (data) {
+	    return axiosApi({
+	      	...apiList.kuangtiCard ,
+	      	data
+	    })
   	}
 }

+ 19 - 11
imcs-ui/src/views/zuihou/largeScreen/cabinLine/index.vue

@@ -87,7 +87,7 @@
 			  				<!-- 方块 -->
 				  			<el-card class="box-card" style="margin-right: 20px;">
 					  			<table class="blokTable" border="0" cellspacing="0" cellpadding="0">
-					  				<tr v-for="(item, index) in sideList" :key="index">
+					  				<tr v-for="(item, index) in sideList1" :key="index">
 					  					<td v-for="obj in item" :key="obj.no" :class="obj.haveGoods == '1' ? 'selectTd' : ''">
 					  						<div :class="obj.lockStatus == '0' ? 'lockStatusCls' : ''">{{ obj.name }}</div>
 					  					</td>
@@ -490,7 +490,7 @@
 			  				<!-- 方块 -->
 				  			<el-card class="box-card" style="margin-right: 20px;">
 					  			<table class="blokTable" border="0" cellspacing="0" cellpadding="0">
-					  				<tr v-for="(item, index) in sideList" :key="index">
+					  				<tr v-for="(item, index) in sideList2" :key="index">
 					  					<td v-for="obj in item" :key="obj.no" :class="obj.haveGoods == '1' ? 'selectTd' : ''">
 					  						<div :class="obj.lockStatus == '0' ? 'lockStatusCls' : ''">{{ obj.name }}</div>
 					  					</td>
@@ -715,7 +715,8 @@
 	    	tabDownData: {    // 下部分-数据
 	    		list: []
 	    	},
-	    	sideList: {}, // 边线库
+	    	sideList1: {}, // 边线库-上
+	    	sideList2: {}, // 边线库-下
 	    	isFullSreen: false, // 默认不全屏
 	      queryParams: initQueryParams({}),
 	      moduleList: [], // 模块信息
@@ -736,8 +737,10 @@
 	  created() {
 	  	// 加载生产资源
 	  	//this.getTabList();
-	  	// 边线库
-	  	this.getQualitySide();
+	  	// 边线库-上
+	  	this.getQualitySide('1');
+	  	// 边线库-下
+	  	this.getQualitySide('2');
 	  	// 加载-模块信息
 	  	this.demoLineResource();
 		},
@@ -964,8 +967,8 @@
 	    },
 	    
 	    // 边线库
-	    getQualitySide() {
-	    	this.sideList = [
+	    getQualitySide(type) {
+	    	/*this.sideList = [
 	    		[
 	    			{no: '1', haveGoods: '1', lockStatus: '0', name: '1'},
 	    			{no: '2', haveGoods: '0', lockStatus: '0', name: '2'},
@@ -980,14 +983,19 @@
 	    			{no: '23', haveGoods: '0', lockStatus: '1', name: '10'},
 	    			{no: '24', haveGoods: '0', lockStatus: '0', name: '11'}
 	    		]
-	    	];
-	    	/*LargeScreenAPI.getIntellect({}).then(res => {
+	    	];*/
+	    	LargeScreenAPI.kuangtiCard({ type }).then(res => {
 	    		res = res.data 
 	    		console.log("【边线库】5:", res)
 	    		if(res.isSuccess){
-	    			this.sideList = res.data;
+	    			if(type == "1"){
+	    				this.sideList1 = res.data;
+	    			}
+	    			if(type == "2"){
+	    				this.sideList2 = res.data;
+	    			}
 	    		}
-	    	})*/
+	    	})
 	    }
 	  }
 	}

+ 22 - 14
imcs-ui/src/views/zuihou/largeScreen/frameLine/index.vue

@@ -42,7 +42,7 @@
 				  </el-select>
 	  	</div>
 	  	
-	  	<table border="0" cellspacing="0" cellpadding="0" style="width: 100%;">
+	  	<table border="0" cellspacing="0" cellpadding="0" style="width: 100%;table-layout: fixed;">
 	  		<tr>
 	  			<td>
 	  				
@@ -223,7 +223,7 @@
 			  				<!-- 方块 -->
 				  			<el-card class="box-card" style="margin-left: 100px;">
 					  			<table class="blokTable" border="0" cellspacing="0" cellpadding="0">
-					  				<tr v-for="(item, index) in sideList" :key="index">
+					  				<tr v-for="(item, index) in sideList1" :key="index">
 					  					<td v-for="obj in item" :key="obj.no" :class="obj.haveGoods == '1' ? 'selectTd' : ''">
 					  						<div :class="obj.lockStatus == '0' ? 'lockStatusCls' : ''">{{ obj.name }}</div>
 					  					</td>
@@ -455,7 +455,7 @@
 				  			<!-- 方块 -->
 				  			<el-card class="box-card" style="margin-left: 100px;">
 					  			<table class="blokTable" border="0" cellspacing="0" cellpadding="0">
-					  				<tr v-for="(item, index) in sideList" :key="index">
+					  				<tr v-for="(item, index) in sideList2" :key="index">
 					  					<td v-for="obj in item" :key="obj.no" :class="obj.haveGoods == '1' ? 'selectTd' : ''">
 					  						<div :class="obj.lockStatus == '0' ? 'lockStatusCls' : ''">{{ obj.name }}</div>
 					  					</td>
@@ -467,8 +467,8 @@
 			  		</el-row>
 			  		
   				</td>
-  				<td>
-	  				<!-- -部分 -->
+  				<td width="250">
+	  				<!-- -部分 -->
 			  		<el-row class="topRow alignLeft">
 			  			<div class="bottomDiv2">
 					  		<!-- AGV接驳位 -->
@@ -542,7 +542,8 @@
 	    	tabDownData: {    // 下部分-数据
 	    		list: []
 	    	},
-	    	sideList: {}, // 边线库
+	    	sideList1: {}, // 边线库-上
+	    	sideList2: {}, // 边线库-下
 	    	isFullSreen: false, // 默认不全屏
 	      queryParams: initQueryParams({}),
 	      moduleList: [], // 模块信息
@@ -563,8 +564,10 @@
 	  created() {
 	  	// 加载生产资源
 	  	//this.getTabList();
-	  	// 边线库
-	  	this.getQualitySide();
+	  	// 边线库-上
+	  	this.getQualitySide("1");
+	  	// 边线库-下
+	  	this.getQualitySide("2");
 	  	// 加载-模块信息
 	  	this.demoLineResource();
 		},
@@ -791,8 +794,8 @@
 	    },
 	    
 	    // 边线库
-	    getQualitySide() {
-	    	this.sideList = [
+	    getQualitySide(type) {
+	    	/*this.sideList = [
 	    		[
 	    			{no: '1', haveGoods: '1', lockStatus: '0', name: '1'},
 	    			{no: '2', haveGoods: '0', lockStatus: '0', name: '2'},
@@ -809,14 +812,19 @@
 	    			{no: '24', haveGoods: '0', lockStatus: '0', name: '11'},
 	    			{no: '25', haveGoods: '0', lockStatus: '0', name: '12'}
 	    		]
-	    	];
-	    	/*LargeScreenAPI.getIntellect({}).then(res => {
+	    	];*/
+	    	LargeScreenAPI.cangtiCard({ type }).then(res => {
 	    		res = res.data 
 	    		console.log("【边线库】5:", res)
 	    		if(res.isSuccess){
-	    			this.sideList = res.data;
+	    			if(type == "1"){
+	    				this.sideList1 = res.data;
+	    			}
+	    			if(type == "2"){
+	    				this.sideList2 = res.data;
+	    			}
 	    		}
-	    	})*/
+	    	})
 	    }
 	  }
 	}

+ 26 - 13
imcs-ui/src/views/zuihou/largeScreen/supportCenter/index.vue

@@ -48,7 +48,7 @@
 			  				<!-- 方块 -->
 				  			<el-card class="box-card" style="margin-right: 20px;">
 					  			<table class="blokTable" border="0" cellspacing="0" cellpadding="0">
-					  				<tr v-for="(item, index) in sideList0" :key="index">
+					  				<tr v-for="(item, index) in sideList1" :key="index">
 					  					<td v-for="obj in item" :key="obj.no" :class="obj.haveGoods == '1' ? 'selectTd' : ''">
 					  						<div :class="obj.lockStatus == '0' ? 'lockStatusCls' : ''">{{ obj.name }}</div>
 					  					</td>
@@ -280,7 +280,7 @@
 			  				<!-- 方块 -->
 				  			<el-card class="box-card" style="margin: 0 20px;">
 					  			<table class="blokTable" border="0" cellspacing="0" cellpadding="0">
-					  				<tr v-for="(item, index) in sideList" :key="index">
+					  				<tr v-for="(item, index) in sideList2" :key="index">
 					  					<td v-for="obj in item" :key="obj.no" :class="obj.haveGoods == '1' ? 'selectTd' : ''">
 					  						<div :class="obj.lockStatus == '0' ? 'lockStatusCls' : ''">{{ obj.name }}</div>
 					  					</td>
@@ -292,7 +292,7 @@
 				  			<!-- 方块 -->
 				  			<el-card class="box-card" style="margin: 0 20px;">
 					  			<table class="blokTable" border="0" cellspacing="0" cellpadding="0">
-					  				<tr v-for="(item, index) in sideList" :key="index">
+					  				<tr v-for="(item, index) in sideList3" :key="index">
 					  					<td v-for="obj in item" :key="obj.no" :class="obj.haveGoods == '1' ? 'selectTd' : ''">
 					  						<div :class="obj.lockStatus == '0' ? 'lockStatusCls' : ''">{{ obj.name }}</div>
 					  					</td>
@@ -799,8 +799,9 @@
 	    	tabDownData: {    // 下部分-数据
 	    		list: []
 	    	},
-	    	sideList0: [], // 边线库-上
-	    	sideList: {}, // 边线库
+	    	sideList1: [], // 边线库-上
+	    	sideList2: {}, // 边线库-框体缓存库
+	    	sideList3: {}, // 边线库-舱体缓存库
 	    	isFullSreen: false, // 默认不全屏
 	      queryParams: initQueryParams({}),
 	      moduleList: [], // 模块信息
@@ -821,8 +822,12 @@
 	  created() {
 	  	// 加载生产资源
 	  	this.getTabList();
-	  	// 边线库
-	  	this.getQualitySide();
+	  	// 边线库-上
+	  	this.getQualitySide("1");
+	  	// 边线库-框体缓存库
+	  	this.getQualitySide("2");
+	  	// 边线库-舱体缓存库
+	  	this.getQualitySide("3");
 	  	// 加载-模块信息
 	  	this.demoLineResource();
 		},
@@ -1048,8 +1053,8 @@
 	    },
 	    
 	    // 边线库
-	    getQualitySide() {
-	    	for(let i = 1; i <= 10; i++){
+	    getQualitySide(type) {
+	    	/*for(let i = 1; i <= 10; i++){
 	    		let arr = [];
 	    		for(let j = 1; j <= 30; j++){
 	    			arr.push({
@@ -1077,14 +1082,22 @@
 	    			{no: '23', haveGoods: '0', lockStatus: '1', name: '10'},
 	    			{no: '24', haveGoods: '0', lockStatus: '0', name: '11'}
 	    		]
-	    	];
-	    	/*LargeScreenAPI.getIntellect({}).then(res => {
+	    	];*/
+	    	LargeScreenAPI.baozhangCard({ type }).then(res => {
 	    		res = res.data 
 	    		console.log("【边线库】5:", res)
 	    		if(res.isSuccess){
-	    			this.sideList = res.data;
+	    			if(type == "1") {
+	    				this.sideList1 = res.data;
+	    			}
+	    			if(type == "2") {
+	    				this.sideList2 = res.data;
+	    			}
+	    			if(type == "3") {
+	    				this.sideList3 = res.data;
+	    			}
 	    		}
-	    	})*/
+	    	})
 	    }
 	  }
 	}