Commit 051d349c authored by 刘殿昕's avatar 刘殿昕

Merge branch 'ldx' into dev

parents dad4cf74 a57d8006
...@@ -462,6 +462,7 @@ export default { ...@@ -462,6 +462,7 @@ export default {
this.selectedTabsPage = arrs; this.selectedTabsPage = arrs;
} }
this.metaData = [...this.selectedTabsPage]; this.metaData = [...this.selectedTabsPage];
console.log(this.selectedTabsPage);
}, },
err => { err => {
console.log("失败" + err); console.log("失败" + err);
...@@ -531,13 +532,13 @@ export default { ...@@ -531,13 +532,13 @@ export default {
select(rows, row) { select(rows, row) {
if (rows.indexOf(row) != -1) { if (rows.indexOf(row) != -1) {
let arrs = this.metaData; let arrs = this.metaData;
this.setMeta(arrs, row, 1); this.setMeta(arrs, row, true);
if (row.parentId && row.parentId != "00000000") { if (row.parentId && row.parentId != "00000000") {
this.getParent(arrs, row.parentId); this.getParent(arrs, row.parentId);
} }
} else { } else {
let arrs = this.metaData; let arrs = this.metaData;
this.setMeta(arrs, row, 0); this.setMeta(arrs, row, false);
} }
this.$emit("select", rows, row); this.$emit("select", rows, row);
}, },
...@@ -545,15 +546,16 @@ export default { ...@@ -545,15 +546,16 @@ export default {
selectAll(rows) { selectAll(rows) {
let arrs = this.metaData; let arrs = this.metaData;
if (rows.length == arrs.length) { if (rows.length == arrs.length) {
this.setAllMeta(arrs, 1); this.setAllMeta(arrs, true);
} else { } else {
this.setAllMeta(arrs, 0); this.setAllMeta(arrs, false);
} }
this.$emit("select", rows); this.$emit("select", rows);
}, },
// 设置元素select // 设置元素select
setMeta(arr, row, state) { setMeta(arr, row, state) {
let self = this; let self = this;
console.log(arr, row, state);
for (let i = 0; i < arr.length; i++) { for (let i = 0; i < arr.length; i++) {
if (arr[i].id == row.id) { if (arr[i].id == row.id) {
if (arr[i].selected) { if (arr[i].selected) {
...@@ -593,18 +595,16 @@ export default { ...@@ -593,18 +595,16 @@ export default {
} }
}, },
// 获取父元素 // 获取父元素
getParent(arr, id) { getParent(arr, pid) {
console.log(arr);
let self = this; let self = this;
for (let i = 0; i < arr.length; i++) { for (let i = 0; i < arr.length; i++) {
if (arr[i].id == id) { if (arr[i].id == pid) {
arr[i].selected = 1; self.$refs.cesTable.toggleRowSelection(arr[i], true);
self.$refs.cesTable.toggleRowSelection(arr[i], 1); self.getParent(self.metaData, arr[i].parentId);
if (arr[i].parentId && arr[i].parentId != "00000000") {
self.getParent(arr, arr[i].parentId);
}
} }
if (arr[i].children && arr[i].children.length != 0) { if (arr[i].children && arr[i].children.length != 0) {
self.getParent(arr[i].children, id); self.getParent(arr[i].children, pid);
} }
} }
}, },
......
...@@ -292,6 +292,10 @@ export default { ...@@ -292,6 +292,10 @@ export default {
this.formDetail.team_name = ""; this.formDetail.team_name = "";
this.formDetail.visit_url = ""; this.formDetail.visit_url = "";
this.mcHold = true; this.mcHold = true;
this.$message({
message: "不要忘了完善信息哦",
type: "success"
});
this.nodeClick(newChild, node); this.nodeClick(newChild, node);
}, },
resetForm() { resetForm() {
...@@ -356,6 +360,10 @@ export default { ...@@ -356,6 +360,10 @@ export default {
}); });
}, },
deleteNode() { deleteNode() {
if (this.nodeId.substring(0, 3) == "new") {
this.getTree();
this.emptyObject();
} else {
let params = { let params = {
id: this.nodeId id: this.nodeId
}; };
...@@ -371,6 +379,7 @@ export default { ...@@ -371,6 +379,7 @@ export default {
console.log(response.data.errMsg); console.log(response.data.errMsg);
} }
}); });
}
}, },
nodePosition(type) { nodePosition(type) {
let node = this.$refs.tree.getNode(this.nodeId); let node = this.$refs.tree.getNode(this.nodeId);
......
...@@ -647,9 +647,9 @@ export default { ...@@ -647,9 +647,9 @@ export default {
this.$api.workbench.fwzcFwcs(query).then(response => { this.$api.workbench.fwzcFwcs(query).then(response => {
if (response.data.success == 1) { if (response.data.success == 1) {
let data = response.data.data; let data = response.data.data;
if (this.activeBtn == 0 && this.activeName == 1) { if (data.body_fields && data.body_fields.length != 0) {
this.datasQqcs = data.body_fields; this.datasQqcs = data.body_fields;
} else if (this.activeBtn == 0) { } else {
this.datasQqcs = data.param_fields; this.datasQqcs = data.param_fields;
} }
this.datasFhcs = data.response_fields; this.datasFhcs = data.response_fields;
......
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