Skip to content

H
haoban-3
Commit 4b13abb9 by crushh
Options

update: ui调整

parent ff941971
Showing with 80 additions and 38 deletions
index.html
......@@ -13,7 +13,7 @@
<meta charset="utf-8">
<link rel="shortcut icon" href="./favicon.ico" />
<title>好办管理平台</title>
<link rel="stylesheet" type="text/css" href="//web-1251519181.file.myqcloud.com/custom-element/custom-element.1.0.69.css" />
<!-- <link rel="stylesheet" type="text/css" href="//web-1251519181.file.myqcloud.com/custom-element/custom-element.1.0.69.css" /> -->
</head>
......@@ -26,11 +26,11 @@
var src = '/component/static/import-component.js?timestrap='+ new Date().getTime();
var host = window.location.host;
host = host.indexOf('localhost') > -1 || host.indexOf('192.168') > -1 ? 'gicdev.demogic.com' : host;
document.write('<script src="//'+ host + src +'"><\/script>')
document.write("<script src='//172.16.30.233:8091/static/import-component.js'><\/script")
})()
</script>
<script src="//web-1251519181.file.myqcloud.com/components/pagination.1.0.10.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/common.1.0.3.js"></script>
<!-- <script src="//web-1251519181.file.myqcloud.com/components/common.1.0.3.js"></script> -->
<script src="//web-1251519181.file.myqcloud.com/components/export-data.1.0.11.js"></script>
</body>
......
src/main.js
......@@ -22,7 +22,7 @@ import '../static/css/index.less';
// import 'element-ui/lib/theme-chalk/index.css';
import '../static/font/iconfont.css';
import '../static/font//iconfont.js'
import '../theme/index.css';
// import '../theme/index.css';
import '../static/css/dialog.css';
import filters from './filters/index.js';
......
src/views/apps/customerApp/myCustomerList.vue
......@@ -42,7 +42,7 @@
<el-table-column width="25">
<template #header>
<el-dropdown style="line-height: 10px; padding: 0; margin-left: -15px; transform: translateY(4px); -webkit-transform: translateY(4px);" placement="bottom-start">
<span class="el-dropdown-link"><i class="iconfont icongengduo"></i> </span>
<span class="el-dropdown-link"><i class="iconfont icongengduo"> </i> </span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item> <el-checkbox v-model="selectRadio" :true-label="0" :false-label="2" @change="handleCommand">选择当页</el-checkbox></el-dropdown-item>
<el-dropdown-item> <el-checkbox v-model="selectRadio" :true-label="1" :false-label="2" @change="handleCommand">选择全部</el-checkbox></el-dropdown-item>
......
src/views/apps/quota/monthTask.vue
......@@ -16,7 +16,7 @@
<el-option v-for="item in storeStatusOptions" :key="item.value" :label="item.label" :value="item.value"> </el-option>
</el-select> -->
<gic-select-group :brandId="brandId" class="m-l-10" :width="213" :selectData="conditionObj.storeGroupIds" @checkGroupIds="checkGroupIds"> </gic-select-group>
<el-date-picker style="width:310px" class="m-l-10" v-model="conditionObj.dateRange" @change="changeDate" :editable="false" :value-format="'yyyy-MM'" type="monthrange" align="right" unlink-panels range-separator="至" start-placeholder="开始月份" end-placeholder="结束月份"> </el-date-picker>
<el-date-picker style="width:310px; vertical-align: middle;" class="m-l-10" v-model="conditionObj.dateRange" @change="changeDate" :editable="false" :value-format="'yyyy-MM'" type="monthrange" align="right" unlink-panels range-separator="至" start-placeholder="开始月份" end-placeholder="结束月份"> </el-date-picker>
</div>
<div class="table-condition-right">
<el-button type="primary" :loading="loadingBtn" @click="exportExcel">导出</el-button>
......
static/css/public.css
......@@ -1340,3 +1340,77 @@ button.el-button--danger.is-plain {
.mult-line-select .line-20 {
line-height: 20px;
}
/**
*表格多选项禁用
*/
.cell-disabled{
pointer-events: none;
opacity: 0.8;
font-size: 0;
}
.font-size-zero{
font-size: 0;
}
.damolish .cell-disabled .el-checkbox.is-checked .el-checkbox__input:not(.is-disabled) .el-checkbox__inner{
background-color: #F7F8FA;
border-color:#C4C6CF;
}
.damolish .cell-disabled .el-checkbox .el-checkbox__input .el-checkbox__inner::after{
border-color:#C0C4CC;
}
@keyframes checkboxClick{
0% {
box-shadow: 0 0 0 3px rgba(47, 84, 237, 0.1);
background-color:#F7F8FA ;
}
100% {
box-shadow: 0 0 0 7px rgba(47, 84, 237, 0);
}
}
.damolish .cell-disabled .el-checkbox__input.is-checked:not(.is-disabled) .el-checkbox__inner {
animation: 0.5s checkboxClick;
}
/**
ui调整
*/
.el-select {
display: inline-block;
position: relative;
vertical-align: middle;
}
.el-dropdown-menu__item {
list-style: none;
line-height: 36px;
padding: 0 20px;
margin: 0;
font-size: 14px;
color: #606266;
cursor: pointer;
outline: none;
}
.el-input {
vertical-align: middle
}
.el-table__empty-block .el-table__empty-text::before {
content: "";
display: block;
margin: 0 auto 10px;
width: 50px;
height: 50px;
background: url(../img/no-data_icon1.png) no-repeat center;
background-size: contain
}
.damolish .el-table__empty-block .el-table__empty-text {
line-height: normal;
}
.damolish .el-tabs .el-tabs__header.is-top .el-tabs__nav-wrap .el-tabs__item {
padding: 0 20px;
font-weight: 400;
}
.damolish .el-table th .cell {
padding-right: 0;
font-size: 14px;
font-weight: 500;
color: #303133;
}
theme/index.css
......@@ -81851,34 +81851,3 @@
margin: 0 auto;
border-radius: 18px;
}
/**
*表格多选项禁用
*/
.cell-disabled{
pointer-events: none;
opacity: 0.8;
font-size: 0;
}
.font-size-zero{
font-size: 0;
}
.damolish .cell-disabled .el-checkbox.is-checked .el-checkbox__input:not(.is-disabled) .el-checkbox__inner{
background-color: #F7F8FA;
border-color:#C4C6CF;
}
.damolish .cell-disabled .el-checkbox .el-checkbox__input .el-checkbox__inner::after{
border-color:#C0C4CC;
}
@keyframes checkboxClick{
0% {
box-shadow: 0 0 0 3px rgba(47, 84, 237, 0.1);
background-color:#F7F8FA ;
}
100% {
box-shadow: 0 0 0 7px rgba(47, 84, 237, 0);
}
}
.damolish .cell-disabled .el-checkbox__input.is-checked:not(.is-disabled) .el-checkbox__inner {
animation: 0.5s checkboxClick;
}
\ No newline at end of file
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