提交merge1.3

openhis-ui-vue3/package.json

@@ -21,11 +21,18 @@
   "dependencies": {
     "@element-plus/icons-vue": "^2.3.2",
     "@vueup/vue-quill": "1.2.0",
+<<<<<<< HEAD
     "@vueuse/core": "^11.0.0",
     "area-data": "^5.0.6",
     "axios": "^1.7.0",
     "chart.js": "^4.5.1",
+=======
+    "@vueuse/core": "10.6.1",
+    "axios": "0.27.2",
+    "china-division": "^2.7.0",
+>>>>>>> v1.3
     "d3": "^7.9.0",
+    "dayjs": "^1.11.19",
     "decimal.js": "^10.5.0",
     "echarts": "^5.4.3",
     "element-china-area-data": "^6.1.0",
@@ -36,6 +43,7 @@
     "js-cookie": "^3.0.5",
     "jsencrypt": "^3.3.2",
     "lodash": "^4.17.21",
+    "lodash-es": "^4.17.21",
     "moment": "^2.30.1",
     "next": "^16.1.0",
     "nprogress": "^0.2.0",
@@ -53,6 +61,7 @@
     "vue-router": "^4.3.0"
   },
   "devDependencies": {
+<<<<<<< HEAD
     "@vitejs/plugin-vue": "^5.0.0",
     "@vue/compiler-sfc": "^3.5.25",
     "sass": "^1.97.1",
@@ -62,5 +71,18 @@
     "vite": "^7.3.0",
     "vite-plugin-compression": "^0.5.1",
     "vite-plugin-svg-icons": "^2.0.1"
+=======
+    "@types/node": "^25.0.1",
+    "@vitejs/plugin-vue": "4.5.0",
+    "@vue/compiler-sfc": "3.3.9",
+    "sass": "1.69.5",
+    "typescript": "^5.9.3",
+    "unplugin-auto-import": "0.17.1",
+    "unplugin-vue-setup-extend-plus": "1.0.0",
+    "vite": "5.0.4",
+    "vite-plugin-compression": "0.5.1",
+    "vite-plugin-svg-icons": "2.0.1",
+    "vue-tsc": "^3.1.8"
+>>>>>>> v1.3
   }
 }