|
@@ -25,9 +25,9 @@
|
|
|
</el-select>
|
|
</el-select>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
<el-form-item label="" prop="queryParamsData3">
|
|
<el-form-item label="" prop="queryParamsData3">
|
|
|
- <el-select v-model="queryParams.queryParamsData3" placeholder="分类" style="width: 200px">
|
|
|
|
|
|
|
+ <el-select v-model="queryParams.queryParamsData3" placeholder="培训方式" style="width: 200px">
|
|
|
<el-option
|
|
<el-option
|
|
|
- v-for="dict in optionListB"
|
|
|
|
|
|
|
+ v-for="dict in optionListD"
|
|
|
:key="dict.value"
|
|
:key="dict.value"
|
|
|
:label="dict.label"
|
|
:label="dict.label"
|
|
|
:value="dict.value"
|
|
:value="dict.value"
|
|
@@ -35,6 +35,16 @@
|
|
|
</el-select>
|
|
</el-select>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
<el-form-item label="" prop="queryParamsData4">
|
|
<el-form-item label="" prop="queryParamsData4">
|
|
|
|
|
+ <el-select v-model="queryParams.queryParamsData4" placeholder="分类" style="width: 200px">
|
|
|
|
|
+ <el-option
|
|
|
|
|
+ v-for="dict in optionListB"
|
|
|
|
|
+ :key="dict.value"
|
|
|
|
|
+ :label="dict.label"
|
|
|
|
|
+ :value="dict.value"
|
|
|
|
|
+ />
|
|
|
|
|
+ </el-select>
|
|
|
|
|
+ </el-form-item>
|
|
|
|
|
+ <el-form-item label="" prop="deptId">
|
|
|
<el-cascader
|
|
<el-cascader
|
|
|
style="width: 180px"
|
|
style="width: 180px"
|
|
|
v-model="queryParams.deptId"
|
|
v-model="queryParams.deptId"
|
|
@@ -93,12 +103,18 @@
|
|
|
</div>
|
|
</div>
|
|
|
</template>
|
|
</template>
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
- <el-table-column label="学时/积分" prop="content" width="200" show-overflow-tooltip>
|
|
|
|
|
|
|
+ <el-table-column label="组织单位" prop="name" width="140" show-overflow-tooltip/>
|
|
|
|
|
+ <el-table-column label="培训方式" prop="content" width="100" show-overflow-tooltip>
|
|
|
|
|
+ <template slot-scope="scope">
|
|
|
|
|
+ <span>{{scope.row.name==1?'线上培训':(scope.row.name==2?'线下培训':'')}}</span>
|
|
|
|
|
+ </template>
|
|
|
|
|
+ </el-table-column>
|
|
|
|
|
+ <el-table-column label="学时/积分" prop="content" width="140" show-overflow-tooltip>
|
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
|
<span style="color:#10a37f;font-weight:600;">学时{{scope.row.name}} +{{scope.row.name}}分</span>
|
|
<span style="color:#10a37f;font-weight:600;">学时{{scope.row.name}} +{{scope.row.name}}分</span>
|
|
|
</template>
|
|
</template>
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
- <el-table-column label="签到人数" prop="content" width="200" show-overflow-tooltip>
|
|
|
|
|
|
|
+ <el-table-column label="进度" prop="content" width="140" show-overflow-tooltip>
|
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
|
<div>
|
|
<div>
|
|
|
<p><span :class="scope.row.status==1?'color-a':(scope.row.status==2?'color-b':(scope.row.status==3?'color-c':''))">50</span>/<span>60</span></p>
|
|
<p><span :class="scope.row.status==1?'color-a':(scope.row.status==2?'color-b':(scope.row.status==3?'color-c':''))">50</span>/<span>60</span></p>
|
|
@@ -189,6 +205,21 @@
|
|
|
<p class="dialog-footer-button-null"></p>
|
|
<p class="dialog-footer-button-null"></p>
|
|
|
</div>
|
|
</div>
|
|
|
</el-dialog>
|
|
</el-dialog>
|
|
|
|
|
+
|
|
|
|
|
+ <el-dialog class="trainingTask-list-dialog" :title="dialogListTitle"
|
|
|
|
|
+ :visible.sync="dialogListType" v-if="dialogListType" width="1090px"
|
|
|
|
|
+ append-to-body :close-on-click-modal="false">
|
|
|
|
|
+ <div class="trainingTask-list-dialog-box">
|
|
|
|
|
+ <trainingProgressDetails v-if="dialogListPageType==1" :propsData="dialogListPropsData"></trainingProgressDetails>
|
|
|
|
|
+ <trainingRecordDetails v-if="dialogListPageType==2" :propsData="dialogListPropsData"></trainingRecordDetails>
|
|
|
|
|
+ </div>
|
|
|
|
|
+ <div slot="footer" class="dialog-footer dialog-footer-box">
|
|
|
|
|
+ <p class="dialog-footer-button-null"></p>
|
|
|
|
|
+ <p class="dialog-footer-button-primary" v-if="dialogListPageType==2" @click="exportButton">导出记录</p>
|
|
|
|
|
+ <p class="dialog-footer-button-info" @click="cancelButton">关闭</p>
|
|
|
|
|
+ <p class="dialog-footer-button-null"></p>
|
|
|
|
|
+ </div>
|
|
|
|
|
+ </el-dialog>
|
|
|
</div>
|
|
</div>
|
|
|
</template>
|
|
</template>
|
|
|
<script>
|
|
<script>
|
|
@@ -196,14 +227,17 @@
|
|
|
//import { getDicts } from "@/api/commonality/noPermission";
|
|
//import { getDicts } from "@/api/commonality/noPermission";
|
|
|
//import { systemUserSelect } from "@/api/commonality/permission";
|
|
//import { systemUserSelect } from "@/api/commonality/permission";
|
|
|
//import { getInfo } from "@/api/basicsModules/index";
|
|
//import { getInfo } from "@/api/basicsModules/index";
|
|
|
- //import addPage from "./addPage.vue";
|
|
|
|
|
|
|
+ import trainingProgressDetails from "./trainingProgressDetails.vue";
|
|
|
|
|
+ import trainingRecordDetails from "./trainingRecordDetails.vue";
|
|
|
import {
|
|
import {
|
|
|
systemDeptCurrentDept,
|
|
systemDeptCurrentDept,
|
|
|
} from "@/api/safetyEducationExaminationNew/index";
|
|
} from "@/api/safetyEducationExaminationNew/index";
|
|
|
export default {
|
|
export default {
|
|
|
name: 'index',
|
|
name: 'index',
|
|
|
components: {
|
|
components: {
|
|
|
- vueQr
|
|
|
|
|
|
|
+ vueQr,
|
|
|
|
|
+ trainingProgressDetails,
|
|
|
|
|
+ trainingRecordDetails,
|
|
|
},
|
|
},
|
|
|
data() {
|
|
data() {
|
|
|
return {
|
|
return {
|
|
@@ -214,6 +248,7 @@
|
|
|
optionListA: [{ value: '0', label: '未开始' }, { value: '1', label: '进行中' }, { value: '2', label: '已结束' }],
|
|
optionListA: [{ value: '0', label: '未开始' }, { value: '1', label: '进行中' }, { value: '2', label: '已结束' }],
|
|
|
optionListB: [],
|
|
optionListB: [],
|
|
|
optionListC: [],
|
|
optionListC: [],
|
|
|
|
|
+ optionListD: [{ value: '1', label: '线上培训' }, { value: '2', label: '线下培训' }],
|
|
|
//查询条件
|
|
//查询条件
|
|
|
queryParams: {
|
|
queryParams: {
|
|
|
page: 1,
|
|
page: 1,
|
|
@@ -222,6 +257,7 @@
|
|
|
queryParamsData2: null,
|
|
queryParamsData2: null,
|
|
|
queryParamsData3: null,
|
|
queryParamsData3: null,
|
|
|
queryParamsData4: null,
|
|
queryParamsData4: null,
|
|
|
|
|
+ deptId:'',
|
|
|
},
|
|
},
|
|
|
//时间数据
|
|
//时间数据
|
|
|
dateRange: [],
|
|
dateRange: [],
|
|
@@ -240,7 +276,12 @@
|
|
|
title:'',
|
|
title:'',
|
|
|
playTime:'',
|
|
playTime:'',
|
|
|
endTime:'',
|
|
endTime:'',
|
|
|
- }
|
|
|
|
|
|
|
+ },
|
|
|
|
|
+ //弹窗展示
|
|
|
|
|
+ dialogListTitle:'',
|
|
|
|
|
+ dialogListType:false,
|
|
|
|
|
+ dialogListPageType:null,
|
|
|
|
|
+ dialogListPropsData:null,
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
created() {
|
|
created() {
|
|
@@ -266,6 +307,7 @@
|
|
|
queryParamsData2: null,
|
|
queryParamsData2: null,
|
|
|
queryParamsData3: null,
|
|
queryParamsData3: null,
|
|
|
queryParamsData4: null,
|
|
queryParamsData4: null,
|
|
|
|
|
+ deptId:'',
|
|
|
})
|
|
})
|
|
|
this.getList()
|
|
this.getList()
|
|
|
},
|
|
},
|
|
@@ -317,10 +359,10 @@
|
|
|
})
|
|
})
|
|
|
} else if (type == 4) {
|
|
} else if (type == 4) {
|
|
|
//查看记录
|
|
//查看记录
|
|
|
- this.$set(this, 'pageType', 2)
|
|
|
|
|
- let obj = JSON.parse(JSON.stringify(row))
|
|
|
|
|
- obj.showType = false
|
|
|
|
|
- this.$set(this, 'propsData', obj)
|
|
|
|
|
|
|
+ this.$set(this, 'dialogListTitle', '培训记录详情');
|
|
|
|
|
+ this.$set(this, 'dialogListPageType', 2);
|
|
|
|
|
+ this.$set(this, 'dialogListPropsData', row);
|
|
|
|
|
+ this.$set(this, 'dialogListType', true);
|
|
|
} else if (type == 5) {
|
|
} else if (type == 5) {
|
|
|
//签到码
|
|
//签到码
|
|
|
this.$set(this,'codeData',{
|
|
this.$set(this,'codeData',{
|
|
@@ -334,10 +376,10 @@
|
|
|
this.dialogQrCodeOn();
|
|
this.dialogQrCodeOn();
|
|
|
} else if (type == 6) {
|
|
} else if (type == 6) {
|
|
|
//进度
|
|
//进度
|
|
|
- this.$set(this, 'pageType', 2)
|
|
|
|
|
- let obj = JSON.parse(JSON.stringify(row))
|
|
|
|
|
- obj.showType = false
|
|
|
|
|
- this.$set(this, 'propsData', obj)
|
|
|
|
|
|
|
+ this.$set(this, 'dialogListTitle', '培训进度详情');
|
|
|
|
|
+ this.$set(this, 'dialogListPageType', 1);
|
|
|
|
|
+ this.$set(this, 'dialogListPropsData', row);
|
|
|
|
|
+ this.$set(this, 'dialogListType', true);
|
|
|
} else if (type == 7) {
|
|
} else if (type == 7) {
|
|
|
//编辑
|
|
//编辑
|
|
|
this.$set(this, 'pageType', 2)
|
|
this.$set(this, 'pageType', 2)
|
|
@@ -366,6 +408,14 @@
|
|
|
this.getList()
|
|
this.getList()
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
|
|
+ //关闭弹窗
|
|
|
|
|
+ cancelButton(){
|
|
|
|
|
+ this.$set(this,'dialogListType',false);
|
|
|
|
|
+ },
|
|
|
|
|
+ //导出记录
|
|
|
|
|
+ exportButton(){
|
|
|
|
|
+
|
|
|
|
|
+ },
|
|
|
//学院列表
|
|
//学院列表
|
|
|
systemDeptCurrentDept(){
|
|
systemDeptCurrentDept(){
|
|
|
systemDeptCurrentDept({}).then(response => {
|
|
systemDeptCurrentDept({}).then(response => {
|