From d1c6fa3e2e7ef9a5009e798909ed80aecf2eb1db Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期二, 29 十一月 2022 11:40:30 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui
---
src/views/systemSetting/device/grid/components/header/index.vue | 2 +-
src/views/systemSetting/device/loudspeaker/index.vue | 2 +-
src/views/systemSetting/platform/otherInterface/index.vue | 2 +-
src/views/operate/message/myIndex/index.vue | 2 +-
src/views/systemSetting/platform/cockpitManage/index.vue | 2 +-
src/views/systemSetting/device/handheldTerminal/index.vue | 2 +-
src/views/operate/message/mycontrol/index.vue | 2 +-
src/views/operate/fivepack/threepack/components/content.vue | 1 +
src/views/operate/disposal/casepool/pool/index.vue | 2 +-
src/views/operate/sms/smsIndex/index.vue | 2 +-
src/views/systemSetting/baseSetting/user/components/header/index.vue | 2 +-
src/views/systemSetting/device/bayonet/index.vue | 2 +-
src/views/operate/car/myIndex/index.vue | 2 +-
src/views/operate/sms/smsTemplate/index.vue | 2 +-
src/views/operate/message/myIndex/update/index.vue | 2 +-
src/App.vue | 5 +++++
src/views/operate/sms/smsTemplate/createTemplate/index.vue | 3 ++-
src/views/operate/video/index.vue | 2 +-
18 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index d11fc9d..2d8e3a8 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -78,6 +78,11 @@
color: #4b9bb7;
}
+.button-addition {
+ background-color: #eb5d01 !important;
+ border: 1px solid #eb5d01 !important;
+}
+
/*瀹氫箟婊氬姩鏉￠珮瀹藉強鑳屾櫙
楂樺鍒嗗埆瀵瑰簲妯珫婊氬姩鏉＄殑灏哄*/
::-webkit-scrollbar {
diff --git a/src/views/operate/car/myIndex/index.vue b/src/views/operate/car/myIndex/index.vue
index 769a0da..df8191b 100644
--- a/src/views/operate/car/myIndex/index.vue
+++ b/src/views/operate/car/myIndex/index.vue
@@ -13,7 +13,7 @@
</div>
</div>
<div class="addCar">
- <el-button type="primary" class="addBtn" @click="handleAddCar">娣诲姞杞﹁締</el-button>
+ <el-button type="primary" class="addBtn button-addition" @click="handleAddCar">娣诲姞杞﹁締</el-button>
</div>
</div>
</header>
diff --git a/src/views/operate/disposal/casepool/pool/index.vue b/src/views/operate/disposal/casepool/pool/index.vue
index 1441b3f..eeffed6 100644
--- a/src/views/operate/disposal/casepool/pool/index.vue
+++ b/src/views/operate/disposal/casepool/pool/index.vue
@@ -16,7 +16,7 @@
</div>
</div>
<div class="addUser">
- <el-button class="addBtn" type="primary" @click="dialogCreate = true">娣诲姞</el-button>
+ <el-button class="addBtn button-addition" type="primary" @click="dialogCreate = true">娣诲姞</el-button>
<!-- 閫夋嫨鐧昏绫诲瀷 -->
<el-dialog :before-close="handleClose" :visible.sync="dialogCreate" title="璇烽�夋嫨涓婃姤浜嬩欢绫诲瀷" width="45%"
v-if="dialogCreate">
diff --git a/src/views/operate/fivepack/threepack/components/content.vue b/src/views/operate/fivepack/threepack/components/content.vue
index d95fd4c..a3ea27b 100644
--- a/src/views/operate/fivepack/threepack/components/content.vue
+++ b/src/views/operate/fivepack/threepack/components/content.vue
@@ -37,6 +37,7 @@
v-if="isStorePage()"
type="primary"
icon="el-icon-plus"
+ class="button-addition"
@click="handleView(null, 'create')"
>娣诲姞</el-button
>
diff --git a/src/views/operate/message/myIndex/index.vue b/src/views/operate/message/myIndex/index.vue
index d3364fa..1a75ef1 100644
--- a/src/views/operate/message/myIndex/index.vue
+++ b/src/views/operate/message/myIndex/index.vue
@@ -37,7 +37,7 @@
<div class="mainContent">
<div class="main-nav">
<span>鏁版嵁鍒楄〃</span>
- <el-button type="primary" icon="el-icon-plus" @click="handleOpera(null, 'create')">娣诲姞</el-button>
+ <el-button class="button-addition" type="primary" icon="el-icon-plus" @click="handleOpera(null, 'create')">娣诲姞</el-button>
</div>
<!-- 鏁版嵁灞曠ず -->
<el-table ref="multipleTable"
diff --git a/src/views/operate/message/myIndex/update/index.vue b/src/views/operate/message/myIndex/update/index.vue
index a43d5de..9ebf470 100644
--- a/src/views/operate/message/myIndex/update/index.vue
+++ b/src/views/operate/message/myIndex/update/index.vue
@@ -40,7 +40,7 @@
</el-option>
</el-select>
</div>
- <span class="message-add" @click="dialogCreate = true">
+ <span class="message-add button-addition" @click="dialogCreate = true">
娣诲姞鏍忕洰</span
>
</div>
diff --git a/src/views/operate/message/mycontrol/index.vue b/src/views/operate/message/mycontrol/index.vue
index 7df41b8..0254b74 100644
--- a/src/views/operate/message/mycontrol/index.vue
+++ b/src/views/operate/message/mycontrol/index.vue
@@ -4,7 +4,7 @@
<div class="mainContent">
<div class="main-nav">
<span>鏁版嵁鍒楄〃</span>
- <el-button type="primary" icon="el-icon-plus" @click="dialogCreate = true">娣诲姞</el-button>
+ <el-button class="button-addition" type="primary" icon="el-icon-plus" @click="dialogCreate = true">娣诲姞</el-button>
</div>
<!-- 鏁版嵁灞曠ず -->
<el-table ref="multipleTable"
diff --git a/src/views/operate/sms/smsIndex/index.vue b/src/views/operate/sms/smsIndex/index.vue
index daadbfa..c8299ee 100644
--- a/src/views/operate/sms/smsIndex/index.vue
+++ b/src/views/operate/sms/smsIndex/index.vue
@@ -26,7 +26,7 @@
<div class="mainContent">
<div class="main-nav">
<span>鏁版嵁鍒楄〃</span>
- <el-button type="primary" icon="el-icon-plus" @click="isShowDialog = true">娣诲姞</el-button>
+ <el-button class="button-addition" type="primary" icon="el-icon-plus" @click="isShowDialog = true">娣诲姞</el-button>
</div>
<!-- 鏁版嵁灞曠ず -->
<el-table ref="multipleTable"
diff --git a/src/views/operate/sms/smsTemplate/createTemplate/index.vue b/src/views/operate/sms/smsTemplate/createTemplate/index.vue
index 038c75f..928fb5f 100644
--- a/src/views/operate/sms/smsTemplate/createTemplate/index.vue
+++ b/src/views/operate/sms/smsTemplate/createTemplate/index.vue
@@ -48,9 +48,10 @@
data() {
const validateMessageContent = (rule, value, callback) => {
if (!value) {
- callback(new Error('璇疯緭鍏ョ煭淇″唴瀹�'))
+ callback(new Error('璇疯緭鍏ョ煭淇″唴瀹�'));
} else {
this.$refs.user.clearValidate('body');
+ callback();
}
}
return {
diff --git a/src/views/operate/sms/smsTemplate/index.vue b/src/views/operate/sms/smsTemplate/index.vue
index 7ad5a7d..f89d736 100644
--- a/src/views/operate/sms/smsTemplate/index.vue
+++ b/src/views/operate/sms/smsTemplate/index.vue
@@ -26,7 +26,7 @@
<div class="mainContent">
<div class="main-nav">
<span>鏁版嵁鍒楄〃</span>
- <el-button type="primary" icon="el-icon-plus" @click="isShowDialog = true; dialogType = 'create'">娣诲姞</el-button>
+ <el-button class="button-addition" type="primary" icon="el-icon-plus" @click="isShowDialog = true; dialogType = 'create'">娣诲姞</el-button>
</div>
<!-- 鏁版嵁灞曠ず -->
<el-table ref="multipleTable"
diff --git a/src/views/operate/video/index.vue b/src/views/operate/video/index.vue
index 49f765d..30d0cf2 100644
--- a/src/views/operate/video/index.vue
+++ b/src/views/operate/video/index.vue
@@ -25,7 +25,7 @@
<el-button type="primary" @click="searchVideoList">鏌ヨ</el-button>
</div>
<div class="findBtn">
- <el-button type="primary" @click="handleOpera(null, 'create')">娣诲姞瑙嗛</el-button>
+ <el-button class="button-addition" type="primary" @click="handleOpera(null, 'create')">娣诲姞瑙嗛</el-button>
</div>
</div>
</div>
diff --git a/src/views/systemSetting/baseSetting/user/components/header/index.vue b/src/views/systemSetting/baseSetting/user/components/header/index.vue
index d5e5dea..a07ce89 100644
--- a/src/views/systemSetting/baseSetting/user/components/header/index.vue
+++ b/src/views/systemSetting/baseSetting/user/components/header/index.vue
@@ -10,7 +10,7 @@
</div>
<div class="addUser">
<!-- :before-close="handleClose" -->
- <el-button class="addBtn" type="primary" @click="dialogCreate = true">娣诲姞鐢ㄦ埛</el-button>
+ <el-button class="addBtn button-addition" type="primary" @click="dialogCreate = true">娣诲姞鐢ㄦ埛</el-button>
<el-dialog :visible.sync="dialogCreate" title="鏂板璐︽埛" width="60%" v-if="dialogCreate"
:before-close="handleClose">
<createUser @sendDialog="sendDialog" />
diff --git a/src/views/systemSetting/device/bayonet/index.vue b/src/views/systemSetting/device/bayonet/index.vue
index f41782d..05b495f 100644
--- a/src/views/systemSetting/device/bayonet/index.vue
+++ b/src/views/systemSetting/device/bayonet/index.vue
@@ -24,7 +24,7 @@
<div class="main-content">
<div class="main-title">
<el-button
- class="el-icon-plus"
+ class="el-icon-plus button-addition"
type="primary"
@click="showDialog(false, null)"
>娣诲姞</el-button
diff --git a/src/views/systemSetting/device/grid/components/header/index.vue b/src/views/systemSetting/device/grid/components/header/index.vue
index c2ef3b6..f92bea3 100644
--- a/src/views/systemSetting/device/grid/components/header/index.vue
+++ b/src/views/systemSetting/device/grid/components/header/index.vue
@@ -10,7 +10,7 @@
</div>
<div class="addUser">
<!-- :before-close="handleClose" -->
- <el-button class="addBtn" type="primary" @click="dialogCreate = true">娣诲姞鐢ㄦ埛</el-button>
+ <el-button class="addBtn button-addition" type="primary" @click="dialogCreate = true">娣诲姞鐢ㄦ埛</el-button>
<el-dialog :visible.sync="dialogCreate" title="鏂板缃戞牸鍛�" width="60%" v-if="dialogCreate"
:before-close="handleClose">
<createUser @sendDialog="sendDialog" />
diff --git a/src/views/systemSetting/device/handheldTerminal/index.vue b/src/views/systemSetting/device/handheldTerminal/index.vue
index 6e2fd98..58a4d30 100644
--- a/src/views/systemSetting/device/handheldTerminal/index.vue
+++ b/src/views/systemSetting/device/handheldTerminal/index.vue
@@ -23,7 +23,7 @@
<main>
<div class="main-content">
<div class="main-title">
- <el-button class="el-icon-plus" type="primary" @click="handleAdd"
+ <el-button class="el-icon-plus button-addition" type="primary" @click="handleAdd"
>娣诲姞</el-button
>
</div>
diff --git a/src/views/systemSetting/device/loudspeaker/index.vue b/src/views/systemSetting/device/loudspeaker/index.vue
index 19de7d7..a5217db 100644
--- a/src/views/systemSetting/device/loudspeaker/index.vue
+++ b/src/views/systemSetting/device/loudspeaker/index.vue
@@ -23,7 +23,7 @@
<main>
<div class="main-content">
<div class="main-title">
- <el-button class="el-icon-plus" type="primary" @click="handleAdd"
+ <el-button class="el-icon-plus button-addition" type="primary" @click="handleAdd"
>娣诲姞</el-button
>
</div>
diff --git a/src/views/systemSetting/platform/cockpitManage/index.vue b/src/views/systemSetting/platform/cockpitManage/index.vue
index ce70c66..3a7c19d 100644
--- a/src/views/systemSetting/platform/cockpitManage/index.vue
+++ b/src/views/systemSetting/platform/cockpitManage/index.vue
@@ -36,7 +36,7 @@
<el-button type="primary">瀵煎叆</el-button>
</el-upload>
<el-button style="margin-left: 10px" type="primary" @click="exportTable">瀵煎嚭</el-button>
- <el-button type="primary" @click="showAddDialog">娣诲姞</el-button>
+ <el-button class="button-addition" type="primary" @click="showAddDialog">娣诲姞</el-button>
</div>
<!-- 鏁版嵁灞曠ず -->
<el-table ref="multipleTable"
diff --git a/src/views/systemSetting/platform/otherInterface/index.vue b/src/views/systemSetting/platform/otherInterface/index.vue
index b46db9e..376e806 100644
--- a/src/views/systemSetting/platform/otherInterface/index.vue
+++ b/src/views/systemSetting/platform/otherInterface/index.vue
@@ -3,7 +3,7 @@
<header>
<div class="headerTitle">绯荤粺璁剧疆 >> 闂ㄦ埛绠＄悊 > 绗笁鏂瑰簲鐢ㄦ帴鍙ｇ鐞�</div>
<div class="addInterface">
- <el-button class="add" @click="handleAdd">娣诲姞绗笁鏂规帴鍙�</el-button>
+ <el-button class="add button-addition" @click="handleAdd">娣诲姞绗笁鏂规帴鍙�</el-button>
</div>
</header>
<main>
--
Gitblit v1.8.0