From bc44c8e3c9d85691ce3fa73ef1300a6fae46e365 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 18 三月 2025 19:07:08 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/center-lims-before-ruoyi into dev
---
src/main.js | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/main.js b/src/main.js
index 7f0fd18..f11e21f 100644
--- a/src/main.js
+++ b/src/main.js
@@ -26,6 +26,7 @@
selectDictLabels,
handleTree,
} from "@/utils/ruoyi";
+import { dictToValue } from "@/utils/index";
// 鍒嗛〉缁勪欢
import Pagination from "@/components/Pagination";
// 鑷畾涔夎〃鏍煎伐鍏风粍浠�
@@ -48,6 +49,8 @@
import { getToken } from "@/utils/auth";
// 鏃堕棿杞崲
import Moment from "moment";
+import basicContainer from './components/basic-container/main'
+
// 鍏ㄥ眬鏂规硶鎸傝浇
Vue.prototype.getDicts = getDicts;
@@ -59,16 +62,18 @@
Vue.prototype.selectDictLabels = selectDictLabels;
Vue.prototype.download = download;
Vue.prototype.handleTree = handleTree;
+Vue.prototype.dictToValue = dictToValue;
Vue.prototype.HaveJson = (val) => {
return JSON.parse(JSON.stringify(val));
};
-Vue.prototype.javaApi = process.env.VUE_APP_BASE_API
- ? process.env.VUE_APP_BASE_API
- : "http://192.168.0.104:8002";
+Vue.prototype.javaApi = process.env.VUE_BASE_URL
+ ? process.env.VUE_BASE_URL
+ : "http://127.0.0.1:8002";
Vue.prototype.checkPermi = checkPermi;
Vue.prototype.uploadHeader = {
Authorization: "Bearer " + getToken(),
};
+
// 瑙ｅ喅el-radio-group鍗曢�夋鑷韩鐨刡ug
Vue.directive("removeAriaHidden", {
bind(el, binding) {
@@ -89,6 +94,8 @@
Vue.component("FileUpload", FileUpload);
Vue.component("ImageUpload", ImageUpload);
Vue.component("ImagePreview", ImagePreview);
+// 娉ㄥ唽鍏ㄥ眬瀹瑰櫒
+Vue.component('basicContainer', basicContainer)
Vue.use(directive);
Vue.use(plugins);
--
Gitblit v1.9.3