From 8bc25357d5742f07710baa7a6f1d6ac4023da3ac Mon Sep 17 00:00:00 2001
From: wangting <wangting@vci-tech.com>
Date: 星期三, 25 十二月 2024 12:00:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/views/authority/ui/uiAuthorization/UIDialog.vue | 4 ++--
Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/index.vue | 4 ++--
Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/cloneDialog.vue | 4 ++--
Source/plt-web/plt-web-ui/src/views/authority/ui/uiAuthorization/index.vue | 4 ++--
Source/plt-web/plt-web-ui/src/views/systemModel/businessModel/index.vue | 2 +-
Source/plt-web/plt-web-ui/src/views/authority/ui/dataAuthorization/index.vue | 2 +-
Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/index.vue | 2 +-
Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/linkType/index.vue | 2 +-
Source/plt-web/plt-web-ui/src/views/systemModel/operateType/index.vue | 2 +-
Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/lifeCycle/index.vue | 2 +-
Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/businessTypeQuery/index.vue | 2 +-
Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/queryDefine/index.vue | 2 +-
Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/index.vue | 2 +-
Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/index.vue | 2 +-
Source/plt-web/plt-web-ui/src/views/systemModel/mangeModel/index.vue | 2 +-
Source/plt-web/plt-web-ui/src/views/systemModel/systemConfig/index.vue | 2 +-
Source/plt-web/plt-web-ui/src/views/custom-ui/product.vue | 2 +-
Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/components/dialog.vue | 2 +-
Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/components/formDialog.vue | 2 +-
Source/plt-web/plt-web-ui/src/views/authority/ui/typeAction/index.vue | 2 +-
Source/plt-web/plt-web-ui/src/views/authority/function/functionView/index.vue | 4 ++--
Source/plt-web/plt-web-ui/src/views/authority/secure/machineClassification/index.vue | 2 +-
Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue | 2 +-
23 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/views/authority/function/functionView/index.vue b/Source/plt-web/plt-web-ui/src/views/authority/function/functionView/index.vue
index ff67598..3f19ee1 100644
--- a/Source/plt-web/plt-web-ui/src/views/authority/function/functionView/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/authority/function/functionView/index.vue
@@ -7,7 +7,7 @@
<div style="height: calc(100vh - 195px);">
<avue-tree :data="treeData" :option="treeOption" @node-click="nodeClick">
<span slot-scope="{ node, data }" class="el-tree-node__label">
- <span style="font-size: 15px">
+ <span>
<i class="el-icon-user-solid"></i>
{{ (node || {}).label }}
</span>
@@ -30,7 +30,7 @@
<div style="height: calc(100vh - 232px);margin-top: 10px;">
<avue-tree ref="uiTree" :data="uiTreeData" :node-key="id" :option="uiTreeOption">
<span slot-scope="{ node, data }" class="el-tree-node__label">
- <span style="font-size: 15px">
+ <span>
<i :class="data.icon"></i>
{{ (node || {}).label }}
</span>
diff --git a/Source/plt-web/plt-web-ui/src/views/authority/secure/machineClassification/index.vue b/Source/plt-web/plt-web-ui/src/views/authority/secure/machineClassification/index.vue
index 97a3686..1abe004 100644
--- a/Source/plt-web/plt-web-ui/src/views/authority/secure/machineClassification/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/authority/secure/machineClassification/index.vue
@@ -23,7 +23,7 @@
<div style="height: calc(100vh - 280px);">
<avue-tree :data="treeData" :option="treeOption" @node-click="nodeClick">
<span slot-scope="{ node, data }" class="el-tree-node__label">
- <span style="font-size: 15px">
+ <span>
<i class="el-icon-s-promotion"></i>
{{ (node || {}).label }}
</span>
diff --git a/Source/plt-web/plt-web-ui/src/views/authority/ui/dataAuthorization/index.vue b/Source/plt-web/plt-web-ui/src/views/authority/ui/dataAuthorization/index.vue
index bf46f53..19075c8 100644
--- a/Source/plt-web/plt-web-ui/src/views/authority/ui/dataAuthorization/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/authority/ui/dataAuthorization/index.vue
@@ -7,7 +7,7 @@
<div style="height: calc(100vh - 190px);">
<avue-tree :data="treeData" :option="treeOption" @node-click="nodeClick">
<span slot-scope="{ node, data }" class="el-tree-node__label">
- <span style="font-size: 15px">
+ <span>
<i class="el-icon-s-promotion"></i>
{{ (node || {}).label }}
</span>
diff --git a/Source/plt-web/plt-web-ui/src/views/authority/ui/typeAction/index.vue b/Source/plt-web/plt-web-ui/src/views/authority/ui/typeAction/index.vue
index c1f6102..909a87b 100644
--- a/Source/plt-web/plt-web-ui/src/views/authority/ui/typeAction/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/authority/ui/typeAction/index.vue
@@ -8,7 +8,7 @@
<div style="height: calc(100vh - 190px);">
<avue-tree :data="treeData" :option="treeOption" @node-click="nodeClick">
<span slot-scope="{ node, data }" class="el-tree-node__label">
- <span style="font-size: 15px">
+ <span>
<i class="el-icon-s-promotion"></i>
{{ (node || {}).label }}
</span>
diff --git a/Source/plt-web/plt-web-ui/src/views/authority/ui/uiAuthorization/UIDialog.vue b/Source/plt-web/plt-web-ui/src/views/authority/ui/uiAuthorization/UIDialog.vue
index 4b92d8d..b574401 100644
--- a/Source/plt-web/plt-web-ui/src/views/authority/ui/uiAuthorization/UIDialog.vue
+++ b/Source/plt-web/plt-web-ui/src/views/authority/ui/uiAuthorization/UIDialog.vue
@@ -13,7 +13,7 @@
<basic-container style="height: 500px">
<avue-tree ref="tree" :data="treeData" :option="treeOption" @node-click="nodeClick">
<span slot-scope="{ node, data }" class="el-tree-node__label">
- <span style="font-size: 15px">
+ <span>
<i class="el-icon-user-solid"></i>
{{ (node || {}).label }}
</span>
@@ -28,7 +28,7 @@
<div style="height: 445px;">
<avue-tree ref="uiTree" :data="uiTreeData" :option="uiTreeOption">
<span slot-scope="{ node, data }" class="el-tree-node__label">
- <span style="font-size: 15px">
+ <span>
<i :class="data.icon"></i>
{{ (node || {}).label }}
</span>
diff --git a/Source/plt-web/plt-web-ui/src/views/authority/ui/uiAuthorization/index.vue b/Source/plt-web/plt-web-ui/src/views/authority/ui/uiAuthorization/index.vue
index b22e484..47483e0 100644
--- a/Source/plt-web/plt-web-ui/src/views/authority/ui/uiAuthorization/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/authority/ui/uiAuthorization/index.vue
@@ -7,7 +7,7 @@
<div style="height: calc(100vh - 195px);">
<avue-tree :data="treeData" :option="treeOption" @node-click="nodeClick">
<span slot-scope="{ node, data }" class="el-tree-node__label">
- <span style="font-size: 15px">
+ <span>
<i class="el-icon-user-solid"></i>
{{ (node || {}).label }}
</span>
@@ -51,7 +51,7 @@
<div style="height: calc(100vh - 232px);margin-top: 10px;">
<avue-tree ref="uiTree" :data="uiTreeData" :node-key="oid" :option="uiTreeOption">
<span slot-scope="{ node, data }" class="el-tree-node__label">
- <span style="font-size: 15px">
+ <span>
<i :class="data.icon"></i>
{{ (node || {}).label }}
</span>
diff --git a/Source/plt-web/plt-web-ui/src/views/custom-ui/product.vue b/Source/plt-web/plt-web-ui/src/views/custom-ui/product.vue
index 108ce6e..2d9ef85 100644
--- a/Source/plt-web/plt-web-ui/src/views/custom-ui/product.vue
+++ b/Source/plt-web/plt-web-ui/src/views/custom-ui/product.vue
@@ -2,7 +2,7 @@
<div style="height: 720px">
<avue-tree ref="tree" v-loading="treeLoading" :data="treeData" :option="treeOption" @node-click="nodeClick">
<span slot-scope="{ node, data }" class="el-tree-node__label">
- <span style="font-size: 15px">
+ <span>
<i class="el-icon-s-promotion"></i>
{{ (node || {}).label }}
</span>
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue
index 048eb04..9d23f9e 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue
@@ -8,7 +8,7 @@
<div style="height: calc(100vh - 190px);">
<avue-tree ref="tree" v-loading="treeLoading" :data="treeData" :option="treeOption" @node-click="nodeClick">
<span slot-scope="{ node, data }" class="el-tree-node__label">
- <span style="font-size: 15px">
+ <span>
<i class="el-icon-s-promotion"></i>
{{ (node || {}).label }}
</span>
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/lifeCycle/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/lifeCycle/index.vue
index fcb4e6e..42274bd 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/lifeCycle/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/lifeCycle/index.vue
@@ -21,7 +21,7 @@
<div style="height: calc(100vh - 300px);">
<avue-tree ref="tree" :data="treeData" :option="treeOption" @node-click="nodeClick">
<span slot-scope="{ node, data }" class="el-tree-node__label">
- <span style="font-size: 15px">
+ <span>
<i class="el-icon-s-promotion"></i>
{{ (node || {}).label }}
</span>
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/linkType/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/linkType/index.vue
index 8072c73..f775a45 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/linkType/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/linkType/index.vue
@@ -7,7 +7,7 @@
<div style="height: calc(100vh - 190px);">
<avue-tree :data="treeData" :option="treeOption" @node-click="nodeClick">
<span slot-scope="{ node, data }" class="el-tree-node__label">
- <span style="font-size: 15px">
+ <span>
<i class="el-icon-s-promotion"></i>
{{ (node || {}).label }}
</span>
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/businessTypeQuery/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/businessTypeQuery/index.vue
index ef198e4..a39c8a4 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/businessTypeQuery/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/businessTypeQuery/index.vue
@@ -8,7 +8,7 @@
<div style="height: calc(100vh - 190px);">
<avue-tree :data="treeData" :option="treeOption" @node-click="nodeClick">
<span slot-scope="{ node, data }" class="el-tree-node__label">
- <span style="font-size: 15px">
+ <span>
<i class="el-icon-s-promotion"></i>
{{ (node || {}).label }}
</span>
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/index.vue
index b4657da..61a7b02 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/index.vue
@@ -7,7 +7,7 @@
<div style="height: calc(100vh - 200px);">
<avue-tree :data="treeData" :option="treeOption" @node-click="nodeClick">
<span slot-scope="{ node, data }" class="el-tree-node__label">
- <span style="font-size: 15px">
+ <span>
<i class="el-icon-s-promotion"></i>
{{ (node || {}).label }}
</span>
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/queryDefine/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/queryDefine/index.vue
index a685dd0..aec2422 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/queryDefine/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/queryDefine/index.vue
@@ -10,7 +10,7 @@
<div style="height: calc(100vh - 230px);">
<avue-tree :data="treeData" :option="treeOption" @node-click="nodeClick">
<span slot-scope="{ node, data }" class="el-tree-node__label">
- <span style="font-size: 15px">
+ <span>
<i class="el-icon-s-promotion"></i>
{{ (node || {}).label }}
</span>
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/components/dialog.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/components/dialog.vue
index 745726b..ed80440 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/components/dialog.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/components/dialog.vue
@@ -20,7 +20,7 @@
:option="treeOption"
@node-click="nodeClick">
<span slot-scope="{ node, data }" class="el-tree-node__label">
- <span style="font-size: 15px">
+ <span>
<i class="el-icon-s-promotion"></i>
{{ (node || {}).label }}
</span>
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/index.vue
index 55a088a..2199e65 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/index.vue
@@ -26,7 +26,7 @@
@update="rowTreeUpdataHandler"
@node-click="nodeClick">
<span slot-scope="{ node, data }" class="el-tree-node__label">
- <span style="font-size: 15px">
+ <span>
<i class="el-icon-s-promotion"></i>
{{ (node || {}).label }}
</span>
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/components/formDialog.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/components/formDialog.vue
index 389563e..eeeb527 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/components/formDialog.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/components/formDialog.vue
@@ -796,7 +796,7 @@
<avue-tree :key="refresh" ref="authTree" v-model="treeAuthForm" :data="treeAuthData" :option="treeAuthOption"
@check-change="treeAuthCheckChange">
<span slot-scope="{ node, data }" class="el-tree-node__label">
- <span style="font-size: 15px">
+ <span>
<i class="el-icon-s-promotion"></i>
{{ (node || {}).label }}
</span>
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/index.vue
index 7c4962c..bfc38c8 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/index.vue
@@ -12,7 +12,7 @@
</div>
<avue-tree v-loading="treeLoading" :data="treeData" :option="treeOption" @node-click="nodeClick">
<span slot-scope="{ node, data }" class="el-tree-node__label">
- <span style="font-size: 15px">
+ <span>
<i class="el-icon-s-promotion"></i>
{{ (node || {}).label }}
</span>
@@ -91,7 +91,7 @@
<avue-tree ref="cloneTree" v-loading="cloneTreeLoading" :data="cloneTreeData" :option="treeOption"
@node-click="cloneTreeNodeClick">
<span slot-scope="{ node, data }" class="el-tree-node__label">
- <span style="font-size: 15px">
+ <span>
<i class="el-icon-s-promotion"></i>
{{ (node || {}).label }}
</span>
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/index.vue
index be0476c..897c452 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/index.vue
@@ -7,7 +7,7 @@
<div style="height: calc(100vh - 190px);">
<avue-tree v-loading="loading" :data="treeData" :option="treeOption" @node-click="nodeClick">
<span slot-scope="{ node, data }" class="el-tree-node__label">
- <span style="font-size: 15px">
+ <span>
<i class="el-icon-s-promotion"></i>
{{ (node || {}).label }}
</span>
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/cloneDialog.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/cloneDialog.vue
index 842412b..7615eaf 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/cloneDialog.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/cloneDialog.vue
@@ -15,7 +15,7 @@
<div style="height: 435px">
<avue-tree ref="tree" :data="treeData" :option="treeOption" @node-click="nodeClick">
<span slot-scope="{ node, data }" class="el-tree-node__label">
- <span style="font-size: 15px">
+ <span>
{{ (node || {}).label }}
</span>
</span>
@@ -29,7 +29,7 @@
<div style="height: 490px;">
<avue-tree ref="uiTree" :data="uiTreeData" :option="uiTreeOption" @check-change="checkChange">
<span slot-scope="{ node, data }" class="el-tree-node__label">
- <span style="font-size: 15px">
+ <span>
<i :class="data.icon"></i>
{{ (node || {}).label }}
</span>
diff --git a/Source/plt-web/plt-web-ui/src/views/systemModel/businessModel/index.vue b/Source/plt-web/plt-web-ui/src/views/systemModel/businessModel/index.vue
index 9d4f253..3de7e58 100644
--- a/Source/plt-web/plt-web-ui/src/views/systemModel/businessModel/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/systemModel/businessModel/index.vue
@@ -6,7 +6,7 @@
<avue-tree :key="refresh" ref="tree" :data="treeData" :option="treeOption" node-key="id"
@node-click="nodeClick">
<span slot-scope="{ node, data }" class="el-tree-node__label">
- <span style="font-size: 15px">
+ <span>
<i :class="data.icon"></i>
{{ (node || {}).label }}
</span>
diff --git a/Source/plt-web/plt-web-ui/src/views/systemModel/mangeModel/index.vue b/Source/plt-web/plt-web-ui/src/views/systemModel/mangeModel/index.vue
index 614abf6..f96e1aa 100644
--- a/Source/plt-web/plt-web-ui/src/views/systemModel/mangeModel/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/systemModel/mangeModel/index.vue
@@ -6,7 +6,7 @@
<avue-tree :key="refresh" ref="tree" :data="treeData" :option="treeOption" node-key="id"
@node-click="nodeClick">
<span slot-scope="{ node, data }" class="el-tree-node__label">
- <span style="font-size: 15px">
+ <span>
<i :class="data.icon"></i>
{{ (node || {}).label }}
</span>
diff --git a/Source/plt-web/plt-web-ui/src/views/systemModel/operateType/index.vue b/Source/plt-web/plt-web-ui/src/views/systemModel/operateType/index.vue
index c171257..7f72b04 100644
--- a/Source/plt-web/plt-web-ui/src/views/systemModel/operateType/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/systemModel/operateType/index.vue
@@ -6,7 +6,7 @@
<avue-tree :key="refresh" ref="tree" :data="treeData" :option="treeOption" node-key="id"
@node-click="nodeClick">
<span slot-scope="{ node, data }" class="el-tree-node__label">
- <span style="font-size: 15px">
+ <span>
<i class="el-icon-s-promotion"></i>
{{ (node || {}).label }}
</span>
diff --git a/Source/plt-web/plt-web-ui/src/views/systemModel/systemConfig/index.vue b/Source/plt-web/plt-web-ui/src/views/systemModel/systemConfig/index.vue
index 841ffbd..fdf5ef9 100644
--- a/Source/plt-web/plt-web-ui/src/views/systemModel/systemConfig/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/systemModel/systemConfig/index.vue
@@ -5,7 +5,7 @@
<div style="max-height: calc(100vh - 150px);overflow: auto">
<avue-tree :key="refresh" ref="tree" :data="treeData" :option="treeOption" @node-click="nodeClick">
<span slot-scope="{ node, data }" class="el-tree-node__label">
- <span style="font-size: 15px">
+ <span>
<i class="el-icon-s-promotion"></i>
{{ (node || {}).label }}
</span>
--
Gitblit v1.9.3