修改导出时间

src/js/modal.js

@@ -18,38 +18,38 @@ const jQuery = require('jquery');
             gobackText: '我知道了',
             message: '<p class="tip">内容</p>',
             time: 1500,
-		    isFather: true,
-		    fatherWrapper: $("#mainBox", parent.document),
+            isFather: true,
+            fatherWrapper: $("#mainBox", parent.document),
             type: 'modal', //tip,loading
             callback: null
         };
         var ops = $.extend(dft, options || {});
         var popDom = $('.alertModal:visible');
-        if(ops.isFather){
-		  popDom =ops.fatherWrapper.find('.alertModal:visible');
-		}
-		const ptitle = popDom.find(".titlemodal").text().trim();
-		if(popDom.length&&ptitle!=="修改密码"){
-		  //如果该弹窗已存在，则不再显示多个
-		  return;
-		}
-		if(ptitle==="修改密码"){
-		  popDom.remove();
+        if (ops.isFather) {
+            popDom = ops.fatherWrapper.find('.alertModal:visible');
+        }
+        const ptitle = popDom.find(".titlemodal").text().trim();
+        if (popDom.length && ptitle !== "修改密码") {
+            //如果该弹窗已存在，则不再显示多个
+            return;
+        }
+        if (ptitle === "修改密码") {
+            popDom.remove();
         }
         var html = `
             <div class="alertModal">
                 <div class="modalBg"></div>
-                <div class="modalMain" style="width:${ops.width}px;margin-left:-${ops.width/2}px">
+                <div class="modalMain" style="width:${ops.width}px;margin-left:-${ops.width / 2}px">
                 <p class="titlemodal">${ops.title} <img src="${close}" alt=""></p>
-                <div class="content ${ops.gobackBtn?'contentleft':''}">
+                <div class="content ${ops.gobackBtn ? 'contentleft' : ''}">
 
-                <img style='display:${ops.gobackBtn?'inlineBlock':'none'} ' class='warnimg' src="${warn}" />
+                <img style='display:${ops.gobackBtn ? 'inlineBlock' : 'none'} ' class='warnimg' src="${warn}" />
                     ${ops.message}
                 </div>
                 <div class="btns clearfix">
-                    <span class="quite" style="display:${ops.quiteBtn?'inlineBlock':'none'}">${ops.cancalText}</span>
-                    <span class="sure sureChange" style="display:${ops.sureBtn?'inlineBlock':'none'}">${ops.sureText}</span>
-                    <span class="gobackbtn" style="display:${ops.gobackBtn?'inlineBlock':'none'}">${ops.gobackText}</span>
+                    <span class="quite" style="display:${ops.quiteBtn ? 'inlineBlock' : 'none'}">${ops.cancalText}</span>
+                    <span class="sure sureChange" style="display:${ops.sureBtn ? 'inlineBlock' : 'none'}">${ops.sureText}</span>
+                    <span class="gobackbtn" style="display:${ops.gobackBtn ? 'inlineBlock' : 'none'}">${ops.gobackText}</span>
                 </div>
                 </div>
             </div>
@@ -60,8 +60,8 @@ const jQuery = require('jquery');
                 <div class='cloInfoTitle'><span class='cloInfoTitleTxt'>导出提示</span> <img class="iconClose" src=${require('./../images/icon_close_default.png')} alt="关闭" /></div>
                 <div class='cloInfo closePort'>
                     <p class="selectDateTip">请选择一种导出的报表样式：</p>
-                    <p class="selectDate"><input checked="true" type="radio" name="date" id="date1" data-select="1"><label for="date1">含缺陷明细项，最多只能导出7天</label></p>
-                    <p class="selectDate"><input type="radio" name="date" id="date2" data-select="2"><label for="date2">不含缺陷明细项，最多只能导出90天</label></p>
+                    <p class="selectDate"><input checked="true" type="radio" name="date" id="date1" data-select="1"><label for="date1">含缺陷明细项，最多只能导出90天</label></p>
+                    <p class="selectDate"><input type="radio" name="date" id="date2" data-select="2"><label for="date2">含缺陷明细项，最多只能导出1年</label></p>
                 </div>
                 <div class='btnBox'>
                     <span class='cancalColSet canclePort'>取消</span> 
@@ -73,15 +73,15 @@ const jQuery = require('jquery');
         //     <div class="modaltip">${ops.message}</div>
         // `
         var tip = `
-            ${ops.win===true?`
+            ${ops.win === true ? `
             <div class="modaltipSuc">
                 <img src="${suc}" />
                 ${ops.message}
-            </div>`:ops.win=='default'?`
+            </div>`: ops.win == 'default' ? `
             <div class="modaltipSuc">
                 <img src="${def}" />
                 ${ops.message}
-            </div>`:`
+            </div>`: `
             <div class="modaltip">
                 ${ops.message}
             </div>`}
@@ -108,11 +108,11 @@ const jQuery = require('jquery');
             }, ops.time);
         }
         if (ops.callback && typeof ops.callback === 'function') {
-            $(parent.document||document).on('click', ".alertModal .titlemodal img,.alertModal .quite,.alertModal .gobackbtn", function () {
+            $(parent.document || document).on('click', ".alertModal .titlemodal img,.alertModal .quite,.alertModal .gobackbtn", function () {
                 ops.callback();
             })
         } else {
-            $(parent.document||document).on('click', ".alertModal .titlemodal img,.alertModal .quite,.alertModal .gobackbtn", function () {
+            $(parent.document || document).on('click', ".alertModal .titlemodal img,.alertModal .quite,.alertModal .gobackbtn", function () {
                 box.remove();
             })
         }

src/js/qcListDept.js

@@ -1421,14 +1421,39 @@ function bindSaveColPort(param) {
     $(".savePort", parent.document).off("click").on("click", function () {
         radioCheck = $(".selectDate input[type='radio']:checked", parent.document).attr("data-select")
         let time = radioCheck == 2 ? exportTimeLimit.defectTime : exportTimeLimit.normalTime
+
         if ((new Date(behosDateEnd) - new Date(behosDateStart)) / 24 / 60 / 60 / 1000 > time) {
             $.alerModal({ "message": `最多只能导出${time}天`, type: "tip", time: '1000', isFather: true, fatherWrapper: $("#mainBox", parent.document) });
             return
         }
+
         param.radioCheck = radioCheck || 1
+        // console.log("radioCheck", param.radioCheck, typeof (param.radioCheck));
+        // old_data = new Date(param.leaveHosDateEnd)
+        // console.log("old_data", old_data);
+        // if (param.radioCheck === '1') {
+        //     param.leaveHosDateStart = dateFomat(new Date(old_data.setDate(old_data.getDate() - 90)))
+        // } else if (param.radioCheck === '2') {
+        //     param.leaveHosDateStart = dateFomat(new Date(old_data.setFullYear(old_data.getFullYear() - 1)))
+        // }
+        console.log("@!@param", param);
         expJson(type == 10 ? api.levelStatisticsExportByDept : api.exportQcListDept, param).then(res => {
             $(".divModal", parent.document).remove();
             downloadExportedData(res.data, behosDateStart.slice(0, 10).replace(/-/g, "") + "-" + behosDateEnd.slice(0, 10).replace(/-/g, "") + "抽查住院病历质量情况.xls")
         })
     })
+}
+function dateFormat(date) {
+
+    // 获取各部分
+    let year = date.getFullYear(); // 获取年份
+    let month = (date.getMonth() + 1).toString().padStart(2, '0'); // 获取月份 (注意：月份是从0开始的，所以要加1)
+    let day = date.getDate().toString().padStart(2, '0'); // 获取日期
+    let hours = date.getHours().toString().padStart(2, '0'); // 获取小时
+    let minutes = date.getMinutes().toString().padStart(2, '0'); // 获取分钟
+    let seconds = date.getSeconds().toString().padStart(2, '0'); // 获取秒数
+
+    // 组合成目标格式
+    let formattedDate = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+    return formattedDate
 }

src/js/utils.js

@@ -71,8 +71,8 @@ const pageMap = {
 
 //导出时间天数
 const exportTimeLimit = {
-  defectTime: 90,
-  normalTime: 7,
+  defectTime: 365,
+  normalTime: 90,
   yiwuTime: 30,
 };
 
@@ -136,9 +136,9 @@ window.abortAjax = '';
 
 const post = function (url, data, opts) {
   const token = localStorage.getItem('accessToken');
-  if(localStorage.getItem('toLogin')==='1'&&token){
+  if (localStorage.getItem('toLogin') === '1' && token) {
     //如果前面已经被标记为登录失效，接下来的请求都不发送
-    return new Promise(()=>{});
+    return new Promise(() => { });
   }
   let isPlacefile = getCookie('isPlacefile') || 1;
   if (!token && window.location.href.indexOf('login') == -1) {
@@ -173,60 +173,60 @@ const post = function (url, data, opts) {
       })),
       contentType: 'application/json; charset=UTF-8',
       beforeSend: function (xmlHttp) {
-        if(url.indexOf("sys/user/getHospitalMark")===-1){
-		  xmlHttp.setRequestHeader('If-Modified-Since', '0');
-		  xmlHttp.setRequestHeader('Cache-Control', 'no-cache');
-		  xmlHttp.setRequestHeader('Authorization', token ? 'Bearer ' + token : '');
+        if (url.indexOf("sys/user/getHospitalMark") === -1) {
+          xmlHttp.setRequestHeader('If-Modified-Since', '0');
+          xmlHttp.setRequestHeader('Cache-Control', 'no-cache');
+          xmlHttp.setRequestHeader('Authorization', token ? 'Bearer ' + token : '');
         }
       },
       success: function (resq) {
-        const doc = parent?parent.document:document;
+        const doc = parent ? parent.document : document;
         //console.log($(doc).find(".alertModal:visible"))
-		//失效后不点知道了直接刷新处理：跳回登录页
-		if(localStorage.getItem('toLogin')==='1'&&$(doc).find(".alertModal:visible").length===0){
-		  (parent||window).location.href='login.html';
-		}
-        let res=resq;
-        if(typeof resq ==='string'){
+        //失效后不点知道了直接刷新处理：跳回登录页
+        if (localStorage.getItem('toLogin') === '1' && $(doc).find(".alertModal:visible").length === 0) {
+          (parent || window).location.href = 'login.html';
+        }
+        let res = resq;
+        if (typeof resq === 'string') {
           res = JSON.parse(resq);
         }
         const code = res.code;
-		const isOut = code === '10020011' || code === '10020012' || code === '10020013';
-        if(isOut){
+        const isOut = code === '10020011' || code === '10020012' || code === '10020013';
+        if (isOut) {
           //登录信息失效处理
-		  unloginPop(res.msg);
-        }else{
-		  resolve({
-			data: res
-		  });
+          unloginPop(res.msg);
+        } else {
+          resolve({
+            data: res
+          });
         }
       },
       error: function (error) {
-          if (error.status === 403 || error.status === 401) {
-            setCookie('behosDateStart', '');
-            setCookie('behosDateEnd', '');
-            if (!token && window.location.href.indexOf('login') == -1) {
-            } else {
-              if($(".alertModal:visible").length){
-                return;
-              }
-              $.alerModal({
-                "message": "没有该权限"+error.status,
-                type: "tip",
-                time: '1000',
-                isFather: true,
-                fatherWrapper: $("#mainBox", parent.document)
-              });
+        if (error.status === 403 || error.status === 401) {
+          setCookie('behosDateStart', '');
+          setCookie('behosDateEnd', '');
+          if (!token && window.location.href.indexOf('login') == -1) {
+          } else {
+            if ($(".alertModal:visible").length) {
+              return;
             }
-          } else if (error.status === 500 || error.status === 501 || error.status === 404) {
             $.alerModal({
-              "message": '接口错误',
+              "message": "没有该权限" + error.status,
               type: "tip",
               time: '1000',
               isFather: true,
               fatherWrapper: $("#mainBox", parent.document)
             });
           }
+        } else if (error.status === 500 || error.status === 501 || error.status === 404) {
+          $.alerModal({
+            "message": '接口错误',
+            type: "tip",
+            time: '1000',
+            isFather: true,
+            fatherWrapper: $("#mainBox", parent.document)
+          });
+        }
         reject(error);
       },
     });
@@ -234,39 +234,39 @@ const post = function (url, data, opts) {
 };
 
 //登录失效弹窗处理
-function unloginPop(msg){
+function unloginPop(msg) {
   /*const isOut = code === '10020011' || code === '10020012' || code === '10020013';
   if(isOut){*/
-  const isQcScore = parent&&parent.location.href.indexOf("qcScore.html")===-1;
-    if(self != top&&isQcScore){//子窗口并且不是病例列表
-	  const dialogmessage = {
-		iframemessage: 1,
-		data: msg
-	  }
-	  console.log('子窗口')
-	  window.parent.postMessage(JSON.stringify(dialogmessage), '*')
-    }else{
-	  console.log('父窗口')
-	  $.alerModal({
-		gobackBtn: true,
-		title: "提示",
-		type: "modal",
-		width: '470',
-		time: 1000,
-		cancalText: '我知道了',
-		isFather: true,
-		fatherWrapper: $("#mainBox", parent.document),
-		sureBtn: false,
-		message: msg || '登录过期',
-		callback: function () {
-          (parent||window).location.href = 'login.html'
-		}
-	  });
-	  //失效后不点知道了直接刷新处理标记
-      localStorage.setItem('toLogin',1);
+  const isQcScore = parent && parent.location.href.indexOf("qcScore.html") === -1;
+  if (self != top && isQcScore) {//子窗口并且不是病例列表
+    const dialogmessage = {
+      iframemessage: 1,
+      data: msg
     }
+    console.log('子窗口')
+    window.parent.postMessage(JSON.stringify(dialogmessage), '*')
+  } else {
+    console.log('父窗口')
+    $.alerModal({
+      gobackBtn: true,
+      title: "提示",
+      type: "modal",
+      width: '470',
+      time: 1000,
+      cancalText: '我知道了',
+      isFather: true,
+      fatherWrapper: $("#mainBox", parent.document),
+      sureBtn: false,
+      message: msg || '登录过期',
+      callback: function () {
+        (parent || window).location.href = 'login.html'
+      }
+    });
+    //失效后不点知道了直接刷新处理标记
+    localStorage.setItem('toLogin', 1);
+  }
   /*}else{
-	callback()
+  callback()
   }*/
 
 }

webpack.config.js

@@ -10,7 +10,8 @@ const glob = require('glob');
 // const proxyHost = "http://192.168.2.236:5858";
 // const proxyHost = "http://192.168.3.184:5859";
 // const proxyHost = "http://172.16.8.64:5858"; //正式
-const proxyHost = "http://172.16.8.12:5859";
+// const proxyHost = "http://172.16.8.12:5859";
+const proxyHost = "http://172.16.8.60:5858/";
 // const proxyHost = "http://www.diagbot.net:5858/"; //测试
 // const proxyHost = "http://192.168.4.222:5858";
 // const proxyHost = "http://192.168.3.117:5858";//铁钢
@@ -18,8 +19,8 @@ const proxyHost = "http://172.16.8.12:5859";
 
 
 let entries = {
-    vendor: 'lodash'
-  },
+  vendor: 'lodash'
+},
   plugines = [];
 
 function getentries() {
@@ -118,52 +119,52 @@ module.exports = {
   module: {
     noParse: /WdatePicker/,
     rules: [{
-        test: /.js$/,
-        enforce: 'post',
-        loader: 'es3ify-loader'
-      },
-      {
-        test: /\.m?js$/,
-        exclude: /(node_modules|bower_components)/,
-        use: {
-          loader: 'babel-loader',
-          options: {
-            presets: ['@babel/preset-env']
-          }
+      test: /.js$/,
+      enforce: 'post',
+      loader: 'es3ify-loader'
+    },
+    {
+      test: /\.m?js$/,
+      exclude: /(node_modules|bower_components)/,
+      use: {
+        loader: 'babel-loader',
+        options: {
+          presets: ['@babel/preset-env']
         }
+      }
+    },
+    {
+      test: /\.css$/,
+      use: [{
+        loader: MiniCssExtractPlugin.loader
       },
-      {
-        test: /\.css$/,
-        use: [{
-            loader: MiniCssExtractPlugin.loader
-          },
-          'css-loader'
-        ]
-      },
-      {
-        test: /\.less$/,
-        use: [{
-            loader: MiniCssExtractPlugin.loader
-          },
-          'css-loader', 'less-loader'
-        ]
+        'css-loader'
+      ]
+    },
+    {
+      test: /\.less$/,
+      use: [{
+        loader: MiniCssExtractPlugin.loader
       },
-      {
-        test: /\.(png|gif|jpg|jpeg|svg|eot|ttf|woff|woff2)$/,
-        use: [{
-          loader: 'url-loader',
-          options: {
-            limit: 10240,
-            esModule: false,
-            name: '[name]_[hash:6].[ext]',
-            outputPath: 'images/'
-          }
-        }],
-        exclude: /node_modules/
-      }, {
-        test: /.html$/,
-        use: 'html-withimg-loader'
-      }
+        'css-loader', 'less-loader'
+      ]
+    },
+    {
+      test: /\.(png|gif|jpg|jpeg|svg|eot|ttf|woff|woff2)$/,
+      use: [{
+        loader: 'url-loader',
+        options: {
+          limit: 10240,
+          esModule: false,
+          name: '[name]_[hash:6].[ext]',
+          outputPath: 'images/'
+        }
+      }],
+      exclude: /node_modules/
+    }, {
+      test: /.html$/,
+      use: 'html-withimg-loader'
+    }
     ]
   },
   // devtool: 'cheap-module-eval-source-map', //开发环境cheap-module-eval-source-map   //生产环境cheap-module-source-map