diff --git a/main.js b/main.js index 9d018e5a..f247c68b 100644 --- a/main.js +++ b/main.js @@ -38,11 +38,11 @@ if (process.env.NODE_ENV === 'development') { console.log('开发环境') // 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: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://jxj.zhgdyun.com:61212/' //杰哥内网穿透地址 // 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://192.168.34.155:19111/' //彭洁本地 // Vue.prototype.work_url = 'http://47.93.215.234:19997' // 工作流线上地址（弃用） diff --git a/pages/projectEnd/specialOperations/bindPlatePlug/detail.vue b/pages/projectEnd/specialOperations/bindPlatePlug/detail.vue index 20f089db..049da220 100644 --- a/pages/projectEnd/specialOperations/bindPlatePlug/detail.vue +++ b/pages/projectEnd/specialOperations/bindPlatePlug/detail.vue @@ -7,40 +7,41 @@ - - - 作业票编号：{{detailData.workTicketCode}} - - + + 申请单位：{{detailData.jobApplicationUnitName}} + + + 作业负责人：{{detailData.assignmentPersonInChargeName}} + + - 申请单位：{{detailData.jobApplicationUnitName}} - - - 作业负责人：{{detailData.assignmentPersonInChargeName}} - - - - 作业类别： - - {{item}} - + 作业类别： + + {{item}} - - - 作业单位：{{detailData.operatingUnitName}} - - - 作业人：{{detailData.jobPersonName}} - - - 实际作业开始时间：{{detailData.actualJobBeginTime}} - - - - - - 监护人：{{detailData.guardianName}} - - - 盲板编号：{{detailData.blindPlateNo}} - - - - 盲板位置图： + + 监护人：{{detailData.guardianName}} + + + 盲板编号：{{detailData.blindPlateNo}} + + + + 盲板位置图： + + + + - - - - - - - - 编制人：{{detailData.organizer}} - - - 编制日期：{{detailData.organizerDate}} - - - 风险辨识结果：{{detailData.riskIdentificationResult}} - - - 关联的其他特殊作业及安全作业票编号：{{detailData.otherRelatedSpecialTask}} - - - 现场作业环境： - -
    -
  • - -
    • -
+
    +
  • + +
    • +
+ + + 安全技术交底： + + {{item.url}} - - 安全技术交底： - - {{item.url}} - - - - - - - - - 设备、管道 - - 管道参数 - 盲板参数 + + + + + + + 设备、管道 - - 名称 - 介质 - 温度 - 压力 - 材质 - 规格 - 编号 + 管道参数 - - {{detailData.devPipelineName||'--'}} - {{JSON.parse(detailData.pipelineParameter)[0]?JSON.parse(detailData.pipelineParameter)[0].materialQuality||'--':'--'}} - {{JSON.parse(detailData.pipelineParameter)[0]?JSON.parse(detailData.pipelineParameter)[0].specifications||'--':'--'}} - {{JSON.parse(detailData.pipelineParameter)[0]?JSON.parse(detailData.pipelineParameter)[0].number||'--':'--'}} - {{JSON.parse(detailData.blindPlateParameter)[0]?JSON.parse(detailData.blindPlateParameter)[0].medium||'--':'--'}} - {{JSON.parse(detailData.blindPlateParameter)[0]?JSON.parse(detailData.blindPlateParameter)[0].temperature||'--':'--'}} - {{JSON.parse(detailData.blindPlateParameter)[0]?JSON.parse(detailData.blindPlateParameter)[0].pressure||'--':'--'}} + + 盲板参数 + + + + 名称 + 介质 + + 温度 + + 压力 + + 材质 + + 规格 + + 编号 + + + + {{detailData.devPipelineName||'--'}} + + {{JSON.parse(detailData.pipelineParameter)[0]?JSON.parse(detailData.pipelineParameter)[0].materialQuality||'--':'--'}} + + + {{JSON.parse(detailData.pipelineParameter)[0]?JSON.parse(detailData.pipelineParameter)[0].specifications||'--':'--'}} + + + {{JSON.parse(detailData.pipelineParameter)[0]?JSON.parse(detailData.pipelineParameter)[0].number||'--':'--'}} + + + {{JSON.parse(detailData.blindPlateParameter)[0]?JSON.parse(detailData.blindPlateParameter)[0].medium||'--':'--'}} + + + {{JSON.parse(detailData.blindPlateParameter)[0]?JSON.parse(detailData.blindPlateParameter)[0].temperature||'--':'--'}} + + + {{JSON.parse(detailData.blindPlateParameter)[0]?JSON.parse(detailData.blindPlateParameter)[0].pressure||'--':'--'}} - - - - 查看安全措施 - - - - - 安全技术交底 - - 安全交底人： - {{detailData.safetyInformantName}} - 接受交底人： - {{detailData.acceptTheInformantName}} - - - - - - - {{isShow ? "收起详情":"展开详情"}} - - - - - - {{item.name}} - + + {{isShow ? "收起详情":"展开详情"}} + + + + + + + + + {{item.name}} - - - - - - + + + + + + - - - - - + - + + + + + + + + @@ -223,33 +248,33 @@ openLocalFile } from '@/utils/tool.js' export default { - components:{ + components: { plan, safe, side, workFinally, }, - data(){ - return{ + data() { + return { statusBarHeight: 0, isShow: false, componentName: "plan", - navList:[{ + navList: [{ id: 1, name: "当前进度" - },{ + }, { id: 2, name: "安全检查" - },{ + }, { id: 3, name: "施工旁站" - },{ + }, { id: 4, name: "最终验收" }], activeIndex: 1, detailId: "", - detailData:{}, + detailData: {}, isShowBtn: null, userInfo: {}, btnAuth: true, @@ -259,36 +284,35 @@ } }, onReachBottom() { - console.log(1,this.$refs['list']) + console.log(1, this.$refs['list']) }, onPullDownRefresh() { console.log(2) }, - onShow(){ + onShow() { this.userInfo = JSON.parse(uni.getStorageSync('userInfo')) this.statusBarHeight = uni.getStorageSync('systemInfo').statusBarHeight; // this.initData() this.getWork() let that = this; - setTimeout(function(){ - console.log(that.$refs,777) - console.log(that.$refs.listBox,777) - if(that.$refs['list'] && that.$refs['list'].initData){ + 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) + }, 200) }, - onLoad(val){ + onLoad(val) { this.btnAuth = this.checkBtnPermission({ key: 'blindPlugWork_add', menuPath: '/project/specialWork/blindPlugWork' }) this.detailId = val.id }, - mounted() { - }, - methods:{ + mounted() {}, + methods: { getType(url) { if (isImageLink(url)) { return "image" @@ -309,9 +333,9 @@ this.iframeUrl = this.url_config + 'image/' + url; } else { // openOutsideFile(`${this.url_config}image/${url}`) - openLocalFile(name,`${this.url_config}image/${url}`) + openLocalFile(name, `${this.url_config}image/${url}`) } - + return; }, previewImage(url) { @@ -319,17 +343,19 @@ urls: [url] }) }, - getWork(){ + getWork() { this.sendRequest({ - url:'xmgl/xzBlindPlatePlugSafe/queryById', - method:'get', - data:{id:this.detailId}, - success:res=>{ + url: 'xmgl/xzBlindPlatePlugSafe/queryById', + method: 'get', + data: { + id: this.detailId + }, + success: res => { uni.hideLoading() // if(res.code==200){ // this.listData = res.result.records // } - this.detailData = res.result + this.detailData = res.result if (this.detailData.fieldWorkingEnvironment) { this.detailData.fieldWorkingEnvironment = JSON.parse(this.detailData .fieldWorkingEnvironment) @@ -361,74 +387,76 @@ } }) }, - goSafeMesure(){ + goSafeMesure() { uni.navigateTo({ - url: "./safeMesure?detailId="+this.detailId + url: "./safeMesure?detailId=" + this.detailId }) }, - getApply(){ + getApply() { console.log("=====================================================detail"); console.log(this.detailData); this.sendRequest({ - url:'xmgl/xzDangerousEngineeringAcceptance/list', - method:'get', - data:{ + url: 'xmgl/xzDangerousEngineeringAcceptance/list', + method: 'get', + data: { engineeringId: this.detailData.id, projectSn: JSON.parse(uni.getStorageSync('projectDetail')).projectSn, type: 4 }, - success:res=>{ + success: res => { uni.hideLoading() - console.log("xmgl/xzDangerousEngineeringAcceptance/list",res); + console.log("xmgl/xzDangerousEngineeringAcceptance/list", res); let result = res.result - if(res.result.length>0){ - if(res.result[0].acceptanceResult === null) this.isShowBtn = false - if(res.result[0].acceptanceResult === 1) this.isShowBtn = false - if(res.result[0].acceptanceResult === 2) this.isShowBtn = true - }else{ + if (res.result.length > 0) { + if (res.result[0].acceptanceResult === null) this.isShowBtn = false + if (res.result[0].acceptanceResult === 1) this.isShowBtn = false + if (res.result[0].acceptanceResult === 2) this.isShowBtn = true + } else { this.isShowBtn = true } } }) }, - checkNav(val){ + checkNav(val) { this.activeIndex = val.id - if(val.id == 1){ + if (val.id == 1) { this.componentName = "plan" - } else if(val.id == 2){ + } else if (val.id == 2) { this.componentName = "safe" - } else if(val.id == 3){ + } else if (val.id == 3) { this.componentName = "side" - } else if(val.id == 4){ + } else if (val.id == 4) { this.componentName = "workFinally" } }, - addForm(){ - if(this.activeIndex == 1){ + addForm() { + if (this.activeIndex == 1) { uni.navigateTo({ - url:'./addPlan?id='+this.detailId + url: './addPlan?id=' + this.detailId }) - } else if(this.activeIndex == 2){ - if(uni.getStorageSync('dangerData')){ + } else if (this.activeIndex == 2) { + if (uni.getStorageSync('dangerData')) { uni.removeStorageSync('dangerData'); } - if(uni.getStorageSync('detailData')){ + if (uni.getStorageSync('detailData')) { uni.removeStorageSync('detailData'); } uni.navigateTo({ // 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({ - url:'./addSide?id='+this.detailId + url: './addSide?id=' + this.detailId }) - } else if(this.activeIndex == 4){ - if(this.isShowBtn){ + } else if (this.activeIndex == 4) { + if (this.isShowBtn) { uni.navigateTo({ - url:'./addWorkFinally?id='+this.detailId+'&workTicketCode='+this.detailData.workTicketCode + url: './addWorkFinally?id=' + this.detailId + '&workTicketCode=' + this.detailData + .workTicketCode }) - }else{ + } else { uni.showToast({ title: '请勿重复操作', icon: "none", @@ -451,12 +479,12 @@ bottom: 0; background-color: rgba(0, 0, 0, .3); display: none; - + &.show { display: initial; } } - + .iframeMain { position: absolute; left: 50%; @@ -464,210 +492,240 @@ transform: translate(-50%, -50%); width: 650rpx; font-size: 0; - + .iframe { width: 100%; height: 500rpx; } } -.other-safe{ - background-color: #fff; - // margin-top: 50rpx; - padding: 15rpx 15rpx; - line-height: 40rpx; - .other-head{ - display: flex; - .other-icon{ - width: 10rpx; - height: 40rpx; - background-color: #2b8df3; - border-radius: 100rpx; - } - .other-text{ - margin-left: 20rpx; - } - } - .other-content{ - font-size: 22rpx; - width: auto; - min-height: 50rpx; - // background-color: darkred; - // border: 1rpx solid black; - margin: 0 30rpx; - margin-top: 15rpx; - display: flex; - .content-1{ - width: 22%; - } - .content-2{ - width: 24%; - } - .content-3{ - width: 23%; - // margin-left: 10%; - } - .content-4{ - width: 26%; - } - } - -} -.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; - // background-color: lightgray; - .teble-list{ - display: flex; - font-size: 18rpx; - width: 99%; - // margin: 0 5rpx; + + .other-safe { background-color: #fff; - white-space: nowrap; - .teble-item{ - display: inline-block; - white-space: normal; - .table-item-inner{ - // background-color: lightgray; - display: flex; - // min-width: 200rpx; - - .item-col{ - width: 220rpx; - padding: 3rpx; - margin-top: 5rpx; - margin-left: 5rpx; - line-height: 50rpx; - text-align: center; - background-color: #F6F6F6; + // margin-top: 50rpx; + padding: 15rpx 15rpx; + line-height: 40rpx; + + .other-head { + display: flex; + + .other-icon { + width: 10rpx; + height: 40rpx; + background-color: #2b8df3; + border-radius: 100rpx; + } + + .other-text { + margin-left: 20rpx; + } + } + + .other-content { + font-size: 22rpx; + width: auto; + min-height: 50rpx; + // background-color: darkred; + // border: 1rpx solid black; + margin: 0 30rpx; + margin-top: 15rpx; + display: flex; + + .content-1 { + width: 22%; + } + + .content-2 { + width: 24%; + } + + .content-3 { + width: 23%; + // margin-left: 10%; + } + + .content-4 { + width: 26%; + } + } + + } + + .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; + + // background-color: lightgray; + .teble-list { + display: flex; + font-size: 18rpx; + width: 99%; + // margin: 0 5rpx; + background-color: #fff; + white-space: nowrap; + + .teble-item { + display: inline-block; + white-space: normal; + + .table-item-inner { + // background-color: lightgray; + display: flex; + // min-width: 200rpx; + + .item-col { + width: 220rpx; + padding: 3rpx; + margin-top: 5rpx; + margin-left: 5rpx; + line-height: 50rpx; + text-align: center; + background-color: #F6F6F6; + } } } } } -} -.dangerbig-details{ - min-height: 100%; - background: #F6F6F6; - .fixedheader{ - position: fixed; - top: 0; - left: 0; - width: 100%; - z-index: 2; - } - .detail-content{ - padding-top: 20rpx; - } - .list{ - margin-bottom: 20rpx; - } - .list-info { - background: #fff; - border-bottom: 1px solid #F6F6F6; - font-size: 26rpx; - padding: 20rpx; - // display: flex; - // align-items: center; - } - .list-info { - .source-box { + + .dangerbig-details { + min-height: 100%; + background: #F6F6F6; + + .fixedheader { + position: fixed; + top: 0; + left: 0; + width: 100%; + z-index: 2; + } + + .detail-content { + padding-top: 20rpx; + } + + .list { + margin-bottom: 20rpx; + } + + .list-info { + background: #fff; + border-bottom: 1px solid #F6F6F6; + font-size: 26rpx; + padding: 20rpx; + // display: flex; + // align-items: center; + } + + .list-info { + .source-box { + display: flex; + flex-direction: column; + + text { + color: #8F8FF7; + text-decoration: underline; + margin-top: 20rpx; + } + } + } + + .list-info ul { + list-style: none; + padding: 0; display: flex; - flex-direction: column; - - text { - color: #8F8FF7; - text-decoration: underline; - margin-top: 20rpx; + flex-wrap: wrap; + align-items: center; + margin-top: 20rpx; + } + + .list-info ul li { + width: 30%; + height: 100px; + margin: 0 10rpx; + margin-bottom: 20rpx; + } + + .list-info ul li image { + width: 100%; + height: 100%; + } + + .more-btn { + text-align: center; + font-size: 14px; + height: 50rpx; + background: #F1F7FE; + line-height: 50rpx; + } + + .nav-list { + display: flex; + height: 80rpx; + align-items: center; + padding: 0 20rpx; + + .nav-item { + width: 25%; + text-align: center; + white-space: nowrap; + padding: 0 20rpx; + height: 80rpx; + box-sizing: border-box; + line-height: 80rpx; + font-size: 14px; + } + + .active-nav { + border-bottom: 2px solid #4396E7; + } + } + + .detail-nav { + width: 100%; + } + + .scrollx-wrap { + width: 100%; + background: #fff; + } + + .add-btn { + background: #4181FE; + width: 96rpx; + height: 96rpx; + border-radius: 50%; + text-align: center; + line-height: 96rpx; + position: fixed; + bottom: 40rpx; + right: 40rpx; + + span { + font-size: 30px; + line-height: 45px; + color: #fff; } } } - .list-info ul { - list-style: none; - padding: 0; - display: flex; - flex-wrap: wrap; - align-items: center; - margin-top: 20rpx; - } - - .list-info ul li { - width: 30%; - height: 100px; - margin: 0 10rpx; - margin-bottom: 20rpx; - } - - .list-info ul li image { - width: 100%; - height: 100%; - } - .more-btn{ - text-align: center; - font-size: 14px; - height: 50rpx; - background: #F1F7FE; - line-height: 50rpx; - } - .nav-list{ - display: flex; - height: 80rpx; - align-items: center; - padding: 0 20rpx; - .nav-item{ - width: 25%; - text-align: center; - white-space: nowrap; - padding: 0 20rpx; - height: 80rpx; - box-sizing: border-box; - line-height: 80rpx; - font-size: 14px; - } - .active-nav{ - border-bottom: 2px solid #4396E7; - } - } - .detail-nav{ - width: 100%; - } - .scrollx-wrap{ - width: 100%; - background: #fff; - } - .add-btn{ - background: #4181FE; - width: 96rpx; - height: 96rpx; - border-radius: 50%; - text-align: center; - line-height: 96rpx; - position: fixed; - bottom: 40rpx; - right: 40rpx; - span{ - font-size: 30px; - line-height: 45px; - color: #fff; - } - } -} - + \ No newline at end of file