Commit 049b4d00 authored by 周远喜's avatar 周远喜

ok

parent f2bf918b
...@@ -30,7 +30,7 @@ export default { ...@@ -30,7 +30,7 @@ export default {
this.getCodes(); this.getCodes();
}, },
props: { props: {
eid: Number, eid: [Number,String],
value: [String, Number, Array], value: [String, Number, Array],
placeholder: { placeholder: {
type: String, type: String,
......
...@@ -69,42 +69,6 @@ export default { ...@@ -69,42 +69,6 @@ export default {
odermodel: -9, odermodel: -9,
orderId: null, orderId: null,
row:{}, row:{},
oderList: [
{
value: -9,
label: "全部"
},
{
value: 12,
label: "未开工"
},
{
value: 14,
label: "执行中"
},
{
value: 0,
label: "已完成"
},
{
value: 5,
label: "暂停中"
},
{
value: 7,
label: "已终止"
},
{
value: -1,
label: "待派工"
}
// value: '交检中',
// label: '交检中'
// },{
// value: '交接中',
// label: '交接中'
// },{
],
condition: [] condition: []
}; };
}, },
......
...@@ -53,6 +53,7 @@ ...@@ -53,6 +53,7 @@
:src="getUrl(row.productUrl)" :src="getUrl(row.productUrl)"
width="120" width="120"
height="120" height="120"
:title="row.productUrl"
style="border:#cacbd0 dashed 1px" style="border:#cacbd0 dashed 1px"
/> />
</Col> </Col>
...@@ -278,7 +279,7 @@ export default { ...@@ -278,7 +279,7 @@ export default {
//返回img需要显示的src值 //返回img需要显示的src值
let tempUrl = ""; let tempUrl = "";
if (url && url.length > 0) { if (url && url.length > 0) {
tempUrl = this.downUrl + JSON.parse(url)[0].filePath; tempUrl = url;
} else { } else {
tempUrl = iconImg + "noPic_product.png"; tempUrl = iconImg + "noPic_product.png";
} }
...@@ -297,6 +298,7 @@ export default { ...@@ -297,6 +298,7 @@ export default {
// height: 100%; // height: 100%;
// overflow: auto; // overflow: auto;
// padding: 15px 0 15px 15px; // padding: 15px 0 15px 15px;
height: calc(100vh - 110px);
.body { .body {
background: white; background: white;
border-radius: 4px; border-radius: 4px;
......
...@@ -12,7 +12,8 @@ let address=systemApi.dev; ...@@ -12,7 +12,8 @@ let address=systemApi.dev;
window.systemUrl = `http://${address}:10000/system`; //System-api 系统管理(基础数据) window.systemUrl = `http://${address}:10000/system`; //System-api 系统管理(基础数据)
window.authUrl = `http://${address}:10010`; //Authentication-api //统一登陆认证 window.authUrl = `http://${address}:10010`; //Authentication-api //统一登陆认证
window.designUrl = `http://${address}:10000/process`; // 工艺规程 window.designUrl = `http://${address}:10000/process`; // 工艺规程
window.PlanUrl = `http://${address}:10000/plan`; //订单 // window.PlanUrl = `http://${address}:10000/plan`; //订单
window.PlanUrl = `http://localhost:10050/api/services/app`; //Process-api
window.bugUrl = `http://${address}:10000/bug`; //bug window.bugUrl = `http://${address}:10000/bug`; //bug
window.fileUrl = `http://${address}:10080/fileServer`; //文件上传url window.fileUrl = `http://${address}:10080/fileServer`; //文件上传url
window.fileUrlDown = `http://${address}`; //文件下载url window.fileUrlDown = `http://${address}`; //文件下载url
......
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