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-29 18:01:30 +08:00
commit cd2d793ad6
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main.js
View File

@ -37,11 +37,11 @@ if (process.env.NODE_ENV === 'development') {
console.log('开发环境') console.log('开发环境')
// Vue.prototype.url_config = 'http://47.93.215.234:9809/' // 鞍钢正式地址（弃用） // 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: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://182.90.224.237:51234/' //雄哥内网穿透地址
// Vue.prototype.url_config = 'http://jxj.zhgdyun.com:61212/' //杰哥内网穿透地址 // Vue.prototype.url_config = 'http://jxj.zhgdyun.com:61212/' //杰哥内网穿透地址
// Vue.prototype.url_config = ' http://192.168.34.221:28888/' //郭圣雄本地 // Vue.prototype.url_config = ' http://192.168.34.221:28888/' //郭圣雄本地
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.url_config = 'http://192.168.34.155:19111/' //彭洁本地
// Vue.prototype.work_url = 'http://47.93.215.234:19997' // 工作流线上地址（弃用） // 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://42.180.188.17:19997' // 工作流线上地址

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

@ -72,16 +72,16 @@
<view class="num" v-show="tabIndex==0"> <view class="num" v-show="tabIndex==0">
<!-- {{((statictisData.yesterdayAttendancePerson.lwPersonTotal/Number(statictisData.toaltPerson.lwPersonTotal))*100).toFixed(2)}}% --> <!-- {{((statictisData.yesterdayAttendancePerson.lwPersonTotal/Number(statictisData.toaltPerson.lwPersonTotal))*100).toFixed(2)}}% -->
<!-- {{(((statictisData.attendancePerson.lwPersonTotal-statictisData.yesterdayAttendancePerson.lwPersonTotal)/statictisData.yesterdayAttendancePerson.lwPersonTotal)*100).toFixed(2)}}% --> <!-- {{(((statictisData.attendancePerson.lwPersonTotal-statictisData.yesterdayAttendancePerson.lwPersonTotal)/statictisData.yesterdayAttendancePerson.lwPersonTotal)*100).toFixed(2)}}% -->
<text v-if="lwRadio(statictisData) > 0"> <text v-if="lwRadio(statictisData) === 999999999">
<text>-</text>
</text>
<text v-if="lwRadio(statictisData) > 0 && lwRadio(statictisData) !== 999999999">
<u-icon name="arrow-upward" color="#2979ff" size="40"></u-icon> <u-icon name="arrow-upward" color="#2979ff" size="40"></u-icon>
<text>{{Math.abs(lwRadio(statictisData))}}%</text> <text>{{Math.abs(lwRadio(statictisData))}}%</text>
</text> </text>
<text v-if="lwRadio(statictisData) === 0"> <text v-if="lwRadio(statictisData) === 0">
<text>{{Math.abs(lwRadio(statictisData))}}%</text> <text>{{Math.abs(lwRadio(statictisData))}}%</text>
</text> </text>
<text v-if="lwRadio(statictisData) === '--'">
<text>{{Math.abs(lwRadio(statictisData))}}</text>
</text>
<text v-if="lwRadio(statictisData) < 0"> <text v-if="lwRadio(statictisData) < 0">
<u-icon name="arrow-downward" color="#FF0000" size="40"></u-icon> <u-icon name="arrow-downward" color="#FF0000" size="40"></u-icon>
<text>{{Math.abs(lwRadio(statictisData))}}%</text> <text>{{Math.abs(lwRadio(statictisData))}}%</text>
@ -90,16 +90,16 @@
<view class="num" v-show="tabIndex==1"> <view class="num" v-show="tabIndex==1">
<!-- {{((statictisData.yesterdayAttendancePerson.glPersonTotal/Number(statictisData.toaltPerson.glPersonTotal))*100).toFixed(2)}}% --> <!-- {{((statictisData.yesterdayAttendancePerson.glPersonTotal/Number(statictisData.toaltPerson.glPersonTotal))*100).toFixed(2)}}% -->
<!-- {{(((statictisData.attendancePerson.glPersonTotal-statictisData.yesterdayAttendancePerson.glPersonTotal)/statictisData.yesterdayAttendancePerson.glPersonTotal)*100).toFixed(2)}}% --> <!-- {{(((statictisData.attendancePerson.glPersonTotal-statictisData.yesterdayAttendancePerson.glPersonTotal)/statictisData.yesterdayAttendancePerson.glPersonTotal)*100).toFixed(2)}}% -->
<text v-if="glRadio(statictisData) > 0"> <text v-if="glRadio(statictisData) === 999999999">
<text>-</text>
</text>
<text v-if="glRadio(statictisData) > 0 && glRadio(statictisData) !== 999999999">
<u-icon name="arrow-upward" color="#2979ff" size="40"></u-icon> <u-icon name="arrow-upward" color="#2979ff" size="40"></u-icon>
<text>{{Math.abs(glRadio(statictisData))}}%</text> <text>{{Math.abs(glRadio(statictisData))}}%</text>
</text> </text>
<text v-if="glRadio(statictisData) === 0"> <text v-if="glRadio(statictisData) === 0">
<text>{{Math.abs(glRadio(statictisData))}}%</text> <text>{{Math.abs(glRadio(statictisData))}}%</text>
</text> </text>
<text v-if="glRadio(statictisData) === '--'">
<text>{{Math.abs(glRadio(statictisData))}}</text>
</text>
<text v-if="glRadio(statictisData) < 0"> <text v-if="glRadio(statictisData) < 0">
<u-icon name="arrow-downward" color="#FF0000" size="40"></u-icon> <u-icon name="arrow-downward" color="#FF0000" size="40"></u-icon>
<text>{{Math.abs(glRadio(statictisData))}}%</text> <text>{{Math.abs(glRadio(statictisData))}}%</text>
@ -267,18 +267,22 @@
}, },
methods: { methods: {
lwRadio(statictisData){ lwRadio(statictisData){
let today = statictisData.attendancePerson.lwPersonTotal let today = Number(statictisData.attendancePerson.lwPersonTotal)
let yesterday = statictisData.yesterdayAttendancePerson.lwPersonTotal let yesterday = Number(statictisData.yesterdayAttendancePerson.lwPersonTotal)
if(yesterday === 0) return '--' if(yesterday === 0) return 999999999
// yesterday = 5
// today = 5
if(today - yesterday === 0) return 0
let radio = (((today - yesterday)/yesterday)*100).toFixed(2) let radio = (((today - yesterday)/yesterday)*100).toFixed(2)
return radio return radio
}, },
glRadio(statictisData){ glRadio(statictisData){
let today = statictisData.attendancePerson.glPersonTotal let today = statictisData.attendancePerson.glPersonTotal
let yesterday = statictisData.yesterdayAttendancePerson.glPersonTotal let yesterday = statictisData.yesterdayAttendancePerson.glPersonTotal
if(yesterday === 0) return '--' if(yesterday === 0) return 999999999
// yesterday = 5
// today = 5
if(today - yesterday === 0) return 0
let radio = (((today - yesterday)/yesterday)*100).toFixed(2) let radio = (((today - yesterday)/yesterday)*100).toFixed(2)
return radio return radio
}, },