Merge branch 'xyLog220509' into test

src/js/doctorQcListCopy.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/doctorQcListCopy.less");
 require('./modal.js');
 const { api } = require('./api.js')
-const { post, getCookie, getLocal, getUrlArgObjectNew, emptyBox, downloadExportedData, expJson, getLogoParam, focusMenuItem, listenScroll, exportTimeLimit, setDatePicker } = require('./utils.js')
+const { post, getCookie,setCookie, getLocal, getUrlArgObjectNew, emptyBox, downloadExportedData, expJson, getLogoParam, focusMenuItem, listenScroll, exportTimeLimit, setDatePicker } = require('./utils.js')
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./../resource/jquery-ui/jquery-ui.min.css');
 const iconCheck = require("./../images/icon_check.png")

src/js/itemDefectDetail.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/itemDefectDetail.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie,getLocal,getUrlArgObjectNew,emptyBox,downloadExportedData,expJson,setDatePicker,getLogoParam,initScroll } = require('./utils.js')
+const {post,getCookie,setCookie,getLocal,getUrlArgObjectNew,emptyBox,downloadExportedData,expJson,setDatePicker,getLogoParam,initScroll } = require('./utils.js')
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./../resource/jquery-ui/jquery-ui.min.css');
 const iconCheck= require("./../images/icon_check.png")

src/js/utils.js

@@ -296,7 +296,7 @@ const expJson = (url, data) => {
     window.location.href = '../login.html';
   }
   let isPlacefile = getCookie('isPlacefile') || 1;
-  let excelName = encodeURIComponent(getCookie('excelName'))||""
+  let excelName = encodeURIComponent(getCookie('excelName').replace(/\//g,"_"))||""
   console.log(1,excelName)
   console.log(2,decodeURIComponent(excelName))
   let need = window.location.href.indexOf('localhost') != -1;