diff --git a/main.js b/main.js index 5cbd1e2a..9e9d6403 100644 --- a/main.js +++ b/main.js @@ -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://42.180.188.17:9809/' // 鞍钢正式地址 // 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://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.work_url = 'http://47.93.215.234:19997' // 工作流线上地址(弃用) // Vue.prototype.work_url = 'http://42.180.188.17:19997' // 工作流线上地址 diff --git a/pages/projectEnd/specialOperations/fireWork/detail.vue b/pages/projectEnd/specialOperations/fireWork/detail.vue index 762f1b97..7c8b18e8 100644 --- a/pages/projectEnd/specialOperations/fireWork/detail.vue +++ b/pages/projectEnd/specialOperations/fireWork/detail.vue @@ -78,6 +78,9 @@ + + 查看安全措施 + @@ -94,9 +97,6 @@ {{detailData.guardianName}} - - 查看安全措施 - @@ -311,7 +311,8 @@ .other-safe{ background-color: #fff; // margin-top: 50rpx; - padding: 0 15rpx; + padding: 15rpx 15rpx; + line-height: 40rpx; .other-head{ display: flex; .other-icon{ @@ -325,6 +326,7 @@ } } .other-content{ + font-size: 22rpx; width: auto; height: 50rpx; // background-color: darkred; @@ -333,17 +335,17 @@ margin-top: 15rpx; display: flex; .content-1{ - width: 25%; + width: 22%; } .content-2{ - width: 18%; + width: 24%; } .content-3{ - width: 26%; + width: 23%; margin-left: 10%; } .content-4{ - width: 22%; + width: 26%; } }