Compare commits

..

No commits in common. '45f4f464a267b4571e8fba3e8c63ee0e94a9a3f5' and '77e5439b9e221063ad86cf9b90a7b87e2418065f' have entirely different histories.

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

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

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

Loading…
Cancel
Save