zcdsj
/
hberp
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop

This commit is contained in:
caoqianming 2022-02-15 15:04:38 +08:00
parent e93f6b6e36 0543a90f2b
commit 4803194e16
4 changed files with 19 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hb_client/src/App.vue
View File

@ -66,4 +66,7 @@ export default {
#warningTabs .el-tabs__item{ #warningTabs .el-tabs__item{
padding: 0 10px!important; padding: 0 10px!important;
} }
#loginFaceWrap .el-dialog{
width: 780px!important;height: 720px!important;
}
</style> </style>

8
hb_client/src/components/faceLogin/tracking.vue
View File

@ -1,11 +1,11 @@
<template> <template>
<div style="width: 100%;height: 100%;"> <div style="width: 100%;height: 620px;">
<div> <div>
<div class="video-box"> <div class="video-box">
<video id="video" width="749" height="640" preload autoplay loop muted></video> <video id="video" width="749" height="620" preload autoplay loop muted></video>
<canvas id="canvas" width="749" height="640"></canvas> <canvas id="canvas" width="749" height="620"></canvas>
</div> </div>
<canvas id="screenshotCanvas" width="749" height="640"></canvas> <canvas id="screenshotCanvas" width="749" height="620"></canvas>
</div> </div>
</div> </div>
</template> </template>

29
hb_client/src/views/dashboard/index.vue
View File

@ -7,11 +7,8 @@
<div style="padding: 20px;overflow: hidden;"> <div style="padding: 20px;overflow: hidden;">
<div class="cardsWrap" @click="toDetail('1')"> <div class="cardsWrap" @click="toDetail('1')">
<div class="svgIconWrap"> <div class="svgIconWrap">
<svg-icon <el-icon class="el-icon-s-order svgIcon"></el-icon>
class="svgIcon" <!--<svg-icon class="svgIcon" icon-class="contract" :className="'svgIcon'"/>-->
icon-class="contract"
:className="'svgIcon'"
/>
</div> </div>
<div class="totalCountWrap"> <div class="totalCountWrap">
<span class="totalCountText">本月合同数</span> <span class="totalCountText">本月合同数</span>
@ -23,6 +20,7 @@
</div> </div>
<div class="cardsWrap" @click="toDetail('2')"> <div class="cardsWrap" @click="toDetail('2')">
<div class="svgIconWrap"> <div class="svgIconWrap">
<el-icon class="el-icon-menu svgIcon"></el-icon>
<svg-icon <svg-icon
class="svgIcon" class="svgIcon"
icon-class="order" icon-class="order"
@ -39,11 +37,8 @@
</div> </div>
<div class="cardsWrap" @click="toDetail('3')"> <div class="cardsWrap" @click="toDetail('3')">
<div class="svgIconWrap"> <div class="svgIconWrap">
<svg-icon <el-icon class="el-icon-s-operation svgIcon"></el-icon>
class="svgIcon" <!--<svg-icon class="svgIcon" icon-class="productionTask" :className="'svgIcon'"/>-->
icon-class="productionTask"
:className="'svgIcon'"
/>
</div> </div>
<div class="totalCountWrap"> <div class="totalCountWrap">
<span class="totalCountText">本月在制任务</span> <span class="totalCountText">本月在制任务</span>
@ -55,11 +50,8 @@
</div> </div>
<div class="cardsWrap" @click="toDetail('4')"> <div class="cardsWrap" @click="toDetail('4')">
<div class="svgIconWrap"> <div class="svgIconWrap">
<svg-icon <el-icon class="el-icon-s-claim svgIcon"></el-icon>
icon-class="product" <!--<svg-icon icon-class="product" class="svgIcon" :className="'svgIcon'"/>-->
class="svgIcon"
:className="'svgIcon'"
/>
</div> </div>
<div class="totalCountWrap"> <div class="totalCountWrap">
<span class="totalCountText">本月交付产品</span> <span class="totalCountText">本月交付产品</span>
@ -71,11 +63,8 @@
</div> </div>
<div class="cardsWrap" @click="toDetail('5')"> <div class="cardsWrap" @click="toDetail('5')">
<div class="svgIconWrap"> <div class="svgIconWrap">
<svg-icon <el-icon class="el-icon-error svgIcon"></el-icon>
icon-class="unqualified" <!--<svg-icon icon-class="unqualified" class="svgIcon" :className="'svgIcon'"/>-->
class="svgIcon"
:className="'svgIcon'"
/>
</div> </div>
<div class="totalCountWrap"> <div class="totalCountWrap">
<span class="totalCountText">本月不合格产品</span> <span class="totalCountText">本月不合格产品</span>

6
hb_client/src/views/login/index.vue
View File

@ -64,8 +64,8 @@
</el-tabs> </el-tabs>
</div> </div>
</div> </div>
<el-dialog :visible.sync="limitedPhoto" @close="closeCamera"> <el-dialog :visible.sync="limitedPhoto" @close="closeCamera" id="loginFaceWrap">
<div style="font-size: 28px;color: #333333;text-align: center;font-weight: bold;margin-bottom: 15px;">打卡</div> <div style="font-size: 28px;color: #333333;text-align: center;font-weight: bold;">打卡</div>
<div class="testTracking"> <div class="testTracking">
<faceLogin ref="faceTracking" name="faceLogin" @func="getMsgFormSon"></faceLogin> <faceLogin ref="faceTracking" name="faceLogin" @func="getMsgFormSon"></faceLogin>
</div> </div>
@ -309,6 +309,6 @@
} }
.testTracking{ .testTracking{
width:100%; width:100%;
height: 700px; height: 620px;
} }
</style> </style>