xinyilu/KindergartenUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
曹辉 2022-08-31 15:45:34 +08:00
commit 6b9e7ed37a
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/system/area/index.vue
View File

@ -156,7 +156,7 @@
/> />
</el-form-item> </el-form-item>
<el-form-item label="排序" prop="sort"> <el-form-item label="排序" prop="sort">
<el-input v-model.number="form.sort" placeholder="请输入排序" /> <el-input v-model.number="form.sort" placeholder="请输入排序" maxlength="10"/>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">

8
src/views/system/itemCategory/index.vue
View File

@ -124,11 +124,11 @@
align="center" align="center"
prop="categoryNameAbbreviate" prop="categoryNameAbbreviate"
/> />
<el-table-column label="创建人" align="center" prop="createBy" /> <el-table-column label="创建人" align="center" prop="createBy" />
<el-table-column label="创建时间" align="center" prop="createTime" /> <el-table-column label="创建时间" align="center" prop="createTime" />
<el-table-column label="分类排序" align="center" prop="sorting" /> <el-table-column label="分类排序" align="center" prop="sorting" />
<el-table-column label="备注信息" align="center" prop="remark" /> <el-table-column label="备注信息" align="center" prop="remark" :show-overflow-tooltip="true"/>
<!-- <el-table-column label="修改人" align="center" prop="updateBy" /> <!-- <el-table-column label="修改人" align="center" prop="updateBy" />
<el-table-column label="修改时间" align="center" prop="updateTime" /> --> <el-table-column label="修改时间" align="center" prop="updateTime" /> -->
<el-table-column <el-table-column
@ -302,8 +302,8 @@ export default {
}else{ }else{
console.log(min, max); console.log(min, max);
} }
} }
if ( if (
value.map((e) => { value.map((e) => {

2
src/views/system/teacherInfo/index.vue
View File

@ -241,7 +241,7 @@
/> />
</el-form-item> </el-form-item>
<el-form-item label="身份证号" prop="cardNo"> <el-form-item label="身份证号" prop="cardNo">
<el-input v-model="form.cardNo" placeholder="请输入身份证号" /> <el-input v-model="form.cardNo" placeholder="请输入身份证号" maxlength="18" />
</el-form-item> </el-form-item>
<el-form-item label="性别" prop="teacherSex"> <el-form-item label="性别" prop="teacherSex">
<el-radio-group v-model="form.teacherSex"> <el-radio-group v-model="form.teacherSex">

2
src/views/system/testItemCityScore/index.vue
View File

@ -116,7 +116,7 @@
{{ scope.row.sex == "FEMALE" ? "女" : "" }} {{ scope.row.sex == "FEMALE" ? "女" : "" }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="平均得分" align="center" prop="itemAvgScore"> <el-table-column label="平均得分" align="center" prop="itemAvgScore" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.dictValue == "number" ? scope.row.itemAvgScore : "" }} {{ scope.row.dictValue == "number" ? scope.row.itemAvgScore : "" }}
{{ scope.row.dictValue == "text" ? scope.row.itemAvgText : "" }} {{ scope.row.dictValue == "text" ? scope.row.itemAvgText : "" }}

2
src/views/system/testScoreBatch/index.vue
View File

@ -99,7 +99,7 @@
<!-- <el-table-column label="主键id" align="center" prop="id" /> --> <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
<el-table-column label="批次编号" align="center" prop="batchCode" /> <el-table-column label="批次编号" align="center" prop="batchCode" />
<el-table-column label="批次名称" align="center" prop="batchName" /> <el-table-column label="批次名称" align="center" prop="batchName" />
<el-table-column label="备注信息" align="center" prop="remark" /> <el-table-column label="备注信息" align="center" prop="remark" :show-overflow-tooltip="true" />
<el-table-column label="创建人" align="center" prop="createBy" /> <el-table-column label="创建人" align="center" prop="createBy" />
<el-table-column label="创建时间" align="center" prop="createTime" /> <el-table-column label="创建时间" align="center" prop="createTime" />
<!-- <el-table-column label="修改人" align="center" prop="updateBy" /> <!-- <el-table-column label="修改人" align="center" prop="updateBy" />