From b77c70bb4fd39f3a08d2a3bc5e16155652452990 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 15 十一月 2024 16:28:08 +0800
Subject: [PATCH] 整合代码
---
Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue | 1 +
Source/plt-web/plt-web-ui/src/views/custom-ui/product.vue | 22 ++++++++++++++++------
Source/plt-web/plt-web-ui/src/views/system/password/option.js | 4 ++--
3 files changed, 19 insertions(+), 8 deletions(-)
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 5107974..a6cd05c 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
@@ -1,6 +1,8 @@
<template>
- <avue-tree ref="tree" v-loading="treeLoading" :data="treeData" :option="treeOption" @node-click="nodeClick">
- </avue-tree>
+ <div style="height: 720px">
+ <avue-tree ref="tree" v-loading="treeLoading" :data="treeData" :option="treeOption" @node-click="nodeClick">
+ </avue-tree>
+ </div>
</template>
<script>
@@ -58,11 +60,19 @@
}
},
created() {
- // console.log(this.sourceData);
- console.log(this.dataStore);
- // console.log(this.paramVOS);
+ console.log('create');
},
- methods: {}
+ methods: {
+ nodeClick(row){
+ console.log(row);
+ this.$emit("setDataStore", {
+ area: 'westAreaInDialog',
+ type: 'tree',
+ btmType:'workcontext',
+ dataStore:row
+ });
+ }
+ }
}
</script>
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue
index e3152b4..87fbb81 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue
@@ -444,6 +444,7 @@
// list.forEach(item => {
// this.form[item] = "";
// })
+ this.form.searchTarger = '1'
const searchTarger = this.option.column.find(item => item.prop === 'searchTarger'); // 鑾峰彇鎼滅储绫诲瀷閰嶇疆椤�
searchTarger.display = true; // 鍒囨崲榛樿灞曠ず鎼滅储绫诲瀷
// 妯℃澘绫诲瀷涓鸿〃鏍�
diff --git a/Source/plt-web/plt-web-ui/src/views/system/password/option.js b/Source/plt-web/plt-web-ui/src/views/system/password/option.js
index be04f8c..5af477d 100644
--- a/Source/plt-web/plt-web-ui/src/views/system/password/option.js
+++ b/Source/plt-web/plt-web-ui/src/views/system/password/option.js
@@ -240,10 +240,10 @@
labelWidth: "30%",
dicData: [{
label: '鍚�',
- value: 0
+ value: false
}, {
label: '鏄�',
- value: 1
+ value: true
}]
},
]
--
Gitblit v1.9.3