Commit 9ee3e7c7 authored by xulili's avatar xulili

修改部分样式

parent 0fb54293
...@@ -22,7 +22,8 @@ ...@@ -22,7 +22,8 @@
</ul> </ul>
</div> </div>
<div id="area2"></div> <div id="area2"></div>
<div id="area3">></div> <div id="area3"></div>
<div id="area4"></div>
</div> </div>
</div> </div>
</div> </div>
...@@ -42,9 +43,6 @@ export default { ...@@ -42,9 +43,6 @@ export default {
}, },
mounted() { mounted() {
this.getList(); this.getList();
this.$nextTick((v) => {
this.initScroll();
});
}, },
methods: { methods: {
initScroll() { initScroll() {
...@@ -53,8 +51,10 @@ export default { ...@@ -53,8 +51,10 @@ export default {
this.con1 = document.getElementById("area1"); this.con1 = document.getElementById("area1");
let con2 = document.getElementById("area2"); let con2 = document.getElementById("area2");
let con3 = document.getElementById("area3"); let con3 = document.getElementById("area3");
let con4 = document.getElementById("area4");
con2.innerHTML = this.con1.innerHTML; con2.innerHTML = this.con1.innerHTML;
con3.innerHTML = this.con1.innerHTML; con3.innerHTML = this.con1.innerHTML;
con4.innerHTML = this.con1.innerHTML;
this.timer = setInterval(_this.scrollUp, _this.speed); this.timer = setInterval(_this.scrollUp, _this.speed);
}, },
scrollUp() { scrollUp() {
...@@ -65,6 +65,7 @@ export default { ...@@ -65,6 +65,7 @@ export default {
} }
}, },
getList() { getList() {
let _this = this;
let requestparams = {}; let requestparams = {};
requestparams._index = 1; requestparams._index = 1;
requestparams._size = 10; requestparams._size = 10;
...@@ -80,6 +81,9 @@ export default { ...@@ -80,6 +81,9 @@ export default {
if (res.status == 200) { if (res.status == 200) {
if (res.data.resultCode == 200) { if (res.data.resultCode == 200) {
this.list = res.data.data.records; this.list = res.data.data.records;
this.$nextTick(()=>{
_this.initScroll();
})
} else { } else {
this.list = []; this.list = [];
} }
......
...@@ -36,7 +36,7 @@ export default { ...@@ -36,7 +36,7 @@ export default {
} }
}, },
components:{demand, interaction , areas, top10, mapDiv, borderNums}, components:{demand, interact , areas, top10, mapDiv, borderNums},
} }
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
......
...@@ -46,13 +46,13 @@ ...@@ -46,13 +46,13 @@
</div> </div>
</template> </template>
<script> <script>
import { loginOut } from "@/config/loginOut.js";
export default { export default {
data() { data() {
var validatePass = (rule, value, callback) => { var validatePass = (rule, value, callback) => {
if (value === "") { if (value === "") {
callback(new Error("请输入密码")); callback(new Error("请输入密码"));
} else { } else {
this.$refs.ruleForm.validateField("password");
callback(); callback();
} }
}; };
...@@ -95,7 +95,7 @@ export default { ...@@ -95,7 +95,7 @@ export default {
}, },
handleSubmit() { handleSubmit() {
let _this = this; let _this = this;
this.$refs.validate((valid) => { this.$refs.form.validate((valid) => {
if (valid) { if (valid) {
let requestParams = {}; let requestParams = {};
requestParams.oldPassWord = _this.form.oldPassWord; requestParams.oldPassWord = _this.form.oldPassWord;
...@@ -105,6 +105,7 @@ export default { ...@@ -105,6 +105,7 @@ export default {
{ {
method: "put", method: "put",
url: "tUser/editPwd", url: "tUser/editPwd",
authType: this.backToken,
}, },
requestParams requestParams
) )
...@@ -117,7 +118,7 @@ export default { ...@@ -117,7 +118,7 @@ export default {
type: "success", type: "success",
message: res.data.message, message: res.data.message,
}); });
_this.redirectLogin() _this.redirectLogin();
} else { } else {
_this.$message.error(res.data.message); _this.$message.error(res.data.message);
} }
...@@ -132,10 +133,10 @@ export default { ...@@ -132,10 +133,10 @@ export default {
} }
}); });
}, },
redirectLogin(){ redirectLogin() {
this.$router.push('./login') loginOut();
this.$router.push("./login");
} },
}, },
}; };
</script> </script>
......
@party-red:#9B1E23; @party-red: #9B1E23;
@page-bg-white:#F9F9F9; @page-bg-white: #F9F9F9;
@party-white:#FFFFFF; @party-white: #FFFFFF;
@font-color:#333333; @font-color: #333333;
@party-pink:pink; @party-pink: pink;
@party-border-color:#EEEEEE; @party-border-color: #EEEEEE;
@party-black:#000000; @party-black: #000000;
@party-bg-gray:#F8F8F8; @party-bg-gray: #F8F8F8;
@party-btn-color:#AC9374; @party-btn-color: #AC9374;
@party-table-header-color:#FDFBF8; @party-table-header-color: #FDFBF8;
@party-page-border-color:#DDDDDD; @party-page-border-color: #DDDDDD;
@party-check-bg-color:#F5F5F5; @party-check-bg-color: #F5F5F5;
.f14{ font-size: 14px; }
.f16{ font-size: 14px; } .f14 {
.f18{ font-size: 18px; } font-size: 14px;
.f24{ font-size: 24px; }
.f0{font-size: 0px;}
.inline-block{
display: inline-block;
}
.height100{
height: 100%;
} }
@media screen and (max-width:1600px){
.search-container{ .f16 {
.el-input{ font-size: 14px;
width: 180px; }
}
.btn-group{ .f18 {
.el-button{ font-size: 18px;
width: 80px; }
}
} .f24 {
font-size: 24px;
}
.f0 {
font-size: 0px;
}
.inline-block {
display: inline-block;
}
.height100 {
height: 100%;
}
@media screen and (max-width:1600px) {
.search-container {
.el-input {
width: 180px;
} }
.page-tips{ .btn-group {
width: 365px; .el-button {
width: 80px;
}
} }
}
.page-tips {
width: 365px;
}
} }
@media (min-width:1601px) and (max-width:1800px){
.search-container{ @media (min-width:1601px) and (max-width:1800px) {
.el-input{ .search-container {
width: 220px; .el-input {
} width: 220px;
.btn-group{
.el-button{
width: 96px;
}
}
} }
.page-tips{
width: 460px; .btn-group {
.el-button {
width: 96px;
}
} }
}
.page-tips {
width: 460px;
}
} }
@media (min-width:1801px){
.search-container{ @media (min-width:1801px) {
.el-input{ .search-container {
width: 280px; .el-input {
} width: 280px;
.btn-group{
.el-button{
width: 128px;
}
}
} }
.page-tips{
width: 480px; .btn-group {
.el-button {
width: 128px;
}
} }
}
.page-tips {
width: 480px;
}
} }
.search-container{
background:@party-white; .search-container {
box-shadow: 0 4px 8px 0 rgba(0,0,0,0.10); background: @party-white;
border-radius: 8px; box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.10);
margin-bottom: 20px; border-radius: 8px;
padding: 20px 24px; margin-bottom: 20px;
height: 80px; padding: 20px 24px;
display: flex; height: 80px;
justify-content: space-between; display: flex;
.el-form{ justify-content: space-between;
margin-bottom: 0;
.el-input{ .el-form {
.el-input__inner{ margin-bottom: 0;
border-radius: 22px;
background-color:@party-bg-gray; .el-input {
border-color: @party-border-color; .el-input__inner {
} border-radius: 22px;
} background-color: @party-bg-gray;
.el-range-editor.el-input__inner{ border-color: @party-border-color;
width: 280px; }
border-radius: 22px;
background-color: @party-bg-gray;
.el-range-separator{
width: 20px;
padding: 0 2px;
}
.el-range-input{
background-color: @party-bg-gray;
}
}
.el-input__icon{
width: 40px;
font-size: 20px;
color: @party-btn-color;
}
.btn-group{
padding-left: 15px;
.el-button{
height: 40px;
}
}
} }
.page-tip{
display: flex; .el-range-editor.el-input__inner {
font-size: 14px; width: 280px;
color: @font-color; border-radius: 22px;
.page-tip-title{ background-color: @party-bg-gray;
font-weight: bold;
padding-right: 10px; .el-range-separator {
} width: 20px;
padding: 0 2px;
}
.el-range-input {
background-color: @party-bg-gray;
}
} }
}
.table-content{ .el-input__icon {
height: calc(100% - 100px); width: 40px;
background:@party-white; font-size: 20px;
box-shadow: 0 4px 8px 0 rgb(0 0 0 / 10%); color: @party-btn-color;
border-radius: 8px;
padding: 20px 40px 0 40px;
.btn-group{
text-align: right;
margin-bottom: 12px;
.el-button{
min-width: 128px;
}
}
}
.btn-group{
.el-button{
height: 36px;
padding: 0;
border-radius: 28px;
span {
font-size: 16px;
}
} }
.el-button--primary{
background-color: @party-btn-color; .btn-group {
border-color: @party-btn-color; padding-left: 15px;
color:@party-white ;
.el-button {
height: 40px;
}
} }
.el-button--default{ }
background: rgba(172,147,116,0.10);
border: 1px solid @party-btn-color; .page-tip {
color:@party-btn-color; display: flex;
font-size: 14px;
color: @font-color;
.page-tip-title {
font-weight: bold;
padding-right: 10px;
} }
}
} }
// 系统form 表单样式
.party-form{ .table-content {
.el-input__icon{ height: calc(100% - 100px);
width: 40px; background: @party-white;
font-size: 20px; box-shadow: 0 4px 8px 0 rgba(0,0,0,.3);
color: @party-btn-color; border-radius: 8px;
padding: 20px 40px 0 40px;
.btn-group {
text-align: right;
margin-bottom: 12px;
.el-button {
min-width: 128px;
} }
.el-range-separator{ }
width: 20px; }
padding: 0 2px;
.btn-group {
.el-button {
height: 36px;
padding: 0;
border-radius: 28px;
span {
font-size: 16px;
} }
.el-input{ }
width: 280px;
.el-input__inner{ .el-button--primary {
border-radius: 22px; background-color: @party-btn-color;
background-color: @party-bg-gray; border-color: @party-btn-color;
border: 1px solid @party-border-color; color: @party-white ;
} }
.el-button--default {
background: rgba(172, 147, 116, 0.10);
border: 1px solid @party-btn-color;
color: @party-btn-color;
}
}
// 系统form 表单样式
.party-form {
.el-input__icon {
width: 40px;
font-size: 20px;
color: @party-btn-color;
}
.el-date-editor {
.el-range-separator {
width: 20px;
padding: 0 2px;
} }
.el-textarea .el-textarea__inner{ }
background-color: @party-bg-gray; .el-input {
border-radius: 8px; width: 280px;
.el-input__inner {
border-radius: 22px;
background-color: @party-bg-gray;
border: 1px solid @party-border-color;
} }
.el-range-editor.el-input__inner{ }
width: 280px;
border-radius: 22px; .el-textarea .el-textarea__inner {
background-color: @party-bg-gray;
border-radius: 8px;
}
.el-range-editor.el-input__inner {
width: 280px;
border-radius: 22px;
}
.mt16 {
margin-top: 16px;
}
.el-radio-group {
.el-radio__inner {
width: 24px;
height: 24px;
border-color: @party-border-color;
} }
.mt16{
margin-top: 16px; .el-radio__label {
font-size: 16px;
} }
.el-radio-group{
.el-radio__inner{ .el-radio.is-checked {
width: 24px; .el-radio__input.is-checked {
height: 24px; .el-radio__inner {
border-color: @party-border-color; background-color: transparent;
border-color: @party-border-color;
&:after {
width: 10px;
height: 10px;
background-color: @party-btn-color;
}
} }
.el-radio__label{ }
font-size: 16px;
.el-radio__label {
color: @font-color;
}
}
}
.el-checkbox-group {
.el-checkbox {
margin-right: 25px;
.el-checkbox__inner {
width: 22px;
height: 22px;
&:hover {
border-color: @party-border-color;
} }
.el-radio.is-checked{ }
.el-radio__input.is-checked{
.el-radio__inner{ .el-checkbox__label {
background-color: transparent; color: @font-color
border-color: @party-border-color; }
&:after{
width: 10px; &+.el-checkbox {
height: 10px; margin-left: 0;
background-color: @party-btn-color; }
}
} &.is-checked {
} .el-checkbox__inner {
.el-radio__label{ border-color: @party-border-color;
color: @font-color; background-color: @party-check-bg-color;
}
&:after {
border: 2px solid #AC9374;
border-left: 0;
border-top: 0;
height: 11px;
left: 7px;
width: 5px;
}
} }
} .el-checkbox__label {
.el-checkbox-group{ color: @font-color
.el-checkbox{
margin-right: 25px;
.el-checkbox__inner{
width: 22px;
height: 22px;
&:hover{
border-color: @party-border-color;
}
}
.el-checkbox__label{
color: @font-color
}
& +.el-checkbox{
margin-left: 0;
}
&.is-checked{
.el-checkbox__inner{
border-color: @party-border-color;
background-color: @party-check-bg-color;
&:after{
border: 2px solid #AC9374;
border-left:0;
border-top: 0;
height: 11px;
left:7px;
width: 5px;
}
}
.el-checkbox__label{
color: @font-color
}
}
} }
}
} }
}
} }
// 适用于修改密码 app 界面定义样式 // 适用于修改密码 app 界面定义样式
.page-form-box{ .page-form-box {
background: @party-white; background: @party-white;
box-shadow: 0 4px 8px 0 rgba(0,0,0,0.10); box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.10);
border-radius: 8px; border-radius: 8px;
height: 100%; height: 100%;
.page-form-box-header{
height: 64px; .page-form-box-header {
line-height: 64px; height: 64px;
text-align: center; line-height: 64px;
border-bottom: 1px solid @party-border-color; text-align: center;
font-size: 20px; border-bottom: 1px solid @party-border-color;
color: @font-color; font-size: 20px;
text-align: center; color: @font-color;
font-weight: bold; text-align: center;
} font-weight: bold;
.page-form-box-content{ }
height: calc(100% - 148px);
padding: 20px; .page-form-box-content {
} height: calc(100% - 148px);
.page-form-box-footer{ padding: 20px;
height: 84px; }
line-height: 84px;
text-align: center; .page-form-box-footer {
border-top: 1px solid @party-border-color; height: 84px;
.el-button{ line-height: 84px;
width: 160px; text-align: center;
height: 40px; border-top: 1px solid @party-border-color;
}
.el-button {
width: 160px;
height: 40px;
} }
}
} }
.imgSize{ .imgSize {
width: 160px; width: 160px;
height: 100px; height: 100px;
} }
.iconImg{
height: 32px; .iconImg {
width: 32px; height: 32px;
margin-right: 8px; width: 32px;
margin-right: 8px;
} }
.w50{
width: 50%; .w50 {
width: 50%;
} }
.w100{
width:100%; .w100 {
width: 100%;
} }
.selectH100{
height:100px; .selectH100 {
overflow: auto; height: 100px;
overflow: auto;
} }
// 内容、审核详情页 // 内容、审核详情页
.info { .info {
height: 100%; height: 100%;
width: 100%;
overflow: hidden;
.info-header {
font-size: 20px;
padding: 20px;
height: 68px;
width: 100%; width: 100%;
overflow: hidden; vertical-align: middle;
.info-header { text-align: center;
font-size: 20px;
padding: 20px; border-bottom: 2px solid #eee;
height: 68px; }
width: 100%;
vertical-align: middle; .info-wrapper {
text-align: center; height: 100%;
width: 640px;
border-bottom: 2px solid #eee; margin: 0 auto;
} background: #fff;
.info-wrapper {
height: 100%; .pageTips {
width: 640px; height: 72px;
margin: 0 auto; padding: 16px;
background: #fff; background: #F7F5F2;
.pageTips{ border-radius: 8px;
height: 72px; margin: 10px 0;
padding:16px;
background: #F7F5F2;
border-radius: 8px;
margin:10px 0;
}
.el-collapse-item__header.is-active {
border-bottom-color: #eeeeee;
}
}
.info-container {
width: 100%;
height: calc(100% - 156px);
overflow-y: auto;
overflow-x: hidden;
}
.info-footer {
height: 88px;
border-top: 2px solid #eee;
padding: 20px;
text-align: center;
.el-button{
width: 160px;
height: 40px;
} }
.el-collapse-item__header.is-active {
border-bottom-color: #eeeeee;
}
}
.info-container {
width: 100%;
height: calc(100% - 156px);
overflow-y: auto;
overflow-x: hidden;
}
.info-footer {
height: 88px;
border-top: 2px solid #eee;
padding: 20px;
text-align: center;
.el-button {
width: 160px;
height: 40px;
} }
} }
// 适用于统计详情样式
.overview-detail{
.ecahrts-panel-box{
height: calc(50% + 20px);
}
.rank-panel-box{
height: calc(50% - 40px);
margin-top: 20px;
}
.ecahrts-panel-box,
.rank-panel-box{
background:@party-white;
box-shadow: 0 4px 8px 0 rgba(221,221,221,0.40);
border-radius: 8px;
}
.panel-box-header{
height: 64px;
line-height: 64px;
border-bottom: 1px solid @party-border-color;
padding: 0 24px;
.title{
font-weight: bold;
font-size: 20px;
}
.tip{
float: right;
color: @font-color;
.tip-title{
font-weight: bold;
padding-right: 10px;
}
}
.el-range-editor.el-input__inner{
width: 280px;
border-radius: 22px;
background-color: @party-bg-gray;
margin-left: 40px;
padding-left:15px;
.el-range-input{
background-color: @party-bg-gray;
}
.el-range-separator{
width: 20px;
padding: 0 2px;
}
.el-icon-date{
color: @party-btn-color;
font-size: 18px;
}
}
}
.panel-box-content{
height: calc(100% - 64px);
overflow: hidden;
}
.rank-box{
width: 50%;
&.left{
padding-right: 10px;
}
&.right{
padding-left: 10px;
}
}
}
.party-icon-20{
display:inline-block;
width: 20px;
height: 20px;
background-repeat: no-repeat;
background-size: cover;
}
.party-icon-24{
display:inline-block;
width: 24px;
height: 24px;
background-repeat: no-repeat;
background-size: cover;
}
.icon-add{
background-image: url("~@/assets/icons/add.png");
}
.icon-import{
background-image: url("~@/assets/icons/import.png");
}
.icon-detail{
background-image: url("~@/assets/icons/detail.png");
}
.icon-edit{
background-image: url("~@/assets/icons/edit.png");
}
.icon-reset{
background-image: url("~@/assets/icons/reset.png");
}
.icon-enable{
background-image: url("~@/assets/icons/enable.png");
}
.icon-disable{
background-image: url("~@/assets/icons/disable.png");
}
.icon-del{
background-image: url("~@/assets/icons/del.png");
}
.icon-org{
display: inline-block;
width: 16px;
height: 16px;
background-repeat: no-repeat;
background-size: cover;
background-image: url("~@/assets/icons/org.png");
margin-right: 8px;
} }
// 组织树结构样式
.org-tree{ // 适用于统计详情样式
// expand 三角icon .overview-detail {
.el-tree-node__expand-icon{ .ecahrts-panel-box {
position: absolute; height: calc(50% + 20px);
right: 10px; }
top: 14px;
color: #000000; .rank-panel-box {
font-size: 16px; height: calc(50% - 40px);
&.is-leaf{ margin-top: 20px;
color: transparent; }
}
.ecahrts-panel-box,
.rank-panel-box {
background: @party-white;
box-shadow: 0 4px 8px 0 rgba(221, 221, 221, 0.40);
border-radius: 8px;
}
.panel-box-header {
height: 64px;
line-height: 64px;
border-bottom: 1px solid @party-border-color;
padding: 0 24px;
.title {
font-weight: bold;
font-size: 20px;
} }
.el-tree-node{
background-color: @party-white; .tip {
&.is-current{ float: right;
>.el-tree-node__content{ color: @font-color;
.custom-tree-node{
background-color: @party-border-color; .tip-title {
} font-weight: bold;
} padding-right: 10px;
}
}
} }
.el-tree-node__content{
height: auto; .el-range-editor.el-input__inner {
position: relative; width: 280px;
background-color: transparent !important; border-radius: 22px;
&:hover{ background-color: @party-bg-gray;
background-color: transparent; margin-left: 40px;
} padding-left: 15px;
.el-range-input {
background-color: @party-bg-gray;
}
.el-range-separator {
width: 20px;
padding: 0 2px;
}
.el-icon-date {
color: @party-btn-color;
font-size: 18px;
}
} }
div[class*="tree-node-level"]{ }
width: 100%;
color: @font-color; .panel-box-content {
border-radius: 5px; height: calc(100% - 64px);
overflow: hidden;
}
.rank-box {
width: 50%;
&.left {
padding-right: 10px;
} }
.tree-node-level1,
.tree-node-level2{ &.right {
span{ padding-left: 10px;
font-size: 16px;
}
} }
.tree-node-level3{ }
span{ }
font-size: 14px;
} .party-icon-20 {
display: inline-block;
width: 20px;
height: 20px;
background-repeat: no-repeat;
background-size: cover;
}
.party-icon-24 {
display: inline-block;
width: 24px;
height: 24px;
background-repeat: no-repeat;
background-size: cover;
}
.icon-add {
background-image: url("~@/assets/icons/add.png");
}
.icon-import {
background-image: url("~@/assets/icons/import.png");
}
.icon-detail {
background-image: url("~@/assets/icons/detail.png");
}
.icon-edit {
background-image: url("~@/assets/icons/edit.png");
}
.icon-reset {
background-image: url("~@/assets/icons/reset.png");
}
.icon-enable {
background-image: url("~@/assets/icons/enable.png");
}
.icon-disable {
background-image: url("~@/assets/icons/disable.png");
}
.icon-del {
background-image: url("~@/assets/icons/del.png");
}
.icon-org {
display: inline-block;
width: 16px;
height: 16px;
background-repeat: no-repeat;
background-size: cover;
background-image: url("~@/assets/icons/org.png");
margin-right: 8px;
}
// 组织树结构样式
.org-tree {
// expand 三角icon
.el-tree-node__expand-icon {
position: absolute;
right: 10px;
top: 14px;
color: #000000;
font-size: 16px;
&.is-leaf {
color: transparent;
} }
.tree-node-level1{ }
height: 56px;
line-height: 56px; .el-tree-node {
border-bottom: 1px solid @party-border-color; background-color: @party-white;
padding-left: 5px;
&.is-current {
>.el-tree-node__content {
.custom-tree-node {
background-color: @party-border-color;
}
}
} }
.tree-node-level2, }
.tree-node-level3{
height: 40px; .el-tree-node__content {
line-height: 40px; height: auto;
margin: 5px 0; position: relative;
border-radius: 20px; background-color: transparent !important;
padding-left: 10px;
&:hover {
background-color: transparent;
} }
.tree-node-level2:hover{ }
background-color: @party-table-header-color;
div[class*="tree-node-level"] {
width: 100%;
color: @font-color;
border-radius: 5px;
}
.tree-node-level1,
.tree-node-level2 {
span {
font-size: 16px;
} }
.tree-node-level3:hover{
background-color: @party-border-color; }
.tree-node-level3 {
span {
font-size: 14px;
} }
}
.tree-node-level1 {
height: 56px;
line-height: 56px;
border-bottom: 1px solid @party-border-color;
padding-left: 5px;
}
.tree-node-level2,
.tree-node-level3 {
height: 40px;
line-height: 40px;
margin: 5px 0;
border-radius: 20px;
padding-left: 10px;
}
.tree-node-level2:hover {
background-color: @party-table-header-color;
}
.tree-node-level3:hover {
background-color: @party-border-color;
}
} }
...@@ -20,6 +20,9 @@ ...@@ -20,6 +20,9 @@
} }
.el-pager{ .el-pager{
padding-left: 20px; padding-left: 20px;
li:hover {
color: @party-btn-color;
}
li.number{ li.number{
width: 40px; width: 40px;
height: 40px; height: 40px;
......
...@@ -26,6 +26,10 @@ ...@@ -26,6 +26,10 @@
.el-button{ .el-button{
border: none; border: none;
padding: 0; padding: 0;
&.is-circle{
padding: 0;
background-color: transparent;
}
} }
} }
.icon-table{ .icon-table{
......
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