Skip to content

M
mes-ui
Commit 9b108084 authored by renjintao's avatar renjintao
Browse files
Options

Merge branch 'product' of git.mes123.com:zhouyx/mes-ui into product-rjt

parents 740242ea 6ec99da9
Hide whitespace changes
Inline Side-by-side
Showing with 106 additions and 77 deletions
pages/home/component/materielChart.vue
View file @ 9b108084
...@@ -204,7 +204,7 @@ export default { ...@@ -204,7 +204,7 @@ export default {
margin: 0 auto; margin: 0 auto;
.echarts-map { .echarts-map {
width: 100%; width: 100%;
height: 300px; height: 280px;
.echarts { .echarts {
height: 280px; height: 280px;
} }
......
pages/home/component/staChart.vue
View file @ 9b108084
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<div class="echarts-map"> <div class="echarts-map">
<v-chart <v-chart
:options="braking" :options="braking"
:style="setStatistics?{width:'350px',height:'300px'}:{width:'100%',height:'100%'}" :style="setStatistics?{width:'400px',height:'270px'}:{width:'100%',height:'100%'}"
/> />
</div> </div>
</Col> </Col>
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
<div class="echarts-map"> <div class="echarts-map">
<v-chart <v-chart
:options="braking1" :options="braking1"
:style="setStatistics?{width:'800px',height:'300px'}:{width:'100%',height:'100%'}" :style="setStatistics?{width:'800px',height:'270px'}:{width:'100%',height:'100%'}"
/> />
</div> </div>
</Col> </Col>
...@@ -325,7 +325,7 @@ export default { ...@@ -325,7 +325,7 @@ export default {
padding: 10px; padding: 10px;
.echarts-map { .echarts-map {
width: 100%; width: 100%;
height: 300px; height: 270px;
.echarts { .echarts {
width: 100%; width: 100%;
height: 100%; height: 100%;
......
pages/home/component/suspendChart.vue
View file @ 9b108084
<template> <template>
<div class="stachart" :style="setStatistics?{width:'620px',height:'300px'}:{width:'100%',height:'100%'}"> <div
class="stachart"
:style="setStatistics?{width:'620px',height:'280px'}:{width:'100%',height:'100%'}"
>
<div class="row_head" v-if="setStatistics?false:true"> <div class="row_head" v-if="setStatistics?false:true">
<Icon type="ios-images" class="f20" /> <Icon type="ios-images" class="f20" />
<span class="ml10">暂停任务统计</span> <span class="ml10">暂停任务统计</span>
...@@ -96,7 +99,8 @@ export default { ...@@ -96,7 +99,8 @@ export default {
grid: { grid: {
left: "3%", left: "3%",
right: "4%", right: "4%",
bottom: "3%", bottom: "5%",
top: "8%",
containLabel: true, containLabel: true,
}, },
tooltip: { tooltip: {
...@@ -197,7 +201,7 @@ export default { ...@@ -197,7 +201,7 @@ export default {
.echarts-map { .echarts-map {
width: 100%; width: 100%;
height: 300px; height: 280px;
.echarts { .echarts {
height: 280px; height: 280px;
} }
......
pages/home/component/unqualifiedEcharts.vue
View file @ 9b108084
...@@ -9,13 +9,13 @@ ...@@ -9,13 +9,13 @@
<div class="echarts-map"> <div class="echarts-map">
<v-chart <v-chart
:options="braking" :options="braking"
:style="setStatistics?{width:'400px',height:'300px'}:{width:'100%',height:'100%'}" :style="setStatistics?{width:'380px',height:'280px'}:{width:'100%',height:'100%'}"
/> />
</div> </div>
</Col> </Col>
<Col :span="16"> <Col :span="16">
<div class="table-b"> <div class="table-b">
<Table border :columns="columns1" :data="data1" height="280"></Table> <Table border :columns="columns1" :data="data1" height="260"></Table>
</div> </div>
</Col> </Col>
</Row> </Row>
...@@ -185,7 +185,7 @@ export default { ...@@ -185,7 +185,7 @@ export default {
width: 100%; width: 100%;
.echarts-map { .echarts-map {
width: 100%; width: 100%;
height: 300px; height: 280px;
.echarts { .echarts {
height: 280px; height: 280px;
} }
......
pages/home/component/workChart.vue
View file @ 9b108084
<template> <template>
<div <div
class="stachart" class="stachart"
:style="setStatistics?{width:'620px',height:'300px'}:{width:'100%',height:'100%'}" :style="setStatistics?{width:'620px',height:'280px'}:{width:'100%',height:'100%'}"
> >
<div :gutter="16" class="row_head" v-if="setStatistics?false:true"> <div :gutter="16" class="row_head" v-if="setStatistics?false:true">
<Icon type="ios-images" class="f20" /> <Icon type="ios-images" class="f20" />
...@@ -298,11 +298,11 @@ export default { ...@@ -298,11 +298,11 @@ export default {
box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.16); box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.16);
border-radius: 8px; border-radius: 8px;
padding: 10px; padding: 10px;
margin: 0 auto; margin: 0 auto;
.echarts-map { .echarts-map {
width: 100%; width: 100%;
height: 300px; height: 280px;
// margin: 0 auto; // margin: 0 auto;
// text-align: center; // text-align: center;
.echarts { .echarts {
......
pages/home/index.vue
View file @ 9b108084
...@@ -16,36 +16,40 @@ ...@@ -16,36 +16,40 @@
<div class="bg-b"> <div class="bg-b">
<Icon type="ios-arrow-back" /> <Icon type="ios-arrow-back" />
</div> </div>
<div class="bg" v-for="(item,i) in collect" :key="i" @click="toPage(item)"> <div class="bg" v-for="(item,i) in collect" :key="i" @click="toPage(item)">
<Icon :type="item.icon||'md-mail'" /> <Icon :type="item.icon||'md-mail'" />
<p>{{item.title}}</p> <p>{{item.title}}</p>
</div> </div>
<div class="bg-l"> <div class="bg-l">
<Icon type="ios-arrow-forward" /> <Icon type="ios-arrow-forward" />
</div> </div>
</div> </div>
</div> </div>
<div class="card-list"> <div class="card-list">
<div class="bg-b"> <!-- <div class="bg-b"> -->
<Icon type="ios-arrow-back" /> <Icon type="ios-arrow-back" class="bg-b" />
</div> <!-- </div> -->
<Card <div class="list-c">
v-for="(item,index) in listTask" <div
:key="index" v-for="(item,index) in listTask"
:class="item.name=='物料复验' ? 'img_bg02':(item.name=='产品合格证' ? 'img_bg03':(item.name=='生产执行' ? 'img_bg04' : 'img_bg01'))" :key="index"
@click.native="goPage(item)" :class="item.name=='订单报价' ? 'img_bg02':(item.name=='质量检验' ? 'img_bg03':(item.name=='生产执行' ? 'img_bg04' : 'img_bg01'))"
> @click="goPage(item)"
<div class="leftIco"> >
<img class="img_icon" :src="imgUrl + item.image" alt /> <div class="leftIco">
</div> <img class="img_icon" :src="imgUrl + item.image" alt />
<div class="text-p"> </div>
<p>{{item.totalUrl}}</p> <div class="text-p">
<p>{{item.name}}</p> <p>{{item.totalUrl}}</p>
<p>{{item.name}}</p>
</div>
</div> </div>
</Card>
<div class="bg-l">
<Icon type="ios-arrow-forward" />
</div> </div>
<!-- <div class="bg-l"> -->
<Icon type="ios-arrow-forward" class="bg-l" />
<!-- </div> -->
</div> </div>
<Row class="table" :gutter="16"> <Row class="table" :gutter="16">
<Col :span="15"> <Col :span="15">
...@@ -87,7 +91,7 @@ ...@@ -87,7 +91,7 @@
<MaterielChart /> <MaterielChart />
</Col> </Col>
</Row> </Row>
<Modal v-model="modal1" title="统计列表显示设置" width="1300" footer-hide> <Modal v-model="modal1" title="统计列表显示设置" width="1200" footer-hide>
<Divider> <Divider>
<span style="color: #2680eb;"> <span style="color: #2680eb;">
生产计划状态监控 生产计划状态监控
...@@ -95,34 +99,42 @@ ...@@ -95,34 +99,42 @@
</span> </span>
</Divider> </Divider>
<StaChart :setStatistics="setStatistics" /> <StaChart :setStatistics="setStatistics" />
<Divider> <div class="divider-t">
<span style="color: #2680eb;"> <Divider>
不合格品审理单统计 <span style="color: #2680eb;">
<Icon :type="show1?'md-eye':'md-eye-off'" @click="clickEye1" /> 不合格品审理单统计
</span> <Icon :type="show1?'md-eye':'md-eye-off'" @click="clickEye1" />
</Divider> </span>
<UnqualifiedEcharts :setStatistics="setStatistics" /> </Divider>
<Divider> <UnqualifiedEcharts :setStatistics="setStatistics" />
<span style="color: #2680eb;"> </div>
班组工单监控 <div class="divider-t">
<Icon :type="show2?'md-eye':'md-eye-off'" @click="clickEye2" /> <Divider>
</span> <span style="color: #2680eb;">
</Divider> 班组工单监控
<WorkChart :setStatistics="setStatistics" /> <Icon :type="show2?'md-eye':'md-eye-off'" @click="clickEye2" />
<Divider> </span>
<span style="color: #2680eb;"> </Divider>
暂停任务统计 <WorkChart :setStatistics="setStatistics" />
<Icon :type="show3?'md-eye':'md-eye-off'" @click="clickEye3" /> </div>
</span> <div class="divider-t">
</Divider> <Divider>
<SuspendChart :setStatistics="setStatistics" /> <span style="color: #2680eb;">
<Divider> 暂停任务统计
<span style="color: #2680eb;"> <Icon :type="show3?'md-eye':'md-eye-off'" @click="clickEye3" />
物料相关统计 </span>
<Icon :type="show4?'md-eye':'md-eye-off'" @click="clickEye4" /> </Divider>
</span> <SuspendChart :setStatistics="setStatistics" />
</Divider> </div>
<MaterielChart :setStatistics="setStatistics" /> <div class="divider-t">
<Divider>
<span style="color: #2680eb;">
物料相关统计
<Icon :type="show4?'md-eye':'md-eye-off'" @click="clickEye4" />
</span>
</Divider>
<MaterielChart :setStatistics="setStatistics" />
</div>
</Modal> </Modal>
</div> </div>
</template> </template>
...@@ -208,11 +220,9 @@ export default { ...@@ -208,11 +220,9 @@ export default {
return (data.totalUrl = r.result); return (data.totalUrl = r.result);
}); });
}); });
this.listTask = list; this.listTask = list;
}); });
}, },
goPage(u) { goPage(u) {
this.$router.push(u.menuUrl); this.$router.push(u.menuUrl);
}, },
...@@ -299,58 +309,76 @@ export default { ...@@ -299,58 +309,76 @@ export default {
} }
} }
.card-list { .card-list {
display: flex;
display: -webkit-flex;
margin-top: 15px; margin-top: 15px;
justify-content: space-around; position: relative;
text-align: center;
.bg-b { .bg-b {
margin-top: 40px;
font-size: 30px; font-size: 30px;
color: #dcdfe6; color: #dcdfe6;
width: 35px; width: 35px;
position: absolute;
top: 45px;
left: 0;
}
.list-c {
// display: flex;
// display: -webkit-flex;
// justify-content: space-around;
width: 98%;
margin: 0 auto;
display: -webkit-inline-box;
overflow-x: hidden;
} }
.bg-l { .bg-l {
margin-top: 40px; position: absolute;
font-size: 30px; font-size: 30px;
color: #dcdfe6; color: #dcdfe6;
top: 45px;
right: 0;
width: 35px; width: 35px;
} }
.img_bg01 { .img_bg01 {
background-color: #ff9100; background-color: #ff9100;
width: 290px; width: 290px;
height: 130px; height: 130px;
border-radius: 8px;
cursor: pointer; cursor: pointer;
margin: 0 40px;
background: linear-gradient(to left, #0673df, #26c2e9); background: linear-gradient(to left, #0673df, #26c2e9);
} }
.img_bg02 { .img_bg02 {
width: 290px; width: 290px;
height: 130px; height: 130px;
cursor: pointer; cursor: pointer;
margin: 0 40px;
border-radius: 8px;
background: linear-gradient(to left, #5140e9, #8a92fc); background: linear-gradient(to left, #5140e9, #8a92fc);
} }
.img_bg03 { .img_bg03 {
cursor: pointer; cursor: pointer;
width: 290px; width: 290px;
height: 130px; height: 130px;
margin: 0 40px;
border-radius: 8px;
background: linear-gradient(to left, #04b573, #69fc8a); background: linear-gradient(to left, #04b573, #69fc8a);
} }
.img_bg04 { .img_bg04 {
cursor: pointer; cursor: pointer;
width: 290px; width: 290px;
height: 130px; height: 130px;
margin: 0 40px;
border-radius: 8px;
background: linear-gradient(to left, #6514cf, #a972fe); background: linear-gradient(to left, #6514cf, #a972fe);
} }
.img_icon { .img_icon {
width: 40px; width: 40px;
height: 40px; height: 40px;
margin: 45% 0 0 20%; margin: 72% 0 0 38px;
} }
.text-p { .text-p {
text-align: center; text-align: center;
color: #fff; color: #fff;
padding: 2% 0 0 40%; padding: 7% 0 0 35%;
p:first-child { p:first-child {
font-size: 30px; font-size: 30px;
font-weight: bold; font-weight: bold;
...@@ -372,11 +400,6 @@ export default { ...@@ -372,11 +400,6 @@ export default {
} }
.title-r { .title-r {
position: relative; position: relative;
// .echart-c {
// width: 600px;
// margin: auto;
// }
} }
.a-r { .a-r {
position: absolute; position: absolute;
...@@ -387,7 +410,9 @@ export default { ...@@ -387,7 +410,9 @@ export default {
.set-p { .set-p {
width: 100%; width: 100%;
margin: 0 auto; margin: 0 auto;
// text-align: center;
} }
} }
.divider-t {
padding-top: 25px;
}
</style> </style>
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