!35 手动同步分支21.09

From: @gitee-cmd
Reviewed-by: @Lostwayzxc
Signed-off-by: @Lostwayzxc

0004-fix-logos-instructions-and-size.patch

@@ -0,0 +1,56 @@
+From b0674ab2e6390ebdf778a32a69716f1e4195fabd Mon Sep 17 00:00:00 2001
+From: gitee-cmd <chemingdao@huawei.com>
+Date: Wed, 29 Sep 2021 21:14:03 +0800
+Subject: [PATCH 1/2] fix logos' instructions and size
+
+---
+ aops-web/src/appCore/components/GlobalFooter/index.vue | 2 +-
+ aops-web/src/appCore/layouts/BasicLayout.vue           | 6 +++++-
+ aops-web/src/appCore/layouts/UserLayout.vue            | 1 -
+ 3 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/aops-web/src/appCore/components/GlobalFooter/index.vue b/aops-web/src/appCore/components/GlobalFooter/index.vue
+index 839ddc8..d0433cc 100644
+--- a/aops-web/src/appCore/components/GlobalFooter/index.vue
++++ b/aops-web/src/appCore/components/GlobalFooter/index.vue
+@@ -11,7 +11,7 @@
+       </div>
+     </template>
+     <template v-slot:copyright>
+-      logo
++      <img src="~@/assets/horizontal-left.png" style="height: 20px" class="logo" alt="logo">
+     </template>
+   </global-footer>
+ </template>
+
+diff --git a/aops-web/src/appCore/layouts/BasicLayout.vue b/aops-web/src/appCore/layouts/BasicLayout.vue
+index e4fd9f8..b7b7a15 100644
+--- a/aops-web/src/appCore/layouts/BasicLayout.vue
++++ b/aops-web/src/appCore/layouts/BasicLayout.vue
+@@ -139,6 +139,10 @@ export default {
+ }
+ </script>
+ 
+-<style lang="less">
++<style lang="less" scoped>
+ @import "./BasicLayout.less";
++.logo {
++  height: auto;
++  width: 32px;
++}
+ </style>
+
+diff --git a/aops-web/src/appCore/layouts/UserLayout.vue b/aops-web/src/appCore/layouts/UserLayout.vue
+index 36826de..15eb79d 100644
+--- a/aops-web/src/appCore/layouts/UserLayout.vue
++++ b/aops-web/src/appCore/layouts/UserLayout.vue
+@@ -126,7 +126,6 @@ export default {
+           .logo {
+             height: 80px;
+             vertical-align: top;
+-            margin-right: 16px;
+             border-style: none;
+           }
+ 
+-- 
+2.30.0

A-Ops.spec

@@ -1,6 +1,6 @@
 Name:		A-Ops
 Version:	v1.1.1
-Release:	3
+Release:	4
 Summary:	The intelligent ops toolkit for openEuler
 License:	MulanPSL2
 URL:		https://gitee.com/openeuler/A-Ops
@@ -9,6 +9,8 @@ Source1:	A-Ops-web-node-modules.tar.gz
 patch0001:	0001-fix-diag-return.patch
 patch0002:      0002-fix-log-of-task-execution.patch
 patch0003:	0003-add-permission-control-in-ragdoll.patch
+patch0004:      0004-fix-logos-instructions-and-size.patch
+patch0005:      0005-switch-logo-images.patch
 
 # build for gopher
 BuildRequires:	cmake gcc-c++ yum elfutils-devel clang >= 10.0.1 llvm libconfig-devel
@@ -172,6 +174,8 @@ website for A-Ops, deployed by Nginx
 %patch0001 -p1
 %patch0002 -p1
 %patch0003 -p1
+%patch0004 -p1
+git apply $RPM_SOURCE_DIR/0005-switch-logo-images.patch --binary
 cp -r A-Ops-web-node-modules/node_modules aops-web/
 
 %build
@@ -493,6 +497,9 @@ fi
 
 
 %changelog
+* Wed Sep 29 2021 chemingdao<chemingdao@huawei.com> - v1.1.1-4
+- switch logo images and modify logo size.
+
 * Wed Sep 29 2021 orange-snn<songnannan2@huawei.com> - v1.1.1-3
 - add permission control in ragdoll.