diff --git a/business-css/frontend/src/assets/table/annotation.png b/business-css/frontend/src/assets/table/annotation.png new file mode 100644 index 0000000..7b0b93b Binary files /dev/null and b/business-css/frontend/src/assets/table/annotation.png differ diff --git a/business-css/frontend/src/components/antvx6/connectingwire.vue b/business-css/frontend/src/components/antvx6/connectingwire.vue index fb1699f..db275f8 100644 --- a/business-css/frontend/src/components/antvx6/connectingwire.vue +++ b/business-css/frontend/src/components/antvx6/connectingwire.vue @@ -80,11 +80,13 @@ function handleClose() { emit("closeConnectingwireModel",false); } function confirmClick() { + connectingwireInfo.value.color = customizeInfo.value.color emit("closeConnectingwireModel", connectingwireInfo.value); } const customizeInfo:any = ref({ label: "自定义", - strokeDasharray: "" + strokeDasharray: "", + color: "#a2b1c3", }) function connectingwireInput(e:any) { connectingwireInfo.value.strokeDasharray = e @@ -135,7 +137,8 @@ onMounted(() => { - +
颜色
+ 取 消 diff --git a/business-css/frontend/src/components/antvx6/index.vue b/business-css/frontend/src/components/antvx6/index.vue index c764228..d2813e0 100644 --- a/business-css/frontend/src/components/antvx6/index.vue +++ b/business-css/frontend/src/components/antvx6/index.vue @@ -186,15 +186,15 @@ onMounted(() => { rowHeight: 120, }, }, - { - collapsable: false, - title: '管线', - name: 'group3', - graphHeight: 400, - layoutOptions: { - rowHeight: 120, - }, - }, + // { + // collapsable: false, + // title: '管线', + // name: 'group3', + // graphHeight: 400, + // layoutOptions: { + // rowHeight: 120, + // }, + // }, ], layoutOptions: { @@ -416,17 +416,32 @@ onMounted(() => { // 删除节点上的文字 // node.attr('text/text', '') // node.attr('label/text', '') - - - - - isAdddevice.value = true } }) + + graph.on('edge:selected', ({ edge }) => { + + edge.addTools({ + name: 'button-remove', + args: { + x: 0, + y: 0, + offset: { x: 10, y: 10 }, + }, + }) + + + }); + graph.on('edge:unselected', ({ edge }) => { + edge.removeTools() + }) + + + // #endregion // #region 快捷键与事件 @@ -933,12 +948,15 @@ function preWork() { } const left = ref(0) const top = ref(0) -const isMenuShow = ref(false) +const isMenuShow = ref(false) // 是否显示右键菜单 const selectedNode:any = ref(null) function deleteNode() { // 删除节点 graph.removeNode(selectedNode.value) isMenuShow.value = false } + + + function copyNode() { // 复制节点 if (selectedNode.value) { try { @@ -1001,9 +1019,12 @@ const connectingwireInfo:any = ref({ strokeDasharray: "0", arrow: "1", strokeWidth: 1, + color: "#a2b1c3", }) +const lineLine:any = ref( "#a2b1c3") function closeConnectingwireModel(e:any){ // 关闭连接线弹窗 if(e != false){ + lineLine.value = e.color let lineStyle:any = { strokeDasharray: 0, targetMarker: {}, @@ -1046,7 +1067,7 @@ function closeConnectingwireModel(e:any){ // 关闭连接线弹窗 return new Shape.Edge({ attrs: { line: { - stroke: '#A2B1C3', + stroke: lineLine.value, strokeWidth: e.strokeWidth, strokeDasharray: lineStyle.strokeDasharray, targetMarker: lineStyle.targetMarker, @@ -1446,6 +1467,7 @@ function saveDesign() { // 保存设计 图标 +
diff --git a/business-css/frontend/src/views/business/algorithm/index.vue b/business-css/frontend/src/views/business/algorithmManagement/algorithm/index.vue similarity index 100% rename from business-css/frontend/src/views/business/algorithm/index.vue rename to business-css/frontend/src/views/business/algorithmManagement/algorithm/index.vue diff --git a/business-css/frontend/src/views/business/algorithmModel/index.vue b/business-css/frontend/src/views/business/algorithmManagement/algorithmModel/index.vue similarity index 100% rename from business-css/frontend/src/views/business/algorithmModel/index.vue rename to business-css/frontend/src/views/business/algorithmManagement/algorithmModel/index.vue diff --git a/business-css/frontend/src/views/business/algorithmManagement/modelTrainTask/index.vue b/business-css/frontend/src/views/business/algorithmManagement/modelTrainTask/index.vue new file mode 100644 index 0000000..8532af5 --- /dev/null +++ b/business-css/frontend/src/views/business/algorithmManagement/modelTrainTask/index.vue @@ -0,0 +1,439 @@ + + + + + + + + \ No newline at end of file