From 0caae4016eb87ea3a5d5ee472c1ddd22c38fe0c9 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sun, 25 Jun 2023 17:41:09 +0800
Subject: [PATCH] 晋城保安系统

---
 src/views/trainExam/singleperformance.vue |   91 +++++++++++++++++++++++++--------------------
 1 files changed, 50 insertions(+), 41 deletions(-)

diff --git a/src/views/trainExam/singleperformance.vue b/src/views/trainExam/singleperformance.vue
index deeef57..ac365f2 100644
--- a/src/views/trainExam/singleperformance.vue
+++ b/src/views/trainExam/singleperformance.vue
@@ -29,7 +29,7 @@
       @refresh-change="refreshChange"
     >
       <template slot-scope="{ row }" slot="learnGrade">
-        {{ row.learnGrade == -1 ? "暂未录入" : row.learnGrade }}
+        {{ row.learnGrade == -1 ? "暂未录入" : row.learnGrade==0?'合格':'不合格'}}
       </template>
       <template slot-scope="{ row }" slot="theoryGrade">
         {{ row.theoryGrade == -1 ? "" : row.theoryGrade }}
@@ -298,17 +298,10 @@
             width: 140
           },
           {
-            label: "所属公司",
-            prop: "companyName",
+            label: "从业单位",
+            prop: "unitName",
             search: true,
-            sortable: true,
             searchSpan: 4,
-            // dicUrl: '/api/blade-system/dept/tree',
-            // props: {
-            //     label: "title",
-            //     value: "id",
-            // },
-            slot: true,
             // 表单新增时是否禁止
             addDisabled: false,
             // 表单新增时是否可见
@@ -321,15 +314,15 @@
             editDisplay: true,
             // 表单编辑时是否为查看模式
             editDetail: false,
-            overHidden: true,
             rules: [
               {
                 required: true,
-                message: "请输入所属公司",
+                message: "请输入从业单位",
                 trigger: "blur"
               }
             ],
-            minWidth: 230
+            // width: 180,
+            overHidden: true
           },
           {
             label: "考试开始时间",
@@ -443,8 +436,9 @@
           {
             label: "实操成绩",
             prop: "learnGrade",
+            type: "select",
             slot: true,
-            sortable: true,
+            // sortable: true,
             // 表单新增时是否禁止
             addDisabled: false,
             // 表单新增时是否可见
@@ -458,36 +452,47 @@
             // 表单编辑时是否为查看模式
             editDetail: false,
             width: 95,
-            rules: [
-              { validator: validatePass, required: true, trigger: "blur" }
-            ]
-          },
-          {
-            label: "总成绩",
-            prop: "allGrade",
-            slot: true,
-            sortable: true,
-            // 表单新增时是否禁止
-            addDisabled: false,
-            // 表单新增时是否可见
-            addDisplay: true,
-            // 表单新增时是否为查看模式
-            addDetail: false,
-            // 表单编辑时是否禁止
-            editDisabled: true,
-            // 表单编辑时是否可见
-            editDisplay: true,
-            // 表单编辑时是否为查看模式
-            editDetail: false,
-            width: 80,
-            rules: [
+            dicData: [
               {
-                required: true,
-                message: "请输入考试名称",
-                trigger: "blur"
+                label: "合格",
+                value: 0
+              },
+              {
+                label: "不合格",
+                value: 1
+              },
+              {
+                label: "暂未录实操成绩",
+                value: 2
               }
-            ]
+            ],
           },
+          // {
+          //   label: "总成绩",
+          //   prop: "allGrade",
+          //   slot: true,
+          //   sortable: true,
+          //   // 表单新增时是否禁止
+          //   addDisabled: false,
+          //   // 表单新增时是否可见
+          //   addDisplay: true,
+          //   // 表单新增时是否为查看模式
+          //   addDetail: false,
+          //   // 表单编辑时是否禁止
+          //   editDisabled: true,
+          //   // 表单编辑时是否可见
+          //   editDisplay: true,
+          //   // 表单编辑时是否为查看模式
+          //   editDetail: false,
+          //   width: 80,
+          //   rules: [
+          //     {
+          //       required: true,
+          //       message: "请输入考试名称",
+          //       trigger: "blur"
+          //     }
+          //   ]
+          // },
           {
             label: "是否合格",
             prop: "qualified",
@@ -509,6 +514,10 @@
               {
                 label: "暂未录实操成绩",
                 value: 2
+              },
+              {
+                label: "暂未录实操成绩",
+                value: -1
               }
             ],
             // 表单新增时是否禁止

--
Gitblit v1.9.3