From bfb5d6f68a71ca0a8f1dfe860b32e05782c05c85 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 20 十一月 2024 11:08:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/public/index.html | 29 ++++++++++++++
Source/plt-web/plt-web-ui/src/App.vue | 4 +
Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-tree.vue | 9 +++-
Source/plt-web/plt-web-ui/src/config/iconList.js | 3 +
Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-table.vue | 7 +++
Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue | 20 ++++++++--
Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/statusPool/index.vue | 21 ++++++++++
7 files changed, 84 insertions(+), 9 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/public/index.html b/Source/plt-web/plt-web-ui/public/index.html
index 1f51aa4..d6f34f2 100644
--- a/Source/plt-web/plt-web-ui/public/index.html
+++ b/Source/plt-web/plt-web-ui/public/index.html
@@ -22,6 +22,12 @@
<script src="<%= BASE_URL %>cdn/xlsx/FileSaver.min.js"></script>
<script src="<%= BASE_URL %>cdn/xlsx/xlsx.full.min.js"></script>
<link href="<%= BASE_URL %>favicon.png" rel="icon">
+
+ <!-- icon 瀵煎叆闇�瑕佺殑鍖� 锛堜竴瀹氳鏀惧埌index.html涓殑head鏍囩閲岋級 -->
+ <!-- 寮曞叆闃块噷宸村反鐨勫浘琛ㄥ簱iconfont鍜宻vg鍥炬爣鍚庯紝鐩存帴浣跨敤鍥炬爣鍚嶅嵆鍙紝璁板緱鍔犲墠缂� -->
+ <link rel="stylesheet" href="https://at.alicdn.com/t/font_567566_pwc3oottzol.css">
+ <script src="//at.alicdn.com/t/font_2621503_zcbiqy2g1i.js"></script>
+
<title>PLTWEB骞冲彴</title>
<style>
html,
@@ -114,6 +120,29 @@
<!--<script charset="utf-8" src="<%= BASE_URL %>cdn/avue/2.12.4/avue.min.js"></script>-->
<script charset="utf-8" src="<%= BASE_URL %>cdn/avue/2.13.1/avue.min.js"></script>
<script charset="utf-8" src="<%= BASE_URL %>cdn/nutflow/wf-design-base/index.umd.min.js"></script>
+
+<script>
+ //灏嗗紩鍏ョ殑鍥炬爣搴撴坊鍔犲埌椤圭洰鍥炬爣搴撲腑
+ let fontIconList=[{
+ label: '闃块噷鍥炬爣-Symbol鍥炬爣',
+ list: [ {
+ label: '鏈烘瀯',
+ value: '#icon-jigou'
+ },
+ {
+ label: '鐭俊绠＄悊',
+ value: '#icon-duanxinguanli'
+ },
+ {
+ label: '鍙戠エ绠＄悊绯荤粺',
+ value: '#icon-fapiaoguanlixitong'
+ },
+ {
+ label: '瑙掕壊',
+ value: '#icon-jiaose'
+ }]
+ }];
+</script>
</body>
</html>
diff --git a/Source/plt-web/plt-web-ui/src/App.vue b/Source/plt-web/plt-web-ui/src/App.vue
index 4678407..69d8872 100644
--- a/Source/plt-web/plt-web-ui/src/App.vue
+++ b/Source/plt-web/plt-web-ui/src/App.vue
@@ -4,7 +4,6 @@
</div>
</template>
-
<script>
export default {
name: "app",
@@ -180,4 +179,7 @@
.el-descriptions__header{
margin-bottom: 10px;
}
+
+.font14{font-size: 14px;width: 12px;height: 12px;display: inline-block;}
+.font16{font-size: 16px;width: 14px;height: 14px;display: inline-block;}
</style>
diff --git a/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-table.vue b/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-table.vue
index 8cc40c2..662bea2 100644
--- a/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-table.vue
+++ b/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-table.vue
@@ -59,7 +59,12 @@
</el-tooltip>
</template>
<template #icon="{ row }">
- <i :class="'iconfont '+row.icon"> </i>
+ <span class="avue-icon avue-icon--small">
+ <svg v-if="row.icon && row.icon.indexOf('#')==-1" aria-hidden="true">
+ <use :xlink:href="row.icon"></use>
+ </svg>
+ <i v-else :class="row.icon"></i>
+ </span>
</template>
</avue-crud>
</div>
diff --git a/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-tree.vue b/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-tree.vue
index 629106e..069d2d4 100644
--- a/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-tree.vue
+++ b/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-tree.vue
@@ -241,13 +241,18 @@
}
const parentBtmName = (node.level === 0) ? '' : node.data.attributes.btmname;
const params = this.params;
+ let url='';
if (node.level === 0) {
params.queryRoot = true;
+ if(this.paramVOS.querytemplate){
+ //璇存槑鏄�氳繃鎸夐挳鐐瑰嚮鎵撳紑鐨勶紝Action鍙傛暟涓厤缃湁this.paramVOS.querytemplate
+ url="/api/uiDataController/getDataByTemp";
+ }
} else {
delete params.queryRoot;
}
- getTree(parentOid, parentBtmName, params).then(res => {
- resolve(res.data.treeData)
+ getTree(parentOid, parentBtmName, params,url).then(res => {
+ resolve(res.data.treeData )
this.$nextTick(()=>{
if (this.isRefresh) {
this.$refs.tree.setCurrentKey(this.currentClickNode.data.oid);
diff --git a/Source/plt-web/plt-web-ui/src/config/iconList.js b/Source/plt-web/plt-web-ui/src/config/iconList.js
index 1aa4194..366df8e 100644
--- a/Source/plt-web/plt-web-ui/src/config/iconList.js
+++ b/Source/plt-web/plt-web-ui/src/config/iconList.js
@@ -149,5 +149,6 @@
"iconfont icon-iframe",
"iconfont icon-huanyingye",
]
- }
+ },
+ ...fontIconList
]
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 fe3446f..92d564f 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
@@ -35,8 +35,8 @@
</div>
<div style="display: flex;justify-content:left;margin-top: 15px;">
<div class="descBox" style="width: 40%">
- <el-descriptions :column="1" border class="margin-top" size="medium" title="灞炴�т俊鎭�">
- <el-descriptions-item :contentStyle="descriptionOption.contentStyle"
+ <el-descriptions :column="2" border class="margin-top" size="medium" title="灞炴�т俊鎭�">
+ <el-descriptions-item :span="12" :contentStyle="descriptionOption.contentStyle"
:labelStyle="descriptionOption.labelStyle">
<template slot="label">
鍚嶇О
@@ -50,7 +50,19 @@
</template>
<el-tag v-if="nodeRow.name">{{ nodeRow.name }}</el-tag>
</el-descriptions-item>
- <el-descriptions-item :contentStyle="descriptionOption.contentStyle"
+ <el-descriptions-item :contentStyle="descriptionOption.contentStyle+';min-width: 100px;'"
+ :labelStyle="descriptionOption.labelStyle">
+ <template slot="label">
+ 鍥炬爣
+ </template>
+ <span class="avue-icon avue-icon--small">
+ <svg v-if="nodeRow.icon && nodeRow.icon.indexOf('#')==-1" aria-hidden="true">
+ <use :xlink:href="nodeRow.icon"></use>
+ </svg>
+ <i v-else :class="nodeRow.icon"></i>
+ </span>
+ </el-descriptions-item>
+ <el-descriptions-item :span="12" :contentStyle="descriptionOption.contentStyle"
:labelStyle="descriptionOption.labelStyle">
<template slot="label">
瀹炵幇绫�
@@ -60,7 +72,7 @@
<el-tag style="max-width: 100%;overflow: hidden;display: block">{{ nodeRow.implClass }}</el-tag>
</el-tooltip>
</el-descriptions-item>
- <el-descriptions-item :contentStyle="descriptionOption.contentStyle"
+ <el-descriptions-item :span="12" :contentStyle="descriptionOption.contentStyle"
:labelStyle="descriptionOption.labelStyle">
<template slot="label">
鎻忚堪
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/statusPool/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/statusPool/index.vue
index 88008d6..8faee80 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/statusPool/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/statusPool/index.vue
@@ -31,6 +31,15 @@
<el-button icon="el-icon-delete" plain size="small" type="text" @click="delRowClickHandler(row)">鍒犻櫎
</el-button>
</template>
+
+ <template #icon="{ row }">
+ <span class="avue-icon avue-icon--small">
+ <svg v-if="row.icon && row.icon.indexOf('#')==-1" aria-hidden="true">
+ <use :xlink:href="row.icon"></use>
+ </svg>
+ <i v-else :class="row.icon"></i>
+ </span>
+ </template>
</avue-crud>
<!-- 鏂板 淇敼 -->
@@ -53,6 +62,12 @@
<el-col :span="24">
<el-form-item label="鏍囩锛�" prop="name">
<el-input v-model="form.name"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="24">
+ <el-form-item label="鍥炬爣锛�" prop="icon">
+ <avue-input-icon v-model="form.icon" :icon-list="iconList" placeholder="璇烽�夋嫨鍥炬爣">
+ </avue-input-icon>
</el-form-item>
</el-col>
<el-col :span="24">
@@ -99,11 +114,13 @@
import {gridStatus, addSave, editSave, deleteStatus, exportStatus, listUsed} from "@/api/modeling/statusPool/api";
import func from "@/util/func";
import basicOption from "@/util/basic-option";
+import iconList from "@/config/iconList";
export default {
name: "index",
data() {
return {
+ iconList: iconList,
loading: false,
data: [],
option: {
@@ -119,6 +136,10 @@
sortable: true,
},
{
+ label: '鍥炬爣',
+ prop: 'icon'
+ },
+ {
label: '鏍囩',
prop: 'name',
sortable: true,
--
Gitblit v1.9.3