Skip to content

M
mes-ui
Commit 1e3f6c3f authored by kangzhenfei's avatar kangzhenfei
Browse files
Options

dnc

parent 8eef0c12
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 738 additions and 104 deletions
pages/aps/dispatch/dispatch.less
View file @ 1e3f6c3f
......@@ -16,7 +16,7 @@
}
.dispatch_part{
border: 1px solid #ccc;
height: 100%;
// height: 100%;
.dispatch_part_top{
height: 50px;
line-height: 50px;
......
pages/aps/dispatch/index.vue
View file @ 1e3f6c3f
......@@ -25,8 +25,8 @@
</RadioGroup>
</span>
</p>
<h4 class="tc" v-if="this.listTask.length==0">暂无数据</h4>
<div class="dispatch_part_body" v-if="listShow == '订单'" :style="{height:byheight}">
<h4 class="tc" v-if="this.listTask.length==0">暂无数据</h4>
<!-- {{ids}} -->
<!-- <Collapse simple> -->
<div v-for="(item,index) in listOrder" :key="index" :name="item.mesCode">
......@@ -75,6 +75,7 @@
<!--</Collapse> -->
</div>
<div class="dispatch_part_body" v-else-if="listShow == '工单'" :style="{height:byheight}">
<h4 class="tc" v-if="this.listTask.length==0">暂无数据</h4>
<Row :gutter="15" class="card_body01">
<Col span="8" class="dispatch_card" v-for="(item,index) in listTask" :key="index">
<Card>
......@@ -376,10 +377,10 @@ export default {
},
created() {
this.getUserInfoFn();
this.byheight = window.innerHeight - 208 + "px";
this.byheight = window.innerHeight - 178 + "px";
},
mounted() {
this.byheight = window.innerHeight - 208 + "px";
this.byheight = window.innerHeight - 178 + "px";
},
async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典
......
pages/dncmnc/dnc/api.js 0 → 100644
View file @ 1e3f6c3f
import Api from '@/plugins/request'
export default {
index: `${PlanUrl}/mesorder/planpaged`,
// 获取当前登录用户信息
getUserInfo(params) {
return Api.get(`${systemUrl}/user/getuserinfo`, params);
},
// 获取人员列表信息
getUser(params) {
return Api.post(`${systemUrl}/user/getselectuser`, params);
},
// 获取用户所在车间
getUserDepartment(params){
return Api.get(`${systemUrl}/user/getuserdepartment`, params);
},
// 获取用户所有设备
getlistall(params){
return Api.get(`${systemUrl}/equipinfo/getlistall`, params);
},
// 获取用户班组工单
getEntryList(params){
return Api.get(`${PlanUrl}/teamsdispatchs/getentrylist`, params);
},
// 派工接口（保存）
saveTeamentry(params){
return Api.post(`${PlanUrl}/teamsdispatchs/saveteamentry`, params);
},
// 删除拆分项
deleteItem(params){
return Api.get(`${PlanUrl}/teamsdispatchs/deldispatch`, params);
},
//删除：
delete(params) {
return Api.delete(`${PlanUrl}/mesorder/delete`, {
params: params
});
},
}
\ No newline at end of file
pages/dncmnc/dnc/datalist.vue
View file @ 1e3f6c3f
This diff is collapsed.
pages/dncmnc/dnc/dispatch.less 0 → 100644
View file @ 1e3f6c3f
.dispatch{
padding: 12px 5px;
.footer02 {
background: #4c5968;
opacity: 0.9;
position: absolute;
bottom: 0;
box-shadow: 0px -5px 6px rgba(0,0,0,0.3);
width: 98%;
z-index: 99;
padding: 10px;
color: #fff;
margin: 10px 0 10px 0;
}
}
.dispatch_part{
border: 1px solid #ccc;
// height: 100%;
.dispatch_part_top{
height: 50px;
line-height: 50px;
padding: 0 0 0 12px;
background: #F5F6FA;
.check{
position: absolute;
top: 0;
right: 24px;
}
}
.dispatch_part_body{
padding: 10px;
overflow-y: auto;
.h3_bg{
background: #a5adbf;
padding: 0 0 0 10px;
.h3_tag{
margin-left: 15px!important;
}
}
.dispatch_card{
margin: 10px 0;
.card{
.card_top{
.label{
cursor: pointer;
}
}
.ivu-card-head{
background: #2d8cf0!important;
}
}
.g_title{
color: #2d8cf0;
}
}
.dispatch_card02{
margin: 10px 0;
// padding-left: 0!important;
// padding-right: 0!important;
.man_body{
max-width: 185px;
.checkUser{
border-radius: 24px;
width: 100%;
height: 50px;
line-height: 47px;
span{
height: 50px;
}
.svg_name{
overflow: hidden;
text-overflow: ellipsis;
-o-text-overflow: ellipsis;
white-space:nowrap;
display: block;
float: right;
width: 82%;
}
.svg{
width: 70px;
}
}
}
}
}
}
.drawer_midell{
.drawer_center{
text-align: center;
padding: 10px;
color: #2d8cf0;
.color{
color: #2d8cf0;
}
}
}
.drawer_box{
.drawer_row_title{
width: 100px;
height: 40px;
float: left;
margin: 2px 0 0;
font-weight: 600;
}
.drawer_midell{
// height: 120px;
// margin: 20px 0;
.drawer_center{
text-align: center;
padding: 10px;
color: #2d8cf0;
.color{
color: #2d8cf0;
}
}
}
.drawer_row_textarea{
width: 550px;
textarea{
max-height: 200px;
}
}
.drawer_footer{
width: 100%;
position: absolute;
bottom: 0;
left: 0;
border-top: 1px solid #e8e8e8;
padding: 10px 16px;
text-align: right;
background: #fff;
}
}
\ No newline at end of file
pages/dncmnc/mnc/index.vue
View file @ 1e3f6c3f
......@@ -15,28 +15,28 @@
<!-- :conditions="easySearch" :action="action" -->
<template slot="easySearch">
<div class="search_box">
<div class="search_item">
<div class="search_item" @click="filterData()">
<img src="../image/guan.png" alt="">
<div class="top_text">
<p>关机状态</p>
<p><b>123</b></p>
</div>
</div>
<div class="search_item search_item02">
<div class="search_item search_item02" @click="filterData()">
<img src="../image/kong.png" alt="">
<div class="top_text">
<p>空闲状态</p>
<p><b>123</b></p>
</div>
</div>
<div class="search_item search_item03">
<div class="search_item search_item03" @click="filterData()">
<img src="../image/guz.png" alt="">
<div class="top_text">
<p>故障状态</p>
<p><b>123</b></p>
</div>
</div>
<div class="search_item search_item04">
<div class="search_item search_item04" @click="filterData()">
<img src="../image/stay.png" alt="">
<div class="top_text">
<p>运行状态</p>
......@@ -58,10 +58,7 @@
</div>
</template>
<template slot="card" slot-scope="{row}">
<div
class="body" v-for="i of 15" :key="i"
@click="toExecute(row)"
>
<div class="body" v-for="i of 15" :key="i">
<Row class="title-i">
<Col :span="16" class="order-code">
<Ellipsis :text="row.productName+i" :lines="1" tooltip transfer />
......@@ -81,13 +78,14 @@
<div class="panel-text">
<Row>
<Col span="8">
<a @click="getImagpage()" >
<img
:src="getUrl(row.productUrl)"
width="120"
width="120" title="设备监控详情"
height="120"
:title="row.productUrl"
style="border:#cacbd0 dashed 1px"
/>
/></a>
<!-- :title="row.productUrl" -->
</Col>
<Col span="16" class="row">
<p>机床类型：{{row.MachineType}}</p>
......@@ -120,83 +118,12 @@ export default {
}
},
downUrl: fileUrlDown,
columns: [
{
title: this.l("mesCode"),
key: "mesCode",
width: 240,
align: "left"
},
{
key: "status",
title: this.l("status"),
align: "center",
high: true,
code: "taskList.status",
width: 120
},
{
key: "productName",
title: this.l("productName"),
align: "left",
high: true
},
{
key: "drawnNumber",
title: this.l("drawnNumber"),
align: "left",
high: true
},
{
key: "quantity",
title: this.l("quantity"),
align: "right",
width: 120,
high: true
},
{
key: "beginTime",
title: this.l("beginTime"),
align: "center",
width: 180,
high: true
},
{
key: "endTime",
title: this.l("endTime"),
align: "center",
width: 180,
high: true
},
{
title: "操作",
key: "action",
width: 140,
align: "center",
render: (h, params) => {
return h("div", { class: "action" }, [
h(
"op",
{
attrs: { oprate: "edit" },
on: {
click: () =>
this.toExecute(
params.row
)
}
},
"查看"
)
]);
}
}
],
columns: [],
comondata:[
{
productName: "德玛吉235550",
statu: "空闲",
productUrl:"",
productUrl:"shebei.png",
MachineType: "机床类型",
MachineCode: "机床编码",
MachineIp: "1231-111-26012",
......@@ -204,6 +131,7 @@ export default {
},{
productName: "德玛吉235536",
statu: "关机",
productUrl:"shebei.png",
MachineType: "机床类型",
MachineCode: "机床编码",
MachineIp: "1231-111-26012",
......@@ -211,6 +139,7 @@ export default {
},{
productName: "德玛吉235537",
statu: "故障",
productUrl:"shebei.png",
MachineType: "机床类型",
MachineCode: "机床编码",
MachineIp: "1231-111-26012",
......@@ -218,6 +147,7 @@ export default {
},{
productName: "德玛吉235537",
statu: "运行中",
productUrl:"shebei.png",
MachineType: "机床类型",
MachineCode: "机床编码",
MachineIp: "1231-111-26012",
......@@ -333,25 +263,31 @@ export default {
}
return res;
},
filterData(){
this.$Message.success("过滤数据...")
},
getUrl(url) {
//返回img需要显示的src值
let tempUrl = "";
if (url && url.length > 0) {
tempUrl = this.downUrl + url;
// tempUrl = this.downUrl + url;
tempUrl = iconImg + url;
} else {
tempUrl = iconImg + "noPic_product.png";
}
return tempUrl;
},
getImagpage(){
this.$router.push("/dncmnc/mnc/monitoring");
},
gotoTable(){
//跳转到数据分析表页面 获取id:this.$route.query.id
this.$router.push("/dncmnc/mnc/analysis"
);
this.$router.push("/dncmnc/mnc/analysis");
},
l(key) {
let vkey = "order_list" + "." + key;
return this.$t(vkey) || key;
}
// l(key) {
// let vkey = "order_list" + "." + key;
// return this.$t(vkey) || key;
// }
}
};
</script>
......@@ -452,7 +388,7 @@ export default {
}
}
.body:hover {
cursor: pointer;
// cursor: pointer;
box-shadow: 0 0 10px #888888;
}
}
......
pages/dncmnc/mnc/monitoring.vue 0 → 100644
View file @ 1e3f6c3f
<template>
<div>
单台设备监控页面
</div>
</template>
<script>
export default {
}
</script>
\ 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