Merge remote-tracking branch 'origin/master'

懒羊羊

2024-01-24 a36d141236c0e06af4da16e8247d30915b197e32

Merge remote-tracking branch 'origin/master'

 jcdm-ui/src/views/main/da/tileMatchRules/index.vue

@@ -211,7 +211,9 @@

<!--        </el-table-column>-->
        <el-table-column label="状态" align="center" prop="state">

          <template slot-scope="scope">
            <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.state"/>
          </template>
        </el-table-column>
        <el-table-column fixed="right" width="200" label="操作" align="center" class-name="small-padding fixed-width">
          <template slot-scope="scope">
@@ -293,7 +295,14 @@
          <el-input v-model="form.updateUser" placeholder="请输入更改用户" />
        </el-form-item>
        <el-form-item label="状态" prop="state">
          <el-input v-model="form.state" placeholder="请输入状态" />
          <el-select v-model="form.state" placeholder="请选择状态">
            <el-option
              v-for="dict in dict.type.sys_normal_disable"
              :key="dict.value"
              :label="dict.label"
              :value="parseInt(dict.value)"
            ></el-option>
          </el-select>
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
@@ -309,6 +318,7 @@

export default {
  name: "TileMatchRules",
  dicts: ['subscription_type', 'sys_yes_no', 'data_type','sys_normal_disable'],
  data() {
    return {
      // 遮罩层

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

@@ -5,7 +5,7 @@
        <div class="container" type="flex" justify="center" style="text-align:center">
<!--          <el-row   type="flex" justify="center" style="text-align:center;height: 12px" >-->
<!--            <el-col  type="flex" justify="center"  :span="14" style="text-align:center">-->
              <span style="font-size:22px;color:black"><strong>发动机数据检查</strong></span>
          <el-divider><span style="font-size:22px;color:black"><strong>发动机数据检查</strong></span></el-divider>
<!--            </el-col>-->
<!--          </el-row>-->
        </div>
@@ -54,22 +54,20 @@
     </el-col>

     <el-col :span="10"  inline style="margin-top: 5px">
       <el-tabs type="border-card"  >
         <el-card class="custom-content"  style="height: 242px;width:800px">
         <el-card class="custom-content"  style="height: 264px">
         <el-col :span="14">
           <span style="font-size:25px"><strong>质量状态</strong></span>
           <el-divider></el-divider>
           {{this.form.engineCheckList}}
         </el-col>
         </el-card>
         <el-card class="custom-content" style="margin-top: 10px;height: 242px;width:800px" >
         <el-card class="custom-content" style="height: 264px" >
         <el-col :span="14"style="  ">
           <span style="font-size:25px"><strong>最终结果</strong></span>
           <el-divider></el-divider>
           {{queryParams.productType}}
         </el-col>
         </el-card>
       </el-tabs>
     </el-col>
   </el-row>
  </div>