diff --git a/package-lock.json b/package-lock.json
index 70cc0e3..9c29420 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1174,11 +1174,6 @@
     },
     "@element-plus/icons-vue": {
       "version": "2.3.2",
-<<<<<<< HEAD
-      "resolved": "https://registry.npmjs.org/@element-plus/icons-vue/-/icons-vue-2.3.2.tgz",
-      "integrity": "sha512-OzIuTaIfC8QXEPmJvB4Y4kw34rSXdCJzxcD1kFStBvr8bK6X1zQAYDo0CNMjojnfTqRQCJ0I7prlErcoRiET2A==",
-      "requires": {}
-=======
       "resolved": "https://registry.npmmirror.com/@element-plus/icons-vue/-/icons-vue-2.3.2.tgz",
       "integrity": "sha512-OzIuTaIfC8QXEPmJvB4Y4kw34rSXdCJzxcD1kFStBvr8bK6X1zQAYDo0CNMjojnfTqRQCJ0I7prlErcoRiET2A=="
     },
@@ -1203,29 +1198,6 @@
       "version": "0.2.10",
       "resolved": "https://registry.npmmirror.com/@floating-ui/utils/-/utils-0.2.10.tgz",
       "integrity": "sha512-aGTxbpbg8/b5JfU1HXSrbH3wXZuLPJcNEcZQFMxLs3oSzgtVu6nFPkbbGGUvBcUjKV2YyB9Wxxabo+HEH9tcRQ=="
