From 3667807a7b7418efc090ee3fa6a6b734bc3080bf Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Wed, 13 Sep 2023 20:36:29 +0800
Subject: [PATCH] Merge branch 'develop' of http://s16s652780.51mypc.cn:49896/r/yskj/iot_drone_web into develop
---
src/App.vue | 26 ++++++++------------------
1 files changed, 8 insertions(+), 18 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index 453e2a5..2f4059e 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,26 +1,16 @@
<template>
<div class="demo-app">
- <router-view />
- <!-- <div class="map-wrapper">
- <GMap/>
- </div> -->
+<!-- <a-local-provider :locale="zhCN">-->
+ <router-view />
+<!-- </a-local-provider>-->
</div>
</template>
-<script lang="ts">
-import { computed, defineComponent, ref } from 'vue'
-import { useMyStore } from './store'
-import GMap from '/@/components/GMap.vue'
-
-export default defineComponent({
- name: 'App',
- components: { GMap },
-
- setup () {
- const store = useMyStore()
- return {}
- }
-})
+<script setup lang="ts">
+import zhCN from 'ant-design-vue/es/locale/zh_CN'
+import moment from 'moment'
+import 'moment/dist/locale/zh-cn'
+moment.locale('zh-cn')
</script>
<style lang="scss" scoped>
.demo-app {
--
Gitblit v1.9.3