页面修改

src/api/question/questionconfig.js

@@ -330,7 +330,6 @@ export function sortingproblemValidate(gName, detailsList) {
  *【完型填空】验证 
  */
 export function clozeValidate(gName, detailsList) {
-  console.log("detailsList",detailsList);
   var message = "";
   if (detailsList && detailsList.length > 0) {
     for (let i = 0; i < detailsList.length; i++) {
@@ -590,13 +589,13 @@ export function questionBankClozeValidate(gName, AnswerList, qObj) {
   if (AnswerList && AnswerList.length > 0) {
     for (let j = 0; j < AnswerList.length; j++) {
       var Num = 0;
-      for (var k = 0; k < AnswerList[j].length; k++) {
-        if (AnswerList[j][k].Content == '') {
+      for (var k = 0; k < AnswerList[j].OptionList.length; k++) {
+        if (AnswerList[j].OptionList[k].Content == '') {
           message =
-            `请填写【${gName}】第 ${j+1} 小题 选项 ${AnswerList[j][k].Name} 内容！`;
+            `请填写【${gName}】第 ${j+1} 小题 选项 ${AnswerList[j].OptionList[k].Name} 内容！`;
           return message;
         }
-        if (AnswerList[j][k].IsAnswer) {
+        if (AnswerList[j].OptionList[k].IsAnswer) {
           Num++
         }
       }

src/components/exam/exampaperlist.vue

@@ -2,12 +2,15 @@
   .examForm .q-table__bottom {
     min-height: 10px;
   }
-  .examForm .isOpen_Type{
+
+  .examForm .isOpen_Type {
     color: var(--q-color-primary);
   }
-  .examForm .q-breadcrumbs__el{
+
+  .examForm .q-breadcrumbs__el {
     cursor: pointer;
   }
+
 </style>
 <template>
   <div class="page-content examForm">
@@ -20,8 +23,8 @@
             <div v-if="navList&&navList.length>0" style="margin-right:20px;">
               <q-breadcrumbs>
                 <q-breadcrumbs-el label="全部" @click="getPaperChild(0)" />
-                <q-breadcrumbs-el :label="item.PaperName" :class="{'lastExam':index==navList.length-1}" 
-                @click="getPaperChild(item.PaperId)" v-for="(item,index) in navList" :key="index" />
+                <q-breadcrumbs-el :label="item.PaperName" :class="{'lastExam':index==navList.length-1}"
+                  @click="getPaperChild(item.PaperId)" v-for="(item,index) in navList" :key="index" />
               </q-breadcrumbs>
             </div>
             <div>
@@ -104,12 +107,7 @@
       <template v-slot:body-cell-ExamineStatusStr="props">
         <q-td :props="props">
           <template v-if="props.row.ExamineStatus==4">
-            <el-popover
-              placement="bottom"
-              title="驳回原因"
-              width="350"
-              trigger="hover"
-              :content='props.row.ExamineRemark'>
+            <el-popover placement="bottom" title="驳回原因" width="350" trigger="hover" :content='props.row.ExamineRemark'>
               <span slot="reference">{{props.row.ExamineStatusStr}}</span>
             </el-popover>
           </template>
@@ -125,10 +123,10 @@
               v-if="currentUserInfo.Id==props.row.CreateBy" />
           </template>
           <template v-if="props.row.PaperType==2">
-        
-            <q-btn flat size="xs" color="primary" icon="edit" style="font-weight:400" @click="goExameEdit(props.row)" label="编辑"
-               />
-            <q-btn flat size="xs" color="primary" icon="iconfont icon-View" style="font-weight:400" @click="showPaperInfo(props.row)" label="详情"/>
+            <q-btn flat size="xs" color="primary" icon="edit" style="font-weight:400" v-if="isEdit(props.row)"
+              @click="goExameEdit(props.row)" label="编辑" />
+            <q-btn flat size="xs" color="primary" icon="iconfont icon-View" style="font-weight:400"
+              @click="showPaperInfo(props.row)" label="详情" />
           </template>
           <q-btn-dropdown flat size="xs" color="dark" label="更多" style="margin-left: 10px">
             <q-list>
@@ -314,6 +312,15 @@
       }
     },
     methods: {
+      //是否可修改
+      isEdit(item) {
+        if(this.currentUserInfo.Id==1)
+        {
+          return true;
+        }
+        return this.currentUserInfo.Id == item.CreateBy &&
+          (item.ExamineStatus == 0 || item.ExamineStatus == 3 || item.ExamineStatus == 4)
+      },
       //提交审核，重新提交审核
       submitAudit(item) {
         submitApproval({

src/components/questiontype/v-cloze.vue

@@ -38,7 +38,7 @@
             <th colspan="2">
               <div class="clozeTest_question_tit">
                 <div>
-                  第{{index+1}}小题 （{{item.SubScore}}分）
+                  第{{index+1}}小题 <template v-if="isShowScore">（{{item.SubScore}}分）</template>
                 </div>
               </div>
             </th>
@@ -112,6 +112,11 @@
       isShowStudentAnswer: {
         type: Boolean,
         default: false
+      },
+      //是否显示小题分数
+      isShowScore: {
+        type: Boolean,
+        default: false,
       }
     },
     data() {

src/components/questiontype/v-readingcomprehensio.vue

@@ -34,7 +34,8 @@
             <th colspan="2" style="text-align:left;">
               <div class="clozeTest_question_tit">
                 <div>
-                  第{{index+1}}小题<span style="color:#A8A8B3;">({{item.QuestionName}})</span> （{{item.SubScore}}分）
+                  第{{index+1}}小题<span style="color:#A8A8B3;">({{item.QuestionName}})</span><template v-if="isShowScore">
+                    （{{item.SubScore}}分）</template>
                 </div>
                 <div>
                 </div>
@@ -211,6 +212,11 @@
       isShowStudentAnswer: {
         type: Boolean,
         default: false
+      },
+      //是否显示小题分数
+      isShowScore: {
+        type: Boolean,
+        default: false,
       }
     },
     data() {

src/pages/exam/paperInfo.vue

@@ -300,12 +300,12 @@
               :isShowAnswer="isShowAnswer"></v-sortingproblem>
 
             <!--完型填空-->
-            <v-cloze v-if="dItem.QuestionTypeKey=='cloze'" :questionObj="dItem" :isShowAnswer="isShowAnswer"></v-cloze>
+            <v-cloze v-if="dItem.QuestionTypeKey=='cloze'" :questionObj="dItem" :isShowAnswer="isShowAnswer" :isShowScore="true"></v-cloze>
 
             <!--阅读理解、听力题-->
             <v-readingcomprehensio
               v-if="dItem.QuestionTypeKey=='reading-comprehensio'||dItem.QuestionTypeKey=='listening'"
-              :questionObj="dItem" :isShowAnswer="isShowAnswer"></v-readingcomprehensio>
+              :questionObj="dItem" :isShowAnswer="isShowAnswer" :isShowScore="true"></v-readingcomprehensio>
 
             <!--共用选择题-->
             <v-sharingchoose v-if="dItem.QuestionTypeKey=='sharing-choose'" :questionObj="dItem"