diff --git a/main.js b/main.js
index 5cbd1e2a..da93e53d 100644
--- a/main.js
+++ b/main.js
@@ -86,13 +86,13 @@ if (process.env.NODE_ENV === 'development') {
// Vue.prototype.url_config = 'http://10.168.1.105:11111/' // 线上地址
// Vue.prototype.url_config = 'http://10.168.1.104:11111/' // 线上地址
// 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: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://192.168.34.221:9111/' // 百色三标段
// 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:19097' // 工作流测试地址
+ // Vue.prototype.work_url = 'http://42.180.188.17:19997' // 工作流线上地址
+ Vue.prototype.work_url = 'http://42.180.188.17:19097' // 工作流测试地址
// Vue.prototype.work_url = 'http://192.168.34.139:5173' // 工作流地址
// Vue.prototype.url_config = 'http://182.90.224.147:100/' //演示平台
// Vue.prototype.url_config ='http://124.71.178.44:8012/' // 河南
diff --git a/manifest.json b/manifest.json
index 9c019149..44ab431a 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "智慧安全", //中建四局
"appid" : "__UNI__4AA4101",
"description" : "",
- "versionName" : "1.5.4",
- "versionCode" : 154,
+ "versionName" : "1.5.5",
+ "versionCode" : 155,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
diff --git a/pages/projectEnd/specialOperations/fireWork/detail.vue b/pages/projectEnd/specialOperations/fireWork/detail.vue
index 2879b683..429b167d 100644
--- a/pages/projectEnd/specialOperations/fireWork/detail.vue
+++ b/pages/projectEnd/specialOperations/fireWork/detail.vue
@@ -55,7 +55,35 @@
风险辨识结果:{{detailData.riskIdentificationResult}}
-
+
+
+ 气体取样分析时间
+ {{detailData.xzGasAnalyzeList[0]?detailData.xzGasAnalyzeList[0].gasAnalyzeTime:''}}
+ {{detailData.xzGasAnalyzeList[1]?detailData.xzGasAnalyzeList[1].gasAnalyzeTime:''}}
+ {{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].gasAnalyzeTime:''}}
+
+
+ 代表性气体
+ {{detailData.xzGasAnalyzeList[0]?detailData.xzGasAnalyzeList[0].representativeGas:''}}
+ {{detailData.xzGasAnalyzeList[1]?detailData.xzGasAnalyzeList[1].representativeGas:''}}
+ {{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].representativeGas:''}}
+
+
+ 分析结果/%
+ {{detailData.xzGasAnalyzeList[0]?detailData.xzGasAnalyzeList[0].analyzeResult:''}}
+ {{detailData.xzGasAnalyzeList[1]?detailData.xzGasAnalyzeList[1].analyzeResult:''}}
+ {{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].analyzeResult:''}}
+
+
+ 分析人
+ {{detailData.xzGasAnalyzeList[0]?detailData.xzGasAnalyzeList[0].analyzer:''}}
+ {{detailData.xzGasAnalyzeList[1]?detailData.xzGasAnalyzeList[1].analyzer:''}}
+ {{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].analyzer:''}}
+
+
+
+
+
查看安全措施