车间报工侧边栏，导航栏优化

src/view/layout/aside/historyComponent/history.vue

@@ -1,4 +1,4 @@
-<template>
+<template>
   <div class="router-history" v-if="showLayout=== true" >
     <el-tabs
       v-model="activeValue"
@@ -72,9 +72,9 @@ const activeValue = ref('')
 const contextMenuVisible = ref(false)
 
 const userStore = useUserStore()
-// if(userStore.userInfo.authorityId==1){
-// 	showLayout.value=false	
-// }
+if(userStore.userInfo.authorityId==6){
+	showLayout.value=false	
+}
 const name = (item) => {
   return (
     item.name + JSON.stringify(item.query) + JSON.stringify(item.params)

src/view/layout/index.vue

@@ -286,12 +286,12 @@ const yourCondition = ref(true)
 
 const userStore = useUserStore()
 console.log(userStore.userInfo.authorityId)
-// if(userStore.userInfo.authorityId==1){
-// 	showLayout.value=false
-// 	yourCondition.value=false
-// }else{
-// 	yourCondition.value=true
-// }
+if(userStore.userInfo.authorityId==6){
+	showLayout.value=false
+	yourCondition.value=false
+}else{
+	yourCondition.value=true
+}
 	
 // console.log(userStore.userInfo.nickName )
 const asideWidth = () => {

src/view/performance/chejianbaogong.vue

@@ -40,29 +40,29 @@
 <!--							</el-row>-->
 <!--						  </el-form-item>-->
               <el-row :gutter="20">
-                <el-col :span="6">
+                <el-col :span="7">
                   <el-form-item label="机台号" prop="id">
                     <el-input v-model="formData.机台号"  placeholder="" />
                   </el-form-item>
                 </el-col>
-                <el-col :span="6">
+                <el-col :span="8">
                   <el-form-item label="工单编号" prop="id">
                     <el-input v-model="formData.工单编号"  placeholder="" />
                   </el-form-item>
                 </el-col>
-                <el-col :span="12">
+                <el-col :span="8">
                   <el-form-item prop="name">
                     <el-input v-model="formData.产品名称"  placeholder="" />
                   </el-form-item>
                 </el-col>
               </el-row>
 						  <el-row :gutter="20">
-							<el-col :span="6">
+							<el-col :span="7">
 							 <el-form-item label="印件编号" style="font-size: 1.5vh;" prop="id">
 							   <el-input v-model="formData.印件号"  placeholder="" />
 							 </el-form-item>
 							</el-col>
-						  <el-col :span="18">
+						  <el-col :span="15">
 							 <el-form-item label="工序名称" prop="name">
 							   <el-input v-model="formData.工序名称"  placeholder="" />
 							 </el-form-item>
@@ -354,7 +354,7 @@
 
             <div style="margin-top:100px;">
 			<el-row :gutter="20">
-			 <el-col :span="10">
+			 <el-col :span="15">
 			   <el-form-item label="机台编号" prop="id">
 			 <el-select v-model="selectedOption" placeholder="请选择">
 			   <el-option
@@ -4771,7 +4771,7 @@ const bzryplanUsageCellClass = ({row, column, rowIndex, columnIndex}) =>{
      background-color:white}
 	 .bt {
 	   height: 5vh;
-	   width: 14vh;
+	   width: 12vh;
 	   font-size:2vh;
 	 }
 	  .gva-table-box{