From dc3af0cbb4a6d105bdff497b510cc0a87b3e8d0a Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期五, 28 二月 2025 17:53:44 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-before into dev

---
 src/main.js |   23 +++++++++++++++++++++--
 1 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/main.js b/src/main.js
index 2e9f017..0736a8c 100644
--- a/src/main.js
+++ b/src/main.js
@@ -48,6 +48,9 @@
 // 瀛楀吀鏁版嵁缁勪欢
 import DictData from "@/components/DictData";
 import { checkPermi } from "@/utils/permission"; // 鏉冮檺鍒ゆ柇鍑芥暟
+import { getToken } from "@/utils/auth";
+// 鏃堕棿杞崲
+import Moment from "moment";
 
 // 鍏ㄥ眬鏂规硶鎸傝浇
 Vue.prototype.getDicts = getDicts;
@@ -63,8 +66,24 @@
 Vue.prototype.HaveJson = (val) => {
   return JSON.parse(JSON.stringify(val));
 };
-Vue.prototype.javaApi = process.env.VUE_APP_BASE_API;
+Vue.prototype.javaApi = process.env.VUE_APP_BASE_API
+  ? process.env.VUE_APP_BASE_API
+  : "http://192.168.0.170:8002";
 Vue.prototype.checkPermi = checkPermi;
+Vue.prototype.uploadHeader = {
+  Authorization: "Bearer " + getToken(),
+};
+// 瑙e喅el-radio-group鍗曢�夋鑷韩鐨刡ug
+Vue.directive("removeAriaHidden", {
+  bind(el, binding) {
+    let ariaEls = el.querySelectorAll(".el-radio__original");
+    ariaEls.forEach((item) => {
+      item.removeAttribute("aria-hidden");
+    });
+  },
+});
+Vue.use(Moment);
+Vue.prototype.$moment = Moment;
 
 // 鍏ㄥ眬缁勪欢鎸傝浇
 Vue.component("DictTag", DictTag);
@@ -74,7 +93,7 @@
 Vue.component("FileUpload", FileUpload);
 Vue.component("ImageUpload", ImageUpload);
 Vue.component("ImagePreview", ImagePreview);
-Vue.component('barcode', VueBarcode)
+Vue.component("barcode", VueBarcode);
 
 Vue.use(directive);
 Vue.use(plugins);

--
Gitblit v1.9.3