zc

src/views/safetyEducationExaminationNew/examManagement/examinationArrange/index.vue

@@ -6,29 +6,67 @@
         <el-form :model="queryParams" class="form-box" ref="queryForm"
                  :inline="true" style="width:100%;">
           <el-form-item label="" prop="queryParamsData1">
-            <el-input
-              maxLength="30"
-              v-model="queryParams.queryParamsData1"
-              placeholder="请输入"
-              style="width: 200px"
-            />
+            <el-select v-model="queryParams.queryParamsData1" placeholder="是否共享" style="width: 120px">
+              <el-option label="共享" value="1"/>
+              <el-option label="不共享" value="2"/>
+            </el-select>
           </el-form-item>
           <el-form-item label="" prop="queryParamsData2">
-            <el-select v-model="queryParams.queryParamsData2" placeholder="请选择" style="width: 200px">
+            <el-select v-model="queryParams.queryParamsData2" placeholder="专业类别" style="width: 140px">
+              <el-option
+                v-for="dict in optionListA"
+                :key="dict.id"
+                :label="dict.disciplineName"
+                :value="dict.id"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="" prop="queryParamsData3">
+            <el-select v-model="queryParams.queryParamsData3" placeholder="考试类别" style="width: 140px">
               <el-option
-                v-for="dict in optionList"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
+                v-for="dict in optionListB"
+                :key="dict.id"
+                :label="dict.examTypeName"
+                :value="dict.id"
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="" prop="queryParamsData4">
+            <el-select v-model="queryParams.queryParamsData4" placeholder="学院单位" style="width: 160px">
+              <el-option
+                v-for="dict in optionListC"
+                :key="dict.deptId"
+                :label="dict.deptName"
+                :value="dict.deptId"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="" prop="queryParamsData5">
+            <el-select v-model="queryParams.queryParamsData5" placeholder="状态" style="width: 120px">
+              <el-option label="进行中" value="1"/>
+              <el-option label="已结束" value="2"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="" prop="queryParamsData6">
+            <el-select v-model="queryParams.queryParamsData6" placeholder="是否补考" style="width: 140px">
+              <el-option label="补考" value="1"/>
+              <el-option label="不补考" value="2"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="" prop="queryParamsData7">
+            <el-input
+              maxLength="30"
+              v-model="queryParams.queryParamsData7"
+              placeholder="考试名称"
+              style="width: 140px"
+            />
+          </el-form-item>
           <el-form-item label="" prop="state">
             <el-date-picker
               :clearable="false"
               v-model="dateRange"
               size="small"
-              style="width: 240px"
+              style="width: 220px"
               value-format="yyyy-MM-dd"
               type="daterange"
               range-separator="-"
@@ -42,34 +80,23 @@
              style="float: right;"
              @click="tableButton(1)"
              v-hasPermiRouter="['demo:demo:add']"
-          >新增</p>
+          >新建考试</p>
         </el-form>
       </div>
       <div class="page-content-box">
         <el-table class="table-box" v-loading="loading" border :data="dataList">
-          <el-table-column label="名称" prop="name"  show-overflow-tooltip/>
-          <el-table-column label="内容" prop="content" width="200" show-overflow-tooltip/>
-          <el-table-column label="状态" prop="state" width="100" show-overflow-tooltip>
+          <el-table-column label="考试名称" prop="name"  show-overflow-tooltip/>
+          <el-table-column label="考试类型" prop="content" width="200" show-overflow-tooltip/>
+          <el-table-column label="专业类别" prop="content" width="200" show-overflow-tooltip/>
+          <el-table-column label="是否共享" prop="content" width="200" show-overflow-tooltip/>
+          <el-table-column label="考试时间" prop="createTime" width="200" show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-switch
-                @click.native="tableButton(5,scope.row)"
-                class="switch captcha-img"
-                :active-value="true"
-                :inactive-value="false"
-                active-color="#0183FA"
-                inactive-color="#999"
-                v-model="scope.row.state"
-                active-text="启用"
-                inactive-text="停用"
-                disabled
-              ></el-switch>
-            </template>
-          </el-table-column>
-          <el-table-column label="创建时间" prop="createTime" width="200" show-overflow-tooltip>
-            <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.createTime,"{y}-{m}-{d} {h}:{i}") }}</span>
+              <span>{{parseTime(scope.row.createTime,"{y}-{m}-{d} {h}:{i}")}}至{{parseTime(scope.row.createTime,"{y}-{m}-{d} {h}:{i}")}}</span>
             </template>
           </el-table-column>
