projects/mes-test #133
4
.env.dev
4
.env.dev
@ -12,8 +12,8 @@ ENV = 'development'
|
|||||||
VUE_APP_TITLE = MES系统
|
VUE_APP_TITLE = MES系统
|
||||||
|
|
||||||
# 芋道管理系统/开发环境
|
# 芋道管理系统/开发环境
|
||||||
# VUE_APP_BASE_API = 'http://100.64.0.26:48082'
|
VUE_APP_BASE_API = 'http://100.64.0.26:48082'
|
||||||
VUE_APP_BASE_API = 'http://192.168.0.33:48082'
|
# VUE_APP_BASE_API = 'http://192.168.0.33:48082'
|
||||||
# VUE_APP_BASE_API = 'http://192.168.4.173:48080'
|
# VUE_APP_BASE_API = 'http://192.168.4.173:48080'
|
||||||
# VUE_APP_BASE_API = 'http://192.168.2.173:48080'
|
# VUE_APP_BASE_API = 'http://192.168.2.173:48080'
|
||||||
# VUE_APP_BASE_API = 'http://192.168.1.49:48080'
|
# VUE_APP_BASE_API = 'http://192.168.1.49:48080'
|
||||||
|
@ -22,7 +22,9 @@
|
|||||||
:line="item.lineName"
|
:line="item.lineName"
|
||||||
:desc="item.remark"
|
:desc="item.remark"
|
||||||
:isActive="item.enabled"
|
:isActive="item.enabled"
|
||||||
@edit="handleUpdate" />
|
@edit="handleUpdate"
|
||||||
|
@copy="handleCopy"
|
||||||
|
@delete="handleDelete" />
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<base-dialog
|
<base-dialog
|
||||||
@ -58,6 +60,12 @@ const ProcessItem = {
|
|||||||
handleEdit() {
|
handleEdit() {
|
||||||
this.$emit('edit', this.id);
|
this.$emit('edit', this.id);
|
||||||
},
|
},
|
||||||
|
handleCopy() {
|
||||||
|
this.$emit('copy', this.id);
|
||||||
|
},
|
||||||
|
handleDelete() {
|
||||||
|
this.$emit('delete', this.id);
|
||||||
|
},
|
||||||
handleViewDetail(e) {
|
handleViewDetail(e) {
|
||||||
this.$router.push({
|
this.$router.push({
|
||||||
name: 'ProcessFlowView',
|
name: 'ProcessFlowView',
|
||||||
@ -117,12 +125,18 @@ const ProcessItem = {
|
|||||||
<el-col
|
<el-col
|
||||||
span={8}
|
span={8}
|
||||||
style="text-align: center; border-right: 1px solid #0001">
|
style="text-align: center; border-right: 1px solid #0001">
|
||||||
<el-button type="text" style="color: #0007; line-height: 1.75">
|
<el-button
|
||||||
|
type="text"
|
||||||
|
style="color: #0007; line-height: 1.75"
|
||||||
|
onClick={this.handleCopy}>
|
||||||
复制
|
复制
|
||||||
</el-button>
|
</el-button>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col span={8} style="text-align: center;">
|
<el-col span={8} style="text-align: center;">
|
||||||
<el-button type="text" style="color: #0007; line-height: 1.75">
|
<el-button
|
||||||
|
type="text"
|
||||||
|
style="color: #0007; line-height: 1.75"
|
||||||
|
onClick={this.handleDelete}>
|
||||||
删除
|
删除
|
||||||
</el-button>
|
</el-button>
|
||||||
</el-col>
|
</el-col>
|
||||||
@ -255,6 +269,43 @@ export default {
|
|||||||
this.open = true;
|
this.open = true;
|
||||||
this.title = '修改工艺';
|
this.title = '修改工艺';
|
||||||
},
|
},
|
||||||
|
async handleCopy(id) {
|
||||||
|
this.$confirm('确认拷贝操作?', '提示', {
|
||||||
|
confirmButtonText: '确 认',
|
||||||
|
cancelButtonText: '取 消',
|
||||||
|
})
|
||||||
|
.then(async () => {
|
||||||
|
const { code } = await this.http(
|
||||||
|
'/extend/process-flow/copy',
|
||||||
|
'post',
|
||||||
|
{
|
||||||
|
id,
|
||||||
|
}
|
||||||
|
);
|
||||||
|
if (code == 0) {
|
||||||
|
this.$modal.msgSuccess('复制成功');
|
||||||
|
this.getList();
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.catch(() => console.info('操作取消'));
|
||||||
|
},
|
||||||
|
async handleDelete(id) {
|
||||||
|
this.$confirm('确认删除这个工艺吗?', '提示', {
|
||||||
|
confirmButtonText: '确 认',
|
||||||
|
cancelButtonText: '取 消',
|
||||||
|
})
|
||||||
|
.then(async () => {
|
||||||
|
const { code } = await this.http(
|
||||||
|
'/extend/process-flow/delete?id=' + id,
|
||||||
|
'delete'
|
||||||
|
);
|
||||||
|
if (code == 0) {
|
||||||
|
this.$modal.msgSuccess('删除成功');
|
||||||
|
this.getList();
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.catch(() => console.info('操作取消'));
|
||||||
|
},
|
||||||
submitForm() {
|
submitForm() {
|
||||||
this.$refs['form'].validate((valid) => {
|
this.$refs['form'].validate((valid) => {
|
||||||
if (!valid) {
|
if (!valid) {
|
||||||
|
@ -9,31 +9,66 @@
|
|||||||
<section class="process-bom">
|
<section class="process-bom">
|
||||||
<SearchBar :formConfigs="searchBarFormConfig" ref="search-bar" />
|
<SearchBar :formConfigs="searchBarFormConfig" ref="search-bar" />
|
||||||
|
|
||||||
<div class="btns" style="
|
<div
|
||||||
|
class="btns"
|
||||||
|
style="
|
||||||
text-align: right;
|
text-align: right;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: 20px;
|
top: 20px;
|
||||||
right: 20px;
|
right: 20px;
|
||||||
display: flex;
|
display: flex;
|
||||||
">
|
">
|
||||||
<el-button type="primary" plain :disabled="currentDet == null" class="btn-create" icon="el-icon-plus">
|
<el-button
|
||||||
|
type="primary"
|
||||||
|
plain
|
||||||
|
:disabled="currentDet == null"
|
||||||
|
class="btn-create"
|
||||||
|
@click="handleAddEquipment"
|
||||||
|
icon="el-icon-plus">
|
||||||
分配设备
|
分配设备
|
||||||
</el-button>
|
</el-button>
|
||||||
<el-input icon="el-icon-search" placeholder="搜索" v-model="searchText" style="margin-left: 20px">
|
<el-input
|
||||||
|
icon="el-icon-search"
|
||||||
|
placeholder="搜索"
|
||||||
|
v-model="searchText"
|
||||||
|
style="margin-left: 20px">
|
||||||
<i slot="prefix" class="el-input__icon el-icon-search"></i>
|
<i slot="prefix" class="el-input__icon el-icon-search"></i>
|
||||||
</el-input>
|
</el-input>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- 列表 -->
|
<!-- 列表 -->
|
||||||
<base-table :table-props="tableProps" :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-data="list"
|
<base-table
|
||||||
|
:table-props="tableProps"
|
||||||
|
:page="queryParams.pageNo"
|
||||||
|
:limit="queryParams.pageSize"
|
||||||
|
:table-data="list"
|
||||||
@emitFun="handleEmitFun">
|
@emitFun="handleEmitFun">
|
||||||
<method-btn v-if="tableBtn.length" slot="handleBtn" label="操作" :width="120" :method-list="tableBtn"
|
<method-btn
|
||||||
|
v-if="tableBtn.length"
|
||||||
|
slot="handleBtn"
|
||||||
|
label="操作"
|
||||||
|
:width="120"
|
||||||
|
:method-list="tableBtn"
|
||||||
@clickBtn="handleTableBtnClick" />
|
@clickBtn="handleTableBtnClick" />
|
||||||
</base-table>
|
</base-table>
|
||||||
|
|
||||||
<!-- 分页组件 -->
|
<!-- 分页组件 -->
|
||||||
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
|
<pagination
|
||||||
|
v-show="total > 0"
|
||||||
|
:total="total"
|
||||||
|
:page.sync="queryParams.pageNo"
|
||||||
|
:limit.sync="queryParams.pageSize"
|
||||||
@pagination="getList" />
|
@pagination="getList" />
|
||||||
|
|
||||||
|
<base-dialog
|
||||||
|
dialogTitle="选择设备"
|
||||||
|
:dialogVisible="open"
|
||||||
|
width="65%"
|
||||||
|
@close="cancel"
|
||||||
|
@cancel="cancel"
|
||||||
|
@confirm="submitForm">
|
||||||
|
<el-transfer v-model="choosedEquipments" :data="eqList" :render-content="renderFn"></el-transfer>
|
||||||
|
</base-dialog>
|
||||||
</section>
|
</section>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@ -44,11 +79,15 @@ export default {
|
|||||||
props: {
|
props: {
|
||||||
currentDet: {
|
currentDet: {
|
||||||
type: Object,
|
type: Object,
|
||||||
default: null
|
default: null,
|
||||||
}
|
},
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
|
open: false,
|
||||||
|
eqList: [],
|
||||||
|
finalList: [],
|
||||||
|
choosedEquipments: [],
|
||||||
searchBarFormConfig: [{ label: '工序下设备' }],
|
searchBarFormConfig: [{ label: '工序下设备' }],
|
||||||
tableProps: [
|
tableProps: [
|
||||||
// {
|
// {
|
||||||
@ -58,9 +97,9 @@ export default {
|
|||||||
// width: 180,
|
// width: 180,
|
||||||
// filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
|
// filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
|
||||||
// },
|
// },
|
||||||
{ prop: 'name', label: '设备名称' },
|
{ prop: 'equipmentId', label: '设备名称' },
|
||||||
{ prop: 'code', label: '物料BOM' },
|
{ prop: 'materialName', label: '物料BOM' },
|
||||||
{ prop: 'remark', label: '参数BOM' },
|
{ prop: 'valueName', label: '参数BOM' },
|
||||||
],
|
],
|
||||||
list: [],
|
list: [],
|
||||||
total: 0,
|
total: 0,
|
||||||
@ -69,7 +108,7 @@ export default {
|
|||||||
pageNo: 1,
|
pageNo: 1,
|
||||||
pageSize: 10,
|
pageSize: 10,
|
||||||
},
|
},
|
||||||
searchText: ''
|
searchText: '',
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
@ -82,12 +121,46 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
immediate: true,
|
immediate: true,
|
||||||
deep: true
|
deep: true,
|
||||||
}
|
},
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
handleEmitFun() { },
|
renderFn(h,option) {
|
||||||
handleTableBtnClick() { },
|
console.log(option)
|
||||||
|
return <span>1</span>
|
||||||
|
},
|
||||||
|
async getEqList() {
|
||||||
|
console.log('currentDet', this.currentDet);
|
||||||
|
const { sectionId } = this.currentDet;
|
||||||
|
const { code, data } = await this.http(
|
||||||
|
'base/core-equipment-bind-section/page',
|
||||||
|
'get',
|
||||||
|
{ workshopSectionId: sectionId, pageNo: 1, pageSize: 100 }
|
||||||
|
);
|
||||||
|
if (code == 0) {
|
||||||
|
console.log('workshopSectionId', data);
|
||||||
|
|
||||||
|
// 模拟数据
|
||||||
|
this.eqList = [
|
||||||
|
{ equipmentId: 1, equipmentName: '设备1' },
|
||||||
|
{ equipmentId: 2, equipmentName: '设备2' },
|
||||||
|
{ equipmentId: 3, equipmentName: '设备3' },
|
||||||
|
{ equipmentId: 4, equipmentName: '设备4' },
|
||||||
|
{ equipmentId: 5, equipmentName: '设备5' },
|
||||||
|
{ equipmentId: 6, equipmentName: '设备6' },
|
||||||
|
]; // ].map((item) => ({ label: item.equipmentName, key: item.equipmentId }));
|
||||||
|
|
||||||
|
|
||||||
|
// 获取参数bom和物料bom
|
||||||
|
this.finalList = this.eqList.map((item) => {
|
||||||
|
// key: equipmentId-参数bomId
|
||||||
|
item.push({ key: item.equipmentId + '-' + '101', label: '参数bom1' });
|
||||||
|
item.push({ key: item.equipmentId + '-' + '201', label: '物料bom1' });
|
||||||
|
});
|
||||||
|
}
|
||||||
|
},
|
||||||
|
handleEmitFun() {},
|
||||||
|
handleTableBtnClick() {},
|
||||||
put(payload) {
|
put(payload) {
|
||||||
return this.http(this.updateUrl, 'put', payload);
|
return this.http(this.updateUrl, 'put', payload);
|
||||||
},
|
},
|
||||||
@ -106,23 +179,34 @@ export default {
|
|||||||
method,
|
method,
|
||||||
params: method === 'get' ? payload : null,
|
params: method === 'get' ? payload : null,
|
||||||
data: method !== 'get' ? payload : null,
|
data: method !== 'get' ? payload : null,
|
||||||
})
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
getList({ detId, detName, detDesc, flowId, sectionName } = {}) {
|
async getList({ detId, detName, detDesc, flowId, sectionName } = {}) {
|
||||||
console.log('get list')
|
console.log('get list', detId, detName, flowId);
|
||||||
|
const { data, code } = await this.http(
|
||||||
|
'/extend/process-flow-det-equipment/page',
|
||||||
|
'get',
|
||||||
|
{ flowDetId: detId, ...this.queryParams }
|
||||||
|
);
|
||||||
|
if (code == 0) {
|
||||||
|
this.list = data.list;
|
||||||
|
this.total = data.total;
|
||||||
|
} else {
|
||||||
|
this.list.splice(0);
|
||||||
|
this.total = 0;
|
||||||
|
}
|
||||||
},
|
},
|
||||||
getList() {
|
async handleAddEquipment() {
|
||||||
this.list = [
|
this.open = true;
|
||||||
{ name: '1', code: 'bomg-1', remark: 'Tochter' },
|
await this.getEqList();
|
||||||
{ name: '2', code: 'bomg-2', remark: 'Bruder' },
|
},
|
||||||
{ name: '3', code: 'bomg-3', remark: 'Kalt' },
|
cancel() {
|
||||||
]
|
this.open = false;
|
||||||
},
|
},
|
||||||
clearList() {
|
clearList() {
|
||||||
this.list = [];
|
this.list = [];
|
||||||
}
|
},
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
@ -9,25 +9,57 @@
|
|||||||
<section class="process-graph">
|
<section class="process-graph">
|
||||||
<SearchBar :formConfigs="searchBarFormConfig" ref="search-bar" />
|
<SearchBar :formConfigs="searchBarFormConfig" ref="search-bar" />
|
||||||
|
|
||||||
<div class="btns" style="text-align: right; position: absolute; top: 20px; right: 20px">
|
<div
|
||||||
<el-button type="warning" @click="undo" plain v-if="allowUndo" :disabled="!allowUndo" icon="el-icon-back">
|
class="btns"
|
||||||
|
style="text-align: right; position: absolute; top: 20px; right: 20px">
|
||||||
|
<el-button
|
||||||
|
type="warning"
|
||||||
|
@click="undo"
|
||||||
|
plain
|
||||||
|
v-if="allowUndo"
|
||||||
|
:disabled="!allowUndo"
|
||||||
|
icon="el-icon-back">
|
||||||
撤销
|
撤销
|
||||||
</el-button>
|
</el-button>
|
||||||
<el-button type="warning" @click="redo" plain v-if="allowRedo" :disabled="!allowRedo">
|
<el-button
|
||||||
|
type="warning"
|
||||||
|
@click="redo"
|
||||||
|
plain
|
||||||
|
v-if="allowRedo"
|
||||||
|
:disabled="!allowRedo">
|
||||||
下一步
|
下一步
|
||||||
<i class="el-icon-right el-icon--right"></i>
|
<i class="el-icon-right el-icon--right"></i>
|
||||||
</el-button>
|
</el-button>
|
||||||
<el-button class="btn-refresh" @click="handleUpdateLayout" icon="el-icon-refresh">
|
<el-button
|
||||||
刷新布局</el-button>
|
class="btn-refresh"
|
||||||
<el-button type="primary" plain class="btn-create" icon="el-icon-plus" @click="handleAdd">
|
@click="handleUpdateLayout"
|
||||||
|
icon="el-icon-refresh">
|
||||||
|
刷新布局
|
||||||
|
</el-button>
|
||||||
|
<el-button
|
||||||
|
type="primary"
|
||||||
|
plain
|
||||||
|
class="btn-create"
|
||||||
|
icon="el-icon-plus"
|
||||||
|
@click="handleAdd">
|
||||||
新建工序
|
新建工序
|
||||||
</el-button>
|
</el-button>
|
||||||
<el-button class="btn-edit" :disabled="currentDet == null" @click="handleEdit">编辑</el-button>
|
<el-button
|
||||||
|
class="btn-edit"
|
||||||
|
:disabled="currentDet == null"
|
||||||
|
@click="handleEdit">
|
||||||
|
编辑
|
||||||
|
</el-button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="process-graph__panel" ref="panel"></div>
|
<div class="process-graph__panel" ref="panel"></div>
|
||||||
|
|
||||||
<base-dialog :dialogTitle="title" :dialogVisible="open" width="35%" @close="cancel" @cancel="cancel"
|
<base-dialog
|
||||||
|
:dialogTitle="title"
|
||||||
|
:dialogVisible="open"
|
||||||
|
width="35%"
|
||||||
|
@close="cancel"
|
||||||
|
@cancel="cancel"
|
||||||
@confirm="submitForm">
|
@confirm="submitForm">
|
||||||
<DialogForm v-if="open" ref="form" v-model="form" :rows="rows" />
|
<DialogForm v-if="open" ref="form" v-model="form" :rows="rows" />
|
||||||
</base-dialog>
|
</base-dialog>
|
||||||
@ -36,11 +68,15 @@
|
|||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { Graph } from '@antv/x6';
|
import { Graph } from '@antv/x6';
|
||||||
import ProcessNode, { createProcessNode, CACHE_NAME, getSectionFrom } from './ProcessNode';
|
import ProcessNode, {
|
||||||
|
createProcessNode,
|
||||||
|
CACHE_NAME,
|
||||||
|
getSectionFrom,
|
||||||
|
} from './ProcessNode';
|
||||||
import DialogForm from '@/components/DialogForm';
|
import DialogForm from '@/components/DialogForm';
|
||||||
// import { IdToName } from '@/utils'
|
// import { IdToName } from '@/utils'
|
||||||
|
|
||||||
Graph.registerNode('process-node', ProcessNode,true);
|
Graph.registerNode('process-node', ProcessNode, true);
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'ProcessGraph',
|
name: 'ProcessGraph',
|
||||||
@ -79,7 +115,7 @@ export default {
|
|||||||
bind: {
|
bind: {
|
||||||
filterable: true,
|
filterable: true,
|
||||||
},
|
},
|
||||||
cache: CACHE_NAME
|
cache: CACHE_NAME,
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
@ -99,42 +135,39 @@ export default {
|
|||||||
id: null,
|
id: null,
|
||||||
flowId: null,
|
flowId: null,
|
||||||
content: '',
|
content: '',
|
||||||
createTime: null
|
createTime: null,
|
||||||
},
|
},
|
||||||
currentDet: null,
|
currentDet: null,
|
||||||
currentNode: null
|
currentNode: null,
|
||||||
|
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
'form.sectionId': {
|
'form.sectionId': {
|
||||||
handler(id) {
|
handler(id) {},
|
||||||
},
|
|
||||||
immediate: false,
|
immediate: false,
|
||||||
},
|
},
|
||||||
currentDet: {
|
currentDet: {
|
||||||
handler(val) {
|
handler(val) {
|
||||||
this.$emit('det-selected', val)
|
this.$emit('det-selected', val);
|
||||||
},
|
},
|
||||||
deep: true,
|
deep: true,
|
||||||
immediate: true
|
immediate: true,
|
||||||
}
|
},
|
||||||
},
|
},
|
||||||
activated() {
|
activated() {
|
||||||
this.loadLayout().then(json => {
|
this.loadLayout().then((json) => {
|
||||||
this.initGraph(json)
|
this.initGraph(json);
|
||||||
})
|
});
|
||||||
},
|
},
|
||||||
deactivated() {
|
deactivated() {
|
||||||
this.graph.dispose();
|
this.graph.dispose();
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
this.resetLayout();
|
this.resetLayout();
|
||||||
this.graph = null;
|
this.graph = null;
|
||||||
})
|
});
|
||||||
},
|
},
|
||||||
computed: {},
|
computed: {},
|
||||||
methods: {
|
methods: {
|
||||||
|
|
||||||
initGraph(json) {
|
initGraph(json) {
|
||||||
const graph = new Graph({
|
const graph = new Graph({
|
||||||
container: this.$refs.panel,
|
container: this.$refs.panel,
|
||||||
@ -144,7 +177,7 @@ export default {
|
|||||||
},
|
},
|
||||||
history: true,
|
history: true,
|
||||||
selecting: {
|
selecting: {
|
||||||
className: 'my-select'
|
className: 'my-select',
|
||||||
},
|
},
|
||||||
connecting: {
|
connecting: {
|
||||||
snap: true,
|
snap: true,
|
||||||
@ -155,24 +188,17 @@ export default {
|
|||||||
allowEdge: false,
|
allowEdge: false,
|
||||||
},
|
},
|
||||||
panning: true,
|
panning: true,
|
||||||
// scroller: {
|
|
||||||
// enabled: true,
|
|
||||||
// pannable: true,
|
|
||||||
// cursor: '',
|
|
||||||
// width: 800,
|
|
||||||
// height: 200
|
|
||||||
// },
|
|
||||||
mousewheel: {
|
mousewheel: {
|
||||||
enabled: true,
|
enabled: true,
|
||||||
modifiers: ['ctrl', 'meta']
|
modifiers: ['ctrl', 'meta'],
|
||||||
}
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
graph.fromJSON(json)
|
graph.fromJSON(json);
|
||||||
this.graph = graph;
|
this.graph = graph;
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
this.registerGraphEvents();
|
this.registerGraphEvents();
|
||||||
})
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
registerGraphEvents() {
|
registerGraphEvents() {
|
||||||
@ -182,31 +208,33 @@ export default {
|
|||||||
this.currentDet = null;
|
this.currentDet = null;
|
||||||
this.currentNode = null;
|
this.currentNode = null;
|
||||||
|
|
||||||
nodes.forEach(node => {
|
nodes.forEach((node) => {
|
||||||
node.attr('container/stroke', '#ccc');
|
node.attr('container/stroke', '#ccc');
|
||||||
});
|
});
|
||||||
edges.forEach(edge => {
|
edges.forEach((edge) => {
|
||||||
edge.attr('line/stroke', '#ccc')
|
edge.attr('line/stroke', '#ccc');
|
||||||
})
|
});
|
||||||
}
|
};
|
||||||
|
|
||||||
this.graph.on('node:click', ({ e, x, y, node, view }) => {
|
this.graph.on('node:click', ({ e, x, y, node, view }) => {
|
||||||
reset();
|
reset();
|
||||||
node.attr('container/stroke', '#0b58ff');
|
node.attr('container/stroke', '#0b58ff');
|
||||||
const { detId, detName, detDesc, processId, sectionId, sectionName } = node.attrs;
|
const { detId, detName, detDesc, processId, sectionId, sectionName } =
|
||||||
this.currentDet = {}
|
node.attrs;
|
||||||
this.$set(this.currentDet, 'detId', detId.text)
|
console.log('node clicked!', node)
|
||||||
this.$set(this.currentDet, 'sectionId', sectionId.text)
|
this.currentDet = {};
|
||||||
this.$set(this.currentDet, 'detName', detName.text)
|
this.$set(this.currentDet, 'detId', detId.text);
|
||||||
this.$set(this.currentDet, 'detDesc', detDesc.text)
|
this.$set(this.currentDet, 'sectionId', sectionId.text);
|
||||||
this.$set(this.currentDet, 'flowId', processId.text)
|
this.$set(this.currentDet, 'detName', detName.text);
|
||||||
this.$set(this.currentDet, 'sectionName', sectionName.text)
|
this.$set(this.currentDet, 'detDesc', detDesc.text);
|
||||||
this.currentNode = node
|
this.$set(this.currentDet, 'flowId', processId.text);
|
||||||
|
this.$set(this.currentDet, 'sectionName', sectionName.text);
|
||||||
|
this.currentNode = node;
|
||||||
});
|
});
|
||||||
this.graph.on('edge:click', ({ e, x, y, edge, view }) => {
|
this.graph.on('edge:click', ({ e, x, y, edge, view }) => {
|
||||||
// console.log('edge clicked!', edge)
|
// console.log('edge clicked!', edge)
|
||||||
reset();
|
reset();
|
||||||
edge.attr('line/stroke', '#0b58ff')
|
edge.attr('line/stroke', '#0b58ff');
|
||||||
});
|
});
|
||||||
this.graph.on('blank:click', ({ e, x, y }) => {
|
this.graph.on('blank:click', ({ e, x, y }) => {
|
||||||
reset();
|
reset();
|
||||||
@ -219,30 +247,28 @@ export default {
|
|||||||
y: 0,
|
y: 0,
|
||||||
offset: { x: 0, y: 0 },
|
offset: { x: 0, y: 0 },
|
||||||
onClick: ({ e, cell, view }) => {
|
onClick: ({ e, cell, view }) => {
|
||||||
this.$confirm(
|
this.$confirm('确定删除这个工序吗?', '提示', {
|
||||||
'确定删除这个工序吗?',
|
|
||||||
'提示',
|
|
||||||
{
|
|
||||||
confirmButtonText: '确定',
|
confirmButtonText: '确定',
|
||||||
cancelButtonText: '取消',
|
cancelButtonText: '取消',
|
||||||
type: 'warning'
|
type: 'warning',
|
||||||
}
|
})
|
||||||
).then(async () => {
|
.then(async () => {
|
||||||
const id = node.attrs.detId.text;
|
const id = node.attrs.detId.text;
|
||||||
const status = await this.handleDelete(id);
|
const status = await this.handleDelete(id);
|
||||||
if (status) {
|
if (status) {
|
||||||
view.cell.remove();
|
view.cell.remove();
|
||||||
}
|
}
|
||||||
}).catch(err => {
|
})
|
||||||
|
.catch((err) => {
|
||||||
return;
|
return;
|
||||||
})
|
});
|
||||||
}
|
},
|
||||||
}
|
},
|
||||||
})
|
});
|
||||||
});
|
});
|
||||||
this.graph.on('node:mouseleave', ({ node }) => {
|
this.graph.on('node:mouseleave', ({ node }) => {
|
||||||
node.removeTools();
|
node.removeTools();
|
||||||
})
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
resetLayout() {
|
resetLayout() {
|
||||||
@ -250,13 +276,13 @@ export default {
|
|||||||
id: null,
|
id: null,
|
||||||
flowId: null,
|
flowId: null,
|
||||||
content: '',
|
content: '',
|
||||||
createTime: null
|
createTime: null,
|
||||||
}
|
};
|
||||||
},
|
},
|
||||||
|
|
||||||
async loadLayout() {
|
async loadLayout() {
|
||||||
const flowId = this.$route.params.id;
|
const flowId = this.$route.params.id;
|
||||||
if (!flowId) return { cells: [] }
|
if (!flowId) return { cells: [] };
|
||||||
const { code, data } = await this.info({ id: flowId });
|
const { code, data } = await this.info({ id: flowId });
|
||||||
if (code == 0) {
|
if (code == 0) {
|
||||||
if (data) {
|
if (data) {
|
||||||
@ -269,9 +295,9 @@ export default {
|
|||||||
return Promise.reject(this.infoUrl + ' 接口出错!');
|
return Promise.reject(this.infoUrl + ' 接口出错!');
|
||||||
},
|
},
|
||||||
|
|
||||||
handleToJson() { },
|
handleToJson() {},
|
||||||
|
|
||||||
handleLoadJson() { },
|
handleLoadJson() {},
|
||||||
|
|
||||||
handleDumpJson() {
|
handleDumpJson() {
|
||||||
if (this.graph) {
|
if (this.graph) {
|
||||||
@ -282,17 +308,25 @@ export default {
|
|||||||
async handleUpdateLayout() {
|
async handleUpdateLayout() {
|
||||||
this.layout.content = JSON.stringify(this.graph.toJSON());
|
this.layout.content = JSON.stringify(this.graph.toJSON());
|
||||||
let code, data;
|
let code, data;
|
||||||
console.table([this.layout, this.$route.params.id])
|
console.table([this.layout, this.$route.params.id]);
|
||||||
// 手动刷新布局
|
// 手动刷新布局
|
||||||
if (this.layout.id) {
|
if (this.layout.id) {
|
||||||
({ code, data } = await this.http('/extend/process-flow-view/update', 'put', this.layout));
|
({ code, data } = await this.http(
|
||||||
|
'/extend/process-flow-view/update',
|
||||||
|
'put',
|
||||||
|
this.layout
|
||||||
|
));
|
||||||
} else {
|
} else {
|
||||||
this.layout.flowId = this.$route.params.id;
|
this.layout.flowId = this.$route.params.id;
|
||||||
({ code, data } = await this.http('/extend/process-flow-view/create', 'post', this.layout));
|
({ code, data } = await this.http(
|
||||||
|
'/extend/process-flow-view/create',
|
||||||
|
'post',
|
||||||
|
this.layout
|
||||||
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (code == 0) {
|
if (code == 0) {
|
||||||
this.$modal.msgSuccess('布局已刷新!')
|
this.$modal.msgSuccess('布局已刷新!');
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
@ -325,12 +359,11 @@ export default {
|
|||||||
this.title = '编辑工序';
|
this.title = '编辑工序';
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
this.open = true;
|
this.open = true;
|
||||||
})
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
async handleDelete(id) {
|
async handleDelete(id) {
|
||||||
const { code, data } = await this.delete({ id });
|
const { code, data } = await this.delete({ id });
|
||||||
debugger;
|
|
||||||
if (code == 0) {
|
if (code == 0) {
|
||||||
this.$modal.msgSuccess('成功删除一个工序!');
|
this.$modal.msgSuccess('成功删除一个工序!');
|
||||||
return true;
|
return true;
|
||||||
@ -349,17 +382,17 @@ export default {
|
|||||||
this.updateProcess()
|
this.updateProcess()
|
||||||
.then((form) => {
|
.then((form) => {
|
||||||
const { name, sectionId, remark } = form;
|
const { name, sectionId, remark } = form;
|
||||||
getSectionFrom(sectionId).then(sectionName => {
|
getSectionFrom(sectionId).then((sectionName) => {
|
||||||
// 修改当前node的信息
|
// 修改当前node的信息
|
||||||
this.currentNode.setAttrs({
|
this.currentNode.setAttrs({
|
||||||
detName: { text: name },
|
detName: { text: name },
|
||||||
sectionId: { text: sectionId },
|
sectionId: { text: sectionId },
|
||||||
sectionName: { text: sectionName },
|
sectionName: { text: sectionName },
|
||||||
detDesc: { text: remark }
|
detDesc: { text: remark },
|
||||||
|
});
|
||||||
|
});
|
||||||
})
|
})
|
||||||
})
|
.catch((err) => {});
|
||||||
})
|
|
||||||
.catch(err => { });
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -368,19 +401,22 @@ export default {
|
|||||||
if (!id) return null;
|
if (!id) return null;
|
||||||
return createProcessNode({
|
return createProcessNode({
|
||||||
flowId: flowId,
|
flowId: flowId,
|
||||||
name, sectionId, remark,
|
name,
|
||||||
|
sectionId,
|
||||||
|
remark,
|
||||||
id,
|
id,
|
||||||
|
});
|
||||||
})
|
})
|
||||||
}).then(node => {
|
.then((node) => {
|
||||||
if (!node) {
|
if (!node) {
|
||||||
this.$modal.msgError('创建节点失败');
|
this.$modal.msgError('创建节点失败');
|
||||||
return;
|
return;
|
||||||
};
|
}
|
||||||
this.graph.addNode(node);
|
this.graph.addNode(node);
|
||||||
}).catch(err => {
|
})
|
||||||
|
.catch((err) => {
|
||||||
return;
|
return;
|
||||||
});
|
});
|
||||||
|
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
@ -390,14 +426,13 @@ export default {
|
|||||||
this.$modal.msgError('工艺ID不能为空');
|
this.$modal.msgError('工艺ID不能为空');
|
||||||
return Promise.reject('工艺ID不能为空');
|
return Promise.reject('工艺ID不能为空');
|
||||||
}
|
}
|
||||||
return this.put({ flowId, ...this.form })
|
return this.put({ flowId, ...this.form }).then(({ code, data }) => {
|
||||||
.then(({ code, data }) => {
|
|
||||||
if (code == 0) {
|
if (code == 0) {
|
||||||
this.$modal.msgSuccess('修改成功');
|
this.$modal.msgSuccess('修改成功');
|
||||||
} else {
|
} else {
|
||||||
this.$modal.msgError('修改失败');
|
this.$modal.msgError('修改失败');
|
||||||
}
|
}
|
||||||
const formCopy = { ...this.form }
|
const formCopy = { ...this.form };
|
||||||
this.open = false;
|
this.open = false;
|
||||||
return formCopy;
|
return formCopy;
|
||||||
});
|
});
|
||||||
@ -410,21 +445,21 @@ export default {
|
|||||||
this.$modal.msgError('工艺ID不能为空');
|
this.$modal.msgError('工艺ID不能为空');
|
||||||
return Promise.reject('工艺ID不能为空');
|
return Promise.reject('工艺ID不能为空');
|
||||||
}
|
}
|
||||||
console.log('create process', this.form)
|
console.log('create process', this.form);
|
||||||
// 添加的提交
|
// 添加的提交
|
||||||
return this.post({ flowId, ...this.form }).then(
|
return this.post({ flowId, ...this.form })
|
||||||
({ code, data }) => {
|
.then(({ code, data }) => {
|
||||||
this.$modal.msgSuccess('新增成功');
|
this.$modal.msgSuccess('新增成功');
|
||||||
this.open = false;
|
this.open = false;
|
||||||
// this.getList();
|
// this.getList();
|
||||||
return {
|
return {
|
||||||
id: data, // 服务器返回的新建的工段id
|
id: data, // 服务器返回的新建的工段id
|
||||||
...this.form, // 保存一份 this.form 副本,当 open->false 时 this.form 里的信息就清空了
|
...this.form, // 保存一份 this.form 副本,当 open->false 时 this.form 里的信息就清空了
|
||||||
flowId
|
flowId,
|
||||||
};
|
};
|
||||||
}
|
})
|
||||||
).catch(err => {
|
.catch((err) => {
|
||||||
this.$modal.msgError(err)
|
this.$modal.msgError(err);
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
@ -452,7 +487,7 @@ export default {
|
|||||||
method,
|
method,
|
||||||
params: method === 'get' ? payload : null,
|
params: method === 'get' ? payload : null,
|
||||||
data: method !== 'get' ? payload : null,
|
data: method !== 'get' ? payload : null,
|
||||||
})
|
});
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user