Merge remote-tracking branch 'origin/master'

jiang

2024-01-24 ed7f09e0376d542bfddb05268f0081ba89a86868

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

@@ -2,7 +2,7 @@
  <div class="app-container">
    <el-card class="box-card" >
      <el-row>
        <el-divider style="margin-bottom: 10px"><span style="font-size: 40px">发动机返修标记系统</span></el-divider>
        <el-divider><span style="font-size: 30px">发动机返修标记系统</span></el-divider>
      </el-row>
      <el-row style="margin-top: 10px">
        <el-form :model="queryParams.sfcCode" ref="queryForm" :inline="true" label-width="68px" >
@@ -21,7 +21,7 @@
        </el-form>
      </el-row>
    </el-card>
    <el-row :gutter="0">
    <el-row>
      <el-col :span="20">
        <el-card style="margin-top: 10px; height: 490px;" class="box-card">
          <el-table border ref="multipleTable" :data="passingStationCollectionList"  @selection-change="handleSelectionChange">
@@ -38,12 +38,12 @@
            </el-table-column>
            <el-table-column label="入站时间" align="center" prop="inboundTime" width="100">
              <template slot-scope="scope">
                <span>{{ parseTime(scope.row.inboundTime, '{y}-{m}-{d}') }}</span>
                <span>{{ parseTime(scope.row.inboundTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
              </template>
            </el-table-column>
            <el-table-column label="出站时间" align="center" prop="outboundTime" width="100">
              <template slot-scope="scope">
                <span>{{ parseTime(scope.row.outboundTime, '{y}-{m}-{d}') }}</span>
                <span>{{ parseTime(scope.row.outboundTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
              </template>
            </el-table-column>
            <el-table-column label="是否合格" align="center" prop="outRsSign">
@@ -52,7 +52,7 @@
            </el-table-column>
            <el-table-column label="采集时间" align="center" prop="collectionTime" width="180">
              <template slot-scope="scope">
                <span>{{ parseTime(scope.row.collectionTime, '{y}-{m}-{d}') }}</span>
                <span>{{ parseTime(scope.row.collectionTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
              </template>
            </el-table-column>
            <el-table-column label="节拍时间" align="center" prop="beatTime">
@@ -61,14 +61,38 @@
        </el-card>
      </el-col>
      <el-col :span="4">
        <el-card style="margin-top: 10px; min-height: 490px" class="box-card">
          <el-button type="success" @click="selectAll" style="margin-left: 50px;width: 100px;margin-top: 10px">选择所有</el-button>
          <el-button type="success" @click="clearAll" style="margin-left: 50px; width: 100px;margin-top: 10px">取消选择</el-button>
          <el-button type="success" @click="selectUnqualified" style="margin-left: 50px; width: 100px;margin-top: 10px">选择不合格</el-button>
          <el-button type="success" @click="markComplete" style="margin-left: 50px; width: 100px;margin-top: 10px">标记完成</el-button>
          <el-button type="success" @click="repairRecord" style="margin-left: 50px; width: 100px;margin-top: 10px">返修记录</el-button>
          <el-button type="success" @click="operationLog" style="margin-left: 50px; width: 100px;margin-top: 10px">操作日志</el-button>
        <el-card style="margin-top: 10px; min-height: 490px">
          <el-row class="centered-row">
            <el-button type="success" icon="el-icon-s-grid" @click="selectAll" >选择所有</el-button>

          </el-row>
          <el-row class="centered-row">
            <el-button type="success" icon="el-icon-close" @click="clearAll">取消选择</el-button>

          </el-row>
          <el-row class="centered-row">
            <el-button type="success" icon="el-icon-document-remove" @click="selectUnqualified">选择不合格</el-button>

          </el-row>
          <el-row class="centered-row">
            <el-button type="success" icon="el-icon-s-flag" @click="markComplete">标记完成</el-button>

          </el-row>    <el-row class="centered-row">
          <el-button type="success" icon="el-icon-files" @click="repairRecord">返修记录</el-button>

        </el-row>
          <el-row class="centered-row">
            <el-button type="success" icon="el-icon-date" @click="operationLog" >操作日志</el-button>

          </el-row>



<!--          <el-button type="success" icon="el-icon-close" @click="clearAll">取消选择</el-button>-->
<!--          <el-button type="success" icon="el-icon-document-remove" @click="selectUnqualified">选择不合格</el-button>-->
<!--          <el-button type="success" icon="el-icon-s-flag" @click="markComplete">标记完成</el-button>-->
<!--          <el-button type="success" icon="el-icon-files" @click="repairRecord">返修记录</el-button>-->
<!--          <el-button type="success" icon="el-icon-date" @click="operationLog" >操作日志</el-button>-->
        </el-card>
      </el-col>
    </el-row>
@@ -203,7 +227,12 @@
::v-deep .el-form-item__label{
  font-size: large;
}
::v-deep .el-card__body{
  padding: 15px 20px 0px 20px;
.el-icon-close {
  margin-left: 20px;
}
.centered-row {
  margin-top: 10px;
  display: flex;
  justify-content: center;
}
</style>