commit
This commit is contained in:
@@ -222,7 +222,7 @@
|
|||||||
label="我司在工作组排名顺序"
|
label="我司在工作组排名顺序"
|
||||||
prop="deptOrder"
|
prop="deptOrder"
|
||||||
align="center"
|
align="center"
|
||||||
width="150">
|
width="170">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-input :disabled="DrawerType === 'see'" style="margin: 10px 0;" v-model="scope.row.deptOrder"></el-input>
|
<el-input :disabled="DrawerType === 'see'" style="margin: 10px 0;" v-model="scope.row.deptOrder"></el-input>
|
||||||
</template>
|
</template>
|
||||||
@@ -1555,6 +1555,7 @@
|
|||||||
this.addForm.wgMeetingInfos.forEach(item => {
|
this.addForm.wgMeetingInfos.forEach(item => {
|
||||||
item.joinfile = JSON.stringify(item.joinfile)
|
item.joinfile = JSON.stringify(item.joinfile)
|
||||||
})
|
})
|
||||||
|
this.addForm.status = '3'
|
||||||
this.$http.postData('wg_work_group/add', this.addForm, {
|
this.$http.postData('wg_work_group/add', this.addForm, {
|
||||||
_this: this
|
_this: this
|
||||||
}, res => {
|
}, res => {
|
||||||
@@ -1670,6 +1671,7 @@
|
|||||||
drawShape: function drawShape(cfg, group) {
|
drawShape: function drawShape(cfg, group) {
|
||||||
const level = cfg.level
|
const level = cfg.level
|
||||||
const nodeType = cfg.nature
|
const nodeType = cfg.nature
|
||||||
|
const processType = cfg.status
|
||||||
if (nodeType === '0') {
|
if (nodeType === '0') {
|
||||||
const circle = group.addShape('circle', {
|
const circle = group.addShape('circle', {
|
||||||
attrs: {
|
attrs: {
|
||||||
@@ -1760,7 +1762,11 @@
|
|||||||
radius: (bbox.height + 12) / 2
|
radius: (bbox.height + 12) / 2
|
||||||
});
|
});
|
||||||
// 自定义层级颜色
|
// 自定义层级颜色
|
||||||
if (nodeType === '1') {
|
if (processType !== '1') {
|
||||||
|
rect.attr({
|
||||||
|
fill: '#666'
|
||||||
|
});
|
||||||
|
} else if (nodeType === '1') {
|
||||||
rect.attr({
|
rect.attr({
|
||||||
fill: '#1C98B8'
|
fill: '#1C98B8'
|
||||||
});
|
});
|
||||||
@@ -1880,7 +1886,6 @@
|
|||||||
graph.setItemState(ce, 'click', false);
|
graph.setItemState(ce, 'click', false);
|
||||||
});
|
});
|
||||||
const edgeItem = e.item; // 获取被点击的边元素对象
|
const edgeItem = e.item; // 获取被点击的边元素对象
|
||||||
console.log('EdgeClick', edgeItem)
|
|
||||||
graph.setItemState(edgeItem, 'click', true); // 设置当前边的 click 状态为 true
|
graph.setItemState(edgeItem, 'click', true); // 设置当前边的 click 状态为 true
|
||||||
this.handleEdgeClick (edgeItem)
|
this.handleEdgeClick (edgeItem)
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -222,7 +222,7 @@
|
|||||||
label="我司在工作组排名顺序"
|
label="我司在工作组排名顺序"
|
||||||
prop="deptOrder"
|
prop="deptOrder"
|
||||||
align="center"
|
align="center"
|
||||||
width="150">
|
width="170">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-input :disabled="DrawerType === 'see'" style="margin: 10px 0;" v-model="scope.row.deptOrder"></el-input>
|
<el-input :disabled="DrawerType === 'see'" style="margin: 10px 0;" v-model="scope.row.deptOrder"></el-input>
|
||||||
</template>
|
</template>
|
||||||
@@ -1411,6 +1411,7 @@
|
|||||||
this.addForm.wgMeetingInfos.forEach(item => {
|
this.addForm.wgMeetingInfos.forEach(item => {
|
||||||
item.joinfile = JSON.stringify(item.joinfile)
|
item.joinfile = JSON.stringify(item.joinfile)
|
||||||
})
|
})
|
||||||
|
this.addForm.status = '3'
|
||||||
this.$http.postData('wg_work_group/add', this.addForm, {
|
this.$http.postData('wg_work_group/add', this.addForm, {
|
||||||
_this: this
|
_this: this
|
||||||
}, res => {
|
}, res => {
|
||||||
@@ -1474,7 +1475,6 @@
|
|||||||
this.headerNo = true
|
this.headerNo = true
|
||||||
let row = node._cfg.model
|
let row = node._cfg.model
|
||||||
this.addForm.pName = row.name
|
this.addForm.pName = row.name
|
||||||
console.log(row);
|
|
||||||
if (row.level === '2') {
|
if (row.level === '2') {
|
||||||
this.standId = row.wgStandorpolicyInfos[0].standId
|
this.standId = row.wgStandorpolicyInfos[0].standId
|
||||||
}
|
}
|
||||||
@@ -1512,6 +1512,7 @@
|
|||||||
drawShape: function drawShape(cfg, group) {
|
drawShape: function drawShape(cfg, group) {
|
||||||
const level = cfg.level
|
const level = cfg.level
|
||||||
const nodeType = cfg.nature
|
const nodeType = cfg.nature
|
||||||
|
const processType = cfg.status
|
||||||
if (nodeType === '0') {
|
if (nodeType === '0') {
|
||||||
const circle = group.addShape('circle', {
|
const circle = group.addShape('circle', {
|
||||||
attrs: {
|
attrs: {
|
||||||
@@ -1602,7 +1603,11 @@
|
|||||||
radius: (bbox.height + 12) / 2
|
radius: (bbox.height + 12) / 2
|
||||||
});
|
});
|
||||||
// 自定义层级颜色
|
// 自定义层级颜色
|
||||||
if (nodeType === '1') {
|
if (processType !== '1') {
|
||||||
|
rect.attr({
|
||||||
|
fill: '#666'
|
||||||
|
});
|
||||||
|
} else if (nodeType === '1') {
|
||||||
rect.attr({
|
rect.attr({
|
||||||
fill: '#1C98B8'
|
fill: '#1C98B8'
|
||||||
});
|
});
|
||||||
@@ -1722,7 +1727,6 @@
|
|||||||
graph.setItemState(ce, 'click', false);
|
graph.setItemState(ce, 'click', false);
|
||||||
});
|
});
|
||||||
const edgeItem = e.item; // 获取被点击的边元素对象
|
const edgeItem = e.item; // 获取被点击的边元素对象
|
||||||
console.log('EdgeClick', edgeItem)
|
|
||||||
graph.setItemState(edgeItem, 'click', true); // 设置当前边的 click 状态为 true
|
graph.setItemState(edgeItem, 'click', true); // 设置当前边的 click 状态为 true
|
||||||
this.handleEdgeClick (edgeItem)
|
this.handleEdgeClick (edgeItem)
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user