Skip to content

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

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

parents 62684fb2 83384116
Hide whitespace changes
Inline Side-by-side
Showing with 152 additions and 45 deletions
pages/dncmnc/mnc/index.vue
View file @ fdf5d990
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
</div> </div>
</template> </template>
<template slot="card" slot-scope="{row}"> <template slot="card" slot-scope="{row}">
<div class="body" v-for="i of 5" :key="i"> <div class="body" v-for="i of 2" :key="i">
<Row class="title-i"> <Row class="title-i">
<Col :span="16" class="order-code"> <Col :span="16" class="order-code">
<Ellipsis :text="row.productName+i" :lines="1" tooltip transfer /> <Ellipsis :text="row.productName+i" :lines="1" tooltip transfer />
...@@ -88,9 +88,9 @@ ...@@ -88,9 +88,9 @@
<!-- :title="row.productUrl" --> <!-- :title="row.productUrl" -->
</Col> </Col>
<Col span="16" class="row"> <Col span="16" class="row">
<p>机床类型：{{row.MachineType}}</p> <p>设备类型：{{row.MachineType}}</p>
<p>机床编码：{{row.MachineCode}}</p> <p>设备编码：{{row.MachineCode}}</p>
<p>机床IP：{{row.MachineIp}}</p> <p>设备IP：{{row.MachineIp}}</p>
<p>系统信息：{{row.information}}</p> <p>系统信息：{{row.information}}</p>
</Col> </Col>
</Row> </Row>
...@@ -123,7 +123,7 @@ export default { ...@@ -123,7 +123,7 @@ export default {
{ {
productName: "德玛吉235550", productName: "德玛吉235550",
statu: "空闲", statu: "空闲",
productUrl:"shebei.png", productUrl:"shebei01.png",
MachineType: "V1-256-16331", MachineType: "V1-256-16331",
MachineCode: "JCBM-06221", MachineCode: "JCBM-06221",
MachineIp: "1231-111-26012", MachineIp: "1231-111-26012",
...@@ -131,7 +131,7 @@ export default { ...@@ -131,7 +131,7 @@ export default {
},{ },{
productName: "德玛吉235536", productName: "德玛吉235536",
statu: "关机", statu: "关机",
productUrl:"shebei.png", productUrl:"shebei02.png",
MachineType: "V1-256-16332", MachineType: "V1-256-16332",
MachineCode: "JCBM-06222", MachineCode: "JCBM-06222",
MachineIp: "1231-111-26012", MachineIp: "1231-111-26012",
...@@ -139,7 +139,7 @@ export default { ...@@ -139,7 +139,7 @@ export default {
},{ },{
productName: "德玛吉235537", productName: "德玛吉235537",
statu: "故障", statu: "故障",
productUrl:"shebei.png", productUrl:"shebei03.png",
MachineType: "V1-256-16333", MachineType: "V1-256-16333",
MachineCode: "JCBM-06223", MachineCode: "JCBM-06223",
MachineIp: "1231-111-26012", MachineIp: "1231-111-26012",
...@@ -147,12 +147,85 @@ export default { ...@@ -147,12 +147,85 @@ export default {
},{ },{
productName: "德玛吉235537", productName: "德玛吉235537",
statu: "运行中", statu: "运行中",
productUrl:"shebei.png", productUrl:"shebei04.png",
MachineType: "V1-256-16334", MachineType: "V1-256-16334",
MachineCode: "JCBM-06224", MachineCode: "JCBM-06224",
MachineIp: "1231-111-26012", MachineIp: "1231-111-26012",
information: "V-5633-12112", 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", typeInfo: "card",
iconInfo: "md-apps", iconInfo: "md-apps",
...@@ -271,7 +344,7 @@ export default { ...@@ -271,7 +344,7 @@ export default {
let tempUrl = ""; let tempUrl = "";
if (url && url.length > 0) { if (url && url.length > 0) {
// tempUrl = this.downUrl + url; // tempUrl = this.downUrl + url;
tempUrl = iconImg + url; tempUrl = mncImg + url;
} else { } else {
tempUrl = iconImg + "noPic_product.png"; tempUrl = iconImg + "noPic_product.png";
} }
......
pages/dncmnc/mnc/monitoring.vue
View file @ fdf5d990
...@@ -18,10 +18,10 @@ ...@@ -18,10 +18,10 @@
</Col> </Col>
<Col span="14"> <Col span="14">
<div class="set_masage"> <div class="set_masage">
<p>机床名称：德玛吉235537</p> <p>设备名称：德玛吉235537</p>
<p>机床类型：V1-256-16334</p> <p>设备类型：V1-256-16334</p>
<p>机床编码：JCBM-06224</p> <p>设备编码：JCBM-06224</p>
<p>机床IP：1231-111-26012</p> <p>设备IP：1231-111-26012</p>
<p>系统信息：V-5633-12112</p> <p>系统信息：V-5633-12112</p>
</div> </div>
</Col> </Col>
......
pages/handle/examine3/detail.vue
View file @ fdf5d990
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
</template> </template>
<script> <script>
import Api from '../api' import Api from '../api'
import Processview from '../../processDesign/Process/processview.vue' import Processview from '../../technology/processview.vue'
export default { export default {
name: 'detail', name: 'detail',
...@@ -40,7 +40,7 @@ export default { ...@@ -40,7 +40,7 @@ export default {
load(v) { load(v) {
Api.get({ Id: this.idVal }).then((r) => { Api.get({ Id: this.idVal }).then((r) => {
if (r.success) { if (r.success) {
this.$refs.processview.loaddata(r.result.fromIds) this.$refs.processview.load(r.result.fromIds)
} else { } else {
this.$Message.error('加载失败') this.$Message.error('加载失败')
} }
......
pages/technology/processview.vue
View file @ fdf5d990
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
<Col span="9"> <Col span="9">
<div class="iview_cont border_none"> <div class="iview_cont border_none">
&nbsp; &nbsp;
<label v-text="formValidate.task_type_str"></label> <state code="Process.Routing.routingType" :value="formValidate.routingType+''" type="text"></state>
</div> </div>
</Col> </Col>
</Row> </Row>
...@@ -52,16 +52,16 @@ ...@@ -52,16 +52,16 @@
<Col span="9"> <Col span="9">
<div class="iview_cont"> <div class="iview_cont">
&nbsp; &nbsp;
<label v-text="formValidate.versiondesc"></label> <state code="Process.Routing.version" :value="formValidate.versionid+''" type="text"></state>
</div> </div>
</Col> </Col>
<Col span="3"> <Col span="3">
<div class="row_label">研制方式</div> <div class="row_label">工艺阶段</div>
</Col> </Col>
<Col span="9"> <Col span="9">
<div class="iview_cont border_none"> <div class="iview_cont border_none">
&nbsp; &nbsp;
<label v-text="formValidate.development_mode_str"></label> <state code="Process.Routing.phase" :value="formValidate.phase+''" type="text"></state>
</div> </div>
</Col> </Col>
</Row> </Row>
...@@ -165,19 +165,19 @@ ...@@ -165,19 +165,19 @@
<tbody> <tbody>
<template v-for="(item5,index5) in formValidate.details"> <template v-for="(item5,index5) in formValidate.details">
<tr> <tr>
<td class="tl">{{item5.taskseq}}</td> <td class="tl">{{item5.taskSeq}}</td>
<td class="tl">{{item5.name}}</td> <td class="tl">{{item5.name}}</td>
<td class="tl"> <td class="tl">
<div v-html="item5.task_content" class="tohtml"></div> <div v-html="item5.taskContent" class="tohtml"></div>
</td> </td>
<td class="tl">{{item5.operator}}</td> <td class="tl">{{item5.operator}}</td>
<td class="tl">{{item5.proofreader}}</td> <td class="tl">{{item5.proofreader}}</td>
</tr> </tr>
<tr v-for="(item6,index6) in item5.step"> <tr v-for="(item6,index6) in item5.step">
<td class="tl">{{item6.taskseq}}</td> <td class="tl">{{item6.taskSeq}}</td>
<td class="tl">{{item6.name}}</td> <td class="tl">{{item6.name}}</td>
<td class="tl"> <td class="tl">
<div v-html="item6.task_content" class="tohtml"></div> <div v-html="item6.taskContent" class="tohtml"></div>
</td> </td>
<td class="tl">{{item6.operator}}</td> <td class="tl">{{item6.operator}}</td>
<td class="tl">{{item6.proofreader}}</td> <td class="tl">{{item6.proofreader}}</td>
...@@ -211,9 +211,9 @@ ...@@ -211,9 +211,9 @@
<tbody> <tbody>
<template v-for="(item7,index7) in formValidate.qcards"> <template v-for="(item7,index7) in formValidate.qcards">
<tr> <tr>
<td class="tl">{{item7.taskseq}}</td> <td class="tl">{{item7.taskSeq}}</td>
<td class="tl">{{item7.check_content}}</td> <td class="tl">{{item7.checkContent}}</td>
<td class="tl">{{item7.checkresult}}</td> <td class="tl">{{item7.checkResult}}</td>
<td class="tl">{{item7.result}}</td> <td class="tl">{{item7.result}}</td>
<td class="tl">{{item7.checker}}</td> <td class="tl">{{item7.checker}}</td>
<td class="tl">{{item7.remarks}}</td> <td class="tl">{{item7.remarks}}</td>
...@@ -233,6 +233,7 @@ ...@@ -233,6 +233,7 @@
</div> </div>
</template> </template>
<script> <script>
import Api from "./api";
import service from "@/plugins/request"; import service from "@/plugins/request";
export default { export default {
name: "processview", name: "processview",
...@@ -274,7 +275,7 @@ export default { ...@@ -274,7 +275,7 @@ export default {
load(v) { load(v) {
this.circleModal = true; this.circleModal = true;
this.dataSatus = false; this.dataSatus = false;
var url = `${designUrl}/routingheader/getprocessinfo?headerid=` + v; var url = `${technologyUrl}routingheader/getprocessinfo?headerid=` + v;
service service
.get(`${url}`) .get(`${url}`)
.then(response => { .then(response => {
...@@ -303,19 +304,53 @@ export default { ...@@ -303,19 +304,53 @@ export default {
loadImg() { loadImg() {
this.nameList = []; this.nameList = [];
this.formValidate.files = []; this.formValidate.files = [];
//查询上传到文件服务器上的文件 if (this.eid == undefined) {
this.$http.sysUser.getFile(this.parms).then(res => { let pars = {
if (res.data != [] && res.data.length > 0) { conditions: [
res.data.forEach(data => { {
let objImag = {}; fieldName: "code",
objImag.fileName = data.fileName; fieldValue: this.formValidate.code,
objImag.url = data.downloadPath; conditionalType: "Equal"
objImag.id = data.id; }
this.nameList.push(objImag); ]
}); };
this.formValidate.files = this.nameList; Api.paged(pars)
} .then(res => {
}); if (res.result.items[0].fileId) {
this.parms.eid = res.result.items[0].fileId;
} else {
this.parms.eid = this.$u.guid(); //未上传过文件
}
//查询上传到文件服务器上的文件
this.$http.sysUser.getFile(this.parms).then(res => {
if (res.data != [] && res.data.length > 0) {
res.data.forEach(data => {
let objImag = {};
objImag.fileName = data.fileName;
objImag.url = data.downloadPath;
objImag.id = data.id;
this.nameList.push(objImag);
});
this.formValidate.files = this.nameList;
}
});
})
.catch(err => {});
} else {
//查询上传到文件服务器上的文件
this.$http.sysUser.getFile(this.parms).then(res => {
if (res.data != [] && res.data.length > 0) {
res.data.forEach(data => {
let objImag = {};
objImag.fileName = data.fileName;
objImag.url = data.downloadPath;
objImag.id = data.id;
this.nameList.push(objImag);
});
this.formValidate.files = this.nameList;
}
});
}
} }
}, },
watch: { watch: {
...@@ -324,12 +359,11 @@ export default { ...@@ -324,12 +359,11 @@ export default {
this.load(v); this.load(v);
} }
}, },
uid(v) { uid(v) {
if (v != 0) { if (v != 0) {
this.parms.eid=v this.parms.eid = v;
} }
}, }
} }
}; };
</script> </script>
...@@ -353,6 +387,5 @@ export default { ...@@ -353,6 +387,5 @@ export default {
position: relative; position: relative;
border: 0px solid #eee; border: 0px solid #eee;
} }
</style> </style>
static/config.js
View file @ fdf5d990
...@@ -26,6 +26,7 @@ window.crmUrl = `http://${address}:10000/crm`; //crm客户、合同、项目管 ...@@ -26,6 +26,7 @@ window.crmUrl = `http://${address}:10000/crm`; //crm客户、合同、项目管
window.apsUrl = `http://${systemApi.aps}:10111/api/services/app`;//aps排产(61) window.apsUrl = `http://${systemApi.aps}:10111/api/services/app`;//aps排产(61)
window.technologyUrl =`http://${address}:10000/technology/`;//新工艺规程接口 window.technologyUrl =`http://${address}:10000/technology/`;//新工艺规程接口
window.iconImg = `/imgicon/`; window.iconImg = `/imgicon/`;
window.mncImg = `/images/mnc/`;//mnc图片
window.material = `http://${address}:10000/material`; //物料管理 window.material = `http://${address}:10000/material`; //物料管理
/* window.systemUrl = `http://${address}:10020/api/services/app`; //System-api 系统管理（基础数据） /* window.systemUrl = `http://${address}:10020/api/services/app`; //System-api 系统管理（基础数据）
......
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