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

Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-dev

Browse Source
This commit is contained in:
kun 2024-05-16 18:27:50 +08:00
commit 921e20f687
3 changed files with 36 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
main.js
View File

@ -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/' // 河南

4
manifest.json
View File

@ -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" : {

32
pages/projectEnd/specialOperations/fireWork/detail.vue
View File

@ -55,7 +55,35 @@
风险辨识结果：<text class="detail-data">{{detailData.riskIdentificationResult}}</text>
</view>
<view class="table-info" style="">
<uni-table emptyText="暂无更多数据" class="uni-table-font">
<u-table style="font-size: 20px;">
<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-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-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>
<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>
<!-- <uni-table emptyText="暂无更多数据" class="uni-table-font">
<uni-td class="uni-td-font" style="background-color: #eaeaea" align="center">
<uni-tr>气体取样分析时间</uni-tr>
<uni-tr>代表性气体</uni-tr>
@ -76,7 +104,7 @@
<uni-tr>{{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].representativeGas:''}}</uni-tr>
<uni-tr>{{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].analyzeResult:''}}</uni-tr>
</uni-td>
</uni-table>
</uni-table> -->
</view>
<view class="safe-mesure">
<view class="safe-btn" @click="goSafeMesure">查看安全措施</view>