diff --git a/.gitignore b/.gitignore index 2b831c5..0f5c909 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ .history/ /node_modules/ -/v2/ +/invest/ *.zip .idea @@ -8,4 +8,5 @@ package-lock.json pnpm-lock.yaml auto-imports.d.ts components.d.ts -vite.config.ts.timestamp-* \ No newline at end of file +vite.config.ts.timestamp-* +invest.zip \ No newline at end of file diff --git a/package.json b/package.json index 8b55756..94c2f5c 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "scripts": { "dev": "vite", "build": "vite build --mode prod", - "build:prod": "vite build --mode prod && WinRAR a -r invest.zip ./v2/", + "build:prod": "vite build --mode prod && WinRAR a -r invest.zip ./invest/", "preview": "vite preview" }, "engines": { @@ -15,22 +15,6 @@ }, "dependencies": { "@element-plus/icons-vue": "^2.3.1", - "@liveqing/liveplayer-v3": "^3.7.35", - "@rollup/rollup-darwin-arm64": "^4.52.4", - "@univerjs/core": "^0.2.5", - "@univerjs/data-validation": "^0.2.5", - "@univerjs/design": "^0.2.5", - "@univerjs/docs": "^0.2.5", - "@univerjs/docs-ui": "^0.2.5", - "@univerjs/engine-formula": "^0.2.5", - "@univerjs/engine-numfmt": "^0.2.5", - "@univerjs/engine-render": "^0.2.5", - "@univerjs/facade": "^0.2.5", - "@univerjs/sheets": "^0.2.5", - "@univerjs/sheets-data-validation": "^0.2.5", - "@univerjs/sheets-formula": "^0.2.5", - "@univerjs/sheets-ui": "^0.2.5", - "@univerjs/ui": "^0.2.5", "@vue-office/docx": "^1.6.0", "@vue-office/excel": "^1.7.11", "@vueup/vue-quill": "^1.2.0", @@ -71,8 +55,5 @@ "unplugin-vue-components": "^0.26.0", "vite": "^5.0.8", "vite-plugin-svg-icons": "^2.0.1" - }, - "resolutions": { - "@rollup/rollup-darwin-arm64": "npm:@rollup/rollup-darwin-x64" } } diff --git a/src/api/report/index.ts b/src/api/report/index.ts index 5b8aef4..215395f 100644 --- a/src/api/report/index.ts +++ b/src/api/report/index.ts @@ -8,7 +8,7 @@ export const saveReportProject=(body)=>{ } //删除 export const removeReportProject = (id)=>{ - return request.delete({ + return request.del({ url:`/reportProject/${id}` }) } diff --git a/src/api/request.ts b/src/api/request.ts index f8861ad..47c9798 100644 --- a/src/api/request.ts +++ b/src/api/request.ts @@ -95,7 +95,11 @@ function ajax(url: string, options: Options) { if( isBlob){ return response.blob(); } - return response.json(); + try { + return response.json(); + } catch (error) { + return response.text(); + } }).then(res => { if(isBlob){ console.log('-----') diff --git a/src/components/home/work/index.vue b/src/components/home/work/index.vue index f9d6fb5..52cd39f 100644 --- a/src/components/home/work/index.vue +++ b/src/components/home/work/index.vue @@ -11,7 +11,7 @@ - +