Commit 5f401cd9 authored by jiaxu.yan's avatar jiaxu.yan

feat(整体样式修改): 字体验色 菜单样式 表格样式

parent 3cc82046
# 页面标题
VUE_APP_TITLE = 中汽研安全检测平台管理系统
VUE_APP_TITLE = 安全信息检测平台
# 开发环境配置
ENV = 'development'
......
# 页面标题
VUE_APP_TITLE = 中汽研安全检测平台管理系统
VUE_APP_TITLE = 安全信息检测平台
# 生产环境配置
ENV = 'production'
......
......@@ -175,7 +175,7 @@
}
#loader-wrapper .load_title {
font-family: 'Open Sans';
font-family: Microsoft YaHei;
color: #FFF;
font-size: 19px;
width: 100%;
......
......@@ -90,3 +90,20 @@
.el-submenu__icon-arrow {
display: none;
}
.el-table th.el-table__cell{
height: 40px !important;
padding: 0 !important;
}
.el-table th.el-table__cell{
.cell{
font-weight: 700;
font-size: 14px;
}
}
.el-tabs__item {
margin: 0;
padding: 0 24px;
}
.el-tabs--top .el-tabs__item.is-top:nth-child(2){
padding-left:24px;
}
......@@ -4,18 +4,30 @@
**/
/* theme color */
$--color-primary: #1890ff;
$--color-success: #13ce66;
$--color-warning: #ffba00;
$--color-danger: #ff4949;
$--color-primary: #1A6FD7;
$--color-success: #13BE24;
$--color-warning: #F9A221;
$--color-danger: #DB4747;
$--button-font-weight: 400;
//table hover
$--background-color-base:#F3F8FF;
//提示性文字
$--color-text-regular: #666666;
//提示框背景
$--tooltip-fill: #efefef;
//按钮hover
$--color-primary-light-9:#e3eefc;
$--color-primary-light-7:#1764c1;
//
$--border-color-light: #dfe4ed;
$--border-color-lighter: #e6ebf5;
$--table-border: 1px solid #dfe6ec;
//,默认文字颜色
$--color-text-primary: #303133;
//,二级文字颜色
$--color-text-secondary: #606266;
//,table 线的颜色
$--table-border: 1px solid #D9D9D9;
/* icon font path, required */
$--font-path: '~element-ui/lib/theme-chalk/fonts';
......
......@@ -13,8 +13,7 @@ body {
-moz-osx-font-smoothing: grayscale;
-webkit-font-smoothing: antialiased;
text-rendering: optimizeLegibility;
font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB,
Microsoft YaHei, Arial, sans-serif;
font-family: Microsoft YaHei;
}
label {
......@@ -108,8 +107,7 @@ aside {
display: block;
line-height: 32px;
font-size: 16px;
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen,
Ubuntu, Cantarell, 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif;
font-family: Microsoft YaHei;
color: #2c3e50;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
......
......@@ -78,7 +78,7 @@ h3,
h4,
h5,
h6 {
font-family: inherit;
font-family: Microsoft YaHei;
font-weight: 500;
line-height: 1.1;
color: inherit;
......
......@@ -87,8 +87,8 @@
& .theme-dark .is-active > .el-submenu__title {
color: $base-menu-color-active !important;
font-weight: 600;
}
& .nest-menu .el-submenu > .el-submenu__title,
& .el-submenu .el-menu-item {
min-width: $base-sidebar-width !important;
......@@ -224,3 +224,6 @@
}
}
}
.el-menu-item.is-active{
font-weight: bold;
}
......@@ -9,8 +9,8 @@ $yellow: #fec171;
$panGreen: #30b08f;
// 默认菜单主题风格
$base-menu-color: #bfcbd9;
$base-menu-color-active: #f4f4f5;
$base-menu-color: #BFCBD9;
$base-menu-color-active: #fff;
$base-menu-background: #304156;
$base-logo-title-color: #ffffff;
......
......@@ -77,7 +77,7 @@ export default {
margin-left: 8px;
.no-redirect {
color: #97a8be;
color: #969696;
cursor: text;
}
}
......
......@@ -418,7 +418,7 @@ export default {
.popup-result table span {
display: block;
width: 100%;
font-family: arial;
font-family: Microsoft YaHei;
line-height: 30px;
height: 30px;
white-space: nowrap;
......
<template>
<div>
<img src="" alt="">
</div>
</template>
\ No newline at end of file
......@@ -33,8 +33,7 @@ export default {
</script>
<style lang="scss" scoped>
.page-box {
// padding: 1.5rem 2rem;
font-size: 16px;
padding: 22px 24px;
}
.box-card {
min-height: 80vh;
......
......@@ -3,7 +3,7 @@
<div class="page-box">
<el-row :gutter="20">
<el-col :span="3">
<el-card class="box-card" shadow="never">
<div class="standard-box">
<el-input
v-model="queryParams.value"
placeholder="输入标准关键词"
......@@ -20,10 +20,10 @@
{{ item.label }}
</li>
</ul>
</el-card>
</div>
</el-col>
<el-col :span="21">
<el-card class="box-card" shadow="never">
<div class="table-box">
<template v-if="$slots.tab && $slots.tab.length">
<!-- <div slot="header" class="clearfix"> -->
<div class="tabList mb10">
......@@ -32,7 +32,7 @@
</div>
</template>
<slot> </slot>
</el-card>
</div>
</el-col>
</el-row>
</div>
......@@ -101,19 +101,30 @@ export default {
}
</script>
<style lang="scss" scoped>
@import "~@/assets/styles/element-variables.scss";
@import '~@/assets/styles/element-variables.scss';
.page-box {
padding: 1.5rem 2rem;
font-size: 16px;
padding: 22px 24px;
}
.standard-box {
border: 1px solid #ebebeb;
display: flex;
flex-flow: column;
justify-content: flex-start;
padding: 15px 11px;
flex-wrap: wrap;
align-items: flex-start;
min-height: 80vh;
}
.box-card {
.table-box{
min-height: 80vh;
// background-color: #000;
}
.header {
font-size: 16px;
font-weight: 500;
}
.page-title {
padding: 15px;
// background-color: #f9f9f9;
......@@ -124,9 +135,11 @@ export default {
.select-list {
list-style-type: none;
margin-top: 5px;
padding: 0;
li {
margin: 1rem 0;
margin: 10px 0;
cursor: pointer;
font-size: 14px;
color: rgb(102, 102, 102);
......@@ -135,6 +148,7 @@ export default {
text-overflow: ellipsis; //溢出用省略号显示
white-space: nowrap; // 默认不换行;
}
.selected {
color: $--color-primary;
font-weight: bold;
......
......@@ -96,7 +96,7 @@ export default {
margin: 0 60px;
padding: 22px 0 0 0;
height: 85px;
font-family: 'Open Sans', Arial, sans-serif;
font-family: Microsoft YaHei;
text-shadow: 0 0 1px #fff, 0 1px 2px rgba(0, 0, 0, 0.3);
}
......@@ -124,7 +124,7 @@ export default {
letter-spacing: 1px;
padding-top: 24px;
margin: 7px auto 0;
font-family: 'Open Sans', Arial, sans-serif;
font-family: Microsoft YaHei;
opacity: 0;
transition: transform 0.3s ease-in-out 0.2s, opacity 0.3s ease-in-out 0.2s,
background 0.2s linear 0s;
......
......@@ -49,7 +49,8 @@ import { mapGetters } from 'vuex'
import Breadcrumb from '@/components/Breadcrumb'
import TopNav from '@/components/TopNav'
import Hamburger from '@/components/Hamburger'
import QuickNew from '@/components/QuickNew'
import avatar from '@/assets/images/touxiang.png'
// import QuickNew from '@/components/QuickNew'
// import MessageWaring from '@/components/MessageWaring'
export default {
......@@ -60,8 +61,13 @@ export default {
// QuickNew
// MessageWaring
},
data() {
return {
avatar
}
},
computed: {
...mapGetters(['sidebar', 'avatar', 'device']),
...mapGetters(['sidebar', 'device']),
setting: {
get() {
return this.$store.state.settings.showSettings
......
......@@ -3,10 +3,7 @@
class="sidebar-logo-container"
:class="{ collapse: collapse }"
:style="{
backgroundColor:
sideTheme === 'theme-dark'
? variables.menuBackground
: variables.menuLightBackground
backgroundColor:variables.menuBackground
}"
>
<transition name="sidebarLogoFade">
......@@ -16,29 +13,23 @@
class="sidebar-logo-link"
to="/"
>
<img v-if="logo" :src="logo" class="sidebar-logo" />
<!-- <img v-if="logo" :src="logo" class="sidebar-logo" />
<h1
v-else
class="sidebar-title"
:style="{
color:
sideTheme === 'theme-dark'
? variables.logoTitleColor
: variables.logoLightTitleColor
color:variables.logoTitleColor
}"
>
{{ title }}
</h1>
</h1> -->
</router-link>
<router-link v-else key="expand" class="sidebar-logo-link" to="/">
<img v-if="logo" :src="logo" class="sidebar-logo" />
<!-- <img v-if="logo" :src="logo" class="sidebar-logo" /> -->
<h1
class="sidebar-title"
:style="{
color:
sideTheme === 'theme-dark'
? variables.logoTitleColor
: variables.logoLightTitleColor
color:variables.logoTitleColor
}"
>
{{ title }}
......@@ -90,8 +81,8 @@ export default {
.sidebar-logo-container {
position: relative;
width: 100%;
height: 50px;
line-height: 50px;
line-height: 80px;
height: 80px;
background: #2b2f3a;
text-align: center;
overflow: hidden;
......@@ -112,9 +103,10 @@ export default {
margin: 0;
color: #fff;
font-weight: 600;
line-height: 50px;
font-size: 14px;
font-family: Avenir, Helvetica Neue, Arial, Helvetica, sans-serif;
line-height: 80px;
font-size: 18px;
font-weight: bold;
font-family: Microsoft YaHei;
vertical-align: middle;
}
}
......
......@@ -13,18 +13,10 @@
<el-menu
:default-active="activeMenu"
:collapse="isCollapse"
:background-color="
settings.sideTheme === 'theme-dark'
? variables.menuBackground
: variables.menuLightBackground
"
:text-color="
settings.sideTheme === 'theme-dark'
? variables.menuColor
: variables.menuLightColor
"
:background-color="variables.menuBackground"
:text-color="variables.menuColor"
:unique-opened="true"
:active-text-color="settings.theme"
:active-text-color="variables.menuColorActive"
:collapse-transition="false"
mode="vertical"
>
......
......@@ -102,8 +102,8 @@ export default {
activeStyle(tag) {
if (!this.isActive(tag)) return {}
return {
'background-color': this.theme,
'border-color': this.theme
// 'background-color': this.theme,
// 'border-color': this.theme
}
},
isAffix(tag) {
......@@ -295,18 +295,22 @@ export default {
margin-right: 15px;
}
&.active {
background-color: #42b983;
color: #fff;
border-color: #42b983;
// background-color: #42b983;
color: #1A6FD7;
position: relative;
padding-left: 20px;
&::before {
content: '';
background: #fff;
background: #1A6FD7;
display: inline-block;
width: 8px;
height: 8px;
width: 4px;
height: 4px;
border-radius: 50%;
position: relative;
margin-right: 2px;
position: absolute;
left: 8px;
top: 40%;
}
}
}
......
......@@ -236,7 +236,7 @@ export default {
width: 100%;
height: 40px;
font-size: 12px;
font-family: Arial;
font-family: Microsoft YaHei;
text-align: center;
color: #ffffff;
line-height: 40px;
......
......@@ -147,7 +147,7 @@
class="confirm-button"
type="primary"
plain
@click="confirmDetailChange(taskModel.id)"
@click="confirmDetailChange()"
>已处理</el-button
>
</div>
......@@ -218,7 +218,8 @@ import {
checkTaskDetail,
reviewDetailsSubmit,
carReviewTaskConfirm,
reviewDetailsConfirm
reviewDetailsConfirm,
reviewTaskConfirm
} from '@/api/task/task'
import sceneView from './components/sceneView.vue'
import companyFile from './components/companyFile.vue'
......@@ -539,7 +540,15 @@ export default {
})
},
confirmDetailChange() {
reviewDetailsConfirm({ detailsId: 0, reviewTaskId: 0 })
reviewDetailsConfirm({
detailsId: this.taskModel.id,
reviewTaskId: this.taskId
}).then(res => {
this.getTask()
this.$modal.msgSuccess('处理完成')
this.taskModel.warn = false
this.taskModel.warnTasks = []
})
}
}
}
......
......@@ -46,13 +46,13 @@
</el-form>
<el-table
v-loading="tableLoading"
style="width: 100%; min-height: 50vh"
style="width: 100%; min-height: 88px"
border
:scroll-x="'1500px'"
:default-sort="{ prop: 'createTime', order: 'descending' }"
:data="tableData"
>
<el-table-column type="index" width="60" label="序号" align="center">
<el-table-column type="index" width="55" label="序号" align="center">
<template slot-scope="scope">
<span>{{ scope.$index + 1 }}</span>
</template>
......
......@@ -141,7 +141,11 @@
<span class="del-scene"> (删除) </span>
</template>
</div>
<el-button class="confirm-button" type="primary" plain
<el-button
class="confirm-button"
type="primary"
plain
@click="confirmDetailChange()"
>已处理</el-button
>
</div>
......@@ -209,7 +213,8 @@
import {
reviewTaskDetail,
reviewDetailsSubmit,
reviewTaskConfirm
reviewTaskConfirm,
reviewDetailsConfirm
} from '@/api/task/task'
import sceneView from './components/sceneView.vue'
import companyFile from './components/companyFile.vue'
......@@ -329,10 +334,6 @@ export default {
},
async mounted() {
this.taskId = this.$route.query.id
// this.$store.dispatch('processing/getCompanyFiles', {
// company: '',
// taskId: ''
// })
await this.getTask()
this.handleCircle(0)
},
......@@ -529,6 +530,17 @@ export default {
path: 'processing/unprocessed-review'
})
})
},
confirmDetailChange() {
reviewDetailsConfirm({
detailsId: this.taskModel.id,
reviewTaskId: this.taskId
}).then(res => {
this.getTask()
this.$modal.msgSuccess('处理完成')
this.taskModel.warn = false
this.taskModel.warnTasks = []
})
}
}
}
......
......@@ -46,13 +46,13 @@
</el-form>
<el-table
v-loading="tableLoading"
style="width: 100%; min-height: 50vh"
style="width: 100%; min-height: 88px"
border
:scroll-x="'1500px'"
:default-sort="{ prop: 'createTime', order: 'descending' }"
:data="tableData"
>
<el-table-column type="index" width="60" label="序号" align="center">
<el-table-column type="index" width="55" label="序号" align="center">
<template slot-scope="scope">
<span>{{ scope.$index + 1 }}</span>
</template>
......
......@@ -245,7 +245,7 @@ export default {
width: 100%;
height: 40px;
font-size: 12px;
font-family: Arial;
font-family: Microsoft YaHei;
text-align: center;
color: #ffffff;
line-height: 40px;
......
......@@ -63,7 +63,7 @@
</el-form>
<el-table
v-loading="loading"
style="width: 100%; min-height: 50vh"
style="width: 100%; min-height: 88px"
border
:default-sort="{ prop: 'createTime', order: 'descending' }"
:data="tableData"
......
......@@ -108,7 +108,7 @@
<el-table
v-if="refreshTable"
v-loading="loading"
style="width: 100%; min-height: 50vh"
style="width: 100%; min-height: 88px"
border
:default-sort="{ prop: 'createTime', order: 'descending' }"
:data="tableData"
......
......@@ -68,13 +68,13 @@
</el-form>
<el-table
v-loading="loading"
style="width: 100%; min-height: 50vh"
style="width: 100%; min-height: 88px"
border
:scroll-x="'1500px'"
:default-sort="{ prop: 'createTime', order: 'descending' }"
:data="tableData"
>
<el-table-column type="index" width="60" label="序号" align="center">
<el-table-column type="index" width="55" label="序号" align="center">
<template slot-scope="scope">
<span>{{ scope.$index + 1 }}</span>
</template>
......
......@@ -81,13 +81,13 @@
<el-table
v-if="refreshTable"
v-loading="loading"
style="width: 100%; min-height: 50vh"
style="width: 100%; min-height: 88px"
border
:scroll-x="'1500px'"
:default-sort="{ prop: 'createTime', order: 'descending' }"
:data="tableData"
>
<el-table-column type="index" width="60" label="序号" align="center">
<el-table-column type="index" width="55" label="序号" align="center">
</el-table-column>
<el-table-column
label="企业名称"
......
......@@ -52,12 +52,12 @@
<el-table
v-if="refreshTable"
v-loading="loading"
style="width: 100%; min-height: 50vh"
style="width: 100%; min-height: 88px"
border
:default-sort="{ prop: 'createTime', order: 'descending' }"
:data="tableData"
>
<el-table-column type="index" width="60" label="序号" align="center">
<el-table-column type="index" width="55" label="序号" align="center">
<template slot-scope="scope">
<span>{{ scope.$index + 1 }}</span>
</template>
......
......@@ -49,7 +49,7 @@
</el-form>
<el-table
v-loading="loading"
style="width: 100%; min-height: 50vh"
style="width: 100%; min-height: 88px"
border
tooltip-effect="dark"
@selection-change="handleSelectionChange"
......
......@@ -49,7 +49,7 @@
</el-form>
<el-table
v-loading="loading"
style="width: 100%; min-height: 50vh"
style="width: 100%; min-height: 88px"
border
tooltip-effect="dark"
@selection-change="handleSelectionChange"
......
......@@ -117,7 +117,7 @@
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb10" v-if="queryParams.type > 1">
<el-row v-if="queryParams.type > 1" :gutter="10" class="mb10">
<right-toolbar
:show-search.sync="showSearch"
@queryTable="loadData"
......@@ -194,7 +194,7 @@
<el-table
v-if="refreshTable && Number(queryParams.type) === 3"
v-loading="loading"
style="width: 100%; min-height: 50vh"
style="width: 100%; min-height: 88px"
border
:scroll-x="'1500px'"
:default-sort="{ prop: 'createTime', order: 'descending' }"
......
......@@ -63,13 +63,13 @@
<el-table
v-if="refreshTable"
v-loading="loading"
style="width: 100%; min-height: 50vh"
style="width: 100%; min-height: 88px"
border
:default-sort="{ prop: 'createTime', order: 'descending' }"
:scroll-x="'1500px'"
:data="tableData"
>
<el-table-column type="index" width="60" label="序号" align="center">
<el-table-column type="index" width="55" label="序号" align="center">
<template slot-scope="scope">
<span>{{ scope.$index + 1 }}</span>
</template>
......
......@@ -49,7 +49,7 @@
</el-form>
<el-table
v-loading="loading"
style="width: 100%; min-height: 50vh"
style="width: 100%; min-height: 88px"
border
tooltip-effect="dark"
@selection-change="handleSelectionChange"
......
......@@ -2,14 +2,14 @@
<page-standard>
<el-table
v-loading="loading"
style="width: 100%; min-height: 50vh"
style="width: 100%; min-height: 88px"
border
:span-method="objectSpanMethod"
:scroll-x="'1500px'"
:default-sort="{ prop: 'createTime', order: 'descending' }"
:data="tableData"
>
<el-table-column type="index" width="60" label="序号" align="center">
<el-table-column type="index" width="55" label="序号" align="center">
<template slot-scope="scope">
<span>{{ scope.$index + 1 }}</span>
</template>
......
......@@ -9,13 +9,13 @@
>
<el-table
v-loading="loading"
style="width: 100%; min-height: 50vh"
style="width: 100%; min-height: 88px"
border
:scroll-x="'1500px'"
:default-sort="{ prop: 'createTime', order: 'descending' }"
:data="tableData"
>
<el-table-column type="index" width="60" label="序号" align="center">
<el-table-column type="index" width="55" label="序号" align="center">
<template slot-scope="scope">
<span>{{ scope.$index + 1 }}</span>
</template>
......
......@@ -90,13 +90,13 @@
<el-table
v-if="refreshTable && Number(queryParams.type) !== 3"
v-loading="loading"
style="width: 100%; min-height: 50vh"
style="width: 100%; min-height: 88px"
border
:scroll-x="'1500px'"
:default-sort="{ prop: 'createTime', order: 'descending' }"
:data="tableData"
>
<el-table-column type="index" width="60" label="序号" align="center">
<el-table-column type="index" width="55" label="序号" align="center">
<template slot-scope="scope">
<span>{{ scope.$index + 1 }}</span>
</template>
......@@ -147,13 +147,13 @@
<el-table
v-if="refreshTable && Number(queryParams.type) === 3"
v-loading="loading"
style="width: 100%; min-height: 50vh"
style="width: 100%; min-height: 88px"
border
:scroll-x="'1500px'"
:default-sort="{ prop: 'createTime', order: 'descending' }"
:data="tableData"
>
<el-table-column type="index" width="60" label="序号" align="center">
<el-table-column type="index" width="55" label="序号" align="center">
<template slot-scope="scope">
<span>{{ scope.$index + 1 }}</span>
</template>
......
......@@ -22,11 +22,11 @@
</div>
<el-table
v-loading="loading"
style="width: 100%; min-height: 50vh"
style="width: 100%; min-height: 88px"
border
:data="tableData"
>
<el-table-column type="index" width="60" label="序号" align="center">
<el-table-column type="index" width="55" label="序号" align="center">
<template slot-scope="scope">
<span>{{ scope.$index + 1 }}</span>
</template>
......
......@@ -124,7 +124,7 @@ export default {
}
} else {
cell.style.backgroundColor = 'pink'
for (var i = 0; i < selrange.length; i++) {
for (i = 0; i < selrange.length; i++) {
selrange[i].style.backgroundColor = '#fec171'
}
}
......
......@@ -52,13 +52,13 @@
<el-table
v-if="refreshTable"
v-loading="loading"
style="width: 100%; min-height: 50vh"
style="width: 100%; min-height: 88px"
border
:default-sort="{ prop: 'createTime', order: 'descending' }"
:scroll-x="'1500px'"
:data="tableData"
>
<el-table-column type="index" width="60" label="序号" align="center">
<el-table-column type="index" width="55" label="序号" align="center">
<template slot-scope="scope">
<span>{{ scope.$index + 1 }}</span>
</template>
......
......@@ -75,7 +75,7 @@
</el-row>
<el-table v-loading="loading" :data="postList">
<el-table-column type="index" width="60" label="序号" align="center">
<el-table-column type="index" width="55" label="序号" align="center">
<template slot-scope="scope">
<span>{{ scope.$index + 1 }}</span>
</template>
......
......@@ -25,7 +25,7 @@
@row-click="clickRow"
@selection-change="handleSelectionChange"
>
<el-table-column type="index" width="60" label="序号" align="center">
<el-table-column type="index" width="55" label="序号" align="center">
<template slot-scope="scope">
<span>{{ (pageNum - 1) * pageSize + scope.$index + 1 }}</span>
</template>
......
......@@ -49,7 +49,7 @@
<el-table
v-if="refreshTable"
v-loading="loading"
style="width: 100%; min-height: 50vh"
style="width: 100%; min-height: 88px"
border
:data="tableData"
>
......
......@@ -49,7 +49,7 @@
<el-table
v-if="refreshTable"
v-loading="loading"
style="width: 100%; min-height: 50vh"
style="width: 100%; min-height: 88px"
border
:data="tableData"
>
......
......@@ -102,7 +102,7 @@
<el-table
v-loading="loading"
style="width: 100%; min-height: 50vh"
style="width: 100%; min-height: 88px"
border
:default-sort="{ prop: 'createTime', order: 'descending' }"
:data="tableData"
......
......@@ -49,7 +49,7 @@
<el-table
v-if="refreshTable"
v-loading="loading"
style="width: 100%; min-height: 50vh"
style="width: 100%; min-height: 88px"
border
:data="tableData"
>
......
......@@ -49,7 +49,7 @@
<el-table
v-if="refreshTable"
v-loading="loading"
style="width: 100%; min-height: 50vh"
style="width: 100%; min-height: 88px"
border
:data="tableData"
>
......
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