学工导入组件2.0 开发完成

zyd_public/components/ImportUtil2.0/index.js

@@ -230,8 +230,8 @@ export default class ImportUtil extends React.PureComponent {
       },
       success: (res) => {
         let key = '';
-        if (res && typeof res === 'object' && Object.keys(res).length) {
-          key = Object.keys(res)[0];
+        if (res && res.cacheKey) {
+          key = res.cacheKey;
         }
         if (key) {
           this.setState({
@@ -350,9 +350,9 @@ export default class ImportUtil extends React.PureComponent {
   // 分析数据后，导出表格里的数据
   // key='pass', 导出通过数据; key='notPass',导出未通过数据
   exportData = (isPass) => {
-    const type = isPass ? 'pass' : 'notPass';
-    const { filekey } = this.state;
-    hrefWithToken(`/CmsExApi/exportImport?key=${filekey}&type=${type}`);
+    const type = isPass ? 'passList' : 'noPassList';
+    const { filekey, exportTemplateUrl } = this.state;
+    window.open(`${exportTemplateUrl}&cacheKey=${filekey}&dataType=${type}&token=${getToken()}`);
   };
 
   continueImport = () => {