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:
Vce 2024-05-16 21:23:45 +08:00
commit cad879bbf5
5 changed files with 55 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,7 +18,7 @@
动火方式：<text class="detail-data">{{detailData.hotMethod}}</text>
</view>
<view class="list-info">
动火实施时间：<text class="detail-data">{{detailData.hotWorkExecutionBeginTime+'-'+detailData.hotWorkExecutionEndTime}}</text>
动火实施时间：<text class="detail-data" v-if="detailData.hotWorkExecutionBeginTime && detailData.hotWorkExecutionEndTime">{{detailData.hotWorkExecutionBeginTime+'-'+detailData.hotWorkExecutionEndTime}}</text>
</view>
<view class="list-info">
动火地点和动火部位：<text class="detail-data">{{detailData.fireLocationAndFirePart}}</text>
@ -435,6 +435,9 @@
}
}
}
.u-td{
height: auto;
}
}
.dangerbig-details{
min-height: 100%;

10
pages/projectEnd/specialOperations/fireWork/safeMesure.vue
View File

@ -11,9 +11,9 @@
<view class="header-right">是否涉及</view>
</view>
<view class="safe-mesure-list">
<view class="safe-mesure-item" v-for="(item,i) in JSON.parse(detailData.safeMeasure)" :key="i">
<view class="safe-mesure-item" v-for="(item,i) in detailData.safeMeasure" :key="i">
<view class="item-left">
{{item.name}}
{{i + 1}}.{{item.name}}
</view>
<view class="item-right" style="color: red;">
@ -80,15 +80,17 @@
},
methods:{
getWork(){
let that = this;
this.sendRequest({
url:'xmgl/xzSpecialOperationFireSafety/queryById',
method:'get',
data:{id:this.detailId},
success:res=>{
uni.hideLoading()
this.detailData = res.result
that.detailData = res.result
that.detailData.safeMeasure = JSON.parse(that.detailData.safeMeasure)
//otherSafeMeasure
console.log("=====================",this.detailData)
console.log("=====================",that.detailData)
}
})
},

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

@ -216,7 +216,7 @@
margin-bottom: 60rpx;
}
.txt{
color: #2E8B57;
color: #CFC8CC;
}
}
}

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

