Compare commits

7 Commits

Author SHA1 Message Date
989f9b9976 Merge pull request 'update remove首页二字' (#23) from lb into master
Reviewed-on: #23
2022-12-02 14:09:47 +08:00
lb
4f91525bea update remove首页二字 2022-12-02 14:01:52 +08:00
9b3d8b4926 Merge pull request 'lb' (#22) from lb into master
Reviewed-on: #22
2022-12-01 08:57:55 +08:00
lb
fedff36ff0 Merge branch 'master' into lb 2022-12-01 08:55:17 +08:00
62bb4c05e8 Merge pull request '1' (#21) from zjl into master
Reviewed-on: #21
2022-11-28 16:53:01 +08:00
lb
4026826869 update small blur box 2022-11-28 15:42:09 +08:00
792496f685 Merge pull request '修改' (#20) from zjl into master
Reviewed-on: #20
2022-11-28 15:40:36 +08:00
3 changed files with 19 additions and 16 deletions

View File

@@ -1,7 +1,7 @@
<template> <template>
<div class="navbar" :style="showTitle ? 'background: rgba(8,17,50,0.25)' : ''"> <div class="navbar" :style="showTitle ? 'background: rgba(8,17,50,0.25)' : ''">
<div v-if="showTitle" class="homeNavIcon" @click="goToRootPage"> <div v-if="showTitle" class="homeNavIcon" @click="goToRootPage">
<img src="../../assets/img/cnbm.png" alt="" /> <img src="../../assets/img/cnbm.png" alt="">
<span> <span>
{{ 'title' | i18nFilter }} {{ 'title' | i18nFilter }}
</span> </span>
@@ -25,9 +25,9 @@
:icon-class="showTitle ? 'home' : 'homeb'" :icon-class="showTitle ? 'home' : 'homeb'"
style="height: calc(24px * var(--beilv)); width: calc(24px * var(--beilv)); vertical-align: calc(-7px * var(--beilv)); margin-right: 2px;" style="height: calc(24px * var(--beilv)); width: calc(24px * var(--beilv)); vertical-align: calc(-7px * var(--beilv)); margin-right: 2px;"
/> />
<span v-if="showhome"> <!-- <span v-if="showhome">
{{ 'navbar.homepage' | i18nFilter }} {{ 'navbar.homepage' | i18nFilter }}
</span> </span> -->
</div> </div>
<el-dropdown <el-dropdown
:style="showTitle ? 'color: #fff' : '#000'" :style="showTitle ? 'color: #fff' : '#000'"
@@ -97,7 +97,7 @@
trigger="click" trigger="click"
> >
<div class="avatar-wrapper"> <div class="avatar-wrapper">
<img :src="require('@/assets/img/head.png')" class="user-avatar" /> <img :src="require('@/assets/img/head.png')" class="user-avatar">
<div class="avatar-username" :title="username">{{ username }}</div> <div class="avatar-username" :title="username">{{ username }}</div>
<div class="avatar-roles" :title="roles.join(',')">{{ roles.length > 0 ? roles[0] : '' }}</div> <div class="avatar-roles" :title="roles.join(',')">{{ roles.length > 0 ? roles[0] : '' }}</div>
<!-- <i class="el-icon-caret-bottom" /> --> <!-- <i class="el-icon-caret-bottom" /> -->
@@ -144,7 +144,7 @@
<el-tooltip class="item" effect="dark" placement="bottom-end"> <el-tooltip class="item" effect="dark" placement="bottom-end">
<div slot="content"> <div slot="content">
{{ 'copyright.copyright' | i18nFilter }}{{ 'copyright.company' | i18nFilter }} {{ 'copyright.copyright' | i18nFilter }}{{ 'copyright.company' | i18nFilter }}
<br /> <br>
{{ 'copyright.version' | i18nFilter }}3.0 {{ 'copyright.version' | i18nFilter }}3.0
</div> </div>
<svg-icon <svg-icon

View File

@@ -7,7 +7,7 @@
--> -->
<template> <template>
<div class="visual-base-table-container"> <div class="visual-base-table-container">
<el-table class="techy-el-table" v-loading="isLoading" :data="renderData" border height="100%"> <el-table v-loading="isLoading" class="techy-el-table" :data="renderData" border height="100%">
<el-table-column <el-table-column
v-if="page && limit && showIndex" v-if="page && limit && showIndex"
prop="_pageIndex" prop="_pageIndex"
@@ -29,7 +29,7 @@
:inject-data="{ ...scope.row, ...item }" :inject-data="{ ...scope.row, ...item }"
@emitData="emitData" @emitData="emitData"
/> />
<span v-else>{{ scope.row[item.prop] | commonFilter(item.filter) }}</span> <span v-else :title="scope.row[item.prop]">{{ scope.row[item.prop] | commonFilter(item.filter) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<slot name="content" /> <slot name="content" />

View File

@@ -318,20 +318,14 @@ export default {
.techy-body-part__middle { .techy-body-part__middle {
position: absolute; position: absolute;
/* background: #ff3311; */
top: 0; top: 0;
right: calc(-16px * var(--beilv)); right: calc(-16px * var(--beilv));
} transform: translateX(100%);
.techy-body-part__middle .techy-box {
position: absolute;
top: 0;
left: 0;
height: calc(128px * var(--beilv));
width: calc(188px * var(--beilv));
} }
.techy-body-part__middle__inner { .techy-body-part__middle__inner {
height: 100%; /* height: 100%; */
padding: calc(16px * var(--beilv)); padding: calc(16px * var(--beilv));
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@@ -346,8 +340,17 @@ export default {
line-height: 1.5; line-height: 1.5;
color: #fff; color: #fff;
display: flex; display: flex;
min-width: calc(168px * var(--beilv));
} }
.techy-body-part__middle__inner p:not(:last-child) {
margin-bottom: calc(8px * var(--beilv));
}
/* .techy-body-part__middle__inner p > b {
width: calc(90px * var(--beilv));
} */
.techy-body-part__middle__inner p > span { .techy-body-part__middle__inner p > span {
position: relative; position: relative;
padding-left: calc(16px * var(--beilv)); padding-left: calc(16px * var(--beilv));