Skip to content

W
web
Commit 17cea665 authored by jiaxu.yan's avatar jiaxu.yan
Browse files
Options

Merge branch 'developer/yanjiaxu' into develop 

# Conflicts:
#	src/views/setting/testMatrix/index.vue
parents f69ffa7e 5f401cd9
Hide whitespace changes
Inline Side-by-side
Showing with 398 additions and 335 deletions
.env.development
View file @ 17cea665
# 页面标题 # 页面标题
VUE_APP_TITLE = 中汽研安全检测平台管理系统 VUE_APP_TITLE = 安全信息检测平台
# 开发环境配置 # 开发环境配置
ENV = 'development' ENV = 'development'
......
.env.production
View file @ 17cea665
# 页面标题 # 页面标题
VUE_APP_TITLE = 中汽研安全检测平台管理系统 VUE_APP_TITLE = 安全信息检测平台
# 生产环境配置 # 生产环境配置
ENV = 'production' ENV = 'production'
......
public/index.html
View file @ 17cea665
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="renderer" content="webkit"> <meta name="renderer" content="webkit">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<link rel="icon" href="<%= BASE_URL %>favicon.ico"> <link rel="icon" href="<%= BASE_URL %>favicon.ico">
<!-- <link href="https://unpkg.com/tailwindcss@^2/dist/tailwind.min.css" rel="stylesheet"> --> <!-- <link href="https://unpkg.com/tailwindcss@^2/dist/tailwind.min.css" rel="stylesheet"> -->
<title><%= webpackConfig.name %></title> <title><%= webpackConfig.name %></title>
<!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]--> <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
<style> <style>
html, html,
body, body,
#app { #app {
height: 100%; height: 100%;
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;
} }
.chromeframe { .chromeframe {
margin: 0.2em 0; margin: 0.2em 0;
background: #ccc; background: #ccc;
color: #000; color: #000;
padding: 0.2em 0; padding: 0.2em 0;
} }
#loader-wrapper { #loader-wrapper {
position: fixed; position: fixed;
top: 0; top: 0;
left: 0; left: 0;
width: 100%; width: 100%;
height: 100%; height: 100%;
z-index: 999999; z-index: 999999;
} }
#loader { #loader {
display: block; display: block;
position: relative; position: relative;
left: 50%; left: 50%;
top: 50%; top: 50%;
width: 150px; width: 150px;
height: 150px; height: 150px;
margin: -75px 0 0 -75px; margin: -75px 0 0 -75px;
border-radius: 50%; border-radius: 50%;
border: 3px solid transparent; border: 3px solid transparent;
border-top-color: #FFF; border-top-color: #FFF;
-webkit-animation: spin 2s linear infinite; -webkit-animation: spin 2s linear infinite;
-ms-animation: spin 2s linear infinite; -ms-animation: spin 2s linear infinite;
-moz-animation: spin 2s linear infinite; -moz-animation: spin 2s linear infinite;
-o-animation: spin 2s linear infinite; -o-animation: spin 2s linear infinite;
animation: spin 2s linear infinite; animation: spin 2s linear infinite;
z-index: 1001; z-index: 1001;
} }
#loader:before { #loader:before {
content: ""; content: "";
position: absolute; position: absolute;
top: 5px; top: 5px;
left: 5px; left: 5px;
right: 5px; right: 5px;
bottom: 5px; bottom: 5px;
border-radius: 50%; border-radius: 50%;
border: 3px solid transparent; border: 3px solid transparent;
border-top-color: #FFF; border-top-color: #FFF;
-webkit-animation: spin 3s linear infinite; -webkit-animation: spin 3s linear infinite;
-moz-animation: spin 3s linear infinite; -moz-animation: spin 3s linear infinite;
-o-animation: spin 3s linear infinite; -o-animation: spin 3s linear infinite;
-ms-animation: spin 3s linear infinite; -ms-animation: spin 3s linear infinite;
animation: spin 3s linear infinite; animation: spin 3s linear infinite;
} }
#loader:after { #loader:after {
content: ""; content: "";
position: absolute; position: absolute;
top: 15px; top: 15px;
left: 15px; left: 15px;
right: 15px; right: 15px;
bottom: 15px; bottom: 15px;
border-radius: 50%; border-radius: 50%;
border: 3px solid transparent; border: 3px solid transparent;
border-top-color: #FFF; border-top-color: #FFF;
-moz-animation: spin 1.5s linear infinite; -moz-animation: spin 1.5s linear infinite;
-o-animation: spin 1.5s linear infinite; -o-animation: spin 1.5s linear infinite;
-ms-animation: spin 1.5s linear infinite; -ms-animation: spin 1.5s linear infinite;
-webkit-animation: spin 1.5s linear infinite; -webkit-animation: spin 1.5s linear infinite;
animation: spin 1.5s linear infinite; animation: spin 1.5s linear infinite;
} }
@-webkit-keyframes spin { @-webkit-keyframes spin {
0% { 0% {
-webkit-transform: rotate(0deg); -webkit-transform: rotate(0deg);
-ms-transform: rotate(0deg); -ms-transform: rotate(0deg);
transform: rotate(0deg); transform: rotate(0deg);
} }
100% { 100% {
-webkit-transform: rotate(360deg); -webkit-transform: rotate(360deg);
-ms-transform: rotate(360deg); -ms-transform: rotate(360deg);
transform: rotate(360deg); transform: rotate(360deg);
} }
} }
@keyframes spin { @keyframes spin {
0% { 0% {
-webkit-transform: rotate(0deg); -webkit-transform: rotate(0deg);
-ms-transform: rotate(0deg); -ms-transform: rotate(0deg);
transform: rotate(0deg); transform: rotate(0deg);
} }
100% { 100% {
-webkit-transform: rotate(360deg); -webkit-transform: rotate(360deg);
-ms-transform: rotate(360deg); -ms-transform: rotate(360deg);
transform: rotate(360deg); transform: rotate(360deg);
} }
} }
#loader-wrapper .loader-section { #loader-wrapper .loader-section {
position: fixed; position: fixed;
top: 0; top: 0;
width: 51%; width: 51%;
height: 100%; height: 100%;
background: #7171C6; background: #7171C6;
z-index: 1000; z-index: 1000;
-webkit-transform: translateX(0); -webkit-transform: translateX(0);
-ms-transform: translateX(0); -ms-transform: translateX(0);
transform: translateX(0); transform: translateX(0);
} }
#loader-wrapper .loader-section.section-left { #loader-wrapper .loader-section.section-left {
left: 0; left: 0;
} }
#loader-wrapper .loader-section.section-right { #loader-wrapper .loader-section.section-right {
right: 0; right: 0;
} }
.loaded #loader-wrapper .loader-section.section-left { .loaded #loader-wrapper .loader-section.section-left {
-webkit-transform: translateX(-100%); -webkit-transform: translateX(-100%);
-ms-transform: translateX(-100%); -ms-transform: translateX(-100%);
transform: translateX(-100%); transform: translateX(-100%);
-webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000); -webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000); transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
} }
.loaded #loader-wrapper .loader-section.section-right { .loaded #loader-wrapper .loader-section.section-right {
-webkit-transform: translateX(100%); -webkit-transform: translateX(100%);
-ms-transform: translateX(100%); -ms-transform: translateX(100%);
transform: translateX(100%); transform: translateX(100%);
-webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000); -webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000); transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
} }
.loaded #loader { .loaded #loader {
opacity: 0; opacity: 0;
-webkit-transition: all 0.3s ease-out; -webkit-transition: all 0.3s ease-out;
transition: all 0.3s ease-out; transition: all 0.3s ease-out;
} }
.loaded #loader-wrapper { .loaded #loader-wrapper {
visibility: hidden; visibility: hidden;
-webkit-transform: translateY(-100%); -webkit-transform: translateY(-100%);
-ms-transform: translateY(-100%); -ms-transform: translateY(-100%);
transform: translateY(-100%); transform: translateY(-100%);
-webkit-transition: all 0.3s 1s ease-out; -webkit-transition: all 0.3s 1s ease-out;
transition: all 0.3s 1s ease-out; transition: all 0.3s 1s ease-out;
} }
.no-js #loader-wrapper { .no-js #loader-wrapper {
display: none; display: none;
} }
.no-js h1 { .no-js h1 {
color: #222222; color: #222222;
} }
#loader-wrapper .load_title { #loader-wrapper .load_title {
font-family: 'Open Sans'; font-family: Microsoft YaHei;
color: #FFF; color: #FFF;
font-size: 19px; font-size: 19px;
width: 100%; width: 100%;
text-align: center; text-align: center;
z-index: 9999999999999; z-index: 9999999999999;
position: absolute; position: absolute;
top: 60%; top: 60%;
opacity: 1; opacity: 1;
line-height: 30px; line-height: 30px;
} }
#loader-wrapper .load_title span { #loader-wrapper .load_title span {
font-weight: normal; font-weight: normal;
font-style: italic; font-style: italic;
font-size: 13px; font-size: 13px;
color: #FFF; color: #FFF;
opacity: 0.5; opacity: 0.5;
} }
</style> </style>
</head> </head>
<body> <body>
<div id="app"> <div id="app">
<div id="loader-wrapper"> <div id="loader-wrapper">
<div id="loader"></div> <div id="loader"></div>
<div class="loader-section section-left"></div> <div class="loader-section section-left"></div>
<div class="loader-section section-right"></div> <div class="loader-section section-right"></div>
<div class="load_title">正在加载系统资源，请耐心等待</div> <div class="load_title">正在加载系统资源，请耐心等待</div>
</div> </div>
</div> </div>
</body> </body>
</html> </html>
src/assets/styles/element-ui.scss
View file @ 17cea665
...@@ -90,3 +90,20 @@ ...@@ -90,3 +90,20 @@
.el-submenu__icon-arrow { .el-submenu__icon-arrow {
display: none; 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;
}
src/assets/styles/element-variables.scss
View file @ 17cea665
...@@ -4,18 +4,30 @@ ...@@ -4,18 +4,30 @@
**/ **/
/* theme color */ /* theme color */
$--color-primary: #1890ff; $--color-primary: #1A6FD7;
$--color-success: #13ce66; $--color-success: #13BE24;
$--color-warning: #ffba00; $--color-warning: #F9A221;
$--color-danger: #ff4949; $--color-danger: #DB4747;
$--button-font-weight: 400; $--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-light: #dfe4ed;
$--border-color-lighter: #e6ebf5; $--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 */ /* icon font path, required */
$--font-path: '~element-ui/lib/theme-chalk/fonts'; $--font-path: '~element-ui/lib/theme-chalk/fonts';
......
src/assets/styles/index.scss
View file @ 17cea665
...@@ -13,8 +13,7 @@ body { ...@@ -13,8 +13,7 @@ body {
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
text-rendering: optimizeLegibility; text-rendering: optimizeLegibility;
font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, font-family: Microsoft YaHei;
Microsoft YaHei, Arial, sans-serif;
} }
label { label {
...@@ -108,8 +107,7 @@ aside { ...@@ -108,8 +107,7 @@ aside {
display: block; display: block;
line-height: 32px; line-height: 32px;
font-size: 16px; font-size: 16px;
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, font-family: Microsoft YaHei;
Ubuntu, Cantarell, 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif;
color: #2c3e50; color: #2c3e50;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
......
src/assets/styles/ruoyi.scss
View file @ 17cea665
...@@ -78,7 +78,7 @@ h3, ...@@ -78,7 +78,7 @@ h3,
h4, h4,
h5, h5,
h6 { h6 {
font-family: inherit; font-family: Microsoft YaHei;
font-weight: 500; font-weight: 500;
line-height: 1.1; line-height: 1.1;
color: inherit; color: inherit;
......
src/assets/styles/sidebar.scss
View file @ 17cea665
...@@ -87,8 +87,8 @@ ...@@ -87,8 +87,8 @@
& .theme-dark .is-active > .el-submenu__title { & .theme-dark .is-active > .el-submenu__title {
color: $base-menu-color-active !important; color: $base-menu-color-active !important;
font-weight: 600;
} }
& .nest-menu .el-submenu > .el-submenu__title, & .nest-menu .el-submenu > .el-submenu__title,
& .el-submenu .el-menu-item { & .el-submenu .el-menu-item {
min-width: $base-sidebar-width !important; min-width: $base-sidebar-width !important;
...@@ -224,3 +224,6 @@ ...@@ -224,3 +224,6 @@
} }
} }
} }
.el-menu-item.is-active{
font-weight: bold;
}
src/assets/styles/variables.scss
View file @ 17cea665
...@@ -9,8 +9,8 @@ $yellow: #fec171; ...@@ -9,8 +9,8 @@ $yellow: #fec171;
$panGreen: #30b08f; $panGreen: #30b08f;
// 默认菜单主题风格 // 默认菜单主题风格
$base-menu-color: #bfcbd9; $base-menu-color: #BFCBD9;
$base-menu-color-active: #f4f4f5; $base-menu-color-active: #fff;
$base-menu-background: #304156; $base-menu-background: #304156;
$base-logo-title-color: #ffffff; $base-logo-title-color: #ffffff;
......
src/components/Breadcrumb/index.vue
View file @ 17cea665
...@@ -77,7 +77,7 @@ export default { ...@@ -77,7 +77,7 @@ export default {
margin-left: 8px; margin-left: 8px;
.no-redirect { .no-redirect {
color: #97a8be; color: #969696;
cursor: text; cursor: text;
} }
} }
......
src/components/Crontab/index.vue
View file @ 17cea665
...@@ -418,7 +418,7 @@ export default { ...@@ -418,7 +418,7 @@ export default {
.popup-result table span { .popup-result table span {
display: block; display: block;
width: 100%; width: 100%;
font-family: arial; font-family: Microsoft YaHei;
line-height: 30px; line-height: 30px;
height: 30px; height: 30px;
white-space: nowrap; white-space: nowrap;
......
src/components/Empty/index.vue 0 → 100644
View file @ 17cea665
<template>
<div>
<img src="" alt="">
</div>
</template>
\ No newline at end of file
src/components/Page/standard.vue
View file @ 17cea665
...@@ -33,8 +33,7 @@ export default { ...@@ -33,8 +33,7 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.page-box { .page-box {
// padding: 1.5rem 2rem; padding: 22px 24px;
font-size: 16px;
} }
.box-card { .box-card {
min-height: 80vh; min-height: 80vh;
......
src/components/Page/standardOption.vue
View file @ 17cea665
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<div class="page-box"> <div class="page-box">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="3"> <el-col :span="3">
<el-card class="box-card" shadow="never"> <div class="standard-box">
<el-input <el-input
v-model="queryParams.value" v-model="queryParams.value"
placeholder="输入标准关键词" placeholder="输入标准关键词"
...@@ -20,19 +20,19 @@ ...@@ -20,19 +20,19 @@
{{ item.label }} {{ item.label }}
</li> </li>
</ul> </ul>
</el-card> </div>
</el-col> </el-col>
<el-col :span="21"> <el-col :span="21">
<el-card class="box-card" shadow="never"> <div class="table-box">
<template v-if="$slots.tab && $slots.tab.length"> <template v-if="$slots.tab && $slots.tab.length">
<!-- <div slot="header" class="clearfix"> --> <!-- <div slot="header" class="clearfix"> -->
<div class="tabList mb10"> <div class="tabList mb10">
<slot name="tab"> </slot> <slot name="tab"> </slot>
<!-- </div> --> <!-- </div> -->
</div> </div>
</template> </template>
<slot> </slot> <slot> </slot>
</el-card> </div>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
...@@ -101,19 +101,30 @@ export default { ...@@ -101,19 +101,30 @@ export default {
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import "~@/assets/styles/element-variables.scss"; @import '~@/assets/styles/element-variables.scss';
.page-box { .page-box {
padding: 1.5rem 2rem; padding: 22px 24px;
font-size: 16px; }
.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; min-height: 80vh;
// background-color: #000;
} }
.header { .header {
font-size: 16px; font-size: 16px;
font-weight: 500; font-weight: 500;
} }
.page-title { .page-title {
padding: 15px; padding: 15px;
// background-color: #f9f9f9; // background-color: #f9f9f9;
...@@ -124,9 +135,11 @@ export default { ...@@ -124,9 +135,11 @@ export default {
.select-list { .select-list {
list-style-type: none; list-style-type: none;
margin-top: 5px;
padding: 0; padding: 0;
li { li {
margin: 1rem 0; margin: 10px 0;
cursor: pointer; cursor: pointer;
font-size: 14px; font-size: 14px;
color: rgb(102, 102, 102); color: rgb(102, 102, 102);
...@@ -135,6 +148,7 @@ export default { ...@@ -135,6 +148,7 @@ export default {
text-overflow: ellipsis; //溢出用省略号显示 text-overflow: ellipsis; //溢出用省略号显示
white-space: nowrap; // 默认不换行； white-space: nowrap; // 默认不换行；
} }
.selected { .selected {
color: $--color-primary; color: $--color-primary;
font-weight: bold; font-weight: bold;
......
src/components/PanThumb/index.vue
View file @ 17cea665
...@@ -96,7 +96,7 @@ export default { ...@@ -96,7 +96,7 @@ export default {
margin: 0 60px; margin: 0 60px;
padding: 22px 0 0 0; padding: 22px 0 0 0;
height: 85px; 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); text-shadow: 0 0 1px #fff, 0 1px 2px rgba(0, 0, 0, 0.3);
} }
...@@ -124,7 +124,7 @@ export default { ...@@ -124,7 +124,7 @@ export default {
letter-spacing: 1px; letter-spacing: 1px;
padding-top: 24px; padding-top: 24px;
margin: 7px auto 0; margin: 7px auto 0;
font-family: 'Open Sans', Arial, sans-serif; font-family: Microsoft YaHei;
opacity: 0; opacity: 0;
transition: transform 0.3s ease-in-out 0.2s, opacity 0.3s ease-in-out 0.2s, transition: transform 0.3s ease-in-out 0.2s, opacity 0.3s ease-in-out 0.2s,
background 0.2s linear 0s; background 0.2s linear 0s;
......
src/layout/components/Navbar.vue
View file @ 17cea665
...@@ -49,7 +49,8 @@ import { mapGetters } from 'vuex' ...@@ -49,7 +49,8 @@ import { mapGetters } from 'vuex'
import Breadcrumb from '@/components/Breadcrumb' import Breadcrumb from '@/components/Breadcrumb'
import TopNav from '@/components/TopNav' import TopNav from '@/components/TopNav'
import Hamburger from '@/components/Hamburger' import Hamburger from '@/components/Hamburger'
import QuickNew from '@/components/QuickNew'
import avatar from '@/assets/images/touxiang.png'
// import QuickNew from '@/components/QuickNew' // import QuickNew from '@/components/QuickNew'
// import MessageWaring from '@/components/MessageWaring' // import MessageWaring from '@/components/MessageWaring'
export default { export default {
...@@ -60,8 +61,13 @@ export default { ...@@ -60,8 +61,13 @@ export default {
// QuickNew // QuickNew
// MessageWaring // MessageWaring
}, },
data() {
return {
avatar
}
},
computed: { computed: {
...mapGetters(['sidebar', 'avatar', 'device']), ...mapGetters(['sidebar', 'device']),
setting: { setting: {
get() { get() {
return this.$store.state.settings.showSettings return this.$store.state.settings.showSettings
......
src/layout/components/Sidebar/Logo.vue
View file @ 17cea665
...@@ -3,10 +3,7 @@ ...@@ -3,10 +3,7 @@
class="sidebar-logo-container" class="sidebar-logo-container"
:class="{ collapse: collapse }" :class="{ collapse: collapse }"
:style="{ :style="{
backgroundColor: backgroundColor:variables.menuBackground
sideTheme === 'theme-dark'
? variables.menuBackground
: variables.menuLightBackground
}" }"
> >
<transition name="sidebarLogoFade"> <transition name="sidebarLogoFade">
...@@ -16,29 +13,23 @@ ...@@ -16,29 +13,23 @@
class="sidebar-logo-link" class="sidebar-logo-link"
to="/" to="/"
> >
<img v-if="logo" :src="logo" class="sidebar-logo" /> <!-- <img v-if="logo" :src="logo" class="sidebar-logo" />
<h1 <h1
v-else v-else
class="sidebar-title" class="sidebar-title"
:style="{ :style="{
color: color:variables.logoTitleColor
sideTheme === 'theme-dark'
? variables.logoTitleColor
: variables.logoLightTitleColor
}" }"
> >
{{ title }} {{ title }}
</h1> </h1> -->
</router-link> </router-link>
<router-link v-else key="expand" class="sidebar-logo-link" to="/"> <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 <h1
class="sidebar-title" class="sidebar-title"
:style="{ :style="{
color: color:variables.logoTitleColor
sideTheme === 'theme-dark'
? variables.logoTitleColor
: variables.logoLightTitleColor
}" }"
> >
{{ title }} {{ title }}
...@@ -90,8 +81,8 @@ export default { ...@@ -90,8 +81,8 @@ export default {
.sidebar-logo-container { .sidebar-logo-container {
position: relative; position: relative;
width: 100%; width: 100%;
height: 50px; line-height: 80px;
line-height: 50px; height: 80px;
background: #2b2f3a; background: #2b2f3a;
text-align: center; text-align: center;
overflow: hidden; overflow: hidden;
...@@ -112,9 +103,10 @@ export default { ...@@ -112,9 +103,10 @@ export default {
margin: 0; margin: 0;
color: #fff; color: #fff;
font-weight: 600; font-weight: 600;
line-height: 50px; line-height: 80px;
font-size: 14px; font-size: 18px;
font-family: Avenir, Helvetica Neue, Arial, Helvetica, sans-serif; font-weight: bold;
font-family: Microsoft YaHei;
vertical-align: middle; vertical-align: middle;
} }
} }
......
src/layout/components/Sidebar/index.vue
View file @ 17cea665
...@@ -13,18 +13,10 @@ ...@@ -13,18 +13,10 @@
<el-menu <el-menu
:default-active="activeMenu" :default-active="activeMenu"
:collapse="isCollapse" :collapse="isCollapse"
:background-color=" :background-color="variables.menuBackground"
settings.sideTheme === 'theme-dark' :text-color="variables.menuColor"
? variables.menuBackground
: variables.menuLightBackground
"
:text-color="
settings.sideTheme === 'theme-dark'
? variables.menuColor
: variables.menuLightColor
"
:unique-opened="true" :unique-opened="true"
:active-text-color="settings.theme" :active-text-color="variables.menuColorActive"
:collapse-transition="false" :collapse-transition="false"
mode="vertical" mode="vertical"
> >
......
src/layout/components/TagsView/index.vue
View file @ 17cea665
...@@ -102,8 +102,8 @@ export default { ...@@ -102,8 +102,8 @@ export default {
activeStyle(tag) { activeStyle(tag) {
if (!this.isActive(tag)) return {} if (!this.isActive(tag)) return {}
return { return {
'background-color': this.theme, // 'background-color': this.theme,
'border-color': this.theme // 'border-color': this.theme
} }
}, },
isAffix(tag) { isAffix(tag) {
...@@ -295,18 +295,22 @@ export default { ...@@ -295,18 +295,22 @@ export default {
margin-right: 15px; margin-right: 15px;
} }
&.active { &.active {
background-color: #42b983; // background-color: #42b983;
color: #fff; color: #1A6FD7;
border-color: #42b983; position: relative;
padding-left: 20px;
&::before { &::before {
content: ''; content: '';
background: #fff; background: #1A6FD7;
display: inline-block; display: inline-block;
width: 8px; width: 4px;
height: 8px; height: 4px;
border-radius: 50%; border-radius: 50%;
position: relative; position: relative;
margin-right: 2px; margin-right: 2px;
position: absolute;
left: 8px;
top: 40%;
} }
} }
} }
......
src/views/login.vue
View file @ 17cea665
...@@ -236,7 +236,7 @@ export default { ...@@ -236,7 +236,7 @@ export default {
width: 100%; width: 100%;
height: 40px; height: 40px;
font-size: 12px; font-size: 12px;
font-family: Arial; font-family: Microsoft YaHei;
text-align: center; text-align: center;
color: #ffffff; color: #ffffff;
line-height: 40px; line-height: 40px;
......
src/views/processing/carReview/write-check-form/index.vue
View file @ 17cea665
...@@ -147,7 +147,7 @@ ...@@ -147,7 +147,7 @@
class="confirm-button" class="confirm-button"
type="primary" type="primary"
plain plain
@click="confirmDetailChange(taskModel.id)" @click="confirmDetailChange()"
>已处理</el-button >已处理</el-button
> >
</div> </div>
...@@ -218,7 +218,8 @@ import { ...@@ -218,7 +218,8 @@ import {
checkTaskDetail, checkTaskDetail,
reviewDetailsSubmit, reviewDetailsSubmit,
carReviewTaskConfirm, carReviewTaskConfirm,
reviewDetailsConfirm reviewDetailsConfirm,
reviewTaskConfirm
} from '@/api/task/task' } from '@/api/task/task'
import sceneView from './components/sceneView.vue' import sceneView from './components/sceneView.vue'
import companyFile from './components/companyFile.vue' import companyFile from './components/companyFile.vue'
...@@ -539,7 +540,15 @@ export default { ...@@ -539,7 +540,15 @@ export default {
}) })
}, },
confirmDetailChange() { 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 = []
})
} }
} }
} }
......
src/views/processing/fileLibrary/index.vue
View file @ 17cea665
...@@ -46,13 +46,13 @@ ...@@ -46,13 +46,13 @@
</el-form> </el-form>
<el-table <el-table
v-loading="tableLoading" v-loading="tableLoading"
style="width: 100%; min-height: 50vh" style="width: 100%; min-height: 88px"
border border
:scroll-x="'1500px'" :scroll-x="'1500px'"
:default-sort="{ prop: 'createTime', order: 'descending' }" :default-sort="{ prop: 'createTime', order: 'descending' }"
:data="tableData" :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"> <template slot-scope="scope">
<span>{{ scope.$index + 1 }}</span> <span>{{ scope.$index + 1 }}</span>
</template> </template>
......
src/views/processing/systemReview/write-check-form/index.vue
View file @ 17cea665
...@@ -141,7 +141,11 @@ ...@@ -141,7 +141,11 @@
<span class="del-scene"> (删除) </span> <span class="del-scene"> (删除) </span>
</template> </template>
</div> </div>
<el-button class="confirm-button" type="primary" plain <el-button
class="confirm-button"
type="primary"
plain
@click="confirmDetailChange()"
>已处理</el-button >已处理</el-button
> >
</div> </div>
...@@ -209,7 +213,8 @@ ...@@ -209,7 +213,8 @@
import { import {
reviewTaskDetail, reviewTaskDetail,
reviewDetailsSubmit, reviewDetailsSubmit,
reviewTaskConfirm reviewTaskConfirm,
reviewDetailsConfirm
} from '@/api/task/task' } from '@/api/task/task'
import sceneView from './components/sceneView.vue' import sceneView from './components/sceneView.vue'
import companyFile from './components/companyFile.vue' import companyFile from './components/companyFile.vue'
...@@ -329,10 +334,6 @@ export default { ...@@ -329,10 +334,6 @@ export default {
}, },
async mounted() { async mounted() {
this.taskId = this.$route.query.id this.taskId = this.$route.query.id
// this.$store.dispatch('processing/getCompanyFiles', {
// company: '',
// taskId: ''
// })
await this.getTask() await this.getTask()
this.handleCircle(0) this.handleCircle(0)
}, },
...@@ -529,6 +530,17 @@ export default { ...@@ -529,6 +530,17 @@ export default {
path: 'processing/unprocessed-review' 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 = []
})
} }
} }
} }
......
src/views/processing/viewFileLibrary/index.vue
View file @ 17cea665
...@@ -46,13 +46,13 @@ ...@@ -46,13 +46,13 @@
</el-form> </el-form>
<el-table <el-table
v-loading="tableLoading" v-loading="tableLoading"
style="width: 100%; min-height: 50vh" style="width: 100%; min-height: 88px"
border border
:scroll-x="'1500px'" :scroll-x="'1500px'"
:default-sort="{ prop: 'createTime', order: 'descending' }" :default-sort="{ prop: 'createTime', order: 'descending' }"
:data="tableData" :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"> <template slot-scope="scope">
<span>{{ scope.$index + 1 }}</span> <span>{{ scope.$index + 1 }}</span>
</template> </template>
......
src/views/register.vue
View file @ 17cea665
...@@ -245,7 +245,7 @@ export default { ...@@ -245,7 +245,7 @@ export default {
width: 100%; width: 100%;
height: 40px; height: 40px;
font-size: 12px; font-size: 12px;
font-family: Arial; font-family: Microsoft YaHei;
text-align: center; text-align: center;
color: #ffffff; color: #ffffff;
line-height: 40px; line-height: 40px;
......
src/views/review/already/index.vue
View file @ 17cea665
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
</el-form> </el-form>
<el-table <el-table
v-loading="loading" v-loading="loading"
style="width: 100%; min-height: 50vh" style="width: 100%; min-height: 88px"
border border
:default-sort="{ prop: 'createTime', order: 'descending' }" :default-sort="{ prop: 'createTime', order: 'descending' }"
:data="tableData" :data="tableData"
......
src/views/review/initiatedReview/index.vue
View file @ 17cea665
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
<el-table <el-table
v-if="refreshTable" v-if="refreshTable"
v-loading="loading" v-loading="loading"
style="width: 100%; min-height: 50vh" style="width: 100%; min-height: 88px"
border border
:default-sort="{ prop: 'createTime', order: 'descending' }" :default-sort="{ prop: 'createTime', order: 'descending' }"
:data="tableData" :data="tableData"
......
src/views/review/wait/index.vue
View file @ 17cea665
...@@ -68,13 +68,13 @@ ...@@ -68,13 +68,13 @@
</el-form> </el-form>
<el-table <el-table
v-loading="loading" v-loading="loading"
style="width: 100%; min-height: 50vh" style="width: 100%; min-height: 88px"
border border
:scroll-x="'1500px'" :scroll-x="'1500px'"
:default-sort="{ prop: 'createTime', order: 'descending' }" :default-sort="{ prop: 'createTime', order: 'descending' }"
:data="tableData" :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"> <template slot-scope="scope">
<span>{{ scope.$index + 1 }}</span> <span>{{ scope.$index + 1 }}</span>
</template> </template>
......
src/views/setting/company/index.vue
View file @ 17cea665
...@@ -81,13 +81,13 @@ ...@@ -81,13 +81,13 @@
<el-table <el-table
v-if="refreshTable" v-if="refreshTable"
v-loading="loading" v-loading="loading"
style="width: 100%; min-height: 50vh" style="width: 100%; min-height: 88px"
border border
:scroll-x="'1500px'" :scroll-x="'1500px'"
:default-sort="{ prop: 'createTime', order: 'descending' }" :default-sort="{ prop: 'createTime', order: 'descending' }"
:data="tableData" :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>
<el-table-column <el-table-column
label="企业名称" label="企业名称"
......
src/views/setting/file/index.vue
View file @ 17cea665
...@@ -52,12 +52,12 @@ ...@@ -52,12 +52,12 @@
<el-table <el-table
v-if="refreshTable" v-if="refreshTable"
v-loading="loading" v-loading="loading"
style="width: 100%; min-height: 50vh" style="width: 100%; min-height: 88px"
border border
:default-sort="{ prop: 'createTime', order: 'descending' }" :default-sort="{ prop: 'createTime', order: 'descending' }"
:data="tableData" :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"> <template slot-scope="scope">
<span>{{ scope.$index + 1 }}</span> <span>{{ scope.$index + 1 }}</span>
</template> </template>
......
src/views/setting/rules/components/detailSelect.vue
View file @ 17cea665
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
</el-form> </el-form>
<el-table <el-table
v-loading="loading" v-loading="loading"
style="width: 100%; min-height: 50vh" style="width: 100%; min-height: 88px"
border border
tooltip-effect="dark" tooltip-effect="dark"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
......
src/views/setting/rules/components/pointSelect.vue
View file @ 17cea665
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
</el-form> </el-form>
<el-table <el-table
v-loading="loading" v-loading="loading"
style="width: 100%; min-height: 50vh" style="width: 100%; min-height: 88px"
border border
tooltip-effect="dark" tooltip-effect="dark"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
......
src/views/setting/rules/index.vue
View file @ 17cea665
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
</el-form-item> </el-form-item>
</el-form> </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 <right-toolbar
:show-search.sync="showSearch" :show-search.sync="showSearch"
@queryTable="loadData" @queryTable="loadData"
...@@ -194,7 +194,7 @@ ...@@ -194,7 +194,7 @@
<el-table <el-table
v-if="refreshTable && Number(queryParams.type) === 3" v-if="refreshTable && Number(queryParams.type) === 3"
v-loading="loading" v-loading="loading"
style="width: 100%; min-height: 50vh" style="width: 100%; min-height: 88px"
border border
:scroll-x="'1500px'" :scroll-x="'1500px'"
:default-sort="{ prop: 'createTime', order: 'descending' }" :default-sort="{ prop: 'createTime', order: 'descending' }"
......
src/views/setting/scene/index.vue
View file @ 17cea665
...@@ -63,13 +63,13 @@ ...@@ -63,13 +63,13 @@
<el-table <el-table
v-if="refreshTable" v-if="refreshTable"
v-loading="loading" v-loading="loading"
style="width: 100%; min-height: 50vh" style="width: 100%; min-height: 88px"
border border
:default-sort="{ prop: 'createTime', order: 'descending' }" :default-sort="{ prop: 'createTime', order: 'descending' }"
:scroll-x="'1500px'" :scroll-x="'1500px'"
:data="tableData" :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"> <template slot-scope="scope">
<span>{{ scope.$index + 1 }}</span> <span>{{ scope.$index + 1 }}</span>
</template> </template>
......
src/views/setting/standard/components/sceneSelect.vue
View file @ 17cea665
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
</el-form> </el-form>
<el-table <el-table
v-loading="loading" v-loading="loading"
style="width: 100%; min-height: 50vh" style="width: 100%; min-height: 88px"
border border
tooltip-effect="dark" tooltip-effect="dark"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
......
src/views/setting/standard/index.vue
View file @ 17cea665
...@@ -2,14 +2,14 @@ ...@@ -2,14 +2,14 @@
<page-standard> <page-standard>
<el-table <el-table
v-loading="loading" v-loading="loading"
style="width: 100%; min-height: 50vh" style="width: 100%; min-height: 88px"
border border
:span-method="objectSpanMethod" :span-method="objectSpanMethod"
:scroll-x="'1500px'" :scroll-x="'1500px'"
:default-sort="{ prop: 'createTime', order: 'descending' }" :default-sort="{ prop: 'createTime', order: 'descending' }"
:data="tableData" :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"> <template slot-scope="scope">
<span>{{ scope.$index + 1 }}</span> <span>{{ scope.$index + 1 }}</span>
</template> </template>
......
src/views/setting/standardTerms/components/vehicleModelDialog.vue
View file @ 17cea665
...@@ -9,13 +9,13 @@ ...@@ -9,13 +9,13 @@
> >
<el-table <el-table
v-loading="loading" v-loading="loading"
style="width: 100%; min-height: 50vh" style="width: 100%; min-height: 88px"
border border
:scroll-x="'1500px'" :scroll-x="'1500px'"
:default-sort="{ prop: 'createTime', order: 'descending' }" :default-sort="{ prop: 'createTime', order: 'descending' }"
:data="tableData" :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"> <template slot-scope="scope">
<span>{{ scope.$index + 1 }}</span> <span>{{ scope.$index + 1 }}</span>
</template> </template>
......
src/views/setting/standardTerms/index.vue
View file @ 17cea665
...@@ -90,13 +90,13 @@ ...@@ -90,13 +90,13 @@
<el-table <el-table
v-if="refreshTable && Number(queryParams.type) !== 3" v-if="refreshTable && Number(queryParams.type) !== 3"
v-loading="loading" v-loading="loading"
style="width: 100%; min-height: 50vh" style="width: 100%; min-height: 88px"
border border
:scroll-x="'1500px'" :scroll-x="'1500px'"
:default-sort="{ prop: 'createTime', order: 'descending' }" :default-sort="{ prop: 'createTime', order: 'descending' }"
:data="tableData" :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"> <template slot-scope="scope">
<span>{{ scope.$index + 1 }}</span> <span>{{ scope.$index + 1 }}</span>
</template> </template>
...@@ -147,13 +147,13 @@ ...@@ -147,13 +147,13 @@
<el-table <el-table
v-if="refreshTable && Number(queryParams.type) === 3" v-if="refreshTable && Number(queryParams.type) === 3"
v-loading="loading" v-loading="loading"
style="width: 100%; min-height: 50vh" style="width: 100%; min-height: 88px"
border border
:scroll-x="'1500px'" :scroll-x="'1500px'"
:default-sort="{ prop: 'createTime', order: 'descending' }" :default-sort="{ prop: 'createTime', order: 'descending' }"
:data="tableData" :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"> <template slot-scope="scope">
<span>{{ scope.$index + 1 }}</span> <span>{{ scope.$index + 1 }}</span>
</template> </template>
......
src/views/setting/template/index.vue
View file @ 17cea665
...@@ -22,11 +22,11 @@ ...@@ -22,11 +22,11 @@
</div> </div>
<el-table <el-table
v-loading="loading" v-loading="loading"
style="width: 100%; min-height: 50vh" style="width: 100%; min-height: 88px"
border border
:data="tableData" :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"> <template slot-scope="scope">
<span>{{ scope.$index + 1 }}</span> <span>{{ scope.$index + 1 }}</span>
</template> </template>
......
src/views/setting/testType/index.vue
View file @ 17cea665
...@@ -52,13 +52,13 @@ ...@@ -52,13 +52,13 @@
<el-table <el-table
v-if="refreshTable" v-if="refreshTable"
v-loading="loading" v-loading="loading"
style="width: 100%; min-height: 50vh" style="width: 100%; min-height: 88px"
border border
:default-sort="{ prop: 'createTime', order: 'descending' }" :default-sort="{ prop: 'createTime', order: 'descending' }"
:scroll-x="'1500px'" :scroll-x="'1500px'"
:data="tableData" :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"> <template slot-scope="scope">
<span>{{ scope.$index + 1 }}</span> <span>{{ scope.$index + 1 }}</span>
</template> </template>
......
src/views/setting/useCaseLibrary/index.vue
View file @ 17cea665
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
</el-row> </el-row>
<el-table v-loading="loading" :data="postList"> <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"> <template slot-scope="scope">
<span>{{ scope.$index + 1 }}</span> <span>{{ scope.$index + 1 }}</span>
</template> </template>
......
src/views/system/user/authRole.vue
View file @ 17cea665
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
@row-click="clickRow" @row-click="clickRow"
@selection-change="handleSelectionChange" @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"> <template slot-scope="scope">
<span>{{ (pageNum - 1) * pageSize + scope.$index + 1 }}</span> <span>{{ (pageNum - 1) * pageSize + scope.$index + 1 }}</span>
</template> </template>
......
src/views/task/archived/components/systemReview.vue
View file @ 17cea665
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
<el-table <el-table
v-if="refreshTable" v-if="refreshTable"
v-loading="loading" v-loading="loading"
style="width: 100%; min-height: 50vh" style="width: 100%; min-height: 88px"
border border
:data="tableData" :data="tableData"
> >
......
src/views/task/archived/components/vehicleModelEvaluation.vue
View file @ 17cea665
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
<el-table <el-table
v-if="refreshTable" v-if="refreshTable"
v-loading="loading" v-loading="loading"
style="width: 100%; min-height: 50vh" style="width: 100%; min-height: 88px"
border border
:data="tableData" :data="tableData"
> >
......
src/views/task/detail/index.vue
View file @ 17cea665
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
<el-table <el-table
v-loading="loading" v-loading="loading"
style="width: 100%; min-height: 50vh" style="width: 100%; min-height: 88px"
border border
:default-sort="{ prop: 'createTime', order: 'descending' }" :default-sort="{ prop: 'createTime', order: 'descending' }"
:data="tableData" :data="tableData"
......
src/views/task/on/components/systemReview.vue
View file @ 17cea665
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
<el-table <el-table
v-if="refreshTable" v-if="refreshTable"
v-loading="loading" v-loading="loading"
style="width: 100%; min-height: 50vh" style="width: 100%; min-height: 88px"
border border
:data="tableData" :data="tableData"
> >
......
src/views/task/on/components/vehicleModelEvaluation.vue
View file @ 17cea665
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
<el-table <el-table
v-if="refreshTable" v-if="refreshTable"
v-loading="loading" v-loading="loading"
style="width: 100%; min-height: 50vh" style="width: 100%; min-height: 88px"
border border
:data="tableData" :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