Commit a08d9124 by zhaopanyu

zpy 9.3修改教学成绩

parent 7ad8e234
...@@ -11,7 +11,8 @@ ...@@ -11,7 +11,8 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="学年" prop="schoolYear"> <el-form-item label="学年" prop="schoolYear">
<el-select v-model="queryParams.schoolYear" clearable placeholder="请选择" style="width: 100%;"> <el-select v-model="queryParams.schoolYear" clearable placeholder="请选择"
style="width: 100%;">
<el-option v-for="dict in dict.type.yearda" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.yearda" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -23,8 +24,8 @@ ...@@ -23,8 +24,8 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="学期" prop="semester"> <el-form-item label="学期" prop="semester">
<el-select v-model="queryParams.semester" clearable placeholder="请选择" style="width: 100%;"> <el-select v-model="queryParams.semester" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value"
:value="dict.value"> :label="dict.label" :value="dict.value">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -52,8 +53,8 @@ ...@@ -52,8 +53,8 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="学科" prop="sub"> <el-form-item label="学科" prop="sub">
<el-select v-model="queryParams.sub" clearable placeholder="请选择" style="width: 100%;"> <el-select v-model="queryParams.sub" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
:value="dict.value"> :label="dict.label" :value="dict.value">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -62,15 +63,15 @@ ...@@ -62,15 +63,15 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="考试开始时间" prop="startTime"> <el-form-item label="考试开始时间" prop="startTime">
<el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="yyyy-MM-dd" <el-date-picker clearable v-model="queryParams.startTime" type="date"
placeholder="请选择" style="width: 100%;"> value-format="yyyy-MM-dd" placeholder="请选择" style="width: 100%;">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="考试结束时间" prop="endTime"> <el-form-item label="考试结束时间" prop="endTime">
<el-date-picker clearable v-model="queryParams.endTime" type="date" value-format="yyyy-MM-dd" <el-date-picker clearable v-model="queryParams.endTime" type="date"
placeholder="请选择" style="width: 100%;"> value-format="yyyy-MM-dd" placeholder="请选择" style="width: 100%;">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -128,8 +129,8 @@ ...@@ -128,8 +129,8 @@
v-hasPermi="['system:achievements:edit']">修改</el-button> v-hasPermi="['system:achievements:edit']">修改</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
v-hasPermi="['system:achievements:remove']">删除</el-button> @click="handleDelete" v-hasPermi="['system:achievements:remove']">删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="success" plain icon="el-icon-upload" size="mini" @click="handleImport" <el-button type="success" plain icon="el-icon-upload" size="mini" @click="handleImport"
...@@ -147,7 +148,7 @@ ...@@ -147,7 +148,7 @@
:default-sort="{ prop: 'examTime', order: 'descending' }" :row-style="{ height: '1px' }" :default-sort="{ prop: 'examTime', order: 'descending' }" :row-style="{ height: '1px' }"
:cell-style="{ padding: '0px' }" :header-cell-style="{ height: '50px', fontSize: '12px', padding: '0 0' }"> :cell-style="{ padding: '0px' }" :header-cell-style="{ height: '50px', fontSize: '12px', padding: '0 0' }">
<el-table-column type="selection" width="30" align="center" /> <el-table-column type="selection" width="30" align="center" />
<el-table-column type="index" label="序号" width="30" align="center" sortable /> <el-table-column type="index" label="序号" width="30" align="center" sortable />
<el-table-column label="学年" align="center" prop="schoolYear" sortable fixed="left" width="80px" <el-table-column label="学年" align="center" prop="schoolYear" sortable fixed="left" width="80px"
show-overflow-tooltip /> show-overflow-tooltip />
<el-table-column label="学期" align="center" prop="semester" sortable fixed="left" width="80px" <el-table-column label="学期" align="center" prop="semester" sortable fixed="left" width="80px"
...@@ -190,8 +191,12 @@ ...@@ -190,8 +191,12 @@
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<!-- 新加 优生增量和常规增量-->
<el-table-column label="优生增量" align="center" prop="yszl" sortable show-overflow-tooltip />
<el-table-column label="常规增量" align="center" prop="cgzl" sortable show-overflow-tooltip />
<el-table-column label="增量分" align="center" prop="assessmentScore" sortable show-overflow-tooltip /> <el-table-column label="增量分" align="center" prop="assessmentScore" sortable show-overflow-tooltip />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180px" fixed="right"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180px"
fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['system:achievements:edit']">修改</el-button> v-hasPermi="['system:achievements:edit']">修改</el-button>
...@@ -201,14 +206,15 @@ ...@@ -201,14 +206,15 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
@pagination="getList" /> :limit.sync="queryParams.pageSize" @pagination="getList" />
<el-dialog :title="title" :visible.sync="uploadOpen" width="520px" append-to-body inline @close="cancel"> <el-dialog :title="title" :visible.sync="uploadOpen" width="520px" append-to-body inline @close="cancel">
<el-form ref="uploadForm" :model="uploadForm" :rules="rules" label-width="70px"> <el-form ref="uploadForm" :model="uploadForm" :rules="rules" label-width="70px">
<el-form-item prop="dataUrl"> <el-form-item prop="dataUrl">
<el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers" <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
:action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading" :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
:on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag> :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false"
drag>
<i class="el-icon-upload"></i> <i class="el-icon-upload"></i>
<div class="el-upload__text">将文件拖到此处,或<em>点击上传</em></div> <div class="el-upload__text">将文件拖到此处,或<em>点击上传</em></div>
<div class="el-upload__tip text-center" slot="tip"> <div class="el-upload__tip text-center" slot="tip">
...@@ -247,8 +253,8 @@ ...@@ -247,8 +253,8 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="学期" prop="semester"> <el-form-item label="学期" prop="semester">
<el-select v-model="form.semester" clearable placeholder="请选择" style="width: 100%;"> <el-select v-model="form.semester" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value"
:value="dict.value"></el-option> :label="dict.label" :value="dict.value"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -307,8 +313,8 @@ ...@@ -307,8 +313,8 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="学科" prop="sub"> <el-form-item label="学科" prop="sub">
<el-select v-model="form.sub" placeholder="请选择" style="width: 100%;" clearable> <el-select v-model="form.sub" placeholder="请选择" style="width: 100%;" clearable>
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
:value="dict.value"> :label="dict.label" :value="dict.value">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -322,7 +328,8 @@ ...@@ -322,7 +328,8 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="班级类型" prop="classType"> <el-form-item label="班级类型" prop="classType">
<el-select v-model="form.classType" multiple placeholder="请选择" clearable style="width: 100%;"> <el-select v-model="form.classType" multiple placeholder="请选择" clearable
style="width: 100%;">
<el-option v-for="dict in dict.type.class_type" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.class_type" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment