From 185547d84110faeb341ca122a8e5c166a1f0681b Mon Sep 17 00:00:00 2001
From: shj <1790240199@qq.com>
Date: 星期二, 12 四月 2022 09:51:23 +0800
Subject: [PATCH] Merge branch 'shf' of https://sinanoaq.cn:8888/r/ztqt into shf
---
src/views/hiddenDangerRectification/applicationForExtension.vue | 13 +++++-
src/views/hiddenDangerManagement/fillRectification.vue | 11 +++++
src/views/delayHiddenDangerRectification/rectificationDelayHiddenDanger.vue | 13 +++++-
src/views/hiddenDangerRegistration/index.vue | 5 +-
src/views/hiddenDangerReview/recheckHiddenDangerList.vue | 13 +++++-
src/views/hiddenDangerReview/recheckCancellationNumber.vue | 2
src/views/delayHiddenDangerRectification/index.vue | 2
src/views/hiddenDangerManagement/fillInspector.vue | 11 +++++
src/views/hiddenDangerRectification/index.vue | 2
src/views/hiddenDangerRectification/sendHiddenDangerList.vue | 13 +++++-
src/views/hiddenDangerRegistration/hiddenDangerList.vue | 13 +++++-
11 files changed, 83 insertions(+), 15 deletions(-)
diff --git a/src/views/delayHiddenDangerRectification/index.vue b/src/views/delayHiddenDangerRectification/index.vue
index 79369ce..3391d81 100644
--- a/src/views/delayHiddenDangerRectification/index.vue
+++ b/src/views/delayHiddenDangerRectification/index.vue
@@ -211,7 +211,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>
diff --git a/src/views/delayHiddenDangerRectification/rectificationDelayHiddenDanger.vue b/src/views/delayHiddenDangerRectification/rectificationDelayHiddenDanger.vue
index ba98496..dc6d129 100644
--- a/src/views/delayHiddenDangerRectification/rectificationDelayHiddenDanger.vue
+++ b/src/views/delayHiddenDangerRectification/rectificationDelayHiddenDanger.vue
@@ -392,8 +392,8 @@
<el-row>
<el-col :span="22">
<el-form-item style="text-align: center;">
- <el-button type="primary" @click="submitForm('ruleForm')">保存</el-button>
- <el-button @click="close()">关闭</el-button>
+ <el-button class="btn" type="primary" @click="submitForm('ruleForm')">保存</el-button>
+ <el-button class="btn" type="primary" @click="close()">关闭</el-button>
</el-form-item>
</el-col>
</el-row>
@@ -519,4 +519,13 @@
max-height: 100px;
overflow-y: auto
}
+ .btn{
+ background-color: #034ea2;
+ border: 1px solid #034ea2;
+ }
+ .el-button:hover {
+ background: #66b1ff;
+ border-color: #66b1ff;
+ color: #FFF;
+ }
</style>
diff --git a/src/views/hiddenDangerManagement/fillInspector.vue b/src/views/hiddenDangerManagement/fillInspector.vue
index 7278abe..5957f7c 100644
--- a/src/views/hiddenDangerManagement/fillInspector.vue
+++ b/src/views/hiddenDangerManagement/fillInspector.vue
@@ -155,9 +155,11 @@
</el-form>
<div class="btn">
<el-button
+ class="btns"
type="primary"
@click="submitConfig('config')">保存</el-button>
<el-button
+ class="btns"
type="primary" @click="close()">关闭</el-button>
</div>
</div>
@@ -300,4 +302,13 @@
text-align: center;
margin-top: 50px;
}
+ .btns{
+ background-color: #034ea2;
+ border: 1px solid #034ea2;
+ }
+ .el-button:hover {
+ background: #66b1ff;
+ border-color: #66b1ff;
+ color: #FFF;
+ }
</style>
diff --git a/src/views/hiddenDangerManagement/fillRectification.vue b/src/views/hiddenDangerManagement/fillRectification.vue
index f0e4ef0..7e5477d 100644
--- a/src/views/hiddenDangerManagement/fillRectification.vue
+++ b/src/views/hiddenDangerManagement/fillRectification.vue
@@ -131,9 +131,11 @@
</el-form>
<div class="btn">
<el-button
+ class="btns"
type="primary"
@click="submitConfig('config')">保存</el-button>
<el-button
+ class="btns"
type="primary" @click="close()">关闭</el-button>
</div>
</div>
@@ -267,4 +269,13 @@
text-align: center;
margin-top: 50px;
}
+ .btns{
+ background-color: #034ea2;
+ border: 1px solid #034ea2;
+ }
+ .el-button:hover {
+ background: #66b1ff;
+ border-color: #66b1ff;
+ color: #FFF;
+ }
</style>
diff --git a/src/views/hiddenDangerRectification/applicationForExtension.vue b/src/views/hiddenDangerRectification/applicationForExtension.vue
index 6986e02..09e1065 100644
--- a/src/views/hiddenDangerRectification/applicationForExtension.vue
+++ b/src/views/hiddenDangerRectification/applicationForExtension.vue
@@ -46,8 +46,8 @@
<el-row>
<el-col :span="22">
<el-form-item style="text-align: center;">
- <el-button type="primary" @click="submitForm('ruleForm')">保存</el-button>
- <el-button @click="close()">关闭</el-button>
+ <el-button class="btn" type="primary" @click="submitForm('ruleForm')">保存</el-button>
+ <el-button class="btn" type="primary" @click="close()">关闭</el-button>
</el-form-item>
</el-col>
</el-row>
@@ -148,4 +148,13 @@
max-height: 80px;
overflow-y: auto
}
+ .btn{
+ background-color: #034ea2;
+ border: 1px solid #034ea2;
+ }
+ .el-button:hover {
+ background: #66b1ff;
+ border-color: #66b1ff;
+ color: #FFF;
+ }
</style>
diff --git a/src/views/hiddenDangerRectification/index.vue b/src/views/hiddenDangerRectification/index.vue
index 88bc5a0..85da3de 100644
--- a/src/views/hiddenDangerRectification/index.vue
+++ b/src/views/hiddenDangerRectification/index.vue
@@ -211,7 +211,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>
diff --git a/src/views/hiddenDangerRectification/sendHiddenDangerList.vue b/src/views/hiddenDangerRectification/sendHiddenDangerList.vue
index 53d5c02..f780446 100644
--- a/src/views/hiddenDangerRectification/sendHiddenDangerList.vue
+++ b/src/views/hiddenDangerRectification/sendHiddenDangerList.vue
@@ -392,8 +392,8 @@
<el-row>
<el-col :span="22">
<el-form-item style="text-align: center;">
- <el-button type="primary" @click="submitForm('ruleForm')">保存</el-button>
- <el-button @click="close()">关闭</el-button>
+ <el-button class="btn" type="primary" @click="submitForm('ruleForm')">保存</el-button>
+ <el-button class="btn" type="primary" @click="close()">关闭</el-button>
</el-form-item>
</el-col>
</el-row>
@@ -519,4 +519,13 @@
max-height: 100px;
overflow-y: auto
}
+ .btn{
+ background-color: #034ea2;
+ border: 1px solid #034ea2;
+ }
+ .el-button:hover {
+ background: #66b1ff;
+ border-color: #66b1ff;
+ color: #FFF;
+ }
</style>
diff --git a/src/views/hiddenDangerRegistration/hiddenDangerList.vue b/src/views/hiddenDangerRegistration/hiddenDangerList.vue
index 9442c29..0a704be 100644
--- a/src/views/hiddenDangerRegistration/hiddenDangerList.vue
+++ b/src/views/hiddenDangerRegistration/hiddenDangerList.vue
@@ -392,8 +392,8 @@
<el-row>
<el-col :span="22">
<el-form-item style="text-align: center;">
- <el-button type="primary" @click="submitForm('ruleForm')">保存</el-button>
- <el-button @click="close()">关闭</el-button>
+ <el-button class="btn" @click="submitForm('ruleForm')" type="primary">保存</el-button>
+ <el-button class="btn" @click="close()" type="primary">关闭</el-button>
</el-form-item>
</el-col>
</el-row>
@@ -519,4 +519,13 @@
max-height: 100px;
overflow-y: auto
}
+ .btn{
+ background-color: #034ea2;
+ border: 1px solid #034ea2;
+ }
+ .el-button:hover {
+ background: #66b1ff;
+ border-color: #66b1ff;
+ color: #FFF;
+ }
</style>
diff --git a/src/views/hiddenDangerRegistration/index.vue b/src/views/hiddenDangerRegistration/index.vue
index 64035c8..1d690fd 100644
--- a/src/views/hiddenDangerRegistration/index.vue
+++ b/src/views/hiddenDangerRegistration/index.vue
@@ -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",
+
})
},
}
diff --git a/src/views/hiddenDangerReview/recheckCancellationNumber.vue b/src/views/hiddenDangerReview/recheckCancellationNumber.vue
index 3cf9265..3a30465 100644
--- a/src/views/hiddenDangerReview/recheckCancellationNumber.vue
+++ b/src/views/hiddenDangerReview/recheckCancellationNumber.vue
@@ -212,7 +212,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>
diff --git a/src/views/hiddenDangerReview/recheckHiddenDangerList.vue b/src/views/hiddenDangerReview/recheckHiddenDangerList.vue
index 9734ed0..08a217d 100644
--- a/src/views/hiddenDangerReview/recheckHiddenDangerList.vue
+++ b/src/views/hiddenDangerReview/recheckHiddenDangerList.vue
@@ -392,8 +392,8 @@
<el-row>
<el-col :span="22">
<el-form-item style="text-align: center;">
- <el-button type="primary" @click="submitForm('ruleForm')">保存</el-button>
- <el-button @click="close()">关闭</el-button>
+ <el-button class="btn" type="primary" @click="submitForm('ruleForm')">保存</el-button>
+ <el-button class="btn" type="primary" @click="close()">关闭</el-button>
</el-form-item>
</el-col>
</el-row>
@@ -519,4 +519,13 @@
max-height: 100px;
overflow-y: auto
}
+ .btn {
+ background-color: #034ea2;
+ border: 1px solid #034ea2;
+ }
+ .el-button:hover {
+ background: #66b1ff;
+ border-color: #66b1ff;
+ color: #FFF;
+ }
</style>
--
Gitblit v1.9.2