Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_web

src/layout/components/Menu/src/Menu.vue

@@ -208,16 +208,16 @@ $prefix-cls: #{$namespace}-menu;
         .#{$elNamespace}-menu-item {
           display: flex;
           align-items: flex-start;
-          min-height: var(--el-menu-item-height);
+         /* min-height: var(--el-menu-item-height);*/
           height: auto;
           padding-top: 10px;
           padding-bottom: 10px;
           white-space: normal;
         }
 
-        .#{$elNamespace}-sub-menu__icon-arrow {
+/*        .#{$elNamespace}-sub-menu__icon-arrow {
           margin-top: 8px;
-        }
+        }*/
 
         .#{$prefix-cls}__title {
           display: block;

src/styles/var.css

@@ -1,7 +1,7 @@
 :root {
   --login-bg-color: #293146;
 
-  --left-menu-max-width: 200px;
+  --left-menu-max-width: 220px;
 
   --left-menu-min-width: 64px;
 

src/views/iot/device/index.vue

@@ -153,7 +153,7 @@
           <el-button
             link
             type="primary"
-            @click="openForm('setting', scope.row.id)"
+            @click.stop="openForm('setting', scope.row.id)"
             v-hasPermi="['iot:device:update']"
           >
             {{ t('DataCollection.Device.settingDialogTitle') }}
@@ -161,7 +161,7 @@
           <el-button
             link
             type="primary"
-            @click="handleCopy(scope.row.id)"
+            @click.stop="handleCopy(scope.row.id)"
             v-hasPermi="['iot:device:create']"
           >
             {{ t('action.copy') }}
@@ -177,7 +177,7 @@
           <el-button
             link
             type="danger"
-            @click="handleDelete(scope.row.id)"
+            @click.stop="handleDelete(scope.row.id)"
             v-hasPermi="['iot:device:delete']"
           >
             {{ t('action.delete') }}