Lexie 1 년 전
부모
커밋
c8304d9772
3개의 변경된 파일13개의 추가작업 그리고 12개의 파일을 삭제
  1. 2 2
      src/pinia/modules/user.js
  2. 1 1
      src/view/login/index.vue
  3. 10 9
      src/view/performance/chejianbaogong.vue

+ 2 - 2
src/pinia/modules/user.js

@@ -147,6 +147,7 @@ export const useUserStore = defineStore('user', () => {
         console.log(response)
         if(response.data===null){
         	// ElMessage.error('请输入账号密码')
+			ClearStorage()
         }else{
 		if (!router.hasRoute(userInfo.value.authority.defaultRouter)) {
 		  ElMessage.error('请联系管理员进行授权')
@@ -194,8 +195,7 @@ if(response.data===null){
       sessionStorage.clear()
       localStorage.clear()
       router.push({ name: 'Login', replace: true })
-      window.location.reload()
-	  
+      window.location.reload()  
     }
   }
   /* 清理数据 */

+ 1 - 1
src/view/login/index.vue

@@ -328,7 +328,7 @@ const GetAddr = () => {
 
 
 userStore.LoginIn2({
-	   username: "JY01#",
+	   username: "admin",
 	   password: "123456",
 	   captcha: "443188",
 	   captchaId: "0FZfnUtAOrdXvTETkJRc",

+ 10 - 9
src/view/performance/chejianbaogong.vue

@@ -28,7 +28,7 @@
         <el-main>
 
 
-<div class="gva-search-box" style="overflow: hidden; padding: 0; display: flex;">
+<div class="gva-search-box" style="overflow: hidden; padding: 0; display: flex;"  >
 			<div style="flex: 1; border: 0px magenta solid; margin: 0; padding: 0; margin-left: 20px; margin-top: 20px;">
 <!--						  <el-form-item label="工单编号" prop="name">-->
 <!--							<el-row :gutter="24">-->
@@ -42,8 +42,8 @@
 <!--						  </el-form-item>-->
               <el-row :gutter="20">
                 <el-col :span="6">
-                  <el-form-item label="机台号" prop="id">
-                    <el-input v-model="formData.机台号"  placeholder="" />
+                  <el-form-item label="机台号" prop="id" >
+                    <el-input v-model="formData.机台号" placeholder="" />
                   </el-form-item>
                 </el-col>
                 <el-col :span="6">
@@ -322,15 +322,15 @@
           </el-dialog>
 
           <el-dialog v-model="detailShow"
-		   fullscreen
+		   fullscreen 
 		   style="font-size: 50px;font-weight: bold;" lock-scroll :before-close="closeDetailShow" title="机台班组维护" destroy-on-close>
             <div>
 			<el-table ref="multipleTable"
                         :row-style="{ height: '20px' }"
-                        :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
+                        :cell-style="cellStyle"
                         :header-cell-style="{ padding: '0px' }"
                         :show-overflow-tooltip="true"
-                        :cell-class-name="bzryplanUsageCellClass"
+                        :cell-class-name="bzryplanUsageCellClass"						
                         @row-click="BZhandle"
                         style="width: 100%;height: 250px;margin-top: 0px;" border tooltip-effect="dark"
 						:data="bzData" row-key="ID" @selection-change="BZSelectionChange">
@@ -3484,8 +3484,8 @@ const FieldInspectionRecord = async () => {
 //获取机台编号
 const GetMachineMac = async (addr) => {
   console.log(addr);
-  const response = await getMachineMac({ addr: addr });
-  // const response = await getMachineMac({ addr: '68-ED-A4-26-5D-5E' });
+  // const response = await getMachineMac({ addr: addr });
+  const response = await getMachineMac({ addr: '68-ED-A4-26-5D-5E' });
   // const response = await getMachineMac({ addr: '68-ED-A4-26-5D-90' });
   // const response = await getMachineMac({ addr: '68-ED-A4-26-5E-50' });
   // const response = await getMachineMac({ addr: '68-ED-A4-26-60-CC' });
@@ -4729,8 +4729,9 @@ const bzryplanUsageCellClass = ({row, column, rowIndex, columnIndex}) =>{
      background-color:white}
 	 .bt {
 	   height: 5vh;
-	   width: 7%;
+	   width: 15vh;
 	   font-size:2vh;
+	   
 	 }
 	  .gva-table-box{
 	   font-size: 15px;