From dab30417bd8782aa676c41a61e3ab1a51ad3b5ba Mon Sep 17 00:00:00 2001
From: yangzhq68909 <993367776@qq.com>
Date: Fri, 13 Jun 2025 16:27:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=B7=E5=81=87=E3=80=81=E5=B9=B2=E7=A7=9F?=
 =?UTF-8?q?=E8=BD=A6=E3=80=81=E5=85=AC=E6=96=87=E5=8F=91=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 env/.env.development                         |   4 +-
 src/api/bpm/index.ts                         |  42 ++++++-
 src/pages-bpm/carRental/index.vue            |   4 +-
 src/pages-bpm/document/index.vue             |  56 +++++++++
 src/pages-bpm/leaveApplication/index.vue     |   4 +-
 src/pages-bpm/zbkh/index.vue                 | 113 +++++++++++++++++++
 src/pages-humanResource/absence/detail.vue   |   4 +-
 src/pages-humanResource/absence/index.vue    |   1 +
 src/pages-operate/file/detail.vue            |   7 +-
 src/pages-process/components/DynamicLink.vue |  26 ++---
 src/pages-process/components/taskDeal.vue    |   1 -
 src/pages-process/taskHandle.vue             |  10 --
 src/pages.json                               |   8 ++
 src/pages/index/index.vue                    |  83 +++++++++++---
 src/pages/login/login.vue                    |   6 +-
 src/pages/onlinePreview/detail.vue           |   2 -
 src/types/uni-pages.d.ts                     |   4 +-
 src/utils/index.ts                           |  22 ++++
 18 files changed, 338 insertions(+), 59 deletions(-)
 create mode 100644 src/pages-bpm/document/index.vue
 create mode 100644 src/pages-bpm/zbkh/index.vue

diff --git a/env/.env.development b/env/.env.development
index 09ee786..c78f0dc 100644
--- a/env/.env.development
+++ b/env/.env.development
@@ -4,6 +4,6 @@ NODE_ENV = 'development'
 VITE_DELETE_CONSOLE = false
 # 是否开启sourcemap
 VITE_SHOW_SOURCEMAP = true
-VITE_SERVER_BASEURL = 'http://10.75.15.249:8080/jeecg-boot'
+#VITE_SERVER_BASEURL = 'http://10.75.15.249:8080/jeecg-boot'
 #VITE_SERVER_BASEURL = 'https://36.112.48.190/jeecg-boot'
-#VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/jeecg-boot'
\ No newline at end of file
+VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/jeecg-boot'
\ No newline at end of file
diff --git a/src/api/bpm/index.ts b/src/api/bpm/index.ts
index 0da8602..716e0d0 100644
--- a/src/api/bpm/index.ts
+++ b/src/api/bpm/index.ts
@@ -1,10 +1,48 @@
 import { http } from '@/utils/http';
 
-/*通过id查询数据*/
+/*通过id查询公文数据*/
+export function queryDocumentByIdApi(id : string) {
+	return http({
+		url: '/cxcoagwfb/cxcOaGwfb/queryById',
+		method: 'GET',
+		data: { id }
+	})
+}
+
+
+/*通过id查询干租车数据*/
 export function queryCarRentalByIdApi(id : string) {
 	return http({
 		url: '/CarRental/cxcCarRental/queryById',
 		method: 'GET',
 		data: { id }
 	})
-}
\ No newline at end of file
+}
+
+/*通过id查询指标考核主表数据*/
+export function queryZbkhZbByIdApi(id : string) {
+	return http({
+		url: '/jxkh.zbkh/cxcJxkhZbkhZb/listById',
+		method: 'GET',
+		data: { id }
+	})
+}
+
+/*通过id查询指标考核子表数据*/
+export function queryZbkhFbByIdApi(mainId : string) {
+	return http({
+		url: '/jxkh.zbkh/cxcJxkhZbkhZb/listCxcJxkhZbkhDwkhByMainId',
+		method: 'GET',
+		data: { mainId }
+	})
+}
+
+/*通过id查询指标考核自定义表头*/
+export function queryZbkhBtByIdApi(mainId : string) {
+	return http({
+		url: '/jxkh.dwkhbt/cxcJxkhZbkhDwkhBtZb/listByMainId',
+		method: 'GET',
+		data: { mainId }
+	})
+}
+
diff --git a/src/pages-bpm/carRental/index.vue b/src/pages-bpm/carRental/index.vue
index fb73567..1366a9f 100644
--- a/src/pages-bpm/carRental/index.vue
+++ b/src/pages-bpm/carRental/index.vue
@@ -37,7 +37,7 @@
 	})
 
 	// 申请信息
