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-dev

Browse Source
This commit is contained in:
kun 2024-05-09 16:43:25 +08:00
commit 71038b3fb6
11 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
main.js
View File

@ -37,14 +37,15 @@ if (process.env.NODE_ENV === 'development') {
console.log('开发环境')
// Vue.prototype.url_config = 'http://47.93.215.234:9809/' // 鞍钢正式地址（弃用）
// Vue.prototype.url_config = 'http://42.180.188.17:9809/' // 鞍钢正式地址
// Vue.prototype.url_config = 'http://42.180.188.17:11211/' // 鞍钢测试地址
Vue.prototype.url_config = 'http://42.180.188.17:11211/' // 鞍钢测试地址
// Vue.prototype.url_config = 'http://182.90.224.237:51234/' //雄哥内网穿透地址
// Vue.prototype.url_config = 'http://jxj.zhgdyun.com:61212/' //杰哥内网穿透地址
Vue.prototype.url_config = 'http://192.168.34.221:9111/' //郭圣雄本地
// Vue.prototype.url_config = 'http://192.168.34.221:9111/' //郭圣雄本地
// Vue.prototype.url_config = 'http://192.168.34.155:19111/' //彭洁本地
// Vue.prototype.work_url = 'http://47.93.215.234:19997' // 工作流线上地址（弃用）
// Vue.prototype.work_url = 'http://42.180.188.17:19997' // 工作流线上地址
Vue.prototype.work_url = 'http://192.168.34.138:5173' // 工作流地址
Vue.prototype.work_url = 'http://42.180.188.17:19097' // 工作流测试地址
// Vue.prototype.work_url = 'http://192.168.34.138:5173' // 工作流地址
// Vue.prototype.work_url = 'http://139.9.66.234:5173' // 工作流地址
// Vue.prototype.work_url = 'http://192.168.34.126:5173' // 工作流地址
// Vue.prototype.url_config = 'http://8.142.139.165:7080/' // 湖里

14
pages.json
View File

@ -1119,13 +1119,15 @@
"enablePullDownRefresh" : false
}
},
// 目前不清楚有啥用，先注释带掉
// {
// "path": "uni_modules/uni-portal/pages/index",
// "style": {
// "navigationBarTitleText": "发布应用",
// "enablePullDownRefresh": false
// }
// },
{
"path": "uni_modules/uni-portal/pages/index",
"style": {
"navigationBarTitleText": "发布应用",
"enablePullDownRefresh": false
}
}, {
"path": "pages/potentialRisk/potentialRisk",
"style": {
"navigationBarTitleText": "安全隐患",

2
pages/personManage/localeTeam.vue
View File

@ -20,7 +20,7 @@
<view class="blockBox">
<view class="blockTitle">
<view class="titleName">
劳务人员分布
施工人员分布
</view>
</view>
<view class="blockContent">

2
pages/personManage/peopleAnalyze.vue
View File

@ -9,7 +9,7 @@
<view class="banner_bg flex">
<view class="type">
<view>{{listData.workercount?listData.workercount.lwPersonTotal:0}}</view>
<view class="type_name">在职劳务人员</view>
<view class="type_name">在职施工人员</view>
</view>
<view class="type">
<view>{{listData.workercount?listData.workercount.glPersonTotal:0}}</view>

2
pages/personManage/personManage.vue
View File

@ -63,7 +63,7 @@
{{listData.presencecount?listData.presencecount.lwPersonTotal:0}}
</view>
<view class="text">
在场劳务人员
在场施工人员
</view>
</view>
<view class="dataItem">

4
pages/projectEnd/carManage/addCar.vue
View File

@ -29,7 +29,7 @@
<view class="uni-form-item">
<view class="uni-form-label">
<text class="star">*</text>
固定/临时车辆
固定/长期车辆
</view>
<view class="uni-form-input">
<u-radio-group v-model="form.carModuleType">
@ -37,7 +37,7 @@
固定车辆
</u-radio>
<u-radio :name="2">
临时车辆
长期车辆
</u-radio>
</u-radio-group>
</view>

4
pages/projectEnd/carManage/index.vue
View File

@ -106,8 +106,8 @@
<text class="value">{{ item.driverTelephone }}</text>
</view>
<view class="alarmItem">
<text class="label">固定/临时车辆：</text>
<text class="value">{{ item.carModuleType == "1" ? "固定" : "临时" }}</text>
<text class="label">固定/长期车辆：</text>
<text class="value">{{ item.carModuleType == "1" ? "固定" : "长期" }}</text>
</view>
<view class="alarmItem" v-if="type !== 'supplier'" style="width: 100%;">
<text class="label">企业名称：</text>

4
pages/projectEnd/laborManage/attendanceManage.vue
View File

@ -79,7 +79,7 @@ export default {
data() {
return {
searchForm: {
personType: 1,//1、劳务人员 2、管理人员
personType: 1,//1、施工人员 2、管理人员
pageNo: 1,
pageSize: 10,
projectSn: "",
@ -92,7 +92,7 @@ export default {
isLoadMore: false,
personTypeArr: [
{
name: '劳务人员', value: 1
name: '施工人员', value: 1
}, {
name: '管理人员', value: 2
}

8
pages/projectEnd/laborManage/index.vue
View File

@ -14,7 +14,7 @@
<view class="itemInner" @click="tabIndex=0">
<view class="">
<view class="txt" :class="tabIndex==0?'active':''">
在场劳务人员
在场施工人员
</view>
<view class="num">
{{statictisData.presencePerson.lwPersonTotal}}
@ -37,7 +37,7 @@
<view class="itemInner">
<view class="">
<view class="txt">
<text v-if="tabIndex === 0">劳务人员出勤</text>
<text v-if="tabIndex === 0">施工人员出勤</text>
<text v-if="tabIndex === 1">管理人员出勤</text>
</view>
<view class="num">
@ -49,7 +49,7 @@
<view class="itemInner">
<view class="">
<view class="txt">
<text v-if="tabIndex === 0">劳务人员总数</text>
<text v-if="tabIndex === 0">施工人员总数</text>
<text v-if="tabIndex === 1">管理人员总数</text>
</view>
<view class="num">
@ -63,7 +63,7 @@
<view class="itemInner">
<view class="">
<view class="txt">
<text v-if="tabIndex === 0">劳务昨日出勤率</text>
<text v-if="tabIndex === 0">施工人员昨日出勤率</text>
<text v-if="tabIndex === 1">管理人员昨日出勤率</text>
</view>

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

@ -355,7 +355,7 @@
let that = this;
let requestData = {
enterpriseName: obj.enterpriseName,
personType: obj.personType == 1?'劳务人员':obj.personType == 2?'管理人员':'临时人员',
personType: obj.personType == 1?'施工人员':obj.personType == 2?'管理人员':'临时人员',
teamDepartmentName: obj.teamName || obj.departmentName,
workerName: obj.workerName,
projectSn: obj.projectSn

4
pages/projectManage/projectManage.vue
View File

@ -106,7 +106,7 @@
{{statisticsCount.workercount.lwPersonTotal}}
</view>
<view class="text">
在职劳务人员数
在职施工人员数
</view>
</view>
<view class="dataItem">
@ -114,7 +114,7 @@
{{statisticsCount.presencecount.lwPersonTotal}}
</view>
<view class="text">
在场劳务人员数
在场施工人员数
</view>
</view>
</view>