Merge remote-tracking branch 'origin/master'

jiang

2024-01-23 eb64c3ede631f9f1ec49260db5190027fa08fb31

 jcdm-ui/src/views/main/kb/engineCheck/index.vue

@@ -1,6 +1,6 @@
<template>
  <div class="app-container">
    <el-card  style="height: 70px;margin-bottom: 10px" class="box-card" >
    <el-card   class="box-card" >
      <template>
        <div class="container">
          <el-row type="flex" justify="center"  style="text-align: center" >
@@ -11,50 +11,41 @@
        </div>
      </template>
    </el-card>
   <el-row :gutter="5"  style="margin-top: 10px">
     <el-col :span="10" style=" height:600px;width:800px"  >
       <el-card class="bottom-card">
         <el-descriptions :column="1" >
           <el-descriptions-item>
   <el-row :gutter="0"  >

     <el-col :span="14">
       <el-card   class="box-card" >
             <el-form ref="form" :model="form"  label-width="200px" style="height: 60px;margin-top: 20px" >
               <el-form-item prop="engineNo" >
              <span slot="label" style="font-size:45px;color:black"><strong>发动机号</strong></span>
              <span slot="label" style="font-size:40px;color:black"><strong>发动机号</strong></span>
                 <el-input style="font-size:30px" v-model="form.engineNo" placeholder="请输入发动机号" clearable  @keyup.enter.native="EngineNohandleChange" >
                   <el-button slot="append" plain type="info" @click="EngineNohandleChange(form.engineNo)" icon="el-icon-search"></el-button>
                 </el-input>
               </el-form-item>
             </el-form>
           </el-descriptions-item>
           <el-descriptions-item>
             <el-form ref="form" :model="form"  label-width="200px" style="height: 60px;margin-top: 20px" >
               <el-form-item   prop="productType" >
                 <span slot="label" style="font-size:45px;color:black"><strong>机型</strong></span>
                 <span slot="label" style="font-size:40px;color:black"><strong>机型</strong></span>
                 <el-input disabled style="font-size:30px"  value="form.productType" v-model="form.productType" placeholder="" />
               </el-form-item>
             </el-form>
           </el-descriptions-item>
           <el-descriptions-item>
             <el-form ref="form" :model="form"  label-width="200px" style="height: 60px;margin-top: 20px" >
               <el-form-item   prop="orderNo" >
              <span  slot="label" style="font-size:45px;color:black"><strong>工单编号</strong></span>
              <span  slot="label" style="font-size:40px;color:black"><strong>工单编号</strong></span>
                 <el-input disabled style="font-size:30px" v-model="form.orderNo" placeholder="" />
               </el-form-item>
             </el-form>
           </el-descriptions-item>
           <el-descriptions-item>
             <el-form ref="form" :model="form"  label-width="200px" style="height: 60px;margin-top: 20px" >
               <el-form-item   prop="currentWorkstation" >
              <span slot="label" style="font-size:45px;color:black"><strong>质量状态</strong></span>
              <span slot="label" style="font-size:40px;color:black"><strong>质量状态</strong></span>
                 <el-input disabled style="font-size:30px" v-model:value="form.add" placeholder="" />
               </el-form-item>
             </el-form>
           </el-descriptions-item>
         </el-descriptions>
         <el-divider></el-divider>
         <el-row :gutter="10" class="mb8" type="flex" justify="center"  style="text-align: center">
           <el-col :span="1.5">
             <el-button plain  :disabled="buttondisabled" type="primary" style="width:400px;height:160px" v-hasPermi="['bs:formula:add']" @click="forceOnline">
               <span   class="el-icon-thumb"   style="font-size:45px;color:black"></span>
               <span   class="el-icon-thumb"   style="font-size:40px;color:black"></span>
               <span style="font-size:45px;color:black"><strong>强制上线</strong></span>
             </el-button>
           </el-col>
@@ -62,17 +53,17 @@
       </el-card>
     </el-col>

     <el-col :span="14"  inline style="height:600px;width:600px  ">
     <el-col :span="10"  inline >
       <el-tabs type="border-card"  >
         <el-card>
         <el-col :span="14"style="height: 270px;width:800px  ">
         <el-col :span="14"style="height: 248px;width:800px  ">
           <span style="font-size:25px"><strong>质量状态</strong></span>
           <el-divider></el-divider>
           {{this.form.engineCheckList}}
         </el-col>
         </el-card>
         <el-card style="margin-top: 10px" >
         <el-col :span="14"style="height: 270px;width:800px  ">
         <el-col :span="14"style="height: 248px;width:800px  ">
           <span style="font-size:25px"><strong>最终结果</strong></span>
           <el-divider></el-divider>
           {{queryParams.productType}}
@@ -163,7 +154,6 @@
          else{
            this.reset();
            this.buttondisabled = true
            // this.$modal.msgError('输入的发动机号有误');
            const h = this.$createElement;
            this.$message({
              message: h('p',null, [
@@ -202,7 +192,6 @@
<style scoped>
::v-deep .el-input__inner{
  height: 50px;
  width: 450px;
}
::v-deep .el-form-item__label {
  line-height: 50px;