diff --git a/.env.development b/.env.development index 550eb6aeae1c2bb1151ddb0c7b79ce94ea05006c..b02d078326357907ab059adcb6f6912811aae665 100644 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ NODE_ENV = 'development' VUE_APP_URL = 'https://zcas.wzswsj.gov.cn:8079/screening-api/' -VUE_APP_IMG = 'https://inno.sh-sict.com/wjy-mobile/' +VUE_APP_IMG = 'https://inno.sh-sict.com/gastric/' diff --git a/package-lock.json b/package-lock.json index 2a30764c5ca9900d2a00908d945306a13c57d88a..8d31505a9bd88643636514a95698cc765242ef53 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1532,6 +1532,41 @@ "@popperjs/core": "^2.9.2" } }, + "@videojs/http-streaming": { + "version": "2.14.3", + "resolved": "https://registry.npmmirror.com/@videojs/http-streaming/-/http-streaming-2.14.3.tgz", + "integrity": "sha512-2tFwxCaNbcEZzQugWf8EERwNMyNtspfHnvxRGRABQs09W/5SqmkWFuGWfUAm4wQKlXGfdPyAJ1338ASl459xAA==", + "requires": { + "@babel/runtime": "^7.12.5", + "@videojs/vhs-utils": "3.0.5", + "aes-decrypter": "3.1.3", + "global": "^4.4.0", + "m3u8-parser": "4.7.1", + "mpd-parser": "0.21.1", + "mux.js": "6.0.1", + "video.js": "^6 || ^7" + } + }, + "@videojs/vhs-utils": { + "version": "3.0.5", + "resolved": "https://registry.npmmirror.com/@videojs/vhs-utils/-/vhs-utils-3.0.5.tgz", + "integrity": "sha512-PKVgdo8/GReqdx512F+ombhS+Bzogiofy1LgAj4tN8PfdBx3HSS7V5WfJotKTqtOWGwVfSWsrYN/t09/DSryrw==", + "requires": { + "@babel/runtime": "^7.12.5", + "global": "^4.4.0", + "url-toolkit": "^2.2.1" + } + }, + "@videojs/xhr": { + "version": "2.6.0", + "resolved": "https://registry.npmmirror.com/@videojs/xhr/-/xhr-2.6.0.tgz", + "integrity": "sha512-7J361GiN1tXpm+gd0xz2QWr3xNWBE+rytvo8J3KuggFaLg+U37gZQ2BuPLcnkfGffy2e+ozY70RHC8jt7zjA6Q==", + "requires": { + "@babel/runtime": "^7.5.5", + "global": "~4.4.0", + "is-function": "^1.0.1" + } + }, "@vue/babel-helper-vue-jsx-merge-props": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.2.1.tgz", @@ -2408,6 +2443,11 @@ "@xtuc/long": "4.2.2" } }, + "@xmldom/xmldom": { + "version": "0.7.6", + "resolved": "https://registry.npmmirror.com/@xmldom/xmldom/-/xmldom-0.7.6.tgz", + "integrity": "sha512-HHXP9hskkFQHy8QxxUXkS7946FFIhYVfGqsk0WLwllmexN9x/+R4UBLvurHEuyXRfVEObVR8APuQehykLviwSQ==" + }, "@xtuc/ieee754": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", @@ -2467,6 +2507,17 @@ "integrity": "sha512-aT6camzM4xEA54YVJYSqxz1kv4IHnQZRtThJJHhUMRExaU5spC7jX5ugSwTaTgJliIgs4VhZOk7htClvQ/LmRA==", "dev": true }, + "aes-decrypter": { + "version": "3.1.3", + "resolved": "https://registry.npmmirror.com/aes-decrypter/-/aes-decrypter-3.1.3.tgz", + "integrity": "sha512-VkG9g4BbhMBy+N5/XodDeV6F02chEk9IpgRTq/0bS80y4dzy79VH2Gtms02VXomf3HmyRe3yyJYkJ990ns+d6A==", + "requires": { + "@babel/runtime": "^7.12.5", + "@videojs/vhs-utils": "^3.0.5", + "global": "^4.4.0", + "pkcs7": "^1.0.4" + } + }, "aggregate-error": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", @@ -6390,6 +6441,11 @@ } } }, + "dom-walk": { + "version": "0.1.2", + "resolved": "https://registry.npmmirror.com/dom-walk/-/dom-walk-0.1.2.tgz", + "integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==" + }, "domain-browser": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz", @@ -7451,6 +7507,15 @@ "integrity": "sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=", "dev": true }, + "global": { + "version": "4.4.0", + "resolved": "https://registry.npmmirror.com/global/-/global-4.4.0.tgz", + "integrity": "sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==", + "requires": { + "min-document": "^2.19.0", + "process": "^0.11.10" + } + }, "globals": { "version": "11.12.0", "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", @@ -8115,6 +8180,11 @@ "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz", "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=" }, + "individual": { + "version": "2.0.0", + "resolved": "https://registry.npmmirror.com/individual/-/individual-2.0.0.tgz", + "integrity": "sha512-pWt8hBCqJsUWI/HtcfWod7+N9SgAqyPEaF7JQjwzjn5vGrpg6aQ5qeAFQ7dx//UH4J1O+7xqew+gCeeFt6xN/g==" + }, "infer-owner": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz", @@ -8370,6 +8440,11 @@ "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", "dev": true }, + "is-function": { + "version": "1.0.2", + "resolved": "https://registry.npmmirror.com/is-function/-/is-function-1.0.2.tgz", + "integrity": "sha512-lw7DUp0aWXYg+CBCN+JKkcE0Q2RayZnSvnZBlwgxHBQhqt5pZNVy4Ri7H9GmmXkdu7LUthszM+Tor1u/2iBcpQ==" + }, "is-glob": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", @@ -8633,6 +8708,11 @@ "resolved": "https://registry.npmjs.org/js-file-download/-/js-file-download-0.4.12.tgz", "integrity": "sha512-rML+NkoD08p5Dllpjo0ffy4jRHeY6Zsapvr/W86N7E0yuzAO6qa5X9+xog6zQNlH102J7IXljNY2FtS6Lj3ucg==" }, + "js-md5": { + "version": "0.7.3", + "resolved": "https://registry.npmmirror.com/js-md5/-/js-md5-0.7.3.tgz", + "integrity": "sha512-ZC41vPSTLKGwIRjqDh8DfXoCrdQIyBgspJVPXHBGu4nZlAEvG3nf+jO9avM9RmLiGakg7vz974ms99nEV0tmTQ==" + }, "js-message": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/js-message/-/js-message-1.0.7.tgz", @@ -8745,6 +8825,11 @@ } } }, + "keycode": { + "version": "2.2.1", + "resolved": "https://registry.npmmirror.com/keycode/-/keycode-2.2.1.tgz", + "integrity": "sha512-Rdgz9Hl9Iv4QKi8b0OlCRQEzp4AgVxyCtz5S/+VIHezDmrDhkp2N2TqBWOLz0/gbeREXOOiI9/4b8BY9uw2vFg==" + }, "killable": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz", @@ -9066,6 +9151,16 @@ "yallist": "^3.0.2" } }, + "m3u8-parser": { + "version": "4.7.1", + "resolved": "https://registry.npmmirror.com/m3u8-parser/-/m3u8-parser-4.7.1.tgz", + "integrity": "sha512-pbrQwiMiq+MmI9bl7UjtPT3AK603PV9bogNlr83uC+X9IoxqL5E4k7kU7fMQ0dpRgxgeSMygqUa0IMLQNXLBNA==", + "requires": { + "@babel/runtime": "^7.12.5", + "@videojs/vhs-utils": "^3.0.5", + "global": "^4.4.0" + } + }, "make-dir": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", @@ -9308,6 +9403,14 @@ "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==", "dev": true }, + "min-document": { + "version": "2.19.0", + "resolved": "https://registry.npmmirror.com/min-document/-/min-document-2.19.0.tgz", + "integrity": "sha512-9Wy1B3m3f66bPPmU5hdA4DR4PB2OfDU/+GS3yAB7IQozE3tqXaVv2zOjgla7MEGSRv95+ILmOuvhLkOK6wJtCQ==", + "requires": { + "dom-walk": "^0.1.0" + } + }, "mini-css-extract-plugin": { "version": "0.9.0", "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.9.0.tgz", @@ -9545,6 +9648,17 @@ "run-queue": "^1.0.3" } }, + "mpd-parser": { + "version": "0.21.1", + "resolved": "https://registry.npmmirror.com/mpd-parser/-/mpd-parser-0.21.1.tgz", + "integrity": "sha512-BxlSXWbKE1n7eyEPBnTEkrzhS3PdmkkKdM1pgKbPnPOH0WFZIc0sPOWi7m0Uo3Wd2a4Or8Qf4ZbS7+ASqQ49fw==", + "requires": { + "@babel/runtime": "^7.12.5", + "@videojs/vhs-utils": "^3.0.5", + "@xmldom/xmldom": "^0.7.2", + "global": "^4.4.0" + } + }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -9566,6 +9680,15 @@ "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=", "dev": true }, + "mux.js": { + "version": "6.0.1", + "resolved": "https://registry.npmmirror.com/mux.js/-/mux.js-6.0.1.tgz", + "integrity": "sha512-22CHb59rH8pWGcPGW5Og7JngJ9s+z4XuSlYvnxhLuc58cA1WqGDQPzuG8I+sPm1/p0CdgpzVTaKW408k5DNn8w==", + "requires": { + "@babel/runtime": "^7.11.2", + "global": "^4.4.0" + } + }, "mz": { "version": "2.7.0", "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz", @@ -10304,6 +10427,14 @@ "pinkie": "^2.0.0" } }, + "pkcs7": { + "version": "1.0.4", + "resolved": "https://registry.npmmirror.com/pkcs7/-/pkcs7-1.0.4.tgz", + "integrity": "sha512-afRERtHn54AlwaF2/+LFszyAANTCggGilmcmILUzEjvs3XgFZT+xE6+QWQcAGmu4xajy+Xtj7acLOPdx5/eXWQ==", + "requires": { + "@babel/runtime": "^7.5.5" + } + }, "pkg-dir": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", @@ -11219,8 +11350,7 @@ "process": { "version": "0.11.10", "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", - "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=", - "dev": true + "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=" }, "process-nextick-args": { "version": "2.0.1", @@ -11871,11 +12001,27 @@ "aproba": "^1.1.1" } }, + "rust-result": { + "version": "1.0.0", + "resolved": "https://registry.npmmirror.com/rust-result/-/rust-result-1.0.0.tgz", + "integrity": "sha512-6cJzSBU+J/RJCF063onnQf0cDUOHs9uZI1oroSGnHOph+CQTIJ5Pp2hK5kEQq1+7yE/EEWfulSNXAQ2jikPthA==", + "requires": { + "individual": "^2.0.0" + } + }, "safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" }, + "safe-json-parse": { + "version": "4.0.0", + "resolved": "https://registry.npmmirror.com/safe-json-parse/-/safe-json-parse-4.0.0.tgz", + "integrity": "sha512-RjZPPHugjK0TOzFrLZ8inw44s9bKox99/0AZW9o/BEQVrJfhI+fIHMErnPyRa89/yRXUUr93q+tiN6zhoVV4wQ==", + "requires": { + "rust-result": "^1.0.0" + } + }, "safe-regex": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", @@ -13624,6 +13770,11 @@ "requires-port": "^1.0.0" } }, + "url-toolkit": { + "version": "2.2.5", + "resolved": "https://registry.npmmirror.com/url-toolkit/-/url-toolkit-2.2.5.tgz", + "integrity": "sha512-mtN6xk+Nac+oyJ/PrI7tzfmomRVNFIWKUbG8jdYFt52hxbiReFAXIjYskvu64/dvuW71IcB7lV8l0HvZMac6Jg==" + }, "use": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz", @@ -13757,6 +13908,39 @@ } } }, + "video.js": { + "version": "7.20.3", + "resolved": "https://registry.npmmirror.com/video.js/-/video.js-7.20.3.tgz", + "integrity": "sha512-JMspxaK74LdfWcv69XWhX4rILywz/eInOVPdKefpQiZJSMD5O8xXYueqACP2Q5yqKstycgmmEKlJzZ+kVmDciw==", + "requires": { + "@babel/runtime": "^7.12.5", + "@videojs/http-streaming": "2.14.3", + "@videojs/vhs-utils": "^3.0.4", + "@videojs/xhr": "2.6.0", + "aes-decrypter": "3.1.3", + "global": "^4.4.0", + "keycode": "^2.2.0", + "m3u8-parser": "4.7.1", + "mpd-parser": "0.21.1", + "mux.js": "6.0.1", + "safe-json-parse": "4.0.0", + "videojs-font": "3.2.0", + "videojs-vtt.js": "^0.15.4" + } + }, + "videojs-font": { + "version": "3.2.0", + "resolved": "https://registry.npmmirror.com/videojs-font/-/videojs-font-3.2.0.tgz", + "integrity": "sha512-g8vHMKK2/JGorSfqAZQUmYYNnXmfec4MLhwtEFS+mMs2IDY398GLysy6BH6K+aS1KMNu/xWZ8Sue/X/mdQPliA==" + }, + "videojs-vtt.js": { + "version": "0.15.4", + "resolved": "https://registry.npmmirror.com/videojs-vtt.js/-/videojs-vtt.js-0.15.4.tgz", + "integrity": "sha512-r6IhM325fcLb1D6pgsMkTQT1PpFdUdYZa1iqk7wJEu+QlibBwATPfPc9Bg8Jiym0GE5yP1AG2rMLu+QMVWkYtA==", + "requires": { + "global": "^4.3.1" + } + }, "vm-browserify": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz", diff --git a/package.json b/package.json index b7b187ff015ce0cb85053834523a0846f887558e..0839c477116ae4dc3b4f264368de17e197fe5114 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "fastclick": "^1.0.6", "js-base64": "^2.4.9", "js-file-download": "^0.4.1", + "js-md5": "^0.7.3", "lodash": "^4.17.4", "marked": "^0.3.19", "mescroll.js": "^1.4.0", @@ -25,6 +26,7 @@ "qs": "^6.5.2", "v-distpicker": "^1.0.16", "vant": "^2.12.45", + "video.js": "^7.20.3", "vue": "^2.6.11", "vue-carousel": "^0.6.5", "vue-product-zoomer": "^2.0.10", diff --git a/src/App.vue b/src/App.vue index a72eb0ce0206041409f4ad94af843cac10a82023..68d1a2e22e23973e6ccd035df49ba1c2f2710605 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,19 +1,10 @@ @@ -22,14 +13,28 @@ export default { name: 'app', data () { return { - aliveRoute: [], - routerAnimate: '' + routerAnimate: '', + keepAlive: [], + aliveRoute: ['peopleList'] } }, watch: { // 监听 $route 为内页设置不同的过渡效果 "$route" (to, from) { + + /*动态设置路由缓存 start*/ + //?需要缓存的组件 + if (this.aliveRoute.includes(to.name)) { + to.meta.keepAlive = true + } + // console.log(to.path + '---' + to.meta.keepAlive); + let aliveRoute = this.$router.options.routes.filter(e => e.meta && e.meta.keepAlive).map(e => e.name) + this.keepAlive = aliveRoute + /*动态设置路由缓存 end*/ + // console.log(aliveRoute); + if (to.meta.index === from.meta.index) { + this.routerAnimate = "" return; // this.routerAnimate = "slide-left" } diff --git a/src/assets/img/video2.mp4 b/src/assets/img/video2.mp4 new file mode 100644 index 0000000000000000000000000000000000000000..49845bcd7850fe46daf86ce1875f54a6148397cc Binary files /dev/null and b/src/assets/img/video2.mp4 differ diff --git a/src/axios/api/index.js b/src/axios/api/index.js index 5d0f2be307ad3aa72d03a9ffcc8b578e234316e6..b542e619d322ad5700dccba712ada0321b2e1cbd 100644 --- a/src/axios/api/index.js +++ b/src/axios/api/index.js @@ -13,24 +13,20 @@ const v1 = `/gastric-cancer${process.env.VUE_APP_MOD || ""}-user`; const ewellDefectData = `/gastric-cancer${process.env.VUE_APP_MOD || ""}-data`; const im = `/gastric-cancer${process.env.VUE_APP_MOD || ""}-im`; export const API = { - //居民端跳转 - postCToken: (data) => { - return post(`${v1}/app/customer/forward`, data); + //登录 + login: (data) => { + return post(`${v1}/user/login`, data); }, - - /******************* - * 患者端-首页 * - *******************/ - //文章推荐 - postArticle: (data) => { - return post(`${ewellDefectData}/app/index/article/list`, data); + getPeopleList: (data) => { + return post(`${ewellDefectData}/report/hospital`, data); }, - //! 筛查档案 - reportInfo: (data) => { + getVideoList: (data) => { return get( - `${ewellDefectData}/app/customer/screen/report?patientId=${data.patientId}`, + `${ewellDefectData}/app/report/video/mine?pageNum=${data.pageNum}&pageSize=${data.pageSize}&dataId=${data.dataId}`, data ); }, - + fileUpload: (data) => { + return post(`${ewellDefectData}/app/report/video/upload`, data); + } }; diff --git a/src/axios/request/http.js b/src/axios/request/http.js index cc8eeb60dfcd826eecb0d5d9aa108bf2dbc5f4ff..b53d233e49d8dcf16f034356c65a024bf6ebf787 100644 --- a/src/axios/request/http.js +++ b/src/axios/request/http.js @@ -8,32 +8,26 @@ let CommonAlert = function (msg) { if (msg.length > 0) { return Toast({ message: msg, - duration: 1500, + duration: 1500 }); } }; // axios.defaults.timeout = 5000; if (process.env.NODE_ENV == "development") { - // axios.defaults.baseURL = 'https://inno.sh-sict.com/screening-api/'; + axios.defaults.baseURL = "https://inno.sh-sict.com/gastric-api/"; } else { axios.defaults.baseURL = process.env.VUE_APP_URL; } window.baseURL = axios.defaults.baseURL; //http request 拦截器 axios.create({ - withCredentials: true, + withCredentials: true }); axios.interceptors.request.use( (config) => { config.data = config.data; - config.headers["user-cookie"] = localStorage.getItem("token"); - if (config.url === "/ewell-tumors-user/province/list") { - //坐下判断如果是获取省市接口则不做拦截 - } - // else if(!localStorage.getItem("token")){ - // toLogin() - // } + config.headers["user-cookie"] = localStorage.getItem("vd_token"); return config; }, (error) => { @@ -47,10 +41,7 @@ axios.interceptors.request.use( */ const toLogin = () => { router.replace({ - path: "/register", - query: { - redirect: router.currentRoute.fullPath, - }, + path: "/login" }); }; @@ -60,8 +51,8 @@ axios.interceptors.response.use( if (response.data.code === 0 || response.data.code === -1) { CommonAlert(response.data.message); } else if (response.data.code === -100) { - localStorage.removeItem('token') - window.location.hash = "/register"; + localStorage.removeItem("vd_token"); + window.location.hash = "/login"; } return response; }, @@ -159,7 +150,7 @@ export function post(url, data = {}, params = {}) { return new Promise((resolve, reject) => { axios .post(url, data, { - params, + params }) .then( (response) => { @@ -176,8 +167,8 @@ export function postForm(url, data = {}) { axios .post(url, qs.stringify(data), { headers: { - "Content-Type": "application/x-www-form-urlencoded", - }, + "Content-Type": "application/x-www-form-urlencoded" + } }) .then( (response) => { @@ -197,8 +188,8 @@ export function expoertExcel(url, data = {}) { .post(url, qs.stringify(data), { responseType: "blob", headers: { - "Content-Type": "application/x-www-form-urlencoded", - }, + "Content-Type": "application/x-www-form-urlencoded" + } }) .then( (response) => { @@ -217,20 +208,20 @@ export function downloadExcel(url, data = {}, title = "筛查信息导出表") { method: "post", url: url, data: data, - responseType: "blob", + responseType: "blob" }) .then((res) => { if ("msSaveOrOpenBlob" in navigator) { //兼容ie let blob = new Blob([res.data], { - type: "application/vnd.ms-excel", + type: "application/vnd.ms-excel" }); window.navigator.msSaveOrOpenBlob(blob, `${title}.xlsx`); return; } else { const link = document.createElement("a"); let blob = new Blob([res.data], { - type: "application/vnd.ms-excel", + type: "application/vnd.ms-excel" }); link.style.display = "none"; link.href = URL.createObjectURL(blob); diff --git a/src/main.js b/src/main.js index b9c7121829da35d228abecdf51b18c40c9909c48..831c2573dcf733a4125560dcc2c8bae026f3d10b 100644 --- a/src/main.js +++ b/src/main.js @@ -17,6 +17,8 @@ import "vant/lib/index.css"; import "vant/lib/index.less"; import "../src/styles/vantTheme.less"; +import 'video.js/dist/video-js.min.css' + import clipboard from "clipboard"; Vue.prototype.clipboard = clipboard; Vue.use(Scroll); diff --git a/src/pages/login.vue b/src/pages/login.vue index e055fcaf1a628d2e1d52390490956c1fc95f6cd8..ae2d8ff1d2eda26147c586423dc7053cf51417a6 100644 --- a/src/pages/login.vue +++ b/src/pages/login.vue @@ -8,12 +8,12 @@ :has-header="false" :has-footer="false" > - +
登录
提交 @@ -41,18 +41,48 @@ @@ -66,15 +96,15 @@ export default { position: absolute; top: 30%; transform: translateY(-50%); - .title{ + .title { text-align: center; font-size: 20px; margin: 20px 0; } - .van-field{ + .van-field { // height: 44px; } - .btn{ + .btn { height: 44px; border-radius: 22px !important; } diff --git a/src/pages/peopleList.vue b/src/pages/peopleList.vue index 09b1c9e964c88747ff279c062cced24500e9d51b..0447b6448de7ff78b9a8019a79a3d1e45910099f 100644 --- a/src/pages/peopleList.vue +++ b/src/pages/peopleList.vue @@ -9,65 +9,62 @@ :has-footer="false" > -
- - - - + + + +
@@ -94,56 +91,47 @@ export default { pageSize: this.pageSize } this.finished = false; - setTimeout(() => { + this.$API.getPeopleList(data).then(res => { this.loading = false - this.totalCount = 40 - this.setNum(this.pageSize) + this.totalCount = res.object.totalCount + this.peopleList = [...this.peopleList, ...res.object.list] if (this.peopleList.length >= this.totalCount) { this.finished = true } - }, 1000); - + }) }, loadMore () { this.pageNum++ this.getList() }, - setNum (num) { - for (let i = 0; i < num; i++) { - this.peopleList.push( - { - name: "test06271021", - followUpTime: '2022-08-88', - diseaseType: 'sj_wzz', - id: "62b90d53e4b0123121be58a8", - patientInfo: { - sex: 'a', - birthday: '1976-08-11', - address: '上海' - }, - riskRank: 'c' - } - ) - } - } }, created () { + this.peopleList = [] this.getList() }, activated () { - const scrollTop = this.$route.meta.scrollTop; - const $wrapper = document.querySelector('.list_content'); - if (scrollTop && $wrapper) { - document.querySelector('.list_content').scrollTop = scrollTop; + const scrollTops = this.$route.meta.scrollTop; + const $content = document.querySelector('.list_content'); + if (scrollTops && $content) { + this.$nextTick(() => { + var scrollTop = this.$el.querySelector('.list_content') + scrollTop.scrollTop = scrollTops - 1 + }) } }, + beforeRouteLeave (to, from, next) { + const $content = document.querySelector('.list_content'); // 列表的外层容器 + const scrollTop = $content ? $content.scrollTop : 0; + from.meta.scrollTop = scrollTop; + next() + }, mounted () { }, watch: {}, filters: { vtol (v) { if (v) { - return [{ + let item = [{ label: "无症状早癌筛查流程", value: "sj_wzz", }, @@ -154,11 +142,15 @@ export default { { label: "院内胃癌筛查流程", value: "sj_nj", - }].filter(e => e.value == v)[0].label + }].filter(e => e.value == v) + if (item.length > 0) { + return item[0].label + } else { + return '--' + } } else { return '--' } - } }, }; @@ -169,10 +161,8 @@ export default { color: #127bff; } -.content { -} .list_content { - height: calc(100vh - 44px); + height: 100%; overflow: auto; padding: 20px 0; } diff --git a/src/pages/videoList.vue b/src/pages/videoList.vue index 9c3df62a51db7b7f7085b3718aaf257a33260d23..a182f29a3aee110e63d221c7f8c3baabf3df0f60 100644 --- a/src/pages/videoList.vue +++ b/src/pages/videoList.vue @@ -1,12 +1,26 @@ \ No newline at end of file diff --git a/src/pages/videoShow.vue b/src/pages/videoShow.vue new file mode 100644 index 0000000000000000000000000000000000000000..8938334ec7a32dea00795287cd5f31714a9cc772 --- /dev/null +++ b/src/pages/videoShow.vue @@ -0,0 +1,94 @@ + + + \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index b7e632f2630eff8d8b6523b1749b27203a7577fe..b1d3eb32fae9b5f424c6b6004e8faf3db7f83b5d 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -15,15 +15,21 @@ const page = [ }, { path: "/peopleList", - meta: { index: 1, keepAlive: true, scrollTop: 0 }, + meta: { index: 2, keepAlive: true, scrollTop: 0 }, name: "peopleList", component: () => import("@/pages/peopleList") }, { path: "/videoList", - meta: { index: 2 }, + meta: { index: 3, keepAlive: true, scrollTop: 0 }, name: "videoList", component: () => import("@/pages/videoList") + }, + { + path: "/videoShow", + meta: { index: 3, keepAlive: false }, + name: "videoShow", + component: () => import("@/pages/videoShow") } ]; diff --git a/src/utils/upload.js b/src/utils/upload.js new file mode 100644 index 0000000000000000000000000000000000000000..0541a05008a500acc3e34324be64cbd511d0a90f --- /dev/null +++ b/src/utils/upload.js @@ -0,0 +1,96 @@ +import md5 from "js-md5"; //引入MD5加密 +import { API } from "@/axios/api"; // 这里指前端调用接口的api方法 +export const uploadByPieces = ({ + randoms, + file, + pieceSize = 10, + progress, + dataId, + success, + error +}) => { + // 如果文件传入为空直接 return 返回 + // if (!file || !file.length) return; + + console.log(file); + let fileMD5 = ""; // 总文件列表 + const chunkSize = pieceSize * 1024 * 1024; // 5MB一片 + const chunkCount = Math.ceil(file.size / chunkSize); // 总片数 + // 获取md5 + const readFileMD5 = () => { + // 读取视频文件的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("文件未被上传，将分片上传"); + readChunkMD5(); + }); + }; + const getChunkInfo = (file, currentChunk, chunkSize) => { + let start = currentChunk * chunkSize; + let end = Math.min(file.size, start + chunkSize); + let chunk = file.slice(start, end); + return { start, end, chunk }; + }; + // 针对每个文件进行chunk处理 + const readChunkMD5 = () => { + // 针对单个文件进行chunk上传 + 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 }); + } + }; + const uploadChunk = (chunkInfo) => { + // progressFun() + let config = { + headers: { + "Content-Type": "multipart/form-data" + } + }; + // 创建formData对象，下面是结合不同项目给后端传入的对象。 + let fetchForm = new FormData(); + fetchForm.append("identifier", randoms); + fetchForm.append("chunkNumber", chunkInfo.currentChunk + 1); + fetchForm.append("chunkSize", chunkSize); + fetchForm.append("currentChunkSize", chunkInfo.chunk.size); + fetchForm.append("file", chunkInfo.chunk); + fetchForm.append("filename", file.name); + fetchForm.append("totalChunks", chunkInfo.chunkCount); + fetchForm.append("totalSize", chunkSize); + fetchForm.append("dataId", dataId); + // fetchForm.append('md5', fileMD5) + API.fileUpload(fetchForm, config) + .then((res) => { + console.log("分片上传返回信息：" + res); + if (res.code == 1) { + // 结合不同项目 将成功的信息返回出去，这里可变的是指 res.data[0] + success(); + // 下面如果在项目中没有用到可以不用打开注释 + // if (chunkInfo.currentChunk < chunkInfo.chunkCount - 1) { + // console.log("分片上传成功") + + // } else { + // // 当总数大于等于分片个数的时候 + // if ((chunkInfo.currentChunk + 1) == chunkInfo.chunkCount) { + // console.log("文件开始------合并成功") + // success(res.data[0]) + // } + // } + } else { + console.log(res.message); + } + }) + .catch((e) => { + error && error(e); + }); + }; + readFileMD5(); // 开始执行代码 +};