From 992a9184ef1085649688da4a95c0e16789c12be6 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期五, 26 五月 2023 09:57:30 +0800
Subject: [PATCH] 解决冲突
---
Source/UBCS-WEB/src/main.js | 38 ++++++++++++++++++++++++++++++++++++++
1 files changed, 38 insertions(+), 0 deletions(-)
diff --git a/Source/UBCS-WEB/src/main.js b/Source/UBCS-WEB/src/main.js
index 5daa98c..1eec9df 100644
--- a/Source/UBCS-WEB/src/main.js
+++ b/Source/UBCS-WEB/src/main.js
@@ -25,7 +25,26 @@
import crudCommon from '@/mixins/crud';
// 涓氬姟缁勪欢
import tenantPackage from './views/system/tenantpackage';
+import enupackage from "@/views/modeling/enupackage";
+import Versionpackage from "@/views/modeling/Versionpackage";
+import Businpackage from "@/views/modeling/Businpackage";
+import Relationpackage from "@/views/modeling/Relationpackage"
+import Torelationpackage from "@/views/modeling/Torelationpackage"
+import originalRange from "@/views/modeling/originalRange"
+import originalLink from "@/views/modeling/originalLink"
+import classifyTrees from "@/components/Tree/classifyTrees"
+import classifyTreeform from "@/components/Tree/classifyTreeform"
+import TemplatePro from "@/components/Tree/TemplatePro"
+import attrCrud from "@/components/Tree/attrCrud"
+import formulaEditor from "@/components/code-dialog-page/formulaEditor"
+import referConfigCrudDialog from "@/components/code-dialog-page/referConfigCrudDialog"
+import referConfigFormDialog from "@/components/code-dialog-page/referConfigFormDialog"
+import businessAdd from "@/views/modeling/BusinessAdd"
+import TableCrud from "@/components/Crud/Crud"
+// 灏嗗伐鍏峰嚱鏁版坊鍔犲埌鍏ㄥ眬
+import utilFunc from './util/func'
+Vue.prototype.$utilFunc = utilFunc
// 娉ㄥ唽鍏ㄥ眬crud椹卞姩
window.$crudCommon = crudCommon;
// 鍔犺浇Vue鎷撳睍
@@ -34,6 +53,7 @@
Vue.use(Element, {
i18n: (key, value) => i18n.t(key, value)
});
+
Vue.use(window.AVUE, {
size: 'small',
tableSize: 'small',
@@ -47,6 +67,24 @@
Vue.component('avueUeditor', avueUeditor);
Vue.component('flowDesign', flowDesign);
Vue.component('tenantPackage', tenantPackage);
+Vue.component('enupackage',enupackage)
+Vue.component('Versionpackage',Versionpackage)
+Vue.component('Businpackage',Businpackage)
+Vue.component('Relationpackage',Relationpackage)
+Vue.component('Torelationpackage',Torelationpackage)
+Vue.component('originalRange',originalRange)
+Vue.component('originalLink',originalLink)
+Vue.component('classifyTrees',classifyTrees)
+Vue.component('classifyTreeform',classifyTreeform)
+Vue.component('TemplatePro',TemplatePro)
+Vue.component('formulaEditor',formulaEditor)
+Vue.component('referConfigCrudDialog',referConfigCrudDialog)
+Vue.component('referConfigFormDialog',referConfigFormDialog)
+Vue.component('businessAdd',businessAdd)
+Vue.component('attrCrud',attrCrud)
+Vue.component('TableCrud',TableCrud)
+
+
// 鍔犺浇鐩稿叧url鍦板潃
Object.keys(urls).forEach(key => {
Vue.prototype[key] = urls[key];
--
Gitblit v1.9.3