From 3729854b670d0e047d2518ff9848776e0a4bfc09 Mon Sep 17 00:00:00 2001
From: Vce <daisy_vce@yeah.net>
Date: Thu, 16 May 2024 21:23:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E5=AD=98=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.js                                       |  8 +--
 .../specialOperations/fireWork/detail.vue     | 56 +++++++++++++------
 2 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/main.js b/main.js
index da93e53d..a722b9a1 100644
--- a/main.js
+++ b/main.js
@@ -37,15 +37,15 @@ 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: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' // 工作流线上地址
-  // Vue.prototype.work_url = 'http://42.180.188.17:19097' // 工作流测试地址
-  Vue.prototype.work_url = 'http://192.168.34.138:5173' // 工作流地址
+  Vue.prototype.work_url = 'http://42.180.188.17:19097' // 工作流测试地址
+  // Vue.prototype.work_url = 'http://192.168.34.138:5173' // 工作流地址
   // Vue.prototype.work_url = 'http://139.9.66.234:5173' // 工作流地址
   // Vue.prototype.work_url = 'http://192.168.34.126:5173' // 工作流地址
   // Vue.prototype.url_config = 'http://8.142.139.165:7080/' // 湖里
diff --git a/pages/projectEnd/specialOperations/fireWork/detail.vue b/pages/projectEnd/specialOperations/fireWork/detail.vue
index 429b167d..9a4e10a6 100644
--- a/pages/projectEnd/specialOperations/fireWork/detail.vue
+++ b/pages/projectEnd/specialOperations/fireWork/detail.vue
@@ -55,33 +55,46 @@
 								风险辨识结果：<text class="detail-data">{{detailData.riskIdentificationResult}}</text>
 							</view>
 							<view class="table-info" style="">
-								<u-table style="font-size: 20px;">
-									<u-tr>
+								<view class="teble-list">
+									<view class="teble-item">
+										<view class="item-col">气体取样分析时间</view>
+										<view class="item-col">代表性气体</view>
+										<view class="item-col">分析结果/%</view>
+										<view class="item-col" style="margin-bottom: 5rpx;">分析人</view>
+									</view>
+									<view class="teble-item">
+										<view class="item-col">气体取样分析时间</view>
+										<view class="item-col">代表性气体</view>
+										<view class="item-col">分析结果/%</view>
+										<view class="item-col" style="margin-bottom: 5rpx;">分析人</view>
+									</view>
+								</view>
+								<!-- <u-table style="font-size: 20px;">
+									<u-tr class="u-tr">
 										<u-th>气体取样分析时间</u-th>
 										<u-th>{{detailData.xzGasAnalyzeList[0]?detailData.xzGasAnalyzeList[0].gasAnalyzeTime:''}}</u-th>
 										<u-th>{{detailData.xzGasAnalyzeList[1]?detailData.xzGasAnalyzeList[1].gasAnalyzeTime:''}}</u-th>
 										<u-th>{{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].gasAnalyzeTime:''}}</u-th>
 									</u-tr>
-									<u-tr>
+									<u-tr class="u-tr">
 										<u-th>代表性气体</u-th>
 										<u-td>{{detailData.xzGasAnalyzeList[0]?detailData.xzGasAnalyzeList[0].representativeGas:''}}</u-td>
 										<u-td>{{detailData.xzGasAnalyzeList[1]?detailData.xzGasAnalyzeList[1].representativeGas:''}}</u-td>
 										<u-td>{{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].representativeGas:''}}</u-td>
 									</u-tr>
-									<u-tr>
+									<u-tr class="u-tr">
 										<u-th>分析结果/%</u-th>
 										<u-td>{{detailData.xzGasAnalyzeList[0]?detailData.xzGasAnalyzeList[0].analyzeResult:''}}</u-td>
 										<u-td>{{detailData.xzGasAnalyzeList[1]?detailData.xzGasAnalyzeList[1].analyzeResult:''}}</u-td>
 										<u-td>{{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].analyzeResult:''}}</u-td>
-									</u-tr>
+									</u-tr class="u-tr">
 									<u-tr>
 										<u-th>分析人</u-th>
 										<u-td>{{detailData.xzGasAnalyzeList[0]?detailData.xzGasAnalyzeList[0].analyzer:''}}</u-td>
 										<u-td>{{detailData.xzGasAnalyzeList[1]?detailData.xzGasAnalyzeList[1].analyzer:''}}</u-td>
 										<u-td>{{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].analyzer:''}}</u-td>
 									</u-tr>
-								</u-table>
-								
+								</u-table> -->
 								
 								<!-- <uni-table emptyText="暂无更多数据" class="uni-table-font">
 									<uni-td class="uni-td-font" style="background-color: #eaeaea" align="center">
@@ -401,19 +414,26 @@
 	justify-content: center;
 	align-items: center;
 	background-color: #fff;
-	.uni-table-font{
-		margin: 0 5rpx;
-		// width: 95%;
-		box-shadow: 0rpx 0rpx 0rpx 2rpx darkgray;
-		.uni-td-font{
-			width: 25%;
-			font-size: 18rpx;
-			border: 1rpx solid lightgray;
-			.uni-tr-font{
-				border: 1rpx solid black;
+	.teble-list{
+		display: flex;
+		justify-content: flex-start;
+		width: 100%;
+		font-size: 18rpx;
+		background-color: gainsboro;
+		.teble-item{
+			width: 24%;
+			line-height: 40rpx;
+			// border: 1rpx solid black;
+			// background-color: darkred;
+			.item-col{
+				// margin: 0 5rpx;
+				margin-left: 5rpx;
+				margin-top: 5rpx;
+				padding: 3rpx;
+				text-align: center;
+				background-color: lightgray;
 			}
 		}
-		
 	}
 }
 .dangerbig-details{