Skip to content

M
mes-ui
Commit 74bd2a9b authored by 周远喜's avatar 周远喜
Browse files
Options

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

parents f50dd120 cdc5aad4
Hide whitespace changes
Inline Side-by-side
Showing with 347 additions and 286 deletions
pages/aps/aps/api.js
View file @ 74bd2a9b
import Api from '@/plugins/request' import Api from '@/plugins/request'
export default { export default {
index:`${resourceUrl}mesparttaskplansimulate/paged`, index: `${resourceUrl}mesparttaskplansimulate/paged`,
paged(params){ paged(params) {
return Api.post(`${resourceUrl}mesparttaskplansimulate/paged`,params); return Api.post(`${resourceUrl}mesparttaskplansimulate/paged`, params);
}, },
get(params){ get(params) {
return Api.get(`${resourceUrl}mesparttaskplansimulate/get`,params); return Api.get(`${resourceUrl}mesparttaskplansimulate/get`, params);
}, },
create(params){ create(params) {
return Api.post(`${resourceUrl}mesparttaskplansimulate/create`,params); return Api.post(`${resourceUrl}mesparttaskplansimulate/create`, params);
}, },
update(params){ update(params) {
return Api.post(`${resourceUrl}mesparttaskplansimulate/update`,params); return Api.post(`${resourceUrl}mesparttaskplansimulate/update`, params);
}, },
//删除： //删除：
delete(params) { delete(params) {
return Api.delete(`${resourceUrl}mesparttaskplansimulate/delete`,{params:params}); return Api.delete(`${resourceUrl}mesparttaskplansimulate/delete`, {
}, params: params
} });
\ No newline at end of file },
//获取排产池数据列表
getall() {
return Api.get(`${aps}/Mes_part_task_plan_simulate/getall`);
},
//点开排产池列表查看对应的工序
getbyorderid(params) {
return Api.get(`${aps}/mes_op_task_plan_simulate/getbyorderid`, params);
},
//订单优先级
orderpriority(params) {
return Api.post(`${aps}/apspoolappservices/orderpriority`, params);
},
//删除工序
removeoptasksimluate(params) {
return Api.post(`${aps}/apspoolappservices/removeoptasksimluate`, params);
},
//恢复工艺
recoveryoptasksimluate(params) {
return Api.post(`${aps}/apspoolappservices/recoveryoptasksimluate`, params);
},
//移出排产池
shiftoutapspool(params) {
return Api.post(`${aps}/apspoolappservices/shiftoutapspool`, params);
},
//排产计算
apsprepareandcalc(params) {
return Api.post(`${aps}/apspoolappservices/apsprepareandcalc`, params);
},
//排产方案下发
processschemedispatch(params) {
return Api.post(`${aps}/apspoolappservices/processschemedispatch`, params);
},
//APS排产前数据合法性校验
recoveryoptasksimluate(params) {
return Api.post(`${aps}/apspoolappservices/apsdatachecked`, params);
},
}
pages/aps/aps/components/excute.vue
View file @ 74bd2a9b
...@@ -12,9 +12,9 @@ ...@@ -12,9 +12,9 @@
:data="data1" :data="data1"
:page="false" :page="false"
></DataGrid> ></DataGrid>
<Modal v-model="editModal" title="编辑" footer-hide width="800"> <Modal v-model="editModal" title="编辑" footer-hide width="800">
<Edit :eid="curId" @on-close="cancel" /> <Edit :eid="curId" @on-close="cancel" />
</Modal> </Modal>
<Modal v-model="deletelModal" title="删除" @on-ok="removeOk" @on-cancel="cancel"> <Modal v-model="deletelModal" title="删除" @on-ok="removeOk" @on-cancel="cancel">
<p>确定删除？</p> <p>确定删除？</p>
...@@ -22,30 +22,30 @@ ...@@ -22,30 +22,30 @@
<Modal v-model="insertlModal" title="插单" @on-ok="insertOk" @on-cancel="cancel"> <Modal v-model="insertlModal" title="插单" @on-ok="insertOk" @on-cancel="cancel">
<p>确定进行 {{insertTItle}} 操作？</p> <p>确定进行 {{insertTItle}} 操作？</p>
</Modal> </Modal>
<Modal v-model="setParsModal" title="工序参数设置" footer-hide width="1000"> <Modal v-model="setParsModal" title="工序参数设置" footer-hide width="1000">
<Add :eid="curId" @on-close="cancel" /> <Add :eid="curId" @on-close="cancel" />
</Modal> </Modal>
</div> </div>
</template> </template>
<script> <script>
import Api from '../api' import Api from "../api";
import Edit from './edit' import Edit from "./edit";
import Add from '../add' import Add from "../add";
export default { export default {
name: 'list', name: "list",
components: { components: {
Edit, Edit,
Add Add
}, },
props: { props: {
row: { type: Number } rowId: { type: Number }
}, },
data() { data() {
return { return {
action: Api.index, action: Api.index,
easySearch: { easySearch: {
keys: { keys: {
op: 'task_seq', op: "task_seq",
value: null value: null
} }
}, },
...@@ -57,397 +57,407 @@ export default { ...@@ -57,397 +57,407 @@ export default {
rowIndex: null, rowIndex: null,
curId: 0, curId: 0,
columns: [ columns: [
{ key: 'id', title: this.l('id'), hide: true, align: 'left' }, { key: "id", title: this.l("id"), hide: true, align: "left" },
{ title: ' ', width: 130 }, { title: " ", width: 130 },
{ {
key: 'insert_flag', key: "insert_flag",
title: this.l('insert_flag'), title: this.l("insert_flag"),
align: 'center', align: "center",
high: true, high: true,
width: 60, width: 60,
render: (h, params) => { render: (h, params) => {
return h('Icon', { return h("Icon", {
attrs: { attrs: {
type: type:
params.row.insert_flag == 1 ? 'ios-flag' : 'ios-flag-outline', params.row.insert_flag == 1 ? "ios-flag" : "ios-flag-outline",
size: 20, size: 20,
color: params.row.insert_flag == 1 ? '#2680EB' : '#aaa' color: params.row.insert_flag == 1 ? "#2680EB" : "#aaa"
}, },
on: { click: () => this.changeFlag(params.row.id, params.index) } on: { click: () => this.changeFlag(params.row.id, params.index) }
}) });
} }
}, },
{ {
key: 'task_seq', key: "task_seq",
title: this.l('task_seq'), title: this.l("task_seq"),
align: 'left', align: "left",
easy: true, easy: true,
high: true high: true
}, },
{ {
key: 'op_task_pk', key: "op_task_pk",
title: this.l('op_task_pk'), title: this.l("op_task_pk"),
align: 'left', align: "left",
high: true, high: true,
hide: true hide: true
}, },
{ {
key: 'task_name', key: "task_name",
title: this.l('task_name'), title: this.l("task_name"),
align: 'left', align: "left",
easy: true, easy: true,
high: true high: true
}, },
{ {
key: 'part_task_pk', key: "part_task_pk",
title: this.l('part_task_pk'), title: this.l("part_task_pk"),
align: 'left', align: "left",
high: true, high: true,
hide: true hide: true
}, },
{ {
key: 'put_into_qty', key: "put_into_qty",
title: this.l('put_into_qty'), title: this.l("put_into_qty"),
align: 'left', align: "left",
high: true high: true
}, },
{ {
key: 'plan_start', key: "plan_start",
title: this.l('plan_start'), title: this.l("plan_start"),
align: 'center', align: "center",
high: true, high: true,
width: 140 width: 140
}, },
{ {
key: 'plan_finish', key: "plan_finish",
title: this.l('plan_finish'), title: this.l("plan_finish"),
align: 'center', align: "center",
high: true, high: true,
width: 140 width: 140
}, },
{ {
key: 'setup_time', key: "setup_time",
title: this.l('setup_time'), title: this.l("setup_time"),
align: 'right', align: "right",
high: true high: true
}, },
{ {
key: 'run_time', key: "run_time",
title: this.l('run_time'), title: this.l("run_time"),
align: 'right', align: "right",
high: true high: true
}, },
{ {
key: 'outside_time', key: "outside_time",
title: this.l('outside_time'), title: this.l("outside_time"),
align: 'center', align: "center",
high: true, high: true,
width: 140 width: 140
}, },
{ {
key: 'transport_time', key: "transport_time",
title: this.l('transport_time'), title: this.l("transport_time"),
align: 'right', align: "right",
high: true, high: true,
hide: true hide: true
}, },
{ {
key: 'check_time', key: "check_time",
title: this.l('check_time'), title: this.l("check_time"),
align: 'right', align: "right",
high: true, high: true,
hide: true hide: true
}, },
{ {
key: 'efficiency_value', key: "efficiency_value",
title: this.l('efficiency_value'), title: this.l("efficiency_value"),
align: 'right', align: "right",
high: true high: true
}, },
{ {
key: 'machine_rule', key: "machine_rule",
title: this.l('machine_rule'), title: this.l("machine_rule"),
align: 'left', align: "left",
easy: true, easy: true,
high: true, high: true,
width: 140 width: 140
}, },
{ {
key: 'singleout', key: "singleout",
title: this.l('singleout'), title: this.l("singleout"),
align: 'left', align: "left",
high: true, high: true,
hide: true hide: true
}, },
{ {
key: 'first_equip', key: "first_equip",
title: this.l('first_equip'), title: this.l("first_equip"),
align: 'left', align: "left",
easy: true, easy: true,
high: true, high: true,
hide: true hide: true
}, },
{ {
key: 'equip_type', key: "equip_type",
title: this.l('equip_type'), title: this.l("equip_type"),
align: 'left', align: "left",
easy: true, easy: true,
high: true, high: true,
hide: true hide: true
}, },
{ {
key: 'cal_id', key: "cal_id",
title: this.l('cal_id'), title: this.l("cal_id"),
align: 'left', align: "left",
easy: true, easy: true,
high: true high: true
}, },
{ {
key: 'plan_method', key: "plan_method",
title: this.l('plan_method'), title: this.l("plan_method"),
align: 'left', align: "left",
easy: true, easy: true,
high: true high: true
}, },
{ {
key: 'over_time', key: "over_time",
title: this.l('over_time'), title: this.l("over_time"),
align: 'left', align: "left",
easy: true, easy: true,
high: true high: true
}, },
{ {
key: 'isdiscrete', key: "isdiscrete",
title: this.l('isdiscrete'), title: this.l("isdiscrete"),
align: 'left', align: "left",
easy: true, easy: true,
high: true high: true
}, },
{ {
key: 'discrete_value', key: "discrete_value",
title: this.l('discrete_value'), title: this.l("discrete_value"),
align: 'left', align: "left",
high: true high: true
}, },
{ {
key: 'multi_machine', key: "multi_machine",
title: this.l('multi_machine'), title: this.l("multi_machine"),
align: 'left', align: "left",
easy: true, easy: true,
high: true high: true
}, },
{ {
key: 'notes', key: "notes",
title: this.l('notes'), title: this.l("notes"),
align: 'left', align: "left",
easy: true, easy: true,
high: true, high: true,
hide: true hide: true
}, },
{ {
key: 'taskseq_des', key: "taskseq_des",
title: this.l('taskseq_des'), title: this.l("taskseq_des"),
align: 'left', align: "left",
easy: true, easy: true,
high: true, high: true,
hide: true hide: true
}, },
{ {
key: 'workshopcode', key: "workshopcode",
title: this.l('workshopcode'), title: this.l("workshopcode"),
align: 'left', align: "left",
easy: true, easy: true,
high: true, high: true,
hide: true hide: true
}, },
{ {
key: 'routing_detail_id', key: "routing_detail_id",
title: this.l('routing_detail_id'), title: this.l("routing_detail_id"),
align: 'left', align: "left",
high: true, high: true,
hide: true hide: true
}, },
{ {
key: 'routing_header_id', key: "routing_header_id",
title: this.l('routing_header_id'), title: this.l("routing_header_id"),
align: 'left', align: "left",
high: true, high: true,
hide: true hide: true
}, },
{ {
key: 'comb_param', key: "comb_param",
title: this.l('comb_param'), title: this.l("comb_param"),
align: 'left', align: "left",
easy: true, easy: true,
high: true, high: true,
hide: true hide: true
}, },
{ {
key: 'rule_qty', key: "rule_qty",
title: this.l('rule_qty'), title: this.l("rule_qty"),
align: 'left', align: "left",
high: true, high: true,
hide: true hide: true
}, },
{ {
title: '操作', title: "操作",
key: 'action', key: "action",
width: 140, width: 140,
align: 'center', align: "center",
render: (h, params) => { render: (h, params) => {
return h('div', { class: 'action' }, [ return h("div", { class: "action" }, [
h('op', { h("op", {
attrs: { attrs: {
icon: 'md-options', icon: "md-options",
type: 'icon', type: "icon",
title: '工序参数设置' title: "工序参数设置"
}, },
on: { click: () => this.openParms(params.row.id) } on: { click: () => this.openParms(params.row.id) }
}), }),
h('op', { h("op", {
attrs: { attrs: {
icon: 'ios-create', icon: "ios-create",
type: 'icon', type: "icon",
title: '編輯工序', title: "編輯工序",
oprate: 'edit', oprate: "edit",
msg: '确认要移出排产吗？' msg: "确认要移出排产吗？"
}, },
on: { click: () => this.edit(params.row.id) } on: { click: () => this.edit(params.row.id) }
}), }),
h('op', { h("op", {
attrs: { attrs: {
icon: 'ios-trash', icon: "ios-trash",
type: 'icon', type: "icon",
title: '删除工序', title: "删除工序",
oprate: 'delete', oprate: "delete",
msg: '确认要刪除工序吗？' msg: "确认要刪除工序吗？"
}, },
on: { click: () => this.remove(params.row.id, params.index) } on: { click: () => this.remove(params.row.id, params.index) }
}) })
]) ]);
} }
} }
], ],
data1: [ data1: [
{ {
id: '1', id: "1",
op_task_pk: '001', op_task_pk: "001",
part_task_pk: '001', part_task_pk: "001",
task_seq: '1', task_seq: "1",
task_name: '测试工序1', task_name: "测试工序1",
put_into_qty: '10', put_into_qty: "10",
plan_start: '04/05/2020', plan_start: "04/05/2020",
plan_finish: '06/05/2020', plan_finish: "06/05/2020",
setup_time: '5', setup_time: "5",
run_time: '1', run_time: "1",
transport_time: '1', transport_time: "1",
check_time: '1', check_time: "1",
efficiency_value: '0.5', efficiency_value: "0.5",
singleout: '2', singleout: "2",
first_equip: 'NTY-0012', first_equip: "NTY-0012",
equip_type: '加工设备', equip_type: "加工设备",
cal_id: '日历id', cal_id: "日历id",
machine_rule: '优先', machine_rule: "优先",
plan_method: '是', plan_method: "是",
over_time: '1', over_time: "1",
isdiscrete: '是', isdiscrete: "是",
discrete_value: '1.2', discrete_value: "1.2",
multi_machine: '5', multi_machine: "5",
notes: '暂无备注信息test', notes: "暂无备注信息test",
insert_flag: 1, insert_flag: 1,
outside_time: '04/06/2020', outside_time: "04/06/2020",
taskseq_des: '', taskseq_des: "",
workshopcode: '', workshopcode: "",
routing_detail_id: '', routing_detail_id: "",
routing_header_id: '', routing_header_id: "",
comb_param: '', comb_param: "",
rule_qty: '' rule_qty: ""
}, },
{ {
id: '2', id: "2",
op_task_pk: '002', op_task_pk: "002",
part_task_pk: '002', part_task_pk: "002",
task_seq: '2', task_seq: "2",
task_name: '测试工序2', task_name: "测试工序2",
put_into_qty: '10', put_into_qty: "10",
plan_start: '04/05/2020', plan_start: "04/05/2020",
plan_finish: '06/05/2020', plan_finish: "06/05/2020",
setup_time: '5', setup_time: "5",
run_time: '1', run_time: "1",
transport_time: '1', transport_time: "1",
check_time: '1', check_time: "1",
efficiency_value: '0.5', efficiency_value: "0.5",
singleout: '2', singleout: "2",
first_equip: 'NTY-0012', first_equip: "NTY-0012",
equip_type: '加工设备', equip_type: "加工设备",
cal_id: '日历id', cal_id: "日历id",
machine_rule: '优先', machine_rule: "优先",
plan_method: '是', plan_method: "是",
over_time: '1', over_time: "1",
isdiscrete: '是', isdiscrete: "是",
discrete_value: '1.2', discrete_value: "1.2",
multi_machine: '5', multi_machine: "5",
notes: '暂无备注信息test', notes: "暂无备注信息test",
insert_flag: 0, insert_flag: 0,
outside_time: '04/06/2020', outside_time: "04/06/2020",
taskseq_des: '', taskseq_des: "",
workshopcode: '', workshopcode: "",
routing_detail_id: '', routing_detail_id: "",
routing_header_id: '', routing_header_id: "",
comb_param: '', comb_param: "",
rule_qty: '' rule_qty: ""
}, },
{ {
id: '3', id: "3",
op_task_pk: '003', op_task_pk: "003",
part_task_pk: '003', part_task_pk: "003",
task_seq: '3', task_seq: "3",
task_name: '测试工序3', task_name: "测试工序3",
put_into_qty: '10', put_into_qty: "10",
plan_start: '04/05/2020', plan_start: "04/05/2020",
plan_finish: '06/05/2020', plan_finish: "06/05/2020",
setup_time: '5', setup_time: "5",
run_time: '1', run_time: "1",
transport_time: '1', transport_time: "1",
check_time: '1', check_time: "1",
efficiency_value: '0.5', efficiency_value: "0.5",
singleout: '2', singleout: "2",
first_equip: 'NTY-0012', first_equip: "NTY-0012",
equip_type: '加工设备', equip_type: "加工设备",
cal_id: '日历id', cal_id: "日历id",
machine_rule: '优先', machine_rule: "优先",
plan_method: '是', plan_method: "是",
over_time: '1', over_time: "1",
isdiscrete: '是', isdiscrete: "是",
discrete_value: '1.2', discrete_value: "1.2",
multi_machine: '5', multi_machine: "5",
notes: '暂无备注信息test', notes: "暂无备注信息test",
insert_flag: 0, insert_flag: 0,
outside_time: '04/06/2020', outside_time: "04/06/2020",
taskseq_des: '', taskseq_des: "",
workshopcode: '', workshopcode: "",
routing_detail_id: '', routing_detail_id: "",
routing_header_id: '', routing_header_id: "",
comb_param: '', comb_param: "",
rule_qty: '' rule_qty: ""
} }
], ],
insertTItle: '插单' insertTItle: "插单"
} };
}, },
mounted() { mounted() {
this.loadData(this.row) this.loadData(this.rowId);
}, },
async fetch({ store, params }) { async fetch({ store, params }) {
await store.dispatch('loadDictionary') // 加载数据字典 await store.dispatch("loadDictionary"); // 加载数据字典
}, },
methods: { methods: {
//根据点击副组件传过来id进行加载数据 //根据点击副组件传过来id进行加载数据
loadData(id) { loadData(expendId) {
let params = {
id: expendId
}
Api.getbyorderid(params).then(res => {
if (res.sucess) {
this.data1 = [];
this.data1 = res.result;
}
});
//加载数据 //加载数据
//alert(id) //alert(id);
// let arr1 = { // let arr1 = {
// id: '1', // id: '1',
// op_task_pk: '001', // op_task_pk: '001',
...@@ -487,52 +497,52 @@ export default { ...@@ -487,52 +497,52 @@ export default {
//插单事件start---- //插单事件start----
changeFlag(id, index) { changeFlag(id, index) {
this.rowIndex = index this.rowIndex = index;
if (this.data1[this.rowIndex].insert_flag == 1) { if (this.data1[this.rowIndex].insert_flag == 1) {
this.insertTItle = '取消插单' this.insertTItle = "取消插单";
} else { } else {
this.insertTItle = '插单' this.insertTItle = "插单";
} }
this.insertlModal = true this.insertlModal = true;
}, },
insertOk() { insertOk() {
//this.loadData(this.row) //this.loadData(this.row)
if (this.data1[this.rowIndex].insert_flag == 1) { if (this.data1[this.rowIndex].insert_flag == 1) {
//根据插单数据状态进行插单或取消插单操作 //根据插单数据状态进行插单或取消插单操作
this.data1[this.rowIndex].insert_flag = 0 this.data1[this.rowIndex].insert_flag = 0;
} else { } else {
this.data1[this.rowIndex].insert_flag = 1 this.data1[this.rowIndex].insert_flag = 1;
} }
this.setParsModal = false this.setParsModal = false;
this.detailModal = false this.detailModal = false;
this.editModal = false this.editModal = false;
this.insertlModal = false this.insertlModal = false;
}, },
//插单事件end---- //插单事件end----
//单个工序进行参设置start---- //单个工序进行参设置start----
openParms(id) { openParms(id) {
this.setParsModal=true this.setParsModal = true;
}, },
//单个工序进行参数设置end---- //单个工序进行参数设置end----
//编辑工序start---- //编辑工序start----
edit(id) { edit(id) {
this.editModal = true this.editModal = true;
this.curId = Number(id) this.curId = Number(id);
}, },
//编辑工序end---- //编辑工序end----
//删除工序事件start----- //删除工序事件start-----
remove(id, index) { remove(id, index) {
this.deletelModal = true this.deletelModal = true;
this.curId = Number(id) this.curId = Number(id);
this.rowIndex = index this.rowIndex = index;
}, },
removeOk() { removeOk() {
alert(this.rowIndex) alert(this.rowIndex);
this.data1.splice(this.rowIndex, 1) this.data1.splice(this.rowIndex, 1);
// Api.delete({ id: this.curId }).then((r) => { // Api.delete({ id: this.curId }).then((r) => {
// if (r.success) { // if (r.success) {
// this.$refs.grid.load() // this.$refs.grid.load()
...@@ -542,23 +552,23 @@ export default { ...@@ -542,23 +552,23 @@ export default {
// }) // })
}, },
removeCancel() { removeCancel() {
this.deletelModal = false this.deletelModal = false;
}, },
//删除工序时间end----- //删除工序时间end-----
cancel() { cancel() {
this.curId = 0 this.curId = 0;
this.setParsModal = false this.setParsModal = false;
this.detailModal = false this.detailModal = false;
this.editModal = false this.editModal = false;
this.deletedlModal = false this.deletedlModal = false;
this.insertlModal = false this.insertlModal = false;
}, },
l(key) { l(key) {
let vkey = 'mes_op_task_plan_simulate' + '.' + key let vkey = "mes_op_task_plan_simulate" + "." + key;
return this.$t(vkey) || key return this.$t(vkey) || key;
} }
} }
} };
</script> </script>
<style lang="less"> <style lang="less">
</style> </style>
\ No newline at end of file
pages/aps/aps/index.vue
View file @ 74bd2a9b
...@@ -128,7 +128,7 @@ export default { ...@@ -128,7 +128,7 @@ export default {
render: (h, params) => { render: (h, params) => {
return h(Expand, { return h(Expand, {
props: { props: {
row: params.row.id rowId: params.row.id
} }
}) })
} }
...@@ -272,11 +272,22 @@ export default { ...@@ -272,11 +272,22 @@ export default {
}, },
mounted() { mounted() {
console.log(this) console.log(this)
}, },
async fetch({ store, params }) { async fetch({ store, params }) {
await store.dispatch('loadDictionary') // 加载数据字典 await store.dispatch('loadDictionary') // 加载数据字典
}, },
methods: { methods: {
//排产池加载数据列表
loadList()
{
Api.getall().then((res)=>{
if(res.success)
{
// this.list=res.result
}
})
},
addOk() { addOk() {
this.$refs.grid.load() this.$refs.grid.load()
this.addModal = false this.addModal = false
...@@ -284,9 +295,6 @@ export default { ...@@ -284,9 +295,6 @@ export default {
this.editModal = false this.editModal = false
this.curId = 0 this.curId = 0
}, },
search() {
this.$refs.grid.reload(this.easySearch)
},
detail(id) { detail(id) {
this.detailModal = true this.detailModal = true
this.curId = id this.curId = id
......
pages/aps/plan/index.vue
View file @ 74bd2a9b
...@@ -444,7 +444,7 @@ export default { ...@@ -444,7 +444,7 @@ export default {
}, },
//跳转到aps排产池（有判断） //跳转到aps排产池（有判断）
goAps() { goAps() {
Api.moveintoaps().then((res) => { Api.moveintoaps().then(res => {
if (res.success) { if (res.success) {
if (res.result.res) { if (res.result.res) {
this.$router.push({ this.$router.push({
...@@ -456,6 +456,10 @@ export default { ...@@ -456,6 +456,10 @@ export default {
} }
} }
}); });
this.$router.push({
name: "aps-aps"
// params: { customerId: id }
});
}, },
addOk() { addOk() {
this.$refs.grid.load(); this.$refs.grid.load();
......
static/config.js
View file @ 74bd2a9b
...@@ -47,7 +47,7 @@ const systemApi = { ...@@ -47,7 +47,7 @@ const systemApi = {
window.certificateUrl = `http://${address}:10090/api/services/app`; //Process-api window.certificateUrl = `http://${address}:10090/api/services/app`; //Process-api
window.crmUrl = `http://${address}:10100/api/services/app`; //crm客户、合同、项目管理 window.crmUrl = `http://${address}:10100/api/services/app`; //crm客户、合同、项目管理
window.iconImg = `http://${hostAddress}:3000/imgicon/`; //待办任务图标路径 window.iconImg = `http://${hostAddress}:3000/imgicon/`; //待办任务图标路径
window.aps = `http://${apsUrl}:10091/api/services/app`;//aps手工排产 window.aps = `http://${apsUrl}:10110/api/services/app`;//aps手工排产
//oidc配置： //oidc配置：
window.authConfig = { window.authConfig = {
authority: `http://${address}:10010`, authority: `http://${address}:10010`,
......
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