From f8668b057747f2982afafcc1ce9a2842a4abd50c Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期三, 29 十一月 2023 16:36:39 +0800
Subject: [PATCH] 1、设备车间管理页面车间名称新增、修改以及批量删除成功后提示为warning图标 2、设备车间管理页面调整修改车间信息中的排序字段由departOrder为productionOrder 3、删除树节点时需判断节点下是否有子节点，若有子节点则不能删除并提示 4、大屏车间管理页面左右两侧卡片区域布局保持一致 5、设备综合效率分析页面由于ant-design-vie的table组件固定列功能导致导出报表布局混乱

---
 src/utils/util.js |   62 ++++++++++++++++++++++++++++++
 1 files changed, 61 insertions(+), 1 deletions(-)

diff --git a/src/utils/util.js b/src/utils/util.js
index 9200d75..fd76ae4 100644
--- a/src/utils/util.js
+++ b/src/utils/util.js
@@ -626,4 +626,64 @@
       },
     })
   }
-}
\ No newline at end of file
+}
+
+/**
+ * 浼戠湢
+ * @param ms 姣
+ * @return {Promise<unknown>}
+ */
+export function sleep(ms) {
+  return new Promise(function (resolve) {
+    return setTimeout(resolve, ms);
+  });
+}
+
+/**
+ * 鑾峰彇鎸囧畾鐨� $refs 瀵硅薄
+ * 鏈夋椂鍊欏彲鑳戒細閬囧埌缁勪欢鏈寕杞藉埌椤甸潰涓殑鎯呭喌锛屽鑷存棤娉曡幏鍙� $refs 涓殑鏌愪釜瀵硅薄
+ * 杩欎釜鏂规硶鍙互绛夊緟鎸傝浇瀹屾垚涔嬪悗鍐嶈繑鍥� $refs 鐨勫璞★紝閬垮厤鎶ラ敊
+ *
+ * 鐢ㄦ硶绀轰緥锛歭et modalRef = getRefPromise(this, 'modal')
+ * @param vm vue瀹炰緥
+ * @param name 瑕佽幏鍙栫殑ref鍚嶇О
+ * @param noComment $el 鏍囩涓嶈兘鏄敞閲�
+ **/
+export function getRefPromise(vm, name, noComment = true) {
+  return new Promise((resolve) => {
+    (function next() {
+      let ref = vm.$refs[name]
+      if (ref && (noComment && ref.$el.tagName)) {
+        resolve(ref)
+      } else {
+        setTimeout(() => {
+          if (noComment) {
+            vm.$forceUpdate()
+          }
+          next()
+        }, 10)
+      }
+    })()
+  })
+}
+
+/**
+ * 瀵煎嚭鏂囦欢xlsx鐨刴ime-type
+ * xls:	application/vnd.ms-excel
+ * @type {string}
+ */
+export const EXPORT_MIME_TYPE = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
+/**
+ * 瀵煎嚭excel鏂囦欢鍚庣紑
+ * @type {string}
+ */
+export const EXPORT_FILE_SUFFIX = ".xlsx";
+
+/**
+ * 瀛楃涓叉槸鍚︿负null鎴杗ull瀛楃涓�
+ * @param str
+ * @return {boolean}
+ */
+export function stringIsNull(str) {
+  return str == null || str === 'null' || str === 'undefined';
+}

--
Gitblit v1.9.3