Commit 40e99520 authored by 仇晓婷's avatar 仇晓婷

字体颜色

parent 0ae95bab
......@@ -19,5 +19,11 @@
//收藏夹自体图标颜色
@icon-color: #2680eb;
//首页标题颜色
@title-color: #0099ff;
//表格、表单 以及其他字体颜色
@table-color:#515A6E;
//弹框颜色
@modal-header-bg-color: #515A6E;
......@@ -183,7 +183,7 @@
vertical-align: middle;
float: left;
font-size: 14px;
color: #515a6e;
color: @table-color;
line-height: 1;
padding: 10px 12px 10px 0;
box-sizing: border-box;
......@@ -256,7 +256,10 @@
}
}
//表格字体颜色
.ivu-table {
color:@table-color !important;
}
//校验不通过下面提示红色小字
.ivu-form-item-error-tip {
position: absolute;
......
......@@ -403,6 +403,7 @@ export default {
};
</script>
<style lang="less">
@import "../../assets/css/custom.less";
.userSelect {
.users {
width: 100%;
......@@ -460,7 +461,7 @@ export default {
display: inline-block;
background: rgba(38, 128, 235, 0.1);
border: 2px solid transparent;
color: #515a6e;
color: @table-color;
margin: 10px;
a {
display: inline-flex;
......
......@@ -324,6 +324,7 @@ export default {
};
</script>
<style lang="less">
@import "../../assets/css/custom.less";
.userSelect {
.users {
width: 100%;
......@@ -381,7 +382,7 @@ export default {
display: inline-block;
background: rgba(38, 128, 235, 0.1);
border: 2px solid transparent;
color: #515a6e;
color: @table-color;
margin: 10px;
a {
display: inline-flex;
......
......@@ -320,6 +320,7 @@ export default {
};
</script>
<style lang="less" scoped>
@import "../../../assets/css/custom.less";
.addclass {
border-color: rgba(38, 128, 235, 0.2) !important;
.title-i {
......@@ -358,7 +359,7 @@ export default {
padding: 0 8px;
height: 34px;
line-height: 34px;
color: #515a6e;
color: @table-color;
background: #e4e6ed;
.order-ringht {
text-align: right;
......@@ -378,7 +379,7 @@ export default {
padding: 0 8px;
height: 32px;
line-height: 32px;
color: #515a6e;
color:@table-color;
}
}
}
......
......@@ -402,14 +402,14 @@ export default {
}
};
</script>
<style lang="less" scoped>
<style lang="less">
@import "../../../assets/css/custom.less";
.addclass {
border-color: rgba(38, 128, 235, 0.5) !important;
.title-i {
background: rgba(38, 128, 235, 0.5) !important;
}
}
.scheduling {
display: flex;
display: -webkit-flex;
......@@ -451,7 +451,7 @@ export default {
padding: 0 8px;
height: 34px;
line-height: 34px;
color: #515a6e;
color: @table-color;
background: #e4e6ed;
.order-ringht {
text-align: right;
......@@ -471,7 +471,7 @@ export default {
padding: 0 8px;
height: 32px;
line-height: 32px;
color: #515a6e;
color: @table-color;
}
}
}
......@@ -533,13 +533,11 @@ export default {
}
}
}
</style>
<style lang="less">
.right-body {
.list {
.s0 {
color: #515a6e !important;
color:@table-color !important;
}
}
}
</style>
\ No newline at end of file
</style>
......@@ -245,6 +245,7 @@ export default {
};
</script>
<style lang="less">
@import "../../../assets/css/custom.less";
.addclass {
border-color: #249e91 !important;
.title-i {
......@@ -304,7 +305,7 @@ export default {
.fa {
height: 30px;
line-height: 30px;
color: #515a6e;
color:@table-color;
}
}
}
......@@ -343,7 +344,7 @@ export default {
height: 28px;
line-height: 28px;
.fa {
color: #515a6e;
color: @table-color;
}
}
}
......
......@@ -128,10 +128,10 @@ export default {
Add,
Edit,
Detail,
Search
Search,
},
props: {
stage: Number
stage: Number,
},
async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典
......@@ -152,62 +152,62 @@ export default {
addId: {
projectId: 0,
customerId: 0,
principal: 0
principal: 0,
},
getSearch: {
conditions: [
{
fieldName: "stage",
fieldValue: "1",
conditionalType: "Equal"
conditionalType: "Equal",
},
{
fieldName: "",
fieldValue: "",
conditionalType: "Equal"
}
conditionalType: "Equal",
},
],
pageSize: 1000
pageSize: 1000,
},
listOperation: [],
easySearch: {
keys: { op: "deliverable", value: null },
stage: { op: "Equal", value: null },
projectId: { op: "Equal", value: null }
projectId: { op: "Equal", value: null },
},
addModal: false,
editModal: false,
detailModal: false,
deletelModal: false,
curId: 0,
columns: [{ key: "id", title: this.l("id"), hide: true, align: "left" }]
columns: [{ key: "id", title: this.l("id"), hide: true, align: "left" }],
};
},
filters: {
filterFun: function(value) {
filterFun: function (value) {
if (value && value.length > 8) {
value = value.substring(0, 8) + "...";
}
return value;
},
filterFun2: function(value) {
filterFun2: function (value) {
if (value && value.length > 15) {
value = value.substring(0, 15) + "...";
}
return value;
}
},
},
created() {
this.getList(1);
},
computed: {
productList() {
return this.list.filter(u => {
return this.list.filter((u) => {
return u.name.indexOf(this.keys) > -1;
});
}
},
},
methods: {
clickSearch() {
......@@ -217,7 +217,7 @@ export default {
},
getList(v) {
this.getSearch.conditions[0].fieldValue = v + "";
Api.pagedList(this.getSearch).then(r => {
Api.pagedList(this.getSearch).then((r) => {
if (r.success) {
this.list = r.result;
this.search();
......@@ -265,7 +265,7 @@ export default {
this.curId = id;
},
removeOk() {
Api.delete({ id: this.curId }).then(r => {
Api.delete({ id: this.curId }).then((r) => {
if (r.success) {
this.$refs.grid.load();
this.deletelModal = false;
......@@ -286,7 +286,7 @@ export default {
l(key) {
let vkey = "Follow" + "." + key;
return this.$t(vkey) || key;
}
},
},
watch: {
stage(v) {
......@@ -297,11 +297,12 @@ export default {
if (v) {
this.search();
}
}
}
},
},
};
</script>
<style lang="less" scoped>
@import "../../../assets/css/custom.less";
.addclass {
border-color: #515a6e !important;
.title-i {
......@@ -388,7 +389,7 @@ export default {
color: #fff;
}
a:hover {
color: #515a6e;
color: @table-color;
}
}
}
......@@ -396,7 +397,7 @@ export default {
background: rgba(167, 184, 204, 0.2);
padding: 5px 8px;
.fa {
color: #515a6e;
color: @table-color;
height: 26px;
line-height: 26px;
}
......
......@@ -518,11 +518,12 @@ export default {
}
</script>
<style lang='less'>
@import "../../assets/css/custom.less";
.ivu-table-wrapper {
overflow: inherit;
}
.userstyle {
color: #515a6e;
color: @table-color;
display: block;
width: 100%;
padding: 4px;
......
......@@ -105,17 +105,18 @@ export default {
};
</script>
<style lang="less" scoped>
@import "../../../assets/css/custom.less";
.approval {
background: rgba(255, 255, 255, 1);
background: @card-bg;
box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.16);
border-radius: 8px;
}
.row_head {
height: 30px;
color: #0099ff;
color: @title-color;
border-bottom: 1px solid #dcdfe6;
a {
color: #0099ff;
color: @title-color;
}
}
.row_card_body {
......
......@@ -213,7 +213,7 @@ export default {
.row_head {
height: 35px;
line-height: 30px;
color: #0099ff;
color: @title-color;
margin-left: 10px;
border-bottom: 1px solid #dcdfe6;
}
......
......@@ -337,7 +337,7 @@ export default {
.row_head {
height: 35px;
line-height: 30px;
color: #0099ff;
color: @title-color;
margin: 0 10px;
border-bottom: 1px solid #dcdfe6;
.geng-duo {
......
......@@ -208,7 +208,7 @@ export default {
height: 35px;
line-height: 30px;
margin-left: 10px;
color: #0099ff;
color:@title-color;
border-bottom: 1px solid #dcdfe6;
}
}
......
......@@ -191,7 +191,7 @@ export default {
.row_head {
height: 35px;
line-height: 30px;
color: #0099ff;
color:@title-color;
// margin: 0 10px;
border-bottom: 1px solid #dcdfe6;
.geng-duo {
......
......@@ -94,18 +94,19 @@ export default {
};
</script>
<style lang="less" scoped>
@import "../../../assets/css/custom.less";
.todolist-u {
background: rgba(255, 255, 255, 1);
background: @card-bg;
box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.16);
border-radius: 8px;
}
.row_head {
height: 35px;
line-height: 30px;
color: #0099ff;
color: @title-color;
border-bottom: 1px solid #dcdfe6;
a {
color: #0099ff;
color: @title-color;
}
}
.msg {
......
......@@ -310,7 +310,7 @@ export default {
.row_head {
height: 35px;
line-height: 30px;
color: #0099ff;
color: @title-color;
margin-left: 10px;
border-bottom: 1px solid #dcdfe6;
.geng-duo {
......
@import "../../assets/css/custom.less";
.transmit_box {
height: 100%;
}
......@@ -49,7 +50,7 @@
.state {
float: right;
color: #515a6e;
color: @table-color;
padding: 5px 5px;
}
......
......@@ -531,11 +531,12 @@ export default {
}
</script>
<style lang='less'>
@import "../../assets/css/custom.less";
.ivu-table-wrapper {
overflow: inherit;
}
.userstyle {
color: #515a6e;
color:@table-color;
display: block;
width: 100%;
padding: 4px;
......
......@@ -190,7 +190,7 @@ export default {
v = 0;
}
// this.$set(this.entity.customProperties,u.filed,v)
// this.entity[u.field] = "";
this.entity.json[u.field] = "";
this.$set(this.entity, u.filed, v);
});
......
......@@ -374,6 +374,7 @@ export default {
</script>
<style lang="less">
@import "../../../assets/css/custom.less";
.classification {
font-family: Microsoft YaHei;
......@@ -436,7 +437,7 @@ export default {
line-height: 34px;
font-size: 14px;
text-align: center;
color: #515a6e;
color: @table-color;
border-top-right-radius: 5px;
border-bottom-right-radius: 5px;
background: #ffffff;
......
This diff is collapsed.
......@@ -153,6 +153,7 @@ export default {
};
</script>
<style lang="less" >
@import "../../../assets/css/custom.less";
.order-bill {
.bill {
display: flex;
......@@ -221,12 +222,12 @@ export default {
height: 30px;
}
div:nth-child(1) {
color: #515a6e;
color: @table-color;
font-size: 16px;
font-weight: bold;
}
div:nth-child(2) {
color: #515a6e;
color:@table-color;
font-size: 14px;
}
div:nth-child(3),
......@@ -246,7 +247,7 @@ export default {
// float: left;
div:nth-child(1),
div:nth-child(2) {
color: #515a6e;
color:@table-color;
}
}
.gong-dan1 {
......
@import "../../../assets/css/custom.less";
.execute_box{
//position: relative;
margin: 0px -10px;
......@@ -742,7 +742,7 @@
.div_card{
display: inline-block;
// margin: 15px 43px;
color: #515a6e;
color: @table-color;
}
}
.zhuanx{
......
......@@ -54,6 +54,7 @@ export default {
};
</script>
<style lang="less" >
@import "../../../assets/css/custom.less";
.product-mix {
font-family: Microsoft YaHei;
......@@ -84,7 +85,7 @@ export default {
line-height: 34px;
font-size: 14px;
text-align: center;
color: #515a6e;
color: @table-color;
border-top-right-radius: 5px;
border-bottom-right-radius: 5px;
background: #ffffff;
......
@import "../../../assets/css/custom.less";
@menuSideWidthCollapse: 80px;
@menuHeaderHeight: 64px;
@headerTriggerMinPadding: 0 12px;
......@@ -406,7 +407,7 @@
margin-right: 6px;
color: #808695;
&:hover{
color: #515a6e;
color: @table-color;
}
}
.ivu-tabs.ivu-tabs-card > .ivu-tabs-bar .ivu-tabs-tab-active{
......
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