diff --git a/.env.production b/.env.production index d650ec4c3945e09b6aabc5119891e312eedf34d9..221946160fdf87db5b761cf9fcc3e67a76a279c2 100644 --- a/.env.production +++ b/.env.production @@ -1,4 +1,3 @@ NODE_ENV = 'production' -VUE_APP_URL = 'https://zcas.wzswsj.gov.cn:8079/screening-api/' -VUE_APP_URL = '/screening-api/' +VUE_APP_URL = 'https://inno.sh-sict.com/gastric-api/' VUE_APP_IMG = 'https://inno.sh-sict.com/wjy-mobile/' \ No newline at end of file diff --git a/src/assets/css/img/award_bg.png b/src/assets/css/img/award_bg.png deleted file mode 100644 index 977671198c4d0e47df6f4658fe04c1b2db9c3c94..0000000000000000000000000000000000000000 Binary files a/src/assets/css/img/award_bg.png and /dev/null differ diff --git a/src/assets/css/img/boy_girl.png b/src/assets/css/img/boy_girl.png deleted file mode 100644 index fc7ca493d6cf0fc18f190f46d1d94e406adb3229..0000000000000000000000000000000000000000 Binary files a/src/assets/css/img/boy_girl.png and /dev/null differ diff --git a/src/assets/css/img/gift.png b/src/assets/css/img/gift.png deleted file mode 100644 index 92a4538bfd1cebedae31e8dff84de0b3994f20d1..0000000000000000000000000000000000000000 Binary files a/src/assets/css/img/gift.png and /dev/null differ diff --git a/src/assets/css/img/item_7_bg.jpg b/src/assets/css/img/item_7_bg.jpg deleted file mode 100644 index cdc1b626f1785310ccad284c2ca7d5ed15761575..0000000000000000000000000000000000000000 Binary files a/src/assets/css/img/item_7_bg.jpg and /dev/null differ diff --git a/src/assets/css/img/man_1.png b/src/assets/css/img/man_1.png deleted file mode 100644 index be6b3486d3f957028963e92050b9c6dc25251e4b..0000000000000000000000000000000000000000 Binary files a/src/assets/css/img/man_1.png and /dev/null differ diff --git a/src/assets/css/img/man_2.png b/src/assets/css/img/man_2.png deleted file mode 100644 index a79641bb12fda8ae7f1e697c588dac910591acc2..0000000000000000000000000000000000000000 Binary files a/src/assets/css/img/man_2.png and /dev/null differ diff --git a/src/assets/css/img/man_3.png b/src/assets/css/img/man_3.png deleted file mode 100644 index 1fbcd64e8eb34404d413cff44126b893bbf277e3..0000000000000000000000000000000000000000 Binary files a/src/assets/css/img/man_3.png and /dev/null differ diff --git a/src/assets/css/img/man_4.png b/src/assets/css/img/man_4.png deleted file mode 100644 index 8a1406fc074358627002cc75c3470d9aa7652756..0000000000000000000000000000000000000000 Binary files a/src/assets/css/img/man_4.png and /dev/null differ diff --git a/src/assets/css/img/sprite_1.png b/src/assets/css/img/sprite_1.png deleted file mode 100644 index 426d046cccfa2e5cb8286463cb6dc1bb0c19ee3f..0000000000000000000000000000000000000000 Binary files a/src/assets/css/img/sprite_1.png and /dev/null differ diff --git a/src/assets/css/img/sprite_1@2x.png b/src/assets/css/img/sprite_1@2x.png deleted file mode 100644 index 426d046cccfa2e5cb8286463cb6dc1bb0c19ee3f..0000000000000000000000000000000000000000 Binary files a/src/assets/css/img/sprite_1@2x.png and /dev/null differ diff --git a/src/assets/css/img/sprite_2.png b/src/assets/css/img/sprite_2.png deleted file mode 100644 index 77eaf631a510cd41119fe87c8fc1c8a42c43030f..0000000000000000000000000000000000000000 Binary files a/src/assets/css/img/sprite_2.png and /dev/null differ diff --git a/src/assets/css/img/sprite_2@2x.png b/src/assets/css/img/sprite_2@2x.png deleted file mode 100644 index 77eaf631a510cd41119fe87c8fc1c8a42c43030f..0000000000000000000000000000000000000000 Binary files a/src/assets/css/img/sprite_2@2x.png and /dev/null differ diff --git a/src/assets/css/img/sprite_3.png b/src/assets/css/img/sprite_3.png deleted file mode 100644 index 128c0bf3a06c7230469fd050d47028441ee07456..0000000000000000000000000000000000000000 Binary files a/src/assets/css/img/sprite_3.png and /dev/null differ diff --git a/src/assets/css/img/sprite_3@2x.png b/src/assets/css/img/sprite_3@2x.png deleted file mode 100644 index 128c0bf3a06c7230469fd050d47028441ee07456..0000000000000000000000000000000000000000 Binary files a/src/assets/css/img/sprite_3@2x.png and /dev/null differ diff --git a/src/assets/css/img/sprite_4.png b/src/assets/css/img/sprite_4.png deleted file mode 100644 index 780835a779c4080f47d44782b7045d9b7b92b3ac..0000000000000000000000000000000000000000 Binary files a/src/assets/css/img/sprite_4.png and /dev/null differ diff --git a/src/assets/css/img/sprite_4@2x.png b/src/assets/css/img/sprite_4@2x.png deleted file mode 100644 index 780835a779c4080f47d44782b7045d9b7b92b3ac..0000000000000000000000000000000000000000 Binary files a/src/assets/css/img/sprite_4@2x.png and /dev/null differ diff --git a/src/assets/css/img/sprite_5.png b/src/assets/css/img/sprite_5.png deleted file mode 100644 index f5a1b996e0a97065fda46849bb526ffc57b957c4..0000000000000000000000000000000000000000 Binary files a/src/assets/css/img/sprite_5.png and /dev/null differ diff --git a/src/assets/css/img/sprite_5@2x.png b/src/assets/css/img/sprite_5@2x.png deleted file mode 100644 index f5a1b996e0a97065fda46849bb526ffc57b957c4..0000000000000000000000000000000000000000 Binary files a/src/assets/css/img/sprite_5@2x.png and /dev/null differ diff --git a/src/assets/css/img/sprite_6.png b/src/assets/css/img/sprite_6.png deleted file mode 100644 index 871e2f126d9470dcc577da75a0d4c37a29f2c5f6..0000000000000000000000000000000000000000 Binary files a/src/assets/css/img/sprite_6.png and /dev/null differ diff --git a/src/assets/css/img/sprite_6@2x.png b/src/assets/css/img/sprite_6@2x.png deleted file mode 100644 index 871e2f126d9470dcc577da75a0d4c37a29f2c5f6..0000000000000000000000000000000000000000 Binary files a/src/assets/css/img/sprite_6@2x.png and /dev/null differ diff --git a/src/assets/css/img/sprite_7.png b/src/assets/css/img/sprite_7.png deleted file mode 100644 index bafd50f941752f8a9c06ecaf2007dc241311428f..0000000000000000000000000000000000000000 Binary files a/src/assets/css/img/sprite_7.png and /dev/null differ diff --git a/src/assets/css/img/sprite_7@2x.png b/src/assets/css/img/sprite_7@2x.png deleted file mode 100644 index bafd50f941752f8a9c06ecaf2007dc241311428f..0000000000000000000000000000000000000000 Binary files a/src/assets/css/img/sprite_7@2x.png and /dev/null differ diff --git a/src/assets/css/img/sprite_global.png b/src/assets/css/img/sprite_global.png deleted file mode 100644 index f16ef5440e1779a1ae22b9a2d1ba7b6cbb83ee06..0000000000000000000000000000000000000000 Binary files a/src/assets/css/img/sprite_global.png and /dev/null differ diff --git a/src/assets/css/img/sprite_global@2x.png b/src/assets/css/img/sprite_global@2x.png deleted file mode 100644 index f16ef5440e1779a1ae22b9a2d1ba7b6cbb83ee06..0000000000000000000000000000000000000000 Binary files a/src/assets/css/img/sprite_global@2x.png and /dev/null differ diff --git a/src/assets/css/img/tips_1.png b/src/assets/css/img/tips_1.png deleted file mode 100644 index 69bf8af4603c0c72050366ecdababb23281577f2..0000000000000000000000000000000000000000 Binary files a/src/assets/css/img/tips_1.png and /dev/null differ diff --git a/src/assets/css/img/tips_2.png b/src/assets/css/img/tips_2.png deleted file mode 100644 index 70d21b5c8b02024b15a949512199fd48c42c4511..0000000000000000000000000000000000000000 Binary files a/src/assets/css/img/tips_2.png and /dev/null differ diff --git a/src/assets/img/video.mp4 b/src/assets/img/video.mp4 deleted file mode 100644 index 3fbf8a34542a7cb72bcfc532f536d68fbaba7397..0000000000000000000000000000000000000000 Binary files a/src/assets/img/video.mp4 and /dev/null differ diff --git a/src/assets/img/video2.mp4 b/src/assets/img/video2.mp4 deleted file mode 100644 index 49845bcd7850fe46daf86ce1875f54a6148397cc..0000000000000000000000000000000000000000 Binary files a/src/assets/img/video2.mp4 and /dev/null differ diff --git a/src/axios/api/index.js b/src/axios/api/index.js index b542e619d322ad5700dccba712ada0321b2e1cbd..af6211b27a0d7e5ea45b5147b6069d26a2568ba7 100644 --- a/src/axios/api/index.js +++ b/src/axios/api/index.js @@ -27,6 +27,9 @@ export const API = { ); }, fileUpload: (data) => { - return post(`${ewellDefectData}/app/report/video/upload`, data); + return post(`${ewellDefectData}/app/report/video/chunk`, data); + }, + fileMerge: (data) => { + return post(`${ewellDefectData}/app/report/video/merge`, data); } }; diff --git a/src/axios/request/http.js b/src/axios/request/http.js index b53d233e49d8dcf16f034356c65a024bf6ebf787..766d307e6a2f8fffb8df4804731b07b302211945 100644 --- a/src/axios/request/http.js +++ b/src/axios/request/http.js @@ -15,7 +15,7 @@ let CommonAlert = function (msg) { // axios.defaults.timeout = 5000; if (process.env.NODE_ENV == "development") { - axios.defaults.baseURL = "https://inno.sh-sict.com/gastric-api/"; + // axios.defaults.baseURL = "https://inno.sh-sict.com/gastric-api/"; } else { axios.defaults.baseURL = process.env.VUE_APP_URL; } diff --git a/src/pages/peopleList.vue b/src/pages/peopleList.vue index 0447b6448de7ff78b9a8019a79a3d1e45910099f..eb2483fddeb229b5188c8f17b8c52fb83dda19a7 100644 --- a/src/pages/peopleList.vue +++ b/src/pages/peopleList.vue @@ -93,7 +93,7 @@ export default { this.finished = false; this.$API.getPeopleList(data).then(res => { this.loading = false - this.totalCount = res.object.totalCount + this.totalCount = res.object?.totalCount this.peopleList = [...this.peopleList, ...res.object.list] if (this.peopleList.length >= this.totalCount) { this.finished = true @@ -105,10 +105,6 @@ export default { this.getList() }, }, - created () { - this.peopleList = [] - this.getList() - }, activated () { const scrollTops = this.$route.meta.scrollTop; const $content = document.querySelector('.list_content'); @@ -126,6 +122,9 @@ export default { next() }, mounted () { + // console.log('???'); + this.peopleList = [] + this.getList() }, watch: {}, filters: { diff --git a/src/pages/videoList.vue b/src/pages/videoList.vue index a182f29a3aee110e63d221c7f8c3baabf3df0f60..2484c18ad0b2d3d593c260d0f31e2ae8aca69e0b 100644 --- a/src/pages/videoList.vue +++ b/src/pages/videoList.vue @@ -173,20 +173,29 @@ export default { afterRead (file) { this.uploadLoading = true // console.log(file); + let dataId = this.$route.query.id + let randomNum = dataId + '' + Math.round(Math.random() * 10000) uploadByPieces({ - randoms: '', // 随机数，这里作为给后端处理分片的标识 根据项目看情况 是否要加 + randoms: randomNum, // 随机数，这里作为给后端处理分片的标识 根据项目看情况 是否要加 file: file.file, // 视频实体 pieceSize: 10, // 分片大小 - dataId: this.$route.query.id, + dataId: dataId, success: data => { console.log('分片上传视频成功', data) this.uploadLoading = false + // 合并 + this.$API.fileMerge({ + dataId: dataId, + videoName: data.videoName, + id: randomNum + }) this.pageNum = 1 this.videoList = [] this.getVideoList() }, error: e => { console.log('分片上传视频失败', e) + this.uploadLoading = false } }) }, diff --git a/src/utils/upload.js b/src/utils/upload.js index 0541a05008a500acc3e34324be64cbd511d0a90f..0dc20cebe4c8d957cc7c4b224fb9dfbe8f0ca53e 100644 --- a/src/utils/upload.js +++ b/src/utils/upload.js @@ -1,4 +1,4 @@ -import md5 from "js-md5"; //引入MD5加密 +import md5, { arrayBuffer } from "js-md5"; //引入MD5加密 import { API } from "@/axios/api"; // 这里指前端调用接口的api方法 export const uploadByPieces = ({ randoms, @@ -19,15 +19,15 @@ export const uploadByPieces = ({ // 获取md5 const readFileMD5 = () => { // 读取视频文件的md5 - console.log("获取文件的MD5值"); + // console.log("获取文件的MD5值"); let fileRederInstance = new FileReader(); console.log("file", file); fileRederInstance.readAsBinaryString(file); fileRederInstance.addEventListener("load", (e) => { let fileBolb = e.target.result; fileMD5 = md5(fileBolb); - console.log("fileMD5", fileMD5); - console.log("文件未被上传，将分片上传"); + // console.log("fileMD5", fileMD5); + // console.log("文件未被上传，将分片上传"); readChunkMD5(); }); }; @@ -40,12 +40,13 @@ export const uploadByPieces = ({ // 针对每个文件进行chunk处理 const readChunkMD5 = () => { // 针对单个文件进行chunk上传 + let arr = []; for (var i = 0; i < chunkCount; i++) { const { chunk } = getChunkInfo(file, i, chunkSize); console.log("总片数" + chunkCount); console.log("分片后的数据---测试：" + i); console.log(chunk); - uploadChunk({ chunk, currentChunk: i, chunkCount }); + uploadChunk({ chunk, currentChunk: i, chunkCount, arr }); } }; const uploadChunk = (chunkInfo) => { @@ -69,23 +70,30 @@ export const uploadByPieces = ({ // fetchForm.append('md5', fileMD5) API.fileUpload(fetchForm, config) .then((res) => { - console.log("分片上传返回信息：" + res); + // console.log("分片上传返回信息：" + JSON.stringify(res)); + // console.log(chunkInfo); + chunkInfo.arr.push(chunkInfo.currentChunk); + // console.log(chunkInfo.arr); if (res.code == 1) { // 结合不同项目 将成功的信息返回出去，这里可变的是指 res.data[0] - success(); + if (chunkInfo.arr.length == chunkInfo.chunkCount) { + success({ + videoName: file.name + }); + } // 下面如果在项目中没有用到可以不用打开注释 - // if (chunkInfo.currentChunk < chunkInfo.chunkCount - 1) { - // console.log("分片上传成功") - - // } else { - // // 当总数大于等于分片个数的时候 - // if ((chunkInfo.currentChunk + 1) == chunkInfo.chunkCount) { - // console.log("文件开始------合并成功") - // success(res.data[0]) - // } - // } + console.log(chunkInfo); + if (chunkInfo.currentChunk < chunkInfo.chunkCount - 1) { + console.log("分片上传成功"); + } else { + // 当总数大于等于分片个数的时候 + if (chunkInfo.currentChunk + 1 == chunkInfo.chunkCount) { + console.log("文件开始------合并成功"); + } + } } else { console.log(res.message); + error(); } }) .catch((e) => { diff --git a/vue.config.js b/vue.config.js index e2acb6eeb69f8598838829acade280d0a80882e3..2d4e9b49a1ced67743751f374bf114f871e44604 100644 --- a/vue.config.js +++ b/vue.config.js @@ -2,7 +2,7 @@ const path = require("path"); module.exports = { publicPath: "", - outputDir: "cssc-mobile", + outputDir: "dist", assetsDir: "static", configureWebpack: (config) => { require("@vux/loader").merge(config, {