Skip to content

M
mes-ui
Commit 404b8207 authored by 仇晓婷's avatar 仇晓婷
Browse files
Options

Merge branch 'master' of http://git.mes123.com/zhouyx/mes-ui

parents 3807f686 d7a69957
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 312 additions and 271 deletions
pages/aps/dispatch/dispatch.less
View file @ 404b8207
...@@ -39,11 +39,11 @@ ...@@ -39,11 +39,11 @@
} }
} }
.ivu-card-head{ .ivu-card-head{
background: #62b8af!important; background: #2d8cf0!important;
} }
} }
.g_title{ .g_title{
color: #249e91; color: #2d8cf0;
} }
} }
.dispatch_card02{ .dispatch_card02{
...@@ -86,9 +86,9 @@ ...@@ -86,9 +86,9 @@
.drawer_center{ .drawer_center{
text-align: center; text-align: center;
padding: 10px; padding: 10px;
color: #249e91; color: #2d8cf0;
.color{ .color{
color: #2680EB; color: #2d8cf0;
} }
} }
} }
...@@ -106,9 +106,9 @@ ...@@ -106,9 +106,9 @@
.drawer_center{ .drawer_center{
text-align: center; text-align: center;
padding: 10px; padding: 10px;
color: #249e91; color: #2d8cf0;
.color{ .color{
color: #2680EB; color: #2d8cf0;
} }
} }
} }
......
pages/aps/dispatch/index.vue
View file @ 404b8207
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
<Icon <Icon
type="ios-disc" type="ios-disc"
size="18" size="18"
:color="item.id==shebeiId?'#249e91':'#fff'" :color="item.id==shebeiId?'#2d8cf0':'#fff'"
/> />
<input <input
name="shebei" name="shebei"
......
pages/basicData/user/index.vue
View file @ 404b8207
This diff is collapsed.
pages/crm/statistical/card.less
View file @ 404b8207
...@@ -59,14 +59,42 @@ ...@@ -59,14 +59,42 @@
width: 40px; width: 40px;
height: 40px; height: 40px;
border-radius: 50%; border-radius: 50%;
background: #249e91; // background: #249e91;
float: left; float: left;
margin: 12px 10px 0 5px; margin: 12px 10px 0 5px;
.img_bg01 {
display: inline-block;
width: 40px;
height: 40px;
border-radius: 50%;
background: #249e91;
}
.img_bg02 {
display: inline-block;
width: 40px;
height: 40px;
border-radius: 50%;
background: #0099FF;
}
.img_bg03 {
display: inline-block;
width: 40px;
height: 40px;
border-radius: 50%;
background: #FF7A8B;
}
.img_bg04 {
display: inline-block;
width: 40px;
height: 40px;
border-radius: 50%;
background: #FFC300;
}
.Icon_bg { .Icon_bg {
text-align: center; text-align: center;
padding: 10px 0 0; padding: 10px 0 0;
img.Icon_icon { img.Icon_icon {
width: 18px; width: 20px;
} }
} }
} }
......
pages/crm/statistical/costomer/todolist.vue
View file @ 404b8207
...@@ -18,8 +18,10 @@ ...@@ -18,8 +18,10 @@
:key="index" :key="index"
> >
<div class="leftIcon"> <div class="leftIcon">
<div class="Icon_bg"> <div class="Icon_bg" :class="item.name=='物料复验' ? 'img_bg02':(item.name=='产品合格证' ? 'img_bg03':(item.name=='生产执行' ? 'img_bg04' : 'img_bg01'))" >
<img class="Icon_icon" :src="imgUrl + item.image" alt /> <!-- <div > -->
<img class="Icon_icon" src="@/assets/imgicon/u1640.png" alt="">
<!-- <img class="Icon_icon" :src="imgUrl + item.image" alt /> -->
</div> </div>
</div> </div>
<div class="h60"> <div class="h60">
......
pages/handle/task.vue
View file @ 404b8207
<style>
/* @font-face {
font-family: 'iconfont';
src: url('./iconfont/iconfont.eot');
src: url('./iconfont/iconfont.eot?#iefix') format('embedded-opentype'),
url('./iconfont/iconfont.woff2') format('woff2'),
url('./iconfont/iconfont.woff') format('woff'),
url('./iconfont/iconfont.ttf') format('truetype'),
url('./iconfont/iconfont.svg#iconfont') format('svg');
}
.iconfont {
font-family: "iconfont" !important;
font-size: 32px;
font-weight: bold;
/* font-style: normal;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
color:#249e91;
} */
.img_bg {
display: inline-block;
width: 48px;
height: 48px;
border-radius: 50%;
background: #249e91;
}
.img_icon {
width: 24px;
margin: 23% 0 0 0;
}
</style>
<template> <template>
<div style="width:100%"> <div style="width:100%">
<Card <Card
...@@ -41,9 +11,9 @@ ...@@ -41,9 +11,9 @@
<div class="leftIco"> <div class="leftIco">
<!-- color:rgba(36, 158, 145, 1) --> <!-- color:rgba(36, 158, 145, 1) -->
<!-- <span class="iconfont">&#xe607;</span> --> <!-- <span class="iconfont">&#xe607;</span> -->
<div class="img_bg"> <div :class="item.name=='物料复验' ? 'img_bg02':(item.name=='产品合格证' ? 'img_bg03':(item.name=='生产执行' ? 'img_bg04' : 'img_bg01'))" >
<img class="img_icon" :src="imgUrl + item.image" alt /> <!-- <img class="img_icon" :src="imgUrl + item.image" alt /> -->
<!-- <img class="img_icon" src="@/assets/imgicon/u1650.png" alt=""> --> <img class="img_icon" src="@/assets/imgicon/u1640.png" alt="">
</div> </div>
<!-- <command icon="@/assets/imgicon/u1638.png"> --> <!-- <command icon="@/assets/imgicon/u1638.png"> -->
<!-- <Icon type="md-analytics" size="36" color="#249e91" /> --> <!-- <Icon type="md-analytics" size="36" color="#249e91" /> -->
...@@ -82,6 +52,7 @@ export default { ...@@ -82,6 +52,7 @@ export default {
return (data.totalUrl = r.result) return (data.totalUrl = r.result)
}) })
}) })
console.log(list)
this.listTask = list this.listTask = list
}) })
}, },
...@@ -93,6 +64,38 @@ export default { ...@@ -93,6 +64,38 @@ export default {
} }
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.img_bg01 {
display: inline-block;
width: 48px;
height: 48px;
border-radius: 50%;
background: #249e91;
}
.img_bg02 {
display: inline-block;
width: 48px;
height: 48px;
border-radius: 50%;
background: #0099FF;
}
.img_bg03 {
display: inline-block;
width: 48px;
height: 48px;
border-radius: 50%;
background: #FF7A8B;
}
.img_bg04 {
display: inline-block;
width: 48px;
height: 48px;
border-radius: 50%;
background: #FFC300;
}
.img_icon {
width: 24px;
margin: 23% 0 0 0;
}
.waitTask { .waitTask {
cursor: pointer; cursor: pointer;
margin-bottom: 10px; margin-bottom: 10px;
......
pages/order/quotation/index.vue
View file @ 404b8207
...@@ -145,7 +145,6 @@ import PhotosensitiveDetails from "./components/photosensitiveDetails.vue"; // ...@@ -145,7 +145,6 @@ import PhotosensitiveDetails from "./components/photosensitiveDetails.vue"; //
import MetalQuotationGeneration from "./components/metalQuotationGeneration.vue"; //生成报价单弹框 import MetalQuotationGeneration from "./components/metalQuotationGeneration.vue"; //生成报价单弹框
import PhotosensitiveGeneration from "./components/photosensitiveGeneration.vue"; //生成报价单弹框 import PhotosensitiveGeneration from "./components/photosensitiveGeneration.vue"; //生成报价单弹框
export default { export default {
components: { components: {
DrawerSet, DrawerSet,
......
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