dedsudiyu 1 dzień temu
rodzic
commit
fa1eb013c8
27 zmienionych plików z 92 dodań i 81 usunięć
  1. 1 1
      src/i18n/config/en.js
  2. 1 1
      src/views/safetyEducationExaminationNew/components/examRecords.vue
  3. 1 1
      src/views/safetyEducationExaminationNew/courseManagement/courseManagement/basicSettings.vue
  4. 1 1
      src/views/safetyEducationExaminationNew/courseManagement/courseManagement/index.vue
  5. 6 6
      src/views/safetyEducationExaminationNew/courseManagement/courseManagement/studyCourses.vue
  6. 1 1
      src/views/safetyEducationExaminationNew/dataStatistics/LabPersonMatch.vue
  7. 1 1
      src/views/safetyEducationExaminationNew/examManagement/examinationArrange/addPage.vue
  8. 2 2
      src/views/safetyEducationExaminationNew/examManagement/examinationArrange/index.vue
  9. 2 2
      src/views/safetyEducationExaminationNew/examManagement/examinationResult/index.vue
  10. 3 3
      src/views/safetyEducationExaminationNew/featurePage/learningCourse/index.vue
  11. 3 3
      src/views/safetyEducationExaminationNew/featurePage/learningMaterials/index.vue
  12. 8 8
      src/views/safetyEducationExaminationNew/featurePage/mockExam/index.vue
  13. 8 8
      src/views/safetyEducationExaminationNew/featurePage/startPracticing/index.vue
  14. 5 5
      src/views/safetyEducationExaminationNew/featurePage/startTheExam/index.vue
  15. 8 8
      src/views/safetyEducationExaminationNew/featurePage/startTraining/index.vue
  16. 13 2
      src/views/safetyEducationExaminationNew/personnelApproval/index.vue
  17. 1 1
      src/views/safetyEducationExaminationNew/publicConfiguration/basicConfiguration/classHoursConfiguration.vue
  18. 1 1
      src/views/safetyEducationExaminationNew/publicConfiguration/knowledgePointManagement/index.vue
  19. 4 4
      src/views/safetyEducationExaminationNew/safetyEducation/knowledgeLearning/index.vue
  20. 1 1
      src/views/safetyEducationExaminationNew/safetyEducation/learningTasks/index.vue
  21. 5 5
      src/views/safetyEducationExaminationNew/safetyTest/mockExam/index.vue
  22. 5 3
      src/views/safetyEducationExaminationNew/safetyTest/myGrades/index.vue
  23. 5 5
      src/views/safetyEducationExaminationNew/safetyTest/onlineExam/index.vue
  24. 3 3
      src/views/safetyEducationExaminationNew/safetyTest/practiceQuestions/index.vue
  25. 2 2
      src/views/safetyEducationExaminationNew/trainingManagement/trainingManagement/index.vue
  26. 0 2
      src/views/safetyEducationExaminationNew/workbench/TaskCard.vue
  27. 1 1
      src/views/safetyEducationExaminationNew/workbench/UserInfoCard.vue

+ 1 - 1
src/i18n/config/en.js

