From 7ef2454c7df85c9a8fd493552398d4ac07c460d4 Mon Sep 17 00:00:00 2001
From: pyt <626651354@qq.com>
Date: 星期一, 23 六月 2025 09:43:56 +0800
Subject: [PATCH] Merge branch 'main' of http://120.76.84.145:10101/gitblit/r/H5/leshan-laboratory

---
 laboratory/src/main.js |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/laboratory/src/main.js b/laboratory/src/main.js
index 2f6ab45..4509762 100644
--- a/laboratory/src/main.js
+++ b/laboratory/src/main.js
@@ -1,8 +1,12 @@
 import Vue from "vue";
 import ElementUI from "element-ui";
 import "element-ui/lib/theme-chalk/index.css";
-import {Calendar} from 'ant-design-vue';
+import {Calendar,ConfigProvider } from 'ant-design-vue';
+import zhCN from 'ant-design-vue/lib/locale-provider/zh_CN';
 import 'ant-design-vue/dist/antd.css';
+// import Antd from 'ant-design-vue';
+// import 'ant-design-vue/dist/antd.css';
+// import zhCN from 'ant-design-vue/lib/locale-provider/zh_CN';
 import '@/assets/font/font.css'
 import App from "./App.vue";
 import router from "./router";
@@ -17,11 +21,18 @@
 import './assets/tailwind.css'
 import './styles/element-variables.less'
 
+import dayjs from "../node_modules/dayjs/dayjs.min.js";
+import "dayjs/locale/zh-cn";
+
+dayjs.locale("zh-cn");
+
 
 
 Vue.config.productionTip = false;
 Vue.use(ElementUI, { size: 'small' })
 Vue.use('Calendar',Calendar)
+Vue.use(ConfigProvider)
+// Vue.use(Antd)
 Vue.component('Table', Table)
 Vue.component('TableCustom', TableCustom)
 Vue.component('Card', Card)
@@ -71,5 +82,9 @@
 new Vue({
   router,
   store,
-  render: (h) => h(App),
+  render: (h) => (
+    <a-config-provider locale={zhCN}>
+      <App />
+    </a-config-provider>
+  ),
 }).$mount("#app");

--
Gitblit v1.7.1