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

flx：提交盲板作业的时间

Browse Source
This commit is contained in:
X_Rian 2024-06-13 20:37:00 +08:00
parent 247b5ded8f
commit f69bb50fc2
2 changed files with 458 additions and 400 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main.js
View File

@ -38,11 +38,11 @@ if (process.env.NODE_ENV === 'development') {
console.log('开发环境') console.log('开发环境')
// 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:28888/' //郭圣雄本地 // Vue.prototype.url_config = ' http://192.168.34.221:28888/' //郭圣雄本地
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://182.90.224.237:51234/' //郭圣雄本地 // Vue.prototype.url_config = 'http://182.90.224.237:51234/' //郭圣雄本地
// 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' // 工作流线上地址（弃用）

116
pages/projectEnd/specialOperations/bindPlatePlug/detail.vue
View File

@ -35,7 +35,8 @@
作业人：<text class="detail-data">{{detailData.jobPersonName}}</text> 作业人：<text class="detail-data">{{detailData.jobPersonName}}</text>
</view> </view>
<view class="list-info"> <view class="list-info">
实际作业开始时间：<text class="detail-data">{{detailData.actualJobBeginTime}}</text> 作业实施时间：<text class="detail-data"
v-if="detailData.workExecutionBeginTime && detailData.workExecutionEndTime">{{detailData.workExecutionBeginTime+'-'+detailData.workExecutionEndTime}}</text>
</view> </view>
<!-- <view class="list-info"> <!-- <view class="list-info">
设备、管道名称：<text class="detail-data">{{detailData.devPipelineName}}</text> 设备、管道名称：<text class="detail-data">{{detailData.devPipelineName}}</text>
@ -118,29 +119,55 @@
<scroll-view :scroll-x="true" class="teble-list"> <scroll-view :scroll-x="true" class="teble-list">
<view class="teble-item"> <view class="teble-item">
<view class="table-item-inner"> <view class="table-item-inner">
<view class="item-col" style="display: flex;justify-content: center;align-items: flex-end;line-height: 20rpx;font-weight: bold;background-color: lightgray;"> <view class="item-col"
style="display: flex;justify-content: center;align-items: flex-end;line-height: 20rpx;font-weight: bold;background-color: lightgray;">
<text>设备、管道</text> <text>设备、管道</text>
</view> </view>
<view class="item-col" style="width: 665rpx;font-weight: bold;background-color: lightgray;">管道参数</view> <view class="item-col"
<view class="item-col" style="margin-right: 5rpx;width: 665rpx;font-weight: bold;background-color: lightgray;">盲板参数</view> style="width: 665rpx;font-weight: bold;background-color: lightgray;">管道参数
</view>
<view class="item-col"
style="margin-right: 5rpx;width: 665rpx;font-weight: bold;background-color: lightgray;">
盲板参数</view>
</view> </view>
<view class="table-item-inner"> <view class="table-item-inner">
<view class="item-col" style="margin-top: 0;display: flex;justify-content: center;align-items: flex-start;line-height: 20rpx;font-weight: bold;background-color: lightgray;">名称</view> <view class="item-col"
<view class="item-col" style="font-weight: bold;background-color: lightgray;">介质</view> style="margin-top: 0;display: flex;justify-content: center;align-items: flex-start;line-height: 20rpx;font-weight: bold;background-color: lightgray;">
<view class="item-col" style="font-weight: bold;background-color: lightgray;">温度</view> 名称</view>
<view class="item-col" style="font-weight: bold;background-color: lightgray;">压力</view> <view class="item-col" style="font-weight: bold;background-color: lightgray;">介质
<view class="item-col" style="font-weight: bold;background-color: lightgray;">材质</view> </view>
<view class="item-col" style="font-weight: bold;background-color: lightgray;">规格</view> <view class="item-col" style="font-weight: bold;background-color: lightgray;">温度
<view class="item-col" style="margin-right: 5rpx;font-weight: bold;background-color: lightgray;">编号</view> </view>
<view class="item-col" style="font-weight: bold;background-color: lightgray;">压力
</view>
<view class="item-col" style="font-weight: bold;background-color: lightgray;">材质
</view>
<view class="item-col" style="font-weight: bold;background-color: lightgray;">规格
</view>
<view class="item-col"
style="margin-right: 5rpx;font-weight: bold;background-color: lightgray;">编号
</view>
</view> </view>
<view class="table-item-inner" style="padding-bottom: 5rpx;"> <view class="table-item-inner" style="padding-bottom: 5rpx;">
<view class="item-col" style="">{{detailData.devPipelineName||'--'}}</view> <view class="item-col" style="">{{detailData.devPipelineName||'--'}}</view>
<view class="item-col" style="">{{JSON.parse(detailData.pipelineParameter)[0]?JSON.parse(detailData.pipelineParameter)[0].materialQuality||'--':'--'}}</view> <view class="item-col" style="">
<view class="item-col" style="">{{JSON.parse(detailData.pipelineParameter)[0]?JSON.parse(detailData.pipelineParameter)[0].specifications||'--':'--'}}</view> {{JSON.parse(detailData.pipelineParameter)[0]?JSON.parse(detailData.pipelineParameter)[0].materialQuality||'--':'--'}}
<view class="item-col" style="">{{JSON.parse(detailData.pipelineParameter)[0]?JSON.parse(detailData.pipelineParameter)[0].number||'--':'--'}}</view> </view>
<view class="item-col" style="">{{JSON.parse(detailData.blindPlateParameter)[0]?JSON.parse(detailData.blindPlateParameter)[0].medium||'--':'--'}}</view> <view class="item-col" style="">
<view class="item-col" style="">{{JSON.parse(detailData.blindPlateParameter)[0]?JSON.parse(detailData.blindPlateParameter)[0].temperature||'--':'--'}}</view> {{JSON.parse(detailData.pipelineParameter)[0]?JSON.parse(detailData.pipelineParameter)[0].specifications||'--':'--'}}
<view class="item-col" style="margin-right: 5rpx;">{{JSON.parse(detailData.blindPlateParameter)[0]?JSON.parse(detailData.blindPlateParameter)[0].pressure||'--':'--'}}</view> </view>
<view class="item-col" style="">
{{JSON.parse(detailData.pipelineParameter)[0]?JSON.parse(detailData.pipelineParameter)[0].number||'--':'--'}}
</view>
<view class="item-col" style="">
{{JSON.parse(detailData.blindPlateParameter)[0]?JSON.parse(detailData.blindPlateParameter)[0].medium||'--':'--'}}
</view>
<view class="item-col" style="">
{{JSON.parse(detailData.blindPlateParameter)[0]?JSON.parse(detailData.blindPlateParameter)[0].temperature||'--':'--'}}
</view>
<view class="item-col" style="margin-right: 5rpx;">
{{JSON.parse(detailData.blindPlateParameter)[0]?JSON.parse(detailData.blindPlateParameter)[0].pressure||'--':'--'}}
</view>
</view> </view>
</view> </view>
</scroll-view> </scroll-view>
@ -175,10 +202,8 @@
<view class="detail-nav" v-if="COMPANY != 'longguang'"> <view class="detail-nav" v-if="COMPANY != 'longguang'">
<scroll-view class="scrollx-wrap" scroll-x> <scroll-view class="scrollx-wrap" scroll-x>
<view class="nav-list"> <view class="nav-list">
<view class="nav-item" <view class="nav-item" :class="{'active-nav': activeIndex == item.id}"
:class="{'active-nav': activeIndex == item.id}" v-for="(item,index) in navList" :key="index" @click="checkNav(item)">
v-for="(item,index) in navList" :key="index"
@click="checkNav(item)">
{{item.name}} {{item.name}}
</view> </view>
</view> </view>
@ -187,13 +212,13 @@
<plan ref="list" v-if="componentName == 'plan'" :detailId="detailId" :info="detailData"></plan> <plan ref="list" v-if="componentName == 'plan'" :detailId="detailId" :info="detailData"></plan>
<safe ref="list" v-if="componentName == 'safe'" :detailId="detailId" :info="detailData"></safe> <safe ref="list" v-if="componentName == 'safe'" :detailId="detailId" :info="detailData"></safe>
<side ref="list" v-if="componentName == 'side'" :detailId="detailId" :info="detailData"></side> <side ref="list" v-if="componentName == 'side'" :detailId="detailId" :info="detailData"></side>
<workFinally ref="list" v-if="componentName =='workFinally'" :detailId="detailId" :info="detailData" ></workFinally> <workFinally ref="list" v-if="componentName =='workFinally'" :detailId="detailId"
:info="detailData"></workFinally>
</view> </view>
</view> </view>
<!-- <view class="add-btn" v-if="activeIndex != 7 && activeIndex != 2 && !(activeIndex == 1 && detailData.engineeringState == 3) --> <!-- <view class="add-btn" v-if="activeIndex != 7 && activeIndex != 2 && !(activeIndex == 1 && detailData.engineeringState == 3) -->
<view class="add-btn" v-if="activeIndex != 7 && userInfo.userId === detailData.assignmentPersonInCharge <view class="add-btn" v-if="activeIndex != 7 && userInfo.userId === detailData.assignmentPersonInCharge
&& COMPANY != 'longguang' && detailData.finalAcceptanceStatus !== 2 && isShowBtn && btnAuth" && COMPANY != 'longguang' && detailData.finalAcceptanceStatus !== 2 && isShowBtn && btnAuth" @click="addForm">
@click="addForm">
<uni-icons v-if="activeIndex == 5" type="camera" size="30" color="#fff"></uni-icons> <uni-icons v-if="activeIndex == 5" type="camera" size="30" color="#fff"></uni-icons>
<uni-icons v-else type="plusempty" size="30" color="#fff"></uni-icons> <uni-icons v-else type="plusempty" size="30" color="#fff"></uni-icons>
<span>+</span> <span>+</span>
@ -286,8 +311,7 @@
}) })
this.detailId = val.id this.detailId = val.id
}, },
mounted() { mounted() {},
},
methods: { methods: {
getType(url) { getType(url) {
if (isImageLink(url)) { if (isImageLink(url)) {
@ -323,7 +347,9 @@
this.sendRequest({ this.sendRequest({
url: 'xmgl/xzBlindPlatePlugSafe/queryById', url: 'xmgl/xzBlindPlatePlugSafe/queryById',
method: 'get', method: 'get',
data:{id:this.detailId}, data: {
id: this.detailId
},
success: res => { success: res => {
uni.hideLoading() uni.hideLoading()
// if(res.code==200){ // if(res.code==200){
@ -417,7 +443,8 @@
} }
uni.navigateTo({ uni.navigateTo({
// url:'../safeManage/addExamine?type=1&engineeringId='+this.detailId + '&moduleType=safeCheck' // url:'../safeManage/addExamine?type=1&engineeringId='+this.detailId + '&moduleType=safeCheck'
url:'../../safeSame/addIssue?type=4&engineeringId='+this.detailId + '&moduleType=safeCheck' url: '../../safeSame/addIssue?type=4&engineeringId=' + this.detailId +
'&moduleType=safeCheck'
}) })
} else if (this.activeIndex == 3) { } else if (this.activeIndex == 3) {
uni.navigateTo({ uni.navigateTo({
@ -426,7 +453,8 @@
} 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+'&workTicketCode='+this.detailData.workTicketCode url: './addWorkFinally?id=' + this.detailId + '&workTicketCode=' + this.detailData
.workTicketCode
}) })
} else { } else {
uni.showToast({ uni.showToast({
@ -470,23 +498,28 @@
height: 500rpx; height: 500rpx;
} }
} }
.other-safe { .other-safe {
background-color: #fff; background-color: #fff;
// margin-top: 50rpx; // margin-top: 50rpx;
padding: 15rpx 15rpx; padding: 15rpx 15rpx;
line-height: 40rpx; line-height: 40rpx;
.other-head { .other-head {
display: flex; display: flex;
.other-icon { .other-icon {
width: 10rpx; width: 10rpx;
height: 40rpx; height: 40rpx;
background-color: #2b8df3; background-color: #2b8df3;
border-radius: 100rpx; border-radius: 100rpx;
} }
.other-text { .other-text {
margin-left: 20rpx; margin-left: 20rpx;
} }
} }
.other-content { .other-content {
font-size: 22rpx; font-size: 22rpx;
width: auto; width: auto;
@ -496,22 +529,27 @@
margin: 0 30rpx; margin: 0 30rpx;
margin-top: 15rpx; margin-top: 15rpx;
display: flex; display: flex;
.content-1 { .content-1 {
width: 22%; width: 22%;
} }
.content-2 { .content-2 {
width: 24%; width: 24%;
} }
.content-3 { .content-3 {
width: 23%; width: 23%;
// margin-left: 10%; // margin-left: 10%;
} }
.content-4 { .content-4 {
width: 26%; width: 26%;
} }
} }
} }
.safe-mesure { .safe-mesure {
width: 100%; width: 100%;
height: 100rpx; height: 100rpx;
@ -519,6 +557,7 @@
justify-content: center; justify-content: center;
align-items: center; align-items: center;
background-color: #fff; background-color: #fff;
.safe-btn { .safe-btn {
text-align: center; text-align: center;
width: 80%; width: 80%;
@ -530,11 +569,13 @@
font-weight: bold; font-weight: bold;
} }
} }
.table-info { .table-info {
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
background-color: #fff; background-color: #fff;
// background-color: lightgray; // background-color: lightgray;
.teble-list { .teble-list {
display: flex; display: flex;
@ -543,9 +584,11 @@
// margin: 0 5rpx; // margin: 0 5rpx;
background-color: #fff; background-color: #fff;
white-space: nowrap; white-space: nowrap;
.teble-item { .teble-item {
display: inline-block; display: inline-block;
white-space: normal; white-space: normal;
.table-item-inner { .table-item-inner {
// background-color: lightgray; // background-color: lightgray;
display: flex; display: flex;
@ -564,9 +607,11 @@
} }
} }
} }
.dangerbig-details { .dangerbig-details {
min-height: 100%; min-height: 100%;
background: #F6F6F6; background: #F6F6F6;
.fixedheader { .fixedheader {
position: fixed; position: fixed;
top: 0; top: 0;
@ -574,12 +619,15 @@
width: 100%; width: 100%;
z-index: 2; z-index: 2;
} }
.detail-content { .detail-content {
padding-top: 20rpx; padding-top: 20rpx;
} }
.list { .list {
margin-bottom: 20rpx; margin-bottom: 20rpx;
} }
.list-info { .list-info {
background: #fff; background: #fff;
border-bottom: 1px solid #F6F6F6; border-bottom: 1px solid #F6F6F6;
@ -588,6 +636,7 @@
// display: flex; // display: flex;
// align-items: center; // align-items: center;
} }
.list-info { .list-info {
.source-box { .source-box {
display: flex; display: flex;
@ -600,6 +649,7 @@
} }
} }
} }
.list-info ul { .list-info ul {
list-style: none; list-style: none;
padding: 0; padding: 0;
@ -620,6 +670,7 @@
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
.more-btn { .more-btn {
text-align: center; text-align: center;
font-size: 14px; font-size: 14px;
@ -627,11 +678,13 @@
background: #F1F7FE; background: #F1F7FE;
line-height: 50rpx; line-height: 50rpx;
} }
.nav-list { .nav-list {
display: flex; display: flex;
height: 80rpx; height: 80rpx;
align-items: center; align-items: center;
padding: 0 20rpx; padding: 0 20rpx;
.nav-item { .nav-item {
width: 25%; width: 25%;
text-align: center; text-align: center;
@ -642,17 +695,21 @@
line-height: 80rpx; line-height: 80rpx;
font-size: 14px; font-size: 14px;
} }
.active-nav { .active-nav {
border-bottom: 2px solid #4396E7; border-bottom: 2px solid #4396E7;
} }
} }
.detail-nav { .detail-nav {
width: 100%; width: 100%;
} }
.scrollx-wrap { .scrollx-wrap {
width: 100%; width: 100%;
background: #fff; background: #fff;
} }
.add-btn { .add-btn {
background: #4181FE; background: #4181FE;
width: 96rpx; width: 96rpx;
@ -663,6 +720,7 @@
position: fixed; position: fixed;
bottom: 40rpx; bottom: 40rpx;
right: 40rpx; right: 40rpx;
span { span {
font-size: 30px; font-size: 30px;
line-height: 45px; line-height: 45px;