From 2c2188d3b41b9646ea5ee4202a11d135ce03daa2 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 26 二月 2025 17:49:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/main.js | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/src/main.js b/src/main.js
index 96becea..5809760 100644
--- a/src/main.js
+++ b/src/main.js
@@ -43,9 +43,12 @@
import DictTag from "@/components/DictTag";
// 澶撮儴鏍囩缁勪欢
import VueMeta from "vue-meta";
+// 鏉″舰鐮佺敓鎴愮粍浠�
+import VueBarcode from "vue-barcode";
// 瀛楀吀鏁版嵁缁勪欢
import DictData from "@/components/DictData";
import { checkPermi } from "@/utils/permission"; // 鏉冮檺鍒ゆ柇鍑芥暟
+import { getToken } from "@/utils/auth";
// 鍏ㄥ眬鏂规硶鎸傝浇
Vue.prototype.getDicts = getDicts;
@@ -61,8 +64,22 @@
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.1.36:8002";
Vue.prototype.checkPermi = checkPermi;
+Vue.prototype.uploadHeader = {
+ Authorization: "Bearer " + getToken(),
+};
+// 瑙ｅ喅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.component("DictTag", DictTag);
@@ -72,6 +89,7 @@
Vue.component("FileUpload", FileUpload);
Vue.component("ImageUpload", ImageUpload);
Vue.component("ImagePreview", ImagePreview);
+Vue.component("barcode", VueBarcode);
Vue.use(directive);
Vue.use(plugins);
--
Gitblit v1.9.3