@@ -468,7 +468,7 @@ export default {
     editCourse: 'Edit Course',
     createCourse: 'Create Course',
     studyCourseMaterials: 'Study Course Materials',
-    published: 'Published?',
+    published: 'Published',
     captchaDialogVerification: 'Captcha Dialog Verification',
     courseCover: 'Course Cover',
     whenEnabledEvery: 'When enabled, every',

+ 1 - 1
src/views/safetyEducationExaminationNew/components/examRecords.vue

@@ -217,7 +217,7 @@
         display: flex;
         p{
           border:1px solid #DCDFE6;
-          width:80px;
+          padding:0 20px;
           text-align: center;
           height:40px;
           line-height:40px;

+ 1 - 1
src/views/safetyEducationExaminationNew/courseManagement/courseManagement/basicSettings.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="page-container courseManagement-basicSettings">
     <div class="content-box scrollbar-box">
-      <el-form class="add-form-box" :model="newData" ref="form" :rules="rules" label-width="120px">
+      <el-form class="add-form-box" :model="newData" ref="form" :rules="rules" label-width="140px">
         <div class="form-big-box">
           <div class="form-box">
             <div class="form-flex-box">

+ 1 - 1
src/views/safetyEducationExaminationNew/courseManagement/courseManagement/index.vue

@@ -101,7 +101,7 @@
           <el-table-column :label="$t('literal.totalCourseMaterials')" prop="coursewareTotalCount" width="100" show-overflow-tooltip/>
           <el-table-column :label="$t('literal.totalDuration')" prop="totalLearningDuration" width="100" show-overflow-tooltip/>
           <el-table-column :label="$t('literal.earnedStudyHours')" prop="totalCreditHours" width="100" show-overflow-tooltip/>
-          <el-table-column :label="$t('tableTitle.status')" prop="shelfStatus" width="100" show-overflow-tooltip>
+          <el-table-column :label="$t('tableTitle.status')" prop="shelfStatus" width="120" show-overflow-tooltip>
             <template slot-scope="scope">
               <span style="padding:2px 10px;border:1px solid #5AD8A6;border-radius:4px;color: #5AD8A6;background-color:rgba(90, 216, 166,0.2)" v-if="scope.row.shelfStatus==1">{{ $t('literal.published') }}</span>
               <span style="padding:2px 10px;border:1px solid #999999;border-radius:4px;color: #999999;background-color:rgba(153, 153, 153,0.2)" v-if="scope.row.shelfStatus==0">{{ $t('literal.unpublished') }}</span>

+ 6 - 6
src/views/safetyEducationExaminationNew/courseManagement/courseManagement/studyCourses.vue

@@ -582,11 +582,11 @@
             font-size:14px;
             border-radius: 4px;
             border:1px solid #999;
-            width: 500px;
+            width: 300px;
           }
           p:nth-child(3){
             font-size:14px;
-            width: 448px;
+            width: 648px;
             margin:0 20px;
             color:#0183fa;
           }
@@ -631,7 +631,7 @@
               height:40px;
             }
             p:nth-child(1){
-              width:400px;
+              width:300px;
               text-align: left;
             }
             p:nth-child(2){
@@ -639,7 +639,7 @@
               text-align: center;
             }
             p:nth-child(3){
-              width:140px;
+              width:240px;
               text-align: center;
             }
             p:nth-child(4){
@@ -665,7 +665,7 @@
               height:40px;
             }
             p:nth-child(1){
-              width:400px;
+              width:300px;
               text-align: left;
             }
             p:nth-child(2){
@@ -673,7 +673,7 @@
               text-align: center;
             }
             p:nth-child(3){
-              width:140px;
+              width:240px;
               text-align: center;
             }
             p:nth-child(4){

+ 1 - 1
src/views/safetyEducationExaminationNew/dataStatistics/LabPersonMatch.vue

@@ -453,7 +453,7 @@ export default {
       display: flex;
       p {
         border: 1px solid #DCDFE6;
-        width: 80px;
+        padding:0 20px;
         text-align: center;
         height: 40px;
         line-height: 40px;

+ 1 - 1
src/views/safetyEducationExaminationNew/examManagement/examinationArrange/addPage.vue

@@ -1507,7 +1507,7 @@
       line-height: 40px;
       border-radius: 4px;
       text-align: center;
-      width: 80px;
+      padding:0 20px;
       cursor: pointer;
     }
 

+ 2 - 2
src/views/safetyEducationExaminationNew/examManagement/examinationArrange/index.vue

@@ -101,7 +101,7 @@
           </el-table-column>
           <el-table-column :label="$t('tableTitle.examType')" prop="examTypeName" width="140" show-overflow-tooltip/>
           <el-table-column :label="$t('tableTitle.safetyCategory')" prop="disciplineTypeName" width="140" show-overflow-tooltip/>
-          <el-table-column :label="$t('tableTitle.isShared')" prop="shareStatus" width="120" show-overflow-tooltip>
+          <el-table-column :label="$t('tableTitle.isShared')" prop="shareStatus" width="130" show-overflow-tooltip>
             <template slot-scope="scope">
               <span style="padding:2px 10px;border:1px solid rgb(1, 131, 251);border-radius:4px;color: rgb(1, 131, 251);background-color:rgba(1, 131, 251,0.2)" v-if="scope.row.shareStatus==1">{{$t('tableTitle.shared')}}</span>
               <span style="padding:2px 10px;border:1px solid rgb(245, 154, 35);border-radius:4px;color: rgb(245, 154, 35);background-color:rgba(245, 154, 35,0.2)" v-if="scope.row.shareStatus==0">{{$t('tableTitle.notShared')}}</span>
@@ -127,7 +127,7 @@
               <span>{{scope.row.status==0?$t('literal.disabled'):(scope.row.status==1?$t('literal.notStarted'):(scope.row.status==2?$t('literal.inProgress'):(scope.row.status==3?$t('literal.ended'):'')))}}</span>
             </template>
           </el-table-column>
-          <el-table-column :label="$t('tableTitle.action')" width="220" show-overflow-tooltip v-if="tableButtonType">
+          <el-table-column :label="$t('tableTitle.action')" width="240" show-overflow-tooltip v-if="tableButtonType">
             <template slot-scope="scope">
               <div class="table-button-box">
                 <p class="table-button-null"></p>

+ 2 - 2
src/views/safetyEducationExaminationNew/examManagement/examinationResult/index.vue

@@ -73,7 +73,7 @@
       <div class="page-content-box">
         <el-table class="table-box"  border :data="dataList">
           <el-table-column :label="$t('tableTitle.examName')" prop="examName"  show-overflow-tooltip/>
-          <el-table-column :label="$t('tableTitle.examType')" prop="examTypeName" width="200" show-overflow-tooltip/>
+          <el-table-column :label="$t('tableTitle.examType')" prop="examTypeName" width="140" show-overflow-tooltip/>
           <el-table-column :label="$t('tableTitle.examTime')" prop="startTime" width="290" show-overflow-tooltip>
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.startTime,"{y}-{m}-{d} {h}:{i}") }} {{$t('tableTitle.to')}} {{ parseTime(scope.row.endTime,"{y}-{m}-{d} {h}:{i}") }}</span>
@@ -83,7 +83,7 @@
           <el-table-column :label="$t('literal.numberPassed')" prop="passedCount" width="140" show-overflow-tooltip/>
           <el-table-column :label="$t('literal.numberAbsent')" prop="absentCount" width="140" show-overflow-tooltip/>
           <el-table-column :label="$t('literal.numberOfMakeupExamCandidates')" prop="makeupCount" width="140" show-overflow-tooltip/>
