From 63270de35c3780a008113a20551c866a28e407f9 Mon Sep 17 00:00:00 2001 From: luoyifan Date: Fri, 23 May 2025 16:55:03 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E6=A0=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../viewWidgets/modeltree/ModeltreeView.vue | 82 ++++-------------- .../viewWidgets/modeltree/ModeltreeViewJs.js | 97 ++++++++++++++++++++++ 2 files changed, 112 insertions(+), 67 deletions(-) create mode 100644 src/designer/viewWidgets/modeltree/ModeltreeViewJs.js diff --git a/src/designer/viewWidgets/modeltree/ModeltreeView.vue b/src/designer/viewWidgets/modeltree/ModeltreeView.vue index 084cc18..f5104c7 100644 --- a/src/designer/viewWidgets/modeltree/ModeltreeView.vue +++ b/src/designer/viewWidgets/modeltree/ModeltreeView.vue @@ -1,80 +1,28 @@ \ No newline at end of file diff --git a/src/designer/viewWidgets/modeltree/ModeltreeViewJs.js b/src/designer/viewWidgets/modeltree/ModeltreeViewJs.js new file mode 100644 index 0000000..cceda75 --- /dev/null +++ b/src/designer/viewWidgets/modeltree/ModeltreeViewJs.js @@ -0,0 +1,97 @@ +import { renderIcon } from '@/utils/webutils.js' + +export default { + name: 'ModeltreeView', + emits: ['close'], + data() { + return { + currentLevel: '', + searchKeyword: '', + treedata: data + } + }, + methods: { + renderIcon, + allowDrop(event) { + return true + }, + allowDrag(event) { + return true + }, + handleDragStart() { + }, + handleDragEnter() { + }, + handleDragLeave() { + }, + handleDragOver() { + }, + handleDragEnd() { + }, + handleDrop() { + } + }, + computed: { + allLevels() { + return designer.allLevels + } + } +} + +const data = [ + { + label: 'Level one 1', + children: [ + { + label: 'Level two 1-1', + children: [ + { + label: 'Level three 1-1-1' + } + ] + } + ] + }, + { + label: 'Level one 2', + children: [ + { + label: 'Level two 2-1', + children: [ + { + label: 'Level three 2-1-1' + } + ] + }, + { + label: 'Level two 2-2', + children: [ + { + label: 'Level three 2-2-1' + } + ] + } + ] + }, + { + label: 'Level one 3', + children: [ + { + label: 'Level two 3-1', + children: [ + { + label: 'Level three 3-1-1' + } + ] + }, + { + label: 'Level two 3-2', + children: [ + { + label: 'Level three 3-2-1' + } + ] + } + ] + } +] \ No newline at end of file From 148275655a1ebd48251bab066804d383fbbe7ad5 Mon Sep 17 00:00:00 2001 From: luoyifan Date: Fri, 23 May 2025 17:08:40 +0800 Subject: [PATCH 2/5] =?UTF-8?q?ModelMain=20=E4=B8=BB=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E6=94=B9=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/designer/viewWidgets/alarm/AlarmView.vue | 76 +++++++++++++- src/designer/viewWidgets/logger/LoggerView.vue | 114 +++++++++++++-------- src/designer/viewWidgets/property/PropertyView.vue | 113 ++++++++++++-------- src/designer/viewWidgets/script/ScriptView.vue | 36 ++++++- src/designer/viewWidgets/task/TaskView.vue | 74 +++++++++---- src/views/ModelMain.vue | 33 +----- 6 files changed, 310 insertions(+), 136 deletions(-) diff --git a/src/designer/viewWidgets/alarm/AlarmView.vue b/src/designer/viewWidgets/alarm/AlarmView.vue index dbfb982..94fb226 100644 --- a/src/designer/viewWidgets/alarm/AlarmView.vue +++ b/src/designer/viewWidgets/alarm/AlarmView.vue @@ -1,3 +1,75 @@ \ No newline at end of file +
+ 告警面板 + + + + + + +
+
+ AlarmView_1
+ AlarmView_2
+ AlarmView_3
+ AlarmView_4
+ AlarmView_5
+ AlarmView_6
+ AlarmView_7
+ AlarmView_8
+ AlarmView_9
+ AlarmView_10
+ AlarmView_11
+ AlarmView_12
+ AlarmView_13
+ AlarmView_14
+ AlarmView_15
+ AlarmView_16
+ AlarmView_17
+ AlarmView_18
+ AlarmView_19
+ AlarmView_20
+ AlarmView_21
+ AlarmView_22
+ AlarmView_23
+ AlarmView_24
+ AlarmView_25
+ AlarmView_26
+ AlarmView_27
+ AlarmView_28
+ AlarmView_29
+ AlarmView_30
+ AlarmView_31
+ AlarmView_32
+ AlarmView_33
+ AlarmView_34
+ AlarmView_35
+ AlarmView_36
+ AlarmView_37
+ AlarmView_38
+ AlarmView_39
+ AlarmView_40
+
+ + + \ No newline at end of file diff --git a/src/designer/viewWidgets/logger/LoggerView.vue b/src/designer/viewWidgets/logger/LoggerView.vue index 740b14d..8e7ba01 100644 --- a/src/designer/viewWidgets/logger/LoggerView.vue +++ b/src/designer/viewWidgets/logger/LoggerView.vue @@ -1,42 +1,74 @@ \ No newline at end of file +
+ 系统日志 + + + + + + +
+
+ LoggerView1
+ LoggerView2
+ LoggerView3
+ LoggerView4
+ LoggerView5
+ LoggerView6
+ LoggerView7
+ LoggerView8
+ LoggerView9
+ LoggerView10
+ LoggerView11
+ LoggerView12
+ LoggerView13
+ LoggerView14
+ LoggerView15
+ LoggerView16
+ LoggerView17
+ LoggerView18
+ LoggerView19
+ LoggerView20
+ LoggerView21
+ LoggerView22
+ LoggerView23
+ LoggerView24
+ LoggerView25
+ LoggerView26
+ LoggerView27
+ LoggerView28
+ LoggerView29
+ LoggerView30
+ LoggerView31
+ LoggerView32
+ LoggerView33
+ LoggerView34
+ LoggerView35
+ LoggerView36
+ LoggerView37
+ LoggerView38
+ LoggerView39
+ LoggerView40
+
+ + \ No newline at end of file diff --git a/src/designer/viewWidgets/property/PropertyView.vue b/src/designer/viewWidgets/property/PropertyView.vue index 593b562..7d70107 100644 --- a/src/designer/viewWidgets/property/PropertyView.vue +++ b/src/designer/viewWidgets/property/PropertyView.vue @@ -1,44 +1,75 @@ - \ No newline at end of file diff --git a/src/designer/viewWidgets/script/ScriptView.vue b/src/designer/viewWidgets/script/ScriptView.vue index dbf5c23..0a1abb3 100644 --- a/src/designer/viewWidgets/script/ScriptView.vue +++ b/src/designer/viewWidgets/script/ScriptView.vue @@ -1,3 +1,35 @@ \ No newline at end of file +
+ 脚本编辑 + + + + + + +
+
+ ScriptView +
+ + \ No newline at end of file diff --git a/src/designer/viewWidgets/task/TaskView.vue b/src/designer/viewWidgets/task/TaskView.vue index 569aa7b..f682cea 100644 --- a/src/designer/viewWidgets/task/TaskView.vue +++ b/src/designer/viewWidgets/task/TaskView.vue @@ -1,22 +1,54 @@ \ No newline at end of file +
+ 任务监视 + + + + + + +
+
+ TaskView1
+ TaskView2
+ TaskView3
+ TaskView4
+ TaskView5
+ TaskView6
+ TaskView7
+ TaskView8
+ TaskView9
+ TaskView10
+ TaskView11
+ TaskView12
+ TaskView13
+ TaskView14
+ TaskView15
+ TaskView16
+ TaskView17
+ TaskView18
+ TaskView19
+ TaskView20
+
+ + \ No newline at end of file diff --git a/src/views/ModelMain.vue b/src/views/ModelMain.vue index 45e0c40..81e1e3c 100644 --- a/src/views/ModelMain.vue +++ b/src/views/ModelMain.vue @@ -65,41 +65,16 @@
-
- - {{ calcRightPanel?.title }} - - - - -
-
- -
+
-
- - {{ calcBottomPanel?.title }} - - - - - - -
-
- -
+
From 67dfe73e57acf25ad877c397cacfbee2811992ed Mon Sep 17 00:00:00 2001 From: luoyifan Date: Fri, 23 May 2025 17:20:17 +0800 Subject: [PATCH 3/5] =?UTF-8?q?ModelMain=20=E4=B8=BB=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E6=94=B9=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ModelMain.vue | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/views/ModelMain.vue b/src/views/ModelMain.vue index 81e1e3c..f3e5757 100644 --- a/src/views/ModelMain.vue +++ b/src/views/ModelMain.vue @@ -43,8 +43,10 @@
- + + +
@@ -65,16 +67,20 @@
- + + +
- + + +
From 136a716136eff9d4909739fb8496978e6eb8bf55 Mon Sep 17 00:00:00 2001 From: luoyifan Date: Fri, 23 May 2025 17:32:06 +0800 Subject: [PATCH 4/5] =?UTF-8?q?ModelMain=20=E4=B8=BB=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E6=94=B9=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/designer/Model2DEditor.vue | 68 ++++++++++++++++++++++ src/designer/ModelEditor.vue | 68 ---------------------- src/designer/viewWidgets/IWidgets.js | 10 ++++ src/designer/viewWidgets/alarm/AlarmView.vue | 11 +--- src/designer/viewWidgets/logger/LoggerView.vue | 10 +--- .../viewWidgets/modeltree/ModeltreeViewJs.js | 4 +- src/designer/viewWidgets/monitor/MonitorView.vue | 11 +--- src/designer/viewWidgets/property/PropertyView.vue | 10 +--- src/designer/viewWidgets/script/ScriptView.vue | 10 +--- src/designer/viewWidgets/task/TaskView.vue | 10 +--- src/designer/viewWidgets/toolbox/ToolboxView.vue | 34 +++++------ src/views/ModelMain.vue | 6 +- 12 files changed, 114 insertions(+), 138 deletions(-) create mode 100644 src/designer/Model2DEditor.vue delete mode 100644 src/designer/ModelEditor.vue create mode 100644 src/designer/viewWidgets/IWidgets.js diff --git a/src/designer/Model2DEditor.vue b/src/designer/Model2DEditor.vue new file mode 100644 index 0000000..69f54d1 --- /dev/null +++ b/src/designer/Model2DEditor.vue @@ -0,0 +1,68 @@ + + \ No newline at end of file diff --git a/src/designer/ModelEditor.vue b/src/designer/ModelEditor.vue deleted file mode 100644 index a517723..0000000 --- a/src/designer/ModelEditor.vue +++ /dev/null @@ -1,68 +0,0 @@ - - \ No newline at end of file diff --git a/src/designer/viewWidgets/IWidgets.js b/src/designer/viewWidgets/IWidgets.js new file mode 100644 index 0000000..31ce61d --- /dev/null +++ b/src/designer/viewWidgets/IWidgets.js @@ -0,0 +1,10 @@ +import { renderIcon } from '@/utils/webutils.js' + +export default { + methods: { + renderIcon, + closeMe() { + this.$emit('close') + } + } +} \ No newline at end of file diff --git a/src/designer/viewWidgets/alarm/AlarmView.vue b/src/designer/viewWidgets/alarm/AlarmView.vue index 94fb226..0163ca9 100644 --- a/src/designer/viewWidgets/alarm/AlarmView.vue +++ b/src/designer/viewWidgets/alarm/AlarmView.vue @@ -6,7 +6,7 @@ - + @@ -55,21 +55,16 @@ \ No newline at end of file diff --git a/src/designer/viewWidgets/logger/LoggerView.vue b/src/designer/viewWidgets/logger/LoggerView.vue index 8e7ba01..2505a37 100644 --- a/src/designer/viewWidgets/logger/LoggerView.vue +++ b/src/designer/viewWidgets/logger/LoggerView.vue @@ -54,21 +54,15 @@ \ No newline at end of file diff --git a/src/designer/viewWidgets/modeltree/ModeltreeViewJs.js b/src/designer/viewWidgets/modeltree/ModeltreeViewJs.js index cceda75..6f9d022 100644 --- a/src/designer/viewWidgets/modeltree/ModeltreeViewJs.js +++ b/src/designer/viewWidgets/modeltree/ModeltreeViewJs.js @@ -1,8 +1,9 @@ import { renderIcon } from '@/utils/webutils.js' +import IWidgets from '../IWidgets.js' export default { name: 'ModeltreeView', - emits: ['close'], + mixins: [IWidgets], data() { return { currentLevel: '', @@ -11,7 +12,6 @@ export default { } }, methods: { - renderIcon, allowDrop(event) { return true }, diff --git a/src/designer/viewWidgets/monitor/MonitorView.vue b/src/designer/viewWidgets/monitor/MonitorView.vue index 99ae190..d3b09e9 100644 --- a/src/designer/viewWidgets/monitor/MonitorView.vue +++ b/src/designer/viewWidgets/monitor/MonitorView.vue @@ -54,21 +54,16 @@ \ No newline at end of file diff --git a/src/designer/viewWidgets/property/PropertyView.vue b/src/designer/viewWidgets/property/PropertyView.vue index 7d70107..2791ace 100644 --- a/src/designer/viewWidgets/property/PropertyView.vue +++ b/src/designer/viewWidgets/property/PropertyView.vue @@ -55,21 +55,15 @@ \ No newline at end of file diff --git a/src/designer/viewWidgets/script/ScriptView.vue b/src/designer/viewWidgets/script/ScriptView.vue index 0a1abb3..0c7d762 100644 --- a/src/designer/viewWidgets/script/ScriptView.vue +++ b/src/designer/viewWidgets/script/ScriptView.vue @@ -15,21 +15,15 @@ \ No newline at end of file diff --git a/src/designer/viewWidgets/task/TaskView.vue b/src/designer/viewWidgets/task/TaskView.vue index f682cea..20c7041 100644 --- a/src/designer/viewWidgets/task/TaskView.vue +++ b/src/designer/viewWidgets/task/TaskView.vue @@ -34,21 +34,15 @@ \ No newline at end of file diff --git a/src/designer/viewWidgets/toolbox/ToolboxView.vue b/src/designer/viewWidgets/toolbox/ToolboxView.vue index 8df6daf..275c701 100644 --- a/src/designer/viewWidgets/toolbox/ToolboxView.vue +++ b/src/designer/viewWidgets/toolbox/ToolboxView.vue @@ -6,7 +6,7 @@ - + @@ -15,7 +15,7 @@ @open="handleOpen" @close="handleClose" :default-openeds="defaultExpandedKeys" - > + > diff --git a/src/views/ModelMain.vue b/src/views/ModelMain.vue index f3e5757..f3ff126 100644 --- a/src/views/ModelMain.vue +++ b/src/views/ModelMain.vue @@ -52,7 +52,7 @@ - + @@ -107,13 +107,13 @@ import './ModelMain.less' import { ModelMainInit, ModelMainMounted, ModelMainUnmounted } from '@/views/ModelMainInit.js' import { getRootMenu } from '@/runtime/DefineMenu.js' import { getWidgetByName, getWidgetBySide, getAllWidget } from '@/runtime/DefineWidget.js' -import ModelEditor from '@/designer/ModelEditor.vue' +import Model2DEditor from '@/designer/Model2DEditor.vue' import ModelView from '@/designer/ModelView.vue' import { normalizeShortKey } from '@/utils/webutils.ts' export default { - components: { ModelEditor, ModelView, Split, SplitArea }, + components: { Model2DEditor, ModelView, Split, SplitArea }, created() { ModelMainInit() }, From 1cc04cf5b9f1b4ac9346ed047dcf1567c74b1ad9 Mon Sep 17 00:00:00 2001 From: luoyifan Date: Fri, 23 May 2025 17:54:17 +0800 Subject: [PATCH 5/5] =?UTF-8?q?ModelMain=20=E4=B8=BB=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E6=94=B9=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/designer/viewWidgets/IWidgets.js | 10 ------- src/designer/viewWidgets/IWidgets.ts | 31 ++++++++++++++++++++++ src/designer/viewWidgets/alarm/AlarmView.vue | 1 + src/designer/viewWidgets/logger/LoggerView.vue | 1 + .../viewWidgets/modeltree/ModeltreeViewJs.js | 6 +++-- src/designer/viewWidgets/monitor/MonitorView.vue | 3 ++- src/designer/viewWidgets/task/TaskView.vue | 1 + 7 files changed, 40 insertions(+), 13 deletions(-) delete mode 100644 src/designer/viewWidgets/IWidgets.js create mode 100644 src/designer/viewWidgets/IWidgets.ts diff --git a/src/designer/viewWidgets/IWidgets.js b/src/designer/viewWidgets/IWidgets.js deleted file mode 100644 index 31ce61d..0000000 --- a/src/designer/viewWidgets/IWidgets.js +++ /dev/null @@ -1,10 +0,0 @@ -import { renderIcon } from '@/utils/webutils.js' - -export default { - methods: { - renderIcon, - closeMe() { - this.$emit('close') - } - } -} \ No newline at end of file diff --git a/src/designer/viewWidgets/IWidgets.ts b/src/designer/viewWidgets/IWidgets.ts new file mode 100644 index 0000000..59486c8 --- /dev/null +++ b/src/designer/viewWidgets/IWidgets.ts @@ -0,0 +1,31 @@ +import { defineComponent } from 'vue' +import { renderIcon } from '@/utils/webutils.js' + +export type IWidgetData = { + /** + * 是否激活 + */ + isActivated: boolean +} + +export default defineComponent({ + activated() { + this.isActivated = true + console.log('activated', this.$.type.name) + }, + deactivated() { + this.isActivated = false + }, + emits: ['close'], + data() { + return { + isActivated: false + } as IWidgetData + }, + methods: { + renderIcon, + closeMe() { + this.$emit('close') + } + } +}) \ No newline at end of file diff --git a/src/designer/viewWidgets/alarm/AlarmView.vue b/src/designer/viewWidgets/alarm/AlarmView.vue index 0163ca9..daa9431 100644 --- a/src/designer/viewWidgets/alarm/AlarmView.vue +++ b/src/designer/viewWidgets/alarm/AlarmView.vue @@ -59,6 +59,7 @@ import IWidgets from '../IWidgets.js' export default { name: 'AlarmView', + webSocketSubscribe: ['alarm'], emits: ['close'], mixins: [IWidgets], data() { diff --git a/src/designer/viewWidgets/logger/LoggerView.vue b/src/designer/viewWidgets/logger/LoggerView.vue index 2505a37..78a4a65 100644 --- a/src/designer/viewWidgets/logger/LoggerView.vue +++ b/src/designer/viewWidgets/logger/LoggerView.vue @@ -58,6 +58,7 @@ import IWidgets from '../IWidgets.js' export default { name: 'LoggerView', + webSocketSubscribe: ['logs'], mixins: [IWidgets], data() { return { diff --git a/src/designer/viewWidgets/modeltree/ModeltreeViewJs.js b/src/designer/viewWidgets/modeltree/ModeltreeViewJs.js index 6f9d022..0104c9c 100644 --- a/src/designer/viewWidgets/modeltree/ModeltreeViewJs.js +++ b/src/designer/viewWidgets/modeltree/ModeltreeViewJs.js @@ -1,7 +1,9 @@ +import { defineComponent } from 'vue' import { renderIcon } from '@/utils/webutils.js' import IWidgets from '../IWidgets.js' -export default { + +export default defineComponent({ name: 'ModeltreeView', mixins: [IWidgets], data() { @@ -36,7 +38,7 @@ export default { return designer.allLevels } } -} +}) const data = [ { diff --git a/src/designer/viewWidgets/monitor/MonitorView.vue b/src/designer/viewWidgets/monitor/MonitorView.vue index d3b09e9..d5356db 100644 --- a/src/designer/viewWidgets/monitor/MonitorView.vue +++ b/src/designer/viewWidgets/monitor/MonitorView.vue @@ -6,7 +6,7 @@ - + @@ -58,6 +58,7 @@ import IWidgets from '../IWidgets.js' export default { name: 'MonitorView', + webSocketSubscribe: ['deviceStatus'], mixins: [IWidgets], data() { return { diff --git a/src/designer/viewWidgets/task/TaskView.vue b/src/designer/viewWidgets/task/TaskView.vue index 20c7041..6d8e331 100644 --- a/src/designer/viewWidgets/task/TaskView.vue +++ b/src/designer/viewWidgets/task/TaskView.vue @@ -38,6 +38,7 @@ import IWidgets from '../IWidgets.js' export default { name: 'TaskView', + webSocketSubscribe: ['task'], mixins: [IWidgets], data() { return {