From e388dcb1c0a9efa3f1522c5adb48b26e86295fd1 Mon Sep 17 00:00:00 2001
From: shj <1790240199@qq.com>
Date: 星期三, 13 四月 2022 15:22:45 +0800
Subject: [PATCH] Merge branch 'shf' of https://sinanoaq.cn:8888/r/ztqt into shf
---
src/views/accidentHidden/majorHidden.vue | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/views/accidentHidden/majorHidden.vue b/src/views/accidentHidden/majorHidden.vue
index 899f06b..63da52a 100644
--- a/src/views/accidentHidden/majorHidden.vue
+++ b/src/views/accidentHidden/majorHidden.vue
@@ -132,8 +132,8 @@
</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>
- <el-button type="primary" class="btns" icon="el-icon-upload2">导出excel</el-button>
+ <el-button type="primary" class="btns" size="small" icon="el-icon-search">查询</el-button>
+ <el-button type="primary" class="btns" size="small" icon="el-icon-upload2">导出excel</el-button>
</el-form-item>
</el-form>
<el-row class="title-center">
@@ -146,7 +146,7 @@
</el-col>
<el-col :offset="4" :span="10" style="text-align:right;">
<el-button class="btns" type="primary" icon="el-icon-search" size="small">查看进度</el-button>
- <el-button class="btns" type="primary" icon="el-icon-edit" size="small">填写进度</el-button>
+ <el-button class="btns" type="primary" icon="el-icon-edit" size="small" @click="fillProgress()">填写进度</el-button>
</el-col>
</el-row>
<el-table :data="tableData" style="width: 100%">
@@ -165,7 +165,7 @@
</el-table-column>
<el-table-column
prop="date"
- label="检察部门"
+ label="检查部门"
align="center"
sortable
width="120"
@@ -182,7 +182,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>
@@ -195,7 +195,6 @@
<el-table-column label="责任人" align="center"> </el-table-column>
<el-table-column label="限改时间" width="120" sortable align="center">
</el-table-column>
- <el-table-column label="级别" align="center"> </el-table-column>
</el-table-column>
<el-table-column label="风险等级" align="center"> </el-table-column>
</el-table>
@@ -242,6 +241,13 @@
currentPage: 1,
};
},
+ methods:{
+ fillProgress(){
+ this.$router.push({
+ path:"/fillProgress"
+ })
+ },
+ }
};
</script>
<style scoped>
@@ -265,9 +271,9 @@
}
.title-center /deep/ .el-radio-button__inner{
border: none;
- border-radius: 0px;
+ border-radius: 0px;
}
.title-center /deep/ .el-radio-button__orig-radio:checked+.el-radio-button__inner{
background-color: #034ea2;background-color: #034ea2;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.2