Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/components/exam/exampaperlist.vue

@@ -2,7 +2,12 @@
   .examForm .q-table__bottom {
     min-height: 10px;
   }
-
+  .examForm .isOpen_Type{
+    color: var(--q-color-primary);
+  }
+  .examForm .q-breadcrumbs__el{
+    cursor: pointer;
+  }
 </style>
 <template>
   <div class="page-content examForm">
@@ -12,14 +17,12 @@
       <template v-slot:top="props">
         <template v-if="(navList&&navList.length>0)||(multipleSelection&&multipleSelection.length>0)">
           <div style="height:38px;display:flex;align-items:center;">
-            <div class="examPNav" v-if="navList&&navList.length>0" style="margin-right:20px;">
-              <span @click="getPaperChild(0)">全部</span> >
-              <template v-for="(item,index) in navList">
-                <span @click="getPaperChild(item.PaperId)" :class="{'lastExam':index==navList.length-1}" :key="index">
-                  {{item.PaperName}}
-                </span>
-                <span v-if="index!=navList.length-1" :key="index">></span>
-              </template>
+            <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>
             </div>
             <div>
               <q-btn v-if="multipleSelection&&multipleSelection.length>0" color="accent" size="sm" class="q-mr-md"
@@ -61,7 +64,7 @@
       <template v-slot:body-cell-QuestionCount="props">
         <q-td :props="props">
           <template v-if="props.row.PaperType==1">
-            ---
+            <span style="color:gray">-</span>
           </template>
           <template v-if="props.row.PaperType==2">
             {{ props.row.QuestionCount }}
@@ -71,7 +74,7 @@
       <template v-slot:body-cell-DifficultyTypeName="props">
         <q-td :props="props">
           <template v-if="props.row.PaperType==1">
-            ---
+            <span style="color:gray">-</span>
           </template>
           <template v-if="props.row.PaperType==2">
             {{ props.row.DifficultyTypeName }}
@@ -81,7 +84,7 @@
       <template v-slot:body-cell-PublishCount="props">
         <q-td :props="props">
           <template v-if="props.row.PaperType==1">
-            ---
+            <span style="color:gray">-</span>
           </template>
           <template v-if="props.row.PaperType==2">
             {{ props.row.PublishCount }}
@@ -91,10 +94,10 @@
       <template v-slot:body-cell-OpenStr="props">
         <q-td :props="props">
           <template v-if="props.row.PaperType==1">
-            ---
+            <span style="color:gray">-</span>
           </template>
           <template v-if="props.row.PaperType==2">
-            {{ props.row.OpenStr }}
+            <span :class="{'isOpen_Type':props.row.IsOpen==2}">{{ props.row.OpenStr }}</span>
           </template>
         </q-td>
       </template>
@@ -117,8 +120,9 @@
               v-if="currentUserInfo.Id==props.row.CreateBy" />
           </template>
           <template v-if="props.row.PaperType==2">
-            <q-btn flat size="xs" color="primary" style="font-weight:400" @click="goExameEdit(props.row)" label="编辑"
+            <q-btn flat size="xs" color="primary" icon="edit" style="font-weight:400" @click="goExameEdit(props.row)" label="编辑"
               v-if="currentUserInfo.Id==props.row.CreateBy &&(props.row.ExamineStatus==0||props.row.ExamineStatus==3||props.row.ExamineStatus==4)" />
+            <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>
@@ -134,11 +138,6 @@
                   <q-item-label>发布考试</q-item-label>
                 </q-item-section>
               </q-item>
-              <q-item clickable v-close-popup @click="showPaperInfo(props.row)" v-if="props.row.PaperType==2">
-                <q-item-section>
-                  <q-item-label>详情</q-item-label>
-                </q-item-section>
-              </q-item>
               <q-item clickable v-close-popup @click="movePaperInfo(props.row)"
                 v-if="currentUserInfo.Id==props.row.CreateBy">
                 <q-item-section>
@@ -246,7 +245,7 @@
           align: "left"
         }, {
           name: "PublishCount",
-          label: "发布考试次数",
+          label: "发布次数",
           field: "PublishCount",
           align: "left"
         }, {

src/components/exam/questionbank-form.vue

@@ -15,7 +15,7 @@
         </div>
         <div class="page-content">
           <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat
-            class="sticky-column-table sticky-header-column-table" style="max-height: 550px" separator="none" :data="dataList" :columns="columns"
+            class="sticky-column-table sticky-header-column-table" style="max-height: 440px" separator="none" :data="dataList" :columns="columns"
             row-key="BankId" selection="multiple" :selected.sync="selectedQuestionBank">
             <template v-slot:top="props">
               <div class="col-2 q-table__title">题库列表</div>
@@ -47,6 +47,12 @@
     queryQuestionBankPage,
   } from '../../api/question/question';
   export default {
+    props: {
+      CheckedArray: {
+        type: Array,
+        default: null
+      },
+    },
     data() {
       return {
         persistent: true,
@@ -83,6 +89,9 @@
       }
     },
     mounted() {
+      if(this.CheckedArray&&this.CheckedArray.length>0){
+        this.selectedQuestionBank = this.CheckedArray;
+      }
       this.getQuestionBankPage();
     },
     methods: {
@@ -115,10 +124,7 @@
         var tempArray = [];
         if (this.selectedQuestionBank && this.selectedQuestionBank.length > 0) {
           this.selectedQuestionBank.forEach(item => {
-            tempArray.push({
-              BankId: item.BankId,
-              BankName: item.BankName,
-            })
+            tempArray.push(item);
           })
         }
         this.$emit('success', tempArray);

src/components/stuMan/moreQuery.vue

@@ -123,7 +123,7 @@
             Id: 6
           },
           {
-            name: "完结的订单",
+            name: "毕业",
             Id: 7
           },
           {

src/pages/course/examPaper.vue

@@ -30,7 +30,6 @@
   }
 
   .lastExam {
-    color: #6B89B3;
     cursor: default !important;
     pointer-events: none;
   }
@@ -67,7 +66,7 @@
         <div class="col-3">
           <q-select v-model="msg.QCreateBy"
             :options="EmployeeList" filled use-input label="创建人" @input="refreshPage" clearable option-label="EmployeeName" option-value="Id"
-            ref="EmployeeName" class="col-6 q-pb-lg" emit-value map-options @filter="filterFn">
+            ref="EmployeeName" class="col-6" emit-value map-options @filter="filterFn">
             <template v-slot:no-option>
               <q-item>
                 <q-item-section class="text-grey">

src/pages/exam/examPaper.vue

@@ -25,7 +25,6 @@
   }
 
   .lastExam {
-    color: #6B89B3;
     cursor: default !important;
     pointer-events: none;
   }
@@ -37,7 +36,6 @@
   .ExamPaper_Sysuser_Date .el-range-editor.el-input__inner {
     background-color: transparent;
   }
-
 </style>
 <!--试卷库管理-->
 <template>