->>>>>>> 83b69c40326e16a175d224acfe21525105ff1b3a
-    },
-    "@floating-ui/core": {
-      "version": "1.7.3",
-      "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.7.3.tgz",
-      "integrity": "sha512-sGnvb5dmrJaKEZ+LDIpguvdX3bDlEllmv4/ClQ9awcmCZrlx5jQyyMWFM5kBI+EyNOCDDiKk8il0zeuX3Zlg/w==",
-      "requires": {
-        "@floating-ui/utils": "^0.2.10"
-      }
-    },
-    "@floating-ui/dom": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.7.4.tgz",
-      "integrity": "sha512-OOchDgh4F2CchOX94cRVqhvy7b3AFb+/rQXyswmzmGakRfkMgoWVjfnLWkRirfLEfuD4ysVW16eXzwt3jHIzKA==",
-      "requires": {
-        "@floating-ui/core": "^1.7.3",
-        "@floating-ui/utils": "^0.2.10"
-      }
-    },
-    "@floating-ui/utils": {
-      "version": "0.2.10",
-      "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.10.tgz",
-      "integrity": "sha512-aGTxbpbg8/b5JfU1HXSrbH3wXZuLPJcNEcZQFMxLs3oSzgtVu6nFPkbbGGUvBcUjKV2YyB9Wxxabo+HEH9tcRQ=="
     },
     "@fullcalendar/common": {
       "version": "5.11.2",
@@ -1487,11 +1459,7 @@
     },
     "@popperjs/core": {
       "version": "npm:@sxzz/popperjs-es@2.11.7",
-<<<<<<< HEAD
-      "resolved": "https://registry.npmjs.org/@sxzz/popperjs-es/-/popperjs-es-2.11.7.tgz",
-=======
       "resolved": "https://registry.npmmirror.com/@sxzz/popperjs-es/-/popperjs-es-2.11.7.tgz",
->>>>>>> 83b69c40326e16a175d224acfe21525105ff1b3a
       "integrity": "sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ=="
     },
     "@samverschueren/stream-to-observable": {
@@ -1674,20 +1642,12 @@
     },
     "@types/lodash": {
       "version": "4.17.20",
-<<<<<<< HEAD
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.20.tgz",
-=======
       "resolved": "https://registry.npmmirror.com/@types/lodash/-/lodash-4.17.20.tgz",
->>>>>>> 83b69c40326e16a175d224acfe21525105ff1b3a
       "integrity": "sha512-H3MHACvFUEiujabxhaI/ImO6gUrd8oOurg7LQtS7mbwIXA/cUqWrvBsaeJ23aZEPk1TAYkurjfMbSELfoCXlGA=="
     },
     "@types/lodash-es": {
       "version": "4.17.12",
-<<<<<<< HEAD
-      "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.12.tgz",
-=======
       "resolved": "https://registry.npmmirror.com/@types/lodash-es/-/lodash-es-4.17.12.tgz",
->>>>>>> 83b69c40326e16a175d224acfe21525105ff1b3a
       "integrity": "sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ==",
       "requires": {
         "@types/lodash": "*"
@@ -1779,11 +1739,7 @@
     },
     "@types/web-bluetooth": {
       "version": "0.0.16",
-<<<<<<< HEAD
-      "resolved": "https://registry.npmjs.org/@types/web-bluetooth/-/web-bluetooth-0.0.16.tgz",
-=======
       "resolved": "https://registry.npmmirror.com/@types/web-bluetooth/-/web-bluetooth-0.0.16.tgz",
->>>>>>> 83b69c40326e16a175d224acfe21525105ff1b3a
       "integrity": "sha512-oh8q2Zc32S6gd/j50GowEjKLoOVOwHP/bWVjKJInBwQqdOYMdPrf1oVlelTlyfFK3CKxL1uahMDAr+vy8T7yMQ=="
     },
     "@types/webpack": {
@@ -2490,11 +2446,7 @@
     },
     "@vueuse/core": {
       "version": "9.13.0",
-<<<<<<< HEAD
-      "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-9.13.0.tgz",
-=======
       "resolved": "https://registry.npmmirror.com/@vueuse/core/-/core-9.13.0.tgz",
->>>>>>> 83b69c40326e16a175d224acfe21525105ff1b3a
       "integrity": "sha512-pujnclbeHWxxPRqXWmdkKV5OX4Wk4YeK7wusHqRwU0Q7EFusHoqNA/aPhB6KCh9hEqJkLAJo7bb0Lh9b+OIVzw==",
       "requires": {
         "@types/web-bluetooth": "^0.0.16",
@@ -2506,27 +2458,18 @@
         "vue-demi": {
           "version": "0.14.10",
           "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.10.tgz",
-          "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
-          "requires": {}
+          "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg=="
         }
       }
     },
     "@vueuse/metadata": {
       "version": "9.13.0",
-<<<<<<< HEAD
-      "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-9.13.0.tgz",
-=======
       "resolved": "https://registry.npmmirror.com/@vueuse/metadata/-/metadata-9.13.0.tgz",
->>>>>>> 83b69c40326e16a175d224acfe21525105ff1b3a
       "integrity": "sha512-gdU7TKNAUVlXXLbaF+ZCfte8BjRJQWPCa2J55+7/h+yDtzw3vOoGQDRXzI6pyKyo6bXFT5/QoPE4hAknExjRLQ=="
     },
     "@vueuse/shared": {
       "version": "9.13.0",
-<<<<<<< HEAD
-      "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-9.13.0.tgz",
-=======
       "resolved": "https://registry.npmmirror.com/@vueuse/shared/-/shared-9.13.0.tgz",
->>>>>>> 83b69c40326e16a175d224acfe21525105ff1b3a
       "integrity": "sha512-UrnhU+Cnufu4S6JLCPZnkWh0WwZGUp72ktOF2DFptMlOs3TOdVv8xJN53zhHGARmVOsz5KqOls09+J1NR6sBKw==",
       "requires": {
         "vue-demi": "*"
@@ -2535,8 +2478,7 @@
         "vue-demi": {
           "version": "0.14.10",
           "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.10.tgz",
-          "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
-          "requires": {}
+          "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg=="
         }
       }
     },
@@ -5162,11 +5104,7 @@
     },
     "dayjs": {
       "version": "1.11.18",
-<<<<<<< HEAD
-      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.18.tgz",
-=======
       "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.18.tgz",
->>>>>>> 83b69c40326e16a175d224acfe21525105ff1b3a
       "integrity": "sha512-zFBQ7WFRvVRhKcWoUh+ZA1g2HVgUbsZm9sbddh8EC5iv93sui8DVVz1Npvz+r6meo9VKfa8NyLWBsQK1VvIKPA=="
     },
     "debug": {
@@ -5726,11 +5664,7 @@
     },
     "element-plus": {
       "version": "2.11.3",
-<<<<<<< HEAD
-      "resolved": "https://registry.npmjs.org/element-plus/-/element-plus-2.11.3.tgz",
-=======
       "resolved": "https://registry.npmmirror.com/element-plus/-/element-plus-2.11.3.tgz",
->>>>>>> 83b69c40326e16a175d224acfe21525105ff1b3a
       "integrity": "sha512-769xsjLR4B9Vf9cl5PDXnwTEdmFJvMgAkYtthdJKPhjVjU3hdAwTJ+gXKiO+PUyo2KWFwOYKZd4Ywh6PHfkbJg==",
       "requires": {
         "@ctrl/tinycolor": "^3.4.1",
@@ -14844,14 +14778,6 @@
       "integrity": "sha512-ctG5mynJIyGLFBhS2JpzXmBWT3JRXwzMm5AoANUmBlbZHTruct1xQF2OKM/mfJv6tSfqCcEfgH8rGCAY5ca83Q==",
       "dev": true
     },
-<<<<<<< HEAD
-=======
-    "vue-demi": {
-      "version": "0.14.10",
-      "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.14.10.tgz",
-      "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg=="
-    },
->>>>>>> 83b69c40326e16a175d224acfe21525105ff1b3a
     "vue-eslint-parser": {
       "version": "7.11.0",
       "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.11.0.tgz",
diff --git a/vue.config.js b/vue.config.js
index cd8911a..affd2c0 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -9,7 +9,7 @@ const serverHost = "http://192.168.1.32:8066";//波哥
 // const serverHost = "http://47.108.232.77:9537";//波哥
 // const serverHost = "http://127.0.0.1:8006"
 module.exports = {
-  publicPath: "./",
+  publicPath: "/bagl/",
   outputDir: "ab",
   assetsDir: "static",
   lintOnSave: false, //process.env.NODE_ENV === 'development',