This commit is contained in:
zhutianqi
2021-10-11 16:10:00 +08:00
parent 637b3e1bb4
commit 718a2b923b
11 changed files with 103 additions and 401 deletions
+1 -344
View File
@@ -1,347 +1,3 @@
//button.el-button.form-upload-btn.el-button--default.el-button--small{
// padding: 13px 15px;
//}
////设置查询按钮
//.el-button--primary.searchAngNewBtn{
// height: 32px;
// padding: 0 15px;
// color: #fff;
// background-color: #3391CE;
// font-family: Helvetica, 'Hiragino Sans GB', 'Microsoft Yahei', Arial, sans-serif;
// border-color: #3391CE;
// &.is-disabled {
// background-color: #b0d3ed !important;
// border-color: #bcd1e0 !important;
// }
//}
//.el-button--primary.searchAngNewBtn:hover{
// padding: 0 15px;
// background-color: #3391CE;
// border-color: #3391CE;
//}
//.el-button--primary.searchAngNewBtn:focus{
// padding: 0 15px;
// background-color: #3391CE;
// border-color: #3391CE;
//}
//.el-button--danger.searchAngNewBtn{
// height: 32px;
// padding: 0 15px;
// color: #fff;
//}
//.el-button--danger.searchAngNewBtn:hover{
// padding: 0 15px;
//}
//.el-button--danger.searchAngNewBtn:focus{
// padding: 0 15px;
//}
//.el-button.searchAngNewBtn{
// height: 32px;
// padding: 0 15px;
// //color: #fff;
//}
//.el-button.searchAngNewBtn:hover{
// padding: 0 15px;
//}
//.el-button.searchAngNewBtn:focus{
// padding: 0 15px;
//}
////设置新增,导出等按钮
//.el-button.el-button--primary.el-button--mini {
// padding: 5px 18px;
// color: #fff;
// background-color: #3391CE;
// border-color: #3391CE;
// &.is-disabled {
// background-color: #b0d3ed !important;
// border-color: #bcd1e0 !important;
// }
//}
//.el-button.el-button--primary.el-button--mini:hover{
// padding: 5px 18px;
// background-color: #3391CE;
// border-color: #3391CE;
//}
//.el-button.el-button--primary.el-button--mini:focus{
// padding: 5px 18px;
// background-color: #3391CE;
// border-color: #3391CE;
//}
//.el-button.el-button--danger.el-button--mini {
// padding: 5px 18px;
// color: #fff;
//}
//.el-button.el-button--danger.el-button--mini:hover{
// padding: 5px 18px;
//}
//.el-button.el-button--danger.el-button--mini:focus{
// padding: 5px 18px;
//}
//// 设置表格操作按钮
//.el-button.el-button--primary.el-button--mini.opera-btn {
// padding: 5px 7px;
// color: #fff;
// background-color: #3391CE;
// border-color: #3391CE;
// &.is-disabled {
// background-color: #b0d3ed !important;
// border-color: #bcd1e0 !important;
// }
//}
//.el-button.el-button--primary.el-button--mini.opera-btn:hover{
// padding: 5px 7px;
// background-color: #3391CE;
// border-color: #3391CE;
//}
//.el-button.el-button--primary.el-button--mini.opera-btn:focus{
// padding: 5px 7px;
// background-color: #3391CE;
// border-color: #3391CE;
//}
//.el-button.el-button--danger.el-button--mini.opera-btn {
// padding: 5px 7px;
// color: #fff;
//}
//.el-button.el-button--danger.el-button--mini.opera-btn:hover{
// padding: 5px 7px;
//}
//.el-button.el-button--danger.el-button--mini.opera-btn:focus{
// padding: 5px 7px;
//}
//.el-button.el-button--warning.el-button--mini.opera-btn {
// padding: 5px 7px;
// color: #fff;
// background-color: #ff9900;
// border-color: #ff9900;
//}
//.el-button.el-button--warning.el-button--mini.opera-btn:hover{
// padding: 5px 7px;
// background-color: #ff9900;
// border-color: #ff9900;
//}
//.el-button.el-button--warning.el-button--mini.opera-btn:focus{
// padding: 5px 7px;
// background-color: #ff9900;
// border-color: #ff9900;
//}
//
////设置form-item
//.el-form-item.serch-form-item {
// margin-bottom: 0;
// margin-right: 6px;
// margin-top: 10px;
//}
//.el-form-item.serch-form-item.btn-box {
// margin-bottom: 0;
// margin-right: 2px;
//}
//// 设置查询orm-item-lable
//.serch-form-item .el-form-item__label{
// position: relative;
// top: 1px;
// padding: 0 7px;
// height: 32px;
// line-height: 32px;
// font-size: 12px;
// border: 1px solid #DDD;
// border-top-left-radius: 4px;
// border-bottom-left-radius: 4px;
// border-right: none;
// background: #F4F8FB;
// text-align: center;
// min-width: 80px;
//}
//.serch-form-item .el-form-item__content {
// line-height: 32px;
// position: relative;
// font-size: 14px;
// .put__inner{
// height: 32px !important;
// line-height: 32px !important;
// width: 170px;
// 0 4px 4px 0;
// font-size: 12px;
// color: #515a6e;
// font-family: Helvetica, 'Hiragino Sans GB', 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important;
// }
// .el-input__icon{
// line-height: 32px;
// }
//}
//.el-form-item.search-form-item.btn-box {
// margin-bottom: 0;
// margin-right: 2px;
//}
//// 设置查询orm-item-lable
//.search-form-item .el-form-item__label{
// position: relative;
// top: 1px;
// padding: 0 7px;
// height: 32px;
// line-height: 32px;
// font-size: 12px;
// border: 1px solid #DDD;
// border-top-left-radius: 4px;
// border-bottom-left-radius: 4px;
// border-right: none;
// background: #F4F8FB;
// text-align: center;
// min-width: 80px;
//}
//.search-form-item .el-form-item__content {
// line-height: 32px;
// position: relative;
// font-size: 14px;
// .el-input__inner{
// height: 32px !important;
// line-height: 32px !important;
// width: 180px;
// 4px;
// font-size: 12px;
// color: #515a6e;
// font-family: Helvetica, 'Hiragino Sans GB', 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important;
// }
// .el-input__icon{
// line-height: 32px;
// }
//}
//// 设置新增form-item-lable
//.add-form-item .el-form-item__label{
// position: relative;
// top: 1px;
// padding: 0 7px;
// width: 120px;
// height: 40px;
// line-height: 40px;
// font-size: 12px;
// border: 1px solid #DDD;
// border-top-left-radius: 4px;
// border-bottom-left-radius: 4px;
// border-right: none;
// background: #F4F8FB;
// text-align: center;
// white-space: nowrap;
// text-overflow: ellipsis;
// overflow: hidden;
//}
//.add-form-item .el-form-item__content {
// position: relative;
// font-size: 14px;
// width: 224px;
// .el-input__inner{
// 0 4px 4px 0;
// font-size: 12px;
// color: #515a6e;
// font-family: Helvetica, 'Hiragino Sans GB', 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important;
// width: 224px;
// }
// //设置输入框高度
//// .label-input-form{
//// .el-input__inner{
//// // @media all and (-ms-high-contrast: none), (-ms-high-contrast: active) {
//// // // ie下样式偏差1px
//// // line-height: 27px !important;
//// // }
//// }
//// }
//}
//// 设置新增等按钮区域样式
//.action-bar{
// padding:10px 0;
// .el-button+.el-button{
// margin-left: 2px;
// }
//}
//// 设置tabs激活状态颜色
//.el-tabs--border-card>.el-tabs__header .el-tabs__item.is-active {
// color: #3391CE;
// background-color: #FFF;
// border-right-color: #DCDFE6;
// border-left-color: #DCDFE6;
//}
//// 设置tabs hover颜色
//.el-tabs--border-card>.el-tabs__header .el-tabs__item:not(.is-disabled):hover {
// color: #3391CE;
//}
//// 设置页面查询区域下的下划线
//.search-area {
// border-bottom: 1px solid #e8eaec;
//}
///* element样式重置 start */
///* 去掉input尾部上下小箭头 start */
//input::-webkit-outer-spin-button,input::-webkit-inner-spin-button{
// -webkit-appearance: none !important;
// -moz-appearance: none !important;
// -o-appearance: none !important;
// -ms-appearance: none !important;
// appearance: none !important;
// margin: 0;
//}
//input[type="number"]{
// -webkit-appearance:textfield;
// -moz-appearance:textfield;
// -o-appearance:textfield;
// -ms-appearance:textfield;
// appearance:textfield;
//}
///* 去掉input尾部上下小箭头 end */
//// 所属部门选项 样式
//.user-dept-popper{
// padding: 0;
//}
//// 表单验证星星样式
//.single-star {
// .el-form-item__label:before{
// content: '*' !important;
// color: #F56C6C !important;
// margin-right: 4px !important;
// }
//}
//.double-star {
// .el-form-item__label:before{
// content: '**' !important;
// color: #F56C6C !important;
// margin-right: 4px !important;
// }
//}
//.add-form-item{
// /*margin-top -1px*/
// .top1px{
// .el-input__inner{
// margin-top: -1px;
// }
// }
// .el-textarea{
// .el-textarea__inner{
// height: 40px;
// min-height: 40px !important;
// font-size: 12px;
// font-family: Helvetica, 'Hiragino Sans GB', 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important;
// border-bottom-left-radius: 0;
// border-top-left-radius: 0;
// }
// }
// .form-upload-btn{
// font-size: 12px;
// font-family: Helvetica, 'Hiragino Sans GB', 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important;
// }
//}
//// 设置日期样式
//.el-date-editor .el-range-input{
// font-size: 12px;
// font-family: sans-serif;
//}
//span.el-range-separator{
// position: relative;
// left: -6px;
// font-size: 12px;
//}
//.el-date-editor .el-range-separator{
// line-height: 26px;
//}
//.serch-form-item .el-form-item__content .el-input__icon{
// line-height: 26px;
//}
// 设置查询区域
.search-area{
display: flex;
@@ -516,6 +172,7 @@ button.el-button.common-button-default.el-button--default.is-round{
}
// 按钮 + 图标
.add-button{
height: 32px;
.add{
background-image: url("~assets/images/shangqi/img/add.png");
}
+3 -2
View File
@@ -8,7 +8,8 @@
</div>
</div>
</div>
<div class="toggle-btn iconfont" style="display: flex;justify-content: center; font-size: 30px; color: #333333;" @click="handleToggleSideBar"><div style="font-size: 14px; line-height: 30px;">{{ this.isCollapse ? '' : '' }}</div>&#xe647;</div>
<div class="toggle-btn iconfont" style="margin: 10px 0; display: flex;justify-content: center; font-size: 30px; color: #333333;" @click="handleToggleSideBar">
<div style="font-size: 14px; line-height: 30px;">{{ this.isCollapse ? '' : '' }}</div>&#xe647;</div>
<div class="left-tree">
<el-menu
unique-opened
@@ -493,7 +494,7 @@
padding: 0px 16px !important;
}
.left-tree {
height: calc(~'100% - 95px');
height: calc(~'100% - 115px');
overflow-y: auto;
}
.left-tree::-webkit-scrollbar {
+38 -8
View File
@@ -1,9 +1,6 @@
<template>
<div class="wx-card" @click="toPage">
<div @click="toPage">
<div>
<div>
<i class="icon" :class="icon" />
</div>
<div v-if="label">
<span class="card-font">{{ label }}</span>
</div>
@@ -30,16 +27,49 @@
<style lang="less" scoped>
.wx-card {
width: 214px;
line-height: 70px;
text-align: center;
background: rgba(182, 213, 255, 0.22);
margin-left: 10px;
background: #fff;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
cursor: pointer;
padding-left: 10px;
& > div {
width: 100%;
height: 70px;
background-color: #E4E4E4;
}
}
.wx-card:hover {
& > div {
color: #fff;
background-color: #5ea9f6;
}
}
.wx-card1 {
line-height: 70px;
text-align: center;
background: #fff;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
cursor: pointer;
padding-left: 10px;
& > div {
width: 100%;
height: 70px;
background: #fff;
border: 2px dashed #E4E4E4;
div {
width: 100%;
height: 100%;
display: flex;
justify-content: center;
}
}
}
.labelNull {
height: 100%;
@@ -47,7 +77,7 @@
align-items: center;
.el-icon-circle-plus-outline {
font-size: 50px;
color: #F4F4F4;
color: #E4E4E4;
}
}
</style>
+13 -7
View File
@@ -3,12 +3,12 @@
<div class="link">
<div class="title">友情链接</div>
<ul>
<li v-for="(link, index) in linkList" v-if="index<5" :key="index" @click="openLinkUrl(link.url)">
<li class="myLi1" v-for="(link, index) in linkList" v-if="index<5" :key="index" @click="openLinkUrl(link.url)">
<a v-if="link.name.length>10" v-html="link.name.substring(0,10)+'...'" :title="link.name"></a>
<a v-else v-html="link.name" :title="link.name"></a>
</li>
<li>
<router-link to="/linkManage">更多链接></router-link>
<li class="myLi2">
<span @click="$router.push('linkManage')">更多链接 </span>
</li>
</ul>
</div>
@@ -61,6 +61,7 @@ export default {
border-radius: 3px;
height: 100%;
.title {
font-weight: bold;
padding-left: 10px;
width: 80px;
}
@@ -70,20 +71,25 @@ export default {
height: 100%;
text-align: center;
user-select: none;
li {
border-right: 1px solid #f4f4f4;
.myLi1 {
border-right: 2px solid #f4f4f4;
flex: 1;
a {
color: #333333;
}
}
li:hover {
.myLi1:hover {
background: #5ea9f6;
a {
color: #e9ca32;
color: #fff;
text-decoration: none;
}
}
.myLi2 {
padding: 0 10px;
cursor: pointer;
color: #5ea9f6 !important;
}
}
}
</style>
+12 -18
View File
@@ -2,13 +2,13 @@
<template>
<div class="nav-menu">
<div class="lattice">
<div class="title">快捷入口</div>
<div class="title"><i class="el-icon-s-promotion"></i> 快捷入口</div>
<div class="menu-wrap">
<enter-card v-for="(item, index) in list"
:key="index"
:label="item.label"
:path="item.path"
:class="list.length === 1 ? 'wx-card1' : (list.length == 2 ? 'wx-card2' :'')">
:class="item.class">
</enter-card>
</div>
</div>
@@ -43,6 +43,7 @@
var json = {}
json.label = item.menuName
json.path = item.menuUrl
json.class = 'wx-card'
this.list.push(json)
}
})
@@ -50,6 +51,7 @@
var json = {}
json.label = ''
json.path = '/plate'
json.class = 'wx-card1'
this.list.push(json)
}
}
@@ -65,6 +67,8 @@
<style lang="less" scoped>
.nav-menu {
.lattice {
background: #fff;
margin-bottom: 10px;
.title {
margin-bottom: 10px;
padding-left: 10px;
@@ -78,36 +82,26 @@
height: 240px;
display: flex;
flex-wrap: wrap;
justify-content:space-between;
font-size: 18px;
justify-content: space-between;
color: #333333;
margin-bottom: 10px;
margin: 0 10px 10px 0;
text-align: center;
&:last-child {
margin-bottom: 0;
}
.wx-card {
height: 70px;
background-color: #FFFFFF;
width: 32%;
margin: 0 0 10px 0;
height: 70px;
width: 33.333333%;
}
.wx-card1 {
width: 100%;
}
.wx-card2 {
width: 49%;
height: 70px;
width: 33.333333%;
}
.menu-item {
flex: 1;
height: 70px;
line-height: 70px;
text-align: center;
margin-right: 10px;
background: #FFFFFF;
&:last-child {
margin-right: 0;
}
}
}
}
+2 -1
View File
@@ -13,12 +13,13 @@
ref="selection"
:data="standardReleaseList"
tooltip-effect="dark"
style="padding:0 0 20px 0;"
border
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
style="width: 100%">
<el-table-column
label="序号"
type="index"
align="center"
width="50">
</el-table-column>
<el-table-column
@@ -13,12 +13,13 @@
ref="selection"
:data="domesticDynamics"
tooltip-effect="dark"
style="padding:0 0 20px 0;"
border
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
style="width: 100%">
<el-table-column
label="序号"
type="index"
align="center"
width="50">
</el-table-column>
<el-table-column
+22 -14
View File
@@ -1,14 +1,16 @@
<!-- 待办任务 -->
<template>
<div class="to-do-list">
<div>
<span class="task">待办任务</span>
<div class="more" @click="togo">更多</div>
<div style="border-bottom: 2px solid #f4f4f4">
<span class="task">
<i class="el-icon-s-goods"></i> 待办任务
</span>
<div class="more" @click="togo">更多 </div>
</div>
<ul>
<li v-for="item in toDoTaskList" :key="item.id" class="time-title">
<div style="height: 18px">
<a style="color: #333333" @click="dealWith(item)">{{ item.prcName }}</a>
<span @click="dealWith(item)">{{ item.prcName }}</span>
</div>
</li>
</ul>
@@ -646,34 +648,40 @@ export default {
<style lang="less" scoped>
.to-do-list {
border-radius: 3px;
//flex: 1;
height: calc(~'100% - 300px');
height: calc(~'100% - 310px');
overflow: hidden;
background: #FFFFFF;
.task {
display: inline-block;
margin: 15px;
color: #333333;
font-size: 18px;
font-size: 16px;
font-weight: bold;
}
.more {
float: right;
color: #333333;
color: #5ea9f6;
margin: 15px 15px;
&:hover {
color: #5ea9f6;
cursor: pointer;
}
}
ul {
height: calc(~'100% - 50px');
overflow-y: auto;
}
ul::-webkit-scrollbar {
display: none;
}
.time-title {
margin: 15px;
border-bottom: 1px dashed #cccccc;
}
a {
color: #333333;
&:hover {
color: #e9c851;
text-decoration: underline;
span {
cursor: pointer;
}
span:hover {
color: #5ea9f6;
}
}
}
+3 -1
View File
@@ -132,9 +132,11 @@ export default {
.home-tabs {
/deep/.el-tabs__content {
height: calc(~'100% - 55px');
margin: 0 10px;
}
::v-deep.el-tabs__header{
margin: 0 70px 15px 10px
margin: 0 10px 15px 10px;
border-bottom: 1px solid #F4F4F4;
}
::v-deep {
.el-tabs__item {
@@ -450,14 +450,14 @@ export default {
.card-top {
width: 100%;
background: #2d8cf0;
height: 120px;
height: 100px;
display: flex;
justify-content: space-between;
.card-top-left {
img {
margin: 10px;
width: 100px;
height: 100px;
width: 80px;
height: 80px;
}
}
.card-top-right {
@@ -44,8 +44,10 @@
class="common-button-primary add-button"
size="mini"
@click="openModal(null,'addOpt')"
v-btn-permission="'389d3690eeea9d3808bdff4d02dddbd8'"
><i class="iconfont">&#xe84e;</i>新增
v-btn-permission="'389d3690eeea9d3808bdff4d02dddbd8'">
<i class="el-icon-plus"></i>
<!-- <i class="iconfont">&#xe84e;</i>-->
新增
</el-button>
<el-button
class="common-button-default delete-button"