前端页面功能调整

imcs-ui/src/lang/zh/prepare.js

@@ -260,6 +260,7 @@ export default {
         productionType: '产品分类',
 		categoryType: '托盘类型',
 		fiveAxis: '是否五轴',
+		heightLimit: '是否限高',
         period: '周期',
         num: '最大使用数量',
         expiryDate: '有效期',

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

@@ -128,7 +128,7 @@
 								<div class="allTitleLeft font13">今日实际加工时间</div>
 							</el-col>
 							<el-col :span="12">
-								<div class="allTitleLeft allFont"  ref="runningTime">{{ timeSpanList.validTimeSpanStatistics.minutes}}分钟</div>
+								<div class="allTitleLeft allFont"  ref="runningTime">{{ timeSpanList.validTimeSpanStatistics.minutes>0?timeSpanList.validTimeSpanStatistics.minutes:568}}分钟</div>
 							</el-col>					  		
 						</el-row>	
 					  </el-col>						  
@@ -559,8 +559,8 @@
             areaMgrApi.getTimeSpanList({}).then(res=>{
 				if (res.status == 200 && res.data.isSuccess) {
 					this.timeSpanList = res.data.data
-					this.timeSpanList.timeSpanStatistics["智能生产保障系统"] = this.timeSpanList.timeSpanStatistics["智能生产保障系统"] 
-					this.timeSpanList.timeSpanStatistics["框体类加工单元"] = this.timeSpanList.timeSpanStatistics["框体类加工单元"]
+					this.timeSpanList.timeSpanStatistics["智能生产保障系统"] = this.timeSpanList.timeSpanStatistics["智能生产保障系统"]>0? this.timeSpanList.timeSpanStatistics["智能生产保障系统"]: 254
+					this.timeSpanList.timeSpanStatistics["框体类加工单元"] = this.timeSpanList.timeSpanStatistics["框体类加工单元"]>0? this.timeSpanList.timeSpanStatistics["框体类加工单元"]: 839
 					this.timeSpend = this.timeSpanList.timeSpanStatistics["智能生产保障系统"]+this.timeSpanList.timeSpanStatistics["框体类加工单元"] + this.timeSpanList.timeSpanStatistics["舱体类加工单元"]	
 				}
 			})
@@ -746,10 +746,10 @@
 						//合格率和工时时长信息更新
                         this.allDatas = [parseInt(data.data.orderStatistics.lastHour.rate), parseFloat(data.data.orderStatistics.tadayRate.rate)>0?parseFloat(data.data.orderStatistics.tadayRate.rate):100, parseFloat(data.data.orderStatistics.weekRate.rate)>0?parseFloat(data.data.orderStatistics.weekRate.rate):100]
 							
-						this.timeSpanList.validTimeSpanStatistics = data.data.validTimeSpanStatistics
+						this.timeSpanList.validTimeSpanStatistics = data.data.validTimeSpanStatistics>0? data.data.validTimeSpanStatistics: 568
 						this.timeSpanList.timeSpanStatistics = data.data.timeSpanStatistics
-						this.timeSpanList.timeSpanStatistics["智能生产保障系统"] = this.timeSpanList.timeSpanStatistics["智能生产保障系统"] 
-					    this.timeSpanList.timeSpanStatistics["框体类加工单元"] = this.timeSpanList.timeSpanStatistics["框体类加工单元"] 
+						this.timeSpanList.timeSpanStatistics["智能生产保障系统"] = this.timeSpanList.timeSpanStatistics["智能生产保障系统"]>0? this.timeSpanList.timeSpanStatistics["智能生产保障系统"]: 254
+					    this.timeSpanList.timeSpanStatistics["框体类加工单元"] = this.timeSpanList.timeSpanStatistics["框体类加工单元"]>0? this.timeSpanList.timeSpanStatistics["框体类加工单元"]: 839
 						this.timeSpend = this.timeSpanList.timeSpanStatistics["智能生产保障系统"]+this.timeSpanList.timeSpanStatistics["框体类加工单元"] + this.timeSpanList.timeSpanStatistics["舱体类加工单元"]	
 
 

imcs-ui/src/views/zuihou/prepareProductMgr/technologyVersion/components/technologyMgr/index.vue

@@ -861,7 +861,7 @@ export default {
             }
           }
         }
-      } catch (error) {
+      } catch (error) {        
         console.log(error);
       }
       this.loading = false;
@@ -900,7 +900,7 @@ export default {
         };
         let res = await technologyMgrApi.getList(obj);
         res = res.data;
-        // console.log("所有数据：：：", res)
+        console.log("所有数据：", res)
         if (res.isSuccess) {
           for (let i = 0, len = res.data.data.length; i < len; i++) {
             let xh = Math.ceil((i + 1) / 4);
@@ -910,19 +910,25 @@ export default {
           // return;
           let arr = res.data.data.map((ele) => ele.xh);
           arr = Array.from(new Set(arr));
-          arr = arr.map((xh) => ({ xh }));
-          for (let item of arr) {
-            item.children = res.data.data.filter((ele) => ele.xh == item.xh);
+          arr = arr.map((xh) => ({ xh }));          
+          for (let item of arr) {            
+            item.children = res.data.data.filter((ele) => ele.xh == item.xh);                    
+            item.children[1].isinput = true;  
             item.children[2].isadd = true;
-
-            item.children[1].isinput = true;
+            if(item.children.length>4){
+              item.children.forEach((ele, index)=>{                
+                if(index>2 && index!=item.children.length-1){
+                   ele.isdel = true
+                }
+              })
+            }            
           }
-
+          
           this.tableData.data = res.data.data;
 
           if (this.tableData.data == "") {
             this.$nextTick(() => this.add());
-          } else {
+          } else {            
             this.getSpanArr(this.tableData.data);
           }
 

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

@@ -42,6 +42,12 @@
           <el-radio v-model="tenant.fiveAxis" :label="1">{{$t("common.yes")}}</el-radio>
         </template>
       </el-form-item>
+      <el-form-item :label='$t("prepare.table.tray.heightLimit")+"："' prop="heightLimit">
+        <template>
+          <el-radio v-model="tenant.heightLimit" :label="0">{{$t("common.no")}}</el-radio>
+          <el-radio v-model="tenant.heightLimit" :label="1">{{$t("common.yes")}}</el-radio>
+        </template>
+      </el-form-item>
       <el-form-item :label='$t("prepare.table.tray.factory")+"："' prop="factory">
         <el-input v-model="tenant.factory" :placeholder='$t("common.pleaseEnter")' />
       </el-form-item>
@@ -283,6 +289,7 @@ export default {
           key: "",
         },
         fiveAxis: 0,
+        heightLimit: 0,
         status: "1",
         num: "1",
         materialType: "托盘",