From e5454b769d44a34af423bf87ac8a740bf8c20341 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 29 四月 2025 13:25:29 +0800
Subject: [PATCH] Merge branch 'dev' into dev_tides
---
src/main.js | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main.js b/src/main.js
index 24129ca..5f56508 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,7 +1,5 @@
import Vue from "vue";
-import Cookies from "js-cookie";
-
import Element from "element-ui";
import "./assets/styles/element-variables.scss";
@@ -49,6 +47,8 @@
import DictData from "@/components/DictData";
import { checkPermi } from "@/utils/permission"; // 鏉冮檺鍒ゆ柇鍑芥暟
import { getToken } from "@/utils/auth";
+// 鏃堕棿杞崲
+import Moment from "moment";
// 鍏ㄥ眬鏂规硶鎸傝浇
Vue.prototype.getDicts = getDicts;
@@ -64,9 +64,7 @@
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.170:8002";
+Vue.prototype.javaApi = "http://192.168.21.53:8001/lims";
Vue.prototype.checkPermi = checkPermi;
Vue.prototype.uploadHeader = {
Authorization: "Bearer " + getToken(),
@@ -80,6 +78,8 @@
});
},
});
+Vue.use(Moment);
+Vue.prototype.$moment = Moment;
// 鍏ㄥ眬缁勪欢鎸傝浇
Vue.component("DictTag", DictTag);
@@ -106,7 +106,7 @@
*/
Vue.use(Element, {
- size: Cookies.get("size") || "medium", // set element-ui default size
+ size: localStorage.getItem("size") || "medium", // set element-ui default size
});
Vue.config.productionTip = false;
--
Gitblit v1.9.3