From cfa71ff7ac5d4878c12b9a1f96613512e10a6cec Mon Sep 17 00:00:00 2001
From: Kxc0822a <kxc000822>
Date: 星期三, 13 四月 2022 10:07:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/shf' into shf
---
src/views/hiddenDangerRegistration/index.vue | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/views/hiddenDangerRegistration/index.vue b/src/views/hiddenDangerRegistration/index.vue
index b61a992..b14a898 100644
--- a/src/views/hiddenDangerRegistration/index.vue
+++ b/src/views/hiddenDangerRegistration/index.vue
@@ -168,10 +168,10 @@
</el-col>
</el-form-item>
<el-form-item style="text-align: center; padding: 0 50px">
- <el-button type="primary" class="btns" icon="el-icon-search"
+ <el-button type="primary" class="btns" size="small" icon="el-icon-search"
>查询</el-button
>
- <el-button type="primary" class="btns" icon="el-icon-upload2"
+ <el-button type="primary" class="btns" size="small" icon="el-icon-upload2"
>导出excel</el-button
>
</el-form-item>
@@ -252,7 +252,7 @@
<el-table-column prop="date" label="检查类别" align="center">
</el-table-column>
<el-table-column label="隐患项目" align="center">
- <el-table-column label="检察时间" width="120" sortable align="center">
+ <el-table-column label="检查时间" width="120" sortable align="center">
</el-table-column>
<el-table-column label="地点" align="center"> </el-table-column>
<el-table-column label="内容" align="center"> </el-table-column>
@@ -268,7 +268,7 @@
<el-table-column label="级别" align="center"> </el-table-column>
</el-table-column>
<el-table-column label="整改情况" align="center">
- <el-table-column label="完成时间" sortable align="center"> </el-table-column>
+ <el-table-column label="完成时间" width="110px" sortable align="center"> </el-table-column>
<el-table-column label="复查结果" align="center"> </el-table-column>
<el-table-column label="复查人" align="center"> </el-table-column>
<el-table-column label="复查时间" width="120" sortable align="center">
@@ -282,7 +282,7 @@
<el-table-column label="流程操作" align="center"> </el-table-column>
<el-table-column label="基本操作" align="center">
<template slot-scope="scope">
- <el-button @click="handleClick(scope.row)" type="text" size="small">发送流程</el-button>
+ <el-button @click="handleClick(scope.row)" type="text" size="small">点击发送</el-button>
</template>
</el-table-column>
</el-table>
@@ -345,7 +345,8 @@
// 发送隐患单跳转
handleClick(){
this.$router.push({
- path:"/hiddenDangerList"
+ path:"/hiddenDangerList",
+
})
},
}
--
Gitblit v1.9.2