-	const qjQueryById = () => {
+	const queryById = () => {
 		queryCarRentalByIdApi(props.formData.dataId).then((res) => {
 			if (res.success) {
 				info.value = res.result.records[0]
@@ -49,6 +49,6 @@
 	}
 
 	onMounted(() => {
-		qjQueryById()
+		queryById()
 	})
 </script>
\ No newline at end of file
diff --git a/src/pages-bpm/document/index.vue b/src/pages-bpm/document/index.vue
new file mode 100644
index 0000000..ae44163
--- /dev/null
+++ b/src/pages-bpm/document/index.vue
@@ -0,0 +1,56 @@
+<template>
+	<wd-cell-group title="申请信息">
+		<wd-cell title="发文字号" :value="info.fwzh" />
+		<wd-cell>
+			<template #title>
+				<view>
+					<view style="display: inline-block">发文标题</view>
+				</view>
+			</template>
+			<view style="color: blue;" @click="onlinePreview(info.wjbt)">
+			{{info.fwbt}}
+			</view>
+		</wd-cell>
+		<wd-cell title="发文日期" :value="info.fwtime" />
+		<wd-cell title="拟稿人" :value="info.ngr" />
+		<wd-cell title="拟稿人电话" :value="info.ngrdh" />
+		<wd-cell title="类别及代号" :value="info.wjlb" />
+		<wd-cell title="密级" :value="info.mj_dictText" />
+		<wd-cell title="主题词" :value="info.ztc" />
+		<wd-cell title="文件描述" :value="info.wjms" />
+		<wd-cell title="签发人" :value="info.qfr_dictText" />
+	</wd-cell-group>
+</template>
+
+<script setup>
+	import {
+		queryDocumentByIdApi
+	} from '@/api/bpm'
+
+	const info = ref({})
+	const props = defineProps({
+		formData: {
+			type: Object,
+			default: () => {},
+		}
+	})
+
+	// 申请信息
+	const queryById = () => {
+		queryDocumentByIdApi(props.formData.dataId).then((res) => {
+			if (res.success) {
+				info.value = res.result.records[0]
+			}
+		})
+	}
+
+	const onlinePreview = (e) => {
+		uni.navigateTo({
+			url: `/pages/onlinePreview/detail?data=${e}`
+		})
+	}
+
+	onMounted(() => {
+		queryById()
+	})
+</script>
\ No newline at end of file
diff --git a/src/pages-bpm/leaveApplication/index.vue b/src/pages-bpm/leaveApplication/index.vue
index 20d5ae5..29a49ce 100644
--- a/src/pages-bpm/leaveApplication/index.vue
+++ b/src/pages-bpm/leaveApplication/index.vue
@@ -41,7 +41,7 @@
 		});
 	}
 	// 申请信息
-	const qjQueryById = () => {
+	const queryById = () => {
 		queryByIdApi(props.formData.dataId).then((res) => {
 			if (res.success) {
 				info.value = res.result.records[0]
@@ -53,6 +53,6 @@
 	}
 
 	onMounted(() => {
-		qjQueryById()
+		queryById()
 	})
 </script>
\ No newline at end of file
diff --git a/src/pages-bpm/zbkh/index.vue b/src/pages-bpm/zbkh/index.vue
new file mode 100644
index 0000000..1b27d63
--- /dev/null
+++ b/src/pages-bpm/zbkh/index.vue
@@ -0,0 +1,113 @@
+<template>
+	<wd-tabbar fixed v-model="tabbar" shape="round">
+	  <wd-tabbar-item title="指标考核主表" icon="cart"></wd-tabbar-item>
+	  <wd-tabbar-item title="指标考核子表" icon="user"></wd-tabbar-item>
+	</wd-tabbar>
+	<wd-cell-group border v-if="tabbar == '0'">
+		<wd-cell size="large" title="年月" :value="zbInfo.year + '年' + zbInfo.month + '月'" />
+		<wd-cell size="large" title="考核指标" :value="zbInfo.assessmentIndicators" />
+		<wd-cell size="large" title="指标类别" :value="zbInfo.indicatorCategory_dictText" />
+		<wd-cell size="large" title="考核对象" :value="zbInfo.templetName_dictText" />
+		<wd-cell size="large" title="考核周期" :value="zbInfo.assessmentCycle_dictText" />
+		<wd-cell size="large" title="考核部门" :value="zbInfo.assessmentDepart_dictText" />
+		<wd-collapse v-model="zbCollapse">
+			<wd-collapse-item title="评价方法" name="评价方法">{{zbInfo.evaluationMethod}}</wd-collapse-item>
+		</wd-collapse>
+		<wd-cell size="large">
+			<template #title>
+				<view>
+					<view style="display: inline-block">考核附件</view>
+				</view>
+			</template>
+			<view style="color: blue;" @click="onlinePreview(zbInfo.khfj)">
+				{{zbInfo.khfj}}
+			</view>
+		</wd-cell>
+	</wd-cell-group>
+	<wd-collapse v-model="collapse" v-if="tabbar == '1'">
+		<wd-collapse-item v-for="(fbItem, fbIndex) in fbInfo" :key="fbIndex" :title="fbItem.depart_dictText"
+			:name="'item' + (fbIndex + 1)">
+			<wd-cell v-for="(btItem, btIndex) in btInfo" :key="btIndex" :title="btItem.name"
+				:value="getDwkhValue(fbItem, btItem.id)" />
+			<wd-cell>
+				<template #title>
+					<view>
+						<view style="display: inline-block">附件</view>
+					</view>
+				</template>
+				<view style="color: blue;" @click="onlinePreview(fbItem.annex)">
+					{{getFilename(fbItem.annex)}}
+				</view>
+			</wd-cell>
+		</wd-collapse-item>
+	</wd-collapse>
+</template>
+
+<script setup>
+	import {
+		queryZbkhZbByIdApi,
+		queryZbkhFbByIdApi,
+		queryZbkhBtByIdApi
+	} from '@/api/bpm'
+	import {
+		getFilename
+	} from '@/utils'
+	const tabbar = ref(0)
+	const zbInfo = ref({})
+	const fbInfo = ref([])
+	const btInfo = ref([])
+	const btDataInfo = ref([])
+	const zbCollapse = ref(['评价方法'])
+	const collapse = ref(['item1'])
+
+	const props = defineProps({
+		formData: {
+			type: Object,
+			default: () => {},
+		}
+	})
+
+	const queryById = async () => {
+		// 1. 获取主表数据
+		const zbRes = await queryZbkhZbByIdApi(props.formData.dataId);
+		if (zbRes.success) {
+			zbInfo.value = zbRes.result.records[0];
+			// 2. 获取指标模板数据（btInfo）
+			if (zbInfo.value.dwkhBtId) {
+				const btRes = await queryZbkhBtByIdApi(zbInfo.value.dwkhBtId);
+				btInfo.value = btRes.result;
+			}
+		}
+		// 3. 获取子表数据（fbInfo）
+		const fbRes = await queryZbkhFbByIdApi(props.formData.dataId);
+		fbInfo.value = fbRes.result.records;
+	};
+
+	const getDwkhValue = (fbItem, btId) => {
+		if (!fbItem.dwkhSaves) return ''; // 如果没有 dwkhSaves，返回空
+		const found = fbItem.dwkhSaves.find(item => item.dwkhBtId === btId);
+		return found ? found.value : '';
+	};
+
+	const onlinePreview = (e) => {
+		uni.navigateTo({
+			url: `/pages/onlinePreview/detail?data=${e}`
+		})
+	}
+
+	onMounted(() => {
+		queryById()
+	})
+</script>
+
+<style lang="scss">
+/* 手动引入 wd-segmented 样式 */
+@import 'wot-design-uni/components/wd-segmented/index.scss';
+
+/* 或直接覆盖关键样式 */
+.wd-segmented {
+  /* 确保样式优先级 */
+  opacity: 1 !important;
+  visibility: visible !important;
+}
+</style>
\ No newline at end of file
diff --git a/src/pages-humanResource/absence/detail.vue b/src/pages-humanResource/absence/detail.vue
index 5c45dd6..8fe62d8 100644
--- a/src/pages-humanResource/absence/detail.vue
+++ b/src/pages-humanResource/absence/detail.vue
@@ -67,7 +67,9 @@
 			if (res.success) {
 				info.value = res.result.records[0]
 				minDate.value = dateStringToTimestamp(info.value.begintime)
-				image.value = info.value.path.split(',').map(path => imgUrl(path))
+				if(image.value.path){
+					image.value = info.value.path.split(',').map(path => imgUrl(path))
+				}
 			}
 		})
 	}
diff --git a/src/pages-humanResource/absence/index.vue b/src/pages-humanResource/absence/index.vue
index 23df1bd..b383575 100644
--- a/src/pages-humanResource/absence/index.vue
+++ b/src/pages-humanResource/absence/index.vue
@@ -118,6 +118,7 @@
 			pageSize
 		}).then((res) => {
 			if (res.success) {
+				console.log('----',res.result.records)
 				list.value = [...list.value, ...res.result.records]
 			}
 			loading = false
diff --git a/src/pages-operate/file/detail.vue b/src/pages-operate/file/detail.vue
index 310104f..f93bb7a 100644
--- a/src/pages-operate/file/detail.vue
+++ b/src/pages-operate/file/detail.vue
@@ -19,7 +19,7 @@
 			<wd-card title="解读材料">
 				<view style="color: blue;"
 					@click="onlinePreview(`/pages/onlinePreview/detail?data=${dataSource.jdwj}`)">
-					{{dataSource.jdwj}}
+					{{getFilename(dataSource.jdwj)}}
 				</view>
 			</wd-card>
 		</view>
@@ -33,7 +33,10 @@
 	import {
 		queryDataById
 	} from '@/api/pages/file'
-
+	import {
+		getFilename
+	} from '@/utils'
+	
 	const appStore = useAppStore()
 	const dataSource = ref({})
 
diff --git a/src/pages-process/components/DynamicLink.vue b/src/pages-process/components/DynamicLink.vue
index c7873b2..dc9c5e3 100644
--- a/src/pages-process/components/DynamicLink.vue
+++ b/src/pages-process/components/DynamicLink.vue
@@ -1,18 +1,18 @@
 <!-- component标签可以变换组件 -->
 <template>
 	<view>
-		<component :is="asyncComponent" :formData="formData" :history="history" :activeKey="activeKey" v-if="asyncComponent"
-			@getStampSuc="getStampSuccess"></component>
+		<component :is="asyncComponent" :formData="formData" :history="history" :activeKey="activeKey"
+			v-if="asyncComponent" @getStampSuc="getStampSuccess"></component>
 		<view v-else>该模块暂未建立审批页面！</view>
+		<wd-tabbar v-if="false">
+			<wd-tabbar-item></wd-tabbar-item>
+		</wd-tabbar>
 	</view>
 </template>
 <script setup lang="ts">
-	import { ref, reactive, onMounted, computed, watch, nextTick } from 'vue';
 	const compName = ref('');
 	const asyncComponent = ref(null);
 	const modules = import.meta.glob('/src/pages-bpm/**/*.vue');
-
-
 	defineOptions({
 		name: 'DynamicLink',
 		options: {
@@ -40,18 +40,18 @@
 	})
 	// 监听 option 变化
 	watch(() => props.path, (newVal) => {
-		if (newVal){
+		if (newVal) {
 			compName.value = newVal;
-			if(newVal.indexOf('index')==-1){
-				compName.value = newVal+'/index'
+			if (newVal.indexOf('index') == -1) {
+				compName.value = newVal + '/index'
 			}
-		} 
+		}
 		//动态加载页面
 		const comp = modules[`/src/pages-bpm/${compName.value}.vue`]
 		comp().then((myModule) => {
 			asyncComponent.value = myModule.default
 		}).catch(() => {
-		
+
 		})
 	}, {
 		deep: true,
@@ -69,8 +69,4 @@
 		//   esignTag: val
 		// });
 	}
-</script>
-
-<style lang="scss" scoped>
-
-</style>
\ No newline at end of file
+</script>
\ No newline at end of file
diff --git a/src/pages-process/components/taskDeal.vue b/src/pages-process/components/taskDeal.vue
index eed1a6f..3d0e78e 100644
--- a/src/pages-process/components/taskDeal.vue
+++ b/src/pages-process/components/taskDeal.vue
@@ -189,7 +189,6 @@
 </template>
 
 <script setup lang="ts">
-	import { ref, reactive, onMounted, computed, watch, nextTick } from 'vue';
 	import SelectUserModal from '@/components/SelectUser/components/SelectUserModal.vue'
 	import { getFileAccessHttpUrl } from '@/common/uitls'
 	import { useQueue } from 'wot-design-uni'
diff --git a/src/pages-process/taskHandle.vue b/src/pages-process/taskHandle.vue
index a0ef399..da7e380 100644
--- a/src/pages-process/taskHandle.vue
+++ b/src/pages-process/taskHandle.vue
@@ -52,16 +52,6 @@
 </template>
 
 <script setup lang="ts">
-	import {
-		ref,
-		computed
-	} from 'vue'
-	import {
-		onLoad,
-		onShow,
-		onReachBottom,
-		onPullDownRefresh
-	} from '@dcloudio/uni-app';
 	import { useToast, useMessage } from 'wot-design-uni'
 	import {
 		useAppStore
diff --git a/src/pages.json b/src/pages.json
index ae75715..2245d05 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -521,9 +521,17 @@
           "path": "carRental/index",
           "type": "page"
         },
+        {
+          "path": "document/index",
+          "type": "page"
+        },
         {
           "path": "leaveApplication/index",
           "type": "page"
+        },
+        {
+          "path": "zbkh/index",
+          "type": "page"
         }
       ]
     }
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 1b981c6..4c4545c 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -9,7 +9,7 @@
 </route>
 <template>
 	<PageLayout :navbarShow="false">
-		<view class="nav" >
+		<view class="nav">
 			<view class="nav_box">
 				<view class="weather_calender">
 					<view class="position position-left">
@@ -103,8 +103,10 @@
 	import {
 		taskListApi
 	} from '@/api/process'
-	import { isH5 } from '@/utils/platform'
-	
+	import {
+		isH5
+	} from '@/utils/platform'
+
 	defineOptions({
 		name: 'index',
 		options: {
@@ -148,7 +150,6 @@
 		})
 	}
 
-
 	const goPageMore = (page) => {
 		router.replace({
 			name: 'more',
@@ -159,19 +160,69 @@
 		})
 	}
 
-	const queryCarousel = () => {
-		// 轮播图
-		queryCarouselApi({
-			zslb: 6
-		}).then((res) => {
-			if (res.success) {
-				let arr = res.result.records[0].wenjian.split(',')
-				carouselList.value = arr.map((item) => {
-					return getEnvBaseUrl() + '/sys/common/static/' + item
-				})
+	const queryCarousel = async () => {
+		// 1. 尝试从缓存获取
+		const cachedData = await getCarouselCache();
+		// 2. 如果有未过期的缓存，直接使用
+		if (cachedData) {
+			carouselList.value = cachedData.data;
+			// 3. 只有当缓存快过期时(例如剩余25%有效期)，才在后台更新
+			const cacheAge = Date.now() - cachedData.timestamp;
+			if (cacheAge > 24 * 60 * 60 * 1000 * 7 * 0.75) {   // 24小时 * 7缓存有效期
+				fetchAndUpdateCarousel(); // 后台静默更新
 			}
-		})
-	}
+			return;
+		}
+		// 4. 没有有效缓存，强制获取最新数据
+		await fetchAndUpdateCarousel();
+	};
+
+	const fetchAndUpdateCarousel = async () => {
+		try {
+			const res = await queryCarouselApi({
+				zslb: 6
+			});
+			if (res.success) {
+				const arr = res.result.records[0].wenjian.split(',');
+				const newData = arr.map(item => getEnvBaseUrl() + '/sys/common/static/' + item);
+				carouselList.value = newData;
+				setCarouselCache(newData);
+			}
+		} catch (error) {
+			console.error('更新轮播图失败:', error);
+		}
+	};
+
+	// 获取缓存（带时间戳验证）
+	const getCarouselCache = () => {
+		const cacheStr = uni.getStorageSync('carousel_data')
+		if (!cacheStr) return null;
+		try {
+			const {
+				data,
+				timestamp
+			} = JSON.parse(cacheStr);
+			if (Date.now() - timestamp < 24 * 60 * 60 * 1000 * 7) {
+				return {
+					data,
+					timestamp
+				};
+			}
+			uni.removeStorageSync('carousel_data');
+			return null;
+		} catch {
+			return null;
+		}
+	};
+
+	// 设置缓存（带时间戳）
+	const setCarouselCache = (data) => {
+		const cacheData = {
+			data,
+			timestamp: Date.now()
+		};
+		uni.setStorageSync('carousel_data', JSON.stringify(cacheData))
+	};
 
 	const queryModule = () => {
 		getUserPermissionApi({
diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue
index 2e1ebfd..d1cbda1 100644
--- a/src/pages/login/login.vue
+++ b/src/pages/login/login.vue
@@ -105,9 +105,9 @@
 		let pw = Base64.encode(encodeURIComponent(password.value))
 		loading.value = true
 		/*生产环境 begin */
-		// loginApi({ username: un, password: pw })
-			/*开发环境 begin */
-			loginApi({ username: userName.value, password: password.value, captcha: 'app' })
+		loginApi({ username: un, password: pw })
+		/*开发环境 begin */
+		// loginApi({ username: userName.value, password: password.value, captcha: 'app' })
 			.then((res : any) => {
 				if (res.success) {
 					const { result } = res
diff --git a/src/pages/onlinePreview/detail.vue b/src/pages/onlinePreview/detail.vue
index 9c780cc..7be16d3 100644
--- a/src/pages/onlinePreview/detail.vue
+++ b/src/pages/onlinePreview/detail.vue
@@ -58,7 +58,6 @@
 	}
 
 	onLoad((options) => {
-		console.log(2222)
 		detail.value = options.data
 		detailArr.value = options.data.split(",");
 		//#ifdef H5 || MP-WEIXIN
@@ -78,7 +77,6 @@
 	
 	onShow (()=>{
 		//页面卸载，如果是从
-		console.log(ifBackAll.value)
 		if(ifBackAll.value){
 			//直接返回上一级
 			uni.navigateBack({
diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts
index b109d57..8089fa2 100644
--- a/src/types/uni-pages.d.ts
+++ b/src/types/uni-pages.d.ts
@@ -57,7 +57,9 @@ interface NavigateToOptions {
        "/pages-process/myApplyProcess" |
        "/pages-process/taskHandle" |
        "/pages-bpm/carRental/index" |
-       "/pages-bpm/leaveApplication/index";
+       "/pages-bpm/document/index" |
+       "/pages-bpm/leaveApplication/index" |
+       "/pages-bpm/zbkh/index";
 }
 interface RedirectToOptions extends NavigateToOptions {}
 
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 3f3efc1..81bca06 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -445,4 +445,26 @@ export function getFileAccessHttpUrl(avatar, subStr) {
 			return getEnvBaseUrl() + "/sys/common/static/" + avatar;
 		}
 	}
+}
+
+/* 获取文件名 */
+export function getFilename(text : string) {
+	if (!text) {
+		return text === null ? null : ""; 
+	}
+	if (text.indexOf(',') > 0) {
+		let arr = text.split(",")
+		let filearr = []
+		for (let a = 0; a < arr.length; a++) {
+			//清除连续8到18位数字
+			let filename = arr[a].substr(arr[a].lastIndexOf('/') + 1, arr[a].length - arr[a].lastIndexOf(
+				'/')).replace(/_\d{8,18}|\d{8,18}/g, "");
+			filearr.push(filename)
+		}
+		return filearr
+	} else {
+		let filename = text.substr(text.lastIndexOf('/') + 1, text.length - text.lastIndexOf('/')).replace(/_\d{8,18}|\d{8,18}/g, "");
+		//清除连续8到18位数字
+		return filename
+	}
 }
\ No newline at end of file