-          <el-table-column :label="$t('tableTitle.action')" width="200" show-overflow-tooltip v-if="tableButtonType">
+          <el-table-column :label="$t('tableTitle.action')" width="250" show-overflow-tooltip v-if="tableButtonType">
             <template slot-scope="scope">
               <div class="table-button-box">
                 <p class="table-button-null"></p>

+ 3 - 3
src/views/safetyEducationExaminationNew/featurePage/learningCourse/index.vue

@@ -11,7 +11,7 @@
       </div>
       <div class="right-max-big-box">
         <p class="title-p">{{newData.courseName}}</p>
-        <div class="text-p" style="color:#666;">{{secondsToMinutes(newData.totalDuration)}}{{ $t('literal.minutes') }}{{newData.totalCreditHours}}{{ $t('literal.studyHours') }}{{newData.totalPoints}}{{ $t('literal.points') }}</div>
+        <div class="text-p" style="color:#666;">{{secondsToMinutes(newData.totalDuration)}} {{ $t('literal.minutes') }} {{newData.totalCreditHours}} {{ $t('literal.studyHours') }} {{newData.totalPoints}} {{ $t('literal.points') }}</div>
         <div class="text-p">{{ $t('literal.studied') }} {{newData.learnedCoursewareCount}} {{ $t('literal.total') }} {{newData.totalCoursewareCount}} {{ $t('literal.courseMaterials') }}</div>
         <div class="progress-box">
           <p class="progress-title-box">{{ $t('literal.learningProgress') }}</p>
@@ -25,7 +25,7 @@
             <div class="for-big-box" @click="checkLearningButton(index)"
                  :class="checkLearningIndex == index ?'check-for-box':''">
               <p>{{item.coursewareName}}</p>
-              <p>{{ $t('literal.studied') }}{{formatTime(item.learnedDuration)}} / {{formatTime(item.minLearningDuration)}}</p>
+              <p>{{ $t('literal.studied') }} {{formatTime(item.learnedDuration)}} / {{formatTime(item.minLearningDuration)}}</p>
               <p :class="item.learnStatus ==2 ?'colorA':(item.learnStatus ==1 ?'colorB':'')">{{item.learnStatus==2?$t('literal.completed'):(item.learnStatus==1?$t('literal.inProgress'):$t('literal.notCompleted'))}}</p>
             </div>
             <p class="for-button" @click="finishStudying(index)"
@@ -458,7 +458,7 @@
                 color:#fff;
                 background-color: #999;
                 border-radius:4px;
-                width:60px;
+                padding:0 10px;
                 line-height:24px;
                 text-align: center;
               }

+ 3 - 3
src/views/safetyEducationExaminationNew/featurePage/learningMaterials/index.vue

@@ -11,7 +11,7 @@
       </div>
       <div class="right-max-big-box">
         <p class="title-p">{{newData.coursewareName}}</p>
-        <div class="text-p" style="color:#666;">{{secondsToMinutes(newData.minLearningDuration)}}{{ $t('literal.minutes') }}{{newData.creditHours}}{{ $t('literal.studyHours') }}{{newData.points}}{{ $t('literal.points') }}</div>
+        <div class="text-p" style="color:#666;">{{secondsToMinutes(newData.minLearningDuration)}} {{ $t('literal.minutes') }} {{newData.creditHours}} {{ $t('literal.studyHours') }} {{newData.points}} {{ $t('literal.points') }}</div>
         <!--<div class="text-p">已学 {{newData.learnedCoursewareCount}} / 总 {{newData.totalCoursewareCount}} 课件</div>-->
         <div class="progress-box">
           <p class="progress-title-box">{{ $t('literal.learningProgress') }}</p>
@@ -26,7 +26,7 @@
                  :class="checkLearningIndex == index ?'check-for-box':''">
               <!--<p>{{item.coursewareName}}</p>-->
               <p></p>
-              <p>{{ $t('literal.studied') }}{{formatTime(item.learnedDuration)}} / {{formatTime(item.minLearningDuration)}}</p>
+              <p>{{ $t('literal.studied') }} {{formatTime(item.learnedDuration)}} / {{formatTime(item.minLearningDuration)}}</p>
               <p :class="item.learnStatus ==2 ?'colorA':(item.learnStatus ==1 ?'colorB':'')">{{item.learnStatus==2?$t('literal.completed'):(item.learnStatus==1?$t('literal.inProgress'):$t('literal.notCompleted'))}}</p>
             </div>
             <p class="for-button" @click="finishStudying(index)"
