Skip to content

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

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

parents 1c941cf1 359467d5
Hide whitespace changes
Inline Side-by-side
Showing with 153 additions and 120 deletions
components/page/dataGrid.vue
View file @ 226a292f
......@@ -277,23 +277,19 @@ export default {
} else {
this.easySearch();
}
console.warn("this.$refs.main.clientX",this.$refs.main.offsetTop,this.$refs.main.offsetHeight)
if (this.height === 0) {
this.$nextTick(() => {
this.tableHeight = this.$refs.main.offsetHeight;
if (this.tableHeight < 300) {
this.tableHeight = window.screen.availHeight -this.$refs.main.offsetTop-200;
}
console.warn("this.$refs.main.VVV",this.tableHeight)
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
console.warn(123)
this.tableHeight = this.$refs.main.offsetHeight;
if (this.tableHeight < 300) {
this.tableHeight = window.screen.availHeight -this.$refs.main.offsetTop-150;
}
console.warn("this.$refs.main.tableHeight",this.tableHeight)
})();
};
});
......@@ -302,7 +298,6 @@ export default {
}
//注册拖拽事件。
this.$dragging.$on("dragend", e => {
// console.log("dragend",e);
this.saveUserconfig();
});
},
......@@ -328,7 +323,6 @@ export default {
if (this.userConfig) {
var curColumns = [];
var config = JSON.parse(this.userConfig.content);
// console.warn("2:列比对",config)
if (config.length == this.columnsCur.length) {
config.map(u => {
var item = this.columnsCur.filter(c => {
......@@ -339,7 +333,6 @@ export default {
curColumns.push(item[0]);
}
});
// console.warn("3:初始化列")
this.columnsCur = curColumns;
}
}
......@@ -369,7 +362,6 @@ export default {
if (r.success) {
if (r.result.length == 1) {
this.userConfig = r.result[0];
// console.warn("1:加载用户配置")
this.columnInit();
}
if (!this.configLoad) {
......
layouts/basic-layout/product.vue
View file @ 226a292f
......@@ -458,7 +458,7 @@ export default {
}
}
.t_title {
min-width: 120px;
min-width: 150px;
background: #515a6e;
.a_goIndex {
color: #fff;
......
pages/aps/aps/index.vue
View file @ 226a292f
......@@ -83,7 +83,10 @@
<Modal v-model="apsModal" title="确定APS排产" @on-ok="apsOk" @on-cancel="cancel">
<p>确定进行APS排产？</p>
</Modal>
<Modal v-model="resultModal" title="数据检查" width="1500" @on-ok="checkOk" @on-cancel="cancel">
<!-- <Modal v-model="resultModal" title="数据检查" width="1500" @on-ok="checkOk" @on-cancel="cancel">
<CheckResult :data="result"></CheckResult>
</Modal> -->
<Modal v-model="resultModal" title="数据检查" width="1500" @on-ok="cancel" @on-cancel="cancel">
<CheckResult :data="result"></CheckResult>
</Modal>
<Modal v-model="apsCheckModal" title="确定APS排产" @on-ok="apsCheckOk" @on-cancel="cancel">
......@@ -591,11 +594,14 @@ export default {
Api.apsdatachecked()
.then(res1 => {
if (res1.success) {
this.result=res1.result;
this.resultModal=true;
// this.result=res1.result;
// this.resultModal=true;
this.checkOk();
} else {
this.circleModal = false;
this.$Message.error("操作失败：数据校验");
// this.circleModal = false;
// this.$Message.error("操作失败：数据校验");
this.result=res1.result;
this.resultModal=true;
}
})
.catch(
......
pages/dncmnc/mnc/index.vue
View file @ 226a292f
......@@ -19,28 +19,28 @@
<img src="../image/guan.png" alt="">
<div class="top_text">
<p>关机状态</p>
<p><b>123</b></p>
<p><b>1</b></p>
</div>
</div>
<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>
<p><b>1</b></p>
</div>
</div>
<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>
<p><b>1</b></p>
</div>
</div>
<div class="search_item search_item04" @click="filterData()">
<img src="../image/stay.png" alt="">
<div class="top_text">
<p>运行状态</p>
<p><b>123</b></p>
<p><b>10</b></p>
</div>
</div>
</div>
......@@ -58,13 +58,13 @@
</div>
</template>
<template slot="card" slot-scope="{row}">
<div class="body" v-for="i of 2" :key="i">
<div class="body">
<Row class="title-i">
<Col :span="16" class="order-code">
<Ellipsis :text="row.productName+i" :lines="1" tooltip transfer />
<Ellipsis :text="row.productName" :lines="1" tooltip transfer />
</Col>
<Col :span="4" class="order-code">
<a>查看详情</a>
<a @click="getImagpage(row)">查看详情</a>
</Col>
<Col :span="4">
<div class="statuBg" :style="tdStyle(row.statu)"></div>
......@@ -78,7 +78,7 @@
<div class="panel-text">
<Row>
<Col span="8">
<a @click="getImagpage()" >
<a @click="getImagpage(row)" >
<img
:src="getUrl(row.productUrl)"
width="120" title="设备监控详情"
......@@ -118,10 +118,12 @@ export default {
}
},
downUrl: fileUrlDown,
columns: [],
columns: {
count:7,
},
comondata:[
{
productName: "德玛吉235550",
productName: "受电弓",
statu: "空闲",
productUrl:"shebei01.png",
MachineType: "V1-256-16331",
......@@ -129,7 +131,7 @@ export default {
MachineIp: "1231-111-26012",
information: "V-5633-12112",
},{
productName: "德玛吉235536",
productName: "列车轮对设备",
statu: "关机",
productUrl:"shebei02.png",
MachineType: "V1-256-16332",
......@@ -137,7 +139,7 @@ export default {
MachineIp: "1231-111-26012",
information: "V-5633-12112",
},{
productName: "德玛吉235537",
productName: "走行部",
statu: "故障",
productUrl:"shebei03.png",
MachineType: "V1-256-16333",
......@@ -145,87 +147,86 @@ export default {
MachineIp: "1231-111-26012",
information: "V-5633-12112",
},{
productName: "德玛吉235537",
productName: "物流系统",
statu: "运行中",
productUrl:"shebei04.png",
MachineType: "V1-256-16334",
MachineCode: "JCBM-06224",
MachineIp: "1231-111-26012",
information: "V-5633-12112",
},{
productName: "安全联锁",
statu: "运行中",
productUrl:"shebei05.png",
MachineType: "V1-256-16334",
MachineCode: "JCBM-06224",
MachineIp: "1231-111-26012",
information: "V-5633-12112",
},{
productName: "智能加注设备",
statu: "运行中",
productUrl:"shebei06.png",
MachineType: "V1-256-16334",
MachineCode: "JCBM-06224",
MachineIp: "1231-111-26012",
information: "V-5633-12112",
},{
productName: "列车自动清洗机",
statu: "运行中",
productUrl:"shebei07.png",
MachineType: "V1-256-16334",
MachineCode: "JCBM-06224",
MachineIp: "1231-111-26012",
information: "V-5633-12112",
},{
productName: "架车机",
statu: "运行中",
productUrl:"shebei08.png",
MachineType: "V1-256-16334",
MachineCode: "JCBM-06224",
MachineIp: "1231-111-26012",
information: "V-5633-12112",
},{
productName: "不轮落旋床",
statu: "运行中",
productUrl:"shebei09.png",
MachineType: "V1-256-16334",
MachineCode: "JCBM-06224",
MachineIp: "1231-111-26012",
information: "V-5633-12112",
},{
productName: "牵引电机试验台",
statu: "运行中",
productUrl:"shebei10.png",
MachineType: "V1-256-16334",
MachineCode: "JCBM-06224",
MachineIp: "1231-111-26012",
information: "V-5633-12112",
},{
productName: "车辆阀类试验台",
statu: "运行中",
productUrl:"shebei11.png",
MachineType: "V1-256-16334",
MachineCode: "JCBM-06224",
MachineIp: "1231-111-26012",
information: "V-5633-12112",
},{
productName: "辅助逆变向试验台",
statu: "运行中",
productUrl:"shebei12.png",
MachineType: "V1-256-16334",
MachineCode: "JCBM-06224",
MachineIp: "1231-111-26012",
information: "V-5633-12112",
},{
productName: "空调负载试验台",
statu: "运行中",
productUrl:"shebei13.png",
MachineType: "V1-256-16334",
MachineCode: "JCBM-06224",
MachineIp: "1231-111-26012",
information: "V-5633-12112",
},
// {
// productName: "德玛吉235537",
// statu: "运行中",
// productUrl:"shebei05.png",
// MachineType: "V1-256-16334",
// MachineCode: "JCBM-06224",
// MachineIp: "1231-111-26012",
// information: "V-5633-12112",
// },{
// productName: "德玛吉235537",
// statu: "运行中",
// productUrl:"shebei06.png",
// MachineType: "V1-256-16334",
// MachineCode: "JCBM-06224",
// MachineIp: "1231-111-26012",
// information: "V-5633-12112",
// },{
// productName: "德玛吉235537",
// statu: "运行中",
// productUrl:"shebei07.png",
// MachineType: "V1-256-16334",
// MachineCode: "JCBM-06224",
// MachineIp: "1231-111-26012",
// information: "V-5633-12112",
// },{
// productName: "德玛吉235537",
// statu: "运行中",
// productUrl:"shebei08.png",
// MachineType: "V1-256-16334",
// MachineCode: "JCBM-06224",
// MachineIp: "1231-111-26012",
// information: "V-5633-12112",
// },{
// productName: "德玛吉235537",
// statu: "运行中",
// productUrl:"shebei09.png",
// MachineType: "V1-256-16334",
// MachineCode: "JCBM-06224",
// MachineIp: "1231-111-26012",
// information: "V-5633-12112",
// },{
// productName: "德玛吉235537",
// statu: "运行中",
// productUrl:"shebei10.png",
// MachineType: "V1-256-16334",
// MachineCode: "JCBM-06224",
// MachineIp: "1231-111-26012",
// information: "V-5633-12112",
// },{
// productName: "德玛吉235537",
// statu: "运行中",
// productUrl:"shebei11.png",
// MachineType: "V1-256-16334",
// MachineCode: "JCBM-06224",
// MachineIp: "1231-111-26012",
// information: "V-5633-12112",
// },{
// productName: "德玛吉235537",
// statu: "运行中",
// productUrl:"shebei12.png",
// MachineType: "V1-256-16334",
// MachineCode: "JCBM-06224",
// MachineIp: "1231-111-26012",
// information: "V-5633-12112",
// },{
// productName: "德玛吉235537",
// statu: "运行中",
// productUrl:"shebei13.png",
// MachineType: "V1-256-16334",
// MachineCode: "JCBM-06224",
// MachineIp: "1231-111-26012",
// information: "V-5633-12112",
// },
],
typeInfo: "card",
iconInfo: "md-apps",
......@@ -350,8 +351,12 @@ export default {
}
return tempUrl;
},
getImagpage(){
this.$router.push("/dncmnc/mnc/monitoring");
getImagpage(rowDta){
console.log(rowDta)
this.$router.push({
path: "/dncmnc/mnc/monitoring",
query: { imgData: rowDta }
});
},
gotoTable(){
//跳转到数据分析表页面 获取id:this.$route.query.id
......
pages/dncmnc/mnc/mnc.less
View file @ 226a292f
......@@ -15,8 +15,8 @@
.set_card_body{
padding: 10px;
.set_img{
min-width: 150px;
min-height: 120px;
width: 150px;
height: 120px;
text-align: center;
}
.statu_box{
......
pages/dncmnc/mnc/monitoring.vue
View file @ 226a292f
......@@ -14,15 +14,16 @@
<div class="set_card_body">
<Row>
<Col span="10">
<img class="set_img" src="../image/shebei.png" alt=""/>
<img class="set_img" :src="getUrl()" alt=""/>
<!-- <img class="set_img" src="../image/shebei.png" alt=""/> -->
</Col>
<Col span="14">
<div class="set_masage">
<p>设备名称：德玛吉235537</p>
<p>设备类型：V1-256-16334</p>
<p>设备编码：JCBM-06224</p>
<p>设备IP：1231-111-26012</p>
<p>系统信息：V-5633-12112</p>
<p>设备名称：{{formData.productName}}</p>
<p>设备类型：{{formData.MachineType}}</p>
<p>设备编码：{{formData.MachineCode}}</p>
<p>设备IP：{{formData.MachineIp}}</p>
<p>系统信息：{{formData.information}}</p>
</div>
</Col>
</Row>
......@@ -34,7 +35,7 @@
<p class="set_top">当前任务信息</p>
<div class="set_card_body">
<div class="set_masage">
<p>当前程序号：德玛吉235537</p>
<p>当前程序号：德玛吉程序235537</p>
<p>零件号：V1-256-16334</p>
<p>加工工序号：JCBM-06224</p>
<p>当前任务号：RWBH-0617-001</p>
......@@ -75,8 +76,11 @@
<Row>
<Col span="9">
<div class="set_img statu_box">
<img src="../image/guz.png" alt="">
<p>故障</p>
<img v-if="formData.statu=='关机'" src="../image/guan.png" alt="">
<img v-else-if="formData.statu=='空闲'" src="../image/kong.png" alt="">
<img v-else-if="formData.statu=='故障'" src="../image/guz.png" alt="">
<img v-else src="../image/stay.png" alt="">
<p>{{formData.statu}}</p>
</div>
</Col>
<Col span="15">
......@@ -171,16 +175,31 @@ export default {
Echart3,
Echart5,
},
created(){
// this.laode()
},
data(){
return{
formData:this.$router.currentRoute.query.imgData
};
},
methods:{
// laode(){},
goView(){
//返回设备监控页面 获取id:this.$route.query.id
this.$router.push("/dncmnc/mnc");
},
getUrl() {
let url = this.formData.productUrl
let tempUrl = "";
if (url && url.length > 0) {
// tempUrl = this.downUrl + url;
tempUrl = mncImg + url;
} else {
tempUrl = iconImg + "noPic_product.png";
}
return tempUrl;
},
},
}
</script>
\ No newline at end of file
pages/technology/processview.vue
View file @ 226a292f
......@@ -36,7 +36,7 @@
</div>
</Col>
<Col span="3">
<div class="row_label">任务类型</div>
<div class="row_label">工艺类型</div>
</Col>
<Col span="9">
<div class="iview_cont border_none">
......@@ -89,7 +89,7 @@
<Row class="center f16">
<div class="iview_cont01">
<span>校 对：</span>
<label class="table_row min120" v-text="formValidate.proofreader"></label>
<label class="table_row min120" v-text="formValidate.proofReader"></label>
</div>
</Row>
<Row class="center f16">
......
pages/technology/productMix/product/add.vue
View file @ 226a292f
......@@ -228,6 +228,10 @@ export default {
width: 100%;
height: 300px;
overflow: hidden;
img{
width: 300px;
max-height: 300px;
}
}
}
</style>
\ No newline at end of file
pages/technology/productMix/product/edit.vue
View file @ 226a292f
......@@ -228,7 +228,11 @@ export default {
.add-list {
width: 100%;
height: 300px;
overflow: hidden;
overflow: hidden;
img{
width: 300px;
max-height: 300px;
}
}
}
</style>
\ No newline at end of file
pages/technology/productMix/product/index.vue
View file @ 226a292f
......@@ -367,11 +367,14 @@ export default {
padding: 10px;
.img-i {
width: 90px;
height: 100px;
background: #eee;
height: 90px;
margin-right: 15px;
overflow: hidden;
// overflow: hidden;
img{
width: 90px;
height: 90px;
}
}
.c div {
margin-bottom: 8px;
......
pages/workflow/process/index.vue
View file @ 226a292f
......@@ -268,7 +268,7 @@ export default {
})
},
remove(id) {
Api.delete({ id: this.curId }).then((r) => {
Api.delete({ id: id}).then((r) => {
if (r.success) {
this.$refs.grid.load()
this.deletelModal = false
......
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