From a01a3502b1d24d6490fe27d740f7517ea98bb9da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AA=86=E4=B9=90?= <342503599@qq.com> Date: Thu, 23 Jun 2022 16:29:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E4=BA=86=E6=A0=87=E5=A4=B4?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=20=E4=BA=BA=E5=91=98=E8=80=83=E5=8B=A4?= =?UTF-8?q?=E6=89=93=E5=8D=B0=20=20=E8=AE=BE=E5=A4=87=E4=B8=AD=E5=8F=B0bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=20=E9=AA=86=E4=B9=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i18n/langs/cn/laborManage/personManage.js | 1 + src/assets/js/api/attendanceManage.js | 2 +- src/components/account.vue | 43 ++++++--- src/components/header.vue | 3 + .../systemSetup/enterpriseInfo.vue | 47 ++++++++-- .../equipmentCenter/laborManage/devConfig.vue | 31 ++++++- .../epidemicPrevention/passingData.vue | 89 +++++++++++++++---- .../attendanceManage/attendanceManage.vue | 16 +++- .../laborManage/personDetails.vue | 3 +- .../projectFront/laborManage/reportCenter.vue | 2 +- 10 files changed, 195 insertions(+), 42 deletions(-) diff --git a/src/assets/i18n/langs/cn/laborManage/personManage.js b/src/assets/i18n/langs/cn/laborManage/personManage.js index f9433410..31095d1f 100644 --- a/src/assets/i18n/langs/cn/laborManage/personManage.js +++ b/src/assets/i18n/langs/cn/laborManage/personManage.js @@ -184,6 +184,7 @@ export default { detailMessage: '详情信息', monthData: '月份数据', recountData: '重新计算考勤数据', + attendPrint:'考勤打印', temperature: '温度', hint1: '请选择导出详细数据时间段', hint2: '请选择重新计算考勤的时间段', diff --git a/src/assets/js/api/attendanceManage.js b/src/assets/js/api/attendanceManage.js index 72c63293..ce97c373 100644 --- a/src/assets/js/api/attendanceManage.js +++ b/src/assets/js/api/attendanceManage.js @@ -5,5 +5,5 @@ import {post,get} from '../http' export const getPageListData = data => post('xmgl/workerMonthAttendanceStatistics/selectMonthAttendanceByPage', data); //查询考勤列表 export const getSelectDateilApi = data => post('xmgl/workerAttendance/viewDayAttendanceList', data); //查询人员考勤个人考勤详情 - export const getAfreshMonthAttendanceStatisticsApi = data => post('xmgl/workerMonthAttendanceStatistics/getAfreshMonthAttendanceStatistics', data); //重新计算考勤数据 +export const attendFsdApi = data => get('/xmgl/workerWagesPayment/attendancePdf', data); //考勤pdf下载 \ No newline at end of file diff --git a/src/components/account.vue b/src/components/account.vue index 057048b0..316a2e16 100644 --- a/src/components/account.vue +++ b/src/components/account.vue @@ -14,7 +14,8 @@

{{ $store.state.userInfo.companyName }}

-

客服电话：{{$store.state.userInfo.customerServicePhone}}

+ +
- 企业后台 + + {{ enterpriseBackground }}
- {{ $t("message.companyDiagram.projectBackEnd") }} + + {{projectBackground}}
- {{ $t("message.companyDiagram.devCenter") }} + + {{equipmentChina}}
-
+
- {{ $t("message.docManage.fileCenter") }} + + {{ dataCenter }}
@@ -107,7 +112,8 @@

{{ $store.state.userInfo.account }}

- {{ $store.state.userInfo.menuAuthority.roleName }} + + {{headerConfiguration}}

@@ -119,14 +125,27 @@ export default { data() { return { - messageB:'', - msgB:'', - seeEquipment: 1, //是否能查看设备中台，0是，1否 + loginData:'', + dataCenter1:'', + projectBackground:'项目后台', + enterpriseBackground:'企业后台', + headerConfiguration:"公司管理员",//标头配置 + enterpriseFront:'企业前台',//企业前台 + equipmentChina:'设备中台',//设备中台 + dataCenter:"资料中心",//资料中心 }; }, mounted() { this.seeEquipment = this.$store.state.userInfo.seeEquipment; + this.loginData = JSON.parse(localStorage.getItem('systemInfo')) + this.headerConfiguration = this.loginData.headerConfiguration + this.projectBackground = this.loginData.projectBackground + this.enterpriseBackground = this.loginData.enterpriseBackground + this.dataCenter1 = this.loginData.dataCenter + this.equipmentChina = this.loginData.equipmentChina + // console.log('项目后台',this.projectBackground) + // console.log('企业后台',this.enterpriseBackground) }, methods: { sendMsg2() { @@ -261,7 +280,7 @@ export default { }, //去设备中台 goDevcenter(value) { - this.$store.commit("setProjectSn", value.projectSn); + // this.$store.commit("setProjectSn", value.projectSn); window.open("/equipmentCenter.html#/equipmentCenterIndx", "_self"); window._paq.push(['trackEvent', '点击', '设备中台','进入设备中台' ]) }, diff --git a/src/components/header.vue b/src/components/header.vue index a3e4bbe8..d5c5b034 100644 --- a/src/components/header.vue +++ b/src/components/header.vue @@ -128,6 +128,7 @@ export default { LOGO_white:LOGO_white, headerName:'', isShowAudio: false, + loginData:{}, systemInfo:{ "loginBackgroundImage": "", "loginLogo": "", @@ -159,6 +160,8 @@ export default { }, created(){ this.company = COMPANY; + this.loginData = JSON.parse(localStorage.getItem('systemInfo')) + // console.log('信息',this.loginData) }, mounted() { diff --git a/src/views/companyAdmin/systemSetup/enterpriseInfo.vue b/src/views/companyAdmin/systemSetup/enterpriseInfo.vue index a79805c0..581dc7f3 100644 --- a/src/views/companyAdmin/systemSetup/enterpriseInfo.vue +++ b/src/views/companyAdmin/systemSetup/enterpriseInfo.vue @@ -82,6 +82,24 @@ 城市 + + + + + + + + + + + + + + + + + + @@ -105,7 +123,13 @@ export default { "loginLogo": "", "platformLogo": "", "platformName": "", - "bigScreenLogo": "" + "bigScreenLogo": "", + headerConfiguration:"",//标头配置 + enterpriseBackground:'',//企业后台 + enterpriseFront:'',//企业前台 + projectBackground:'',//项目后台 + equipmentChina:'',//设备中台 + dataCenter:"",//资料中心 }, zoomType: '0', iconType: '1', @@ -172,12 +196,21 @@ export default { this.form.zoomType = this.zoomType this.form.iconType = this.iconType this.form.areaType = this.areaType - editSystemLogoConfigApi(this.form).then((res) => { - this.$message.success(this.$t('message.companyDiagram.editSuccess'));//编辑成功！ - this.getDetail() - }); - - } else { + // console.log('参数',this.form) + editSystemLogoConfigApi(this.form).then((res) => { + console.log('编辑的结果',res) + if(res.success){ + this.$message.success(this.$t('message.companyDiagram.editSuccess'));//编辑成功！ + this.getDetail() + this.form.headerConfiguration = "",//标头配置 + this.form.enterpriseBackground='',//企业后台 + this.form.enterpriseFront='',//企业前台 + this.form.projectBackground='',//项目后台 + this.form.equipmentChina='',//设备中台 + this.form.dataCenter=""//资料中心 + } + }) + }else { console.log("error submit!!"); return false; } diff --git a/src/views/equipmentCenter/laborManage/devConfig.vue b/src/views/equipmentCenter/laborManage/devConfig.vue index 3c9aac13..a5e5b872 100644 --- a/src/views/equipmentCenter/laborManage/devConfig.vue +++ b/src/views/equipmentCenter/laborManage/devConfig.vue @@ -197,6 +197,15 @@
+ + 取消 + { - console.log("list", list); + console.log("列表", list); this.pointList = list.result; }); }, @@ -714,6 +723,20 @@ }); }) }, + // 取消 + cancelBeaconFn(){ + this.initDialog = false + this.beaconForm= { + supplierType: '', + appId: "", + appSecret: "", + appKey: "", + projectSn: this.$store.state.projectSn, + housing:'', + issueDev:"", + serviceUrl:'' + } + }, saveBeaconFn() { this.$refs["beaconForm"].validate((valid) => { if (valid) { @@ -723,17 +746,19 @@ this.beaconForm.housing=0 } projectUfaceConfigEdit(this.beaconForm).then((res) => { - this.beaconDialog = false; - this.initDialog = false; + console.log('初始化设备',res) this.getConfig();//???获取配置 // this.getList(); this.$message.success( this.$t("message.personnelPosition.add_success") ); //添加成功！ + this.beaconDialog = false; + this.initDialog = false; }); } else { console.log("error submit!!"); return false; + } }); }, diff --git a/src/views/projectFront/epidemicPrevention/passingData.vue b/src/views/projectFront/epidemicPrevention/passingData.vue index 48369a59..7962a8ff 100644 --- a/src/views/projectFront/epidemicPrevention/passingData.vue +++ b/src/views/projectFront/epidemicPrevention/passingData.vue @@ -117,6 +117,34 @@ @click="exportForm" >导出表格 + + + + + + + + + 取 消 + 确 定 + +
@@ -133,12 +161,26 @@ import moment from "moment"; export default { data() { return { + rules: { + time: [ + { + required: true, + message: "请选择需要打印的日期", + trigger: "change", + }, + ], + }, + ruleForm: { + time: "", + }, + queryTime: "", //时间 + selectTime: false, // 选择时间的弹窗 moment: moment, searchWord: "", // 搜索框输入 dataIndex: 0, projectList: [], projectSn: "", - userEnterpriseId:'', + userEnterpriseId: "", enterpriseId: "", statisticalData: { workerNum: 0, //实名人数 @@ -157,6 +199,7 @@ export default { created() { this.projectSn = this.$store.state.projectSn; this.userEnterpriseId = this.$store.state.userInfo.userEnterpriseId; + // console.log('-----',this.userEnterpriseId) }, mounted() { this.getProjectList(); @@ -230,7 +273,7 @@ export default { }, boundaryGap: true, axisLabel: { - formatter: function (val) { + formatter: function(val) { let index = val.indexOf("-"); val = val.slice(index + 1); return val; @@ -352,7 +395,7 @@ export default { lineHeight: 30, }, padding: 10, - formatter: function (params) { + formatter: function(params) { var tip = "时间：" + params[0].name + "
"; for (var i = 0, l = params.length; i < l; i++) { tip += @@ -384,7 +427,7 @@ export default { type: "shadow", }, axisLabel: { - formatter: function (val) { + formatter: function(val) { let index = val.indexOf("-"); val = val.slice(index + 1); return val; @@ -476,10 +519,10 @@ export default { selectProjectAllEnterpriseList({ projectSn: this.projectSn, enterpriseName: this.searchWord, - userEnterpriseId:this.userEnterpriseId + userEnterpriseId: this.userEnterpriseId, }).then((res) => { if (res.code == 200) { - console.log('企业列表的信息',res); + console.log("企业列表的信息", res); this.projectList = res.result; this.enterpriseId = this.projectList[0].enterpriseId; this.enterpriseName = this.projectList[0].name; @@ -514,7 +557,6 @@ export default { : this.selectType, enterpriseId: this.enterpriseId, }).then((res) => { - let dateArray = []; let notCodeNum = []; let redCodeNum = []; @@ -581,15 +623,32 @@ export default { "xmgl/projectEnterpriseWorkerStatistics/exporExcelProjectEnterpriseWorkerStatistics?projectSn=" + this.$store.state.projectSn + "&enterpriseName=" + - this.searchWord; + this.searchWord + + "&userEnterpriseId=" + + this.userEnterpriseId; }, exportForm() { - window.location.href = - this.$http.defaults.baseURL + - "xmgl/projectEnterpriseWorkerStatistics/exporExcelProjectEnterpriseWorkerStatistics?projectSn=" + - this.$store.state.projectSn + - "&enterpriseName=" + - this.enterpriseName; + this.selectTime = true; + }, + getTime(val) { + console.log("时间", val); + this.queryTime = val; + }, + submit() { + this.$refs.ruleForm.validate((valid) => { + if (valid) { + window.location.href = + this.$http.defaults.baseURL + + "xmgl/projectEnterpriseWorkerStatistics/exporExcelDayEnterpriseWorkerStatisticsDetail?projectSn=" + + this.$store.state.projectSn + + "&userEnterpriseId=" + + this.userEnterpriseId + + "&queryTime=" + + this.queryTime + + "&enterpriseId=" + + this.enterpriseId; + } + }); }, }, }; @@ -728,4 +787,4 @@ export default { right: 3%; } } - \ No newline at end of file + diff --git a/src/views/projectFront/laborManage/attendanceManage/attendanceManage.vue b/src/views/projectFront/laborManage/attendanceManage/attendanceManage.vue index abdbba20..3e75cd3c 100644 --- a/src/views/projectFront/laborManage/attendanceManage/attendanceManage.vue +++ b/src/views/projectFront/laborManage/attendanceManage/attendanceManage.vue @@ -104,6 +104,7 @@ {{$t("message.laborMange.export")+$t("message.laborMange.detailData")}} {{$t("message.laborMange.export")+$t("message.laborMange.monthData")}} {{$t("message.laborMange.recountData")}} + {{$t("message.laborMange.attendPrint")}} @@ -443,12 +444,12 @@ import scroll from "vue-seamless-scroll"; import { getPageListData, - getSelectDateilApi,getAfreshMonthAttendanceStatisticsApi + getSelectDateilApi,getAfreshMonthAttendanceStatisticsApi,attendFsdApi } from "@/assets/js/api/attendanceManage"; import { getDepartmentInfoList, getTeamInfoList, - getEnterpriseInfoList + getEnterpriseInfoList } from "@/assets/js/api/laborPerson"; export default { name: "attendanceManage", @@ -457,6 +458,7 @@ export default { }, data() { return { + printPdf:"", nucleicAcidResultsList:{ 0:"未知", 1:"阴性", @@ -525,6 +527,12 @@ export default { }, methods: { + //考勤打印 + attendancePrint(){ + this.printPdf = this.$http.defaults.baseURL + 'xmgl/workerWagesPayment/attendancePdf?monthTime=' + + this.formInline.monthTime +'&personType=' + this.formInline.personType + '&projectSn=' + this.$store.state.projectSn + // console.log('路径', this.printPdf ) + }, // 导入考勤数据 importAttendanceData(){ @@ -675,6 +683,10 @@ export default { };