From 06d3d15a5a08637041cc601101c063b11b07a346 Mon Sep 17 00:00:00 2001
From: net <net@netdeMBP.lan>
Date: 星期五, 14 二月 2025 17:25:21 +0800
Subject: [PATCH] 合并理去杀杀人
---
zhitan-vue/src/utils/ruoyi.js | 207 ++++++++++++++++++++++++++++-----------------------
1 files changed, 115 insertions(+), 92 deletions(-)
diff --git a/zhitan-vue/src/utils/ruoyi.js b/zhitan-vue/src/utils/ruoyi.js
index 4efca08..74f7c30 100644
--- a/zhitan-vue/src/utils/ruoyi.js
+++ b/zhitan-vue/src/utils/ruoyi.js
@@ -1,5 +1,3 @@
-
-
/**
* 閫氱敤js鏂规硶灏佽澶勭悊
* Copyright (c) 2019 ruoyi
@@ -10,17 +8,20 @@
if (arguments.length === 0 || !time) {
return null
}
- const format = pattern || '{y}-{m}-{d} {h}:{i}:{s}'
+ const format = pattern || "{y}-{m}-{d} {h}:{i}:{s}"
let date
- if (typeof time === 'object') {
+ if (typeof time === "object") {
date = time
} else {
- if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
+ if (typeof time === "string" && /^[0-9]+$/.test(time)) {
time = parseInt(time)
- } else if (typeof time === 'string') {
- time = time.replace(new RegExp(/-/gm), '/').replace('T', ' ').replace(new RegExp(/\.[\d]{3}/gm), '');
+ } else if (typeof time === "string") {
+ time = time
+ .replace(new RegExp(/-/gm), "/")
+ .replace("T", " ")
+ .replace(new RegExp(/\.[\d]{3}/gm), "")
}
- if ((typeof time === 'number') && (time.toString().length === 10)) {
+ if (typeof time === "number" && time.toString().length === 10) {
time = time * 1000
}
date = new Date(time)
@@ -32,14 +33,16 @@
h: date.getHours(),
i: date.getMinutes(),
s: date.getSeconds(),
- a: date.getDay()
+ a: date.getDay(),
}
const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
let value = formatObj[key]
// Note: getDay() returns 0 on Sunday
- if (key === 'a') { return ['鏃�', '涓�', '浜�', '涓�', '鍥�', '浜�', '鍏�'][value] }
+ if (key === "a") {
+ return ["鏃�", "涓�", "浜�", "涓�", "鍥�", "浜�", "鍏�"][value]
+ }
if (result.length > 0 && value < 10) {
- value = '0' + value
+ value = "0" + value
}
return value || 0
})
@@ -49,89 +52,92 @@
// 琛ㄥ崟閲嶇疆
export function resetForm(refName) {
if (this.$refs[refName]) {
- this.$refs[refName].resetFields();
+ this.$refs[refName].resetFields()
}
}
// 娣诲姞鏃ユ湡鑼冨洿
export function addDateRange(params, dateRange, propName) {
- let search = params;
- search.params = typeof (search.params) === 'object' && search.params !== null && !Array.isArray(search.params) ? search.params : {};
- dateRange = Array.isArray(dateRange) ? dateRange : [];
- if (typeof (propName) === 'undefined') {
- search.params['beginTime'] = dateRange[0];
- search.params['endTime'] = dateRange[1];
+ let search = params
+ search.params =
+ typeof search.params === "object" && search.params !== null && !Array.isArray(search.params) ? search.params : {}
+ dateRange = Array.isArray(dateRange) ? dateRange : []
+ if (typeof propName === "undefined") {
+ search.params["beginTime"] = dateRange[0]
+ search.params["endTime"] = dateRange[1]
} else {
- search.params['begin' + propName] = dateRange[0];
- search.params['end' + propName] = dateRange[1];
+ search.params["begin" + propName] = dateRange[0]
+ search.params["end" + propName] = dateRange[1]
}
- return search;
+ return search
}
// 鍥炴樉鏁版嵁瀛楀吀
export function selectDictLabel(datas, value) {
if (value === undefined) {
- return "";
+ return ""
}
- var actions = [];
+ var actions = []
Object.keys(datas).some((key) => {
- if (datas[key].value == ('' + value)) {
- actions.push(datas[key].label);
- return true;
+ if (datas[key].value == "" + value) {
+ actions.push(datas[key].label)
+ return true
}
})
if (actions.length === 0) {
- actions.push(value);
+ actions.push(value)
}
- return actions.join('');
+ return actions.join("")
}
// 鍥炴樉鏁版嵁瀛楀吀锛堝瓧绗︿覆鏁扮粍锛�
export function selectDictLabels(datas, value, separator) {
- if (value === undefined || value.length ===0) {
- return "";
+ if (value === undefined || value.length === 0) {
+ return ""
}
if (Array.isArray(value)) {
- value = value.join(",");
+ value = value.join(",")
}
- var actions = [];
- var currentSeparator = undefined === separator ? "," : separator;
- var temp = value.split(currentSeparator);
+ var actions = []
+ var currentSeparator = undefined === separator ? "," : separator
+ var temp = value.split(currentSeparator)
Object.keys(value.split(currentSeparator)).some((val) => {
- var match = false;
+ var match = false
Object.keys(datas).some((key) => {
- if (datas[key].value == ('' + temp[val])) {
- actions.push(datas[key].label + currentSeparator);
- match = true;
+ if (datas[key].value == "" + temp[val]) {
+ actions.push(datas[key].label + currentSeparator)
+ match = true
}
})
if (!match) {
- actions.push(temp[val] + currentSeparator);
+ actions.push(temp[val] + currentSeparator)
}
})
- return actions.join('').substring(0, actions.join('').length - 1);
+ return actions.join("").substring(0, actions.join("").length - 1)
}
// 瀛楃涓叉牸寮忓寲(%s )
export function sprintf(str) {
- var args = arguments, flag = true, i = 1;
+ var args = arguments,
+ flag = true,
+ i = 1
str = str.replace(/%s/g, function () {
- var arg = args[i++];
- if (typeof arg === 'undefined') {
- flag = false;
- return '';
+ var arg = args[i++]
+ if (typeof arg === "undefined") {
+ flag = false
+ return ""
}
- return arg;
- });
- return flag ? str : '';
+ return arg
+ })
+ return flag ? str : ""
}
// 杞崲瀛楃涓诧紝undefined,null绛夎浆鍖栦负""
export function parseStrEmpty(str) {
if (!str || str == "undefined" || str == "null") {
- return "";
+ return ""
}
- return str;
+ return str
}
// 鏁版嵁鍚堝苟
@@ -139,16 +145,16 @@
for (var p in target) {
try {
if (target[p].constructor == Object) {
- source[p] = mergeRecursive(source[p], target[p]);
+ source[p] = mergeRecursive(source[p], target[p])
} else {
- source[p] = target[p];
+ source[p] = target[p]
}
} catch (e) {
- source[p] = target[p];
+ source[p] = target[p]
}
}
- return source;
-};
+ return source
+}
/**
* 鏋勯�犳爲鍨嬬粨鏋勬暟鎹�
@@ -159,88 +165,105 @@
*/
export function handleTree(data, id, parentId, children) {
let config = {
- id: id || 'id',
- parentId: parentId || 'parentId',
- childrenList: children || 'children'
- };
+ id: id || "id",
+ parentId: parentId || "parentId",
+ childrenList: children || "children",
+ }
- var childrenListMap = {};
- var nodeIds = {};
- var tree = [];
+ var childrenListMap = {}
+ var nodeIds = {}
+ var tree = []
for (let d of data) {
- let parentId = d[config.parentId];
+ let parentId = d[config.parentId]
if (childrenListMap[parentId] == null) {
- childrenListMap[parentId] = [];
+ childrenListMap[parentId] = []
}
- nodeIds[d[config.id]] = d;
- childrenListMap[parentId].push(d);
+ nodeIds[d[config.id]] = d
+ childrenListMap[parentId].push(d)
}
for (let d of data) {
- let parentId = d[config.parentId];
+ let parentId = d[config.parentId]
if (nodeIds[parentId] == null) {
- tree.push(d);
+ tree.push(d)
}
}
for (let t of tree) {
- adaptToChildrenList(t);
+ adaptToChildrenList(t)
}
function adaptToChildrenList(o) {
if (childrenListMap[o[config.id]] !== null) {
- o[config.childrenList] = childrenListMap[o[config.id]];
+ o[config.childrenList] = childrenListMap[o[config.id]]
}
if (o[config.childrenList]) {
for (let c of o[config.childrenList]) {
- adaptToChildrenList(c);
+ adaptToChildrenList(c)
}
}
}
- return tree;
+ return tree
}
/**
-* 鍙傛暟澶勭悊
-* @param {*} params 鍙傛暟
-*/
+ * 鍙傛暟澶勭悊
+ * @param {*} params 鍙傛暟
+ */
export function tansParams(params) {
- let result = ''
+ let result = ""
for (const propName of Object.keys(params)) {
- const value = params[propName];
- var part = encodeURIComponent(propName) + "=";
- if (value !== null && value !== "" && typeof (value) !== "undefined") {
- if (typeof value === 'object') {
+ const value = params[propName]
+ var part = encodeURIComponent(propName) + "="
+ if (value !== null && value !== "" && typeof value !== "undefined") {
+ if (typeof value === "object") {
for (const key of Object.keys(value)) {
- if (value[key] !== null && value[key] !== "" && typeof (value[key]) !== 'undefined') {
- let params = propName + '[' + key + ']';
- var subPart = encodeURIComponent(params) + "=";
- result += subPart + encodeURIComponent(value[key]) + "&";
+ if (value[key] !== null && value[key] !== "" && typeof value[key] !== "undefined") {
+ let params = propName + "[" + key + "]"
+ var subPart = encodeURIComponent(params) + "="
+ result += subPart + encodeURIComponent(value[key]) + "&"
}
}
} else {
- result += part + encodeURIComponent(value) + "&";
+ result += part + encodeURIComponent(value) + "&"
}
}
}
return result
}
-
// 杩斿洖椤圭洰璺緞
export function getNormalPath(p) {
- if (p.length === 0 || !p || p == 'undefined') {
+ if (p.length === 0 || !p || p == "undefined") {
return p
- };
- let res = p.replace('//', '/')
- if (res[res.length - 1] === '/') {
+ }
+ let res = p.replace("//", "/")
+ if (res[res.length - 1] === "/") {
return res.slice(0, res.length - 1)
}
- return res;
+ return res
}
// 楠岃瘉鏄惁涓篵lob鏍煎紡
export function blobValidate(data) {
- return data.type !== 'application/json'
+ return data.type !== "application/json"
+}
+
+// 閫氱敤涓嬭浇鏂规硶
+const baseURL = import.meta.env.VITE_APP_BASE_API
+export function download(fileName) {
+ window.location.href = baseURL + "/common/download?fileName=" + encodeURI(fileName) + "&delete=" + true
+}
+
+// 閫氱敤涓嬭浇鏂规硶 showfileName锛氫笅杞藉悗鐨勬枃浠跺悕绉板甫鎵╁睍鍚�;filePath:瑕佷笅杞芥枃浠剁殑缁濆璺緞,甯︾潃鏂囦欢鍚嶅拰鎵╁睍鍚嶏紱deleteflage涓嬭浇瀹屾垚鍚庢槸鍚﹀垹闄ゆ枃浠�
+export function fileDownload(showfileName, filePath, deleteflage) {
+ window.location.href =
+ baseURL +
+ "/common/downloadAssign?showFileName=" +
+ encodeURI(showfileName) +
+ "&filePath=" +
+ encodeURI(filePath) +
+ "&delete=" +
+ deleteflage
}
--
Gitblit v1.9.3