From 09fff7d4449fe9fe9e8cd1ffca560ff57e22ed5a Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 06 六月 2023 17:52:34 +0800
Subject: [PATCH] 解决代码冲突
---
Source/UBCS-WEB/src/components/refer/vciWebRefer.vue | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/refer/vciWebRefer.vue b/Source/UBCS-WEB/src/components/refer/vciWebRefer.vue
index 93bfa72..9d6f311 100644
--- a/Source/UBCS-WEB/src/components/refer/vciWebRefer.vue
+++ b/Source/UBCS-WEB/src/components/refer/vciWebRefer.vue
@@ -1,18 +1,20 @@
<template>
- <vciWebReferTree v-if="refertype=='tree'" :defaultValue="defaultValue" :options="referConfig"></vciWebReferTree>
+ <vciWebReferTree v-if="refertype=='tree'" :value="value" :options="options"></vciWebReferTree>
+ <vciWebReferTable v-else-if="refertype=='table'" :value="value" :options="options"></vciWebReferTable>
+ <vciWebReferDefalut v-else :value="value" :options="options"></vciWebReferDefalut>
</template>
<script>
import vciWebReferTree from "./vciWebReferTree.vue";
+import vciWebReferTable from "./vciWebReferTable.vue";
+import vciWebReferDefalut from "./vciWebReferTable.vue";
export default {
name: "vciWebRefer",
- props:["options"],
- components: { vciWebReferTree},
+ props:["options","value"],
+ components: { vciWebReferTree,vciWebReferTable,vciWebReferDefalut},
data() {
return {
- referConfig:this.options.referConfig,
- refertype:this.options.referConfig.type,
- defaultValue:this.options.defaultValue
+ refertype:this.options.type
};
},
created() {
--
Gitblit v1.10.0