Merge remote-tracking branch 'origin/master'

ruoyi-ui/src/views/tireManagement/info/index.vue

@@ -131,35 +131,16 @@
     <el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" fixed/>
         <el-table-column label="工厂" align="center" prop="tyreFactory" width="150"/>
-<!--      <el-table-column :label="t('tireManagement.enterpriseCode')" align="center" prop="companyCode" width="150"/>-->
         <el-table-column label="外胎号" align="center" prop="outerTireNumber" width="150"/>
         <el-table-column label="品牌" align="center" prop="brand" width="150"/>
         <el-table-column label="规格型号" align="center" prop="size" width="150"/>
         <el-table-column label="花纹" align="center" prop="pattern" wXXXidth="150"/>
-<!--      <el-table-column :label="t('tireManagement.carId')" align="center" prop="carId" width="150"/>-->
       <el-table-column label="目前所安装车辆" align="center" prop="carLicense" width="150"/>
-
-
-<!--      <el-table-column :label="t('tireManagement.tireModelId')" align="center" prop="tureModelId" width="150"/>-->
-
-<!--      <el-table-column label="RFID" align="center" prop="tyreRfid" width="150"/>-->
       <el-table-column label="安装轮位" align="center" prop="tyrePosition" width="150"/>
       <el-table-column label="传感器编号" align="center" prop="sensorId" width="150"/>
       <el-table-column label="最新花纹深度(mm)" align="center" prop="currentTextureDepth" width="170"/>
       <el-table-column label="创建时间" align="center" prop="createTime" width="170"/>
       <el-table-column label="创建者" align="center" prop="createName" width="170"/>
-<!--      <el-table-column :label="t('common.state')" align="center" prop="state" width="150"/>-->
-<!--      <el-table-column :label="t('common.isRemove')" align="center" prop="isDelete" width="150"/>-->
-<!--      <el-table-column :label="t('common.creatorId')" align="center" prop="createId" width="150"/>-->
-
-<!--      <el-table-column :label="t('common.editTime')" align="center" prop="modifyTime" width="150">-->
-<!--        <template #default="scope">-->
-<!--          <span>{{ parseTime(scope.row.modifyTime, '{y}-{m}-{d}') }}</span>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
-<!--      <el-table-column :label="t('common.editID')" align="center" prop="modifyId" width="150"/>-->
-<!--      <el-table-column :label="t('common.editAccount')" align="center" prop="modifyBy" width="150"/>-->
-<!--      <el-table-column :label="t('common.creatorName')" align="center" prop="modifyName" width="150"/>-->
       <el-table-column :label="t('option.option')" align="center" class-name="small-padding fixed-width" fixed="right"
                        width="160">
         <template #default="scope">
@@ -170,13 +151,6 @@
               v-hasPermi="['basetyre:basetyre:edit']"
           >{{ t('option.edit') }}
           </el-button>
-<!--          <el-button-->
-<!--              type="text"-->
-<!--              icon="Delete"-->
-<!--              @click="handleDelete(scope.row)"-->
-<!--              v-hasPermi="['basetyre:basetyre:remove']"-->
-<!--          >{{ t('option.remove') }}-->
-<!--          </el-button>-->
         </template>
       </el-table-column>
       .