From 4845af1c934493638f62e2869a5a2cbf0b31007b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E9=92=A6?= <360013221@qq.com>
Date: Thu, 9 May 2024 17:25:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=B9=E9=87=8F=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../images/shareWith/message-active.svg              | 12 +++++++-----
 .../images/shareWith/message-active2.svg             |  9 +++++++++
 .../pages/Home/components/HomeFrameControl/index.vue |  7 +++++--
 3 files changed, 21 insertions(+), 7 deletions(-)
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/images/shareWith/message-active2.svg

diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/shareWith/message-active.svg b/ruoyi-ui/src/views/JiHeExpressway/images/shareWith/message-active.svg
index e07f38e9..53329e6a 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/images/shareWith/message-active.svg
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/shareWith/message-active.svg
@@ -1,9 +1,11 @@
-<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g id="&#231;&#159;&#173;&#228;&#191;&#161;">
-<rect id="Rectangle 3688" width="22" height="22" rx="6" fill="#A2C847"/>
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Group 1142814973">
+<g id="&#195;&#167;&#194;&#159;&#194;&#173;&#195;&#164;&#194;&#191;&#194;&#161;-&#195;&#167;&#194;&#129;&#194;&#176;">
+<path id="Rectangle 3688" d="M11.6364 0H4.36364C1.95367 0 0 1.95367 0 4.36364V11.6364C0 14.0463 1.95367 16 4.36364 16H11.6364C14.0463 16 16 14.0463 16 11.6364V4.36364C16 1.95367 14.0463 0 11.6364 0Z" fill="#03C3FF"/>
 <g id="Group 1142814681">
-<path id="Vector 553" d="M6.5 16.5325V13.5H12.1408L7.28922 16.9404C6.95812 17.1751 6.5 16.9384 6.5 16.5325Z" fill="white"/>
-<path id="Subtract" fill-rule="evenodd" clip-rule="evenodd" d="M5.5 5C4.67157 5 4 5.67157 4 6.5V13.5C4 14.3284 4.67157 15 5.5 15H16.5C17.3284 15 18 14.3284 18 13.5V6.5C18 5.67157 17.3284 5 16.5 5H5.5ZM7.5 11C8.05228 11 8.5 10.5523 8.5 10C8.5 9.44772 8.05228 9 7.5 9C6.94772 9 6.5 9.44772 6.5 10C6.5 10.5523 6.94772 11 7.5 11ZM12 10C12 10.5523 11.5523 11 11 11C10.4477 11 10 10.5523 10 10C10 9.44772 10.4477 9 11 9C11.5523 9 12 9.44772 12 10ZM14.5 11C15.0523 11 15.5 10.5523 15.5 10C15.5 9.44772 15.0523 9 14.5 9C13.9477 9 13.5 9.44772 13.5 10C13.5 10.5523 13.9477 11 14.5 11Z" fill="white"/>
+<path id="Vector 553" d="M4.72705 12.0228V9.81738H8.82945L5.30103 12.3195C5.06023 12.4902 4.72705 12.318 4.72705 12.0228Z" fill="white"/>
+<path id="Subtract" fill-rule="evenodd" clip-rule="evenodd" d="M4.00009 3.63574C3.39759 3.63574 2.90918 4.12416 2.90918 4.72665V9.81756C2.90918 10.42 3.39759 10.9085 4.00009 10.9085H12.0001C12.6026 10.9085 13.091 10.42 13.091 9.81756V4.72665C13.091 4.12416 12.6026 3.63574 12.0001 3.63574H4.00009ZM5.45463 7.99938C5.85629 7.99938 6.18191 7.67378 6.18191 7.27211C6.18191 6.87045 5.85629 6.54483 5.45463 6.54483C5.05298 6.54483 4.72736 6.87045 4.72736 7.27211C4.72736 7.67378 5.05298 7.99938 5.45463 7.99938ZM8.72736 7.27211C8.72736 7.67378 8.40176 7.99938 8.00009 7.99938C7.59842 7.99938 7.27282 7.67378 7.27282 7.27211C7.27282 6.87045 7.59842 6.54483 8.00009 6.54483C8.40176 6.54483 8.72736 6.87045 8.72736 7.27211ZM10.5455 7.99938C10.9472 7.99938 11.2728 7.67378 11.2728 7.27211C11.2728 6.87045 10.9472 6.54483 10.5455 6.54483C10.1439 6.54483 9.81827 6.87045 9.81827 7.27211C9.81827 7.67378 10.1439 7.99938 10.5455 7.99938Z" fill="white"/>
+</g>
 </g>
 </g>
 </svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/shareWith/message-active2.svg b/ruoyi-ui/src/views/JiHeExpressway/images/shareWith/message-active2.svg
new file mode 100644
index 00000000..e07f38e9
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/shareWith/message-active2.svg
@@ -0,0 +1,9 @@
+<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="&#231;&#159;&#173;&#228;&#191;&#161;">
+<rect id="Rectangle 3688" width="22" height="22" rx="6" fill="#A2C847"/>
+<g id="Group 1142814681">
+<path id="Vector 553" d="M6.5 16.5325V13.5H12.1408L7.28922 16.9404C6.95812 17.1751 6.5 16.9384 6.5 16.5325Z" fill="white"/>
+<path id="Subtract" fill-rule="evenodd" clip-rule="evenodd" d="M5.5 5C4.67157 5 4 5.67157 4 6.5V13.5C4 14.3284 4.67157 15 5.5 15H16.5C17.3284 15 18 14.3284 18 13.5V6.5C18 5.67157 17.3284 5 16.5 5H5.5ZM7.5 11C8.05228 11 8.5 10.5523 8.5 10C8.5 9.44772 8.05228 9 7.5 9C6.94772 9 6.5 9.44772 6.5 10C6.5 10.5523 6.94772 11 7.5 11ZM12 10C12 10.5523 11.5523 11 11 11C10.4477 11 10 10.5523 10 10C10 9.44772 10.4477 9 11 9C11.5523 9 12 9.44772 12 10ZM14.5 11C15.0523 11 15.5 10.5523 15.5 10C15.5 9.44772 15.0523 9 14.5 9C13.9477 9 13.5 9.44772 13.5 10C13.5 10.5523 13.9477 11 14.5 11Z" fill="white"/>
+</g>
+</g>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrameControl/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrameControl/index.vue
index 7b231d2a..fea8dc43 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrameControl/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrameControl/index.vue
@@ -408,8 +408,7 @@ export default {
   },
   methods: {
     onHide(){
-      this.data['deviceType']=deviceTypeDefault;
-      changeHandle(this.data, this.formList);
+      // TODO
     },
     submitClick() {
       this.$refs.ControlComponent?.handleSubmit();
@@ -430,6 +429,10 @@ export default {
     },
     handleClick(type) {
       this.activeIcon = this.activeIcon === type ? null : type;
+      if(this.activeIcon){
+        this.data['deviceType']=deviceTypeDefault;
+        changeHandle(this.data, this.formList);
+      }
     },
     filterEnd(data) {
       this.activeIcon = null;