From f0524f158d89a91ac0dfb758405afa302149442a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 30 四月 2024 01:57:40 +0800
Subject: [PATCH] 2024-04-30

---
 src/utils/utils-datamanage.js |   64 ++++++++++++++++++++++++++-----
 1 files changed, 53 insertions(+), 11 deletions(-)

diff --git a/src/utils/utils-datamanage.js b/src/utils/utils-datamanage.js
index 91e58db..6210d62 100644
--- a/src/utils/utils-datamanage.js
+++ b/src/utils/utils-datamanage.js
@@ -1,16 +1,13 @@
 import md5 from 'md5'
 import moment from 'moment'
+import { notification, Modal } from 'antd'
+
+import MKEmitter from '@/utils/events.js'
 import Utils from './utils.js'
 
 export default class DataUtils {
   /**
-   * @description 鏁版嵁婧愬悕绉帮紝鐢ㄤ簬缁熶竴鏌ヨ
-   * @param {Object}   setting      鏁版嵁婧愯缃�
-   * @param {Array}    search       鎼滅储鏉′欢
-   * @param {String}   orderBy      鎺掑簭鏂瑰紡
-   * @param {Number}   pageIndex    椤电爜
-   * @param {Number}   pageSize     姣忛〉鏁伴噺
-   * @param {String}   BID          涓婄骇ID
+   * @description 鏁版嵁婧愮粺涓�鏌ヨ
    */
   static getQueryDataParams (setting, search = [], orderBy = '', pageIndex = 1, pageSize = 10, BID, id, year) {
     let param = null
@@ -49,6 +46,10 @@
       param.PageSize = pageSize
     } else if (setting.$re_year) {
       param.mk_year = year
+    }
+
+    if (setting.hasExtend) {
+      param.mk_time = setting.extendTime
     }
 
     if (setting.interType === 'inner') {
@@ -153,6 +154,9 @@
       { reg: /@typename@/ig, value: `'admin'`},
     )
 
+    if (setting.hasExtend) {
+      regoptions.push({ reg: /@mk_time@/ig, value: setting.extendTime })
+    }
     if (setting.$re_year) {
       regoptions.push({ reg: /@mk_year@/ig, value: year })
     }
@@ -297,7 +301,7 @@
 
     // exec_type 瑙ｇ爜瀛楁锛歀Text銆丩Text1銆丩Text2銆乧ustom_script銆丏ateCount
 
-    param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
+    param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss.SSS')
     param.secretkey = Utils.encrypt('', param.timestamp)
 
     param.username = userName
@@ -442,6 +446,46 @@
 
     return param
   }
+
+  /**
+   * @description 鏁版嵁鑾峰彇鎴愬姛
+   */
+  static querySuccess (result) {
+    if (!result.message) return
+
+    if (result.ErrCode === 'Y') {
+      Modal.success({
+        title: result.message
+      })
+    } else if (result.ErrCode === 'S') {
+      notification.success({
+        top: 92,
+        message: result.message,
+        duration: 2
+      })
+    }
+  }
+
+  /**
+   * @description 鏁版嵁鑾峰彇澶辫触
+   */
+  static queryFail (result) {
+    if (!result.message && result.ErrCode !== 'version_up') return
+    
+    if (result.ErrCode === 'N') {
+      Modal.error({
+        title: result.message,
+      })
+    } else if (result.ErrCode === 'version_up') {
+      MKEmitter.emit('reloadTabs')
+    } else if (result.ErrCode !== '-2') {
+      notification.error({
+        top: 92,
+        message: result.message,
+        duration: 10
+      })
+    }
+  }
 }
 
 /**
@@ -572,9 +616,7 @@
     fullName: sessionStorage.getItem('Full_Name') || ''
   }
 
-  if (config.MenuName) {
-    param.menuname = config.MenuName
-  }
+  param.menuname = config.MenuName || config.$menuname || ''
 
   param.exec_type = window.GLOB.execType || 'y'
   param.LText = Utils.formatOptions(_LText.join(' union all '), param.exec_type)

--
Gitblit v1.8.0