@@ -366,7 +366,7 @@
                 color:#fff;
                 background-color: #999;
                 border-radius:4px;
-                width:60px;
+                padding:0 10px;
                 line-height:24px;
                 text-align: center;
               }

+ 8 - 8
src/views/safetyEducationExaminationNew/featurePage/mockExam/index.vue

@@ -9,14 +9,14 @@
       <!-- 左侧面板 -->
       <div class="left-panel">
         <div class="exam-title">{{ examInfo.examTypeName }}</div>
-        <div class="exam-subtitle">{{ $t('literal.total') }}{{ examInfo.questionCount }}{{ $t('literal.questionsTotal') }}{{ examInfo.totalScore }}{{ $t('literal.points') }}</div>
+        <div class="exam-subtitle">{{ $t('literal.total') }} {{ examInfo.questionCount }} {{ $t('literal.questionsTotal') }} {{ examInfo.totalScore }} {{ $t('literal.points') }}</div>
         <div class="exam-name-box">{{ examInfo.examName }}</div>
         <div class="question-group-max-box">
           <!-- 题目导航 -->
           <div v-for="(item,index) in questionTypeGroups" :key="index" class="question-group">
             <div class="group-header">
               <span class="group-title">{{ item.questionTypeName }}</span>
-              <span class="group-count">{{ item.questionCount }}{{ $t('literal.questionsTotal') }}{{ item.totalScore }}{{ $t('literal.points') }}</span>
+              <span class="group-count">{{ item.questionCount }} {{ $t('literal.questionsTotal') }} {{ item.totalScore }} {{ $t('literal.points') }}</span>
             </div>
             <div class="question-nums">
               <div
@@ -39,11 +39,11 @@
       <div class="right-panel" v-if="currentQuestion">
         <div class="num-flex-box">
           <p class="null-p"></p>
-          <p class="text-p">{{ $t('literal.correct') }}{{correct}} {{ $t('literal.questions') }}</p>
+          <p class="text-p">{{ $t('literal.correct') }} {{correct}} {{ $t('literal.questions') }}</p>
           <p>丨</p>
-          <p class="text-p">{{ $t('literal.incorrect') }}{{incorrect}} {{ $t('literal.questions') }}</p>
+          <p class="text-p">{{ $t('literal.incorrect') }} {{incorrect}} {{ $t('literal.questions') }}</p>
           <p>丨</p>
-          <p class="text-p">{{ $t('literal.accuracy') }}{{ (accuracy * 100).toFixed(0) }}%</p>
+          <p class="text-p">{{ $t('literal.accuracy') }} {{ (accuracy * 100).toFixed(0) }}%</p>
           <p class="null-p"></p>
         </div>
         <div class="question-card scrollbar-box">
@@ -876,7 +876,7 @@
               background-color: #0183fa;
               color:#fff;
               font-size:14px;
-              width:80px;
+              padding:0 20px;
               text-align: center;
               border-radius:4px;
               margin-right:30px;
