diff --git a/.env b/.env index 0b7926b..7983075 100644 --- a/.env +++ b/.env @@ -1,5 +1,5 @@ # 标题 -VITE_APP_TITLE=智慧小区管理后台 +VITE_APP_TITLE=智慧小区平台 # 项目本地运行端口号 VITE_PORT=80 diff --git a/src/layout/components/Breadcrumb/src/Breadcrumb.vue b/src/layout/components/Breadcrumb/src/Breadcrumb.vue index 80770a8..a786587 100644 --- a/src/layout/components/Breadcrumb/src/Breadcrumb.vue +++ b/src/layout/components/Breadcrumb/src/Breadcrumb.vue @@ -100,7 +100,8 @@ $prefix-cls: #{$elNamespace}-breadcrumb; color: var(--top-header-text-color); &:hover { - color: var(--el-color-primary); + color: #fff; + opacity: 0.8; } } } @@ -110,7 +111,8 @@ $prefix-cls: #{$elNamespace}-breadcrumb; color: var(--top-header-text-color); &:hover { - color: var(--el-color-primary); + color: #fff; + opacity: 0.8; } } } @@ -119,10 +121,10 @@ $prefix-cls: #{$elNamespace}-breadcrumb; .#{$prefix-cls}__inner { display: flex; align-items: center; - color: var(--el-text-color-placeholder); + color: rgba(255, 255, 255, 0.65); &:hover { - color: var(--el-text-color-placeholder); + color: rgba(255, 255, 255, 0.65); } } } diff --git a/src/layout/components/Logo/src/Logo.vue b/src/layout/components/Logo/src/Logo.vue index 80ddfe4..ce99dd9 100644 --- a/src/layout/components/Logo/src/Logo.vue +++ b/src/layout/components/Logo/src/Logo.vue @@ -66,10 +66,12 @@ watch( ]" to="/" > - - - - +
+ + + + +
{hamburger.value && layout.value !== 'cutMenu' ? ( - + ) : undefined} {breadcrumb.value ? : undefined}
@@ -71,20 +71,20 @@ export default defineComponent({
{hasTenantVisitPermission.value ? : undefined} {screenfull.value ? ( - + ) : undefined} - {search.value ? : undefined} + {search.value ? : undefined} {size.value ? ( - + ) : undefined} {locale.value ? ( ) : undefined} {message.value ? ( - + ) : undefined}
@@ -99,5 +99,20 @@ $prefix-cls: #{$namespace}-tool-header; .#{$prefix-cls} { transition: left var(--transition-time-02); + + .custom-hover { + cursor: pointer; + transition: all 0.3s; + border-radius: 4px; + padding: 4px 8px; + + &:hover { + background-color: rgba(255, 255, 255, 0.2); + } + } + + :deep(.layout-border__right) { + border-right: none !important; + } } diff --git a/src/layout/components/useRenderLayout.tsx b/src/layout/components/useRenderLayout.tsx index a631aa0..7199231 100644 --- a/src/layout/components/useRenderLayout.tsx +++ b/src/layout/components/useRenderLayout.tsx @@ -41,14 +41,14 @@ export const useRenderLayout = () => { <>
{logo.value ? ( { > -
- +
+ + @@ -10,10 +11,10 @@
- {{ t('workplace.welcome') }} {{ username }} {{ t('workplace.happyDay') }} + 你好 {{ username }} 祝你开心每一天!
- {{ t('workplace.toady') }},20℃ - 32℃! + 今日晴,20℃ - 32℃!
@@ -21,7 +22,7 @@
-
{{ t('workplace.project') }}
+
项目数
-
{{ t('workplace.toDo') }}
+
待办
-
{{ t('workplace.access') }}
+
项目访问
-
- - - - - - - - -
- - {{ item.name }} -
-
{{ t(item.message) }}
-
- {{ item.personal }} - {{ formatTime(item.time, 'yyyy-MM-dd') }} -
-
-
-
-
-
- - - - - - - - - - - - - - - - - - - - - -
- - - - - - -
- - - {{ item.name }} - -
-
-
-
-
- - - -
-
- - - -
-
- - {{ item.type }} : {{ item.title }} - -
-
- {{ formatTime(item.date, 'yyyy-MM-dd') }} -
-
+ + + + + + + + + + +
+ + {{ item.name }} +
+
{{ item.description }}
+
+ {{ item.location }} + {{ formatTime(item.time, 'yyyy-MM-dd') }} +
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + +
+ + + {{ item.name }} + +
+
+
+
+
+ + + + + +
+
+ + + +
+
+ {{ item.type }}: + {{ item.title }} +
+
+ {{ formatTime(item.date, 'yyyy-MM-dd') }} +
+
+
+ +
+
+
+
+
+
+ + + diff --git a/src/views/Login/Login.vue b/src/views/Login/Login.vue index a279d39..2ec81f0 100644 --- a/src/views/Login/Login.vue +++ b/src/views/Login/Login.vue @@ -1,107 +1,462 @@ + diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue index 0aceacf..3d05240 100644 --- a/src/views/system/dept/index.vue +++ b/src/views/system/dept/index.vue @@ -33,32 +33,33 @@ - 搜索 - 重置 - - 新增 + + 查询 - - 展开/折叠 - - - 批量删除 + + 重置 + + +
+ + 新建 + + + 展开/折叠 + +
+
+ - - - + + + + - - + + @@ -89,7 +105,7 @@ width="180" :formatter="dateFormatter" /> - +