hywen
/
YNUtdPlatform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug等问题修复

This commit is contained in:
BianLzhaoMin 2024-10-24 10:51:32 +08:00
parent ae21e9e3be
commit d91c04af2b
5 changed files with 365 additions and 274 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/workPlan/monthPlan.js Normal file
View File

@ -0,0 +1,3 @@
import request_yn from '@/utils/request_new_yn'
// 获取

2
pages/realName/index/components/bar-charts-model.vue
View File

@ -147,7 +147,7 @@ export default {
res.data.proMsgBean
setTimeout(() => {
let data = {
categories: ['基建线路', '基建变电', '生产线路', '生产变电', '配网', '其他'],
categories: ['基建线路', '基建变电', '生产线路', '生产变电', '配网', '其它'],
series: [
{
name: '',

32
pages/realName/index/index.vue
View File

@ -8,8 +8,8 @@
leftIconColor="#fff"
bgColor="#00337A"
:titleStyle="{ color: '#FFF', fontSize: '32rpx' }"
/>
></u-navbar>
<button class="refresh-btn" @tap="onRefreshPages">刷新</button>
<scroll-view scroll-y="true">
<!-- 轮播图区域 -->
<swiper class="swiper-container" autoplay interval="3000" circular indicator-dots>
@ -594,10 +594,11 @@ export default {
},
//展示工程选择弹窗
leftClick() {
console.log('返回')
if (this.type.indexOf('4') > -1) {
this.showPopup = true
}
// console.log('返回')
// if (this.type.indexOf('4') > -1) {
// this.showPopup = true
// }
uni.navigateTo({ url: '/pages/gzt/index' })
},
//选择工程
chosenPro(item) {
@ -832,6 +833,12 @@ export default {
uni.navigateTo({ url: `/pages/realName/index/pages/personList?workerType=0` })
break
}
},
/* 刷新页面 */
onRefreshPages() {
uni.reLaunch({
url: '/pages/realName/index/index'
})
}
}
}
@ -853,6 +860,19 @@ export default {
box-sizing: border-box;
padding: 0 10rpx;
.refresh-btn {
position: fixed;
top: 36rpx;
right: 26rpx;
background-color: #00337a;
color: #fff;
z-index: 999;
}
.refresh-btn::after {
border: none;
}
.search {
width: 100%;
margin: 0 auto;

21
pages/realName/index/pages/project.vue
View File

@ -27,13 +27,18 @@
<view style="padding: 0 20rpx">
<scroll-view class="data-container" scroll-y="true">
<view class="scroll-item" v-for="(item, index) in companyInfoList" :key="index">
<view class="item-1">
<view>{{ index + 1 }}</view>
<view>{{ item.proName }}</view>
<uni-icons :type="item.isCollect == 1 ? 'star-filled' : 'star'" size="20" @click="onCollection($event, item)" :style="{ color: item.isCollect == 1 ? '#f9971e' : '' }" style="position: absolute;right: 1%;"></uni-icons>
</view>
<view class="item-1">
<view>{{ index + 1 }}</view>
<view>{{ item.proName }}</view>
<uni-icons
:type="item.isCollect == 1 ? 'star-filled' : 'star'"
size="20"
@click="onCollection($event, item)"
:style="{ color: item.isCollect == 1 ? '#f9971e' : '' }"
style="position: absolute; right: 1%"
></uni-icons>
</view>
<view class="item-2">
<view>{{ item.subComName }}</view>
<view>{{ item.voltageLevel }}</view>
@ -368,7 +373,7 @@ export default {
/* 收藏与取消收藏 */
onCollection(e, row) {
console.log(row)
console.log(row)
const params = {
id: row.collectId,
userId: uni.getStorageSync('realNameUser').userId,

581
pages/realName/index/pages/subList.vue
View File

@ -1,11 +1,18 @@
<template>
<view class="page">
<u-navbar class="u-navbar" title="分包信息" placeholder @leftClick="leftClick"
leftIconColor="#fff" bgColor="#00337A" :titleStyle="{ color: '#FFF', fontSize: '32rpx' }"/>
<u-navbar
class="u-navbar"
title="分包信息"
placeholder
@leftClick="leftClick"
leftIconColor="#fff"
bgColor="#00337A"
:titleStyle="{ color: '#FFF', fontSize: '32rpx' }"
/>
<view class="header-fixed">
<view class="search-content">
<view style="width: 98%;">
<view style="width: 98%">
<uni-easyinput
suffixIcon="search"
v-model="queryParams.params.subName"
@ -23,56 +30,88 @@
<view class="item-1">
<view>{{ index + 1 }}</view>
<view>{{ item.subName }}</view>
<uni-icons :type="item.isCollect == 1 ? 'star-filled' : 'star'" size="20" @catchtap="onCollection($event, item)" :style="{ color: item.isCollect == 1 ? '#f9971e' : '' }" style="position: absolute;right: 1%;"></uni-icons>
<uni-icons
:type="item.isCollect == 1 ? 'star-filled' : 'star'"
size="20"
@catchtap="onCollection($event, item)"
:style="{ color: item.isCollect == 1 ? '#f9971e' : '' }"
style="position: absolute; right: 1%"
></uni-icons>
</view>
<view class="item-3">
<view
style="width: 25%; margin: 0 20rpx; display: flex; align-items: center; justify-content: space-between"
@tap="goTeamListPage(item)"
>
<view>班组</view>
<view style="color: #3f9dfd; font-weight: bold">{{ item.teamNum }}</view>
</view>
<view
style="width: 25%; margin: 0 20rpx; display: flex; align-items: center; justify-content: space-between"
@tap="goAttPersonListPage(item)"
>
<view>考勤人数</view>
<view style="color: #3f9dfd; font-weight: bold">{{ item.attPersonNum }}</view>
</view>
</view>
<view class="item-3">
<view
style="width: 25%; margin: 0 20rpx; display: flex; align-items: center; justify-content: space-between"
@tap="goAllPersonListPage(item)"
>
<view>在场</view>
<view style="color: #3f9dfd; font-weight: bold">{{ item.einPersonNum }}</view>
</view>
<view
style="width: 25%; margin: 0 20rpx; display: flex; align-items: center; justify-content: space-between"
@tap="goWorkPersonListPage(item)"
>
<view>固定</view>
<view style="color: #3f9dfd; font-weight: bold">{{ item.formalPersonNum }}</view>
</view>
<view
style="width: 25%; margin: 0 20rpx; display: flex; align-items: center; justify-content: space-between"
@tap="goTempPersonListPage(item)"
>
<view>临时</view>
<view style="color: #3f9dfd; font-weight: bold">{{ item.temporaryPersonNum }}</view>
</view>
</view>
<view class="item-3">
<view
style="width: 25%; margin: 0 20rpx; display: flex; align-items: center; justify-content: space-between"
@tap="goLightPersonListPage(item, 2)"
>
<view>绿灯</view>
<view style="color: #3fb779; font-weight: bold">{{ item.greenPersonNum }}</view>
</view>
<view
style="width: 25%; margin: 0 20rpx; display: flex; align-items: center; justify-content: space-between"
@tap="goLightPersonListPage(item, 1)"
>
<view>黄灯</view>
<view style="color: #e89c2d; font-weight: bold">{{ item.yellowPersonNum }}</view>
</view>
<view
style="width: 25%; margin: 0 20rpx; display: flex; align-items: center; justify-content: space-between"
@tap="goLightPersonListPage(item, 0)"
>
<view>红灯</view>
<view style="color: #e8717f; font-weight: bold">{{ item.redPersonNum }}</view>
</view>
</view>
<view style="width: 100%; font-size: 24rpx; padding: 20rpx 0; border-bottom: 1px solid #eee">
<view
style="width: 95%%; margin: 0 20rpx; display: flex; align-items: center; justify-content: space-between"
>
<view style="width: 100rpx">所在工程</view>
<view style="width: 83%">
<view v-for="(items, indexs) in item.proName.split('<br>')" :key="indexs">
{{ items }}
</view>
</view>
</view>
</view>
<view class="item-3">
<view style="width: 25%;margin:0 20rpx;display: flex;align-items: center;justify-content: space-between;" @tap="goTeamListPage(item)">
<view>班组</view>
<view style="color: #3f9dfd; font-weight: bold">{{item.teamNum}}</view>
</view>
<view style="width: 25%;margin:0 20rpx;display: flex;align-items: center;justify-content: space-between;" @tap="goAttPersonListPage(item)">
<view>考勤人数</view>
<view style="color: #3f9dfd; font-weight: bold">{{item.attPersonNum}}</view>
</view>
</view>
<view class="item-3">
<view style="width: 25%;margin:0 20rpx;display: flex;align-items: center;justify-content: space-between;" @tap="goAllPersonListPage(item)">
<view>在场</view>
<view style="color: #3f9dfd; font-weight: bold">{{item.einPersonNum}}</view>
</view>
<view style="width: 25%;margin:0 20rpx;display: flex;align-items: center;justify-content: space-between;" @tap="goWorkPersonListPage(item)">
<view>固定</view>
<view style="color: #3f9dfd; font-weight: bold">{{item.formalPersonNum}}</view>
</view>
<view style="width: 25%;margin:0 20rpx;display: flex;align-items: center;justify-content: space-between;" @tap="goTempPersonListPage(item)">
<view>临时</view>
<view style="color: #3f9dfd; font-weight: bold">{{item.temporaryPersonNum}}</view>
</view>
</view>
<view class="item-3">
<view style="width: 25%;margin:0 20rpx;display: flex;align-items: center;justify-content: space-between;" @tap="goLightPersonListPage(item,2)">
<view>绿灯</view>
<view style="color: #3FB779; font-weight: bold">{{item.greenPersonNum}}</view>
</view>
<view style="width: 25%;margin:0 20rpx;display: flex;align-items: center;justify-content: space-between;" @tap="goLightPersonListPage(item,1)">
<view>黄灯</view>
<view style="color: #E89C2D; font-weight: bold">{{item.yellowPersonNum}}</view>
</view>
<view style="width: 25%;margin:0 20rpx;display: flex;align-items: center;justify-content: space-between;" @tap="goLightPersonListPage(item,0)">
<view>红灯</view>
<view style="color: #E8717F; font-weight: bold">{{item.redPersonNum}}</view>
</view>
</view>
<view style="width: 100%;font-size: 24rpx;padding: 20rpx 0;border-bottom: 1px solid #eee;">
<view style="width:95%%;margin:0 20rpx;display: flex;align-items: center;justify-content: space-between;">
<view style="width: 100rpx;">所在工程</view>
<view style="width: 83%;">
<view v-for="(items,indexs) in item.proName.split('<br>')" :key="indexs">
{{items}}
</view>
</view>
</view>
</view>
</view>
</scroll-view>
</view>
@ -86,7 +125,8 @@
<scroll-view class="company-container" scroll-y="true">
<view class="company-items">
<view
v-for="(item, index) in companyList" :key="index"
v-for="(item, index) in companyList"
:key="index"
:class="{ active: index === activeIndex }"
@tap="onSelectCompany(index, item.name)"
>
@ -100,7 +140,8 @@
<scroll-view class="company-container" scroll-y="true">
<view class="company-items">
<view
v-for="(item, index) in proStatusList" :key="index"
v-for="(item, index) in proStatusList"
:key="index"
:class="{ active: index === activeIndex2 }"
@tap="onSelectStatus(index, item.name)"
>
@ -109,38 +150,38 @@
</view>
</scroll-view>
</view>
<h2>电压等级</h2>
<view>
<scroll-view class="company-container" scroll-y="true">
<view class="company-items">
<view
v-for="(item, index) in levelList" :key="index"
:class="{ active: index === activeIndex3 }"
@tap="onSelectLevel(index, item.name)"
>
{{ item.name }}
</view>
</view>
</scroll-view>
</view>
<h2>工程类型</h2>
<view>
<scroll-view class="company-container" scroll-y="true">
<view class="company-items">
<view
v-for="(item, index) in proTypeList" :key="index"
:class="{ active: index === activeIndex4 }"
@tap="onSelectType(index, item.name)"
>
{{ item.name }}
</view>
</view>
</scroll-view>
</view>
<view class="bottom-btn">
<h2>电压等级</h2>
<view>
<scroll-view class="company-container" scroll-y="true">
<view class="company-items">
<view
v-for="(item, index) in levelList"
:key="index"
:class="{ active: index === activeIndex3 }"
@tap="onSelectLevel(index, item.name)"
>
{{ item.name }}
</view>
</view>
</scroll-view>
</view>
<h2>工程类型</h2>
<view>
<scroll-view class="company-container" scroll-y="true">
<view class="company-items">
<view
v-for="(item, index) in proTypeList"
:key="index"
:class="{ active: index === activeIndex4 }"
@tap="onSelectType(index, item.name)"
>
{{ item.name }}
</view>
</view>
</scroll-view>
</view>
<view class="bottom-btn">
<button style="background-color: #fff; color: #00337a" @tap="onReset">重置</button>
<button style="background-color: #00337a; color: #fff" @tap="onQuery">查询</button>
</view>
@ -163,20 +204,43 @@ export default {
token: uni.getStorageSync('tjToken'),
// 查询参数
queryParams: {
offset: "0",
limit: "999999",
offset: '0',
limit: '999999',
params: {
userId:uni.getStorageSync('realNameUser').userId+"",
proId:"",
subName:"",
proName:"",
subComName:""
userId: uni.getStorageSync('realNameUser').userId + '',
proId: '',
subName: '',
proName: '',
subComName: ''
}
},
companyList: [{ name: '全部', id: '' }],
proStatusList: [{name:'全部', id:'' },{name:'在建', id:'1' },{name:'完工', id:'2' },{name:'筹建', id:'3' },{name:'停工', id:'4' },{name:'遗憾收尾', id:'5' }],
levelList: [{name:'全部', id:'' },{name:'其他', id:'1' },{name:'110kV', id:'2' },{name:'220kV', id:'3' },{name:'500kV', id:'4' },{name:'±500kV', id:'5' },{name:'1000kV以上', id:'6' }],
proTypeList: [{name:'全部', id:'' },{name:'其他', id:'1' },{name:'变电改扩建', id:'2' },{name:'基建变电', id:'3' },{name:'基建线路', id:'4' },{name:'生产变电', id:'5' },{name:'生产线路', id:'6' }],
proStatusList: [
{ name: '全部', id: '' },
{ name: '在建', id: '1' },
{ name: '完工', id: '2' },
{ name: '筹建', id: '3' },
{ name: '停工', id: '4' },
{ name: '遗憾收尾', id: '5' }
],
levelList: [
{ name: '全部', id: '' },
{ name: '其他', id: '1' },
{ name: '110kV', id: '2' },
{ name: '220kV', id: '3' },
{ name: '500kV', id: '4' },
{ name: '±500kV', id: '5' },
{ name: '1000kV以上', id: '6' }
],
proTypeList: [
{ name: '全部', id: '' },
{ name: '其他', id: '1' },
{ name: '变电改扩建', id: '2' },
{ name: '基建变电', id: '3' },
{ name: '基建线路', id: '4' },
{ name: '生产变电', id: '5' },
{ name: '生产线路', id: '6' }
],
companyInfoList: []
}
},
@ -184,14 +248,14 @@ export default {
// this.getHomePageSelectData()
},
onLoad(option) {
console.log(option)
this.queryParams.params.proId=option.proId||"";
this.getListData()
console.log(option)
this.queryParams.params.proId = option.proId || ''
this.getListData()
},
methods: {
/* 获取列表 */
async getListData() {
console.log(this.queryParams)
console.log(this.queryParams)
uni.request({
url: config.realBmwUrl + '/homeSubPage/getAppActiveSub',
method: 'POST',
@ -214,7 +278,8 @@ export default {
this.companyList = this.companyList.concat(res.subList)
},
leftClick() {
uni.navigateTo({ url: `/pages/realName/index/index` })
// uni.navigateTo({ url: `/pages/realName/index/index` })
uni.navigateBack()
},
onSearchFilter() {
// 打开底部弹框
@ -229,7 +294,7 @@ export default {
this.queryParams.params.subComName = name
}
},
onSelectStatus(index, name) {
onSelectStatus(index, name) {
this.activeIndex2 = index
if (index === 0) {
this.queryParams.params.proStatus = ''
@ -237,7 +302,7 @@ export default {
this.queryParams.params.proStatus = name
}
},
onSelectLevel(index, name) {
onSelectLevel(index, name) {
this.activeIndex3 = index
if (index === 0) {
this.queryParams.params.level = ''
@ -245,7 +310,7 @@ export default {
this.queryParams.params.level = name
}
},
onSelectType(index, name) {
onSelectType(index, name) {
this.activeIndex4 = index
if (index === 0) {
this.queryParams.params.type = ''
@ -257,12 +322,12 @@ export default {
onReset() {
this.activeIndex = 0
this.queryParams.params.subComName = ''
this.activeIndex2 = 0
this.activeIndex2 = 0
this.queryParams.params.proStatus = ''
this.activeIndex3 = 0
this.queryParams.params.level = ''
this.activeIndex4 = 0
this.queryParams.params.type = ''
this.activeIndex3 = 0
this.queryParams.params.level = ''
this.activeIndex4 = 0
this.queryParams.params.type = ''
this.onQuery()
},
/* 查询 */
@ -271,34 +336,33 @@ export default {
this.$refs.popup.close()
})
},
/* 点击跳转班组 */
goTeamListPage(row) {
uni.navigateTo({ url: `/pages/realName/index/pages/teamList?subId=${row.subId}` })
},
/* 点击跳转人员-已考勤 */
goAttPersonListPage(row) {
uni.navigateTo({ url: `/pages/realName/index/pages/personList?subId=${row.subId}&isAtt=0` })
},
/* 点击跳转人员-在场（全部） */
goAllPersonListPage(row) {
uni.navigateTo({ url: `/pages/realName/index/pages/personList?subId=${row.subId}` })
},
/* 点击跳转人员-固定 */
goWorkPersonListPage(row) {
uni.navigateTo({ url: `/pages/realName/index/pages/personList?subId=${row.subId}&workerType=1` })
},
/* 点击跳转人员-临时 */
goTempPersonListPage(row) {
uni.navigateTo({ url: `/pages/realName/index/pages/personList?subId=${row.subId}&workerType=0` })
},
/* 点击跳转人员-灯 */
goLightPersonListPage(row,type) {//绿2 黄1 红0
uni.navigateTo({ url: `/pages/realName/index/pages/personList?subId=${row.subId}&lightStatus=${type}` })
},
/* 点击跳转班组 */
goTeamListPage(row) {
uni.navigateTo({ url: `/pages/realName/index/pages/teamList?subId=${row.subId}` })
},
/* 点击跳转人员-已考勤 */
goAttPersonListPage(row) {
uni.navigateTo({ url: `/pages/realName/index/pages/personList?subId=${row.subId}&isAtt=0` })
},
/* 点击跳转人员-在场（全部） */
goAllPersonListPage(row) {
uni.navigateTo({ url: `/pages/realName/index/pages/personList?subId=${row.subId}` })
},
/* 点击跳转人员-固定 */
goWorkPersonListPage(row) {
uni.navigateTo({ url: `/pages/realName/index/pages/personList?subId=${row.subId}&workerType=1` })
},
/* 点击跳转人员-临时 */
goTempPersonListPage(row) {
uni.navigateTo({ url: `/pages/realName/index/pages/personList?subId=${row.subId}&workerType=0` })
},
/* 点击跳转人员-灯 */
goLightPersonListPage(row, type) {
//绿2 黄1 红0
uni.navigateTo({ url: `/pages/realName/index/pages/personList?subId=${row.subId}&lightStatus=${type}` })
},
/* 收藏与取消收藏 */
onCollection(e, row) {
e.stopPropagation()
@ -333,146 +397,145 @@ export default {
<style lang="scss" scoped>
.page {
width: 100vw;
height: 100vh;
background-color: #EFEFEF;
box-sizing: border-box;
width: 100vw;
height: 100vh;
background-color: #efefef;
box-sizing: border-box;
}
.header-fixed {
width: 94%;
margin: 20rpx auto;
background-color: #FFF;
border-radius: 10rpx;
padding:20rpx;
.header-fixed {
width: 94%;
margin: 20rpx auto;
background-color: #fff;
border-radius: 10rpx;
padding: 20rpx;
.search-content {
display: flex;
align-items: center;
.search-icon {
width: 48rpx;
height: 40rpx;
margin-right: 60rpx;
margin-left: 30rpx;
background: url('../../../../static/realName/screen.png') no-repeat;
background-size: 100% 100%;
}
}
}
.search-content {
display: flex;
align-items: center;
.data-container {
width: 100%;
height: 75vh;
.scroll-item {
padding: 14rpx 0;
background-color: #fff;
margin: 20rpx auto;
}
.item-1,
.item-2,
.item-3 {
width: 96%;
margin: 0 auto;
padding: 20rpx 0;
border-bottom: 1px solid #eee;
display: flex;
align-items: center;
position: relative;
}
.item-1 view:first-child {
width: 80rpx;
height: 56rpx;
margin-right: 16rpx;
text-align: center;
line-height: 56rpx;
background: url('../../../../static/realName/serial.png') no-repeat;
.search-icon {
width: 48rpx;
height: 40rpx;
margin-right: 60rpx;
margin-left: 30rpx;
background: url('../../../../static/realName/screen.png') no-repeat;
background-size: 100% 100%;
color: #fff;
font-weight: bold;
font-size: 28rpx;
}
.item-2,
.item-3 {
font-size: 24rpx;
justify-content: space-around;
}
}
}
.bottom-content {
height: 60vh;
overflow-y: auto;
.data-container {
width: 100%;
height: 75vh;
h1,
h2 {
padding: 15rpx 0;
font-size: 32rpx;
}
h1 {
margin-top: 10rpx;
border-bottom: 1px solid #ccc;
text-align: center;
}
h2 {
padding-left: 16rpx;
// border-top: 1px solid #ccc;
border-bottom: 1px solid #ccc;
}
.scroll-item {
padding: 14rpx 0;
background-color: #fff;
margin: 20rpx auto;
}
.company-container {
width: 96%;
height: auto;
padding: 40rpx 20rpx;
padding-bottom: 120rpx;
.company-items {
width: 100%;
padding: 0 16rpx;
display: flex;
flex-wrap: wrap;
.item-1,
.item-2,
.item-3 {
width: 96%;
margin: 0 auto;
padding: 20rpx 0;
border-bottom: 1px solid #eee;
display: flex;
align-items: center;
position: relative;
}
view {
width: 48%;
height: 48rpx;
margin-top: 10rpx;
line-height: 48rpx;
border-radius: 10rpx;
text-align: center;
background-color: #eee;
color: #656565;
}
.item-1 view:first-child {
width: 80rpx;
height: 56rpx;
margin-right: 16rpx;
text-align: center;
line-height: 56rpx;
background: url('../../../../static/realName/serial.png') no-repeat;
background-size: 100% 100%;
color: #fff;
font-weight: bold;
font-size: 28rpx;
}
.active {
background-color: #3f9dfd;
color: #fff;
}
}
.item-2,
.item-3 {
font-size: 24rpx;
justify-content: space-around;
}
}
.company-items view:nth-child(2n + 1) {
margin-right: 10rpx;
}
}
.bottom-content {
height: 60vh;
overflow-y: auto;
.bottom-btn {
h1,
h2 {
padding: 15rpx 0;
font-size: 32rpx;
}
h1 {
margin-top: 10rpx;
border-bottom: 1px solid #ccc;
text-align: center;
}
h2 {
padding-left: 16rpx;
// border-top: 1px solid #ccc;
border-bottom: 1px solid #ccc;
}
.company-container {
width: 96%;
height: auto;
padding: 40rpx 20rpx;
padding-bottom: 120rpx;
.company-items {
width: 100%;
position: fixed;
padding: 0 16rpx;
display: flex;
bottom: 20rpx;
z-index: 9;
flex-wrap: wrap;
button {
flex: 1;
height: 80rpx;
margin: 0 20rpx;
line-height: 80rpx;
font-weight: normal;
border-radius: 20rpx;
border: 1rpx solid #00337a;
view {
width: 48%;
height: 48rpx;
margin-top: 10rpx;
line-height: 48rpx;
border-radius: 10rpx;
text-align: center;
background-color: #eee;
color: #656565;
}
.active {
background-color: #3f9dfd;
color: #fff;
}
}
.company-items view:nth-child(2n + 1) {
margin-right: 10rpx;
}
}
.bottom-btn {
width: 100%;
position: fixed;
display: flex;
bottom: 20rpx;
z-index: 9;
button {
flex: 1;
height: 80rpx;
margin: 0 20rpx;
line-height: 80rpx;
font-weight: normal;
border-radius: 20rpx;
border: 1rpx solid #00337a;
}
}
}
</style>