44

pages/login/login.scss

@@ -21,10 +21,25 @@
 .login_logo{
    margin-top: 280rpx;
    text-align: center;
+   
 	image{
 		    width: 280rpx;
 		   	 height: 280rpx;
 	}
+	
+	.logo_bj{
+		width: 280rpx;
+		 height: 280rpx;
+		 background: url('../../static/logo_round.png') ;
+		 background-size: 100%;
+		 margin: auto;
+		 
+		 line-height: 280rpx;
+		 font-size: 66rpx;
+		 font-weight: 800;
+		 letter-spacing: 10rpx;
+		 color: #157A2C;
+	}
 
 
 	

pages/login/login.vue

@@ -2,10 +2,11 @@
 	<view class="content">
 		<uni-icons class="setting" type="gear" @click="handleServerSettings" size="50" color="#fff"></uni-icons>
 		<view class="login_logo">
-			<image :src="logo || 'https://img.picgo.net/2024/04/18/login_logo45cb6a5eb95c8c1c.png'"></image>
+			<!-- <image :src="logo || 'https://img.picgo.net/2024/04/18/login_logo45cb6a5eb95c8c1c.png'"></image> -->
+			<view class="logo_bj">嘉实</view>
 		</view>
 		<view class="login-title">
-			<label>智慧工厂信息化系统</label>
+			<label>工业互联网平台</label>
 
 			<text>{{ companyName }}</text>
 		</view>

pages/pda/feeding/components/semiProductBom.vue

@@ -85,7 +85,7 @@
 						</view>
 
 
-						<view class="rx ww50">
+						<view class="rx ww50" v-if="workInfo.reportStatus != 0">
 							<view class="lable ww80 rx-cc">刻码</view>
 							<view class="content">{{mate.extInfo.engrave}}</view>
 						</view>
@@ -96,7 +96,7 @@
 
 
 
-					<view class="item" v-if='mate.isConsumable == 0'>
+					<view class="item" v-if='mate.isConsumable == 0 && workInfo.reportStatus != 0'>
 						<view class="lable rx-cc">物料代号</view>
 						<view class="content">{{mate.extInfo.materielCode}}</view>
 					</view>
@@ -126,6 +126,13 @@
 							</view>
 						</view>
 					</view>
+					
+	
+					
+						<view class="item" v-if='mate.isConsumable == 0 && workInfo.reportStatus == 0'>
+							<view class="lable rx-cc">投料类型</view>
+							<view class="content" style="color:#157A2C;">{{ workInfo.reportStatus == 0 ? '批量投料' : ''}}</view>
+						</view>
 
 
 
@@ -239,6 +246,11 @@
 			isDetails: {
 				type: Boolean,
 				default: false
+			},
+			
+			workInfo: {
+				type: Object,
+				default: () => {}
 			}
 		},
 
@@ -258,6 +270,8 @@
 		data() {
 			return {
 				deviceList: [],
+				
+		
 
 				deviveShow: false,
 				formData: {

pages/pda/feeding/details.vue

@@ -25,17 +25,16 @@
 
 					<instanceBom v-if='item.instanceList.length != 0' :workOrderId='item.workOrderId'
 						:list='item.instanceList' :equipmentList="item.equipmentList"
-						:currentTaskDiagram="item.currentTaskDiagram"></instanceBom>
 
 
 					<semiProductBom v-if='item.semiProductList.length != 0' :workOrderId='item.workOrderId'
 						:list='item.semiProductList' :equipmentList="item.equipmentList"
-						:currentTaskDiagram="item.currentTaskDiagram"></semiProductBom>
+						:currentTaskDiagram="item.currentTaskDiagram" :workInfo="item"></semiProductBom>
 
 
 
 					<turnoverBom v-if='item.turnover.length != 0' :list='item.turnover' :wordItem='item' pattern='feed'
-						@handleScan='handleScan' @handleDel='handleDel'></turnoverBom>
+						@handleScan='handleScan' @handleDel='handleDel' ></turnoverBom>
 
 					<aridRegion v-if='item.aridRegionList.length != 0' :list='item.aridRegionList'
 						@handleScan='handleScan'></aridRegion>