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-16 17:42:27 +08:00
commit bfdcdc53ff
8 changed files with 31 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main.js
View File

@ -38,9 +38,9 @@ if (process.env.NODE_ENV === 'development') {
// 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: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' // 工作流线上地址

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

@ -35,7 +35,7 @@
export default { export default {
data() { data() {
return { return {
title: "查看待办", title: "危大验收",
listData: [], listData: [],
projectSn: '', projectSn: '',
userInfo: {}, userInfo: {},

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

@ -8,8 +8,8 @@
<view :style="{ 'padding-top': statusBarHeight + 45 + 'px' }"> <view :style="{ 'padding-top': statusBarHeight + 45 + 'px' }">
<view class="plan-form"> <view class="plan-form">
<view class="form-item b-bottom"> <view class="form-item b-bottom">
<view class="form-lable">动火作业</view> <!-- <view class="form-lable">动火作业</view> -->
<!-- <view class="">{{engineeringName}}</view> --> <view class="">作业票编号：{{workTicketCode}}</view>
</view> </view>
<view class="form-item b-bottom"> <view class="form-item b-bottom">
<view class="form-lable"><text class="tag">*</text>验收单位</view> <view class="form-lable"><text class="tag">*</text>验收单位</view>
@ -92,7 +92,7 @@
this.projectSn = JSON.parse(uni.getStorageSync('projectDetail')).projectSn this.projectSn = JSON.parse(uni.getStorageSync('projectDetail')).projectSn
this.userInfo = JSON.parse(uni.getStorageSync('userInfo')) this.userInfo = JSON.parse(uni.getStorageSync('userInfo'))
this.engineeringId = val.id this.engineeringId = val.id
this.engineeringName = val.name this.workTicketCode = val.workTicketCode
this.getEnterpriseInfoList() this.getEnterpriseInfoList()
}, },
watch:{ watch:{

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

@ -9,7 +9,7 @@
<view class="plan-form"> <view class="plan-form">
<view style="background-color: #fff;border-bottom: 10px solid #068de8;padding:10px 10px 15px 10px"> <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">动火作业票编号：{{checkRecord.workTicketCode}}</view> <view class="backlogMargin">作业票编号：{{checkRecord.workTicketCode}}</view>
<view class="backlogMargin">计划执行时间：{{checkRecord.planTime}}</view> <view class="backlogMargin">计划执行时间：{{checkRecord.planTime}}</view>
<view class="backlogMargin">申请验收单位：{{checkRecord.applyAcceptanceUnitName}}</view> <view class="backlogMargin">申请验收单位：{{checkRecord.applyAcceptanceUnitName}}</view>
<view class="backlogMargin">申请验收人：{{checkRecord.applyAcceptanceUserName}}</view> <view class="backlogMargin">申请验收人：{{checkRecord.applyAcceptanceUserName}}</view>

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

@ -9,7 +9,8 @@
<view class="backlogList backlogMargin"> <view class="backlogList backlogMargin">
<span> <span>
<!-- 危大工程名称：{{item.engineeringName}} --> <!-- 危大工程名称：{{item.engineeringName}} -->
动火作业票编号：{{item.workTicketCode}} 作业票编号：{{item.engineeringName}}
<!-- 动火作业 -->
</span> </span>
<span class="backlogList-span" v-if="!item.acceptanceResult">待确认</span> <span class="backlogList-span" v-if="!item.acceptanceResult">待确认</span>
<span class="backlogList-span" v-if="item.acceptanceResult === 1">合格</span> <span class="backlogList-span" v-if="item.acceptanceResult === 1">合格</span>
@ -36,7 +37,7 @@
export default { export default {
data() { data() {
return { return {
title: "查看待办", title: "动火验收",
listData: [], listData: [],
projectSn: '', projectSn: '',
userInfo: {}, userInfo: {},
@ -96,7 +97,8 @@
.backlogList-admin { .backlogList-admin {
margin: 10px; margin: 10px;
background-color: #fff; background-color: #fff;
height: 160px; // height: 160px;
height: auto;
padding: 15px; padding: 15px;
.backlogList { .backlogList {

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

@ -8,6 +8,9 @@
<view :style="{ 'padding-top': statusBarHeight + 45 + 'px' }"> <view :style="{ 'padding-top': statusBarHeight + 45 + 'px' }">
<view class="detail-content"> <view class="detail-content">
<view class="list"> <view class="list">
<view class="list-info">
作业票编号：<text class="detail-data">{{detailData.workTicketCode}}</text>
</view>
<view class="list-info"> <view class="list-info">
动火人：<text class="detail-data">{{detailData.firemanName}}</text> 动火人：<text class="detail-data">{{detailData.firemanName}}</text>
</view> </view>
@ -39,9 +42,9 @@
<view class="list-info"> <view class="list-info">
作业申请时间：<text class="detail-data">{{detailData.jobApplicationTime}}</text> 作业申请时间：<text class="detail-data">{{detailData.jobApplicationTime}}</text>
</view> </view>
<view class="list-info"> <!-- <view class="list-info">
关联的其他特殊作业：<text class="detail-data">{{detailData.otherRelatedSpecialTask}}</text> 关联的其他特殊作业：<text class="detail-data">{{detailData.otherRelatedSpecialTask}}</text>
</view> </view> -->
<view class="list-info"> <view class="list-info">
证书编号：<text class="detail-data">{{detailData.certificateNo}}</text> 证书编号：<text class="detail-data">{{detailData.certificateNo}}</text>
</view> </view>
@ -75,6 +78,9 @@
</uni-td> </uni-td>
</uni-table> </uni-table>
</view> </view>
<view class="safe-mesure">
<view class="safe-btn" @click="goSafeMesure">查看安全措施</view>
</view>
<view class="other-safe"> <view class="other-safe">
<view class="other-head"> <view class="other-head">
<view class="other-icon"></view> <view class="other-icon"></view>
@ -91,9 +97,6 @@
<view class="content-2">{{detailData.guardianName}}</view> <view class="content-2">{{detailData.guardianName}}</view>
</view> </view>
</view> </view>
<view class="safe-mesure">
<view class="safe-btn" @click="goSafeMesure">查看安全措施</view>
</view>
</view> </view>
<view v-if="COMPANY != 'longguang'" class="more-btn" @click="isShow=!isShow"> <view v-if="COMPANY != 'longguang'" class="more-btn" @click="isShow=!isShow">
@ -289,7 +292,7 @@
} else if(this.activeIndex == 4){ } else if(this.activeIndex == 4){
if(this.isShowBtn){ if(this.isShowBtn){
uni.navigateTo({ uni.navigateTo({
url:'./addWorkFinally?id='+this.detailId+'&name='+this.detailData.engineeringName url:'./addWorkFinally?id='+this.detailId+'&workTicketCode='+this.detailData.workTicketCode
}) })
}else{ }else{
uni.showToast({ uni.showToast({
@ -308,7 +311,8 @@
.other-safe{ .other-safe{
background-color: #fff; background-color: #fff;
// margin-top: 50rpx; // margin-top: 50rpx;
padding: 0 15rpx; padding: 15rpx 15rpx;
line-height: 40rpx;
.other-head{ .other-head{
display: flex; display: flex;
.other-icon{ .other-icon{
@ -322,6 +326,7 @@
} }
} }
.other-content{ .other-content{
font-size: 22rpx;
width: auto; width: auto;
height: 50rpx; height: 50rpx;
// background-color: darkred; // background-color: darkred;
@ -330,17 +335,17 @@
margin-top: 15rpx; margin-top: 15rpx;
display: flex; display: flex;
.content-1{ .content-1{
width: 25%; width: 22%;
} }
.content-2{ .content-2{
width: 18%; width: 24%;
} }
.content-3{ .content-3{
width: 26%; width: 23%;
margin-left: 10%; // margin-left: 10%;
} }
.content-4{ .content-4{
width: 22%; width: 26%;
} }
} }

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

@ -13,7 +13,7 @@
<!-- 未销项 --> <!-- 未销项 -->
<view> <view>
<text class="tag" v-if="item.hiddenDangerNum > 0">未销项{{item.hiddenDangerNum}}</text> <text class="tag" v-if="item.hiddenDangerNum > 0">未销项{{item.hiddenDangerNum}}</text>
动火作业票编号：{{item.workTicketCode}} 作业票编号：{{item.workTicketCode}}
</view> </view>
<view :class="{'status1': item.engineeringState == 1,'status2': item.engineeringState == 2,'status3': item.engineeringState == 3,'status4': item.engineeringState == 4}"> <view :class="{'status1': item.engineeringState == 1,'status2': item.engineeringState == 2,'status3': item.engineeringState == 3,'status4': item.engineeringState == 4}">
{{item.engineeringState == 1 ? "未开始" : item.engineeringState == 2 ? "在施" : item.engineeringState == 3 ? "超期" : item.engineeringState == 4 ? "已完工" : ""}} {{item.engineeringState == 1 ? "未开始" : item.engineeringState == 2 ? "在施" : item.engineeringState == 3 ? "超期" : item.engineeringState == 4 ? "已完工" : ""}}

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

@ -3,7 +3,7 @@
<view class="" v-if="finallyCheckList.length > 0"> <view class="" v-if="finallyCheckList.length > 0">
<view class="finally" v-for="item in finallyCheckList" :key="item.id"> <view class="finally" v-for="item in finallyCheckList" :key="item.id">
<view style="padding:10px;"> <view style="padding:10px;">
<text style="font-weight: bold;">动火作业票编号：{{item.workTicketCode}}</text> <text style="font-weight: bold;">作业票编号：{{item.workTicketCode}}</text>
<!-- {{item.engineeringName}} --> <!-- {{item.engineeringName}} -->
</view> </view>
<view style="padding:10px;"> <view style="padding:10px;">