@ -6,29 +6,29 @@
</view>
</headers>
<view class="sp-menu">
<view class="menu-item" style="margin-left: 60rpx;" @click="handleNavigateTo(1)">
<view class="menu-item" @click="handleNavigateTo(1)">
<view class="item-icon">
<image src="@/static/specialOperations/fireWork.png" style="width: 50rpx;height: 70rpx;"></image>
<image src="@/static/specialOperations/fireWork.png"></image>
</view>
<view class="item-text">
<text>动火作业</text>
</view>
</view>
<!-- <view class="menu-item" style="margin-right: 60rpx;" @click="handleNavigateTo(2)">
<!-- <view class="menu-item" @click="handleNavigateTo(2)">
<view class="item-icon">
<image src="@/static/specialOperations/limitSpaceWork.png" style="width: 50rpx;height: 50rpx;"></image>
<image src="@/static/specialOperations/limitSpaceWork.png"></image>
</view>
<view class="item-text">
<text>受限空间作业</text>
</view>
</view> -->
<view class="menu-item" style="margin-left: 60rpx;"></view>
<!-- <view class="menu-item" style="margin-left: 60rpx;"></view>
<view class="menu-item" style="margin-left: 60rpx;"></view>
<view class="menu-item" style="margin-right: 60rpx;"></view>
<view class="menu-item" style="margin-left: 60rpx;"></view>
<view class="menu-item" style="margin-right: 60rpx;"></view>
<view class="menu-item" style="margin-left: 60rpx;"></view>
<view class="menu-item" style="margin-right: 60rpx;"></view>
<view class="menu-item" style="margin-right: 60rpx;"></view> -->
</view>
</view>
</template>
@ -61,30 +61,37 @@
z-index: 2;
}
.sp-menu{
margin: 0 38rpx;
margin-top: 138rpx;
width: 100%;
// height: 1200rpx;
// height: 1000rpx;
// background-color: darkred;
display: grid;
grid-gap: 10rpx;
grid-gap: 24rpx;
grid-template-columns: repeat(2, 1fr);
// grid-template-columns: repeat(auto-fill, 220rpx);
place-items: center;
justify-content: center;
// place-items: center;
// justify-content: center;
.menu-item{
width: 220rpx;
// width: 220rpx;
height: 274rpx;
// background-color: darkblue;
box-shadow: 0px 8rpx 15rpx 0px rgba(219,229,255,0.6);
border-radius: 10rpx;
display: flex;
align-items: center;
justify-content: center;
flex-direction: column;
.item-icon{
width: 220rpx;
height: 220rpx;
// width: 220rpx;
// height: 220rpx;
display: flex;
justify-content: center;
align-items: center;
margin-bottom: 14rpx;
image{
width: 220rpx;
height: 220rpx;
width: 66rpx;
height: 86rpx;
}
}
.item-text{

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

@ -6,29 +6,29 @@
</view>
</headers>
<view class="sp-menu">
<view class="menu-item" style="margin-left: 60rpx;" @click="handleNavigateTo(1)">
<view class="menu-item" @click="handleNavigateTo(1)">
<view class="item-icon">
<image src="@/static/specialOperations/fireWork.png" style="width: 50rpx;height: 70rpx;"></image>
<image src="@/static/specialOperations/fireWork.png"></image>
</view>
<view class="item-text">
<text>动火作业</text>
</view>
</view>
<!-- <view class="menu-item" style="margin-right: 60rpx;" @click="handleNavigateTo(2)">
<!-- <view class="menu-item" @click="handleNavigateTo(2)">
<view class="item-icon">
<image src="@/static/specialOperations/limitSpaceWork.png" style="width: 50rpx;height: 50rpx;"></image>
<image src="@/static/specialOperations/limitSpaceWork.png"></image>
</view>
<view class="item-text">
<text>受限空间作业</text>
</view>
</view> -->
<view class="menu-item" style="margin-left: 60rpx;"></view>
<!-- <view class="menu-item" style="margin-left: 60rpx;"></view>
<view class="menu-item" style="margin-left: 60rpx;"></view>
<view class="menu-item" style="margin-right: 60rpx;"></view>
<view class="menu-item" style="margin-left: 60rpx;"></view>
<view class="menu-item" style="margin-right: 60rpx;"></view>
<view class="menu-item" style="margin-left: 60rpx;"></view>
<view class="menu-item" style="margin-right: 60rpx;"></view>
<view class="menu-item" style="margin-right: 60rpx;"></view> -->
</view>
</view>
</template>
@ -61,30 +61,37 @@
z-index: 2;
}
.sp-menu{
margin: 0 38rpx;
margin-top: 138rpx;
width: 100%;
// height: 1200rpx;
// height: 1000rpx;
// background-color: darkred;
display: grid;
grid-gap: 10rpx;
grid-gap: 24rpx;
grid-template-columns: repeat(2, 1fr);
// grid-template-columns: repeat(auto-fill, 220rpx);
place-items: center;
justify-content: center;
// place-items: center;
// justify-content: center;
.menu-item{
width: 220rpx;
// width: 220rpx;
height: 274rpx;
// background-color: darkblue;
box-shadow: 0px 8rpx 15rpx 0px rgba(219,229,255,0.6);
border-radius: 10rpx;
display: flex;
align-items: center;
justify-content: center;
flex-direction: column;
.item-icon{
width: 220rpx;
height: 220rpx;
// width: 220rpx;
// height: 220rpx;
display: flex;
justify-content: center;
align-items: center;
margin-bottom: 14rpx;
image{
width: 220rpx;
height: 220rpx;
width: 66rpx;
height: 86rpx;
}
}
.item-text{