From 2ff59bd14d4b8f2ec46a80190ef540e6d88f3766 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Thu, 29 Jul 2021 20:06:40 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises
---
src/views/singleperformance/index.vue | 64 ++++++++++++++++----------------
1 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/src/views/singleperformance/index.vue b/src/views/singleperformance/index.vue
index 792827c..b0626d4 100644
--- a/src/views/singleperformance/index.vue
+++ b/src/views/singleperformance/index.vue
@@ -6,7 +6,7 @@
* menu-name 成绩管理
*/
<template>
- <el-row class="morpheus-box">
+ <el-row class="morpheus-box-score">
<el-col :span="24">
<el-card>
@@ -107,7 +107,7 @@
excelBtn: true,
excelBtnText: '成绩导出',
viewBtn: true,
- title: '成绩',
+ // title: '成绩',
align: 'center',
height: 'auto',
@@ -129,7 +129,7 @@
label: "试卷名称",
prop: "examName",
search: true,
- searchSpan: 4,
+ searchSpan: 5,
slot: true,
// 表单新增时是否禁止
addDisabled: false,
@@ -175,14 +175,14 @@
},
{
label: "所属公司",
- prop: "company",
+ prop: "companyName",
search: true,
- searchSpan: 4,
- dicUrl: '/api/blade-system/dept/tree',
- props: {
- label: "title",
- value: "id",
- },
+ searchSpan: 5,
+ // dicUrl: '/api/blade-system/dept/tree',
+ // props: {
+ // label: "title",
+ // value: "id",
+ // },
slot: true,
// 表单新增时是否禁止
addDisabled: false,
@@ -260,28 +260,28 @@
editDetail: false,
rules: [{ validator: validatePass, required: true, trigger: 'blur' }],
},
- {
- label: "总成绩",
- prop: "allGrade",
- slot: true,
- // 表单新增时是否禁止
- addDisabled: false,
- // 表单新增时是否可见
- addDisplay: true,
- // 表单新增时是否为查看模式
- addDetail: false,
- // 表单编辑时是否禁止
- editDisabled: true,
- // 表单编辑时是否可见
- editDisplay: true,
- // 表单编辑时是否为查看模式
- editDetail: false,
- rules: [{
- required: true,
- message: "请输入考试名称",
- trigger: "blur"
- }]
- },
+ // {
+ // label: "总成绩",
+ // prop: "allGrade",
+ // slot: true,
+ // // 表单新增时是否禁止
+ // addDisabled: false,
+ // // 表单新增时是否可见
+ // addDisplay: true,
+ // // 表单新增时是否为查看模式
+ // addDetail: false,
+ // // 表单编辑时是否禁止
+ // editDisabled: true,
+ // // 表单编辑时是否可见
+ // editDisplay: true,
+ // // 表单编辑时是否为查看模式
+ // editDetail: false,
+ // rules: [{
+ // required: true,
+ // message: "请输入考试名称",
+ // trigger: "blur"
+ // }]
+ // },
{
label: "是否合格",
prop: "qualified",
--
Gitblit v1.9.3