Skip to content

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

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

parents 92e1727d 576f0669
Hide whitespace changes
Inline Side-by-side
Showing with 140 additions and 8 deletions
i18n/locale/zh-CN.js
View file @ b61860d7
......@@ -1487,7 +1487,9 @@ export default {
endTime: '结束时间',
planEndTime: '计划结束时间',
action: '操作',
subWorkHourStatus:'工时状态'
subWorkHourStatus:'工时状态',
routingHeaderCode:'工艺编号',
routingHeaderName:'工艺名称'
},
product_level: {
name: '名称',
......
pages/api.vue 0 → 100644
View file @ b61860d7
<template>
<div class="api-content">
<div class="header">
<div class="fl">
<a href="/api" class="mr20">
<Icon type="md-home" size="20" color="#547F00"/> 主页
</a>
<span>
<img height="20" width="20" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAMAAAAM7l6QAAAAYFBMVEUAAABUfwBUfwBUfwBUfwBUfwBUfwBUfwBUfwBUfwBUfwBUfwBUfwBUfwBUfwB0lzB/n0BfhxBpjyC0x4////+qv4CJp1D09++ft3C/z5/K16/U379UfwDf58/q79+Ur2D2RCk9AAAAHXRSTlMAEEAwn9//z3Agv4/vYID/////////////////UMeji1kAAAD8SURBVHgBlZMFAoQwDATRxbXB7f+vPKnlXAZn6k2cf3A9z/PfOC8IIYni5FmmABM8FMhwT17c9hnhiZL1CwvEL1tmPD0qSKq6gaStW/kMXanVmAVRDUlH1OvuuTINo6k90Sxf8qsOtF6g4ff1osP3OnMcV7d4pzdIUtu1oA4V0DZoKmxmlEYvtDUjjS3tmKmqB+pYy8pD1VPf7jPE0I40HHcaBwnue6fGzgyS5tXIU96PV7rkDWHNLV0DK4FkoKmFpN5oUnvi8KoeA2/JXsmXQuokx0siR1G8tLkN6eB9sLwJp/yymcyaP/TrP+RPmbMMixcJVgTR1aUZ93oGXsgXQAaG6EwAAAAASUVORK5CYII=" alt="Swagger UI">
Swagger</span>
<a target="blank" :href="host + ':10020/swagger/index.html'">
系统管理
</a>
<a target="blank" :href="host + ':10030/swagger/index.html'">
工艺规程（旧）
</a>
<a target="blank" :href="host + ':10031/swagger/index.html'">
工艺规程
</a>
<a target="blank" :href="host + ':10032/swagger/index.html'">
物料中心
</a>
<a target="blank" :href="host + ':10040/swagger/index.html'">
制造资源
</a>
<a target="blank" :href="host + ':10050/swagger/index.html'">
计划管理
</a>
<a target="blank" :href="host + ':10060/swagger/index.html'">
工作流
</a>
<a target="blank" :href="host + ':10070/swagger/index.html'"> Bug </a>
<a target="blank" :href="host + ':10090/swagger/index.html'">
certificate
</a>
<a target="blank" :href="host + ':10100/swagger/index.html'"> CRM </a>
</div>
<div class="fl ml20">
<span>
<Icon type="md-grid" size="20" color="#547F00"/>
产品</span>
<a :href="host+':3006'" target="blank">Mes</a>
<a :href="host+':3005'" target="blank">Portal</a>
<a :href="host+':3004'" target="blank">Saas</a>
</div>
<div class="fr">
<RadioGroup v-model="host" type="button">
<Radio label="http://49.232.68.61">61</Radio>
<Radio label="http://39.100.148.168">168</Radio>
</RadioGroup>
</div>
</div>
<div class="main">
<iframe
src="http://47.92.102.113:5000/account/login"
frameborder="0"
width="100%"
height="100%"
></iframe>
</div>
</div>
</template>
<script>
export default {
name: "Api",
layout: "empty",
header:{
title:"Swagger集成页面"
},
data() {
return {
url: "http://39.100.148.168:10010/swagger/index.html",
host: "http://39.100.148.168",
};
},
};
</script>
<style lang="less">
.api-content {
height: 100vh;
.header{
background: #f7f7f7;
height: 33px;
padding: 0 0 0 10px;
color:#2D8cF0;
img{
vertical-align: -5px;
}
.fl{
line-height: 33px;
a{
display: inline-block;
margin-left: 10px;
}
a::after{
margin-left: 10px;
content: "|";
}
a:hover{
color: orangered;
}
}
}
.main {
height: calc(100vh - 40px);
}
}
</style>
\ No newline at end of file
pages/aps/dispatch/index.vue
View file @ b61860d7
......@@ -48,7 +48,7 @@
:name="item.mesCode"
>
<h3 class="h3_bg">
订单号22：{{ item[0].mesCode }}
订单号：{{ item[0].mesCode }}
<Tag class="h3_tag">{{ item.length }}</Tag
>&nbsp;&nbsp;&nbsp; 工艺规程：{{ item[0].routingHeaderCode }} / {{ item[0].routingHeaderName }}
</h3>
......@@ -122,7 +122,7 @@
<Checkbox
v-model="item.checked"
:disabled="item.status != -1"
>订单号11：{{ item.mesCode }}</Checkbox
>订单号：{{ item.mesCode }}</Checkbox
>
</p>
<div class="h60">
......
pages/produce/api.js
View file @ b61860d7
import Api from '@/plugins/request'
export default {
index: `${PlanUrl}/orderexecutenew/Paged_Img_RoutingDetail`,
// index: `${PlanUrl}/orderexecutenew/Paged_Img_RoutingDetail`,
index: `${PlanUrl}/orderexecutenew/paged_list_order`,
paged(params) {
return Api.post(`${PlanUrl}/orderexecutenew/Paged_Img_RoutingDetail`, params);
},
......
pages/produce/orderlist.vue
View file @ b61860d7
......@@ -104,18 +104,23 @@
/>-->
</Col>
<Col span="16" class="row">
<p>{{ l("beginTime") }}：{{ row.beginTime }}</p>
<p>
工艺：{{ row.routingHeaderCode }} /
{{ row.routingHeaderName }}
</p>
<!-- <p>工艺名称：{{ row.routingHeaderName }}</p> -->
<p>{{ l("beginTime") }}：{{ row.begin_time }}</p>
<p>
<span v-if="getStatus(row.status)"
>{{ l("planEndTime") }}：</span
>
<span v-else>{{ l("endTime") }}：</span>
{{ row.endTime }}
{{ row.end_time }}
</p>
<p v-if="getStatus(row.status) && getTimes(row.endTime) > 0">
<p v-if="getStatus(row.status) && getTimes(row.end_time) > 0">
剩余时间：
<OutputTime
:value="getTimes(row.endTime)"
:value="getTimes(row.end_time)"
style="display: inline"
></OutputTime>
</p>
......@@ -208,6 +213,20 @@ export default {
width: 240,
align: "left",
},
{
key: "routingHeaderCode",
title: this.l("routingHeaderCode"),
align: "center",
width: 180,
high: true,
},
{
key: "routingHeaderName",
title: this.l("routingHeaderName"),
align: "center",
width: 180,
high: true,
},
{
key: "status",
title: this.l("status"),
......
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