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

Merge branch 'bjxz-cjw' into bjxz-dev

Browse Source
This commit is contained in:
Vce 2024-05-16 09:22:38 +08:00
commit 7f6548678b
26 changed files with 323 additions and 186 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
pages.json
View File

@ -1716,78 +1716,78 @@
"navigationBarTitleText" : "修改密码"
}
},
{
"path" : "pages/projectEnd/specialOperations/specialOperations",
"style" :
{
"navigationBarTitleText" : ""
}
},
{
"path" : "pages/projectEnd/specialOperations/fireWork/fireWork",
"path" : "pages/projectEnd/specialOperations/fireWork/work",
"style" :
{
"navigationBarTitleText" : ""
}
},
{
"path" : "pages/projectEnd/specialOperations/specialOperations",
"path" : "pages/projectEnd/specialOperations/fireWork/detail",
"style" :
{
"navigationBarTitleText" : ""
}
},
{
"path" : "pages/projectEnd/specialOperations/fireWork/fireWorkDetail",
"path" : "pages/projectEnd/specialOperations/fireWork/plan",
"style" :
{
"navigationBarTitleText" : ""
}
},
{
"path" : "pages/projectEnd/specialOperations/fireWork/fireWorkPlan",
"path" : "pages/projectEnd/specialOperations/fireWork/addPlan",
"style" :
{
"navigationBarTitleText" : ""
}
},
{
"path" : "pages/projectEnd/specialOperations/fireWork/addFireWorkPlan",
"path" : "pages/projectEnd/specialOperations/fireWork/safe",
"style" :
{
"navigationBarTitleText" : ""
}
},
{
"path" : "pages/projectEnd/specialOperations/fireWork/fireWorkSafe",
"path" : "pages/projectEnd/specialOperations/fireWork/safeList",
"style" :
{
"navigationBarTitleText" : ""
}
},
{
"path" : "pages/projectEnd/specialOperations/fireWork/fireWorkSafeList",
"path" : "pages/projectEnd/specialOperations/fireWork/side",
"style" :
{
"navigationBarTitleText" : ""
}
},
{
"path" : "pages/projectEnd/specialOperations/fireWork/fireWorkSide",
"path" : "pages/projectEnd/specialOperations/fireWork/addSide",
"style" :
{
"navigationBarTitleText" : ""
}
},
{
"path" : "pages/projectEnd/specialOperations/fireWork/addFireWorkSide",
"path" : "pages/projectEnd/specialOperations/fireWork/workFinally",
"style" :
{
"navigationBarTitleText" : ""
}
},
{
"path" : "pages/projectEnd/specialOperations/fireWork/fireWorkFinally",
"style" :
{
"navigationBarTitleText" : ""
}
},
{
"path" : "pages/projectEnd/specialOperations/fireWork/addFireWorkFinally",
"path" : "pages/projectEnd/specialOperations/fireWork/addWorkFinally",
"style" :
{
"navigationBarTitleText" : ""
@ -1801,14 +1801,21 @@
}
},
{
"path" : "pages/projectEnd/specialOperations/fireWork/fireWorkCheck",
"path" : "pages/projectEnd/specialOperations/fireWork/check",
"style" :
{
"navigationBarTitleText" : ""
}
},
{
"path" : "pages/projectEnd/specialOperations/fireWork/fireWorkCheckList",
"path" : "pages/projectEnd/specialOperations/fireWork/checkList",
"style" :
{
"navigationBarTitleText" : ""
}
},
{
"path" : "pages/projectEnd/specialOperations/fireWork/safeMesure",
"style" :
{
"navigationBarTitleText" : ""

1
pages/projectEnd/dangerBigProject/addConstructionStation.vue
View File

@ -169,6 +169,7 @@
this.formData.imgFileList.forEach(item=>{
arr.push(item.url)
})
data.type = 1
data.imageUrl = arr.join(',')
// if(data.sideStationAddr == ""){
// uni.showToast({

1
pages/projectEnd/dangerBigProject/addFinallyAcceptance.vue
View File

@ -144,6 +144,7 @@
acceptanceUnitId: this.enterpriseId,
acceptanceUserId: this.acceptancePerson.userId,
planTime: this.planTime,
type: 1
}
console.log(data);
if(!data.acceptanceUnitId){

3
pages/projectEnd/dangerBigProject/addOrdinaryAcceptance.vue
View File

@ -171,7 +171,8 @@
acceptanceRegion: this.formData.acceptanceRegion,
acceptanceResult: this.formData.acceptanceResult,
acceptanceType: this.formData.acceptanceType,
dangerousEngineeringId: this.formData.dangerousEngineeringId
dangerousEngineeringId: this.formData.dangerousEngineeringId,
type: 1
}
data.createUser = JSON.parse(uni.getStorageSync('userInfo')).userId;
let arr = []

3
pages/projectEnd/dangerBigProject/addPlan.vue
View File

@ -143,7 +143,8 @@
progressDescribe: this.formData.progressDescribe,
engineeringId: this.formData.engineeringId,
createUser: this.formData.createUser,
createUserName: this.formData.createUserName
createUserName: this.formData.createUserName,
type: 1
}
let arr = []
this.formData.imgFileList.forEach(item=>{

3
pages/projectEnd/dangerBigProject/backlogList.vue
View File

@ -59,7 +59,8 @@
method:'get',
data:{
projectSn: this.projectSn,
acceptanceUserId: this.userInfo.userId
acceptanceUserId: this.userInfo.userId,
type:1
},
success:res=>{
uni.hideLoading()

2
pages/projectEnd/dangerBigProject/constructionStation.vue
View File

@ -52,7 +52,7 @@
this.sendRequest({
url:'xmgl/dangerousEngineeringSideStation/selectList',
method:'post',
data: {engineeringId: this.detailId},
data: {engineeringId: this.detailId,type:1},
success:res=>{
uni.hideLoading()
if(res.code==200){

12
pages/projectEnd/dangerBigProject/details.vue
View File

@ -146,9 +146,14 @@
onShow(){
this.statusBarHeight = uni.getStorageSync('systemInfo').statusBarHeight;
this.initData()
if(this.$refs['list'] && this.$refs['list'].initData){
this.$refs['list'].initData()
}
let that = this;
setTimeout(function(){
// console.log(that.$refs,777)
// console.log(that.$refs.list,777)
if(that.$refs['list'] && that.$refs['list'].initData){
that.$refs['list'].initData()
}
},200)
},
onLoad(val){
this.detailId = val.id
@ -196,6 +201,7 @@
data:{
engineeringId: this.detailData.id,
projectSn: JSON.parse(uni.getStorageSync('projectDetail')).projectSn,
type:1
},
success:res=>{
uni.hideLoading()

1
pages/projectEnd/dangerBigProject/finallyAcceptance.vue
View File

@ -50,6 +50,7 @@
data:{
engineeringId: this.detailId,
projectSn: JSON.parse(uni.getStorageSync('projectDetail')).projectSn,
type: 1
},
success:res=>{
uni.hideLoading()

2
pages/projectEnd/dangerBigProject/planList.vue
View File

@ -52,7 +52,7 @@
this.sendRequest({
url:'xmgl/dangerousEngineeringProgressRecord/list',
method:'post',
data: {engineeringId: this.detailId},
data: {engineeringId: this.detailId,type:1},
success:res=>{
uni.hideLoading()
if(res.code==200){

6
pages/projectEnd/safeSame/addIssue.vue
View File

@ -582,7 +582,7 @@
this.form.itemId = option.itemId
console.log(dateformat(new Date()), 777888)
if(option.engineeringId) this.engineeringId = option.engineeringId
if(option.type) this.type = option.type
if(option.type) this.type = Number(option.type)
},
@ -1322,7 +1322,7 @@
data.creatorId = this.userInfo.userId
data.dangerItemContent = this.issueName
if(this.engineeringId) data.engineeringId = this.engineeringId
if(this.type) data.type = '2'
if(this.type) data.type = this.type
let pointArr = []
for (let i = 0; i < this.pointList.length; i++) {
let obj =
@ -1388,7 +1388,7 @@
}
if(this.engineeringId) data2.engineeringId = this.engineeringId
if(this.type) data2.type = '2'
if(this.type) data2.type = this.type
console.log(data.taskId);
await this.sendRequest({
url: 'xmgl/xzSecurityQualityInspectionRecord/add',

0
pages/projectEnd/specialOperations/fireWork/addFireWorkPlan.vue → pages/projectEnd/specialOperations/fireWork/addPlan.vue
View File

0
pages/projectEnd/specialOperations/fireWork/addFireWorkSide.vue → pages/projectEnd/specialOperations/fireWork/addSide.vue
View File

0
pages/projectEnd/specialOperations/fireWork/addFireWorkFinally.vue → pages/projectEnd/specialOperations/fireWork/addWorkFinally.vue
View File

2
pages/projectEnd/specialOperations/fireWork/fireWorkCheck.vue → pages/projectEnd/specialOperations/fireWork/check.vue
View File

@ -84,7 +84,7 @@
<view class="text-tip">
提示：最终验收通过后，将闭合该动火作业计划，任何人不能再进行操作！
</view>
<view class="confirm-btn" @click="confirmClose">关闭危大工程</view>
<view class="confirm-btn" @click="confirmClose">关闭</view>
</view>
</view>
</view>

5
pages/projectEnd/specialOperations/fireWork/fireWorkCheckList.vue → pages/projectEnd/specialOperations/fireWork/checkList.vue
View File

@ -8,7 +8,8 @@
<view class="backlogList-admin" v-for="item in listData" :key="item.id" @click="jobTrial(item)">
<view class="backlogList backlogMargin">
<span>
危大工程名称：{{item.engineeringName}}
<!-- 危大工程名称：{{item.engineeringName}} -->
动火作业
</span>
<span class="backlogList-span" v-if="!item.acceptanceResult">待确认</span>
<span class="backlogList-span" v-if="item.acceptanceResult === 1">合格</span>
@ -79,7 +80,7 @@
}
checkRecord = item
uni.navigateTo({
url:'./fireWorkCheck?checkRecord='+encodeURIComponent(JSON.stringify(checkRecord))
url:'./check?checkRecord='+encodeURIComponent(JSON.stringify(checkRecord))
})
}
}

167
pages/projectEnd/specialOperations/fireWork/fireWorkDetail.vue → pages/projectEnd/specialOperations/fireWork/detail.vue
View File

@ -51,51 +51,37 @@
<view class="list-info">
风险辨识结果：<text class="detail-data">{{detailData.riskIdentificationResult}}</text>
</view>
<view class="safe-mesure">
<view class="safe-btn" @click="goSafeMesure">安全措施</view>
</view>
<view class="table-info" style="">
<uni-table emptyText="暂无更多数据" style="" class="uni-table-font">
<uni-td style="font-size: 20rpx;background-color: #eaeaea;" align="center">
<uni-tr style="">气体取样分析时间</uni-tr>
<uni-table emptyText="暂无更多数据" class="uni-table-font">
<uni-td class="uni-td-font" style="background-color: #eaeaea" align="center">
<uni-tr>气体取样分析时间</uni-tr>
<uni-tr>代表性气体</uni-tr>
<uni-tr>分析结果/%</uni-tr>
</uni-td>
<uni-td style="font-size: 20rpx;" align="center" v-for="item in detailData.xzGasAnalyzeList" :key="item.id">
<uni-tr style="">{{item.gasAnalyzeTime}}</uni-tr>
<uni-tr>{{item.representativeGas}}</uni-tr>
<uni-tr>{{item.analyzeResult}}</uni-tr>
<uni-td class="uni-td-font" align="center">
<uni-tr class="uni-tr-font">{{detailData.xzGasAnalyzeList[0]?detailData.xzGasAnalyzeList[0].gasAnalyzeTime:''}}</uni-tr>
<uni-tr>{{detailData.xzGasAnalyzeList[0]?detailData.xzGasAnalyzeList[0].representativeGas:''}}</uni-tr>
<uni-tr>{{detailData.xzGasAnalyzeList[0]?detailData.xzGasAnalyzeList[0].analyzeResult:''}}</uni-tr>
</uni-td>
<uni-td class="uni-td-font" align="center">
<uni-tr style="">{{detailData.xzGasAnalyzeList[1]?detailData.xzGasAnalyzeList[1].gasAnalyzeTime:''}}</uni-tr>
<uni-tr>{{detailData.xzGasAnalyzeList[1]?detailData.xzGasAnalyzeList[1].representativeGas:''}}</uni-tr>
<uni-tr>{{detailData.xzGasAnalyzeList[1]?detailData.xzGasAnalyzeList[1].analyzeResult:''}}</uni-tr>
</uni-td>
<uni-td class="uni-td-font" align="center">
<uni-tr style="">{{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].gasAnalyzeTime:''}}</uni-tr>
<uni-tr>{{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].representativeGas:''}}</uni-tr>
<uni-tr>{{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].analyzeResult:''}}</uni-tr>
</uni-td>
</uni-table>
</view>
</view>
<!-- <view class="list-info">
工程名称：<text class="detail-data">{{detailData.engineeringName}}</text>
</view>
<view class="list-info">
工程类别：<text class="detail-data">{{detailData.engineeringTypeName}}</text>
</view>
<view v-show="isShow">
<view class="list-info">
工程概况：<text class="detail-data">{{detailData.engineeringSurvey ? detailData.engineeringSurvey : "无"}}</text>
</view>
<view class="list-info">
类别描述：<text class="detail-data">{{detailData.describeName ? detailData.describeName : "无"}}</text>
</view>
<view class="list-info">
施工部位：<text class="detail-data">{{detailData.constructionLocation ? detailData.constructionLocation : "无"}}</text>
</view>
<view class="list-info">
计划时间：<text class="detail-data">{{detailData.planStartTime}}~{{detailData.planEndTime}}</text>
</view>
<view class="list-info">
负责人：<text class="detail-data">{{detailData.personLiable ? detailData.personLiable : "无"}}</text>
</view>
<view class="list-info">
责任分包：<text class="detail-data">{{detailData.responsibilityCompany ? detailData.responsibilityCompany : "无"}}</text>
</view>
</view> -->
<view v-if="COMPANY != 'longguang'" class="more-btn" @click="isShow=!isShow">
{{isShow ? "收起":"展开"}}
{{isShow ? "收起详情":"展开详情"}}
<uni-icons :type="isShow ? 'arrowup':'arrowdown'"></uni-icons>
</view>
</view>
@ -112,10 +98,10 @@
</view>
</scroll-view>
<view class="detail-wrap">
<fireWorkPlan ref="listBox" v-if="componentName == 'fireWorkPlan'" :detailId="detailId" :info="detailData"></fireWorkPlan>
<fireWorkSafe ref="list" v-if="componentName == 'fireWorkSafe'" :detailId="detailId" :info="detailData"></fireWorkSafe>
<fireWorkSide ref="list" v-if="componentName == 'fireWorkSide'" :detailId="detailId" :info="detailData"></fireWorkSide>
<fireWorkFinally ref="list" v-if="componentName =='fireWorkFinally'" :detailId="detailId" :info="detailData" ></fireWorkFinally>
<plan ref="list" v-if="componentName == 'plan'" :detailId="detailId" :info="detailData"></plan>
<safe ref="list" v-if="componentName == 'safe'" :detailId="detailId" :info="detailData"></safe>
<side ref="list" v-if="componentName == 'side'" :detailId="detailId" :info="detailData"></side>
<workFinally ref="list" v-if="componentName =='workFinally'" :detailId="detailId" :info="detailData" ></workFinally>
</view>
</view>
<!-- <view class="add-btn" v-if="activeIndex != 7 && activeIndex != 2 && !(activeIndex == 1 && detailData.engineeringState == 3) -->
@ -132,23 +118,23 @@
</template>
<script>
import fireWorkPlan from './fireWorkPlan.vue'
import fireWorkSafe from './fireWorkSafe.vue'
import fireWorkSide from './fireWorkSide.vue'
import fireWorkFinally from './fireWorkFinally.vue'
import plan from './plan.vue'
import safe from './safe.vue'
import side from './side.vue'
import workFinally from './workFinally.vue'
export default {
components:{
fireWorkPlan,
fireWorkSafe,
fireWorkSide,
fireWorkFinally,
plan,
safe,
side,
workFinally,
},
data(){
return{
statusBarHeight: 0,
isShow: true,
componentName: "fireWorkPlan",
isShow: false,
componentName: "plan",
navList:[{
id: 1,
name: "当前进度"
@ -177,7 +163,7 @@
onShow(){
this.statusBarHeight = uni.getStorageSync('systemInfo').statusBarHeight;
// this.initData()
this.getFireWork()
this.getWork()
let that = this;
setTimeout(function(){
console.log(that.$refs,777)
@ -190,13 +176,11 @@
},
onLoad(val){
this.detailId = val.id
// if(val.)
// this.initData()
},
mounted() {
},
methods:{
getFireWork(){
getWork(){
this.sendRequest({
url:'xmgl/xzSpecialOperationFireSafety/queryById',
method:'get',
@ -220,38 +204,13 @@
// console.log(str,123456789)
// this.detailData.describeName = str;
// }
console.log("fireWork=======================",this.detailData)
this.getApply()
}
})
},
initData(){
this.sendRequest({
url:'xmgl/dangerousEngineeringRecord/queryById',
method:'post',
data:{id:this.detailId,type:2},
success:res=>{
uni.hideLoading()
// if(res.code==200){
// this.listData = res.result.records
// }
this.detailData = res.result
let str = '';
if(res.result.chooseTypeDescribeList){
this.detailData.describeName
res.result.chooseTypeDescribeList.map((item,index) => {
if(index == res.result.chooseTypeDescribeList.length - 1){
str = str + item.describeName
} else {
str = str + item.describeName + ','
}
})
console.log(str,123456789)
this.detailData.describeName = str;
}
console.log(this.detailData)
this.getApply()
}
goSafeMesure(){
uni.navigateTo({
url: "./safeMesure"
})
},
getApply(){
@ -282,19 +241,19 @@
checkNav(val){
this.activeIndex = val.id
if(val.id == 1){
this.componentName = "fireWorkPlan"
this.componentName = "plan"
} else if(val.id == 2){
this.componentName = "fireWorkSafe"
this.componentName = "safe"
} else if(val.id == 3){
this.componentName = "fireWorkSide"
this.componentName = "side"
} else if(val.id == 4){
this.componentName = "fireWorkFinally"
this.componentName = "workFinally"
}
},
addForm(){
if(this.activeIndex == 1){
uni.navigateTo({
url:'./addFireWorkPlan?id='+this.detailId
url:'./addPlan?id='+this.detailId
})
} else if(this.activeIndex == 2){
if(uni.getStorageSync('dangerData')){
@ -305,16 +264,16 @@
}
uni.navigateTo({
// url:'../safeManage/addExamine?type=1&engineeringId='+this.detailId + '&moduleType=safeCheck'
url:'../../safeSame/addIssue?type=1&engineeringId='+this.detailId + '&moduleType=safeCheck&type=2'
url:'../../safeSame/addIssue?type=2&engineeringId='+this.detailId + '&moduleType=safeCheck'
})
} else if(this.activeIndex == 3){
uni.navigateTo({
url:'./addFireWorkSide?id='+this.detailId
url:'./addSide?id='+this.detailId
})
} else if(this.activeIndex == 4){
if(this.isShowBtn){
uni.navigateTo({
url:'./addFireWorkFinally?id='+this.detailId+'&name='+this.detailData.engineeringName
url:'./addWorkFinally?id='+this.detailId+'&name='+this.detailData.engineeringName
})
}else{
uni.showToast({
@ -330,18 +289,42 @@
</script>
<style lang="scss" scoped>
.safe-mesure{
width: 100%;
height: 100rpx;
display: flex;
justify-content: center;
align-items: center;
background-color: #fff;
.safe-btn{
text-align: center;
width: 80%;
line-height: 70rpx;
// background-color: darkred;
border: 4rpx solid #2b8df3;
color: #2b8df3;
border-radius: 20rpx;
font-weight: bold;
}
}
.table-info{
display: flex;
justify-content: center;
align-items: center;
background-color: #fff;
.uni-table-font{
margin: 0 10rpx;
margin: 0 5rpx;
// width: 95%;
box-shadow: 0rpx 0rpx 0rpx 2rpx darkgray;
uni-td{
.uni-td-font{
width: 25%;
font-size: 18rpx;
border: 1rpx solid lightgray;
.uni-tr-font{
border: 1rpx solid black;
}
}
}
}
.dangerbig-details{
@ -363,7 +346,7 @@
.list-info{
background: #fff;
border-bottom: 1px solid #F6F6F6;
font-size: 14px;
font-size: 26rpx;
padding: 20rpx;
}
.more-btn{

0
pages/projectEnd/specialOperations/fireWork/fireWorkPlan.vue → pages/projectEnd/specialOperations/fireWork/plan.vue
View File

2
pages/projectEnd/specialOperations/fireWork/fireWorkSafe.vue → pages/projectEnd/specialOperations/fireWork/safe.vue
View File

@ -31,7 +31,7 @@
if(val == 1){
uni.navigateTo({
// url:'../safeManage/dangerList?type=5&engineeringId='+this.detailId
url:"./fireWorkSafeList?type=1&engineeringId=" + this.detailId
url:"./safeList?type=2&engineeringId=" + this.detailId
})
}
}

5
pages/projectEnd/specialOperations/fireWork/fireWorkSafeList.vue → pages/projectEnd/specialOperations/fireWork/safeList.vue
View File

@ -367,6 +367,7 @@
chekItm8: '',
engineeringId: '',
workType: '',
}
},
onLoad(option) {
@ -375,7 +376,7 @@
this.engineeringId = option.engineeringId
// console.log(JSON.parse(uni.getStorageSync('userInfo')))
this.getCheckPointList();
this.workType = option.type
},
onShow() {
this.listData = [];
@ -950,7 +951,7 @@
console.log('查询列表条件数据', this.checkedTab)
let that = this;
// uni.showLoading({title: '加载中'})
that.condition.type = 2
that.condition.type = Number(that.workType)
this.sendRequest({
url: 'xmgl/xzSecurityQualityInspectionRecord/list',
method: 'post',

95
pages/projectEnd/specialOperations/fireWork/safeMesure.vue Normal file
View File

@ -0,0 +1,95 @@
<template>
<view class="safe-mesure">
<headers class="fixedheader" :themeType="true" :showBack="true">
<view class="headerName">
安全措施
</view>
</headers>
<view class="safe-mesure-container">
<view class="safe-mesure-header">
<view class="header-left">安全措施</view>
<view class="header-right">是否涉及</view>
</view>
<view class="safe-mesure-list">
<view class="safe-mesure-item">
<view class="item-left">
1.动火设备内部构件清洗干净,蒸汽吹扫或水洗、置换合格,达到动火条件
</view>
<view class="item-right" style="color: green;">是</view>
</view>
<view class="safe-mesure-item">
<view class="item-left">
2.与动火设备相连接的所有管线已断开,加盲板()块,未采取水封或仅关闭阀的方式代替盲板
</view>
<view class="item-right" style="color: red;">否</view>
</view>
</view>
</view>
</view>
</template>
<script>
export default {
data() {
return {
};
}
}
</script>
<style lang="scss">
.safe-mesure{
min-height: 100%;
background: #F6F6F6;
.fixedheader{
position: fixed;
top: 0;
left: 0;
width: 100%;
z-index: 2;
}
.safe-mesure-container{
margin-top: 88rpx;
padding: 0 20rpx;
// background-color: darkred;
.safe-mesure-header{
display: flex;
// justify-content: space-between;
margin-top: 10rpx;
line-height: 80rpx;
font-size: 32rpx;
font-weight: bold;
color: #81818c;
.header-left{
width: 65%;
display: flex;
justify-content: center;
}
.header-right{
width: 35%;
display: flex;
justify-content: center;
}
}
.safe-mesure-list{
.safe-mesure-item{
display: flex;
// justify-content: space-between;
margin-top: 15rpx;
// line-height: 40rpx;
.item-left{
width: 65%;
}
.item-right{
width: 35%;
display: flex;
justify-content: center;
align-items: center;
}
}
}
}
}
</style>

0
pages/projectEnd/specialOperations/fireWork/fireWorkSide.vue → pages/projectEnd/specialOperations/fireWork/side.vue
View File

84
pages/projectEnd/specialOperations/fireWork/fireWork.vue → pages/projectEnd/specialOperations/fireWork/work.vue
View File

@ -7,8 +7,8 @@
</headers>
<view :style="{ 'padding-top': statusBarHeight + 45 + 'px' }">
<view class="list" v-if="fireWorkList && fireWorkList.length>0">
<view class="list-item" v-for="(item,index) in fireWorkList" :key="index" @click="checkItem(item)">
<view class="list" v-if="workList && workList.length>0">
<view class="list-item" v-for="(item,index) in workList" :key="index" @click="checkItem(item)">
<view class="list-title">
<!-- 未销项 -->
<view>
@ -53,7 +53,7 @@
listData:[],
isLoadMore: false,
loadStatus: 'more',
fireWorkList: [],
workList: [],
}
},
onShow(){
@ -62,27 +62,27 @@
},
onLoad(){
this.projectSn = JSON.parse(uni.getStorageSync('userInfo')).sn
this.initData()
this.getFireWorkList()
// this.initData()
this.getWorkList()
},
onReachBottom() {
console.log(1)
if(!this.isLoadMore){ //此处判断，上锁，防止重复请求
this.isLoadMore=true
this.pageNo+=1
this.initData()
this.getFireWorkList()
// this.initData()
this.getWorkList()
}
},
onPullDownRefresh() {
console.log(2)
this.pageNo=1
this.listData=[]
this.initData()
this.getFireWorkList()
// this.initData()
this.getWorkList()
},
methods:{
getFireWorkList(){
getWorkList(){
let data = {
pageNo: this.pageNo,
pageSize: this.pageSize,
@ -95,10 +95,10 @@
success:res=>{
uni.hideLoading()
if(res.code==200){
console.log("fireWorkList======================",res)
console.log("workList======================",res)
// this.listData = res.result.records
// this.fireWorkList=this.fireWorkList.concat(res.result)
this.fireWorkList=this.fireWorkList.concat(res.result.records)
// this.workList=this.workList.concat(res.result)
this.workList=this.workList.concat(res.result.records)
if(res.result.records.length<this.pageSize){ //判断接口返回数据量小于请求数据量，则表示此为最后一页
this.isLoadMore=true
this.loadStatus='nomore'
@ -115,37 +115,37 @@
checkItem(val){
console.log(val)
uni.navigateTo({
url:'./fireWorkDetail?id='+val.id
})
},
initData(){
let data = {
pageNo: this.pageNo,
pageSize: this.pageSize,
projectSn: this.projectSn
}
this.sendRequest({
url:'xmgl/dangerousEngineeringRecord/list',
method:'post',
data:data,
success:res=>{
uni.hideLoading()
if(res.code==200){
// this.listData = res.result.records
this.listData=this.listData.concat(res.result.records)
if(res.result.records.length<this.pageSize){ //判断接口返回数据量小于请求数据量，则表示此为最后一页
this.isLoadMore=true
this.loadStatus='nomore'
}else{
this.isLoadMore=false
// that.loadStatus='more'
}
uni.stopPullDownRefresh()
}
console.log(res)
}
url:'./detail?id='+val.id
})
},
// initData(){
// let data = {
// pageNo: this.pageNo,
// pageSize: this.pageSize,
// projectSn: this.projectSn
// }
// this.sendRequest({
// url:'xmgl/dangerousEngineeringRecord/list',
// method:'post',
// data:data,
// success:res=>{
// uni.hideLoading()
// if(res.code==200){
// // this.listData = res.result.records
// this.listData=this.listData.concat(res.result.records)
// if(res.result.records.length<this.pageSize){ //判断接口返回数据量小于请求数据量，则表示此为最后一页
// this.isLoadMore=true
// this.loadStatus='nomore'
// }else{
// this.isLoadMore=false
// // that.loadStatus='more'
// }
// uni.stopPullDownRefresh()
// }
// console.log(res)
// }
// })
// },
}
}
</script>

0
pages/projectEnd/specialOperations/fireWork/fireWorkFinally.vue → pages/projectEnd/specialOperations/fireWork/workFinally.vue
View File

35
pages/projectEnd/specialOperations/specialCheck.vue
View File

@ -6,9 +6,13 @@
</view>
</headers>
<view class="sp-menu">
<view class="menu-item" style="margin-left: 60rpx;">
<image @click="handleNavigateTo(1)" src="@/static/file.png"></image>
<text>动火作业</text>
<view class="menu-item" style="margin-left: 60rpx;" @click="handleNavigateTo(1)">
<view class="item-icon">
<image src="@/static/specialOperations/fireWork.png" style="width: 50rpx;height: 70rpx;"></image>
</view>
<view class="item-text">
<text>动火作业</text>
</view>
</view>
<view class="menu-item" style="margin-right: 60rpx;"></view>
<view class="menu-item" style="margin-left: 60rpx;"></view>
@ -34,7 +38,7 @@
handleNavigateTo(val){
if(val === 1){
uni.navigateTo({
url: "./fireWork/fireWorkCheckList"
url: "./fireWork/checkList"
})
}
}
@ -67,14 +71,29 @@
width: 220rpx;
height: 274rpx;
// background-color: darkblue;
image{
.item-icon{
width: 220rpx;
height: 220rpx;
}
text{
text-align: center;
display: flex;
justify-content: center;
align-items: center;
image{
width: 220rpx;
height: 220rpx;
}
}
.item-text{
align-items: center;
width: 220rpx;
height: 54rpx;
display: flex;
justify-content: center;
align-items: center;
text{
text-align: center;
display: flex;
justify-content: center;
}
}
}
}

35
pages/projectEnd/specialOperations/specialOperations.vue
View File

@ -6,9 +6,13 @@
</view>
</headers>
<view class="sp-menu">
<view class="menu-item" style="margin-left: 60rpx;">
<image @click="handleNavigateTo(1)" src="@/static/specialOperations/fireWork.png" style="width: 50rpx;height: 70rpx;"></image>
<text>动火作业</text>
<view class="menu-item" style="margin-left: 60rpx;" @click="handleNavigateTo(1)">
<view class="item-icon">
<image src="@/static/specialOperations/fireWork.png" style="width: 50rpx;height: 70rpx;"></image>
</view>
<view class="item-text">
<text>动火作业</text>
</view>
</view>
<view class="menu-item" style="margin-right: 60rpx;"></view>
<view class="menu-item" style="margin-left: 60rpx;"></view>
@ -34,7 +38,7 @@
handleNavigateTo(val){
if(val === 1){
uni.navigateTo({
url: "./fireWork/fireWork"
url: "./fireWork/work"
})
}
}
@ -67,14 +71,29 @@
width: 220rpx;
height: 274rpx;
// background-color: darkblue;
image{
.item-icon{
width: 220rpx;
height: 220rpx;
}
text{
text-align: center;
display: flex;
justify-content: center;
align-items: center;
image{
width: 220rpx;
height: 220rpx;
}
}
.item-text{
align-items: center;
width: 220rpx;
height: 54rpx;
display: flex;
justify-content: center;
align-items: center;
text{
text-align: center;
display: flex;
justify-content: center;
}
}
}
}