From 36c733acab2e37ec9cddc8cc74233e390489f789 Mon Sep 17 00:00:00 2001
From: bai <1643359946@qq.com>
Date: Thu, 23 May 2024 00:44:58 +0800
Subject: [PATCH] =?UTF-8?q?2024=E5=B9=B45=E6=9C=8823=E6=97=A5=20=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
builddev.bat | 1 +
buildev.bat | 1 -
package.json | 1 +
src/api/common/api.ts | 2 +-
src/views/site/utils/index.ts | 28 ++++++++
src/views/zy/jiaoXueDanYuanNeiRong/index2.vue | 65 ++++++++++++-------
.../zy/jiaoXueDanYuanNeiRong/stuIndex.vue | 18 +++--
7 files changed, 83 insertions(+), 33 deletions(-)
create mode 100644 builddev.bat
delete mode 100644 buildev.bat
diff --git a/builddev.bat b/builddev.bat
new file mode 100644
index 0000000..914e378
--- /dev/null
+++ b/builddev.bat
@@ -0,0 +1 @@
+yarn build:dev
\ No newline at end of file
diff --git a/buildev.bat b/buildev.bat
deleted file mode 100644
index 8af2b17..0000000
--- a/buildev.bat
+++ /dev/null
@@ -1 +0,0 @@
-yarn build:test
\ No newline at end of file
diff --git a/package.json b/package.json
index 54c52ed..fed1753 100644
--- a/package.json
+++ b/package.json
@@ -13,6 +13,7 @@
"clean:cache": "rimraf node_modules/.cache/ && rimraf node_modules/.vite",
"clean:lib": "rimraf node_modules",
"build": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=8192 vite build && esno ./build/script/postBuild.ts",
+ "build:dev": "cross-env NODE_OPTIONS=--max-old-space-size=8192 vite build --mode development && esno ./build/script/postBuild.ts",
"build:test": "cross-env NODE_OPTIONS=--max-old-space-size=8192 vite build --mode test && esno ./build/script/postBuild.ts",
"build:no-cache": "pnpm clean:cache && npm run build",
"report": "cross-env REPORT=true npm run build",
diff --git a/src/api/common/api.ts b/src/api/common/api.ts
index 47d5cfb..5edd648 100644
--- a/src/api/common/api.ts
+++ b/src/api/common/api.ts
@@ -2,7 +2,7 @@ import { defHttp } from '/@/utils/http/axios';
import { message } from 'ant-design-vue';
import { useGlobSetting } from '/@/hooks/setting';
const globSetting = useGlobSetting();
-const baseUploadUrl = globSetting.uploadUrl;
+export const baseUploadUrl = globSetting.uploadUrl;
enum Api {
positionList = '/sys/position/list',
userList = '/sys/user/list',
diff --git a/src/views/site/utils/index.ts b/src/views/site/utils/index.ts
index 248f04c..a7573b5 100644
--- a/src/views/site/utils/index.ts
+++ b/src/views/site/utils/index.ts
@@ -57,6 +57,34 @@ export const getMd5Str = ( str:string ) :string => {
return md5(str);
}
+
+function calculateFileMd5(file) {
+ return new Promise((resolve, reject) => {
+ const reader = new FileReader();
+
+ // 当文件被成功读取时调用onload事件
+ reader.onload = function (event) {
+ const arrayBufferView = event.target.result;
+
+ // 将ArrayBuffer转换为WordArray对象
+ const wordArray = CryptoJS.lib.WordArray.create(arrayBufferView);
+
+ // 计算MD5哈希值
+ const md5Hash = CryptoJS.MD5(wordArray).toString();
+
+ resolve(md5Hash);
+ };
+
+ // 当发生错误时调用onerror事件
+ reader.onerror = function () {
+ reject('Failed to read file');
+ };
+
+ // 开始读取文件内容
+ reader.readAsArrayBuffer(file);
+ });
+}
+
export const get16BitStr = ( str:string ) :string => {
let val="";
for(let i = 0; i < str.length; i++){
diff --git a/src/views/zy/jiaoXueDanYuanNeiRong/index2.vue b/src/views/zy/jiaoXueDanYuanNeiRong/index2.vue
index f027144..0752297 100644
--- a/src/views/zy/jiaoXueDanYuanNeiRong/index2.vue
+++ b/src/views/zy/jiaoXueDanYuanNeiRong/index2.vue
@@ -13,25 +13,26 @@