暂存

node_modules/.vite/deps/_metadata.json

@@ -1,140 +1,83 @@
 {
-<<<<<<< HEAD
-  "hash": "0d9d205c",
-  "browserHash": "81d05683",
-=======
   "hash": "18bbf35d",
   "browserHash": "174209d7",
->>>>>>> master
   "optimized": {
     "@ant-design/icons-vue": {
       "src": "../../@ant-design/icons-vue/es/index.js",
       "file": "@ant-design_icons-vue.js",
-<<<<<<< HEAD
-      "fileHash": "8e02ca6b",
-=======
       "fileHash": "5938cea3",
->>>>>>> master
       "needsInterop": false
     },
     "ant-design-vue": {
       "src": "../../ant-design-vue/es/index.js",
       "file": "ant-design-vue.js",
-<<<<<<< HEAD
-      "fileHash": "829568bd",
-=======
       "fileHash": "45f9b0ec",
->>>>>>> master
       "needsInterop": false
     },
     "ant-design-vue/es/locale/zh_CN": {
       "src": "../../ant-design-vue/es/locale/zh_CN.js",
       "file": "ant-design-vue_es_locale_zh_CN.js",
-<<<<<<< HEAD
-      "fileHash": "a361d9d2",
-=======
       "fileHash": "298e1579",
->>>>>>> master
       "needsInterop": false
     },
     "axios": {
       "src": "../../axios/index.js",
       "file": "axios.js",
-<<<<<<< HEAD
-      "fileHash": "7514f3e7",
-=======
       "fileHash": "eb7df329",
->>>>>>> master
       "needsInterop": false
     },
     "dayjs": {
       "src": "../../dayjs/dayjs.min.js",
       "file": "dayjs.js",
-<<<<<<< HEAD
-      "fileHash": "e5d604b4",
-=======
       "fileHash": "e0c0caf7",
->>>>>>> master
       "needsInterop": true
     },
     "dayjs/locale/zh-cn": {
       "src": "../../dayjs/locale/zh-cn.js",
       "file": "dayjs_locale_zh-cn.js",
-<<<<<<< HEAD
-      "fileHash": "0ba0e49e",
-=======
       "fileHash": "f34e927d",
->>>>>>> master
       "needsInterop": true
     },
     "js-md5": {
       "src": "../../js-md5/src/md5.js",
       "file": "js-md5.js",
-<<<<<<< HEAD
-      "fileHash": "5f92d7e8",
-=======
       "fileHash": "9d8e97a5",
->>>>>>> master
       "needsInterop": true
     },
     "less": {
       "src": "../../less/dist/less.js",
       "file": "less.js",
-<<<<<<< HEAD
-      "fileHash": "1b1eb850",
-=======
       "fileHash": "9b1ce05e",
->>>>>>> master
       "needsInterop": true
     },
     "mathjs": {
       "src": "../../mathjs/lib/esm/index.js",
       "file": "mathjs.js",
-<<<<<<< HEAD
-      "fileHash": "a09badc9",
-=======
       "fileHash": "2c610573",
->>>>>>> master
       "needsInterop": false
     },
     "pinia": {
       "src": "../../pinia/dist/pinia.mjs",
       "file": "pinia.js",
-<<<<<<< HEAD
-      "fileHash": "24af44a4",
-=======
       "fileHash": "fce44de8",
->>>>>>> master
       "needsInterop": false
     },
     "pinia-plugin-persist": {
       "src": "../../pinia-plugin-persist/dist/pinia-persist.es.js",
       "file": "pinia-plugin-persist.js",
-<<<<<<< HEAD
-      "fileHash": "029824d5",
-=======
       "fileHash": "02794d5a",
->>>>>>> master
       "needsInterop": false
     },
     "vue": {
       "src": "../../vue/dist/vue.runtime.esm-bundler.js",
       "file": "vue.js",
-<<<<<<< HEAD
-      "fileHash": "7bb21984",
-=======
       "fileHash": "7ad6386c",
->>>>>>> master
       "needsInterop": false
     },
     "vue-router": {
       "src": "../../vue-router/dist/vue-router.mjs",
       "file": "vue-router.js",
-<<<<<<< HEAD
-      "fileHash": "6e6e5f1d",
-=======
       "fileHash": "fe58ddc8",
->>>>>>> master
       "needsInterop": false
     }
   },

src/components/layout/modules/systemMod.vue

@@ -37,8 +37,7 @@ const onSystemClick = (system)=>{
 
 const siteData = async ()=>{
   const res = await Api.requested({
-    classname:'manager.site.site',
-    method:'querySite',
+    id:20230608103602,
     content:{}
   })
   siteInfo.value = res.data
@@ -96,7 +95,7 @@ watch (()=>system.value,() => {
   font-size: 14px;
   text-align: center;
   line-height: 30px;
-  
+
 }
 .collapsed{
   display: block;
@@ -105,4 +104,4 @@ watch (()=>system.value,() => {
 .onSystem .uncollapsed{
  color:#333;
 }
-</style>
+</style>

src/components/upload/index.vue

@@ -63,7 +63,7 @@ const beforeUpload = file=>{
   let type = file.name.substr(index + 1);
 
   getUploadUrl(file.name, type,file)
-  
+
 }
 
 const getUploadUrl = async (filename,type,file)=>{
@@ -136,8 +136,7 @@ const appfolderid = ref('')
 const salematerialfolderid = ref('')
 const querySite_Parameter = async ()=> {
   const res = await Api.requested({
-    "classname": "manager.site.site",
-    "method": "querySite_Parameter",
+    "id":20230608103802,
     "content": {}
   })
   appfolderid.value = res.data.appfolderid, // 应用附件文件夹ID
@@ -154,4 +153,4 @@ const onClose = ()=>{
   justify-content: space-between;
   padding: 20px 15px 0 0;
 }
-</style>
+</style>