From 1dc7cc313eab65d20e0fc586912c4892c6edfbc0 Mon Sep 17 00:00:00 2001
From: Admin <978517621@qq.com>
Date: 星期三, 07 九月 2022 11:15:26 +0800
Subject: [PATCH] Default Changelist
---
src/views/intellectInspect/intelligentLine/index.vue | 7 ++++---
src/views/riskWarningSys/warningBigScreen/indexs/index.vue | 1 +
src/views/specialWorkSystem/workProcess/workCheck/index.vue | 9 ++++++++-
src/views/specialWorkSystem/workProcess/gasCheck/index.vue | 12 ++++++++++--
4 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/src/views/intellectInspect/intelligentLine/index.vue b/src/views/intellectInspect/intelligentLine/index.vue
index 1615816..3040a58 100644
--- a/src/views/intellectInspect/intelligentLine/index.vue
+++ b/src/views/intellectInspect/intelligentLine/index.vue
@@ -1004,9 +1004,10 @@
display: flex;
justify-content: center;
align-items: flex-start;
- overflow: hidden;
- overflow-x: auto;
- overflow-y: auto;
+ overflow: auto;
+
+ &::-webkit-scrollbar { width: 0; height: 0; color: transparent; }
+ &::scrollbar { width: 0; height: 0; color: transparent; }
}
.line-map {
diff --git a/src/views/riskWarningSys/warningBigScreen/indexs/index.vue b/src/views/riskWarningSys/warningBigScreen/indexs/index.vue
index a55b011..570d38d 100644
--- a/src/views/riskWarningSys/warningBigScreen/indexs/index.vue
+++ b/src/views/riskWarningSys/warningBigScreen/indexs/index.vue
@@ -395,6 +395,7 @@
color: #11FEEE;
&::-webkit-scrollbar { width: 0; height: 0; color: transparent; }
+ &::scrollbar { width: 0; height: 0; color: transparent; }
&>div{
margin-bottom: 2rem;
diff --git a/src/views/specialWorkSystem/workProcess/gasCheck/index.vue b/src/views/specialWorkSystem/workProcess/gasCheck/index.vue
index 1e90316..564360f 100644
--- a/src/views/specialWorkSystem/workProcess/gasCheck/index.vue
+++ b/src/views/specialWorkSystem/workProcess/gasCheck/index.vue
@@ -42,7 +42,12 @@
<el-table-column type="index" label="序号" width="200"/>
<el-table-column property="id" label="作业证编号" width="200"/>
<el-table-column property="workType" label="作业类型" width="200"/>
- <el-table-column property="combustible" label="可燃气%"/>
+<!-- <el-table-column property="combustible" label="可燃气%"/>-->
+ <el-table-column property="combustible" label="可燃气%">
+ <template #default="scope">
+ <span :class="scope.row.combustible > 0 ? 'red': ''">{{ scope.row.combustible }}</span>
+ </template>
+ </el-table-column>
<el-table-column property="oxygen" label="氧气%"/>
<el-table-column property="co" label="一氧化碳ppm"/>
<el-table-column property="hs" label="硫化氢ppm"/>
@@ -123,7 +128,7 @@
<el-form-item label="可燃气%" prop="combustible">
<el-input v-model="addRecord.combustible"/>
</el-form-item>
- <el-form-item label="氧气" prop="oxygen">
+ <el-form-item label="氧气%" prop="oxygen">
<el-input v-model="addRecord.oxygen"/>
</el-form-item>
<el-form-item label="一氧化碳ppm" prop="combustible">
@@ -461,6 +466,9 @@
<style scoped lang="scss">
$homeNavLengh: 8;
+ .red{
+ color: red;
+ }
.home-container {
height: calc(100vh - 144px);
box-sizing: border-box;
diff --git a/src/views/specialWorkSystem/workProcess/workCheck/index.vue b/src/views/specialWorkSystem/workProcess/workCheck/index.vue
index ab1e9ee..eafbbee 100644
--- a/src/views/specialWorkSystem/workProcess/workCheck/index.vue
+++ b/src/views/specialWorkSystem/workProcess/workCheck/index.vue
@@ -43,7 +43,11 @@
<el-table-column property="id" label="作业证编号" width="200"/>
<el-table-column property="workType" label="作业类型" width="200"/>
<el-table-column property="checkInfo" label="检查内容"/>
- <el-table-column property="result" label="检查结果"/>
+ <el-table-column property="result" label="检查结果">
+ <template #default="scope">
+ <span :class="scope.row.result == '异常' ? 'red': ''">{{ scope.row.result }}</span>
+ </template>
+ </el-table-column>
<el-table-column property="desc" label="描述" width="200"/>
<el-table-column property="name" label="分析人"/>
<el-table-column property="updateTime" label="分析时间"/>
@@ -442,6 +446,9 @@
<style scoped lang="scss">
$homeNavLengh: 8;
+ .red{
+ color: red;
+ }
.home-container {
height: calc(100vh - 144px);
box-sizing: border-box;
--
Gitblit v1.9.2