Skip to content

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

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

parents 55717055 113b8bc5
Hide whitespace changes
Inline Side-by-side
Showing with 250 additions and 156 deletions
components/page/dataGrid.vue
View file @ 781d93f8
......@@ -277,14 +277,14 @@ export default {
} else {
this.easySearch();
}
console.warn("this.$refs.main.clientX",this.$refs.main.offsetTop,this.$refs.main.offsetHeight)
// 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)
// console.warn("this.$refs.main.VVV",this.tableHeight)
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
......
layouts/basic-layout/product.vue
View file @ 781d93f8
......@@ -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 @ 781d93f8
......@@ -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/crm/customer/index.vue
View file @ 781d93f8
......@@ -36,13 +36,13 @@
</div>
</template>
<script>
import Api from './api'
import Add from './add'
import Edit from './edit'
import Detail from './detail'
import Search from './search'
import Api from "./api";
import Add from "./add";
import Edit from "./edit";
import Detail from "./detail";
import Search from "./search";
export default {
name: 'list',
name: "list",
components: {
Add,
Edit,
......@@ -54,8 +54,7 @@ export default {
action: Api.index,
easySearch: {
keys: {
op:
'name,telephone',
op: "name,telephone",
value: null
}
},
......@@ -65,258 +64,262 @@ export default {
deletelModal: false,
curId: 0,
columns: [
{ key: 'id', title: this.l('id'), hide: true, align: 'left' },
{ key: "id", title: this.l("id"), hide: true, align: "left" },
{
key: 'creationTime',
title: this.l('creationTime'),
key: "creationTime",
title: this.l("creationTime"),
hide: true,
align: 'left'
align: "left"
},
{
key: 'creatorUserId',
title: this.l('creatorUserId'),
key: "creatorUserId",
title: this.l("creatorUserId"),
hide: true,
align: 'left'
align: "left"
},
{
key: 'lastModificationTime',
title: this.l('lastModificationTime'),
key: "lastModificationTime",
title: this.l("lastModificationTime"),
hide: true,
align: 'left'
align: "left"
},
{
key: 'lastModifierUserId',
title: this.l('lastModifierUserId'),
key: "lastModifierUserId",
title: this.l("lastModifierUserId"),
hide: true,
align: 'left'
align: "left"
},
{
key: 'isDeleted',
title: this.l('isDeleted'),
key: "isDeleted",
title: this.l("isDeleted"),
hide: true,
align: 'left'
align: "left"
},
{
key: 'deletionTime',
title: this.l('deletionTime'),
key: "deletionTime",
title: this.l("deletionTime"),
hide: true,
align: 'left'
align: "left"
},
{
key: 'deleterUserId',
title: this.l('deleterUserId'),
key: "deleterUserId",
title: this.l("deleterUserId"),
hide: true,
align: 'left'
align: "left"
},
{
key: 'name',
title: this.l('name'),
align: 'left',
key: "name",
title: this.l("name"),
align: "left",
easy: true,
high: true,
width: 160,
tooltip: true
},
{
key: 'abbre',
title: this.l('abbre'),
align: 'left',
key: "abbre",
title: this.l("abbre"),
align: "left",
easy: true,
high: true
high: true,
hide: true
},
{
key: 'address',
title: this.l('address'),
align: 'left',
key: "address",
title: this.l("address"),
align: "left",
easy: true,
high: true,
width: 120,
tooltip: true,
hide:true,
hide: true
},
{
key: 'principal',
title: this.l('principal'),
align: 'left',
key: "principal",
title: this.l("principal"),
align: "left",
easy: true,
high: true
},
{
key: 'telephone',
title: this.l('telephone'),
align: 'left',
key: "telephone",
title: this.l("telephone"),
align: "left",
easy: true,
high: true
},
{
key: 'mobile',
title: this.l('mobile'),
align: 'left',
key: "mobile",
title: this.l("mobile"),
align: "left",
easy: true,
high: true
},
{
key: 'type',
title: this.l('type'),
align: 'left',
key: "type",
title: this.l("type"),
align: "left",
easy: true,
high: true
high: true,
hide: true
},
{
key: 'area',
title: this.l('area'),
align: 'left',
key: "area",
title: this.l("area"),
align: "left",
easy: true,
high: true
high: true,
hide: true
},
{
key: 'isInform',
title: this.l('isInform'),
align: 'center',
key: "isInform",
title: this.l("isInform"),
align: "center",
high: true,
code: 'crm.customer.isInform',
width:120,
code: "crm.customer.isInform",
width: 120
},
{
key: 'status',
title: this.l('status'),
align: 'center',
key: "status",
title: this.l("status"),
align: "center",
high: true,
code: 'crm.customer.status',
width:120,
code: "crm.customer.status",
width: 120
},
{
key: 'notes',
title: this.l('notes'),
align: 'left',
key: "notes",
title: this.l("notes"),
align: "left",
easy: true,
high: true,
tooltip: true,
hide:true,
tooltip: true,
hide: true
},
{
key: 'code',
title: this.l('code'),
align: 'left',
key: "code",
title: this.l("code"),
align: "left",
easy: true,
high: true
high: true,
hide: true
},
{
key: 'trade',
title: this.l('trade'),
align: 'left',
key: "trade",
title: this.l("trade"),
align: "left",
easy: true,
high: true
high: true,
hide: true
},
{
title: '操作',
key: 'action',
title: "操作",
key: "action",
width: 180,
align: 'center',
align: "center",
render: (h, params) => {
return h('div', { class: 'action' }, [
return h("div", { class: "action" }, [
h(
'op',
"op",
{
attrs: { oprate: 'detail' },
attrs: { oprate: "detail" },
on: { click: () => this.detail(params.row.id) }
},
'查看'
"查看"
),
h(
'op',
"op",
{
attrs: { oprate: 'edit' },
attrs: { oprate: "edit" },
on: { click: () => this.edit(params.row.id) }
},
'编辑'
"编辑"
),
h(
'op',
"op",
{
attrs: { oprate: 'remove' },
attrs: { oprate: "remove" },
on: { click: () => this.remove(params.row.id) }
},
'删除'
"删除"
),
h(
'op',
"op",
{
attrs: { oprate: 'detail' },
attrs: { oprate: "detail" },
on: { click: () => this.goShop(params.row.id) }
},
'部门信息'
"部门信息"
)
])
]);
}
}
]
}
};
},
mounted() {
console.log(this)
console.log(this);
},
async fetch({ store, params }) {
await store.dispatch('loadDictionary') // 加载数据字典
await store.dispatch("loadDictionary"); // 加载数据字典
},
methods: {
addOk() {
this.$refs.grid.load()
this.addModal = false
this.detailModal = false
this.editModal = false
this.curId = 0
this.$refs.grid.load();
this.addModal = false;
this.detailModal = false;
this.editModal = false;
this.curId = 0;
},
search() {
this.$refs.grid.reload(this.easySearch)
this.$refs.grid.reload(this.easySearch);
},
detail(id) {
setTimeout(() => {
this.detailModal = true
}, 400)
this.curId = id
this.detailModal = true;
}, 400);
this.curId = id;
},
edit(id) {
setTimeout(() => {
this.editModal = true
}, 400)
this.curId = id
this.editModal = true;
}, 400);
this.curId = id;
},
remove(id) {
this.deletelModal = true
this.curId = id
this.deletelModal = true;
this.curId = id;
},
removeOk() {
Api.delete({ id: this.curId }).then((r) => {
Api.delete({ id: this.curId }).then(r => {
if (r.success) {
this.$refs.grid.load()
this.deletelModal = false
this.$Message.success('删除成功')
this.$refs.grid.load();
this.deletelModal = false;
this.$Message.success("删除成功");
}
})
});
},
removeCancel() {
this.deletelModal = false
this.deletelModal = false;
},
cancel() {
this.curId = 0
this.addModal = false
this.detailModal = false
this.editModal = false
this.deletedlModal = false
this.curId = 0;
this.addModal = false;
this.detailModal = false;
this.editModal = false;
this.deletedlModal = false;
},
goShop(id) {
this.$router.push({
name: 'crm-customer-shopIndex',
name: "crm-customer-shopIndex",
params: { customerId: id }
})
});
},
l(key) {
let vkey = 'Customer' + '.' + key
return this.$t(vkey) || key
let vkey = "Customer" + "." + key;
return this.$t(vkey) || key;
}
}
}
};
</script>
<style lang="less"></style>
pages/dncmnc/mnc/index.vue
View file @ 781d93f8
......@@ -58,7 +58,7 @@
</div>
</template>
<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">
<Col :span="16" class="order-code">
<Ellipsis :text="row.productName+i" :lines="1" tooltip transfer />
......@@ -88,9 +88,9 @@
<!-- :title="row.productUrl" -->
</Col>
<Col span="16" class="row">
<p>机床类型：{{row.MachineType}}</p>
<p>机床编码：{{row.MachineCode}}</p>
<p>机床IP：{{row.MachineIp}}</p>
<p>设备类型：{{row.MachineType}}</p>
<p>设备编码：{{row.MachineCode}}</p>
<p>设备IP：{{row.MachineIp}}</p>
<p>系统信息：{{row.information}}</p>
</Col>
</Row>
......@@ -123,7 +123,7 @@ export default {
{
productName: "德玛吉235550",
statu: "空闲",
productUrl:"shebei.png",
productUrl:"shebei01.png",
MachineType: "V1-256-16331",
MachineCode: "JCBM-06221",
MachineIp: "1231-111-26012",
......@@ -131,7 +131,7 @@ export default {
},{
productName: "德玛吉235536",
statu: "关机",
productUrl:"shebei.png",
productUrl:"shebei02.png",
MachineType: "V1-256-16332",
MachineCode: "JCBM-06222",
MachineIp: "1231-111-26012",
......@@ -139,7 +139,7 @@ export default {
},{
productName: "德玛吉235537",
statu: "故障",
productUrl:"shebei.png",
productUrl:"shebei03.png",
MachineType: "V1-256-16333",
MachineCode: "JCBM-06223",
MachineIp: "1231-111-26012",
......@@ -147,12 +147,85 @@ export default {
},{
productName: "德玛吉235537",
statu: "运行中",
productUrl:"shebei.png",
productUrl:"shebei04.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",
......@@ -271,7 +344,7 @@ export default {
let tempUrl = "";
if (url && url.length > 0) {
// tempUrl = this.downUrl + url;
tempUrl = iconImg + url;
tempUrl = mncImg + url;
} else {
tempUrl = iconImg + "noPic_product.png";
}
......
pages/dncmnc/mnc/monitoring.vue
View file @ 781d93f8
......@@ -18,10 +18,10 @@
</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>设备名称：德玛吉235537</p>
<p>设备类型：V1-256-16334</p>
<p>设备编码：JCBM-06224</p>
<p>设备IP：1231-111-26012</p>
<p>系统信息：V-5633-12112</p>
</div>
</Col>
......
pages/technology/productMix/product/add.vue
View file @ 781d93f8
......@@ -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 @ 781d93f8
......@@ -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 @ 781d93f8
......@@ -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;
......
static/config.js
View file @ 781d93f8
......@@ -26,6 +26,7 @@ window.crmUrl = `http://${address}:10000/crm`; //crm客户、合同、项目管
window.apsUrl = `http://${systemApi.aps}:10111/api/services/app`;//aps排产(61)
window.technologyUrl =`http://${address}:10000/technology/`;//新工艺规程接口
window.iconImg = `/imgicon/`;
window.mncImg = `/images/mnc/`;//mnc图片
window.material = `http://${address}:10000/material`; //物料管理
/* 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