admin/zhgdyunapp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-rain

Browse Source
This commit is contained in:
”Rain“ 2024-05-24 22:20:32 +08:00
commit 996e8536dc
4 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pages.json
View File

@ -1134,11 +1134,11 @@
{
"path": "pages/alarmPage/indexTwo",
"style": {
"navigationBarTitleText": "报警提示",
"enablePullDownRefresh": true,
"onReachBottomDistance": 100,
"navigationBarBackgroundColor": "#3A7BFF",
"navigationBarTextStyle": "white"
// "navigationBarTitleText": "报警提示",
"enablePullDownRefresh": true
// "onReachBottomDistance": 100,
// "navigationBarBackgroundColor": "#3A7BFF",
// "navigationBarTextStyle": "white"
}
},
{

16
pages/personLocation/exam/beginexam/beginexam.vue
View File

@ -290,6 +290,7 @@
.beginexam {
padding: 26.92rpx 32.69rpx;
padding-top: 40rpx;
height: 58%;
display: flex;
flex-direction: column;
@ -307,7 +308,8 @@
.text:nth-child(2) {
font-size: 34rpx;
width: 52%;
// width: 52%;
flex: 1;
overflow-wrap: anywhere;
}
}
@ -322,8 +324,10 @@
.radio {
display: flex;
align-items: flex;
// align-items: center;
>text{
margin-top: 5rpx;
}
.question-desc {
display: inline-block;
width: 82%;
@ -342,8 +346,10 @@
.check {
display: flex;
align-items: flex;
// align-items: center;
>text{
margin-top: 5rpx;
}
.question-desc {
display: inline-block;
width: 82%;

6
pages/personLocation/exam/examresult/examresult.vue
View File

@ -17,13 +17,13 @@
<text>对于成绩不满意可再次考试</text>
</view>
<button type="primary" class="btn"
@click="goHiidden('/personLocation/exam/beginexam/beginexam')">再考一次</button>
@click="examAgain('/personLocation/exam/beginexam/beginexam')">再考一次</button>
<button type="primary" class="btn1" plain="true"
@click="goHiidden('/personLocation/exam/index/index')">返回</button>
</view>
<view class="examresult" v-else>
<view class="text-success">
<text>80</text>
<text>{{pageData.score}}</text>
</view>
<view class="image-tip">
<image src="/static/exam/examSuccess.png" mode=""></image>
@ -32,7 +32,7 @@
<text>恭喜您通过考试</text>
</view>
<button type="primary" class="btn"
@click="goHiidden('/personLocation/exam/beginexam/beginexam')">返回</button>
@click="goHiidden('/personLocation/exam/index/index')">返回</button>
</view>
<levitatedsphere :x="100" :y="80"></levitatedsphere>
</view>

12
pages/projectEnd/laborManage/searchTeam/personDetail.vue
View File

@ -28,6 +28,10 @@
<view class="projectName">{{workerInfo.projectName}}</view>
<view class="details-content" v-if="workerInfo.personType==1 && codeShow">
<view class="left-content">
<view class="project_info">
<text class="name">企业：</text>
<text>{{workerInfo.enterpriseName}}</text>
</view>
<view class="project_info">
<text class="name">班组：</text>
<text>{{workerInfo.teamName}}</text>
@ -68,21 +72,21 @@
<view class="flex item" @click="showItemDetails(1)">
<image class="margin_r_5" style="width: 46rpx;height:46rpx"
src="../../../../static/personManage/ht.png"></image>
<text>合同</text>
<text>劳动合同</text>
<text class="state1" v-if="contractList.length>0">已签</text>
<text class="state2" v-else>未签</text>
<text class="state2" style="top: -7px;left: 68px;" v-else>未签</text>
</view>
<view class="flex item" @click="showItemDetails(2)">
<image class="margin_r_5" style="width: 42rpx;height:42rpx"
src="../../../../static/personManage/tjzs.png"></image>
<text>体检</text>
<text class="state1" v-if="physicalsList.length>0">已体检</text>
<text class="state2" v-else>未体检</text>
<text class="state2" style="top: -7px;left: 40px;" v-else>未体检</text>
</view>
<view class="flex item" @click="showItemDetails(3)">
<image class="margin_r_5" style="width: 38rpx;height:44rpx"
src="../../../../static/personManage/bx.png"></image>
<text>保险</text>
<text>工伤保险</text>
</view>
<view class="flex item" @click="showItemDetails(4)">
<image class="margin_r_5" style="width: 43rpx;height:38rpx"