Skip to content

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

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

parents 79ab0203 2c7a40f2
Expand all Show whitespace changes
Inline Side-by-side
Showing with 887 additions and 194 deletions
package-lock.json
View file @ 1f9cb369
......@@ -22195,8 +22195,8 @@
},
"vue-class-component": {
"version": "7.2.3",
"resolved": "https://registry.npmjs.org/vue-class-component/-/vue-class-component-7.2.3.tgz",
"integrity": "sha512-oEqYpXKaFN+TaXU+mRLEx8dX0ah85aAJEe61mpdoUrq0Bhe/6sWhyZX1JjMQLhVsHAkncyhedhmCdDVSasUtDw=="
"resolved": "https://registry.npm.taobao.org/vue-class-component/download/vue-class-component-7.2.3.tgz",
"integrity": "sha1-pbGr1TUTpyrVEJh1Li3t1JmAfMo="
},
"vue-client-only": {
"version": "2.0.0",
......@@ -22330,9 +22330,9 @@
"integrity": "sha1-h1875vsK5BVoqDfzrBqA6qE3uZg="
},
"vue-property-decorator": {
"version": "8.4.2",
"resolved": "https://registry.npmjs.org/vue-property-decorator/-/vue-property-decorator-8.4.2.tgz",
"integrity": "sha512-IqbARlvgPE2pzKfbecKxsu2yEH0Wv7hfHR6m4eZA3LTnNw9hveAX77vDfLFyTeMISS5N7Kucp/xRSHjcQ6bAfQ==",
"version": "8.5.1",
"resolved": "https://registry.npm.taobao.org/vue-property-decorator/download/vue-property-decorator-8.5.1.tgz",
"integrity": "sha1-VxqRz40rUH9TfXm/gnWvMYRXL/8=",
"requires": {
"vue-class-component": "^7.1.0"
}
......@@ -22419,11 +22419,19 @@
}
},
"vue-slider-component": {
"version": "3.1.3",
"resolved": "https://registry.npmjs.org/vue-slider-component/-/vue-slider-component-3.1.3.tgz",
"integrity": "sha512-SPFb1I3G2a4thIwghvVNhcvPGCUz6PIZR1ClwtvN4MT44ZUzvqCMDS7osdKz0hdKu4kfanxET8qZn826A/XPxA==",
"version": "3.1.5",
"resolved": "https://registry.npm.taobao.org/vue-slider-component/download/vue-slider-component-3.1.5.tgz?cache=0&sync_timestamp=1590980161427&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-slider-component%2Fdownload%2Fvue-slider-component-3.1.5.tgz",
"integrity": "sha1-2a1vGhBcigp7cvW4+VZW0HuOTDY=",
"requires": {
"core-js": "^3.6.5",
"vue-property-decorator": "^8.0.0"
},
"dependencies": {
"core-js": {
"version": "3.6.5",
"resolved": "https://registry.npm.taobao.org/core-js/download/core-js-3.6.5.tgz",
"integrity": "sha1-c5XcJzrzf7LlDpvT2f6EEoUjHRo="
}
}
},
"vue-style-loader": {
......
pages/aps/plan/api.js
View file @ 1f9cb369
......@@ -31,4 +31,7 @@ export default {
getpoolordercount(){//各排产池订单数量
return Api.get(`${PlanUrl}/messchedule/getpoolordercount`);
},
listbyuser(params) {//获取当前登录用户可操作的排产
return Api.post(`${authUrl}/api/services/app/setschedulecompany/listbyuser`, params);
},
}
\ No newline at end of file
pages/aps/plan/index.vue
View file @ 1f9cb369
......@@ -26,6 +26,7 @@
overflow-count="99"
style="margin-right:15px;"
type="info"
v-if="showAps"
>
<a href="javascript:;" @click="goAps">APS排产&nbsp;&nbsp;&nbsp;</a>
</Badge>
......@@ -34,6 +35,7 @@
overflow-count="99"
style="margin-right:15px;"
type="info"
v-if="showAi"
>
<a href="javascript:;">智能排产&nbsp;&nbsp;&nbsp;</a>
</Badge>
......@@ -42,10 +44,11 @@
overflow-count="99"
style="margin-right:15px;"
type="info"
v-if="showAll"
>
<a href="javascript:;" @click="goCemplate">整机排产&nbsp;&nbsp;&nbsp;</a>
</Badge>
<Badge :count="this.$store.state.countRun" overflow-count="99" type="info">
<Badge :count="this.$store.state.countRun" overflow-count="99" type="info" v-if="showRun">
<a href="javascript:;" @click="goStream">流水排产&nbsp;&nbsp;&nbsp;</a>
</Badge>
</template>
......@@ -82,7 +85,14 @@
<Modal v-model="scheduleModal" title="移入排产" width="800">
<p>&nbsp;</p>
<h4>请选择排产模型：</h4>
<Dictionary code="aps.plan.scheduleType" v-model="scheduleType" class="radioList" :border="true" type="radio" @on-change="onchangeScheduleType"></Dictionary>
<Dictionary
code="aps.plan.scheduleType"
v-model="scheduleType"
class="radioList"
:border="true"
type="radio"
@on-change="onchangeScheduleType"
></Dictionary>
<p class="pl30 pt10" v-show="scheduleType!=null">
确定将订单
<span class="fwBold">{{resultsOrderList}}</span> 移入
......@@ -310,7 +320,13 @@ export default {
h(
"op",
{
attrs: { oprate: "detail",title: params.row.mainRoutingSetStatus == 0? "工艺派发": "移入排产"},
attrs: {
oprate: "detail",
title:
params.row.mainRoutingSetStatus == 0
? "工艺派发"
: "移入排产"
},
style: {
color: params.row.mainRoutingSetStatus == 0 ? "red" : ""
},
......@@ -331,7 +347,14 @@ export default {
h(
"op",
{
attrs: { oprate: "detail",title: params.row.isSupportingFinish == 2|| params.row.isSupportingFinish == 3? "配套派发": "" },
attrs: {
oprate: "detail",
title:
params.row.isSupportingFinish == 2 ||
params.row.isSupportingFinish == 3
? "配套派发"
: ""
},
style: {
color: params.row.mainRoutingSetStatus == 0 ? "red" : ""
},
......@@ -365,7 +388,11 @@ export default {
scheduleStatus: 0, //排产标识
resultsOrderList: "",
scheduleType: null,
scheduleTypeName: ""
scheduleTypeName: "",
showAps: false,
showAi: false,
showAll: false,
showRun: false
};
},
mounted() {
......@@ -640,6 +667,29 @@ export default {
},
//进入页面加载排产count-----
loadInitCount() {
let currentUserId = this.$store.state.userInfo.userId;
let para = { id: currentUserId };
Api.listbyuser(para).then(datas => {
if (datas.success && datas.result && datas.result.length > 0) {
datas.result.forEach(dateScheduleId => {
switch (dateScheduleId.apsScheduleId) {
case 1:
this.showAps = true;
break;
case 2:
this.showAll = true;
break;
case 3:
this.showRun = true;
break;
default:
this.showAi = true;
}
});
}
});
this.$store.commit("setCountAps", 0);
this.$store.commit("setCountAi", 0);
this.$store.commit("setCountAll", 0);
......
pages/dncmnc/dnc/datalist.vue
View file @ 1f9cb369
......@@ -9,7 +9,7 @@
<p class="dispatch_part_top">
<b class="mr10">设备列表</b>
共 {{listSheBei.length}} 台
<!-- {{ids}} -->
<span style="display:none">{{ids}}</span>
</p>
<div class="dispatch_part_body" :style="{height:byheight}">
<h4 class="tc" v-if="this.listSheBei.length==0">暂无数据</h4>
......@@ -33,12 +33,13 @@
<p class="show_btn">
<a @click="showRow(item.id,item.btnShow)">
<Tooltip content="所属程序列表">
<Icon v-if="btnModal" type="ios-arrow-down" />
<Icon v-if="item.btnShow" type="ios-arrow-down" />
<Icon v-else type="ios-arrow-up" />
</Tooltip>
</a>
</p>
<div class="h60" v-if="!btnModal">
<div class="h60" v-if="item.btnShow">
<span style="display:none"> {{liOrderIds}} </span>
<Row class="card_body02" v-for="(li,index) in item.row" :key="index">
<Col span="8" class="dispatch_li">
<Checkbox v-model="li.checked">程序名：{{li.mdcNmae}}</Checkbox>
......@@ -46,7 +47,6 @@
<Col span="8" class="dispatch_li">大小：{{li.size}}</Col>
<Col span="8" class="dispatch_li">下载时间：{{li.downTime}}</Col>
</Row>
<!-- {{liOrderIds}} -->
</div>
</div>
</div>
......@@ -100,7 +100,7 @@
</Modal>
<!-- 底部 -->
<FooterToolbar style="height:65px" v-show="showOperate&&footerToolbar">
<!-- <span>已选程序：{{chengXuIds.length}}</span> -->
<!-- <span v-if="beyong">已选程序：{{chengXuIds.length}}</span> -->
<Button class="span ml20" type="primary" v-if="xiaZai" @click="downFile">下载</Button>
<Button class="span ml20" type="primary" v-if="beyong" @click="fileBeyong">文本对比</Button>
<Button @click="footerToolbar=false">取消</Button>
......@@ -200,21 +200,19 @@ export default {
{
mdcNmae: "00123_281",
id:101,
size: "128Mb",
size: "120Mb",
downTime: "2020-05-26 10:30:26",
checked: false
},
{
},{
mdcNmae: "00123_282",
id:102,
size: "128Mb",
size: "133Mb",
downTime: "2020-05-26 10:30:26",
checked: false
},
{
},{
mdcNmae: "00123_283",
id:103,
size: "128Mb",
size: "100Mb",
downTime: "2020-05-26 10:30:26",
checked: false
}
......@@ -230,25 +228,59 @@ export default {
id: 2,
row: [
{
mdcNmae: "00123_281",
mdcNmae: "00123_284",
id:201,
size: "128Mb",
downTime: "2020-05-26 10:30:26",
checked: false
},
{
mdcNmae: "00123_282",
},{
mdcNmae: "00123_285",
id:202,
size: "128Mb",
size: "118Mb",
downTime: "2020-05-26 10:30:26",
checked: false
},
{
mdcNmae: "00123_283",
},{
mdcNmae: "00123_286",
id:203,
size: "100Mb",
downTime: "2020-05-26 10:30:26",
checked: false
}
]
},{
dncCode: "19212_0665003",
dncName: "数控机床03",
dncUser: "刘蕾",
dncArea: "区域03",
dncStatue: "空闲",
checked: false,
btnShow: false,
id: 3,
row: [
{
mdcNmae: "00123_287",
id:201,
size: "128Mb",
downTime: "2020-05-26 10:30:26",
checked: false
},{
mdcNmae: "00123_288",
id:202,
size: "110Mb",
downTime: "2020-05-26 10:30:26",
checked: false
},{
mdcNmae: "00123_289",
id:203,
size: "130Mb",
downTime: "2020-05-26 10:30:26",
checked: false
},{
mdcNmae: "00123_290",
id:203,
size: "135Mb",
downTime: "2020-05-26 10:30:26",
checked: false
}
]
}
......@@ -292,7 +324,6 @@ export default {
endTime: "2020/05/26 "
}
],
btnModal: true,//箭头
listTitle: [], //订单号列表
newList: [], //选中数据
chaiModal: false, //拆分弹框
......@@ -386,14 +417,12 @@ export default {
this.footerToolbar = true;
},
// 切换箭头
showRow(id,btn){
// console.log(id)
// let ss=!btnModal
// this.listSheBei.map(u=>{
// })
// console.log(btnModal = ss)
this.btnModal = !this.btnModal
showRow(rowid,btn){
this.listSheBei.map(u=>{
if(u.id==rowid){
u.btnShow = !u.btnShow
}
})
},
// 获取查询人员
getselectuser(id) {
......@@ -472,10 +501,11 @@ export default {
this.getUserInfoFn();
},
downFile(){
this.$Message.success("下载文件")
this.$Message.success("下载文件中...")
},
fileBeyong(){
this.$Message.success("对比文件")
this.$router.push("/dncmnc/dnc/difftext");
},
// 打开抽屉
openDrawer() {
......@@ -609,8 +639,13 @@ export default {
}
});
if (ids.length > 0) {
// if(this.liOrderIds.length>0){
// this.$Message.info("设备和所属程序不能同时选择！")
// }else{
this.footerToolbar = true;
this.xiaZai = true;
this.beyong = false;
// }
}
return ids;
},
......@@ -633,23 +668,35 @@ export default {
return orders;
},
liOrderIds() {
let liOrderIds = [];
let rowList ;
this.listSheBei.map(u => { rowList = u.row });
// rowList.map(item=>{ rowData.push(item) })
// rowList.map(tm=>{
// if(tm.checked){
// liOrderIds.push(tm.id)
// }
// })
let rowList = [] ;
let liOrderIds = [] ;
let cardData = this.listSheBei;
for(let i=0;i<cardData.length;i++){
cardData[i].row.map(u=>{
rowList.push(u)
})
}
rowList.map(tem => {
if (tem.checked) {
liOrderIds.push(tem.id);
}
});
if(liOrderIds.length > 0){
if(this.ids.length > 0){
this.$Message.info("设备和所属程序不能同时选择！")
this.footerToolbar = false;
}else{
this.footerToolbar = true;
this.xiaZai = false;
this.beyong = true;
}
}
return liOrderIds;
// this.footerToolbar = true;
return rowList;
},
showOperate() {
return (
this.ids.length > 0 && (this.chengXuIds.length > 0 )
// || this.liOrderIds.length > 0
(this.ids.length > 0 || this.liOrderIds.length > 0) && (this.chengXuIds.length > 0 )
);
}
},
......
pages/dncmnc/dnc/difftext.vue 0 → 100644
View file @ 1f9cb369
<style lang="less" scoped>
@import "./dispatch.less";
</style>
<template>
<div class="diff_box">
<a class="back_href" @click="goView">
<Icon type="ios-undo-outline" size="24" />返回设备监控
</a>
<div class="diff_card">
<div class="diff_top">
程序名：00123_281
</div>
<div class="diff_top">
程序名：1288-268 &nbsp;&nbsp;
绑定设备：数控机床
</div>
<img src="../image/textdiff.png" alt="">
</div>
</div>
</template>
<script>
import Api from "./api";
export default {
components: {},
data() {
return {
action: Api.index,
byheight: "450px",
};
},
created() {
// this.getUserInfoFn();
this.byheight = window.innerHeight - 178 + "px";
},
mounted() {
this.byheight = window.innerHeight - 178 + "px";
},
async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典
},
methods: {
goView(){
//返回数控程序传输页面
this.$router.push("/dncmnc/dnc/datalist");
},},
computed: {},
watch: {}
};
</script>
<style lang="less">
.diff_card{
width: 100%;
height: 86vh;
.diff_top{
width: 50%;
float: left;
text-align: center;
}
img{
display: block;
width: 90%;
margin: 0vh auto;
}
}
</style>
\ No newline at end of file
pages/dncmnc/mnc/compose/echart3.vue
View file @ 1f9cb369
<template>
<div>
<div id="myChart03" style="width:865px;height:316px;top: 0px;"></div>
<div id="myChart03" style="width:895px;height:316px;top: 0px;"></div>
</div>
</template>
<script>
......
pages/dncmnc/mnc/compose/echart4.vue
View file @ 1f9cb369
<template>
<div>
<div id="gauge01" style="width:200px;height:150px;top: 0px;"></div>
<div id="myChart04" style="width:100%;height:340px;margin:20px auto;top: 0px;"></div>
</div>
</template>
<script>
......@@ -17,141 +17,61 @@ export default {
},
loadEchart() {
// 基于准备好的dom，初始化echarts实例
var gauge01 = this.$echarts.init(document.getElementById('gauge01'))
var score = 78;
var name = '名称';
var option = {
var myChart04 = this.$echarts.init(document.getElementById('myChart04'))
series: [
{
type: 'gauge',
min: 0,
max: 100,
radius: '80%',
startAngle: 180,
endAngle: 0,
axisLine: {
show: false,
lineStyle: {
opacity: 0,
width: 12
}
},
splitLine: {
show: false
},
pointer: {
show: false
},
axisTick: {
splitNumber: 10,
length: 12,
lineStyle: {
color: '#004fb0'
}
},
var option = {
title: {
show: true,
fontSize: 16,
color: '#5faeff',
offsetCenter: [0, '-115%']
text: ''
},
detail: {
formatter: function (value) {
return '{a|' + value + '} {b|分}'
legend: {
data: ['开机', '关机', '故障', '运行'],
right: 55,
},
offsetCenter: [0,-20],
rich: {
a: {
fontSize: 32,
color: '#15e198'
tooltip: {
trigger: 'axis'
},
b: {
fontSize: 14,
color: '#15e198',
padding: [0, 0, 5, 0]
}
}
grid: {
left: '3%',
right: '4%',
bottom: '3%',
containLabel: true
},
data: [{value: [score], name: name}]
xAxis: {
data: ['1日', '2日', '3日', '4日', '5日', '6日', '7日', '8日', '9日', '10日', '11日', '12日', '13日',
'14日', '15日', '16日', '17日', '18日']
},
{
name: 'score',
type: 'pie',
startAngle: 180,
hoverAnimation: false,
radius: [105, 115],
label: {
normal: {
show: false
}
},
data: [
{
value: 0.4,
name: 0.4,
itemStyle: {
normal: {
color: '#fff'
}
}
yAxis: {
type: 'value'
},
series: [
{
value: 0.4,
itemStyle: {
normal: {
color: 'transparent'
}
}
}
]
name: '开机',
type: 'bar',
barWidth: 8,
data: [120, 132, 101, 134, 90, 230, 210,120, 132, 101, 134, 90, 230, 210,120, 132, 101, 134]
},
{
name: 'score',
type: 'pie',
startAngle: 180,
hoverAnimation: false,
radius: [105, 115],
label: {
normal: {
show: false
}
name: '关机',
type: 'bar',
barWidth: 8,
data: [220, 182, 191, 234, 290, 330, 310,220, 182, 191, 234, 290, 330, 310,220, 182, 191, 234, 290, 330, 310]
},
data: [
{
value: [(score * 0.5 /100).toFixed(2)],
name: [(score * 0.5 /100).toFixed(2)],
itemStyle: {
normal: {
color: {
type: 'linear',
x: 0,
y: 0,
x2: 0,
y2: 1,
colorStops: [{
offset: 0, color: '#15e198'
}, {
offset: 1, color: '#409eff'
}]
}
}
}
name: '故障',
type: 'bar',
barWidth: 8,
data: [150, 232, 201, 154, 190, 330, 410,150, 232, 201, 154, 190, 330, 410,150, 232, 201, 154, 190, 330, 410]
},
{
value: [1- (score * 0.5 /100).toFixed(2)],
itemStyle: {
normal: {
color: 'transparent'
}
}
}
]
name: '运行',
type: 'bar',
barWidth: 8,
data: [320, 332, 301, 334, 390, 330, 320,320, 332, 301, 334, 390, 330, 320,320, 332, 301, 334, 390, 330, 320]
}
]
}
// 绘制图表
gauge01.setOption(option)
myChart04.setOption(option)
}
},
mounted() {
......
pages/dncmnc/mnc/compose/echart5.vue 0 → 100644
View file @ 1f9cb369
This diff is collapsed.
pages/dncmnc/mnc/mnc.less
View file @ 1f9cb369
......@@ -42,24 +42,30 @@
border-radius: 3px;
}
}
.set_masage02{
line-height: 35px;
}
}
}
}
#echarts{
.set_echarts{
.echart3{
height: 800px;
}
.tips{
// padding: 20px;
.tips_item{
background: #eff1f7;
margin: 20px;
line-height: 36px;
line-height: 38px;
padding: 0 20px;
.item_top{
border-bottom: 1px solid #b1b1b1;
}
.item_center{
text-align: center;
line-height: 32px;
// line-height: 32px;
}
.item_right{
float: right;
......
pages/dncmnc/mnc/monitoring.vue
View file @ 1f9cb369
......@@ -80,7 +80,7 @@
</div>
</Col>
<Col span="15">
<div class="set_masage">
<div class="set_masage set_masage02">
<p>当前状态开始时间：</p>
<p class="time_bg">11:45:05</p>
<p>当前状态持续时间：</p>
......@@ -102,13 +102,13 @@
<p class="set_top">加工状态实时信息</p>
<div class="set_echarts">
<Row>
<Col span="16">
<Col span="17">
<div class="echart3">
<Echart3 ></Echart3>
<Echart4 ></Echart4>
<Echart5 ></Echart5>
</div>
</Col>
<Col span="8">
<Col span="7">
<div class="tips">
<div class="tips_item">
<Row class="item_top">
......@@ -164,12 +164,12 @@
<script>
import Echart2 from './compose/echart2'
import Echart3 from './compose/echart3'
import Echart4 from './compose/echart4'
import Echart5 from './compose/echart5'
export default {
components: {
Echart2,
Echart3,
Echart4,
Echart5,
},
data(){
return{
......
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