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

动火作业初版

Browse Source
This commit is contained in:
Vce 2024-05-15 18:15:05 +08:00
parent 903ac9abbf
commit 33d62c9703
15 changed files with 192 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -562,6 +562,7 @@
reviewList: [],
areaData: {},
engineeringId: '',
type: '',
}
},
onLoad(option) {
@ -580,9 +581,8 @@
this.form.taskId = option.taskId
this.form.itemId = option.itemId
console.log(dateformat(new Date()), 777888)
if(option.engineeringId){
this.engineeringId = option.engineeringId
}
if(option.engineeringId) this.engineeringId = option.engineeringId
if(option.type) this.type = option.type
},
@ -1322,6 +1322,7 @@
data.creatorId = this.userInfo.userId
data.dangerItemContent = this.issueName
if(this.engineeringId) data.engineeringId = this.engineeringId
if(this.type) data.type = '2'
let pointArr = []
for (let i = 0; i < this.pointList.length; i++) {
let obj =
@ -1385,7 +1386,9 @@
taskId: this.taskId || null, // 任务ID
itemId: this.itemId || null, // 任务子ID
}
if(this.engineeringId) data2.engineeringId = this.engineeringId
if(this.type) data2.type = '2'
console.log(data.taskId);
await this.sendRequest({
url: 'xmgl/xzSecurityQualityInspectionRecord/add',

5
pages/projectEnd/specialOperations/fireWork/addFireWorkFinally.vue
View File

@ -8,8 +8,8 @@
<view :style="{ 'padding-top': statusBarHeight + 45 + 'px' }">
<view class="plan-form">
<view class="form-item b-bottom">
<view class="form-lable">危大工程</view>
<view class="">{{engineeringName}}</view>
<view class="form-lable">动火作业</view>
<!-- <view class="">{{engineeringName}}</view> -->
</view>
<view class="form-item b-bottom">
<view class="form-lable"><text class="tag">*</text>验收单位</view>
@ -144,6 +144,7 @@
acceptanceUnitId: this.enterpriseId,
acceptanceUserId: this.acceptancePerson.userId,
planTime: this.planTime,
type:2
}
console.log(data);
if(!data.acceptanceUnitId){

1
pages/projectEnd/specialOperations/fireWork/addFireWorkPlan.vue
View File

@ -139,6 +139,7 @@
},
saveForm(){
let data = {
type: 2,
dutyRegion: this.formData.dutyRegion,
progressDescribe: this.formData.progressDescribe,
engineeringId: this.formData.engineeringId,

1
pages/projectEnd/specialOperations/fireWork/addFireWorkSide.vue
View File

@ -164,6 +164,7 @@
buildSituation: this.formData.buildSituation,
dangerousEngineeringId: this.formData.dangerousEngineeringId,
createUser: JSON.parse(uni.getStorageSync('userInfo')).userId,
type:2
}
let arr = []
this.formData.imgFileList.forEach(item=>{

53
pages/projectEnd/specialOperations/fireWork/fireWork.vue
View File

@ -7,24 +7,26 @@
</headers>
<view :style="{ 'padding-top': statusBarHeight + 45 + 'px' }">
<view class="list" v-if="listData && listData.length>0">
<view class="list-item" v-for="(item,index) in listData" :key="index" @click="checkItem(item)">
<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-title">
<!-- 未销项 -->
<view>
<text class="tag" v-if="item.hiddenDangerNum > 0">未销项{{item.hiddenDangerNum}}</text>
{{item.engineeringName}}
<!-- <text class="tag" v-if="item.hiddenDangerNum > 0">未销项{{item.hiddenDangerNum}}</text> -->
动火地点和动火部位：{{item.fireLocationAndFirePart}}
</view>
<!-- <view :class="{'status1': item.engineeringState == 2,'status2': item.engineeringState == 3}">
{{item.engineeringState == 2 ? "在施" : item.engineeringState == 3 ? "已完工" : ""}}
</view> -->
<view :class="{'status1': item.finalAcceptanceStatus == 1,'status2': item.finalAcceptanceStatus == 2}">
<!-- <view :class="{'status1': item.finalAcceptanceStatus == 1,'status2': item.finalAcceptanceStatus == 2}">
{{item.finalAcceptanceStatus == 1 ? "在施" : item.finalAcceptanceStatus == 2 ? "已完工" : ""}}
</view>
</view> -->
</view>
<view class="list-content">
<view class="list-info">
类别：{{item.engineeringTypeName}}
<view class="info-status" v-if="item.issuperdanger">超危</view>
<!-- 类别：{{item.engineeringTypeName}} -->
动火人：{{item.firemanName}}
<!-- <view class="info-status" v-if="item.issuperdanger">超危</view> -->
</view>
</view>
</view>
@ -50,7 +52,8 @@
projectSn: "",
listData:[],
isLoadMore: false,
loadStatus: 'more'
loadStatus: 'more',
fireWorkList: [],
}
},
onShow(){
@ -60,6 +63,7 @@
onLoad(){
this.projectSn = JSON.parse(uni.getStorageSync('userInfo')).sn
this.initData()
this.getFireWorkList()
},
onReachBottom() {
console.log(1)
@ -67,6 +71,7 @@
this.isLoadMore=true
this.pageNo+=1
this.initData()
this.getFireWorkList()
}
},
onPullDownRefresh() {
@ -74,8 +79,38 @@
this.pageNo=1
this.listData=[]
this.initData()
this.getFireWorkList()
},
methods:{
getFireWorkList(){
let data = {
pageNo: this.pageNo,
pageSize: this.pageSize,
projectSn: this.projectSn
}
this.sendRequest({
url:'xmgl/xzSpecialOperationFireSafety/page',
method:'get',
data:data,
success:res=>{
uni.hideLoading()
if(res.code==200){
console.log("fireWorkList======================",res)
// this.listData = res.result.records
// this.fireWorkList=this.fireWorkList.concat(res.result)
this.fireWorkList=this.fireWorkList.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()
}
}
})
},
checkItem(val){
console.log(val)

8
pages/projectEnd/specialOperations/fireWork/fireWorkCheck.vue
View File

@ -8,7 +8,8 @@
<view :style="{ 'padding-top': statusBarHeight + 45 + 'px' }">
<view class="plan-form">
<view style="background-color: #fff;border-bottom: 10px solid #068de8;padding:10px 10px 15px 10px">
<view class="backlogMargin">危大工程名称：{{checkRecord.engineeringName}}</view>
<!-- <view class="backlogMargin">危大工程名称：{{checkRecord.engineeringName}}</view> -->
<view class="backlogMargin">动火作业</view>
<view class="backlogMargin">计划执行时间：{{checkRecord.planTime}}</view>
<view class="backlogMargin">申请验收单位：{{checkRecord.applyAcceptanceUnitName}}</view>
<view class="backlogMargin">申请验收人：{{checkRecord.applyAcceptanceUserName}}</view>
@ -81,7 +82,7 @@
<!-- <view class="dialog-container" v-if="unitDialog"> -->
<view class="dialog-content">
<view class="text-tip">
提示：最终验收通过后，将闭合整个危大任务计划，任何人不能再进行操作！
提示：最终验收通过后，将闭合该动火作业计划，任何人不能再进行操作！
</view>
<view class="confirm-btn" @click="confirmClose">关闭危大工程</view>
</view>
@ -244,7 +245,8 @@
id: this.checkRecord.id,
acceptanceResult: this.formData.acceptanceResult, //验收结果
acceptanceDesc: this.formData.acceptanceDescribe, //验收描述
photo: this.formData.imgFileList[0].url
photo: this.formData.imgFileList[0].url,
type:2
}
// data.createUser = JSON.parse(uni.getStorageSync('userInfo')).userId;
// let arr = []

3
pages/projectEnd/specialOperations/fireWork/fireWorkCheckList.vue
View File

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

156
pages/projectEnd/specialOperations/fireWork/fireWorkDetail.vue
View File

@ -9,6 +9,66 @@
<view class="detail-content">
<view class="list">
<view class="list-info">
动火人：<text class="detail-data">{{detailData.firemanName}}</text>
</view>
<view class="list-info">
动火方式：<text class="detail-data">{{detailData.hotMethod}}</text>
</view>
<view class="list-info">
动火实施时间：<text class="detail-data">{{detailData.hotWorkExecutionBeginTime+'-'+detailData.hotWorkExecutionEndTime}}</text>
</view>
<view class="list-info">
动火地点和动火部位：<text class="detail-data">{{detailData.fireLocationAndFirePart}}</text>
</view>
<view class="" v-if="isShow">
<view class="list-info">
作业内容：<text class="detail-data">{{detailData.jobContent}}</text>
</view>
<view class="list-info">
作业单位：<text class="detail-data">{{detailData.operatingUnitName}}</text>
</view>
<view class="list-info">
动火作业级别：<text class="detail-data">{{detailData.hotWorkLevel}}</text>
</view>
<view class="list-info">
作业负责人：<text class="detail-data">{{detailData.assignmentPersonInChargeName}}</text>
</view>
<view class="list-info">
作业申请单位：<text class="detail-data">{{detailData.jobApplicationUnitName}}</text>
</view>
<view class="list-info">
作业申请时间：<text class="detail-data">{{detailData.jobApplicationTime}}</text>
</view>
<view class="list-info">
关联的其他特殊作业：<text class="detail-data">{{detailData.otherRelatedSpecialTask}}</text>
</view>
<view class="list-info">
证书编号：<text class="detail-data">{{detailData.certificateNo}}</text>
</view>
<view class="list-info">
安全作业票编号：<text class="detail-data">{{detailData.safetyWorkTicketCode}}</text>
</view>
<view class="list-info">
风险辨识结果：<text class="detail-data">{{detailData.riskIdentificationResult}}</text>
</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-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>
</uni-table>
</view>
</view>
<!-- <view class="list-info">
工程名称：<text class="detail-data">{{detailData.engineeringName}}</text>
</view>
<view class="list-info">
@ -27,16 +87,13 @@
<view class="list-info">
计划时间：<text class="detail-data">{{detailData.planStartTime}}~{{detailData.planEndTime}}</text>
</view>
<!-- <view class="list-info">
施工时间：<text class="detail-data">{{detailData.buildStartTime}}~{{detailData.buildEndTime}}</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> -->
<view v-if="COMPANY != 'longguang'" class="more-btn" @click="isShow=!isShow">
{{isShow ? "收起":"展开"}}
<uni-icons :type="isShow ? 'arrowup':'arrowdown'"></uni-icons>
@ -55,19 +112,10 @@
</view>
</scroll-view>
<view class="detail-wrap">
<fireWorkPlan ref="list" v-if="componentName == 'fireWorkPlan'" :detailId="detailId" :info="detailData"></fireWorkPlan>
<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>
<!-- <component ref="list" :is="componentName" :id="detailId" :info="detailData"></component> -->
<!-- <safeList ref="list" v-if="componentName == 'safeList'" :detailId="detailId" :info="detailData">123123</safeList>
<control ref="list" v-if="componentName == 'control'" :detailId="detailId" :info="detailData"></control>
<planList ref="list" v-if="componentName == 'planList'" :detailId="detailId" :info="detailData"></planList>
<constructionStation ref="list" v-if="componentName == 'constructionStation'" :detailId="detailId" :info="detailData"></constructionStation>
<ordinaryAcceptance ref="list" v-if="componentName == 'ordinaryAcceptance'" :detailId="detailId" :info="detailData"></ordinaryAcceptance>
<engineeringData ref="list" v-if="componentName == 'engineeringData'" :detailId="detailId" :info="detailData"></engineeringData>
<verifyTableList ref="list" v-if="componentName == 'verifyTableList'" :detailId="detailId" :info="detailData"></verifyTableList>
<finally-acceptance ref="list" v-if="componentName =='finallyAcceptance'" :detailId="detailId" :info="detailData" ></finally-acceptance> -->
</view>
</view>
<!-- <view class="add-btn" v-if="activeIndex != 7 && activeIndex != 2 && !(activeIndex == 1 && detailData.engineeringState == 3) -->
@ -88,28 +136,13 @@
import fireWorkSafe from './fireWorkSafe.vue'
import fireWorkSide from './fireWorkSide.vue'
import fireWorkFinally from './fireWorkFinally.vue'
// import safeList from './safeList.vue'
// import control from './control.vue'
// import planList from './planList.vue'
// import constructionStation from './constructionStation.vue'
// import ordinaryAcceptance from './ordinaryAcceptance.vue'
// import engineeringData from './engineeringData.vue'
// import verifyTableList from './verifyTableList.vue'
// import finallyAcceptance from './finallyAcceptance.vue'
export default {
components:{
fireWorkPlan,
fireWorkSafe,
fireWorkSide,
fireWorkFinally,
// safeList,
// control,
// planList,
// constructionStation,
// ordinaryAcceptance,
// engineeringData,
// verifyTableList,
// finallyAcceptance
},
data(){
return{
@ -143,10 +176,17 @@
},
onShow(){
this.statusBarHeight = uni.getStorageSync('systemInfo').statusBarHeight;
this.initData()
if(this.$refs['list'] && this.$refs['list'].initData){
this.$refs['list'].initData()
}
// this.initData()
this.getFireWork()
let that = this;
setTimeout(function(){
console.log(that.$refs,777)
console.log(that.$refs.listBox,777)
if(that.$refs['list'] && that.$refs['list'].initData){
console.log(777888)
that.$refs['list'].initData()
}
},200)
},
onLoad(val){
this.detailId = val.id
@ -156,11 +196,40 @@
mounted() {
},
methods:{
getFireWork(){
this.sendRequest({
url:'xmgl/xzSpecialOperationFireSafety/queryById',
method:'get',
data:{id:this.detailId},
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("fireWork=======================",this.detailData)
this.getApply()
}
})
},
initData(){
this.sendRequest({
url:'xmgl/dangerousEngineeringRecord/queryById',
method:'post',
data:{id:this.detailId},
data:{id:this.detailId,type:2},
success:res=>{
uni.hideLoading()
// if(res.code==200){
@ -194,6 +263,7 @@
data:{
engineeringId: this.detailData.id,
projectSn: JSON.parse(uni.getStorageSync('projectDetail')).projectSn,
type:2
},
success:res=>{
uni.hideLoading()
@ -235,7 +305,7 @@
}
uni.navigateTo({
// url:'../safeManage/addExamine?type=1&engineeringId='+this.detailId + '&moduleType=safeCheck'
url:'../../safeSame/addIssue?type=1&engineeringId='+this.detailId + '&moduleType=safeCheck'
url:'../../safeSame/addIssue?type=1&engineeringId='+this.detailId + '&moduleType=safeCheck&type=2'
})
} else if(this.activeIndex == 3){
uni.navigateTo({
@ -260,6 +330,20 @@
</script>
<style lang="scss" scoped>
.table-info{
display: flex;
justify-content: center;
align-items: center;
background-color: #fff;
.uni-table-font{
margin: 0 10rpx;
// width: 95%;
box-shadow: 0rpx 0rpx 0rpx 2rpx darkgray;
uni-td{
border: 1rpx solid lightgray;
}
}
}
.dangerbig-details{
min-height: 100%;
background: #F6F6F6;

4
pages/projectEnd/specialOperations/fireWork/fireWorkFinally.vue
View File

@ -3,7 +3,8 @@
<view class="" v-if="finallyCheckList.length > 0">
<view class="finally" v-for="item in finallyCheckList" :key="item.id">
<view style="padding:10px;">
<text style="font-weight: bold;">危大工程名称：</text>{{item.engineeringName}}
<text style="font-weight: bold;">动火作业</text>
<!-- {{item.engineeringName}} -->
</view>
<view style="padding:10px;">
<text style="font-weight: bold;">验收时间：</text>{{item.planTime}}
@ -50,6 +51,7 @@
data:{
engineeringId: this.detailId,
projectSn: JSON.parse(uni.getStorageSync('projectDetail')).projectSn,
type:2
},
success:res=>{
uni.hideLoading()

6
pages/projectEnd/specialOperations/fireWork/fireWorkPlan.vue
View File

@ -39,8 +39,8 @@
listData:[]
}
},
created(){
this.initData()
created() {
this.initData()
},
methods:{
previewImage(url) {
@ -52,7 +52,7 @@
this.sendRequest({
url:'xmgl/dangerousEngineeringProgressRecord/list',
method:'post',
data: {engineeringId: this.detailId},
data: {engineeringId: this.detailId,type: 2},
success:res=>{
uni.hideLoading()
if(res.code==200){

1
pages/projectEnd/specialOperations/fireWork/fireWorkSafe.vue
View File

@ -42,6 +42,7 @@
<style lang="scss" scoped>
.safe-list{
padding-top: 20rpx;
height: 500rpx;
.list-detail{
background: #fff;
padding: 0 40rpx;

1
pages/projectEnd/specialOperations/fireWork/fireWorkSafeList.vue
View File

@ -950,6 +950,7 @@
console.log('查询列表条件数据', this.checkedTab)
let that = this;
// uni.showLoading({title: '加载中'})
that.condition.type = 2
this.sendRequest({
url: 'xmgl/xzSecurityQualityInspectionRecord/list',
method: 'post',

2
pages/projectEnd/specialOperations/fireWork/fireWorkSide.vue
View File

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

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

@ -7,7 +7,7 @@
</headers>
<view class="sp-menu">
<view class="menu-item" style="margin-left: 60rpx;">
<image @click="handleNavigateTo(1)" src="@/static/file.png"></image>
<image @click="handleNavigateTo(1)" src="@/static/specialOperations/fireWork.png" style="width: 50rpx;height: 70rpx;"></image>
<text>动火作业</text>
</view>
<view class="menu-item" style="margin-right: 60rpx;"></view>

BIN
static/specialOperations/fireWork.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB