From 5a1616f169d75ece07d2d12a8edac3e5f660a920 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期四, 08 九月 2022 09:36:16 +0800
Subject: [PATCH] 合并
---
src/views/specialWorkSystem/workProcess/gasCheck/index.vue | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/src/views/specialWorkSystem/workProcess/gasCheck/index.vue b/src/views/specialWorkSystem/workProcess/gasCheck/index.vue
index 7e4c300..f8a0c36 100644
--- a/src/views/specialWorkSystem/workProcess/gasCheck/index.vue
+++ b/src/views/specialWorkSystem/workProcess/gasCheck/index.vue
@@ -28,7 +28,7 @@
<div class="main-card">
<el-row class="cardTop">
<el-col :span="12" class="mainCardBtn">
- <el-button type="primary" :icon="Plus" size="default" @click="dialogAddRecord = true">新建</el-button>
+ <el-button type="primary" :icon="Plus" size="default" @click="dialogAddRecord = true">新增</el-button>
</el-col>
<el-button type="primary" :icon="Refresh" size="default"/>
</el-row>
@@ -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"/>
@@ -105,10 +110,14 @@
</el-form-item>
</el-form>
</el-dialog>
- <el-dialog v-model="dialogAddRecord" title="新建" @close="closeAdd" @open="openAdd">
+ <el-dialog v-model="dialogAddRecord" title="新增" @close="closeAdd" @open="openAdd">
<el-form :model="addRecord" label-width="120px" ref="addRef" :rules="addRules">
<el-form-item label="作业证编号" prop="id">
- <el-input v-model="addRecord.id"> </el-input>
+ <el-input v-model="addRecord.id">
+ <template #append>
+ <el-button :icon="Search" />
+ </template>
+ </el-input>
</el-form-item>
<el-form-item label="作业类型" prop="groupMembers">
<el-select v-model="addRecord.groupMembers">
@@ -123,7 +132,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">
@@ -152,7 +161,7 @@
import { Session } from '/@/utils/storage';
import { Edit, View, Plus, Delete, Refresh, Search, Download } from '@element-plus/icons-vue';
import { ElTable } from 'element-plus';
- import { FormInstance, FormRules, ElMessage } from 'element-plus';
+ import type { FormInstance, FormRules } from 'element-plus'
import { teamManageApi } from '/@/api/systemManage/basicDateManage/personShiftManage/teamManage';
// 定义接口来定义对象的类型
@@ -441,6 +450,7 @@
Delete,
Refresh,
Plus,
+ Search,
handleChange,
searchRecord,
clearSearch,
@@ -461,6 +471,9 @@
<style scoped lang="scss">
$homeNavLengh: 8;
+ .red{
+ color: red;
+ }
.home-container {
height: calc(100vh - 144px);
box-sizing: border-box;
--
Gitblit v1.9.2