Skip to content

M
memberTag-web
Commit c5097547 by caoyanzhi
Options

Merge branch 'hotfix/解决上传进度NaN的问题' into dev 

# Conflicts:
#	dist/index.html
parents 87e95f73 3eedc2d3
Showing with 10 additions and 12 deletions
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>GIC-会员标签</title><link href=./static/css/app.93903871b38b001e53dd2962c2f58e48.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.30.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.40.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/area-ab.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/selector.1.1.95.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.11.js></script><script type=text/javascript src=./static/js/manifest.e3bcab304a7d4f5e432a.js></script><script type=text/javascript src=./static/js/vendor.83081d6a93a866b5b8f1.js></script><script type=text/javascript src=./static/js/app.fdf7d3d096a41b3b1614.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>GIC-会员标签</title><link href=./static/css/app.a3690454af6a75b6d8d98c882fcf0be0.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.30.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.40.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/area-ab.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/selector.1.1.95.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.11.js></script><script type=text/javascript src=./static/js/manifest.eb2a0b654b64698d48f1.js></script><script type=text/javascript src=./static/js/vendor.83081d6a93a866b5b8f1.js></script><script type=text/javascript src=./static/js/app.fdf7d3d096a41b3b1614.js></script></body></html>
\ No newline at end of file
dist/static/js/0.ac33b9fd7278810669ef.js → dist/static/js/0.585dc1473963d1fe20a3.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/10.49dc4ce10dca172e66e9.js → dist/static/js/10.0468ca5bb7a6dd6d21e6.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/15.d92460353eb3e0bb9bf6.js → dist/static/js/15.3917aa09ec184a6ec064.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/2.f15e3730afe5f0ba7adb.js → dist/static/js/2.ad94d0c63c3c0cd06160.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.e3bcab304a7d4f5e432a.js deleted 100644 → 0
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(f,a,t){for(var o,d,b,i=0,u=[];i<f.length;i++)d=f[i],n[d]&&u.push(n[d][0]),n[d]=0;for(o in a)Object.prototype.hasOwnProperty.call(a,o)&&(e[o]=a[o]);for(c&&c(f,a,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)b=r(r.s=t[i]);return b};var f={},n={33:0};function r(c){if(f[c])return f[c].exports;var n=f[c]={i:c,l:!1,exports:{}};return e[c].call(n.exports,n,n.exports,r),n.l=!0,n.exports}r.e=function(e){var c=n[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var f=new Promise(function(f,r){c=n[e]=[f,r]});c[2]=f;var a=document.getElementsByTagName("head")[0],t=document.createElement("script");t.type="text/javascript",t.charset="utf-8",t.async=!0,t.timeout=12e4,r.nc&&t.setAttribute("nonce",r.nc),t.src=r.p+"static/js/"+e+"."+{0:"ac33b9fd7278810669ef",1:"1a66f3452cb905b67755",2:"f15e3730afe5f0ba7adb",3:"8bdcde52d82c3b61ec31",4:"fe10700a0dc4396d6fb6",5:"f892e974c5b02a219721",6:"31eb51419dea97959645",7:"f169140cbd6ad9f5611c",8:"fe61efcd1ccfc3412252",9:"ea583eedf0e8e01807bd",10:"49dc4ce10dca172e66e9",11:"97c54692f1a8adbe99aa",12:"ff49b3face62ef7aef5f",13:"5ff52df0201b9234fa89",14:"698cfa21b2f783438c71",15:"d92460353eb3e0bb9bf6",16:"77043b18784ab0e7f74a",17:"b43a253e53779917cbec",18:"9022ea0326694df97cda",19:"58217a281ee1178e0c5d",20:"519677922a687ccbe4d9",21:"e39e3461a16359f1196b",22:"f24920a6257c85f352de",23:"a9f0ca604a44f9f9b1ad",24:"590887b93345814f00ef",25:"fbc9d87dd52c837c39be",26:"c5f9e5a4bc2c63938b70",27:"2c48b10d124016d57c0b",28:"f5fc73b651e29d17f74d",29:"ed4b43f3d8456f7bd36e",30:"5d1cb1b10c82fdeede4d"}[e]+".js";var o=setTimeout(d,12e4);function d(){t.onerror=t.onload=null,clearTimeout(o);var c=n[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return t.onerror=t.onload=d,a.appendChild(t),f},r.m=e,r.c=f,r.d=function(e,c,f){r.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:f})},r.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(c,"a",c),c},r.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},r.p="./",r.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
dist/static/js/manifest.eb2a0b654b64698d48f1.js 0 → 100644
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(f,t,a){for(var o,d,b,i=0,u=[];i<f.length;i++)d=f[i],n[d]&&u.push(n[d][0]),n[d]=0;for(o in t)Object.prototype.hasOwnProperty.call(t,o)&&(e[o]=t[o]);for(c&&c(f,t,a);u.length;)u.shift()();if(a)for(i=0;i<a.length;i++)b=r(r.s=a[i]);return b};var f={},n={33:0};function r(c){if(f[c])return f[c].exports;var n=f[c]={i:c,l:!1,exports:{}};return e[c].call(n.exports,n,n.exports,r),n.l=!0,n.exports}r.e=function(e){var c=n[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var f=new Promise(function(f,r){c=n[e]=[f,r]});c[2]=f;var t=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,r.nc&&a.setAttribute("nonce",r.nc),a.src=r.p+"static/js/"+e+"."+{0:"585dc1473963d1fe20a3",1:"1a66f3452cb905b67755",2:"ad94d0c63c3c0cd06160",3:"b5b06f78dc47b1f27f0f",4:"35467910ddd39694bf98",5:"1cf65f24eda2b4f97908",6:"31eb51419dea97959645",7:"f169140cbd6ad9f5611c",8:"fe61efcd1ccfc3412252",9:"ea583eedf0e8e01807bd",10:"0468ca5bb7a6dd6d21e6",11:"539638351d637df57018",12:"ff49b3face62ef7aef5f",13:"5ff52df0201b9234fa89",14:"a1a9f4f1d7e27b74ccac",15:"3917aa09ec184a6ec064",16:"8b5816be3cf77b0756a0",17:"b43a253e53779917cbec",18:"9022ea0326694df97cda",19:"9b57a3285aa7d39f651f",20:"ff444905c59c2384cf40",21:"e39e3461a16359f1196b",22:"f24920a6257c85f352de",23:"28eb1f6885ce91232a86",24:"590887b93345814f00ef",25:"fbc9d87dd52c837c39be",26:"c5f9e5a4bc2c63938b70",27:"2c48b10d124016d57c0b",28:"f5fc73b651e29d17f74d",29:"ed4b43f3d8456f7bd36e",30:"5d1cb1b10c82fdeede4d"}[e]+".js";var o=setTimeout(d,12e4);function d(){a.onerror=a.onload=null,clearTimeout(o);var c=n[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return a.onerror=a.onload=d,t.appendChild(a),f},r.m=e,r.c=f,r.d=function(e,c,f){r.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:f})},r.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(c,"a",c),c},r.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},r.p="./",r.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
src/router/index.js
......@@ -170,8 +170,6 @@ export const constantRouterMap = [
];
export default new Router({
// mode: 'history',
// base: '/member-tag/',
routes: constantRouterMap,
scrollBehavior: () => ({ y: 0 })
});
\ No newline at end of file
src/view/manualTag/manual-tag-value-edit.vue
......@@ -15,10 +15,10 @@
<div v-if="scope.row.status === 4 || scope.row.status === 6" class="uploading">
<span>正在上传</span>
<span class="uploading-progress">
<el-progress
:percentage="scope.row.percent">
</el-progress>
</span>
<el-progress
:percentage="scope.row.percent">
</el-progress>
</span>
</div>
<!-- 初始状态和导入完成状态 -->
<template v-else>
......@@ -481,6 +481,7 @@ export default {
param.append("file", this.filesData);
param.append("optType", optType ? 1 : 0);
param.append("tagItemId", tagItemId);
param.append("requestProject", 'member-tag');
postForm('/memberTag/uploadTagItemExcel', param).then((res) => {
const { errorCode } = res.data;
if (errorCode === 1) {
......@@ -561,7 +562,7 @@ export default {
// 导入进行中
if (this.tagValTableData[tagItemIndex].tagItemId === tagItemId) {
this.tagValTableData[tagItemIndex].status = result.status;
const num = parseInt((result.totalNum - result.needExec) / result.totalNum * 100);
const num =result.totalNum == 0 ? 0 : parseInt((result.totalNum - result.needExec) / result.totalNum * 100);
this.tagValTableData[tagItemIndex].percent = num === 100 ? 99 : num;
}
break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment