From b848a5cbbcc80c994aaf6156c365ce725867ad57 Mon Sep 17 00:00:00 2001
From: “dzb” <2632970487@qq.com>
Date: 星期四, 13 十月 2022 17:57:58 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui
---
src/utils/helper.js | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/src/utils/helper.js b/src/utils/helper.js
index dcb709e..e8e2d20 100644
--- a/src/utils/helper.js
+++ b/src/utils/helper.js
@@ -1,7 +1,6 @@
-import { hash } from "immutable";
-
+import myrequest from './request'
// 娣辨嫹璐�
-function deepClone(obj) {
+export function deepClone(obj) {
let objClone = Array.isArray(obj) ? [] : {};
if (obj && typeof obj === 'object' && obj != null) {
for (let key in obj) {
@@ -17,10 +16,22 @@
return objClone;
}
// 璁＄畻闄愬埗鏃堕棿
-function computeTime(time2) {
+export function computeTime(time2) {
const t1 = new Date();
const t2 = new Date(time2);
return filterTime(t2.getTime() - t1.getTime());
+}
+// 鑾峰彇瀛楀吀琛�
+export async function getTypeList(level,code){
+ let arr;
+ await myrequest({
+ method:'get',
+ url:`sccg/dict/query_type?level=${level}&typeCode=${code}`
+ })
+ .then(res=>{
+ arr = res.data;
+ })
+ return arr;
}
function filterTime(time) {
if (time < 0) {
@@ -29,7 +40,6 @@
let dd = Math.floor(time/24/60/60/1000),
hh = Math.floor(time/60/60/1000-dd*24),
mi = Math.floor(time/60/1000-dd*24*60-hh*60);
- console.log(dd, hh, mi)
return addDay(fillTime(dd)) + addHour(fillTime(hh)) + addMin(fillTime(mi));
}
function fillTime(num) {
@@ -40,23 +50,22 @@
}
function addDay(str) {
str = parseFloat(str);
- if (str <= 0) {
+ if (str <0) {
return;
}
return str + '澶�'
}
function addHour(str) {
str = parseFloat(str);
- if (str <= 0) {
+ if (str <0) {
return;
}
return str + '灏忔椂'
}
function addMin(str) {
str = parseFloat(str);
- if (str <= 0) {
+ if (str < 0) {
return;
}
return str + '鍒嗛挓'
}
-export { deepClone, computeTime };
--
Gitblit v1.8.0