@@ -1132,14 +1132,14 @@
           .button-p-1{
             cursor: pointer;
             margin-right:10px;
-            width:100px;
+            padding:0 10px;
             border:1px solid #0183fa;
             color:#0183fa;
             background-color: #fff;
           }
           .button-p-2{
             cursor: pointer;
-            width:100px;
+            padding:0 10px;
             border:1px solid #0183fa;
             color:#fff;
             background-color: #0183fa;

+ 8 - 8
src/views/safetyEducationExaminationNew/featurePage/startPracticing/index.vue

@@ -9,14 +9,14 @@
       <!-- 左侧面板 -->
       <div class="left-panel">
         <div class="exam-title">{{ $t('literal.questionPractice') }}</div>
-        <div class="exam-subtitle">{{ $t('literal.total') }}{{ examInfo.totalCount }}{{ $t('literal.questions') }}</div>
+        <div class="exam-subtitle">{{ $t('literal.total') }} {{ examInfo.totalCount }} {{ $t('literal.questions') }}</div>
         <div class="exam-name-box">{{ examInfo.knowledgePointName }}</div>
         <div class="question-group-max-box">
           <!-- 题目导航 -->
           <div v-for="(item,index) in questionTypeGroups" :key="index" class="question-group">
             <div class="group-header">
               <span class="group-title">{{ item.questionTypeName }}</span>
-              <span class="group-count">{{ item.count }}{{ $t('literal.questions') }}</span>
+              <span class="group-count">{{ item.count }} {{ $t('literal.questions') }}</span>
             </div>
             <div class="question-nums">
               <div
@@ -34,11 +34,11 @@
       <div class="right-panel" v-if="currentQuestion">
         <div class="num-flex-box">
           <p class="null-p"></p>
-          <p class="text-p">{{ $t('literal.correct') }}{{correct}} {{ $t('literal.questions') }}</p>
+          <p class="text-p">{{ $t('literal.correct') }} {{correct}} {{ $t('literal.questions') }}</p>
           <p>丨</p>
-          <p class="text-p">{{ $t('literal.incorrect') }}{{incorrect}} {{ $t('literal.questions') }}</p>
+          <p class="text-p">{{ $t('literal.incorrect') }} {{incorrect}} {{ $t('literal.questions') }}</p>
           <p>丨</p>
-          <p class="text-p">{{ $t('literal.accuracy') }}{{ (accuracy * 100).toFixed(0) }}%</p>
+          <p class="text-p">{{ $t('literal.accuracy') }} {{ (accuracy * 100).toFixed(0) }}%</p>
           <p class="null-p"></p>
         </div>
         <div class="question-card scrollbar-box">
@@ -752,7 +752,7 @@
               background-color: #0183fa;
               color:#fff;
               font-size:14px;
-              width:80px;
+              padding:0 20px;
               text-align: center;
               border-radius:4px;
               margin-right:30px;
@@ -1008,14 +1008,14 @@
           .button-p-1{
             cursor: pointer;
             margin-right:10px;
-            width:100px;
+            padding:0 10px;
             border:1px solid #0183fa;
             color:#0183fa;
             background-color: #fff;
           }
           .button-p-2{
             cursor: pointer;
-            width:100px;
+            padding:0 10px;
             border:1px solid #0183fa;
             color:#fff;
             background-color: #0183fa;

+ 5 - 5
src/views/safetyEducationExaminationNew/featurePage/startTheExam/index.vue

@@ -9,7 +9,7 @@
       <!-- 左侧面板 -->
       <div class="left-panel">
         <div class="exam-title">{{ examInfo.examTypeName }}</div>
-        <div class="exam-subtitle">{{ $t('literal.total') }}{{ examInfo.questionCount }}{{ $t('literal.questionsTotal') }}{{ examInfo.totalScore }}{{ $t('literal.points') }}</div>
+        <div class="exam-subtitle">{{ $t('literal.total') }} {{ examInfo.questionCount }} {{ $t('literal.questionsTotal') }} {{ examInfo.totalScore }} {{ $t('literal.points') }}</div>
         <div class="exam-name-box">{{ examInfo.examName }}</div>
         <p class="examKindType" v-if="examInfo.examKind== 2">{{ $t('literal.makeupExam') }}</p>
         <div class="question-group-max-box">
@@ -17,7 +17,7 @@
           <div v-for="(item,index) in questionTypeGroups" :key="index" class="question-group">
             <div class="group-header">
               <span class="group-title">{{ item.questionTypeName }}</span>
-              <span class="group-count">{{ item.questionCount }}{{ $t('literal.questionsTotal') }}{{ item.totalScore }}{{ $t('literal.points') }}</span>
+              <span class="group-count">{{ item.questionCount }} {{ $t('literal.questionsTotal') }} {{ item.totalScore }} {{ $t('literal.points') }}</span>
             </div>
             <div class="question-nums">
               <div
@@ -1167,21 +1167,21 @@
           .button-p-1{
             cursor: pointer;
             margin-right:10px;
-            width:100px;
+            padding:0 10px;
             border:1px solid #0183fa;
             color:#0183fa;
             background-color: #fff;
           }
           .button-p-2{
             cursor: pointer;
-            width:100px;
+            padding:0 10px;
             border:1px solid #0183fa;
             color:#fff;
             background-color: #0183fa;
           }
           .button-p-3{
             cursor: pointer;
-            width:150px;
+            padding:0 10px;
             border:1px solid #0183fa;
             color:#fff;
             background-color: #0183fa;

+ 8 - 8
src/views/safetyEducationExaminationNew/featurePage/startTraining/index.vue

@@ -9,14 +9,14 @@
       <!-- 左侧面板 -->
       <div class="left-panel">
         <div class="exam-title">{{ $t('literal.questionPractice') }}</div>
-        <div class="exam-subtitle">{{ $t('literal.total') }}{{ examInfo.totalCount }}{{ $t('literal.questions') }}</div>
+        <div class="exam-subtitle">{{ $t('literal.total') }} {{ examInfo.totalCount }} {{ $t('literal.questions') }}</div>
         <div class="exam-name-box">{{ examInfo.knowledgePointName }}</div>
         <div class="question-group-max-box">
           <!-- 题目导航 -->
           <div v-for="(item,index) in questionTypeGroups" :key="index" class="question-group">
             <div class="group-header">
               <span class="group-title">{{ item.questionTypeName }}</span>
-              <span class="group-count">{{ item.count }}{{ $t('literal.questions') }}</span>
+              <span class="group-count">{{ item.count }} {{ $t('literal.questions') }}</span>
             </div>
             <div class="question-nums">
               <div
@@ -34,11 +34,11 @@
       <div class="right-panel" v-if="currentQuestion">
         <div class="num-flex-box">
           <p class="null-p"></p>
-          <p class="text-p">{{ $t('literal.correct') }}{{correct}} {{ $t('literal.questions') }}</p>
+          <p class="text-p">{{ $t('literal.correct') }} {{correct}} {{ $t('literal.questions') }}</p>
           <p>丨</p>
-          <p class="text-p">{{ $t('literal.incorrect') }}{{incorrect}} {{ $t('literal.questions') }}</p>
+          <p class="text-p">{{ $t('literal.incorrect') }} {{incorrect}} {{ $t('literal.questions') }}</p>
           <p>丨</p>
-          <p class="text-p">{{ $t('literal.accuracy') }}{{ (accuracy * 100).toFixed(0) }}%</p>
+          <p class="text-p">{{ $t('literal.accuracy') }} {{ (accuracy * 100).toFixed(0) }}%</p>
           <p class="null-p"></p>
         </div>
         <div class="question-card scrollbar-box">
@@ -642,7 +642,7 @@
               background-color: #0183fa;
               color:#fff;
               font-size:14px;
-              width:80px;
+              padding:0 20px;
               text-align: center;
               border-radius:4px;
               margin-right:30px;
@@ -898,14 +898,14 @@
           .button-p-1{
             cursor: pointer;
             margin-right:10px;
-            width:100px;
+            padding:0 10px;
             border:1px solid #0183fa;
             color:#0183fa;
             background-color: #fff;
           }
           .button-p-2{
             cursor: pointer;
-            width:100px;
+            padding:0 10px;
             border:1px solid #0183fa;
             color:#fff;
             background-color: #0183fa;

+ 13 - 2
src/views/safetyEducationExaminationNew/personnelApproval/index.vue

@@ -10,7 +10,7 @@
             <div class="table-top-button-box">
               <div>
                 <p
-                  v-for="(btn, i) in filterData.statusBtns" :key="btn.value"
+                  v-for="(btn, i) in statusBtns" :key="btn.value"
                   :class="filterData.activeStatus === btn.value ? 'check-table-button' : ''"
                   @click="checkButton(btn.value)"
                 >{{ btn.label }}</p>
@@ -150,6 +150,17 @@
   } from "@/api/safetyEducationExaminationNew/index";
   export default {
     name: 'LabBindingApply',
+    computed: {
+      statusBtns() {
+        return [
+          { label: this.$t('literal.all'), value: '' },
+          { label: this.$t('literal.pendingApproval'), value: '0' },
+          { label: this.$t('literal.bound'), value: '1' },
+          { label: this.$t('literal.rejected'), value: '2' },
+          { label: this.$t('literal.unbound'), value: '3' },
+        ];
+      }
+    },
     data() {
       return {
         optionDeptList:[],
@@ -333,7 +344,7 @@
 
         p {
           border: 1px solid #DCDFE6;
-          width: 80px;
+          padding:0 20px;
           text-align: center;
           height: 40px;
           line-height: 40px;

+ 1 - 1
src/views/safetyEducationExaminationNew/publicConfiguration/basicConfiguration/classHoursConfiguration.vue

@@ -272,7 +272,7 @@
             line-height: 40px;
           }
           .form-min-p{
-            width:72px;
+            padding:0 20px;
             background-color: #DCDFE6;
             text-align: center;
             border-top-right-radius: 4px;

+ 1 - 1
src/views/safetyEducationExaminationNew/publicConfiguration/knowledgePointManagement/index.vue

@@ -56,7 +56,7 @@
               <span>{{ parseTime(scope.row.createTime,"{y}-{m}-{d} {h}:{i}") }}</span>
             </template>
           </el-table-column>
-          <el-table-column :label="$t('tableTitle.action')" width="200" show-overflow-tooltip v-if="tableButtonType">
+          <el-table-column :label="$t('tableTitle.action')" width="220" show-overflow-tooltip v-if="tableButtonType">
             <template slot-scope="scope">
               <div class="table-button-box">
                 <p class="table-button-null"></p>

+ 4 - 4
src/views/safetyEducationExaminationNew/safetyEducation/knowledgeLearning/index.vue

@@ -13,7 +13,7 @@
           </p>
         </div>
         <div class="right-box">
-          <div class="page-form-title-box">
+          <div class="page-form-title-box" style="max-height:140px;height:auto;">
             <el-form :model="queryParams" class="form-box" ref="queryForm"
                      :inline="true" style="width:100%;">
               <div class="table-top-button-box-2">
@@ -368,7 +368,7 @@
               display: flex;
               p{
                 border:1px solid #DCDFE6;
-                width:100px;
+                padding:0 20px;
                 text-align: center;
                 height:40px;
                 line-height:40px;
@@ -400,7 +400,7 @@
               display: flex;
               p{
                 border:1px solid #DCDFE6;
-                width:80px;
+                padding:0 20px;
                 text-align: center;
                 height:40px;
                 line-height:40px;
@@ -473,7 +473,7 @@
               .type-p{
                 position: absolute;
                 right:5px;
-                bottom:5px;
+                top:5px;
                 padding:2px 8px;
                 border-radius:4px;
                 font-size:14px;

+ 1 - 1
src/views/safetyEducationExaminationNew/safetyEducation/learningTasks/index.vue

@@ -246,7 +246,7 @@
           display: flex;
           p{
             border:1px solid #DCDFE6;
-            width:80px;
+            padding:0 20px;
             text-align: center;
             height:40px;
             line-height:40px;

+ 5 - 5
src/views/safetyEducationExaminationNew/safetyTest/mockExam/index.vue

@@ -56,7 +56,7 @@
             <div class="bottom-box">
               <p class="text-big-p">{{item.examTypeName}}</p>
               <p class="text-p">{{parseTime(item.startTime,"{y}-{m}-{d} {h}:{i}")}} {{$t('tableTitle.to')}} {{parseTime(item.endTime,"{y}-{m}-{d} {h}:{i}")}}</p>
-              <p class="time-p">{{ $t('literal.duration') }}{{item.answerDuration}}{{ $t('literal.minutesTotalScore') }}{{item.totalScore}}{{ $t('literal.pointsPassingScore') }}{{item.passScore}}{{ $t('literal.points') }}</p>
+              <p class="time-p">{{ $t('literal.duration') }} {{item.answerDuration}} {{ $t('literal.minutesTotalScore') }} {{item.totalScore}} {{ $t('literal.pointsPassingScore') }} {{item.passScore}} {{ $t('literal.points') }}</p>
             </div>
             <p class="position-p-1" v-if="item.conditionType == 1" @click="tableButton(1,item)">{{ $t('literal.completeTheRequiredStudyHoursToUnlock') }}</p>
             <p class="position-p-1" v-if="item.conditionType == 2" @click="tableButton(2,item)">{{ $t('literal.completeThePreExamCourseToUnlock') }}</p>
@@ -386,7 +386,7 @@
           display: flex;
           p{
             border:1px solid #DCDFE6;
-            width:80px;
+            padding:0 20px;
             text-align: center;
             height:40px;
             line-height:40px;
@@ -476,7 +476,7 @@
             border-radius:4px;
             font-size:14px;
             line-height:30px;
-            width:180px;
+            padding:0 10px;
             text-align: center;
             cursor: pointer;
           }
@@ -490,7 +490,7 @@
             border-radius:4px;
             font-size:14px;
             line-height:30px;
-            width:80px;
+            padding:0 10px;
             text-align: center;
             cursor: pointer;
           }
@@ -502,7 +502,7 @@
             border-radius:4px;
             font-size:14px;
             line-height:30px;
-            width:180px;
+            padding:0 10px;
             text-align: center;
             cursor: pointer;
             color:#fff!important;

+ 5 - 3
src/views/safetyEducationExaminationNew/safetyTest/myGrades/index.vue

@@ -413,7 +413,7 @@
           display: flex;
           p{
             border:1px solid #DCDFE6;
-            width:80px;
+            padding:0 20px;
             text-align: center;
             height:40px;
             line-height:40px;
@@ -458,11 +458,13 @@
             font-size:16px;
             font-weight:700;
             line-height:20px;
+            height:20px;
           }
           .text-p{
             font-size:14px;
             margin-top:10px;
             line-height:20px;
+            height:20px;
           }
           .color-A{
             margin-left:10px;
@@ -520,7 +522,7 @@
             border-radius:4px;
             font-size:14px;
             line-height:30px;
-            width:80px;
+            padding:0 10px;
             text-align: center;
             cursor: pointer;
           }
@@ -534,7 +536,7 @@
             border-radius:4px;
             font-size:14px;
             line-height:30px;
-            width:80px;
+            padding:0 10px;
             text-align: center;
             cursor: pointer;
           }

+ 5 - 5
src/views/safetyEducationExaminationNew/safetyTest/onlineExam/index.vue

@@ -56,8 +56,8 @@
             <div class="bottom-box">
               <p class="text-big-p">{{item.examTypeName}}</p>
               <p class="text-p">{{parseTime(item.startTime,"{y}-{m}-{d} {h}:{i}")}} {{$t('tableTitle.to')}} {{parseTime(item.endTime,"{y}-{m}-{d} {h}:{i}")}}</p>
-              <p class="time-p">{{ $t('literal.duration') }}{{item.answerDuration}}{{ $t('literal.minutesTotalScore') }}{{item.totalScore}}{{ $t('literal.pointsPassingScore') }}{{item.passScore}}{{ $t('literal.pointsAllowedAttempts') }}{{item.attemptLimit===0?$t('literal.unlimited'):item.attemptCount+'/'+item.attemptLimit}}{{ $t('literal.attempts') }}
-                <span v-if="item.studyHoursRequirement>0"> {{ $t('literal.requiredStudyHours') }}{{item.completedStudyHours>=item.studyHoursRequirement?$t('literal.satisfied'):item.completedStudyHours + '/' + item.studyHoursRequirement + $t('literal.studyHours')}}</span>
+              <p class="time-p">{{ $t('literal.duration') }} {{item.answerDuration}} {{ $t('literal.minutesTotalScore') }} {{item.totalScore}} {{ $t('literal.pointsPassingScore') }} {{item.passScore}} {{ $t('literal.pointsAllowedAttempts') }} {{item.attemptLimit===0?$t('literal.unlimited'):item.attemptCount+'/'+item.attemptLimit}} {{ $t('literal.attempts') }}
+                <span v-if="item.studyHoursRequirement>0"> {{ $t('literal.requiredStudyHours') }} {{item.completedStudyHours>=item.studyHoursRequirement?$t('literal.satisfied'):item.completedStudyHours + '/' + item.studyHoursRequirement + $t('literal.studyHours')}}</span>
               </p>
               <p class="position-passed-p" v-if="item.isPassed">{{ $t('literal.passed') }}</p>
             </div>
@@ -467,7 +467,7 @@
           display: flex;
           p{
             border:1px solid #DCDFE6;
-            width:80px;
+            padding:0 20px;
             text-align: center;
             height:40px;
             line-height:40px;
@@ -569,7 +569,7 @@
             border-radius:4px;
             font-size:14px;
             line-height:30px;
-            width:180px;
+            padding:0 10px;
             text-align: center;
             cursor: pointer;
           }
@@ -581,7 +581,7 @@
             border-radius:4px;
             font-size:14px;
             line-height:30px;
-            width:180px;
+            padding:0 10px;
             text-align: center;
             cursor: pointer;
             color:#fff!important;

+ 3 - 3
src/views/safetyEducationExaminationNew/safetyTest/practiceQuestions/index.vue

@@ -72,8 +72,8 @@
                     <p class="el-icon-time"></p>
                     <p :style="!item.lastAnswerTime?'font-size:14px;':''">{{item.lastAnswerTime?parseTime(item.lastAnswerTime,"{y}-{m}-{d} {h}:{i}"):$t('literal.notPracticed')}}</p>
                   </div>
-                  <p class="text-p">{{ $t('literal.practiceProgress') }}{{item.answeredCount}} / {{item.totalCount}}</p>
-                  <p class="text-p">{{ $t('literal.correct') }}{{item.correctCount}} {{ $t('literal.incorrect') }}{{item.wrongCount}} {{ $t('literal.accuracy') }}{{item.correctRate}}%</p>
+                  <p class="text-p">{{ $t('literal.practiceProgress') }} {{item.answeredCount}} / {{item.totalCount}}</p>
+                  <p class="text-p">{{ $t('literal.correct') }} {{item.correctCount}} {{ $t('literal.incorrect') }} {{item.wrongCount}} {{ $t('literal.accuracy') }} {{item.correctRate}}%</p>
                 </div>
                 <p class="position-p" v-if="item.hasWrongQuestion" @click.stop="tableButton(2,item)">{{ $t('literal.incorrectAnswerHistory') }}</p>
                 <el-progress
@@ -335,7 +335,7 @@
               display: flex;
               p{
                 border:1px solid #DCDFE6;
-                width:80px;
+                padding:0 20px;
                 text-align: center;
                 height:40px;
                 line-height:40px;

+ 2 - 2
src/views/safetyEducationExaminationNew/trainingManagement/trainingManagement/index.vue

@@ -104,12 +104,12 @@
             </template>
           </el-table-column>
           <el-table-column :label="$t('literal.organization')" prop="orgDeptName" width="140" show-overflow-tooltip/>
-          <el-table-column :label="$t('literal.trainingMethod')" prop="trainingMode" width="100" show-overflow-tooltip>
+          <el-table-column :label="$t('literal.trainingMethod')" prop="trainingMode" width="140" show-overflow-tooltip>
             <template slot-scope="scope">
               <span>{{scope.row.trainingMode==1?$t('literal.onlineTraining'):(scope.row.trainingMode==2?$t('literal.inPersonTraining'):'')}}</span>
             </template>
           </el-table-column>
-          <el-table-column :label="$t('literal.studyHoursPoints')" prop="content" width="140" show-overflow-tooltip>
+          <el-table-column :label="$t('literal.studyHoursPoints')" prop="content" width="170" show-overflow-tooltip>
             <template slot-scope="scope">
               <span style="color:#10a37f;font-weight:600;">{{ $t('literal.studyHours') }}{{scope.row.creditHours}} +{{scope.row.points}}{{ $t('literal.points') }}</span>
             </template>

+ 0 - 2
src/views/safetyEducationExaminationNew/workbench/TaskCard.vue

@@ -523,7 +523,6 @@ export default {
       .year-card-top-title-box{
         padding:20px 20px 0 20px;
         position: relative;
-        height:64px;
         p:nth-child(1){
           font-size:15px;
           font-weight:700;
@@ -724,7 +723,6 @@ export default {
           border-radius:6px;
           padding:13px 14px;
           margin-bottom:12px;
-          height:78px;
           position: relative;
           border: 1px solid #e5edf8;
           background-color: #fff;

+ 1 - 1
src/views/safetyEducationExaminationNew/workbench/UserInfoCard.vue

@@ -544,7 +544,7 @@ export default {
             /*background-color: rgba(1,131,250,0.1);*/
             border: 1px solid #e5edf8;
             background-color: #f7faff;;
-            padding:10px 20px;
+            padding:10px 18px;
             border-radius:6px;
             width:188px;
             p{