Skip to content

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

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

parents f46ff2d4 84281cfc
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1970 additions and 425 deletions
pages/aps/ai/index.vue
View file @ bff946e9
...@@ -507,6 +507,10 @@ export default { ...@@ -507,6 +507,10 @@ export default {
if (res2.success) { if (res2.success) {
if (res2.result.res) { if (res2.result.res) {
this.$Message.success("排产计算成功"); this.$Message.success("排产计算成功");
//智能排产操作start
//只能排产操作end
this.circleModal = false; this.circleModal = false;
this.$router.push({ this.$router.push({
path: "/ai/results" path: "/ai/results"
......
pages/aps/plan/index.vue
View file @ bff946e9
This diff is collapsed.
pages/demo/city.js 0 → 100644
View file @ bff946e9
This diff is collapsed.
pages/demo/index.vue
View file @ bff946e9
...@@ -108,39 +108,7 @@ import BmNavigation from "vue-baidu-map/components/controls/Navigation"; ...@@ -108,39 +108,7 @@ import BmNavigation from "vue-baidu-map/components/controls/Navigation";
import BmMarkerClusterer from "vue-baidu-map/components/extra/MarkerClusterer"; import BmMarkerClusterer from "vue-baidu-map/components/extra/MarkerClusterer";
import BmMarker from "vue-baidu-map/components/overlays/Marker"; import BmMarker from "vue-baidu-map/components/overlays/Marker";
import BmInfoWindow from "vue-baidu-map/components/overlays/InfoWindow"; import BmInfoWindow from "vue-baidu-map/components/overlays/InfoWindow";
const citys = `北京,116.28,39.54 import citys from "./city"
上海,121.29,31.14
天津,117.11,39.09
重庆,106.32,29.32
哈尔滨,126.41,45.45
长春,125.19,43.52
沈阳,123.24,41.50
呼和浩特,111.48,40.49
石家庄,114.28,38.02
太原,112.34,37.52
济南,117.,36.38
郑州,113.42,34.48
西安,108.54,34.16
兰州,103.49,36.03
银川,106.16,38.20
西宁,101.45,36.38
乌鲁木齐,87.36,43.48
合肥,117.18,31.51
南京,118.50,32.02
杭州,120.09,30.14
长沙,113.,28.11
南昌,115.52,28.41
武汉,114.21,30.37
成都,104.05,30.39
贵阳,106.42,26.35
福州,119.18,26.05
台北,121.31,25.03
广州,113.15,23.08
海口,110.20,20.02
南宁,108.20,22.48
昆明,102.41,25.0
拉萨,91.10,29.40
香港,114.10,22.18`;
export default { export default {
components: { components: {
BaiduMap, BaiduMap,
...@@ -279,26 +247,13 @@ export default { ...@@ -279,26 +247,13 @@ export default {
this.eye = !this.eye; this.eye = !this.eye;
let ps = []; let ps = [];
if (this.eye) { if (this.eye) {
var arr = citys.split("\n");
arr.map(u => {
let v = u.split(",");
let p = {
name: v[0],
lng: parseFloat(v[1]),
lat: parseFloat(v[2]),
list: [
{ car: "CRH380A", count: 29 },
{ car: "CRH381A", count: 9 },
{ car: "CRH382A", count: 13 },
{ car: "CRH384A", count: 19 },
{ car: "CRH388A", count: 24 }
]
};
ps.push(p); ps=citys;
});
} }
this.markers = ps; this.markers = ps;
console.warn(JSON.stringify(ps))
}, },
infoWindowOpen(e) { infoWindowOpen(e) {
this.infoWindow.show = true; this.infoWindow.show = true;
......
pages/demo/lid/2.vue 0 → 100644
View file @ bff946e9
This diff is collapsed.
pages/demo/lid/index.vue 0 → 100644
View file @ bff946e9
This diff is collapsed.
pages/home/component/approval.vue
View file @ bff946e9
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<a class="row_more fr" @click="toivew">更多</a> <a class="row_more fr" @click="toivew">更多</a>
</p> </p>
<div class="row_card_body"> <div class="row_card_body">
<Table border :columns="columns1" :data="data1" height="220"></Table> <Table border :columns="columns1" :data="data1" height="250"></Table>
</div> </div>
</Card> </Card>
<Modal v-model="viewModal" width="800" title="详情"> <Modal v-model="viewModal" width="800" title="详情">
......
pages/home/component/staChart.vue
View file @ bff946e9
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
format="yyyy/MM/dd" format="yyyy/MM/dd"
type="daterange" type="daterange"
placement="bottom-end" placement="bottom-end"
placeholder="Select date" placeholder="选择日期"
style="width: 200px" style="width: 200px"
></DatePicker> ></DatePicker>
<Button type="primary">查询</Button> <Button type="primary">查询</Button>
......
pages/home/component/unreadMessage.vue
View file @ bff946e9
...@@ -87,7 +87,7 @@ export default { ...@@ -87,7 +87,7 @@ export default {
} }
} }
.msg { .msg {
height: 215px; height: 245px;
overflow-y: auto; overflow-y: auto;
margin-top: 10px; margin-top: 10px;
.row-text { .row-text {
......
pages/home/index.vue
View file @ bff946e9
<template> <template>
<div class="home_box"> <div class="home">
<Card> <div class="card-user">
<div class="flex"> <div class="img-header">
<div class="user"> <img src="@/assets/images/home/user.png" />
<img src="@/assets/images/home/user.png" /> </div>
<div class="user-text"> <div class="user-text">
<p>你好：张飞，欢迎登录MES系统!</p> <p>你好：张飞，欢迎登录MES系统!</p>
<p> <p>
<span>xx公司/xx车间xx班组</span> &nbsp &nbsp <span>xx公司/xx车间xx班组</span> &nbsp &nbsp
<span>工艺技术员</span> <span>工艺技术员</span>
</p> </p>
</div> </div>
</div> <div class="incon-carousel">
<div class="fg flex"> <div class="bg-b">
<div class="left"> <Icon type="ios-arrow-back" />
<Icon type="ios-arrow-back" size="32" /> </div>
</div> <div class="bg">
<div class="fg"></div> <Icon type="ios-cube" />
<div class="right"> <p>电子对账单</p>
<Icon type="ios-arrow-forward" size="32" /> </div>
</div> <div class="bg">
<Icon type="md-mail" />
<p>站内邮件</p>
</div>
<div class="bg">
<Icon type="md-map" />
<p>站内邮件</p>
</div>
<div class="bg">
<Icon type="ios-cube" />
<p>电子对账单</p>
</div>
<div class="bg">
<Icon type="ios-cube" />
<p>电子对账单</p>
</div>
<div class="bg">
<Icon type="md-mail" />
<p>站内邮件</p>
</div>
<div class="bg">
<Icon type="md-mail" />
<p>站内邮件</p>
</div>
<div class="bg-l">
<Icon type="ios-arrow-forward" />
</div>
</div>
</div>
<div class="card-list">
<div class="bg-b">
<Icon type="ios-arrow-back" />
</div>
<Card
v-for="(item,index) in listTask"
:key="index"
:class="item.name=='物料复验' ? 'img_bg02':(item.name=='产品合格证' ? 'img_bg03':(item.name=='生产执行' ? 'img_bg04' : 'img_bg01'))"
@click.native="goPage(item)"
>
<div class="leftIco">
<img class="img_icon" :src="imgUrl + item.image" alt />
</div> </div>
<div class="text-p">
<p>{{item.totalUrl}}</p>
<p>{{item.name}}</p>
</div>
</Card>
<div class="bg-l">
<Icon type="ios-arrow-forward" />
</div> </div>
</Card> </div>
<Row class="table" :gutter="16">
<Col :span="15">
<Approval ref="approval" />
</Col>
<Col :span="9">
<UnreadMessage />
</Col>
</Row>
<div class="table">
<StaChart/>
</div>
</div> </div>
</template> </template>
<script> <script>
import Api from "./api";
import Approval from "./component/approval";
import UnreadMessage from "./component/unreadMessage";
import StaChart from "./component/staChart";
export default { export default {
name: "", components: {
Approval,
UnreadMessage,
StaChart
},
data() { data() {
return {}; return {
listTask: [],
imgUrl: iconImg,
};
},
created() {
this.get();
},
methods: {
get() {
let list = [];
let url = `${systemUrl}/backlog/get`;
this.$api.get(url).then(r => {
list = r.result;
list.forEach(data => {
// console.log(data.totalUrl)
let ulrt = `http://${address}:` + data.totalUrl;
data.totalUrl = 0;
this.$api.get(ulrt).then(r => {
return (data.totalUrl = r.result);
});
});
console.log(list);
this.listTask = list;
});
},
goPage(u) {
// alert(u.menuUrl)
this.$router.push(u.menuUrl);
}
} }
}; };
</script> </script>
<style lang="less" scoped>
<style lang="less"> .ivu-layout-content {
.home_box { background-color: none !important;
background: rgba(245, 246, 250, 1); }
margin: -5px -10px -50px -10px; .home {
height: 100%; padding: 10px 0;
padding: 5px 10px; .card-user {
.flex{ padding: 25px 15px;
height: 90px; height: 120px;
.user{ background: rgba(255, 255, 255, 1);
width: 600px; box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.16);
img{ border-radius: 8px;
float: left; .img-header {
} margin-top: -8px;
float: left;
}
.user-text {
float: left;
p {
margin: 10px;
}
}
.incon-carousel {
float: right;
// margin-top: 8px;
width: 800px;
.bg-b {
float: left;
margin-top: 10px;
font-size: 30px;
color: #dcdfe6;
}
.bg-l {
float: right;
margin-top: 10px;
font-size: 30px;
color: #dcdfe6;
} }
.fg { .bg {
.left,.right{ text-align: center;
width: 50px; width: 100px;
line-height: 90px; float: left;
text-align: center; .ivu-icon {
color: #A7B8CC; font-size: 35px;
} color: #2680eb;
}
p {
margin-top: 8px;
}
} }
}
}
.card-list {
display: flex;
display: -webkit-flex;
margin-top: 15px;
justify-content: space-around;
.bg-b {
margin-top: 40px;
font-size: 30px;
color: #dcdfe6;
width: 35px;
}
.bg-l {
margin-top: 40px;
font-size: 30px;
color: #dcdfe6;
width: 35px;
}
.img_bg01 {
background-color: #ff9100;
width: 290px;
height: 130px;
cursor: pointer;
background: linear-gradient(to left, #0673df, #26c2e9);
}
.img_bg02 {
width: 290px;
height: 130px;
cursor: pointer;
background: linear-gradient(to left, #5140e9, #8a92fc);
}
.img_bg03 {
cursor: pointer;
width: 290px;
height: 130px;
background: linear-gradient(to left, #04b573, #69fc8a);
}
.img_bg04 {
cursor: pointer;
width: 290px;
height: 130px;
background: linear-gradient(to left, #6514cf, #a972fe);
}
.img_icon {
width: 40px;
height: 40px;
margin: 45% 0 0 20%;
}
.text-p {
text-align: center;
color: #fff;
padding: 2% 0 0 40%;
p:first-child {
font-size: 30px;
font-weight: bold;
margin-bottom: 5px;
}
p:nth-child(2) {
font-size: 18px;
}
}
}
.url-img {
width: 100%;
height: 370px;
background: url("../../assets/images/home/echars.png") no-repeat;
background-size: 100% 100%;
}
.table {
margin-top: 15px;
} }
} }
</style> </style>
\ No newline at end of file
pages/home/index1.vue 0 → 100644
View file @ bff946e9
<template>
<div class="home_box">
<Card>
<div class="flex">
<div class="user">
<img src="@/assets/images/home/user.png" />
<div class="user-text">
<p>你好：张飞，欢迎登录MES系统!</p>
<p>
<span>xx公司/xx车间xx班组</span> &nbsp &nbsp
<span>工艺技术员</span>
</p>
</div>
</div>
<div class="fg flex">
<div class="left">
<Icon type="ios-arrow-back" size="32" />
</div>
<div class="fg"></div>
<div class="right">
<Icon type="ios-arrow-forward" size="32" />
</div>
</div>
</div>
</Card>
</div>
</template>
<script>
export default {
name: "",
data() {
return {};
}
};
</script>
<style lang="less">
.home_box {
background: rgba(245, 246, 250, 1);
margin: -5px -10px -50px -10px;
height: 100%;
padding: 5px 10px;
.flex{
height: 90px;
.user{
width: 600px;
img{
float: left;
}
}
.fg {
.left,.right{
width: 50px;
line-height: 90px;
text-align: center;
color: #A7B8CC;
}
}
}
}
</style>
\ No newline at end of file
pages/home/index2.vue deleted 100644 → 0
View file @ f46ff2d4
<template>
<div class="home">
<div class="card-user">
<div class="img-header">
<img src="@/assets/images/home/user.png" />
</div>
<div class="user-text">
<p>你好：张飞，欢迎登录MES系统!</p>
<p>
<span>xx公司/xx车间xx班组</span> &nbsp &nbsp
<span>工艺技术员</span>
</p>
</div>
<div class="incon-carousel">
<div class="bg-b">
<Icon type="ios-arrow-back" />
</div>
<div class="bg">
<Icon type="ios-cube" />
<p>电子对账单</p>
</div>
<div class="bg">
<Icon type="md-mail" />
<p>站内邮件</p>
</div>
<div class="bg">
<Icon type="md-map" />
<p>站内邮件</p>
</div>
<div class="bg">
<Icon type="ios-cube" />
<p>电子对账单</p>
</div>
<div class="bg">
<Icon type="ios-cube" />
<p>电子对账单</p>
</div>
<div class="bg">
<Icon type="md-mail" />
<p>站内邮件</p>
</div>
<div class="bg">
<Icon type="md-mail" />
<p>站内邮件</p>
</div>
<div class="bg-l">
<Icon type="ios-arrow-forward" />
</div>
</div>
</div>
<div class="card-list">
<div class="bg-b">
<Icon type="ios-arrow-back" />
</div>
<Card
v-for="(item,index) in listTask"
:key="index"
:class="item.name=='物料复验' ? 'img_bg02':(item.name=='产品合格证' ? 'img_bg03':(item.name=='生产执行' ? 'img_bg04' : 'img_bg01'))"
@click.native="goPage(item)"
>
<div class="leftIco">
<img class="img_icon" :src="imgUrl + item.image" alt />
</div>
<div class="text-p">
<p>{{item.totalUrl}}</p>
<p>{{item.name}}</p>
</div>
</Card>
<div class="bg-l">
<Icon type="ios-arrow-forward" />
</div>
</div>
<Row class="table" :gutter="16">
<Col :span="15">
<Approval ref="approval" />
</Col>
<Col :span="9">
<UnreadMessage />
</Col>
</Row>
<div class="table">
<StaChart/>
</div>
</div>
</template>
<script>
import Api from "./api";
import Approval from "./component/approval";
import UnreadMessage from "./component/unreadMessage";
import StaChart from "./component/staChart";
export default {
components: {
Approval,
UnreadMessage,
StaChart
},
data() {
return {
listTask: [],
imgUrl: iconImg,
};
},
created() {
this.get();
},
methods: {
get() {
let list = [];
let url = `${systemUrl}/backlog/get`;
this.$api.get(url).then(r => {
list = r.result;
list.forEach(data => {
// console.log(data.totalUrl)
let ulrt = `http://${address}:` + data.totalUrl;
data.totalUrl = 0;
this.$api.get(ulrt).then(r => {
return (data.totalUrl = r.result);
});
});
console.log(list);
this.listTask = list;
});
},
goPage(u) {
// alert(u.menuUrl)
this.$router.push(u.menuUrl);
}
}
};
</script>
<style lang="less" scoped>
.ivu-layout-content {
background-color: none !important;
}
.home {
padding: 10px 0;
.card-user {
padding: 25px 15px;
height: 120px;
background: rgba(255, 255, 255, 1);
box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.16);
border-radius: 8px;
.img-header {
margin-top: -8px;
float: left;
}
.user-text {
float: left;
p {
margin: 10px;
}
}
.incon-carousel {
float: right;
// margin-top: 8px;
width: 800px;
.bg-b {
float: left;
margin-top: 10px;
font-size: 30px;
color: #dcdfe6;
}
.bg-l {
float: right;
margin-top: 10px;
font-size: 30px;
color: #dcdfe6;
}
.bg {
text-align: center;
width: 100px;
float: left;
.ivu-icon {
font-size: 35px;
color: #2680eb;
}
p {
margin-top: 8px;
}
}
}
}
.card-list {
display: flex;
display: -webkit-flex;
margin-top: 15px;
justify-content: space-around;
.bg-b {
margin-top: 40px;
font-size: 30px;
color: #dcdfe6;
width: 35px;
}
.bg-l {
margin-top: 40px;
font-size: 30px;
color: #dcdfe6;
width: 35px;
}
.img_bg01 {
background-color: #ff9100;
width: 290px;
height: 130px;
cursor: pointer;
background: linear-gradient(to left, #0673df, #26c2e9);
}
.img_bg02 {
width: 290px;
height: 130px;
cursor: pointer;
background: linear-gradient(to left, #5140e9, #8a92fc);
}
.img_bg03 {
cursor: pointer;
width: 290px;
height: 130px;
background: linear-gradient(to left, #04b573, #69fc8a);
}
.img_bg04 {
cursor: pointer;
width: 290px;
height: 130px;
background: linear-gradient(to left, #6514cf, #a972fe);
}
.img_icon {
width: 40px;
height: 40px;
margin: 45% 0 0 20%;
}
.text-p {
text-align: center;
color: #fff;
padding: 2% 0 0 40%;
p:first-child {
font-size: 30px;
font-weight: bold;
margin-bottom: 5px;
}
p:nth-child(2) {
font-size: 18px;
}
}
}
.url-img {
width: 100%;
height: 370px;
background: url("../../assets/images/home/echars.png") no-repeat;
background-size: 100% 100%;
}
.table {
margin-top: 15px;
}
}
</style>
\ 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