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

src/pages/course/examPaper.vue

 <style>
-  .OtherCourseNum {
-    display: inline-block;
-    width: 25px;
-    height: 25px;
-    text-align: center;
-    line-height: 25px;
-    border: 1px solid #2961FE;
-    border-radius: 50%;
-    cursor: pointer;
-    color: #2961FE;
-  }
-
-  .OCourseTable {
-    width: 400px;
-    text-align: center;
-  }
-
-  .OCourseTable tr td {
-    height: 40px;
-  }
-
-  .OCourseTable tr th {
-    height: 40px;
-    background-color: rgb(238, 238, 239);
-  }
-
   .Exam_PaperName {
     width: 300px;
     display: inline;
@@ -60,9 +34,14 @@
     cursor: default !important;
     pointer-events: none;
   }
-  .disabled-column .el-checkbox__input{
-    display:none;
+ .ExamPaper_Sysuser_Date .el-range-editor .el-range-input {
+    background-color: transparent;
   }
+
+  .ExamPaper_Sysuser_Date .el-range-editor.el-input__inner {
+    background-color: transparent;
+  }
+
 </style>
 <!--试卷库管理-->
 <template>
@@ -73,6 +52,18 @@
           <q-input @change="getList" clearable filled v-model="msg.PaperName" @clear="getList" maxlength="20"
             label="输入试卷名称、组卷人查找" />
         </div>
+        <div class="col-3 ExamPaper_Sysuser_Date">
+          <q-field filled>
+             <template v-slot:control>
+              <el-date-picker v-model="dateTimeList" @change="refreshPage" value-format="yyyy-MM-dd" type="daterange" style="border:none;" range-separator="至"
+                 start-placeholder="开始时间"  end-placeholder="结束时间"></el-date-picker>       
+            </template>
+          </q-field>
+        </div>
+        <div class="col-3">
+          <q-select @input="refreshPage" clearable filled v-model="msg.QExamineStatus" :options="auditStatusList"
+            emit-value map-options label="审核状态" />
+        </div>
       </div>
       <div class="page-option">
         <q-btn color="accent" size="sm" v-if="IsCreateFolder" class="q-mr-md" label="新增文件夹"
@@ -94,16 +85,7 @@
       </div>
     </div>
     <div class="page-content examPaper">
-      <div v-if="navList&&navList.length>0" class="examPNav">
-        <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>
-      <exampaperlist :dataList="dataList" ref="examPaper" :msg="msg" :loading="loading" @success="refreshPage"></exampaperlist>
+      <exampaperlist :dataList="dataList" ref="examPaper" :msg="msg" :navList="navList" :loading="loading" @success="refreshPage"></exampaperlist>
       <q-pagination class="full-width justify-end" v-model="msg.pageIndex" color="primary" :max="pageCount"
         :input="true" @input="changePage" />
     </div>
@@ -131,6 +113,9 @@
           rowsPerPage: 10,
           PaperName: '', //题库名
           ParentId: 0,
+          QStartTime: "", //开始时间
+          QEndTime: "", //结束时间
+          QExamineStatus: '', //审核状态
         },
         pageCount: 0,
         loading: false,
@@ -138,7 +123,29 @@
         navList: [], //导航列表
         IsCreateFolder: false, //是否试卷创建文件夹权限
         IsCreatePaper: false, //是否创建试卷权限
-        currentUserInfo: {} //当前登录用户
+        currentUserInfo: {}, //当前登录用户
+        dateTimeList: [], //选择时间
+        auditStatusList: [{
+            value: 0,
+            label: "草稿"
+          },
+          {
+            value: 1,
+            label: "审核中"
+          },
+          {
+            value: 2,
+            label: "正常"
+          },
+          {
+            value: 3,
+            label: "驳回"
+          },
+          {
+            value: 6,
+            label: "作废"
+          }
+        ],
       }
     },
     created() {
@@ -168,6 +175,13 @@
       },
       //获取菜单分页列表
       getList() {
+        if (this.dateTimeList && this.dateTimeList.length > 0) {
+          this.msg.QStartTime = this.dateTimeList[0];
+          this.msg.QEndTime = this.dateTimeList[1];
+        } else {
+          this.msg.QStartTime = '';
+          this.msg.QEndTime = '';
+        }
         this.loading = true;
         this.dataList = [];
         GetPaperPage(this.msg).then(res => {

src/pages/exam/examPaper.vue

 <style>
-  .OtherCourseNum {
-    display: inline-block;
-    width: 25px;
-    height: 25px;
-    text-align: center;
-    line-height: 25px;
-    border: 1px solid #2961FE;
-    border-radius: 50%;
-    cursor: pointer;
-    color: #2961FE;
-  }
-
   .Exam_PaperName {
     display: inline;
     overflow: hidden;