Commit 2c5b995c authored by “yiyousong”'s avatar “yiyousong”

fix:修复样式冲突

parent 0dd8ea2e
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
> >
<!-- 动态组件渲染各自报表搜索 --> <!-- 动态组件渲染各自报表搜索 -->
<component <component
v-if="censusList.length" v-if="censusList.length && curSearchForm"
:is="curSearchForm + '-search'" :is="curSearchForm + '-search'"
></component> ></component>
<div v-else class="flex-1 flex items-center justify-center"> <div v-else class="flex-1 flex items-center justify-center">
...@@ -113,7 +113,11 @@ export default { ...@@ -113,7 +113,11 @@ export default {
let { path } = this.$route; let { path } = this.$route;
let index = path.lastIndexOf("/"); let index = path.lastIndexOf("/");
let str = path.slice(index + 1); let str = path.slice(index + 1);
if (str == "dataManagement") {
return false;
} else {
return str; return str;
}
}, },
}, },
created() { created() {
......
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
<p class="text-[14px]">返回门户</p> <p class="text-[14px]">返回门户</p>
</div> </div>
<div v-if="isHomePage" class="show-time flex flex-col items-end"> <div v-if="isHomePage" class="show-time flex flex-col items-end">
<div class="time mb-1">{{ nowTime }}</div> <div class="time mb-[4px]">{{ nowTime }}</div>
<div class="date">{{ nowDay }} {{ nowWeek }}</div> <div class="date">{{ nowDay }} {{ nowWeek }}</div>
</div> </div>
<div class="line"></div> <div class="line"></div>
...@@ -53,14 +53,14 @@ ...@@ -53,14 +53,14 @@
<a-dropdown> <a-dropdown>
<div class="flex items-center"> <div class="flex items-center">
<div class="userInfo flex flex-col items-center cursor-pointer"> <div class="userInfo flex flex-col items-center cursor-pointer">
<span class="mb-1"> <span class="mb-[4px]">
{{ userData.loginName ? userData.loginName : "--" }} {{ userData.loginName ? userData.loginName : "--" }}
</span> </span>
<span> <span>
{{ userData.realName ? userData.realName : "--" }} {{ userData.realName ? userData.realName : "--" }}
</span> </span>
</div> </div>
<a-icon class="ml-1" type="down" /> <a-icon class="ml-[4px]" type="down" />
</div> </div>
<a-menu slot="overlay"> <a-menu slot="overlay">
<a-menu-item> <a-menu-item>
......
...@@ -51,11 +51,7 @@ ...@@ -51,11 +51,7 @@
</div> </div>
</a-form-model-item> </a-form-model-item>
<a-form-model-item> <a-form-model-item>
<a-button <a-button :loading="loading" class="login-btn" @click="handleSubmit"
:loading="loading"
type="primary"
class="login-btn"
@click="handleSubmit"
>登录</a-button >登录</a-button
> >
</a-form-model-item> </a-form-model-item>
......
...@@ -26,7 +26,7 @@ html{ ...@@ -26,7 +26,7 @@ html{
position: sticky; position: sticky;
top: 0; top: 0;
/* height: 100vh; */ /* height: 100vh; */
min-height: 932rem; min-height: 930rem;
background-color: #031233; background-color: #031233;
perspective: 800px; perspective: 800px;
overflow: hidden; overflow: hidden;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment