admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加了培训记录导出功能

Browse Source
This commit is contained in:
骆乐 2022-07-06 10:27:28 +08:00
parent ef285b0caa
commit 3e76c85cf1
11 changed files with 84 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
dist.7z
View File

Binary file not shown.

2
src/assets/js/api/laborPerson.js
View File

@ -129,7 +129,7 @@ export const safeEducationQuestionListApi = data => post('xmgl/safeEducationQues
export const safeEducationQuestionAddApi = data => post('xmgl/safeEducationQuestion/addQuestionCourse', data);
export const safeEducationQuestionDetailApi = data => post('xmgl/safeEducationQuestion/selectSafeEducationQuestionInfo', data);
export const selectWorkerEducationPageApi = data => post('xmgl/safeEducationQuestion/selectWorkerEducationPage', data);
export const exportExcelWorkerEducationApi = data => post('xmgl/safeEducationQuestion/exportExcelWorkerEducation', data);
export const selectCompanyEducationCoursePageApi = data => post('xmgl/safeEducationQuestion/selectCompanyEducationCoursePage', data);
//安全教育 --- 课程分类

5
src/assets/js/http.js
View File

@ -40,9 +40,9 @@ if (process.env.NODE_ENV == 'development') {
// axios.defaults.baseURL = 'http://36.137.53.203:9090/'; // 南昌地铁 17512009894 123456789 gdjt 123456789
// axios.defaults.baseURL = 'http://124.71.178.44:100/'
axios.defaults.baseURL = 'http://192.168.34.148:6023/'
// axios.defaults.baseURL = 'http://192.168.34.148:6023/' //张志鹏本地
// tag: 本地
// axios.defaults.baseURL = 'http://192.168.34.125:6023/'; //本地 http/1.1
axios.defaults.baseURL = 'http://192.168.34.125:6023/'; //本地 http/1.1
// axios.defaults.baseURL = 'http://139.9.66.234:40001/'; //南昌二期
// axios.defaults.baseURL = 'http://120.196.217.6:7000/';
// axios.defaults.baseURL = 'http://139.9.66.234:8/';
@ -79,6 +79,7 @@ else if (process.env.NODE_ENV == 'debug') {
// axios.defaults.baseURL = window.location.protocol + "//" + host.split(":")[0] + ":6023" + "/"
// axios.defaults.baseURL = 'http://192.168.34.125:6023/';
axios.defaults.baseURL = 'http://139.9.66.234:8/'
// axios.defaults.baseURL = 'http://192.168.34.148:6023/
// axios.defaults.baseURL = 'http://zhgd.loganwy.com/'
}

2
src/components/account.vue
View File

@ -15,7 +15,7 @@
<div style="margin-left:10px">
<p>{{ $store.state.userInfo.companyName }}</p>
<!-- 横琴和鹤洲不需要客服电话-->
<!-- <p>客服电话：{{$store.state.userInfo.customerServicePhone}}</p> -->
<p>客服电话：{{$store.state.userInfo.customerServicePhone}}</p>
</div>
</div>
<!-- <div class="flex2" style="margin-top:20px">

5
src/views/jxjadmin/moduleMenuManage.vue
View File

@ -636,7 +636,7 @@ export default {
btnList:[],
moudleTypeArr:['企业模块','项目后台','企业后台','项目看板'],
searchModuleType: 2,
styleTypeArr:['普通项目级版本','精益建造版本'],
styleTypeArr:['普通项目级版本','精益建造版本','衢州版'],
searchStyleType:1,
allMenuList:[]
};
@ -794,9 +794,12 @@ export default {
if (valid) {
let params = this.addEditForm;
params.styleType=this.searchStyleType
console.log("params", params);
console.log("添加信息", this.addEditForm);
if (this.Popup.type === "add") {
console.log('添加成功的参数',params)
addModuleApi(params).then((result) => {
console.log('添加成功的返回值',result)
if (result.success) {
this.$message.success(result.message);
this.getList();

95
src/views/messageV2.vue
View File

@ -38,7 +38,7 @@
value="">
</el-option>
<el-option
v-for="item in $t('message.messageCenter.options')"
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value">
@ -130,54 +130,61 @@ export default {
pageSize: 20,
tableData: [],
options:[{
label: "高空火警",
value: "8"
},{
label: "考勤提醒",
value: "1"
},{
label: "防疫人员通知",
value: "2"
},{
label: "防疫车辆通知",
value: "3"
},{
label: "访客通知",
value: "16"
},{
label: "混凝土监测",
value: "4"
},{
label: "卸料平台",
value: "5"
},{
label: "配电箱",
value: "6"
},{
label: "扬尘",
value: "7"
},{
label: "标养室",
value: "9"
},{
label: "安全检查",
value: "10"
},{
label: "质量检查",
value: "11"
},{
label: "塔吊",
value: "12"
},{
label: "升降机",
value: "13"
},{
label: "电表",
value: "14"
},{
label: "水表",
value: "15"
}],
// options:[{
// label: "高空火警",
// value: "8"
// },{
// label: "考勤提醒",
// value: "1"
// },{
// label: "防疫人员通知",
// value: "2"
// },{
// label: "防疫车辆通知",
// value: "3"
// },{
// label: "访客通知",
// value: "16"
// },{
// label: "混凝土监测",
// value: "4"
// },{
// label: "卸料平台",
// value: "5"
// },{
// label: "配电箱",
// value: "6"
// },{
// label: "扬尘",
// value: "7"
// },{
// label: "标养室",
// value: "9"
// },{
// label: "安全检查",
// value: "10"
// },{
// label: "质量检查",
// value: "11"
// },{
// label: "塔吊",
// value: "12"
// },{
// label: "升降机",
// value: "13"
// },{
// label: "电表",
// value: "14"
// },{
// label: "水表",
// value: "15"
// }],
};
},
created() {
@ -281,7 +288,7 @@ export default {
border-radius: 3px;
display: flex;
align-items: center;
height: 100px;
height: 200px;
padding: 0 20px;
margin-bottom: 20px;
position: relative;

2
src/views/projectFront/epidemicPrevention/visitorsManage.vue
View File

@ -496,7 +496,7 @@ export default {
pageSize: this.pageSize,
visitName: this.visitName,
// enterDate:this.enterDate,
userEnterpriseId: this.$store.state.userInfo.userEnterpriseId,
userId: this.$store.state.userInfo.userId,
codeState:this.codeState
};
visitorManageRecordApi(data).then((res) => {

6
src/views/projectFront/laborManage/personModule/administration.vue
View File

@ -344,7 +344,7 @@
type="primary"
:disabled="checkedWorker.length == 0"
@click="issuePersonFn"
v-if="key"
v-if="!key"
>{{ $t("message.laborMange.aKeyIssued") }}</el-button
>
</el-form-item>
@ -494,11 +494,11 @@
type="primary"
size="mini"
@click="issuePersonOneFn(scope.row.id)"
v-if="key"
v-if="!key"
>{{ $t("message.laborMange.aKeyIssued") }}</el-button
>
</div>
<div v-if="key">
<div v-if="!key">
<el-checkbox
v-model="scope.row.isUploadHousing"
:checked="scope.row.isUploadHousing == 1 ? true : false"

6
src/views/projectFront/laborManage/personModule/laborComponent.vue
View File

@ -336,7 +336,7 @@
type="primary"
:disabled="checkedWorker.length == 0"
@click="issuePersonFn"
v-if="!key"
v-if="key"
>{{ $t("message.laborMange.aKeyIssued") }}</el-button
>
</el-form-item>
@ -479,7 +479,7 @@
type="primary"
size="mini"
@click="issuePersonOneFn(scope.row.id)"
v-if="!key"
v-if="key"
>{{ $t("message.laborMange.aKeyIssued") }}</el-button
>
</div>
@ -499,7 +499,7 @@
</div> -->
<div
class="personItemBottom"
v-if="!key"
v-if="key"
>
<el-checkbox
v-model="scope.row.isUploadHousing"

2
src/views/projectFront/laborManage/personnelOverview.vue
View File

@ -652,7 +652,7 @@ export default {
};
getRealTimeDataApi(data).then((res) => {
console.log(res);
console.log('查询结果',res);
if (res.code == 200) {
this.crewRealTimeList = res.result;
this.$nextTick(() => {

17
src/views/projectFront/safetyEducation/trainingRecords.vue
View File

@ -55,6 +55,9 @@
$t("message.deviceManage.query")
}}</el-button>
<el-button type="warning" size="medium" plain @click="refresh">{{$t('message.deviceManage.refresh')}}</el-button>
<el-button type="primary" size="medium" plain @click="exportBtn">
<a :href="printUrl" class="printUrl">导出</a>
</el-button>
</el-form-item>
</el-form>
</div>
@ -106,12 +109,13 @@
</div>
</template>
<script>
import { selectWorkerEducationPageApi } from "@/assets/js/api/laborPerson";
import { selectWorkerEducationPageApi,exportExcelWorkerEducationApi } from "@/assets/js/api/laborPerson";
export default {
name: "historyData",
data() {
return {
printUrl:'',
projectSn: "",
time: [],
formInline: {
@ -154,6 +158,14 @@ export default {
this.pageSize = 10;//条数
this.onSubmit();
},
// 导出
exportBtn(){
console.log('导出')
this.printUrl = this.$http.defaults.baseURL + 'xmgl/safeEducationQuestion/exportExcelWorkerEducation?projectSn=' +
this.projectSn + '&eduType=' + this.formInline.eduType + '&eduCourseName=' + this.formInline.eduCourseName
+ '&workerName=' + this.formInline.workerName
console.log(this.printUrl)
},
//查询列表
onSubmit() {
if (this.time.length == 0 || this.time == null) {
@ -190,4 +202,7 @@ export default {
};
</script>
<style lang="less" scoped>
.printUrl{
text-decoration: none;
}
</style>