+          <el-table-column label="可考次数" prop="content" width="200" show-overflow-tooltip/>
+          <el-table-column label="考试范围" prop="content" width="200" show-overflow-tooltip/>
+          <el-table-column label="状态" prop="content" width="200" show-overflow-tooltip/>
           <el-table-column label="操作" width="200" show-overflow-tooltip v-if="tableButtonType">
             <template slot-scope="scope">
               <div class="table-button-box">
@@ -77,12 +104,16 @@
                 <p class="table-button-p"
                    @click="tableButton(2,scope.row)"
                    v-hasPermiRouter="['demo:demo:detail']"
-                >详情</p>
+                >补考</p>
                 <p class="table-button-p"
                    @click="tableButton(3,scope.row)"
                    v-hasPermiRouter="['demo:demo:edit']"
                 >编辑</p>
                 <p class="table-button-p"
+                   @click="tableButton(2,scope.row)"
+                   v-hasPermiRouter="['demo:demo:detail']"
+                >复制</p>
+                <p class="table-button-p"
                    @click="tableButton(4,scope.row)"
                    v-hasPermiRouter="['demo:demo:del']"
                 >删除</p>
@@ -108,6 +139,7 @@
   //import { systemUserSelect } from "@/api/commonality/permission";
   //import { getInfo } from "@/api/basicsModules/index";
   //import addPage from "./addPage.vue";
+  import { examElDisciplineTypeList,examElExamTypeList,systemDeptCurrentDept, } from "@/api/safetyEducationExaminationNew/index";
   export default {
     name: 'index',
     //components: {
@@ -126,8 +158,13 @@
         queryParams:{
           page:1,
           pageSize:20,
-          queryParamsData1:"",
+          queryParamsData1 :null,
           queryParamsData2 :null,
+          queryParamsData3 :null,
+          queryParamsData4 :null,
+          queryParamsData5 :null,
+          queryParamsData6 :null,
+          queryParamsData7:"",
         },
         //时间数据
         dateRange:[],
@@ -144,6 +181,9 @@
     },
     mounted () {
       //this.getList();
+      this.examElDisciplineTypeList();
+      this.examElExamTypeList();
+      this.systemDeptCurrentDept();
     },
     methods: {
       //查询按钮
@@ -157,8 +197,13 @@
         this.$set(this,'queryParams',{
           page:1,
           pageSize:20,
-          queryParamsData1:"",
+          queryParamsData1 :null,
           queryParamsData2 :null,
+          queryParamsData3 :null,
+          queryParamsData4 :null,
+          queryParamsData5 :null,
+          queryParamsData6 :null,
+          queryParamsData7:"",
         });
         this.getList();
       },
@@ -231,6 +276,24 @@
           this.getList();
         }
       },
+      //查询全部专业类别
+      examElDisciplineTypeList(){
+        examElDisciplineTypeList({}).then(response => {
+          this.$set(this,'optionListA',response.data);
+        });
+      },
+      //查询全部考试类型
+      examElExamTypeList(){
+        examElExamTypeList({}).then(response => {
+          this.$set(this,'optionListB',response.data);
+        });
+      },
+      //学院列表
+      systemDeptCurrentDept(){
+        systemDeptCurrentDept({}).then(response => {
+          this.$set(this,'optionListC',response.data);
+        });
+      },
     },
   }
 </script>