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

Merge branch 'master' into dev-xiaole

Browse Source
This commit is contained in:
骆乐 2022-06-16 18:15:10 +08:00
commit 4d92f4028a
4 changed files with 354 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/assets/i18n/langs/cn/laborManage/personManage.js
View File

@ -822,7 +822,7 @@ export default {
bluetooth: '蓝牙', bluetooth: '蓝牙',
entranceGuardPhotos: '门禁照片', entranceGuardPhotos: '门禁照片',
attendanceRules: '考勤规则', attendanceRules: '考勤规则',
//LED大屏显示器--------- 新增LED //LED大屏显示器--------- 新增LED
@ -996,6 +996,11 @@ export default {
out: '出', out: '出',
peopleIdNo: 'I深建人员序列号', peopleIdNo: 'I深建人员序列号',
inOutTime: '出入时间', inOutTime: '出入时间',
healthCodeStatus:"健康码状态",
nucleicAcidTime:"核酸时间",
nucleicAcidResults:"核酸结果",
vaccinationTime:"疫苗接种时间",
vaccinationFrequency:"疫苗接种次数",

3
src/util/nowDate/index.js
View File

@ -39,4 +39,5 @@ export function getNowTime() {
let ss = new Date().getSeconds() < 10 ? '0' + new Date().getSeconds() : new Date().getSeconds() let ss = new Date().getSeconds() < 10 ? '0' + new Date().getSeconds() : new Date().getSeconds()
dateTime = yy + '-' + mm + '-' + dd + ' ' + hh + ':' + mf + ':' + ss dateTime = yy + '-' + mm + '-' + dd + ' ' + hh + ':' + mf + ':' + ss
return dateTime return dateTime
} }

62
src/views/projectFront/laborManage/attendanceManage/attendanceManage.vue
View File

@ -268,6 +268,51 @@
{{scope.row.temperature?scope.row.temperature:'--'}} {{scope.row.temperature?scope.row.temperature:'--'}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column
:label="$t('message.laborMange.healthCodeStatus')"
align="center"
>
<template slot-scope="scope">
{{healthCodelist[scope.row.healthCode]}}
</template>
</el-table-column>
<el-table-column
prop="nucleicAcidTime"
:label="$t('message.laborMange.nucleicAcidTime')"
align="center"
></el-table-column>
<el-table-column
:label="$t('message.laborMange.nucleicAcidResults')"
align="center"
>
<template slot-scope="scope">
{{nucleicAcidResultsList[scope.row.nucleicAcidResult]}}
</template>
</el-table-column>
<el-table-column
prop="vaccinateTime"
:label="$t('message.laborMange.vaccinationTime')"
align="center"
></el-table-column>
<el-table-column
:label="$t('message.laborMange.vaccinationFrequency')"
align="center"
>
<template slot-scope="scope">
{{vaccinationFrequencyltsList[scope.row.vaccinateState]}}
</template>
</el-table-column>
<el-table-column <el-table-column
prop="passType" prop="passType"
:label=" :label="
@ -412,6 +457,23 @@ export default {
}, },
data() { data() {
return { return {
nucleicAcidResultsList:{
0:"未知",
1:"阴性",
2:"阳性"
},
healthCodelist:{
0:"无",
1:"红码",
2:"黄码",
3:"绿码"
},
vaccinationFrequencyltsList:{
0:"未接种",
1:"接种一针",
2:"接种两针",
3:"接种三针"
},
exportDialog:false, exportDialog:false,
exportDateArr:[], exportDateArr:[],
inserviceTypeOptions:[{ inserviceTypeOptions:[{

372
src/views/projectFront/laborManage/overview.vue
View File

@ -36,22 +36,22 @@
/> />
<div class="perNumInner"> <div class="perNumInner">
<p> <p>
{{ $t("message.laborMange.workersOnSite") }}：<span {{ $t('message.laborMange.workersOnSite') }}：<span
class="num1" class="num1"
>{{ statictisData.presencePerson.totalPerson }}</span >{{ statictisData.presencePerson.totalPerson }}</span
>{{ $t("message.laborMange.person") }} >{{ $t('message.laborMange.person') }}
</p> </p>
<p> <p>
{{ $t("message.laborMange.peopleWhoPunchInToday") }}：<span {{ $t('message.laborMange.peopleWhoPunchInToday') }}：<span
class="num1" class="num1"
>{{ statictisData.todayNum }}</span >{{ statictisData.todayNum }}</span
>{{ $t("message.laborMange.person") }} >{{ $t('message.laborMange.person') }}
</p> </p>
<p> <p>
{{ {{
$t("message.laborMange.peopleWhoClockedInYesterday") $t('message.laborMange.peopleWhoClockedInYesterday')
}}：<span class="num1">{{ statictisData.yesterdayNum }}</span }}：<span class="num1">{{ statictisData.yesterdayNum }}</span
>{{ $t("message.laborMange.person") }} >{{ $t('message.laborMange.person') }}
</p> </p>
</div> </div>
</div> </div>
@ -86,47 +86,64 @@
<img src="@/assets/images/profile_photo.png" /> <img src="@/assets/images/profile_photo.png" />
<img src="@/assets/images/profile_photo.png" /> <img src="@/assets/images/profile_photo.png" />
</div> </div>
<div class="personName"> <div class="personName">
<span> <span>
{{ currentPersonDetail.workerName}} {{ currentPersonDetail.workerName }}
<b class="codeResult" v-show="currentPersonDetail.codeState === 0" style="color: rgb(168, 168, 168);"> <b
无码 class="codeResult"
v-show="currentPersonDetail.codeState === 0"
style="color: rgb(168, 168, 168)"
>
无码
</b> </b>
<b class="codeResult" v-show="currentPersonDetail.codeState === 1" style="color: red;"> <b
红码 class="codeResult"
v-show="currentPersonDetail.codeState === 1"
style="color: red"
>
红码
</b> </b>
<b class="codeResult" v-show="currentPersonDetail.codeState === 2" style="color: yellow;"> <b
黄码 class="codeResult"
v-show="currentPersonDetail.codeState === 2"
style="color: yellow"
>
黄码
</b> </b>
<b class="codeResult" v-show="currentPersonDetail.codeState === 3" style="color: green;"> <b
绿码 class="codeResult"
v-show="currentPersonDetail.codeState === 3"
style="color: green"
>
绿码
</b> </b>
</span> </span>
<span class="inoutType">{{ <span class="inoutType">{{
currentPersonDetail.passType == 1 currentPersonDetail.passType == 1
? $t("message.laborMange.enter") ? $t('message.laborMange.enter')
: $t("message.laborMange.leave") : $t('message.laborMange.leave')
}}</span> }}</span>
</div> </div>
<p>体温：{{currentPersonDetail.temperature}}°</p> <p>体温：{{ currentPersonDetail.temperature }}°</p>
<p> <p>
{{ $t("message.laborMange.inOutTime") }}：{{ {{ $t('message.laborMange.inOutTime') }}：{{
currentPersonDetail.createTime currentPersonDetail.createTime
}} }}
</p> </p>
<p v-if="currentPersonDetail.teamName"> <p v-if="currentPersonDetail.teamName">
{{ $t("message.laborMange.team") }}：{{ {{ $t('message.laborMange.team') }}：{{
currentPersonDetail.teamName currentPersonDetail.teamName
}} }}
</p> </p>
<p v-else> <p v-else>
{{ $t("message.laborMange.section") }}：{{ {{ $t('message.laborMange.section') }}：{{
currentPersonDetail.departmentName currentPersonDetail.departmentName
}} }}
</p> </p>
<p> <p>
{{ $t("message.laborMange.companies") }}：{{ {{ $t('message.laborMange.companies') }}：{{
currentPersonDetail.enterpriseName currentPersonDetail.enterpriseName
}} }}
</p> </p>
@ -144,8 +161,8 @@
/> />
<div class="inListBox itemList"> <div class="inListBox itemList">
<div class="typeTxt"> <div class="typeTxt">
{{ $t("message.laborMange.up") }}<br />{{ {{ $t('message.laborMange.up') }}<br />{{
$t("message.laborMange.shift") $t('message.laborMange.shift')
}} }}
</div> </div>
<div class="personInner"> <div class="personInner">
@ -154,41 +171,96 @@
v-for="(item, index) in inList" v-for="(item, index) in inList"
:key="index" :key="index"
> >
<img <div class="personBoxItem">
:src="$store.state.FILEURL + item.imageUrl" <div class="urseLogo">
:preview="$store.state.FILEURL + item.imageUrl"
/> <div class="stateLabel" v-if="item.nadTime&&item.workerClassify">
<div class="detail">
<p class="name">{{ item.workerName }}</p> {{overtimeEve(item.nadTime,item.workerClassify)}}
<p> </div>
{{ <img
item.departmentName ? item.departmentName : item.teamName :src="$store.state.FILEURL + item.imageUrl"
}} :preview="$store.state.FILEURL + item.imageUrl"
</p> />
<p>{{ item.createTime.split(" ")[1] }}</p> </div>
<p>体温:{{item.temperature}}°</p> <div class="detail">
<p> <p class="name">{{ item.workerName }}</p>
<b v-show="item.codeState == 0" style="color:rgb(168, 168, 168);width: 40px;height:25px;line-height: 25px;font-size: 20px;margin: 0;" class="codeResult"> <p>
{{
item.departmentName
? item.departmentName
: item.teamName
}}
</p>
<p>{{ item.createTime.split(' ')[1] }}</p>
<p>体温:{{ item.temperature }}°</p>
<p>
<b
v-show="item.codeState == 0"
style="
color: rgb(168, 168, 168);
width: 40px;
height: 25px;
line-height: 25px;
font-size: 20px;
margin: 0;
"
class="codeResult"
>
无码 无码
</b> </b>
<b v-show="item.codeState == 1" style="color:red;width: 40px;height:25px;line-height: 25px;font-size: 20px;margin: 0;" class="codeResult"> <b
v-show="item.codeState == 1"
style="
color: red;
width: 40px;
height: 25px;
line-height: 25px;
font-size: 20px;
margin: 0;
"
class="codeResult"
>
红码 红码
</b> </b>
<b v-show="item.codeState == 2" style="color:yellow;width: 40px;height:25px;line-height: 25px;font-size: 20px;margin: 0;" class="codeResult"> <b
v-show="item.codeState == 2"
style="
color: yellow;
width: 40px;
height: 25px;
line-height: 25px;
font-size: 20px;
margin: 0;
"
class="codeResult"
>
黄码 黄码
</b> </b>
<b v-show="item.codeState == 3" style="color:green;width: 40px;height:25px;line-height: 25px;font-size: 20px;margin: 0;" class="codeResult"> <b
v-show="item.codeState == 3"
style="
color: green;
width: 40px;
height: 25px;
line-height: 25px;
font-size: 20px;
margin: 0;
"
class="codeResult"
>
绿码 绿码
</b> </b>
</p> </p>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="outListBox itemList"> <div class="outListBox itemList">
<div class="typeTxt"> <div class="typeTxt">
{{ $t("message.laborMange.down") }}<br />{{ {{ $t('message.laborMange.down') }}<br />{{
$t("message.laborMange.shift") $t('message.laborMange.shift')
}} }}
</div> </div>
<div class="personInner"> <div class="personInner">
@ -197,33 +269,88 @@
v-for="(item, index) in outList" v-for="(item, index) in outList"
:key="index" :key="index"
> >
<img <div class="personBoxItem">
:src="$store.state.FILEURL + item.imageUrl" <div class="urseLogo">
:preview="$store.state.FILEURL + item.imageUrl" <div class="stateLabel" v-if="item.nadTime&&item.workerClassify">
/>
<div class="detail"> {{overtimeEve(item.nadTime,item.workerClassify)}}
<p class="name">{{ item.workerName }}</p>
<p> </div>
{{ <img
item.departmentName ? item.departmentName : item.teamName :src="$store.state.FILEURL + item.imageUrl"
}} :preview="$store.state.FILEURL + item.imageUrl"
</p> />
<p>{{ item.createTime.split(" ")[1] }}</p> </div>
<p>体温:{{item.temperature}}°</p> <div class="detail">
<p> <p class="name">{{ item.workerName }}</p>
<b v-show="item.codeState == 0" style="color:rgb(168, 168, 168);width: 40px;height:25px;line-height: 25px;font-size: 20px;margin: 0;" class="codeResult"> <p>
{{
item.departmentName
? item.departmentName
: item.teamName
}}
</p>
<p>{{ item.createTime.split(' ')[1] }}</p>
<p>体温:{{ item.temperature }}°</p>
<p>
<b
v-show="item.codeState == 0"
style="
color: rgb(168, 168, 168);
width: 40px;
height: 25px;
line-height: 25px;
font-size: 20px;
margin: 0;
"
class="codeResult"
>
无码 无码
</b> </b>
<b v-show="item.codeState == 1" style="color:red;width: 40px;height:25px;line-height: 25px;font-size: 20px;margin: 0;" class="codeResult"> <b
v-show="item.codeState == 1"
style="
color: red;
width: 40px;
height: 25px;
line-height: 25px;
font-size: 20px;
margin: 0;
"
class="codeResult"
>
红码 红码
</b> </b>
<b v-show="item.codeState == 2" style="color:yellow;width: 40px;height:25px;line-height: 25px;font-size: 20px;margin: 0;" class="codeResult"> <b
v-show="item.codeState == 2"
style="
color: yellow;
width: 40px;
height: 25px;
line-height: 25px;
font-size: 20px;
margin: 0;
"
class="codeResult"
>
黄码 黄码
</b> </b>
<b v-show="item.codeState == 3" style="color:green;width: 40px;height:25px;line-height: 25px;font-size: 20px;margin: 0;" class="codeResult"> <b
v-show="item.codeState == 3"
style="
color: green;
width: 40px;
height: 25px;
line-height: 25px;
font-size: 20px;
margin: 0;
"
class="codeResult"
>
绿码 绿码
</b> </b>
</p> </p>
</div>
</div> </div>
</div> </div>
</div> </div>
@ -240,7 +367,7 @@
class="blockLine-bottom" class="blockLine-bottom"
/> />
<div class="title"> <div class="title">
{{ $t("message.laborMange.enterprisesEnteringMarket") }} {{ $t('message.laborMange.enterprisesEnteringMarket') }}
</div> </div>
<div <div
id="detetion-box2" id="detetion-box2"
@ -259,11 +386,11 @@
<p v-for="(data, i) in item.list" :key="i + 'child'"> <p v-for="(data, i) in item.list" :key="i + 'child'">
<span>{{ data.name }}</span <span>{{ data.name }}</span
><span ><span
>{{ $t("message.laborMange.today") }}：{{ >{{ $t('message.laborMange.today') }}：{{
data.todayNum data.todayNum
}}</span }}</span
><span ><span
>{{ $t("message.laborMange.yesterday") }}：{{ >{{ $t('message.laborMange.yesterday') }}：{{
data.yesterdayNum data.yesterdayNum
}}</span }}</span
> >
@ -271,13 +398,13 @@
</div> </div>
<div class="groupBox"> <div class="groupBox">
<p class="groupTotal"> <p class="groupTotal">
<span>{{ $t("message.laborMange.total") }}</span <span>{{ $t('message.laborMange.total') }}</span
><span ><span
>{{ $t("message.laborMange.today") }}：{{ >{{ $t('message.laborMange.today') }}：{{
item.totaltodayNum item.totaltodayNum
}}</span }}</span
><span ><span
>{{ $t("message.laborMange.yesterday") }}：{{ >{{ $t('message.laborMange.yesterday') }}：{{
item.totalyesterdayNum item.totalyesterdayNum
}}</span }}</span
> >
@ -291,7 +418,7 @@
v-if="statictisData.list.length == 0" v-if="statictisData.list.length == 0"
> >
<img src="@/assets/images/noData3.png" alt="" srcset="" /> <img src="@/assets/images/noData3.png" alt="" srcset="" />
<p>{{ $t("message.laborMange.noData") }}</p> <p>{{ $t('message.laborMange.noData') }}</p>
</div> </div>
</div> </div>
</div> </div>
@ -314,6 +441,7 @@ const options = {
password: "123456", password: "123456",
clean: true, clean: true,
}; };
import tool from "@/util/nowDate/index";
var client2 = null; var client2 = null;
export default { export default {
// components:{vueSeamlessScroll}, // components:{vueSeamlessScroll},
@ -370,9 +498,10 @@ export default {
}; };
}, },
created() { created() {
if(COMPANY == 'nanchang') { if (COMPANY == 'nanchang') {
document.title='疫情防控LED大屏'; document.title = '疫情防控LED大屏';
} }
}, },
mounted() { mounted() {
this.getTime(); this.getTime();
@ -392,8 +521,56 @@ export default {
if (client2) { if (client2) {
client2.unsubscribe(this.topicName + this.$store.state.projectSn); client2.unsubscribe(this.topicName + this.$store.state.projectSn);
} }
},
filters:{
}, },
methods: { methods: {
overtimeEve(data, workerClass) {
// console.log(time,'=============')
if (data && workerClass) {
let timestamp = new Date().getTime();
let codeTime = new Date(data).getTime();
let timeDifference = Number(timestamp) - Number(codeTime);
if(isNaN(timeDifference)){
return "核酸超时"
}
let hour = Math.floor(timeDifference / 3600000);
let res='';
switch (workerClass) {
case 1:
if(hour>168){
res="核酸超时"
}else{
res=hour.toString()+'小时'
}
break;
case 2:
if(hour>24){
res="核酸超时"
}else{
res=hour.toString()+'小时'
}
break;
case 3:
if(hour>72){
res="核酸超时"
}else{
res=hour.toString()+'小时'
}
break;
default:
res=''
}
return res;
} else {
return ""
}
},
mqttMSG() { mqttMSG() {
// mqtt连接 +"/#" +workerId // mqtt连接 +"/#" +workerId
client2.on("connect", (e) => { client2.on("connect", (e) => {
@ -469,8 +646,8 @@ export default {
ajax.open( ajax.open(
"get", "get",
url + url +
"?key=a3217cf9335d333c307abee2fce600b5&extensions=base&output=json&city=" + "?key=a3217cf9335d333c307abee2fce600b5&extensions=base&output=json&city=" +
this.$store.state.currentProDetail.cityCode this.$store.state.currentProDetail.cityCode
); );
//步骤三:发送请求 //步骤三:发送请求
ajax.send(); ajax.send();
@ -613,7 +790,7 @@ export default {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
background: url("../../../assets/images/inoutBigScreen/headerBG.png") background: url('../../../assets/images/inoutBigScreen/headerBG.png')
no-repeat 100% 100%; no-repeat 100% 100%;
.left { .left {
flex: 1; flex: 1;
@ -669,7 +846,7 @@ export default {
justify-content: center; justify-content: center;
border-radius: 34px; border-radius: 34px;
// border-bottom: 1px dashed rgba(0, 236, 213, 1); // border-bottom: 1px dashed rgba(0, 236, 213, 1);
background: url("../../../assets/images/inoutBigScreen/numBG.png") no-repeat background: url('../../../assets/images/inoutBigScreen/numBG.png') no-repeat
100% 100%; 100% 100%;
} }
} }
@ -744,7 +921,6 @@ export default {
font-size: 35px; font-size: 35px;
text-align: center; text-align: center;
} }
} }
p { p {
color: #f2f2f2; color: #f2f2f2;
@ -814,6 +990,26 @@ export default {
white-space: nowrap; white-space: nowrap;
} }
.personBox { .personBox {
.personBoxItem {
display: flex;
.urseLogo {
position: relative;
.stateLabel {
font-size: 14px;
position: absolute;
left: 10px;
top: 10px;
padding: 0 6px;
height: 24px;
line-height: 24px;
text-align: center;
background-color: #3662d6;
color: #fff;
}
}
}
display: inline-block; display: inline-block;
// margin-right: 5px; // margin-right: 5px;
min-width: 240px; min-width: 240px;
@ -841,7 +1037,7 @@ export default {
} }
} }
} }
.codeResult{ .codeResult {
font-weight: normal; font-weight: normal;
display: inline-block; display: inline-block;
width: 60px; width: 60px;