diff --git a/business-css/frontend/package.json b/business-css/frontend/package.json index 6b2ca7e..0d4da51 100644 --- a/business-css/frontend/package.json +++ b/business-css/frontend/package.json @@ -35,7 +35,8 @@ "vue": "^3.2.40", "vue-i18n": "^9.1.9", "vue-router": "^4.1.6", - "vuedraggable": "^2.24.3" + "vuedraggable": "^2.24.3", + "xlsx": "^0.18.5" }, "devDependencies": { "@commitlint/cli": "^16.2.3", diff --git a/business-css/frontend/src/assets/x6/1.png b/business-css/frontend/src/assets/x6/1.png index d1a8200..ec014f6 100644 Binary files a/business-css/frontend/src/assets/x6/1.png and b/business-css/frontend/src/assets/x6/1.png differ diff --git a/business-css/frontend/src/assets/x6/11.png b/business-css/frontend/src/assets/x6/11.png index 6122205..b8fe47b 100644 Binary files a/business-css/frontend/src/assets/x6/11.png and b/business-css/frontend/src/assets/x6/11.png differ diff --git a/business-css/frontend/src/assets/x6/111.png b/business-css/frontend/src/assets/x6/111.png new file mode 100644 index 0000000..6122205 Binary files /dev/null and b/business-css/frontend/src/assets/x6/111.png differ diff --git a/business-css/frontend/src/assets/x6/2.png b/business-css/frontend/src/assets/x6/2.png index 9a9e270..18e247a 100644 Binary files a/business-css/frontend/src/assets/x6/2.png and b/business-css/frontend/src/assets/x6/2.png differ diff --git a/business-css/frontend/src/assets/x6/22.png b/business-css/frontend/src/assets/x6/22.png index a7f73b5..c1581c9 100644 Binary files a/business-css/frontend/src/assets/x6/22.png and b/business-css/frontend/src/assets/x6/22.png differ diff --git a/business-css/frontend/src/assets/x6/222.png b/business-css/frontend/src/assets/x6/222.png new file mode 100644 index 0000000..a7f73b5 Binary files /dev/null and b/business-css/frontend/src/assets/x6/222.png differ diff --git a/business-css/frontend/src/assets/x6/3.png b/business-css/frontend/src/assets/x6/3.png index 25fbd1e..8339ec1 100644 Binary files a/business-css/frontend/src/assets/x6/3.png and b/business-css/frontend/src/assets/x6/3.png differ diff --git a/business-css/frontend/src/assets/x6/33.png b/business-css/frontend/src/assets/x6/33.png index aed195f..cda26fd 100644 Binary files a/business-css/frontend/src/assets/x6/33.png and b/business-css/frontend/src/assets/x6/33.png differ diff --git a/business-css/frontend/src/assets/x6/333.png b/business-css/frontend/src/assets/x6/333.png new file mode 100644 index 0000000..aed195f Binary files /dev/null and b/business-css/frontend/src/assets/x6/333.png differ diff --git a/business-css/frontend/src/assets/x6/4.png b/business-css/frontend/src/assets/x6/4.png index 77bdc3a..88e7267 100644 Binary files a/business-css/frontend/src/assets/x6/4.png and b/business-css/frontend/src/assets/x6/4.png differ diff --git a/business-css/frontend/src/assets/x6/44.png b/business-css/frontend/src/assets/x6/44.png index 76006a8..994dd17 100644 Binary files a/business-css/frontend/src/assets/x6/44.png and b/business-css/frontend/src/assets/x6/44.png differ diff --git a/business-css/frontend/src/assets/x6/444.png b/business-css/frontend/src/assets/x6/444.png new file mode 100644 index 0000000..76006a8 Binary files /dev/null and b/business-css/frontend/src/assets/x6/444.png differ diff --git a/business-css/frontend/src/assets/x6/5.png b/business-css/frontend/src/assets/x6/5.png index c7ea006..a2b4fdf 100644 Binary files a/business-css/frontend/src/assets/x6/5.png and b/business-css/frontend/src/assets/x6/5.png differ diff --git a/business-css/frontend/src/assets/x6/55.png b/business-css/frontend/src/assets/x6/55.png index 21bc6d9..a78d1d7 100644 Binary files a/business-css/frontend/src/assets/x6/55.png and b/business-css/frontend/src/assets/x6/55.png differ diff --git a/business-css/frontend/src/assets/x6/555.png b/business-css/frontend/src/assets/x6/555.png new file mode 100644 index 0000000..21bc6d9 Binary files /dev/null and b/business-css/frontend/src/assets/x6/555.png differ diff --git a/business-css/frontend/src/assets/x6/6.png b/business-css/frontend/src/assets/x6/6.png index 743acbd..ba5a3ad 100644 Binary files a/business-css/frontend/src/assets/x6/6.png and b/business-css/frontend/src/assets/x6/6.png differ diff --git a/business-css/frontend/src/assets/x6/61.png b/business-css/frontend/src/assets/x6/61.png new file mode 100644 index 0000000..d1a8200 Binary files /dev/null and b/business-css/frontend/src/assets/x6/61.png differ diff --git a/business-css/frontend/src/assets/x6/62.png b/business-css/frontend/src/assets/x6/62.png new file mode 100644 index 0000000..9a9e270 Binary files /dev/null and b/business-css/frontend/src/assets/x6/62.png differ diff --git a/business-css/frontend/src/assets/x6/63.png b/business-css/frontend/src/assets/x6/63.png new file mode 100644 index 0000000..25fbd1e Binary files /dev/null and b/business-css/frontend/src/assets/x6/63.png differ diff --git a/business-css/frontend/src/assets/x6/64.png b/business-css/frontend/src/assets/x6/64.png new file mode 100644 index 0000000..77bdc3a Binary files /dev/null and b/business-css/frontend/src/assets/x6/64.png differ diff --git a/business-css/frontend/src/assets/x6/65.png b/business-css/frontend/src/assets/x6/65.png new file mode 100644 index 0000000..c7ea006 Binary files /dev/null and b/business-css/frontend/src/assets/x6/65.png differ diff --git a/business-css/frontend/src/assets/x6/66.png b/business-css/frontend/src/assets/x6/66.png index 6941ded..fd87ba2 100644 Binary files a/business-css/frontend/src/assets/x6/66.png and b/business-css/frontend/src/assets/x6/66.png differ diff --git a/business-css/frontend/src/assets/x6/666.png b/business-css/frontend/src/assets/x6/666.png new file mode 100644 index 0000000..6941ded Binary files /dev/null and b/business-css/frontend/src/assets/x6/666.png differ diff --git a/business-css/frontend/src/assets/x6/7.png b/business-css/frontend/src/assets/x6/7.png index cc936d4..e22d851 100644 Binary files a/business-css/frontend/src/assets/x6/7.png and b/business-css/frontend/src/assets/x6/7.png differ diff --git a/business-css/frontend/src/assets/x6/77.png b/business-css/frontend/src/assets/x6/77.png index 4c2cb94..45b9fa3 100644 Binary files a/business-css/frontend/src/assets/x6/77.png and b/business-css/frontend/src/assets/x6/77.png differ diff --git a/business-css/frontend/src/assets/x6/777.png b/business-css/frontend/src/assets/x6/777.png new file mode 100644 index 0000000..4c2cb94 Binary files /dev/null and b/business-css/frontend/src/assets/x6/777.png differ diff --git a/business-css/frontend/src/assets/x6/96.png b/business-css/frontend/src/assets/x6/96.png new file mode 100644 index 0000000..743acbd Binary files /dev/null and b/business-css/frontend/src/assets/x6/96.png differ diff --git a/business-css/frontend/src/assets/x6/97.png b/business-css/frontend/src/assets/x6/97.png new file mode 100644 index 0000000..cc936d4 Binary files /dev/null and b/business-css/frontend/src/assets/x6/97.png differ diff --git a/business-css/frontend/src/components/antvx6/connectingwire.vue b/business-css/frontend/src/components/antvx6/connectingwire.vue new file mode 100644 index 0000000..fb1699f --- /dev/null +++ b/business-css/frontend/src/components/antvx6/connectingwire.vue @@ -0,0 +1,181 @@ + + + + + + + diff --git a/business-css/frontend/src/components/antvx6/index.vue b/business-css/frontend/src/components/antvx6/index.vue index d1bdbc7..c764228 100644 --- a/business-css/frontend/src/components/antvx6/index.vue +++ b/business-css/frontend/src/components/antvx6/index.vue @@ -46,7 +46,7 @@ import EditdeviceModel from './editdevice.vue'; import MaterialModels from './materialmodel.vue'; import ChangesettingsModels from './changesettings.vue'; - +import ConnectingwireModel from './connectingwire.vue'; const emit = defineEmits([ 'closeAntvx6']); const props = defineProps({ projectInfo: { @@ -203,6 +203,7 @@ onMounted(() => { rowHeight: 100, }, getDragNode: (sourceNode:any) => { + console.log('1111') let node:any = sourceNode if (node.data && node.data.lineStyle) { // 应用管线样式到连接线 @@ -225,13 +226,13 @@ onMounted(() => { setTimeout(() => { graph.removeNode(node) }, 100) - return + return null } return sourceNode.clone({ deep: true }) }, - getDropNode: (draggingNode) => { - return draggingNode.clone({ deep: true }) - }, + // getDropNode: (draggingNode) => { + // return draggingNode.clone({ deep: true }) + // }, }) graph.on('node:contextmenu', ({ e, node }) => { @@ -454,7 +455,6 @@ onMounted(() => { // undo redo graph.bindKey(['meta+z', 'ctrl+z'], () => { - debugger if (graph.canUndo()) { graph.undo() } @@ -475,7 +475,6 @@ onMounted(() => { } }) graph.bindKey('delete', () => { - debugger const cells = graph.getSelectedCells() if (cells.length) { graph.removeCells(cells) @@ -985,13 +984,81 @@ function removeClick(){ }, 500); } } -function bigClick(){ +function bigClick(){ // 放大画布 graph.zoom(0.1) } -function smallClick(){ +function smallClick(){ // 缩小画布 graph.zoom(-0.1) } - +function ConnectingwireClick(){ // 打开连接线弹窗 + isConnectingwire.value = true; +} +function dialogConnectingwire(){ // 关闭连接线弹窗 + isConnectingwire.value = false; +} +const connectingwireInfo:any = ref({ + label: "实线", + strokeDasharray: "0", + arrow: "1", + strokeWidth: 1, +}) +function closeConnectingwireModel(e:any){ // 关闭连接线弹窗 + if(e != false){ + let lineStyle:any = { + strokeDasharray: 0, + targetMarker: {}, + sourceMarker: {} + } + if(e.arrow == 0){ + lineStyle = { + sourceMarker: null, + strokeDasharray: e.strokeDasharray, + targetMarker: null + } + } + if(e.arrow == 1){ + lineStyle = { + sourceMarker: null, + strokeDasharray:e.strokeDasharray, + targetMarker: { + height: 8, + name: "block", + width: 12 + } + } + } + if(e.arrow == 2){ + lineStyle = { + sourceMarker: { + height: 8, + name: "block", + width: 12 + }, + strokeDasharray:e.strokeDasharray, + targetMarker: { + height: 8, + name: "block", + width: 12 + } + } + } + graph.options.connecting.createEdge = () => { + return new Shape.Edge({ + attrs: { + line: { + stroke: '#A2B1C3', + strokeWidth: e.strokeWidth, + strokeDasharray: lineStyle.strokeDasharray, + targetMarker: lineStyle.targetMarker, + sourceMarker: lineStyle.sourceMarker + } + }, + zIndex: 0 + }) + } + } + isConnectingwire.value = false; +} const nodeId = ref("") @@ -1082,6 +1149,9 @@ function closeMaterialModel(e:any){ // 关闭物料信息弹窗 isMaterialModel.value = false; } +const isConnectingwire = ref(false) // 是否连接线 +// const connectingwireData:any = ref([]) // 是否连接线数据 + const isChangesettings = ref(false) const changesettingsData:any = ref([]) // 是否变动设置 function dialogChangesettings(){ // 关闭变动设置弹窗 @@ -1178,7 +1248,6 @@ const styleInfo:any = ref({ function inputChange (e:any){ let node:any = graph.getCellById(nodeId.value) - debugger node.attr('label/text', e) } function lineChange(e:any){ @@ -1354,6 +1423,13 @@ function saveDesign() { // 保存设计
显示
+ +
+ + +
连接线
+
+
保存
@@ -1451,6 +1527,18 @@ function saveDesign() { // 保存设计 :materialInfo="materialInfo" :deviceInfo="deviceInfo" ref="ChangesettingsModel" @closeChangesettingsModel="closeChangesettingsModel"/> + + +
+ +
+ + + + + +