From 2175a82f6c770858f13325a1da671283386cd81b Mon Sep 17 00:00:00 2001
From: yangzhq68909 <993367776@qq.com>
Date: Thu, 19 Jun 2025 17:38:54 +0800
Subject: [PATCH 01/16] =?UTF-8?q?1.=E6=B5=81=E7=A8=8B=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0=E8=80=83=E6=A0=B8=E5=AE=9E?=
 =?UTF-8?q?=E6=96=BD=E3=80=81=E6=8C=87=E6=A0=87=E8=80=83=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 env/.env.development                         |   2 +-
 src/api/bpm/index.ts                         |  48 +++-
 src/api/humanResource/clockin/index.ts       |  11 +
 src/pages-bpm/khss/index.vue                 | 230 +++++++++++++++++++
 src/pages-bpm/zbkh/index.vue                 | 178 ++++++++++----
 src/pages-humanResource/absence/index.vue    |   1 -
 src/pages-process/components/DynamicLink.vue |  39 ++--
 src/pages.json                               |   4 +
 src/pages/user/people.vue                    |  37 ++-
 src/store/index.ts                           |   4 +
 src/types/uni-pages.d.ts                     |   1 +
 src/utils/index.ts                           |   1 +
 12 files changed, 479 insertions(+), 77 deletions(-)
 create mode 100644 src/api/humanResource/clockin/index.ts
 create mode 100644 src/pages-bpm/khss/index.vue

diff --git a/env/.env.development b/env/.env.development
index 375d2cf..09ee786 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.247: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
diff --git a/src/api/bpm/index.ts b/src/api/bpm/index.ts
index 716e0d0..c7cc202 100644
--- a/src/api/bpm/index.ts
+++ b/src/api/bpm/index.ts
@@ -29,11 +29,11 @@ export function queryZbkhZbByIdApi(id : string) {
 }
 
 /*通过id查询指标考核子表数据*/
-export function queryZbkhFbByIdApi(mainId : string) {
+export function queryZbkhFbByIdApi(data : object) {
 	return http({
 		url: '/jxkh.zbkh/cxcJxkhZbkhZb/listCxcJxkhZbkhDwkhByMainId',
 		method: 'GET',
-		data: { mainId }
+		data
 	})
 }
 
@@ -46,3 +46,47 @@ export function queryZbkhBtByIdApi(mainId : string) {
 	})
 }
 
+/*通过id查询考核实施主表数据*/
+export function queryKhssZbByIdApi(id : string) {
+	return http({
+		url: '/jxkh.khss/cxcJxkhXhss/getAllById',
+		method: 'GET',
+		data: { id }
+	})
+}
+
+ /*通过id查询考核实施主表自定义表头*/
+ export function queryKhssZbBtByIdApi(mainId : string) {
+ 	return http({
+ 		url: '/jxkh.jxkh/cxcJxkhKhssKhjxZb/getByMainId',
+ 		method: 'GET',
+ 		data: { mainId }
+ 	})
+ }
+ 
+ /*通过id查询考核实施子表数据*/
+ export function queryKhssFbByIdApi(data : object) {
+ 	return http({
+ 		url: '/jxkh.khss/cxcJxkhXhss/selectAllByMainId',
+ 		method: 'GET',
+ 		data
+ 	})
+ }
+ 
+ /*通过id查询总金额*/
+ export function queryKhssAllSumByIdApi(mainId : string) {
+ 	return http({
+ 		url: '/jxkh.khss/cxcJxkhXhss/getAllSum',
+ 		method: 'GET',
+ 		data: { mainId }
+ 	})
+ }
+ 
+ /*通过id查询考核实子表自定义表头*/
+ export function queryKhssFbBtByIdApi(mainId : string) {
+ 	return http({
+ 		url: '/jxkh.jxfp.bt/cxcJxkhJxfbBtZb/listByMainId',
+ 		method: 'GET',
+ 		data: { mainId }
+ 	})
+ }
diff --git a/src/api/humanResource/clockin/index.ts b/src/api/humanResource/clockin/index.ts
new file mode 100644
index 0000000..57c1f37
--- /dev/null
+++ b/src/api/humanResource/clockin/index.ts
@@ -0,0 +1,11 @@
+import { http } from '@/utils/http';
+
+
+/*新增打卡记录*/
+export function addApi(config : Object) {
+	return http({
+		url: '/cxc_rlzy.wbxm.wbdk/cxcRlzyWbdk/add',
+		method: 'POST',
+		data: config
+	})
+}
\ No newline at end of file
diff --git a/src/pages-bpm/khss/index.vue b/src/pages-bpm/khss/index.vue
new file mode 100644
index 0000000..0f7ba0d
--- /dev/null
+++ b/src/pages-bpm/khss/index.vue
@@ -0,0 +1,230 @@
+<template>
+	<!-- 可滚动内容区域 -->
+	<scroll-view class="content-scroll" :style="{ height: scrollViewHeight }" scroll-y :scroll-top="scrollTop">
+		<!-- 主表内容 -->
+		<wd-cell-group border v-if="tabbar == '0'">
+			<wd-cell size="large" title="年月" :value="zbInfo.assessmentDate" />
+			<wd-cell size="large" title="单位" :value="zbInfo.templetName_dictText" />
+			<wd-cell size="large" title="当月人数" :value="zbInfo.monthNumber" />
+			<wd-cell size="large" title="本次兑现合计" :value="zbInfo.redemptionTotal" />
+			<wd-collapse v-model="collapse">
+				<wd-collapse-item title="考核绩效" name="item01">
+					<wd-cell v-for="(item, index) in zbBtInfo" :key="index" :title="item.name"
+						:value="getKhjxValue(item.id)" />
+				</wd-collapse-item>
+			</wd-collapse>
+			<wd-cell size="large">
+				<template #title>
+					<view style="display: inline-block">考核公报</view>
+				</template>
+				<view style="color: blue;" @click="onlinePreview(zbInfo.bmKhgb)">
+					{{getFilename(zbInfo.bmKhgb)}}
+				</view>
+			</wd-cell>
+		</wd-cell-group>
+
+		<!-- 子表内容 -->
+		<wd-collapse v-model="fbCollapse" v-if="tabbar == '1'">
+			<div style="display: flex;justify-content: space-between;padding: 10px 15px;font-weight: bold;">
+				<span>已分配金额: {{ sumJx }}</span>
+				<span>待分配金额: {{ (allJx - 0) - (sumJx - 0) }}</span>
+			</div>
+			<wd-collapse-item v-for="(fbItem, fbIndex) in fbInfo" :key="fbIndex" :title="fbItem.userName"
+				:name="'item' + (fbIndex + 1)">
+				<wd-cell-group border>
+					<wd-cell size="large" title="单位/部门" :value="fbItem.depart_dictText" />
+					<wd-cell size="large" title="劳动合同号" :value="fbItem.ldhth" />
+					<wd-cell size="large" title="岗位/职务" :value="fbItem.gw" />
+					<wd-cell size="large" title="绩效工资合计" :value="fbItem.jxgz" />
+					<wd-collapse v-model="fbCollapse2">
+						<wd-collapse-item title="绩效详情" :name="'item0' + (fbIndex + 1)">
+							<wd-cell v-for="(item, index) in fbBtInfo" :key="index" :title="item.name"
+								:value="getJxDetailValue(fbItem.id, item.id)" />
+						</wd-collapse-item>
+					</wd-collapse>
+					<wd-cell size="large" title="备注" :value="fbItem.bz" />
+				</wd-cell-group>
+			</wd-collapse-item>
+		</wd-collapse>
+		<wd-pagination v-if="tabbar == '1'" v-model="page" :total="total" @change="handleChange" />
+
+		<!-- 底部占位视图 -->
+		<view class="bottom-spacer" :style="{ height: safeAreaBottom }"></view>
+	</scroll-view>
+
+	<!-- 固定在底部的TabBar -->
+	<wd-tabbar fixed v-model="tabbar" class="safe-area-tabbar">
+		<wd-tabbar-item title="考核实施主表" icon="cart"></wd-tabbar-item>
+		<wd-tabbar-item title="考核实施子表" icon="user"></wd-tabbar-item>
+	</wd-tabbar>
+</template>
+
+<script setup>
+	import {
+		queryKhssZbByIdApi,
+		queryKhssZbBtByIdApi,
+		queryKhssFbByIdApi,
+		queryKhssFbBtByIdApi,
+		queryKhssAllSumByIdApi
+	} from '@/api/bpm'
+	import {
+		getFilename
+	} from '@/utils'
+
+	// 响应式数据
+	const tabbar = ref(0)
+	const zbInfo = ref({})
+	const fbInfo = ref([])
+	const zbBtInfo = ref([])
+	const fbBtInfo = ref([])
+	const collapse = ref([''])
+	const fbCollapse = ref([''])
+	const fbCollapse2 = ref([''])
+	const jxxqList = ref([])
+	const sumJx = ref(0)
+	const allJx = ref(0)
+	const page = ref(1)
+	const total = ref(0)
+	const scrollTop = ref(0)
+	const tabbarHeight = ref(50)
+	const systemInfo = ref({})
+	const scrollViewHeight = ref('100vh')
+
+	const props = defineProps({
+		formData: {
+			type: Object,
+			default: () => ({})
+		}
+	})
+
+	// 计算安全区域底部高度
+	const safeAreaBottom = computed(() => {
+		// #ifdef H5
+		return `${tabbarHeight.value}px`
+		// #endif
+		// #ifdef APP-PLUS || MP-WEIXIN
+		return `calc(${tabbarHeight.value}px + env(safe-area-inset-bottom))`
+		// #endif
+	})
+
+	// 获取系统信息
+	const getSystemInfo = () => {
+		uni.getSystemInfo({
+			success: (res) => {
+				systemInfo.value = res
+				const safeBottom = res.safeAreaInsets?.bottom || 0
+				scrollViewHeight.value =
+					`calc(${res.windowHeight}px - ${tabbarHeight.value + safeBottom}px)`
+			}
+		})
+	}
+
+	// 初始化TabBar高度
+	const initTabbarHeight = () => {
+		const query = uni.createSelectorQuery().select('.safe-area-tabbar')
+		query.boundingClientRect(data => {
+			if (data) {
+				tabbarHeight.value = data.height
+				getSystemInfo()
+			}
+		}).exec()
+	}
+
+	// 获取数据
+	const queryById = async () => {
+		const zbRes = await queryKhssZbByIdApi(props.formData.dataId)
+		if (zbRes.success) {
+			zbInfo.value = zbRes.result.records[0]
+			allJx.value = zbInfo.value.redemptionTotal
+			if (zbInfo.value.jxxqs) {
+				jxxqList.value = zbInfo.value.jxxqs
+			}
+			if (zbInfo.value.khjxZbId) {
+				const btRes = await queryKhssZbBtByIdApi(zbInfo.value.khjxZbId)
+				zbBtInfo.value = btRes.result
+			}
+			if (zbInfo.value.jxfpBtId) {
+				const btRes = await queryKhssFbBtByIdApi(zbInfo.value.jxfpBtId)
+				fbBtInfo.value = btRes.result
+			}
+		}
+
+		const fbRes = await queryKhssFbByIdApi({
+			mainId: props.formData.dataId
+		})
+		fbInfo.value = fbRes.result.records
+		total.value = fbRes.result.total
+
+		queryKhssAllSumByIdApi(props.formData.dataId).then(res => {
+			sumJx.value = res.result
+		})
+	}
+
+	// 获取考核绩效值
+	const getKhjxValue = (khjxId) => {
+		if (!jxxqList.value || jxxqList.value.length === 0) return ''
+		const item = jxxqList.value.find(item => item.khjxId === khjxId)
+		return item ? item.numValue : ''
+	}
+
+	// 获取绩效详情值
+	const getJxDetailValue = (mainId, jxfpBtId) => {
+		if (!fbInfo.value || fbInfo.value.length === 0) return ''
+		const currentItem = fbInfo.value.find(item => item.id === mainId)
+		if (!currentItem || !currentItem.jxxfpSaves) return ''
+		const detail = currentItem.jxxfpSaves.find(save => save.jxfpBt === jxfpBtId)
+		return detail ? detail.value : ''
+	}
+
+	const handleChange = (value) => {
+		fbInfo.value = []
+		queryKhssFbByIdApi({
+			mainId: props.formData.dataId,
+			pageNo: value.value
+		}).then(res => {
+			fbInfo.value = res.result.records
+			scrollTop.value = scrollTop.value ? 0 : 1 // 触发滚动
+		})
+	}
+
+	const onlinePreview = (e) => {
+		uni.navigateTo({
+			url: `/pages/onlinePreview/detail?data=${e}`
+		})
+	}
+
+	onMounted(() => {
+		queryById()
+	})
+
+	onReady(() => {
+		initTabbarHeight()
+		getSystemInfo()
+	})
+</script>
+
+<style lang="scss" scoped>
+	/* 滚动内容区域 */
+	.content-scroll {
+		width: 100%;
+		flex: 1;
+		overflow-y: auto;
+		-webkit-overflow-scrolling: touch;
+	}
+
+	/* 底部占位视图 */
+	.bottom-spacer {
+		width: 100%;
+	}
+
+	/* 安全区域适配 */
+	.safe-area-tabbar {
+		/* #ifdef APP-PLUS || MP-WEIXIN */
+		padding-bottom: env(safe-area-inset-bottom);
+		/* #endif */
+		/* #ifdef H5 */
+		position: sticky;
+		bottom: 0;
+		/* #endif */
+	}
+</style>
\ No newline at end of file
diff --git a/src/pages-bpm/zbkh/index.vue b/src/pages-bpm/zbkh/index.vue
index 1b27d63..940d603 100644
--- a/src/pages-bpm/zbkh/index.vue
+++ b/src/pages-bpm/zbkh/index.vue
@@ -1,46 +1,57 @@
 <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>
+	<!-- 可滚动内容区域 -->
+	<scroll-view class="content-scroll" :style="{ height: scrollViewHeight }" scroll-y :scroll-top="scrollTop">
+		<!-- 主表内容 -->
+		<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-collapse v-model="khdxCollapse">
+				<wd-collapse-item title="考核对象" name="考核对象">{{zbInfo.templetName_dictText}}</wd-collapse-item>
+			</wd-collapse>
+			<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 style="display: inline-block">考核附件</view>
 					</view>
 				</template>
-				<view style="color: blue;" @click="onlinePreview(fbItem.annex)">
-					{{getFilename(fbItem.annex)}}
+				<view style="color: blue;" @click="onlinePreview(zbInfo.khfj)">
+					{{getFilename(zbInfo.khfj)}}
 				</view>
 			</wd-cell>
-		</wd-collapse-item>
-	</wd-collapse>
+		</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>
+		<wd-pagination v-if="tabbar == '1'" v-model="page" :total="total" @change="handleChange" />
+		<!-- 底部占位视图 -->
+		<view class="bottom-spacer" :style="{ height: safeAreaBottom }"></view>
+	</scroll-view>
+
+	<wd-tabbar fixed v-model="tabbar" class="safe-area-tabbar">
+		<wd-tabbar-item title="指标考核主表" icon="cart"></wd-tabbar-item>
+		<wd-tabbar-item title="指标考核子表" icon="user"></wd-tabbar-item>
+	</wd-tabbar>
 </template>
 
 <script setup>
@@ -58,7 +69,14 @@
 	const btInfo = ref([])
 	const btDataInfo = ref([])
 	const zbCollapse = ref(['评价方法'])
-	const collapse = ref(['item1'])
+	const khdxCollapse = ref(['考核对象'])
+	const collapse = ref(['item01'])
+	const page = ref(1)
+	const total = ref(0)
+	const scrollTop = ref(0)
+	const tabbarHeight = ref(50)
+	const systemInfo = ref({})
+	const scrollViewHeight = ref('100vh')
 
 	const props = defineProps({
 		formData: {
@@ -67,20 +85,57 @@
 		}
 	})
 
+	// 计算安全区域底部高度
+	const safeAreaBottom = computed(() => {
+		// #ifdef H5
+		return `${tabbarHeight.value}px`
+		// #endif
+		// #ifdef APP-PLUS || MP-WEIXIN
+		return `calc(${tabbarHeight.value}px + env(safe-area-inset-bottom))`
+		// #endif
+	})
+	
+	
+	// 获取系统信息
+	const getSystemInfo = () => {
+		uni.getSystemInfo({
+			success: (res) => {
+				systemInfo.value = res
+				const safeBottom = res.safeAreaInsets?.bottom || 0
+				scrollViewHeight.value =
+					`calc(${res.windowHeight}px - ${tabbarHeight.value + safeBottom}px)`
+			}
+		})
+	}
+	
+	// 初始化TabBar高度
+	const initTabbarHeight = () => {
+		const query = uni.createSelectorQuery().select('.safe-area-tabbar')
+		query.boundingClientRect(data => {
+			if (data) {
+				tabbarHeight.value = data.height
+				getSystemInfo()
+			}
+		}).exec()
+	}
+	
 	const queryById = async () => {
 		// 1. 获取主表数据
 		const zbRes = await queryZbkhZbByIdApi(props.formData.dataId);
 		if (zbRes.success) {
 			zbInfo.value = zbRes.result.records[0];
-			// 2. 获取指标模板数据（btInfo）
+			// 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);
+		const fbRes = await queryZbkhFbByIdApi({
+			mainId: props.formData.dataId
+		});
 		fbInfo.value = fbRes.result.records;
+		total.value = fbRes.result.total
 	};
 
 	const getDwkhValue = (fbItem, btId) => {
@@ -88,6 +143,18 @@
 		const found = fbItem.dwkhSaves.find(item => item.dwkhBtId === btId);
 		return found ? found.value : '';
 	};
+	
+	const handleChange = (value) => {
+		fbInfo.value = []
+		queryZbkhFbByIdApi({
+			mainId: props.formData.dataId,
+			pageNo: value.value
+		}).then(res => {
+			fbInfo.value = res.result.records
+			scrollTop.value = scrollTop.value ? 0 : 1 // 触发滚动
+		})
+	}
+	
 
 	const onlinePreview = (e) => {
 		uni.navigateTo({
@@ -97,17 +164,32 @@
 
 	onMounted(() => {
 		queryById()
+		getSystemInfo()
 	})
 </script>
 
-<style lang="scss">
-/* 手动引入 wd-segmented 样式 */
-@import 'wot-design-uni/components/wd-segmented/index.scss';
+<style lang="scss" scoped>
+	/* 滚动内容区域 */
+	.content-scroll {
+		width: 100%;
+		flex: 1;
+		overflow-y: auto;
+		-webkit-overflow-scrolling: touch;
+	}
 
-/* 或直接覆盖关键样式 */
-.wd-segmented {
-  /* 确保样式优先级 */
-  opacity: 1 !important;
-  visibility: visible !important;
-}
+	/* 底部占位视图 */
+	.bottom-spacer {
+		width: 100%;
+	}
+
+	/* 安全区域适配 */
+	.safe-area-tabbar {
+		/* #ifdef APP-PLUS || MP-WEIXIN */
+		padding-bottom: env(safe-area-inset-bottom);
+		/* #endif */
+		/* #ifdef H5 */
+		position: sticky;
+		bottom: 0;
+		/* #endif */
+	}
 </style>
\ No newline at end of file
diff --git a/src/pages-humanResource/absence/index.vue b/src/pages-humanResource/absence/index.vue
index b383575..23df1bd 100644
--- a/src/pages-humanResource/absence/index.vue
+++ b/src/pages-humanResource/absence/index.vue
@@ -118,7 +118,6 @@
 			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-process/components/DynamicLink.vue b/src/pages-process/components/DynamicLink.vue
index a0fe46a..3347dac 100644
--- a/src/pages-process/components/DynamicLink.vue
+++ b/src/pages-process/components/DynamicLink.vue
@@ -1,13 +1,16 @@
 <!-- component标签可以变换组件 -->
 <template>
 	<view>
-		<component ref="comptRef" :is="asyncComponent" :formData="formData" :history="history" :activeKey="activeKey" v-if="asyncComponent"
-			@getStampSuc="getStampSuccess"></component>
+		<component ref="comptRef" :is="asyncComponent" :formData="formData" :history="history" :activeKey="activeKey"
+			v-if="asyncComponent" @getStampSuc="getStampSuccess"></component>
 		<view v-else>该模块暂未建立审批页面！</view>
 	</view>
+	<wd-tabbar v-if="false">
+		<wd-tabbar-item></wd-tabbar-item>
+	</wd-tabbar>
+	<wd-pagination v-if="false"/>
 </template>
 <script setup>
-	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');
@@ -35,34 +38,34 @@
 		},
 		formData: {
 			type: Object,
-			default: () => { },
+			default: () => {},
 		}
 
 	})
 	// 监听 option 变化
 	watch(() => props.path, (newVal) => {
-		if (newVal){
+		if (newVal) {
 			compName.value = newVal;
-		} 
+		}
 		//动态加载页面
 		const comp = modules[`/src/pages-bpm/${compName.value}.vue`]
-		if(!comp){
+		if (!comp) {
 			console.log(newVal)
-			if(newVal.indexOf('index')==-1){
-				compName.value = newVal+'/index'
+			if (newVal.indexOf('index') == -1) {
+				compName.value = newVal + '/index'
 				console.log(compName.value)
 				const comp2 = modules[`/src/pages-bpm/${compName.value}.vue`]
 				comp2().then((myModule) => {
 					asyncComponent.value = myModule.default
 				}).catch(() => {
-				
+
 				})
 			}
-		}else{
+		} else {
 			comp().then((myModule) => {
 				asyncComponent.value = myModule.default
 			}).catch(() => {
-			
+
 			})
 		}
 
@@ -73,18 +76,18 @@
 		// #endif
 	});
 
-	const signValidator = ()=>{
+	const signValidator = () => {
 		console.log(comptRef.value)
 		//这里进行电子签章验证
-		if(!comptRef.value.signValidator){
+		if (!comptRef.value.signValidator) {
 			console.log(123124)
 			return null;
-		}else{
+		} else {
 			console.log(12)
 			return comptRef.value.signValidator()
 		}
 	}
-	
+
 	const getStampSuccess = (val) => {
 		// this.$emit('getStampSuc', val)
 		// //在<component>标签动态组件使用vuex，没有保存成功。
@@ -93,9 +96,9 @@
 		//   esignTag: val
 		// });
 	}
-	
+
 	defineExpose({ //暴露方法
-	  signValidator
+		signValidator
 	})
 </script>
 
diff --git a/src/pages.json b/src/pages.json
index c5bf3e1..88e5087 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -525,6 +525,10 @@
           "path": "document/index",
           "type": "page"
         },
+        {
+          "path": "khss/index",
+          "type": "page"
+        },
         {
           "path": "leaveApplication/index",
           "type": "page"
diff --git a/src/pages/user/people.vue b/src/pages/user/people.vue
index f4d1354..ab17ebb 100644
--- a/src/pages/user/people.vue
+++ b/src/pages/user/people.vue
@@ -52,9 +52,7 @@
 </template>
 
 <script lang="ts" setup>
-	import { ref, watch, onBeforeUnmount } from 'vue'
 	import { getFileAccessHttpUrl } from '@/common/uitls'
-	import { onLoad } from '@dcloudio/uni-app'
 	import { useToast, useMessage } from 'wot-design-uni'
 	import { useRouter } from '@/plugin/uni-mini-router'
 	import { http } from '@/utils/http'
@@ -62,20 +60,22 @@
 	import useUpload from '@/hooks/useUpload'
 	import { getEnvBaseUrl } from '@/utils/index'
 	import { queryPostByUserIdApi, editUserApi } from '@/api/system/user'
-
+	import { useAppStore } from '@/store'
+	import { addApi } from '@/api/humanResource/clockin'
+	
+	const appStore = useAppStore();
 	const userStore = useUserStore()
 	const toast = useToast()
 	const router = useRouter()
 	const message = useMessage()
+	const loading = ref(false)
 	const post = ref('')
 	let stopWatch : any = null
 
 	const dataSource = [
-		// { key: 'collect', title: '收藏', class: 'cuIcon-favorfill text-yellow' },
-		// { key: 'redPacket', title: '红包', class: 'cuIcon-redpacket_fill text-red' },
 		{ key: 'setting', title: '个人资料', class: 'cuIcon-settingsfill text-cyan' },
+		{ key: 'clockin', title: '打卡', class: 'cuIcon-location text-cyan' },
 		{ key: 'scan', title: '扫码', class: 'cuIcon-scan text-red' },
-		// { key: 'location', title: '定位', class: 'cuIcon-location text-cyan' },
 		{ key: 'exit', title: '退出', class: 'cuIcon-exit text-cyan' },
 	]
 
@@ -156,8 +156,28 @@
 		toast.warning('H5暂不支持')
 		// #endif
 	}
+	
+	const clockin = () => {
+		// #ifndef H5
+		if (loading.value) return
+		addApi({
+			weizhi: appStore.clockin
+		}).then((res : any) => {
+			if(res.success){
+				toast.success(res.message)
+			}else{
+				toast.warning(res.message)
+			}
+			loading.value = true
+		})
+		// #endif
+		// #ifdef H5
+		toast.warning('H5暂不支持')
+		// #endif
+	}
+
+
 	const exit = () => {
-		console.log(message)
 		message
 			.confirm({
 				title: '提示',
@@ -180,6 +200,9 @@
 			case 'exit':
 				exit()
 				break
+			case 'clockin':
+				clockin()
+				break
 			default:
 				toast.show('功能暂未开发~')
 		}
diff --git a/src/store/index.ts b/src/store/index.ts
index 159cdf9..d23a18b 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -15,6 +15,7 @@ export const useAppStore = defineStore('app', {
 		isGray: 0 as 0 | 1, // 0=正常，1=灰化
 		position: null, //市
 		location: null, //省市区
+		clockin: null, //详细位置 精确到街道
 		temperature: null, //温度
 		weather: null //天气
 	}),
@@ -28,6 +29,9 @@ export const useAppStore = defineStore('app', {
 		setLocation(value : string) {
 			this.location = value
 		},
+		setClockin(value : string) {
+			this.clockin = value
+		},
 		setTemperature(value : number) {
 			this.temperature = value
 		},
diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts
index 181b6cd..34686a6 100644
--- a/src/types/uni-pages.d.ts
+++ b/src/types/uni-pages.d.ts
@@ -58,6 +58,7 @@ interface NavigateToOptions {
        "/pages-process/taskHandle" |
        "/pages-bpm/carRental/index" |
        "/pages-bpm/document/index" |
+       "/pages-bpm/khss/index" |
        "/pages-bpm/leaveApplication/index" |
        "/pages-bpm/unconventional/index" |
        "/pages-bpm/unconventional/stamp" |
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 34ea067..32a87bd 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -398,6 +398,7 @@ export const getLocation = () => {
 						const obj = data.result.addressComponent
 						store.setPosition(obj.city ? obj.city : obj.province) //市
 						store.setLocation(obj.city ? obj.province + obj.city + obj.county : obj.province + obj.county) //省市区
+						store.setClockin(data.result.formatted_address)
 						getWeather(position.latitude, position.longitude)
 					} else {
 						handleDefaultLocation()

From 72938d640743d15a6b4ebc078a0efcca6c2b5394 Mon Sep 17 00:00:00 2001
From: yangzhq68909 <993367776@qq.com>
Date: Fri, 20 Jun 2025 10:51:47 +0800
Subject: [PATCH 02/16] =?UTF-8?q?=E4=B8=89=E5=86=8C=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 env/.env                       | 4 ++--
 env/.env.development           | 7 +++++--
 src/api/pages/sc/index.ts      | 9 ++++-----
 src/manifest.json              | 2 +-
 src/pages-operate/sc/index.vue | 7 ++-----
 src/pages/login/login.vue      | 4 ++--
 6 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/env/.env b/env/.env
index fa5fd9f..8a9e6a3 100644
--- a/env/.env
+++ b/env/.env
@@ -1,9 +1,9 @@
 VITE_APP_TITLE = '数智产销'
 VITE_APP_PORT = 9000
 
-#VITE_UNI_APPID = '__UNI__9F097F0'
+VITE_UNI_APPID = '__UNI__9F097F0'
 #测试APPID
-VITE_UNI_APPID = '__UNI__1B02D50'
+#VITE_UNI_APPID = '__UNI__1B02D50'
 VITE_WX_APPID = 'wx8e287639924edb51'
 
 #发布版本号
diff --git a/env/.env.development b/env/.env.development
index cfea491..f347345 100644
--- a/env/.env.development
+++ b/env/.env.development
@@ -7,8 +7,11 @@ VITE_SHOW_SOURCEMAP = true
 # 是否启用读取配置文件 min
 #VITE_WEBAPP = 'D://opt//AppUpdateTest'
 VITE_WEBAPP = ''
-#VITE_SERVER_BASEURL = 'http://10.75.15.247: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'
+#VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/jeecg-boot'
+
+
+
 #VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/wwapi'
 #VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/yjapi'
\ No newline at end of file
diff --git a/src/api/pages/sc/index.ts b/src/api/pages/sc/index.ts
index 0f6c53a..bfd3db7 100644
--- a/src/api/pages/sc/index.ts
+++ b/src/api/pages/sc/index.ts
@@ -1,18 +1,17 @@
 import { http } from '@/utils/http';
 
-export function getListApi(orgCode : string) {
+export function getListApi() {
 	return http({
 		url: '/sjgl.scnr/cxcSjSc/queryTreeData',
-		method: 'GET',
-		data: { orgCode }
+		method: 'GET'
 	})
 }
 
-export function getJobDesIdByDepAndName(config : Object) {
+export function getJobDesIdByDepAndName(jobname : string) {
 	return http({
 		url: '/sjgl.tynr/cxcSjJobdescription/queryByNameDep',
 		method: 'GET',
-		data: config
+		data: { jobname }
 	})
 }
 
diff --git a/src/manifest.json b/src/manifest.json
index 4ae261f..cf7c67b 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -1,6 +1,6 @@
 {
   "name": "数智产销",
-  "appid": "__UNI__1B02D50",
+  "appid": "__UNI__9F097F0",
   "description": "",
   "versionName": "2.0.0",
   "versionCode": "20250616",
diff --git a/src/pages-operate/sc/index.vue b/src/pages-operate/sc/index.vue
index e8d57d4..2628dc1 100644
--- a/src/pages-operate/sc/index.vue
+++ b/src/pages-operate/sc/index.vue
@@ -83,10 +83,7 @@
 						new base64().encode(baseUrl + url))
 				}
 			} else if (/^-?\d+$/.test(quote) && !insFlag) {
-				getJobDesIdByDepAndName({
-					jobname: quote,
-					jobdep: useUserStore().userInfo.orgCode
-				}).then((res) => {
+				getJobDesIdByDepAndName(quote).then((res) => {
 					fileUrl.value = getEnvBaseUrl() + '/jmreport/view/929517863011811328?id=' + res
 						.id +
 						"&token=" + useUserStore().userInfo.token;
@@ -113,7 +110,7 @@
 	}
 
 	const getList = () => {
-		getListApi(useUserStore().userInfo.orgCode).then(res => {
+		getListApi().then(res => {
 			data.value = res.result
 			dataSource.value = [data.value.map(item => {
 				return {
diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue
index d1cbda1..72d8ac9 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 })
+		// loginApi({ username: un, password: pw })
 		/*开发环境 begin */
-		// loginApi({ username: userName.value, password: password.value, captcha: 'app' })
+		loginApi({ username: userName.value, password: password.value, captcha: 'app' })
 			.then((res : any) => {
 				if (res.success) {
 					const { result } = res

From 5726688c2ec5d0c091ab7d8f8130a6d8b5ba11ba Mon Sep 17 00:00:00 2001
From: yangzhq68909 <993367776@qq.com>
Date: Mon, 23 Jun 2025 08:38:09 +0800
Subject: [PATCH 03/16] 1

---
 manifest.config.ts        | 4 ++--
 src/manifest.json         | 4 ++--
 src/pages/user/people.vue | 5 -----
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/manifest.config.ts b/manifest.config.ts
index 1ee837f..f2be00d 100644
--- a/manifest.config.ts
+++ b/manifest.config.ts
@@ -17,8 +17,8 @@ export default defineManifestConfig({
   name: VITE_APP_TITLE,
   appid: VITE_UNI_APPID,
   description: '',
-  versionName: '2.0.0',
-  versionCode: '20250616',
+  versionName: '2.0.3',
+  versionCode: '20250620',
   transformPx: false,
   locale: VITE_FALLBACK_LOCALE, // 'zh-Hans'
   /* 5+App特有相关 */
diff --git a/src/manifest.json b/src/manifest.json
index cf7c67b..110fba0 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -2,8 +2,8 @@
   "name": "数智产销",
   "appid": "__UNI__9F097F0",
   "description": "",
-  "versionName": "2.0.0",
-  "versionCode": "20250616",
+  "versionName": "2.0.3",
+  "versionCode": "20250620",
   "transformPx": false,
   "app-plus": {
     "usingComponents": true,
diff --git a/src/pages/user/people.vue b/src/pages/user/people.vue
index ab17ebb..d67f01c 100644
--- a/src/pages/user/people.vue
+++ b/src/pages/user/people.vue
@@ -158,7 +158,6 @@
 	}
 	
 	const clockin = () => {
-		// #ifndef H5
 		if (loading.value) return
 		addApi({
 			weizhi: appStore.clockin
@@ -170,10 +169,6 @@
 			}
 			loading.value = true
 		})
-		// #endif
-		// #ifdef H5
-		toast.warning('H5暂不支持')
-		// #endif
 	}
 
 

From 928959dfe0758a1535021a9bc3613031e235edb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E7=A5=A5=E7=91=9E?= <1131549607@qq.com>
Date: Mon, 23 Jun 2025 16:19:05 +0800
Subject: [PATCH 04/16] =?UTF-8?q?6.23=E5=BC=A0=E7=A5=A5=E7=91=9E=EF=BC=8C?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=B6=E5=BA=A6=E5=8F=8A=E6=B3=95=E5=BE=8B?=
 =?UTF-8?q?=E6=B3=95=E8=A7=84=E7=9A=84=E5=AE=A1=E6=89=B9=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 env/.env.development                          |  4 +-
 package.json                                  |  7 +++
 pnpm-lock.yaml                                | 56 +++++++++++++-----
 .../bpmApi/index.ts                           | 11 ++++
 src/api/SuperiorSystem/bpmApi/index.ts        | 11 ++++
 src/api/lawsAndRegulations/bpmApi/index.ts    | 11 ++++
 .../index.vue                                 | 49 +++++++++++++++
 src/pages-bpm/SuperiorSystem/index.vue        | 56 ++++++++++++++++++
 src/pages-bpm/lawsAndRegulations/index.vue    | 59 +++++++++++++++++++
 src/pages-process/components/DynamicLink.vue  |  1 +
 src/pages.json                                | 12 ++++
 src/types/uni-pages.d.ts                      |  5 +-
 12 files changed, 263 insertions(+), 19 deletions(-)
 create mode 100644 src/api/OfficeEquipmentMaintenanceApplication/bpmApi/index.ts
 create mode 100644 src/api/SuperiorSystem/bpmApi/index.ts
 create mode 100644 src/api/lawsAndRegulations/bpmApi/index.ts
 create mode 100644 src/pages-bpm/OfficeEquipmentMaintenanceApplication/index.vue
 create mode 100644 src/pages-bpm/SuperiorSystem/index.vue
 create mode 100644 src/pages-bpm/lawsAndRegulations/index.vue

diff --git a/env/.env.development b/env/.env.development
index c78f0dc..65c9105 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.246: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/package.json b/package.json
index 22d5959..aabe517 100644
--- a/package.json
+++ b/package.json
@@ -76,21 +76,28 @@
     "@dcloudio/uni-mp-weixin": "3.0.0-4030620241128001",
     "@dcloudio/uni-mp-xhs": "3.0.0-4030620241128001",
     "@dcloudio/uni-quickapp-webview": "3.0.0-4030620241128001",
+    "@tanstack/match-sorter-utils": "^8.19.4",
     "@tanstack/query-core": "^5.76.0",
     "@tanstack/vue-query": "^5.62.16",
     "@vant/area-data": "^2.0.0",
+    "@vue/devtools-api": "^7.7.6",
+    "@vue/devtools-kit": "^7.7.6",
+    "@vue/devtools-shared": "^7.7.6",
     "abortcontroller-polyfill": "^1.7.8",
     "base-64": "^1.0.0",
+    "birpc": "^2.3.0",
     "charenc": "^0.0.2",
     "crypt": "^0.0.2",
     "dayjs": "1.11.10",
     "echarts": "^5.6.0",
     "fs-extra": "^11.3.0",
+    "hookable": "^5.5.3",
     "is-buffer": "^2.0.5",
     "js-base64": "^3.6.1",
     "lodash": "^4.17.21",
     "lodash-es": "^4.17.21",
     "md5": "^2.3.0",
+    "perfect-debounce": "^1.0.0",
     "pinia": "2.0.36",
     "pinia-plugin-persistedstate": "3.2.1",
     "qs": "6.5.3",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 2a22990..9b06ce6 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -56,6 +56,9 @@ importers:
       '@dcloudio/uni-quickapp-webview':
         specifier: 3.0.0-4030620241128001
         version: 3.0.0-4030620241128001(@vueuse/core@11.3.0(vue@3.4.21(typescript@5.7.2)))(postcss@8.4.49)(rollup@4.28.0)(vue@3.4.21(typescript@5.7.2))
+      '@tanstack/match-sorter-utils':
+        specifier: ^8.19.4
+        version: 8.19.4
       '@tanstack/query-core':
         specifier: ^5.76.0
         version: 5.76.0
@@ -65,12 +68,24 @@ importers:
       '@vant/area-data':
         specifier: ^2.0.0
         version: 2.0.0
+      '@vue/devtools-api':
+        specifier: ^7.7.6
+        version: 7.7.6
+      '@vue/devtools-kit':
+        specifier: ^7.7.6
+        version: 7.7.6
+      '@vue/devtools-shared':
+        specifier: ^7.7.6
+        version: 7.7.6
       abortcontroller-polyfill:
         specifier: ^1.7.8
         version: 1.7.8
       base-64:
         specifier: ^1.0.0
         version: 1.0.0
+      birpc:
+        specifier: ^2.3.0
+        version: 2.3.0
       charenc:
         specifier: ^0.0.2
         version: 0.0.2
@@ -86,6 +101,9 @@ importers:
       fs-extra:
         specifier: ^11.3.0
         version: 11.3.0
+      hookable:
+        specifier: ^5.5.3
+        version: 5.5.3
       is-buffer:
         specifier: ^2.0.5
         version: 2.0.5
@@ -101,6 +119,9 @@ importers:
       md5:
         specifier: ^2.3.0
         version: 2.3.0
+      perfect-debounce:
+        specifier: ^1.0.0
+        version: 1.0.0
       pinia:
         specifier: 2.0.36
         version: 2.0.36(typescript@5.7.2)(vue@3.4.21(typescript@5.7.2))
@@ -1321,6 +1342,7 @@ packages:
   '@esbuild/darwin-arm64@0.20.2':
     resolution: {integrity: sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==}
     engines: {node: '>=12'}
+    cpu: [arm64]
     os: [darwin]
 
   '@esbuild/darwin-arm64@0.21.5':
@@ -1332,6 +1354,7 @@ packages:
   '@esbuild/darwin-x64@0.20.2':
     resolution: {integrity: sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==}
     engines: {node: '>=12'}
+    cpu: [x64]
     os: [darwin]
 
   '@esbuild/darwin-x64@0.21.5':
@@ -1928,6 +1951,7 @@ packages:
 
   '@rollup/rollup-darwin-x64@4.28.0':
     resolution: {integrity: sha512-8hxgfReVs7k9Js1uAIhS6zq3I+wKQETInnWQtgzt8JfGx51R1N6DRVy3F4o0lQwumbErRz52YqwjfvuwRxGv1w==}
+    cpu: [x64]
     os: [darwin]
 
   '@rollup/rollup-freebsd-arm64@4.28.0':
@@ -2529,14 +2553,14 @@ packages:
   '@vue/devtools-api@6.6.4':
     resolution: {integrity: sha512-sGhTPMuXqZ1rVOk32RylztWkfXTRhuS7vgAKv0zjqk8gbsHkJ7xfFf+jbySxt7tWObEJwyKaHMikV/WGDiQm8g==}
 
-  '@vue/devtools-api@7.7.0':
-    resolution: {integrity: sha512-bHEv6kT85BHtyGgDhE07bAUMAy7zpv6nnR004nSTd0wWMrAOtcrYoXO5iyr20Hkf5jR8obQOfS3byW+I3l2CCA==}
+  '@vue/devtools-api@7.7.6':
+    resolution: {integrity: sha512-b2Xx0KvXZObePpXPYHvBRRJLDQn5nhKjXh7vUhMEtWxz1AYNFOVIsh5+HLP8xDGL7sy+Q7hXeUxPHB/KgbtsPw==}
 
-  '@vue/devtools-kit@7.7.0':
-    resolution: {integrity: sha512-5cvZ+6SA88zKC8XiuxUfqpdTwVjJbvYnQZY5NReh7qlSGPvVDjjzyEtW+gdzLXNSd8tStgOjAdMCpvDQamUXtA==}
+  '@vue/devtools-kit@7.7.6':
+    resolution: {integrity: sha512-geu7ds7tem2Y7Wz+WgbnbZ6T5eadOvozHZ23Atk/8tksHMFOFylKi1xgGlQlVn0wlkEf4hu+vd5ctj1G4kFtwA==}
 
-  '@vue/devtools-shared@7.7.0':
-    resolution: {integrity: sha512-jtlQY26R5thQxW9YQTpXbI0HoK0Wf9Rd4ekidOkRvSy7ChfK0kIU6vvcBtjj87/EcpeOSK49fZAicaFNJcoTcQ==}
+  '@vue/devtools-shared@7.7.6':
+    resolution: {integrity: sha512-yFEgJZ/WblEsojQQceuyK6FzpFDx4kqrz2ohInxNj5/DnhoX023upTv4OD6lNPLAA5LLkbwPVb10o/7b+Y4FVA==}
 
   '@vue/language-core@1.8.27':
     resolution: {integrity: sha512-L8Kc27VdQserNaCUNiSFdDl9LWT24ly8Hpwf1ECy3aFb9m6bDhBGQYOujDm21N7EW3moKIOKEanQwe1q5BK+mA==}
@@ -2876,8 +2900,8 @@ packages:
   bing-translate-api@4.0.2:
     resolution: {integrity: sha512-JJ8XUehnxzOhHU91oy86xEtp8OOMjVEjCZJX042fKxoO19NNvxJ5omeCcxQNFoPbDqVpBJwqiGVquL0oPdQm1Q==}
 
-  birpc@0.2.19:
-    resolution: {integrity: sha512-5WeXXAvTmitV1RqJFppT5QtUiz2p1mRSYU000Jkft5ZUCLJIk4uQriYNO50HknxKwM6jd8utNc66K1qGIwwWBQ==}
+  birpc@2.3.0:
+    resolution: {integrity: sha512-ijbtkn/F3Pvzb6jHypHRyve2QApOCZDR25D/VnkY2G/lBNcXCTsnsCxgY4k4PkVB7zfwzYbY3O9Lcqe3xufS5g==}
 
   bmp-js@0.1.0:
     resolution: {integrity: sha512-vHdS19CnY3hwiNdkaqk93DvjVLfbEcI8mys4UjuWrlX1haDmroo8o4xCzh4wD6DGV6HxRCyauwhHRqMTfERtjw==}
@@ -10171,21 +10195,21 @@ snapshots:
 
   '@vue/devtools-api@6.6.4': {}
 
-  '@vue/devtools-api@7.7.0':
+  '@vue/devtools-api@7.7.6':
     dependencies:
-      '@vue/devtools-kit': 7.7.0
+      '@vue/devtools-kit': 7.7.6
 
-  '@vue/devtools-kit@7.7.0':
+  '@vue/devtools-kit@7.7.6':
     dependencies:
-      '@vue/devtools-shared': 7.7.0
-      birpc: 0.2.19
+      '@vue/devtools-shared': 7.7.6
+      birpc: 2.3.0
       hookable: 5.5.3
       mitt: 3.0.1
       perfect-debounce: 1.0.0
       speakingurl: 14.0.1
       superjson: 2.2.2
 
-  '@vue/devtools-shared@7.7.0':
+  '@vue/devtools-shared@7.7.6':
     dependencies:
       rfdc: 1.4.1
 
@@ -10602,7 +10626,7 @@ snapshots:
     dependencies:
       got: 11.8.6
 
-  birpc@0.2.19: {}
+  birpc@2.3.0: {}
 
   bmp-js@0.1.0: {}
 
@@ -14973,7 +14997,7 @@ snapshots:
       '@shikijs/types': 1.27.0
       '@types/markdown-it': 14.1.2
       '@vitejs/plugin-vue': 5.2.1(vite@5.4.11(@types/node@20.17.9)(sass@1.77.6)(terser@5.36.0))(vue@3.5.13(typescript@5.7.2))
-      '@vue/devtools-api': 7.7.0
+      '@vue/devtools-api': 7.7.6
       '@vue/shared': 3.5.13
       '@vueuse/core': 11.3.0(vue@3.5.13(typescript@5.7.2))
       '@vueuse/integrations': 11.3.0(axios@1.7.9)(focus-trap@7.6.4)(vue@3.5.13(typescript@5.7.2))
diff --git a/src/api/OfficeEquipmentMaintenanceApplication/bpmApi/index.ts b/src/api/OfficeEquipmentMaintenanceApplication/bpmApi/index.ts
new file mode 100644
index 0000000..5efa2df
--- /dev/null
+++ b/src/api/OfficeEquipmentMaintenanceApplication/bpmApi/index.ts
@@ -0,0 +1,11 @@
+import { http } from '@/utils/http';
+
+
+/*通过id查询请假数据*/
+export function queryByIdApi(id : string) {
+	return http({
+		url: '/cxcbgjjwxsq/cxcBgjjwxsq/queryByIdForApp',//填写表单的queryById请求地址
+		method: 'GET',
+		data: { id }
+	})
+}
diff --git a/src/api/SuperiorSystem/bpmApi/index.ts b/src/api/SuperiorSystem/bpmApi/index.ts
new file mode 100644
index 0000000..9551f60
--- /dev/null
+++ b/src/api/SuperiorSystem/bpmApi/index.ts
@@ -0,0 +1,11 @@
+import { http } from '@/utils/http';
+
+
+/*通过id查询数据*/
+export function queryByIdApi(id : string) {
+	return http({
+		url: '/cxcjyglsjzdgl/cxcJyglSjzdgl/queryByIdForAPP',//填写表单的queryById请求地址
+		method: 'GET',
+		data: { id }
+	})
+}
diff --git a/src/api/lawsAndRegulations/bpmApi/index.ts b/src/api/lawsAndRegulations/bpmApi/index.ts
new file mode 100644
index 0000000..bb1b4f7
--- /dev/null
+++ b/src/api/lawsAndRegulations/bpmApi/index.ts
@@ -0,0 +1,11 @@
+import { http } from '@/utils/http';
+
+
+/*通过id查询请假数据*/
+export function queryByIdApi(id : string) {
+	return http({
+		url: '/cxcoaflgf/cxcOaFlgf/queryByIdForApp',//填写表单的queryById请求地址
+		method: 'GET',
+		data: { id }
+	})
+}
diff --git a/src/pages-bpm/OfficeEquipmentMaintenanceApplication/index.vue b/src/pages-bpm/OfficeEquipmentMaintenanceApplication/index.vue
new file mode 100644
index 0000000..04bf31b
--- /dev/null
+++ b/src/pages-bpm/OfficeEquipmentMaintenanceApplication/index.vue
@@ -0,0 +1,49 @@
+<template>
+	<wd-cell-group title="申请信息">
+		
+		<wd-cell title="申请人" :value="info.name" />
+		<wd-cell title="申请时间" :value="info.sqtime" />
+		<wd-cell title="申请单位" :value="info.sqdw_dictText" />
+		<wd-cell title="设备类型" :value="info.sblx" />
+		<wd-cell title="设备型号" :value="info.sbxh" />
+		<wd-cell title="数量" :value="info.sbsl" />
+		<wd-cell title="维修类型" :value="info.wxlx" />
+		<wd-cell title="故障现象" />
+		<wd-textarea  title="" v-model="info.gzxx" readonly/>
+		<wd-cell title="维修内容" />
+		<wd-textarea  title="维修内容" v-model="info.wxnr" readonly/>
+	</wd-cell-group>
+</template>
+
+<script setup>
+	import {
+		queryByIdApi
+	} from '@/api/OfficeEquipmentMaintenanceApplication/bpmApi'
+	
+	const info = ref({})
+	const image = ref([])
+	const gzxxvalue = ref('')//故障现象
+	const wxnrvalue = ref('')//维修内容
+	const props = defineProps({
+		formData: {
+			type: Object,
+			default: () => {},
+		}
+	})
+
+	// 申请信息
+	const QueryById = () => {
+		queryByIdApi(props.formData.dataId).then((res) => {			
+			console.log("res----------------",res)
+			if (res.success) {
+				info.value = res.result.records[0]
+				// gzxxvalue= res.result.gzxx
+				// wxnrvalue= res.result.wxnr
+			}
+		})
+	}
+
+	onMounted(() => {
+		QueryById()
+	})
+</script>
diff --git a/src/pages-bpm/SuperiorSystem/index.vue b/src/pages-bpm/SuperiorSystem/index.vue
new file mode 100644
index 0000000..0565728
--- /dev/null
+++ b/src/pages-bpm/SuperiorSystem/index.vue
@@ -0,0 +1,56 @@
+<template>
+	<wd-cell-group title="申请信息">
+		
+		<!-- <wd-cell title="制度名称" :value="info.zdmc" /> -->
+		<wd-cell title="制度名称" :value="info.sszd">
+			<view style="color: blue;"
+				@click="onlinePreview(`/pages/onlinePreview/detail?data=${info.sszd}`)">
+				{{info.zdmc}}
+			</view>
+		</wd-cell>
+		<wd-cell title="制度类型" :value="info.ssywlx_dictText" />
+		<wd-cell title="制定部门" :value="info.sbbm_dictText" />
+		<wd-cell title="发文字号" :value="info.wh" />
+		<wd-cell title="发文时间" :value="info.fatime" />
+		
+	</wd-cell-group>
+</template>
+
+<script setup>
+	import {
+		queryByIdApi
+	} from '@/api/SuperiorSystem/bpmApi'
+	
+	const info = ref({})
+	const image = ref([])
+	const gzxxvalue = ref('')//故障现象
+	const wxnrvalue = ref('')//维修内容
+	const props = defineProps({
+		formData: {
+			type: Object,
+			default: () => {},
+		}
+	})
+	
+	const onlinePreview = (url) => {
+		uni.navigateTo({
+			url
+		})
+	}
+
+	// 申请信息
+	const QueryById = () => {
+		queryByIdApi(props.formData.dataId).then((res) => {			
+			console.log("res----------------",res)
+			if (res.success) {
+				info.value = res.result.records[0]
+				// gzxxvalue= res.result.gzxx
+				// wxnrvalue= res.result.wxnr
+			}
+		})
+	}
+
+	onMounted(() => {
+		QueryById()
+	})
+</script>
diff --git a/src/pages-bpm/lawsAndRegulations/index.vue b/src/pages-bpm/lawsAndRegulations/index.vue
new file mode 100644
index 0000000..9dbb7f4
--- /dev/null
+++ b/src/pages-bpm/lawsAndRegulations/index.vue
@@ -0,0 +1,59 @@
+<template>
+	<wd-cell-group title="审批信息">
+		
+		<!-- <wd-cell title="制度名称" :value="info.zdmc" /> -->
+		<wd-cell title="法律法规名称" :value="info.flfgmc">
+			<view style="color: blue;"
+				@click="onlinePreview(`/pages/onlinePreview/detail?data=${info.mingcheng}`)">
+				{{info.flfgmc}}
+			</view>
+		</wd-cell>
+		<wd-cell title="颁布部门" :value="info.fabubumen" />
+		<wd-cell title="法律法规类型" :value="info.flfgfl_dictText" />
+		<wd-cell title="实施日期" :value="info.shishiriqi" />
+		<wd-cell title="最新修订日期" :value="info.zxxdrq" />
+		<wd-cell title="适用条款" />
+		<wd-textarea v-model="info.sytk" readonly/>
+		<wd-cell title="识别人" :value="info.sbr" />
+		
+	</wd-cell-group>
+</template>
+
+<script setup>
+	import {
+		queryByIdApi
+	} from '@/api/lawsAndRegulations/bpmApi'
+	
+	const info = ref({})
+	const image = ref([])
+	const gzxxvalue = ref('')//故障现象
+	const wxnrvalue = ref('')//维修内容
+	const props = defineProps({
+		formData: {
+			type: Object,
+			default: () => {},
+		}
+	})
+	
+	const onlinePreview = (url) => {
+		uni.navigateTo({
+			url
+		})
+	}
+
+	// 申请信息
+	const QueryById = () => {
+		queryByIdApi(props.formData.dataId).then((res) => {			
+			console.log("res----------------",res)
+			if (res.success) {
+				info.value = res.result.records[0]
+				// gzxxvalue= res.result.gzxx
+				// wxnrvalue= res.result.wxnr
+			}
+		})
+	}
+
+	onMounted(() => {
+		QueryById()
+	})
+</script>
diff --git a/src/pages-process/components/DynamicLink.vue b/src/pages-process/components/DynamicLink.vue
index c7873b2..b7b0692 100644
--- a/src/pages-process/components/DynamicLink.vue
+++ b/src/pages-process/components/DynamicLink.vue
@@ -40,6 +40,7 @@
 	})
 	// 监听 option 变化
 	watch(() => props.path, (newVal) => {
+		console.log("newVal----",newVal)
 		if (newVal){
 			compName.value = newVal;
 			if(newVal.indexOf('index')==-1){
diff --git a/src/pages.json b/src/pages.json
index 7468f94..4e1b946 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -508,9 +508,21 @@
     {
       "root": "pages-bpm",
       "pages": [
+        {
+          "path": "lawsAndRegulations/index",
+          "type": "page"
+        },
         {
           "path": "leaveApplication/index",
           "type": "page"
+        },
+        {
+          "path": "OfficeEquipmentMaintenanceApplication/index",
+          "type": "page"
+        },
+        {
+          "path": "SuperiorSystem/index",
+          "type": "page"
         }
       ]
     }
diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts
index 8d0baa7..1f2ff16 100644
--- a/src/types/uni-pages.d.ts
+++ b/src/types/uni-pages.d.ts
@@ -55,7 +55,10 @@ interface NavigateToOptions {
        "/pages-process/approvalTabbar" |
        "/pages-process/myApplyProcess" |
        "/pages-process/taskHandle" |
-       "/pages-bpm/leaveApplication/index";
+       "/pages-bpm/lawsAndRegulations/index" |
+       "/pages-bpm/leaveApplication/index" |
+       "/pages-bpm/OfficeEquipmentMaintenanceApplication/index" |
+       "/pages-bpm/SuperiorSystem/index";
 }
 interface RedirectToOptions extends NavigateToOptions {}
 

From 0c5543ae73ac563f5aaf1de5628816b7bc28b1b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E7=A5=A5=E7=91=9E?= <1131549607@qq.com>
Date: Tue, 24 Jun 2025 16:51:53 +0800
Subject: [PATCH 05/16] =?UTF-8?q?6.24=E5=BC=A0=E7=A5=A5=E7=91=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 env/.env.development                          |    2 +-
 src/api/healthfollow/healthfllow.ts           |   12 +
 src/pages-politics/healthfollow/send.vue      |  136 ++
 .../healthfollow/sendmessage.vue              |   79 ++
 src/pages.json                                | 1118 +++++++++--------
 src/static/index/index/Healthfollow.png       |  Bin 0 -> 8993 bytes
 src/types/uni-pages.d.ts                      |    7 +-
 7 files changed, 808 insertions(+), 546 deletions(-)
 create mode 100644 src/api/healthfollow/healthfllow.ts
 create mode 100644 src/pages-politics/healthfollow/send.vue
 create mode 100644 src/pages-politics/healthfollow/sendmessage.vue
 create mode 100644 src/static/index/index/Healthfollow.png

diff --git a/env/.env.development b/env/.env.development
index f347345..77103c3 100644
--- a/env/.env.development
+++ b/env/.env.development
@@ -7,7 +7,7 @@ VITE_SHOW_SOURCEMAP = true
 # 是否启用读取配置文件 min
 #VITE_WEBAPP = 'D://opt//AppUpdateTest'
 VITE_WEBAPP = ''
-VITE_SERVER_BASEURL = 'http://10.75.15.249:8080/jeecg-boot'
+VITE_SERVER_BASEURL = 'http://10.75.15.246:8080/jeecg-boot'
 #VITE_SERVER_BASEURL = 'https://36.112.48.190/jeecg-boot'
 #VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/jeecg-boot'
 
diff --git a/src/api/healthfollow/healthfllow.ts b/src/api/healthfollow/healthfllow.ts
new file mode 100644
index 0000000..34bc399
--- /dev/null
+++ b/src/api/healthfollow/healthfllow.ts
@@ -0,0 +1,12 @@
+import { http } from '@/utils/http';
+
+
+
+// 判断是否是三级高血压人员
+export function followpersonList(config : object) { // 获取随访人员信息
+	return http({
+		url: '/Hmcappselect/appselect/Hmcapplist',
+		method: 'GET',
+		data: config
+	})
+}
\ No newline at end of file
diff --git a/src/pages-politics/healthfollow/send.vue b/src/pages-politics/healthfollow/send.vue
new file mode 100644
index 0000000..d2ee10a
--- /dev/null
+++ b/src/pages-politics/healthfollow/send.vue
@@ -0,0 +1,136 @@
+<template>
+	<PageLayout :navbarShow="false">
+		<wd-card style="margin: 10px; display: flex; justify-content: center; align-items: center;" id="top1">
+			<wd-row>
+				<wd-col :span="12" style="display: flex; justify-content: center;">
+					<uni-easyinput v-model="realname" placeholder="姓名模糊查询" @change="getpersonList"
+						@clear="getpersonList" />
+				</wd-col>
+				<wd-col :span="12" style="display: flex; justify-content: center;">
+					<wd-button @click="sendMessage">发送消息</wd-button>
+				</wd-col>
+			</wd-row>
+		</wd-card>
+		<wd-table :data="list" :height="tableHeight">
+			<wd-table-col prop="ldhth" label="" align="center" :width="screenWidth / 5">
+				<template #value="{row}">
+					<wd-checkbox v-model="row.checked" @change="handleCheckboxChange(row)"></wd-checkbox>
+				</template>
+			</wd-table-col>
+			<wd-table-col prop="xh" label="序号" align="center" :width="screenWidth / 5"></wd-table-col>
+			<!-- <wd-table-col prop="dw" label="单位" align="center" :width="screenWidth /5"></wd-table-col> -->
+			<wd-table-col prop="xm" label="姓名" align="center" :width="screenWidth / 5"></wd-table-col>
+			<wd-table-col prop="nl" label="年龄" align="center" :width="screenWidth /5"></wd-table-col>
+			<wd-table-col prop="xb_dictText" label="性别" align="center" :width="screenWidth / 5"></wd-table-col>
+		</wd-table>
+		<wd-pagination custom-style="border: 1px solid #ececec;border-top:none" v-model="pageNo" :total="total"
+			@change="handleChange"></wd-pagination>
+	</PageLayout>
+</template>
+
+<script setup>
+	import {
+		useMessage,
+		useToast
+	} from 'wot-design-uni'
+	import SelectDept from '@/components/SelectDept/SelectDept'
+
+	import {
+		followpersonList
+	} from '@/api/healthfollow/healthfllow'
+
+
+	const realname = ref('') //姓名查询
+	const list = ref([])
+	let pageNo = 0
+	let pageSize = 10
+	const total = ref(0)
+	const screenHeight = ref(0)
+	const screenWidth = ref(0)
+	const tableHeight = ref(0)
+
+	const getpersonList = (e) => {
+		if (e != 1) { //为1时是切换页码
+			pageNo = 1
+		}
+		let params = {
+			xm: '*' + realname.value + '*'
+		}
+		followpersonList({
+				...params,
+				pageNo,
+				pageSize
+			}).then((res) => {
+				console.log("res--健康随访---", res)
+				if (res.success) {
+					list.value = res.result.records.map((item, index) => ({
+						...item, // 保留原有字段
+						xh: index + 1, // 添加序号 xh，从 1 开始
+						checked: true // 新增选中状态字段，默认设置为true
+					}));
+					total.value = res.result.total
+				}
+				// getHeight();
+			})
+			.catch((err) => {
+				console.log(err);
+			});
+	}
+
+	const sendMessage = () => {
+		// 过滤出选中的行
+		const selectedData = list.value.filter(item => item.checked);
+
+		if (selectedData.length === 0) {
+			useToast().show('请先选择要发送消息的人员');
+			return;
+		}
+		// 收集所有选中项的 ldhth 字段并以逗号拼接
+		const ldhthValues = selectedData.map(item => item.ldhth).join(',');
+		console.log('拼接后的 ldhth 值:', ldhthValues);
+
+
+	}
+
+	const handleCheckboxChange = (row) => {
+		// 这里可以添加额外的选中状态处理逻辑
+		console.log(`选中状态变更: ${row.xm}，当前状态: ${row.checked}`);
+	}
+
+	/*切换页码*/
+	const handleChange = ({
+		value
+	}) => {
+		pageNo = value
+		getpersonList(1)
+	}
+
+	const calculateTableHeight = () => {
+		const systemInfo = uni.getSystemInfoSync();
+		screenWidth.value = systemInfo.screenWidth;
+		screenHeight.value = systemInfo.screenHeight;
+		// 获取页面顶部元素高度（导航栏+日期选择器）
+		const query = uni.createSelectorQuery();
+		query.select('#top1').boundingClientRect(data => {
+			const topHeight = data ? data.height : 0;
+			const navHeight = 88; // 导航栏高度
+			const margin = 20; // 上下边距
+			// 计算表格可用高度
+			tableHeight.value = screenHeight.value - topHeight - navHeight;
+		}).exec();
+	}
+
+
+	onMounted(() => {
+		getpersonList();
+		followpersonList();
+		calculateTableHeight();
+		// 监听屏幕旋转变化
+		uni.onWindowResize(() => {
+			calculateTableHeight();
+		});
+	})
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/src/pages-politics/healthfollow/sendmessage.vue b/src/pages-politics/healthfollow/sendmessage.vue
new file mode 100644
index 0000000..5f0f51e
--- /dev/null
+++ b/src/pages-politics/healthfollow/sendmessage.vue
@@ -0,0 +1,79 @@
+<route lang="json5" type="page">
+	{
+	layout: 'default',
+	style: {
+	navigationStyle: 'custom',
+	navigationBarTitleText: '健康随访',
+	},
+	}
+</route>
+<template>
+	<PageLayout navTitle="健康随访">
+		<view style="margin: 0 10px;">
+			<uni-segmented-control style="margin-top: 10px;margin-bottom: 10px" :current="current" :values="items"
+				@clickItem="onClickItem" styleType="button"></uni-segmented-control>
+		</view>
+		<view class="content">
+			<view v-if="current === 0">
+				<send></send>
+			</view>
+			<view v-if="current === 1">
+			</view>
+		</view>
+	</PageLayout>
+</template>
+
+<script setup>
+	import {
+		useMessage,
+		useToast
+	} from 'wot-design-uni'
+	import {
+		useAppStore
+	} from '@/store';
+	import {
+		useUserStore
+	} from '@/store/user';
+	import {
+		addApi,
+		queryIf3rdGxyApi
+	} from '@/api/politics/health'
+	import {
+		getEnvBaseUrl
+	} from '@/utils/index'
+	import send from './send'
+
+	const items = ref(['发送随访信息', '查看随访信息'])
+	const userStore = useUserStore(); //登录人信息
+	const current = ref(0)
+
+	function onClickItem(e) {
+		if (current.value != e.currentIndex) {
+			current.value = e.currentIndex;
+		}
+	}
+
+	onLoad(() => {
+		// if3rdGxy()
+	})
+</script>
+
+<style lang="scss" scoped>
+	.form-container {
+		padding: 20rpx;
+		background-color: #f5f7fa;
+		min-height: 100vh;
+	}
+
+	.card {
+		background: #ffffff;
+		border-radius: 16rpx;
+		box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.05);
+		margin-bottom: 30rpx;
+		overflow: hidden;
+	}
+
+	.footer {
+		padding: 40rpx 0;
+	}
+</style>
\ No newline at end of file
diff --git a/src/pages.json b/src/pages.json
index 5deeecb..b7d4451 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -1,546 +1,576 @@
 {
-	"globalStyle": {
-		"navigationStyle": "default",
-		"navigationBarTitleText": "uniapp",
-		"navigationBarBackgroundColor": "#f8f8f8",
-		"navigationBarTextStyle": "black",
-		"backgroundColor": "#FFFFFF"
-	},
-	"easycom": {
-		"autoscan": true,
-		"custom": {
-			"^wd-(.*)": "wot-design-uni/components/wd-$1/wd-$1.vue",
-			"^(?!z-paging-refresh|z-paging-load-more)z-paging(.*)": "z-paging/components/z-paging$1/z-paging$1.vue"
-		}
-	},
-	"tabBar": {
-		"color": "#aaa",
-		"selectedColor": "#39b54a",
-		"backgroundColor": "#F8F8F8",
-		"borderStyle": "black",
-		"height": "50px",
-		"fontSize": "11px",
-		"iconWidth": "24px",
-		"spacing": "3px",
-		"list": [{
-				"iconPath": "static/tabbar/tabbar-home-2.png",
-				"selectedIconPath": "static/tabbar/tabbar-home.png",
-				"pagePath": "pages/index/index",
-				"text": "首页"
-			},
-			{
-				"iconPath": "static/tabbar/tabbar-production.png",
-				"selectedIconPath": "static/tabbar/tabbar-production-2.png",
-				"pagePath": "pages/production/index",
-				"text": "生产"
-			},
-			{
-				"iconPath": "static/tabbar/tabbar-operation.png",
-				"selectedIconPath": "static/tabbar/tabbar-operation-2.png",
-				"pagePath": "pages/operation/index",
-				"text": "经营"
-			},
-			{
-				"iconPath": "static/tabbar/tabbar-user-2.png",
-				"selectedIconPath": "static/tabbar/tabbar-user.png",
-				"pagePath": "pages/user/people",
-				"text": "个人"
-			}
-		]
-	},
-	"pages": [{
-			"path": "pages/login/login",
-			"type": "home",
-			"style": {
-				"navigationStyle": "custom",
-				"navigationBarTitleText": "登录页"
-			}
-		},
-		{
-			"path": "pages/annotation/annotationDetail",
-			"type": "page",
-			"layout": "default",
-			"style": {
-				"navigationBarTitleText": "",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/annotation/annotationList",
-			"type": "page",
-			"layout": "default",
-			"style": {
-				"navigationBarTitleText": "我的消息",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/index/index",
-			"type": "page",
-			"layout": "default",
-			"style": {
-				"navigationStyle": "custom",
-				"navigationBarTitleText": "主页"
-			}
-		},
-		{
-			"path": "pages/message/message",
-			"type": "page",
-			"layout": "default",
-			"style": {
-				"navigationBarTitleText": "",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/more/more",
-			"type": "page",
-			"layout": "default",
-			"style": {
-				"navigationBarTitleText": "更多",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/onlinePreview/detail",
-			"type": "page",
-			"layout": "default",
-			"style": {
-				"navigationStyle": "custom",
-				"navigationBarTitleText": "在线预览"
-			}
-		},
-		{
-			"path": "pages/onlinePreview/onlinePreview",
-			"type": "page",
-			"layout": "default",
-			"style": {
-				"navigationStyle": "custom",
-				"navigationBarTitleText": "在线预览"
-			}
-		},
-		{
-			"path": "pages/onlinePreview/onlinePreviewH5",
-			"type": "page",
-			"layout": "default",
-			"style": {
-				"navigationStyle": "custom",
-				"navigationBarTitleText": "H5在线预览"
-			}
-		},
-		{
-			"path": "pages/operation/index",
-			"type": "page",
-			"layout": "default",
-			"style": {
-				"navigationStyle": "custom",
-				"navigationBarTitleText": "经营数据"
-			}
-		},
-		{
-			"path": "pages/production/index",
-			"type": "page",
-			"layout": "default",
-			"style": {
-				"navigationStyle": "custom",
-				"navigationBarTitleText": "生产数据"
-			}
-		},
-		{
-			"path": "pages/sljd/index",
-			"type": "page",
-			"layout": "default",
-			"style": {
-				"navigationStyle": "custom",
-				"navigationBarTitleText": "实流检定"
-			}
-		},
-		{
-			"path": "pages/user/people",
-			"type": "page",
-			"layout": "default",
-			"style": {
-				"navigationStyle": "custom",
-				"navigationBarTitleText": "个人"
-			}
-		},
-		{
-			"path": "pages/workHome/index",
-			"type": "page",
-			"layout": "default",
-			"style": {
-				"navigationBarTitleText": "工作台",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/production/ribaoshuju/rbsjLsxq",
-			"type": "page",
-			"layout": "default",
-			"style": {
-				"navigationStyle": "custom",
-				"navigationBarTitleText": "历史数据"
-			}
-		},
-		{
-			"path": "pages/production/ribaoshuju/trqRbsj",
-			"type": "page"
-		},
-		{
-			"path": "pages/production/ribaoshuju/yyRbsj",
-			"type": "page"
-		},
-		{
-			"path": "pages/production/shishishuju/aqbjSssj",
-			"type": "page"
-		},
-		{
-			"path": "pages/production/shishishuju/gycsSssj",
-			"type": "page"
-		},
-		{
-			"path": "pages/production/shishishuju/index",
-			"type": "page"
-		},
-		{
-			"path": "pages/production/shishishuju/nyxhSssj",
-			"type": "page"
-		},
-		{
-			"path": "pages/production/shishishuju/trqSssj",
-			"type": "page"
-		},
-		{
-			"path": "pages/production/shishishuju/ysjSssj",
-			"type": "page"
-		}
-	],
-	"subPackages": [{
-			"root": "pages-home",
-			"pages": [{
-				"path": "home/home",
-				"type": "page",
-				"layout": "default",
-				"style": {
-					"navigationBarTitleText": ""
-				}
-			}]
-		},
-		{
-			"root": "pages-message",
-			"pages": [{
-					"path": "chat/chat",
-					"type": "page",
-					"layout": "default",
-					"style": {
-						"navigationBarTitleText": "聊天",
-						"navigationStyle": "custom"
-					}
-				},
-				{
-					"path": "contacts/contacts",
-					"type": "page",
-					"layout": "default",
-					"style": {
-						"navigationStyle": "custom",
-						"navigationBarTitleText": "联系人"
-					}
-				},
-				{
-					"path": "personPage/personPage",
-					"type": "page",
-					"layout": "default",
-					"style": {
-						"navigationBarTitleText": "",
-						"navigationStyle": "custom"
-					}
-				},
-				{
-					"path": "tenant/tenant",
-					"type": "page",
-					"layout": "default",
-					"style": {
-						"navigationBarTitleText": "",
-						"navigationStyle": "custom",
-						"styleIsolation": "apply-shared"
-					}
-				}
-			]
-		},
-		{
-			"root": "pages-user",
-			"pages": [{
-				"path": "userEdit/userEdit",
-				"type": "page",
-				"layout": "default",
-				"style": {
-					"navigationBarTitleText": "",
-					"navigationStyle": "custom"
-				}
-			}]
-		},
-		{
-			"root": "pages-work",
-			"pages": [{
-					"path": "dragPage/index",
-					"type": "page",
-					"layout": "default",
-					"style": {
-						"navigationStyle": "custom",
-						"navigationBarTitleText": "仪表盘"
-					}
-				},
-				{
-					"path": "onlinePage/onlineAdd",
-					"type": "page",
-					"layout": "default",
-					"style": {
-						"navigationStyle": "custom",
-						"navigationBarTitleText": "Online表单新增"
-					}
-				},
-				{
-					"path": "onlinePage/onlineDetail",
-					"type": "page",
-					"layout": "default",
-					"style": {
-						"navigationStyle": "custom",
-						"navigationBarTitleText": "Online表单新增"
-					}
-				},
-				{
-					"path": "onlinePage/onlineEdit",
-					"type": "page",
-					"layout": "default",
-					"style": {
-						"navigationStyle": "custom",
-						"navigationBarTitleText": "Online表单新增"
-					}
-				}
-			]
-		},
-		{
-			"root": "pages-sub",
-			"pages": [{
-					"path": "online/online",
-					"type": "page",
-					"layout": "default",
-					"style": {
-						"navigationBarTitleText": "online",
-						"navigationStyle": "custom"
-					}
-				},
-				{
-					"path": "online/onlineCard",
-					"type": "page",
-					"layout": "default",
-					"style": {
-						"navigationBarTitleText": "",
-						"navigationStyle": "custom"
-					}
-				},
-				{
-					"path": "online/onlineTable",
-					"type": "page",
-					"layout": "default",
-					"style": {
-						"navigationBarTitleText": "",
-						"navigationStyle": "custom"
-					}
-				}
-			]
-		},
-		{
-			"root": "pages-operate",
-			"pages": [{
-					"path": "file/detail",
-					"type": "page",
-					"layout": "default",
-					"style": {
-						"navigationStyle": "custom",
-						"navigationBarTitleText": "厂级制度详情"
-					}
-				},
-				{
-					"path": "file/index",
-					"type": "page",
-					"layout": "default",
-					"style": {
-						"navigationStyle": "custom",
-						"navigationBarTitleText": "公文/通知公告/法律法规/上级制度/厂级制度"
-					}
-				},
-				{
-					"path": "sc/index",
-					"type": "page",
-					"layout": "default",
-					"style": {
-						"navigationStyle": "custom",
-						"navigationBarTitleText": "三册"
-					}
-				}
-			]
-		},
-		{
-			"root": "pages-humanResource",
-			"pages": [{
-					"path": "absence/add",
-					"type": "page",
-					"layout": "default",
-					"style": {
-						"navigationStyle": "custom",
-						"navigationBarTitleText": "请假申请"
-					}
-				},
-				{
-					"path": "absence/detail",
-					"type": "page",
-					"layout": "default",
-					"style": {
-						"navigationStyle": "custom",
-						"navigationBarTitleText": "请假详情"
-					}
-				},
-				{
-					"path": "absence/index",
-					"type": "page",
-					"layout": "default",
-					"style": {
-						"navigationStyle": "custom",
-						"navigationBarTitleText": "请假信息"
-					}
-				},
-				{
-					"path": "personnel/ageStatistics",
-					"type": "page"
-				},
-				{
-					"path": "personnel/detail",
-					"type": "page",
-					"layout": "default",
-					"style": {
-						"navigationStyle": "custom",
-						"navigationBarTitleText": "人员详情"
-					}
-				},
-				{
-					"path": "personnel/generalFieldStatistics",
-					"type": "page"
-				},
-				{
-					"path": "personnel/index",
-					"type": "page",
-					"layout": "default",
-					"style": {
-						"navigationStyle": "custom",
-						"navigationBarTitleText": "人员信息"
-					}
-				},
-				{
-					"path": "personnel/standingbook",
-					"type": "page"
-				}
-			]
-		},
-		{
-			"root": "pages-integrated",
-			"pages": [{
-				"path": "duty/index",
-				"type": "page",
-				"layout": "default",
-				"style": {
-					"navigationStyle": "custom",
-					"navigationBarTitleText": "干部值班"
-				}
-			}]
-		},
-		{
-			"root": "pages-politics",
-			"pages": [{
-				"path": "health/add",
-				"type": "page",
-				"layout": "default",
-				"style": {
-					"navigationStyle": "custom",
-					"navigationBarTitleText": "健康填报"
-				}
-			}]
-		},
-		{
-			"root": "pages-process",
-			"pages": [{
-					"path": "approvalTabbar",
-					"type": "page",
-					"layout": "default",
-					"style": {
-						"navigationStyle": "custom",
-						"navigationBarTitleText": "流程审批导航"
-					}
-				},
-				{
-					"path": "myApplyProcess",
-					"type": "page",
-					"layout": "default",
-					"style": {
-						"navigationStyle": "custom",
-						"navigationBarTitleText": "我发起流程"
-					}
-				},
-				{
-					"path": "taskHandle",
-					"type": "page",
-					"layout": "default",
-					"style": {
-						"navigationStyle": "custom",
-						"navigationBarTitleText": "任务处理"
-					}
-				}
-			]
-		},
-		{
-			"root": "pages-bpm",
-			"pages": [{
-					"path": "carRental/index",
-					"type": "page"
-				},
-				{
-					"path": "document/index",
-					"type": "page"
-				},
-				{
-					"path": "khss/index",
-					"type": "page"
-				},
-				{
-					"path": "leaveApplication/index",
-					"type": "page"
-				},
-				{
-					"path": "unconventional/index",
-					"type": "page"
-				},
-				{
-					"path": "unconventional/stamp",
-					"type": "page"
-				},
-				{
-					"path": "zbkh/index",
-					"type": "page"
-				},
-				{
-
-					"path": "lawsAndRegulations/index",
-					"type": "page"
-				},
-				{
-					"path": "OfficeEquipmentMaintenanceApplication/index",
-					"type": "page"
-				},
-				{
-					"path": "SuperiorSystem/index",
-					"type": "page"
-				}
-			]
-		}
-	]
+  "globalStyle": {
+    "navigationStyle": "default",
+    "navigationBarTitleText": "uniapp",
+    "navigationBarBackgroundColor": "#f8f8f8",
+    "navigationBarTextStyle": "black",
+    "backgroundColor": "#FFFFFF"
+  },
+  "easycom": {
+    "autoscan": true,
+    "custom": {
+      "^wd-(.*)": "wot-design-uni/components/wd-$1/wd-$1.vue",
+      "^(?!z-paging-refresh|z-paging-load-more)z-paging(.*)": "z-paging/components/z-paging$1/z-paging$1.vue"
+    }
+  },
+  "tabBar": {
+    "color": "#aaa",
+    "selectedColor": "#39b54a",
+    "backgroundColor": "#F8F8F8",
+    "borderStyle": "black",
+    "height": "50px",
+    "fontSize": "11px",
+    "iconWidth": "24px",
+    "spacing": "3px",
+    "list": [
+      {
+        "iconPath": "static/tabbar/tabbar-home-2.png",
+        "selectedIconPath": "static/tabbar/tabbar-home.png",
+        "pagePath": "pages/index/index",
+        "text": "首页"
+      },
+      {
+        "iconPath": "static/tabbar/tabbar-production.png",
+        "selectedIconPath": "static/tabbar/tabbar-production-2.png",
+        "pagePath": "pages/production/index",
+        "text": "生产"
+      },
+      {
+        "iconPath": "static/tabbar/tabbar-operation.png",
+        "selectedIconPath": "static/tabbar/tabbar-operation-2.png",
+        "pagePath": "pages/operation/index",
+        "text": "经营"
+      },
+      {
+        "iconPath": "static/tabbar/tabbar-user-2.png",
+        "selectedIconPath": "static/tabbar/tabbar-user.png",
+        "pagePath": "pages/user/people",
+        "text": "个人"
+      }
+    ]
+  },
+  "pages": [
+    {
+      "path": "pages/login/login",
+      "type": "home",
+      "style": {
+        "navigationStyle": "custom",
+        "navigationBarTitleText": "登录页"
+      }
+    },
+    {
+      "path": "pages/annotation/annotationDetail",
+      "type": "page",
+      "layout": "default",
+      "style": {
+        "navigationBarTitleText": "",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/annotation/annotationList",
+      "type": "page",
+      "layout": "default",
+      "style": {
+        "navigationBarTitleText": "我的消息",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/index/index",
+      "type": "page",
+      "layout": "default",
+      "style": {
+        "navigationStyle": "custom",
+        "navigationBarTitleText": "主页"
+      }
+    },
+    {
+      "path": "pages/message/message",
+      "type": "page",
+      "layout": "default",
+      "style": {
+        "navigationBarTitleText": "",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/more/more",
+      "type": "page",
+      "layout": "default",
+      "style": {
+        "navigationBarTitleText": "更多",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/onlinePreview/detail",
+      "type": "page",
+      "layout": "default",
+      "style": {
+        "navigationStyle": "custom",
+        "navigationBarTitleText": "在线预览"
+      }
+    },
+    {
+      "path": "pages/onlinePreview/onlinePreview",
+      "type": "page",
+      "layout": "default",
+      "style": {
+        "navigationStyle": "custom",
+        "navigationBarTitleText": "在线预览"
+      }
+    },
+    {
+      "path": "pages/onlinePreview/onlinePreviewH5",
+      "type": "page",
+      "layout": "default",
+      "style": {
+        "navigationStyle": "custom",
+        "navigationBarTitleText": "H5在线预览"
+      }
+    },
+    {
+      "path": "pages/operation/index",
+      "type": "page",
+      "layout": "default",
+      "style": {
+        "navigationStyle": "custom",
+        "navigationBarTitleText": "经营数据"
+      }
+    },
+    {
+      "path": "pages/production/index",
+      "type": "page",
+      "layout": "default",
+      "style": {
+        "navigationStyle": "custom",
+        "navigationBarTitleText": "生产数据"
+      }
+    },
+    {
+      "path": "pages/sljd/index",
+      "type": "page",
+      "layout": "default",
+      "style": {
+        "navigationStyle": "custom",
+        "navigationBarTitleText": "实流检定"
+      }
+    },
+    {
+      "path": "pages/user/people",
+      "type": "page",
+      "layout": "default",
+      "style": {
+        "navigationStyle": "custom",
+        "navigationBarTitleText": "个人"
+      }
+    },
+    {
+      "path": "pages/workHome/index",
+      "type": "page",
+      "layout": "default",
+      "style": {
+        "navigationBarTitleText": "工作台",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/production/ribaoshuju/rbsjLsxq",
+      "type": "page",
+      "layout": "default",
+      "style": {
+        "navigationStyle": "custom",
+        "navigationBarTitleText": "历史数据"
+      }
+    },
+    {
+      "path": "pages/production/ribaoshuju/trqRbsj",
+      "type": "page"
+    },
+    {
+      "path": "pages/production/ribaoshuju/yyRbsj",
+      "type": "page"
+    },
+    {
+      "path": "pages/production/shishishuju/aqbjSssj",
+      "type": "page"
+    },
+    {
+      "path": "pages/production/shishishuju/gycsSssj",
+      "type": "page"
+    },
+    {
+      "path": "pages/production/shishishuju/index",
+      "type": "page"
+    },
+    {
+      "path": "pages/production/shishishuju/nyxhSssj",
+      "type": "page"
+    },
+    {
+      "path": "pages/production/shishishuju/trqSssj",
+      "type": "page"
+    },
+    {
+      "path": "pages/production/shishishuju/ysjSssj",
+      "type": "page"
+    }
+  ],
+  "subPackages": [
+    {
+      "root": "pages-home",
+      "pages": [
+        {
+          "path": "home/home",
+          "type": "page",
+          "layout": "default",
+          "style": {
+            "navigationBarTitleText": ""
+          }
+        }
+      ]
+    },
+    {
+      "root": "pages-message",
+      "pages": [
+        {
+          "path": "chat/chat",
+          "type": "page",
+          "layout": "default",
+          "style": {
+            "navigationBarTitleText": "聊天",
+            "navigationStyle": "custom"
+          }
+        },
+        {
+          "path": "contacts/contacts",
+          "type": "page",
+          "layout": "default",
+          "style": {
+            "navigationStyle": "custom",
+            "navigationBarTitleText": "联系人"
+          }
+        },
+        {
+          "path": "personPage/personPage",
+          "type": "page",
+          "layout": "default",
+          "style": {
+            "navigationBarTitleText": "",
+            "navigationStyle": "custom"
+          }
+        },
+        {
+          "path": "tenant/tenant",
+          "type": "page",
+          "layout": "default",
+          "style": {
+            "navigationBarTitleText": "",
+            "navigationStyle": "custom",
+            "styleIsolation": "apply-shared"
+          }
+        }
+      ]
+    },
+    {
+      "root": "pages-user",
+      "pages": [
+        {
+          "path": "userEdit/userEdit",
+          "type": "page",
+          "layout": "default",
+          "style": {
+            "navigationBarTitleText": "",
+            "navigationStyle": "custom"
+          }
+        }
+      ]
+    },
+    {
+      "root": "pages-work",
+      "pages": [
+        {
+          "path": "dragPage/index",
+          "type": "page",
+          "layout": "default",
+          "style": {
+            "navigationStyle": "custom",
+            "navigationBarTitleText": "仪表盘"
+          }
+        },
+        {
+          "path": "onlinePage/onlineAdd",
+          "type": "page",
+          "layout": "default",
+          "style": {
+            "navigationStyle": "custom",
+            "navigationBarTitleText": "Online表单新增"
+          }
+        },
+        {
+          "path": "onlinePage/onlineDetail",
+          "type": "page",
+          "layout": "default",
+          "style": {
+            "navigationStyle": "custom",
+            "navigationBarTitleText": "Online表单新增"
+          }
+        },
+        {
+          "path": "onlinePage/onlineEdit",
+          "type": "page",
+          "layout": "default",
+          "style": {
+            "navigationStyle": "custom",
+            "navigationBarTitleText": "Online表单新增"
+          }
+        }
+      ]
+    },
+    {
+      "root": "pages-sub",
+      "pages": [
+        {
+          "path": "online/online",
+          "type": "page",
+          "layout": "default",
+          "style": {
+            "navigationBarTitleText": "online",
+            "navigationStyle": "custom"
+          }
+        },
+        {
+          "path": "online/onlineCard",
+          "type": "page",
+          "layout": "default",
+          "style": {
+            "navigationBarTitleText": "",
+            "navigationStyle": "custom"
+          }
+        },
+        {
+          "path": "online/onlineTable",
+          "type": "page",
+          "layout": "default",
+          "style": {
+            "navigationBarTitleText": "",
+            "navigationStyle": "custom"
+          }
+        }
+      ]
+    },
+    {
+      "root": "pages-operate",
+      "pages": [
+        {
+          "path": "file/detail",
+          "type": "page",
+          "layout": "default",
+          "style": {
+            "navigationStyle": "custom",
+            "navigationBarTitleText": "厂级制度详情"
+          }
+        },
+        {
+          "path": "file/index",
+          "type": "page",
+          "layout": "default",
+          "style": {
+            "navigationStyle": "custom",
+            "navigationBarTitleText": "公文/通知公告/法律法规/上级制度/厂级制度"
+          }
+        },
+        {
+          "path": "sc/index",
+          "type": "page",
+          "layout": "default",
+          "style": {
+            "navigationStyle": "custom",
+            "navigationBarTitleText": "三册"
+          }
+        }
+      ]
+    },
+    {
+      "root": "pages-humanResource",
+      "pages": [
+        {
+          "path": "absence/add",
+          "type": "page",
+          "layout": "default",
+          "style": {
+            "navigationStyle": "custom",
+            "navigationBarTitleText": "请假申请"
+          }
+        },
+        {
+          "path": "absence/detail",
+          "type": "page",
+          "layout": "default",
+          "style": {
+            "navigationStyle": "custom",
+            "navigationBarTitleText": "请假详情"
+          }
+        },
+        {
+          "path": "absence/index",
+          "type": "page",
+          "layout": "default",
+          "style": {
+            "navigationStyle": "custom",
+            "navigationBarTitleText": "请假信息"
+          }
+        },
+        {
+          "path": "personnel/ageStatistics",
+          "type": "page"
+        },
+        {
+          "path": "personnel/detail",
+          "type": "page",
+          "layout": "default",
+          "style": {
+            "navigationStyle": "custom",
+            "navigationBarTitleText": "人员详情"
+          }
+        },
+        {
+          "path": "personnel/generalFieldStatistics",
+          "type": "page"
+        },
+        {
+          "path": "personnel/index",
+          "type": "page",
+          "layout": "default",
+          "style": {
+            "navigationStyle": "custom",
+            "navigationBarTitleText": "人员信息"
+          }
+        },
+        {
+          "path": "personnel/standingbook",
+          "type": "page"
+        }
+      ]
+    },
+    {
+      "root": "pages-integrated",
+      "pages": [
+        {
+          "path": "duty/index",
+          "type": "page",
+          "layout": "default",
+          "style": {
+            "navigationStyle": "custom",
+            "navigationBarTitleText": "干部值班"
+          }
+        }
+      ]
+    },
+    {
+      "root": "pages-politics",
+      "pages": [
+        {
+          "path": "health/add",
+          "type": "page",
+          "layout": "default",
+          "style": {
+            "navigationStyle": "custom",
+            "navigationBarTitleText": "健康填报"
+          }
+        },
+        {
+          "path": "healthfollow/send",
+          "type": "page"
+        },
+        {
+          "path": "healthfollow/sendmessage",
+          "type": "page",
+          "layout": "default",
+          "style": {
+            "navigationStyle": "custom",
+            "navigationBarTitleText": "健康随访"
+          }
+        }
+      ]
+    },
+    {
+      "root": "pages-process",
+      "pages": [
+        {
+          "path": "approvalTabbar",
+          "type": "page",
+          "layout": "default",
+          "style": {
+            "navigationStyle": "custom",
+            "navigationBarTitleText": "流程审批导航"
+          }
+        },
+        {
+          "path": "myApplyProcess",
+          "type": "page",
+          "layout": "default",
+          "style": {
+            "navigationStyle": "custom",
+            "navigationBarTitleText": "我发起流程"
+          }
+        },
+        {
+          "path": "taskHandle",
+          "type": "page",
+          "layout": "default",
+          "style": {
+            "navigationStyle": "custom",
+            "navigationBarTitleText": "任务处理"
+          }
+        }
+      ]
+    },
+    {
+      "root": "pages-bpm",
+      "pages": [
+        {
+          "path": "carRental/index",
+          "type": "page"
+        },
+        {
+          "path": "document/index",
+          "type": "page"
+        },
+        {
+          "path": "khss/index",
+          "type": "page"
+        },
+        {
+          "path": "lawsAndRegulations/index",
+          "type": "page"
+        },
+        {
+          "path": "leaveApplication/index",
+          "type": "page"
+        },
+        {
+          "path": "OfficeEquipmentMaintenanceApplication/index",
+          "type": "page"
+        },
+        {
+          "path": "SuperiorSystem/index",
+          "type": "page"
+        },
+        {
+          "path": "unconventional/index",
+          "type": "page"
+        },
+        {
+          "path": "unconventional/stamp",
+          "type": "page"
+        },
+        {
+          "path": "zbkh/index",
+          "type": "page"
+        }
+      ]
+    }
+  ]
 }
\ No newline at end of file
diff --git a/src/static/index/index/Healthfollow.png b/src/static/index/index/Healthfollow.png
new file mode 100644
index 0000000000000000000000000000000000000000..a044c7c6919ba218a42cd298d82a5515a4ecf323
GIT binary patch
literal 8993
zcmX9^Wn7fa*S>*OS0r}nQkJEpOF){HrRyO@T2eZel4ccHU`Yv4!iSPZLJ*{-(WP0s
z5d<Wp)Bis2`{BOl!~7=B%$aM>b)AX%M@N;Ml!+7o0CIITq&}hS`|ktaCj2W*Dsu=0
z5lUb62~de+`2_$lKplxN46yudaW|Ev`{m8w9E*r{1|-&PdTHuz0y%>%yt$T`@rTcG
zWgQEtd{Q;FYp^w1>T~VNr+y`fm5skKtetJ?6$gt1>C`gS%<ruSis<`y8Ewou9ksC9
z?ROxvPhf7RxjZ6e<$nHtrA=i)4h5yBC%@!=giYX&kM(;0vcGkJ2!qFw0J+3%qF0J;
zpgQWV`rit7!dC?b10{j)oO!F?ZwZ5uic5H4-vBscgt|TH@<l*oEqT*a*r#I4^WtIk
zZnJ<V6FlcOaH*Wo_mBzX%)So?WXS+NsSS4~#cnRJ?M@4FJQ@=>2A(<-1{*@ZOxKjV
zL`6sEs!=7IfSzMRZULmgaJpSmPd(zpZQ?MFJfXmx23elhaOy6vtV_)1>jGjiKXPJH
z@La#t-z0Q%-3t!1aL)iR%=Wt*%mhkNUE0n%)ZO;W*Mjs+;fa>sG?9p$kP&-9VR?MA
zLuPb%TtEmX`f&n^3p!sc2G|b5J}^eyd%VHtJDvL9^f-Vosu{Mny|5$*aob(Ab!ds<
zMKZ-DFQ}0j(3xBwpArUhVA}<<4##}YlHiz^ft%qoQ)<)^!eogDAz`-WxiugW-NY|y
z%-4p5AvJx<6UR9*ZnGXLT~>uNGOOQV5LTiL)B-IYONNk-$4GYj+8vP-JFyQ>PM#Er
zyG&l`vb2eU8mXZQklvUPaquH>#2cxN)1Cv13>db0kEngbD~rM6l_EQ2xZ3lfQj!&M
zJDZ5~7hW(rPNQ(tK*W_{LXM26*UKB}BL%G4_*_50o#!!Jz?6~%fKR$eZcf}w`MgTK
z*>BL|l&(Y~rJVzAC5W?KxJWSb#5_RMW1`fX%hu;EjPctLWI*rWp5l)LB#5J6)ohP$
z`#FNh5PlnFE*EsnL`q3h5GInZVuZS{hZEu<aq;17YOdh;h<Qdr-Te91yVh=%b_j>W
z>mEgR=-b2g*y+iIj*j1mGg&u}pyiRsmZ5EIF9gZ`uE*FJ>=Qtu38_#9>IN-&kO82i
zSoXuq-BBo(4MRZ_A8!clyXckymd1Z&QFXW(_gr-LU2*F6+{HmSC<0X^eL*#$2ho7%
z>w?vIHW0U4pVd)$!4-#yQc`grW6L<9v2wCSNSJc3i$f=?F3);KOL=jF(j0_?)LDg_
z(73SUGNPC}))w@|ox|#}P;4ce8qGLXrxfgS@hSs4tkC0m;Ui@gph**=l=QHeF?$@c
zxpXaIN|*Rs_``0^m}I##!46sx_FN`nsj%q<v*&FU(kxUX-P^xg%M9HZ(Zz6wH3KEs
zHofvdmgJTvhVJS|-xXR-v3Q&ek-8+>>BN?F9JfdmZs2o%@8Kb?cjsPMx%1Hfclnt3
zeql$UTEUg{BW-Ku!ShZLJz_~v4Eo)OI$4B{N4MAOWzz}@432j;BzbFq0sW$ds>g&M
z1Qs^qjjDFlGETTUf)tS<9$Asw3Q7|{3)|-gj!rh|ipFJIvV`WSCW_e94A-zZ#vtkD
z2#@Vb-$cNQrJr6fj=GpljpYbiNe7bF>^_WHViM@-!9wPZ>M!LP@PtO@p!iUJkn~lD
zE#!p~KRb0AR3g!RaiO+)n<^PEWh@4Yxs|Jz5T`gP<bEf-{)?aA7W-?6wQlAy#jj6J
z;5-s#TXrhq`=JLx#f^2h;O4?9d@uOExq_*FjWQK}0sEYhNU|^WuFf!4B`Qi{*Di6B
zPGkS)E9o@E_ix%4*_Ra5?`qzA?!<NVFZWhQv8g*5qCiOT0-gPBkn)wpHo0vM$>7C#
z)OqB`u|#BUZzCne1IDPMkPte5lR!a`%W~9J3iqQ~@q3X?MDZ?FV?v>C!;#Pn9pI`~
z{REOjl-CR0UsU-M>Ct<fQ6Cy@6--1#G5jmz$;D>ir2ki)_qO%lsX6W%vQO>o-_b#|
z50Qiq6gBns)d*TDgvHQz*l+PZt2%?hSgIyOM$^{Kb04OqtBHZsLB`_w&)U8a1A>NQ
zGdu!C>KUnrk=yKBAM+-E(N}SXqkN^6x@1(mTUaNZP<aAMNgN|-pR$i{w-RA;lOPq`
z-o8>+Ci=R?&^E`Hf4SRhTK}CsrJR{@<TsbxYj%7zJKvqfrk1ifSv{}E)XW^CGf7Jf
z4|e=&pIv)!##tSU-;PzClIk(LNg%7gR{N+8Og*4Fa{YAgV5k&-_d5i6nD$0IgW!sw
za51}e`*rY=7q}BODWl1nHleOBxJ|#Bevrf4j2a6pd<0VW_8BKkEp7v7_l;>(33vb=
z;@JplOM6Rs_Zz{@ECFe~Cx*&v7v8NOj?EmTH=<y?87i+_KjL#a>r@`SEp;I#5@hVB
zPsh`0DZ<QnL+^qGC!Cmw&Q5ZhiyT*<ImX1q7`|gu;}ve(S{s+q`Em8<18#)If|zK2
z|KsA#FZ7SN3^&a|4^^incC~=_#$m`I6GoTi{KKHI4-@Y9ZKGg3dGpJ(f0?0h`?END
zuF84<7xrlJvNphP%f<hKZ$Sfclh<1C4ym>rEjgvBY<z0?o=r`|)3GHYh)D1B@=Nd$
z_&pDJ$ZRN`tEu>{0IeiZ$MT;Dbu}tW%le?I)TD7i8*twJ(f->q0e?m7%Daq%Xq!IW
zBEsG8r*}6VPNw^D@v4Dj*lCnh6b)|3Kt(1FV7S<9!6~59RaZaRx)mf@XAretzFiKG
zUNJ;p`Hy}n``j{lFa@-&c#I2>BSOq})}WSAfxidL#6Zct8qY*!ypNf!T_BACaWzV`
zxAHu2U0NPIZOHLC%!KsSiaOX+m!JJjnw1JTNac^F=DXj#nPMP4w5IlBGu|5(@XZr#
zK4m8)CBKXM`Pn^o4~5*r;n-<6#2E^BTO#I7EE^QkdU`usB7aKsKX`eqGbtnw0QWeM
z%)DqoAzIj6v@=~Lkl60J0}2c{{|0po)L48`Ec=1!Aw$54C9_SbWS&xkQO*4TAo$OG
z>&P;_$CGefmw58$#pV~bl>BBzGT&?pgvk-`4r8;DF`*m;V3V6RsRE8m{s0D|Ux>@%
z7^uv}ZRiEls~4X!Jx&CF=2V5qLk}_@F`cAlxBd_nDIlz09(3LI`o{m3wUgB^&b*<j
zhRasNmu}mja3bKbj_nk+)<{G7@K#Xj@l8{DVk0Fvj*?{b<^Y?1+>v~)SvM|;k4$94
z2yzg?wkfYb!12#?&I^a>-ODwTx4q;7VPh|XiooH4c;=pEMQ|cu60(ib<oXTHxolsG
zSY9~dfHYgO`zQh#gdKaNOWm6|4B?QElHs>&SqTaEM025R9VXKcBTu#MYikY7bwKn^
zCz1<uRnQN@2XjHuRzA>hr;{K}DJ#gv{`*Qs^ouVX&%&0RfpMAbC;QPO65H8h_d~b#
zFNZ$2Gr_`J9{Jd6P`?fsxiI%=JF6aJX5rwN|41j9KrAr#cJI<cKLlfo|L+1^>DObr
z;)ggXQ0icMtA>u{&4rqEs=i=6dwVbcJ+{lgNeIUi4flY!SnK}@m)p+1xW+OCnae39
zF@PO3yJcSslYuiC9JtD;f=gZL3x+)X1G@8vI}xy&&ppYXM386S)hay=I^AtD3HJ_o
z(aR-cPf~iu@^;=g_`A2J<jaHW=F6y3i4C$a`@dRdv*Jx-FH3va_!7ad*c+c9j9c}*
zqhQeFq4e0lM4&i$DIRub!3cNUQ|gp_9Q%~GQ{hFt=2sDO3*6~e&hYSqLg5!+Dx%49
zg~x#6yS>n(GVjWLI>mC=`gpwbb%ZXp4HRt2Jfu%N18xI%j^y<2#HDG9aznH&-bBHC
z*=CGBd=tuv1ZE^h^ng8+J(|!w1|97Kowh}`PnEaB*?p$RZKC&6YvwOmO<fDEyC6uS
zHHrlfvvl9K6DOm4I{ZUIb5)So)J^lS{b7hTCvdFB!y$;wNIwj*QlE=gxf2CTv2H!>
zSYgYAfTR{UOW-^z^n}X5?Zf!Ptiz1YZjsl>*nev|NHmaSM1So$7R%%)P2e2~Vgn4+
z+hT9tU<RdbWH+ufz4Ht-pUbVQhz0Ps>a+#W6E(M4HpjLtn&aqw3hq~IOKekG5-VC&
z^1XcxbX=UAxZT6I?v2u?2<H}P_n54K!jN6ELvd*&A2`9Izi2b4ofjq%pBi21^{?go
zE?#|P8`dCx{IDPKInM31!fT=<SL;Ys{lk(GsO^pcu>Tp%l^c4#o{?zM;6BgFzPW4Y
z6o~c-<V#>D!}t7JOKmcnJr&CJykV`It+4g%O|V996D?O698`SS%+$~#)zOhZUkkAe
z{8jiIcx;Ry$85?D9oje!xdx)`uJhCuOC-DHM?~zudgPNXN!u@OTm4nJXVv%sBmZG+
zm%|Kmy>9N2!puue9`^mq>SI;v5v8>J+f~UvUt&?MCi;G+)kR#Gx1XO3j%FjSj=Wnv
z<0$r5W;P$v#;FZ6<8g);V9!0Z)(--x5Gs+<shzDYQzVieI#TE8g?SOP@zN&HLes^W
zFp&sKq9tAdIa(EnaXRXU*JNP1u6h<(x!tpQJEEKv6)sgbyviuVR!bK8mkwBv(^0mI
zn#N*s{VkquBWjAc)Er9!xS(?nV=UyVlf7Go8*=_(58dM@&(W&dRh#t6@~5_Y;dOrY
zQ%d4JsAztE{_-{gCaQLmgSxR&KMOd{G5sj+{jMSZ(U}y-sMmnN!;O1x#}_kwi~feW
zoD4wT?xvUZUD0K!uQF13tNE4FbD#s`EDVDJUmopB$5{4(akPL`e7O}(bpC~*+&>JK
z)j0wdMWv2wA5}k;-1XjhcZ0tpR&L@X1oawGtCZBom8g*CluHWV;olZhJj#?7am^FH
z@^|f(`EJ0TSvD~af?D7%ND=|-E{{7GPox&{Yi2_(R#T^Pb$>qm?%-2}I8c0qo&Dt?
zXLO-9t?N&MGwNd-W{yC=jxJH4^eMICbkjH1#jf=4<ZEsIWK0EMUMY@IBYgy)h<=eF
z#H7(HfUOTXv9>~-_zjhjOK>n5uplvCD8^dmV7-m}z?lQHy^l*M4;FBnKJog#RH7)%
z3@n)RJ6#e36(sHPklTwwwQ*5C#CEQ~r@?hJh?5;n`@lsofo(8FG#yNff*H_t-wQ<}
zB!~&rLgj;da6K7;b_k$Kv_8ZuwnGY_#V#kAgX;@33k#u-q4yC;o9ME~8vHl&6hK?W
zjT{C;S>Mp0&=h#QHLk1gy!(d&g{{6HLU*m)wFnvU5E#6uzzOU{!PLzgQ(Z-Snt-KR
zz%#a7Qv?I?N;?~qO0v7|O-8Y7Xu+veJ$l`N%gImNxPRlA(h3>H9Lh~w0zZFIM><Er
zlC53JQ`}~4lCoZ5SmPP{8z2X~cwg2;CvH98UN3o5wiBt+jZx))Y$XYp`}Cr<DocA5
z!ZD&*hCj=aLd~2mhW*`!9%#j<Tfy^gH2kuPW_gDgsC88iUeo9fe9>ORZ*62*725Pc
zkhdys4@f7}DnPH90S;f>l}y&5-5a%sOT7%#ch*yDckrkPj8f&chKG$fs3iIY^;N5N
z2YNa`Kfi%kQGVIe9M_oe)wf)jPx2Kl(&srp`xu`>uN3`k>Xw93QWHen7?v@3|6RYG
zJ4yIy5lw%5)?rkkx-ZLy3VigOREpCTbJn@JxoMTAQRt*O#E33<w3XNN94mJlK;><z
zj$blu$Q~f1MI?H?+}ZOIkyxqN85N}Lyze}>3lB3I86nPjzvt~^@5>>c#@TLdhNy(S
z%O+IH#15&gRxsA3N}MNRzReq_;0}gI7}mx-+Wb{bavRzFRrLB&(#cw1d)dIayzo!U
zz{L>tM6d~SH!%<V!7~eP##}MYqI+^#sA_l7l1y$4SulB0%-K;uIA*t&e>>WYfOTK+
zmO(M79h*-qk(i7!KlV5MEK-ji9Vr>f8NKZFN~cObI^u&`T<p{iQMfNOznn!{p*C>Y
zjYIO680<dpFK3q`UU86K%R8R_GI=@7rt8q5v+;sA3%4rLhHFQ=#sZc%C_6NkoKaph
zn3I$9iXey7KL8eZsp;XN!@l!hxB5kU=#0HX%PYAhcTd@Q&x0j(Qzb!qioybVv-P^l
zT{1LR7W`j<9)`=@E%onBKcUq-P412s9Sp?vZdM7Hnz+<cPh8=>hMD^LM2x;v4`wsA
zgig~e0d^iN@A7PtyG%^RX=t~PA~FavatFZs&a?LM#`jOx6Hb68$FVF<>P;#w^VPx~
z0B+D^SOz)X|K;$q0IS8`#qgCL&`JGN%LzuGrfL-Cs`u?e`q#bhIEpe>x7e}X&5oAZ
z=xsQnel5b4Lid*%*x?>oc7VK$#mE<$u46>F1h=fz{gzB{=lLl$GF=R|i+WQ_0Yn?Y
zg|Q*erp*QM>HT)~Ks(vpZ1Su_io1;#NCw*#+nX1REikY{ng(YwILOh3uw`zu8}OCS
zqW9fIGu_hdv!!KagB!HW8_jpcGqqIec}MF>C}lm{jLM9)FHEv=87mSAX<3K&>};N<
zm4wpAa93!3%|un23+mdtMPldzavC&86VqX8{{E+I2uS%@>b3b#n-^(_F5fi&ikG4)
zZnHO<$kdSd04%Dqxie>IgZ^1Mry1$REJ57)ug~Y$m`pA`n0k>#w^W;nif1!+_3<^5
z<MRF=k)gw`(1yvt|8yh)Xm%N?&YOPC5Vg399rQmb)e1kP!r}^cbVRz98>u#AljW?j
z)rUlirJcgi`QI;d{xp%<YT2!)@_y4sYRU~UzmOsbSY779rMD!F?qt8dqRu*O+UvxM
zRJ$MKQl0o=K#2W%{gR{9^5&#kw@Z~sfkSn9M3=k8w9^_Z3b$A?I^=8>7K@1<*!;|a
z@NS%2$kcKu)4KEC+~G1#sP)TUPdszC$ke-dk(1j%fbqXV8lT%K6|VLfYaNH^SdVLz
zk<^#B^(w66F!wC*7VL4_{{H?FU^MjEOSp5(Q+}^qlT?~FzwN{Z`zy7|=mbc=dFJe0
z>Q~tlJQ9r=J)ZH!U%lTC@q|NToGhnLI5y0&cS?E~sHp)dp5>>ytn~}3O{<Tip(6#f
zI@3CmZ?cFHUD%A#j)#o139G?`vuW5-@JA%<Xn+6H)L}u35uPW<Sj5}~;gLr^Tc1(l
zUPaL0+6d-<Jg9#cN~g&pCbtw$f*ck_t@E0E6yQ6K<wSe4INpVltAO`40nhC&0qO}c
z&dwaFUjS@0s7+(8)XcfGUNckcXUf0-vQ>9@W&C`MBZiw20nsI0Z1shnINi6!V@Dt;
zkysB>8#V3kplq&BopGU7b@EheKK5E&Z<eb%MHiV@8PGxo8#{+Mexa_Yt^DF*ZBwpL
znZ*i?D@}}}{p(zsUrf;HJaKI^r64H1)64OZQI0_Uv1Z%qnfee`xK2}k;amm<?mUVk
zgjdIfn<}<1xQ2j6_eG2XKcoks4XtD*C;8yH;6Ns9DL+jDdmkg_VZEDVX-Ed@=H^k>
z)1vzB-8sYHiOr#>QXBA!;ets~&@V#pLld<uAW%o?Lgrdn!L?eIw35S<ZF{afSo23c
zBukg9?j2C2=W7xAH2YSTsH5>9q~O9`kZz=FpzLTo8>dIzVO;Pd);6@MscC^a>fg7e
zvM}^sAFsO3?@7|qh_9SQA;)e!Xs~B@Om(K1V<-c(yR>d=WT5Yrik=<^3B+KGInULf
zb#KrsD-k-<_V6N+Uk6Emz_0L{2u$q6wcj^jKLNv)S3DuB{@9^>9ZYpA(ik686AG;!
zT3pHcm}z8}A^epvwhq!B{*G28l=gGe8iYV74PkB{Tt{U{F`J=7hjtW#oUu=Ib%!ix
z>)kHNfo2JWs{WcVNPVA_<9U+?l^2cVmU&pkCn~GGf4X0ZaMfVdK7x%t329R(L2eno
zM?CtOXZl0XaNC*Ry~rCpf!&4ozuxte-Z1|jr6GP8%X!OSHIjfwERBzKb4=LtbOUny
zQ8pAD<T44U2T)G$@BY08L<jnK-!?dP0vm=*gFIbtex8}zeELVYSFqN{K?Z7WG9zzO
zWzt(v4^NBJoxp)8*fGR;e~)m6!_ysljz83#h+6qwHtPfsWc(kcY7Os<nb)%Di%<^W
zl*vNOlB)QsHHiMR;e(|t&HDxu>u*F({DDt{FFh^lx2H-n{d{`2O<G_!@(a{5L*_!e
z#(!IyVsETF$Fj#d441N0r@gDlTHI#C5-=`AOV;-5Z%J)(=gObe{;V?n%=>mAl}$}6
z{EdEt+a)XXpr&9)b1H<O7B^&Q6zbibHi2WSw~;@(O;l_i>YmQqgQ-ZSIE-lD^m0;>
z!b9hL=fkwS0wy-|l;cijYwY9Hq`j<DLbs+Cx}?G~UZNlElNNv3-P*EAyI)ipt3y@e
zR9^Y91z%35lV&>~CpTm!e&BxyQn#_|t}96)7cSysJjQ$B!i3lvlzY6gpzr~e;rT*&
zHHN6(XX(DK$KQu<pgY=)o$dq%*k548U~9wuX)Dtinm+YyEylJO^H8JVvynGrTLi|T
zj7yjS-+PL}wY^8?mZb&x_eb)rIyPOvL~x67x4KBo@z;w7B6TbX*IBx;M41~qYIJ|N
zWf~9L$~CgCNT2Hbk~Gj%nb8)m-rX9jQq^xKiYFr{zqa9RF&8|Q9;|6iz>Kbwyw2tr
zih7*D&ijOCncs|+V}RlXGWfJ>^{#+2q{qb6aV(c4{2pKCmEB<vZ^HV_3btB-B;1Lw
zN+(cPWyjazsokIASq59mrvsvD>v!pTc>O2J`23Bg^~rp%6X`u!RK<nTokJjnEY@is
zchxJm7w{>%Nh-}5k~XuE|1qQFfVOnEQ*T`1*!kMwxm3D+3|?qDeQMgL*9*s$r=E#)
z2A$|bK&mC<cl3V1V=%ddAye^F)21tT_4~7Z^b4(Vay3s4^XJ6e+}wHz9-(4ruTjX8
z4uXhqTCj3dcUyL^xhJA<X$A^LmaDtv%{?KCKUcJUm0W4j4;`6OiI6H>zdvH&h|yxo
zQGQU2&y1dZ*i%g^LS9IceWl9oHtLD!=-ox1v!@(tOvi|KXqcXdA+K&pItOMYd_+Wr
zdnQSTvGiM`O&B}*!lU3mYpDNz(Q^JTt7_NTn;_)e`Zx944B4WhG5`9WYufJfUO+6U
zORR*Jvs^6ZB|$_OpJ--<DKbP+p(RH!JH(D3Tuo~`ZFt;e<PISmEfKxc(9rDioR{6D
z5r)_}p12UXM!9QR7vA7>N72lV|IprBX#UUnmCaxc(x@cAAgvS~1rvvevHsFN22C@P
z!CL{~Dek?b$9j$ZVCSzqJM22NIuQfsUX=i4-hSTmHuGmTQ*NDAby4h-;9PS#qasLh
z5g01Oktb%9%Rs$Ojws^BJbUPBiN-3|GXW12yY|@g9?o9V6Og+YIsHtgq=BGGxQhf0
z8^2+J#=M>otzgW7iF);<i-3~DJ$0wbiy!km2kSe|b!BU~U-%})TsOFVWrl7TIzB=6
z+hx0n!R6Vg9!ffY{mRxio-rni@S!-QtG5T+fJZyONuCdrBghabto8ys9gr?aL1eVY
zpMROr3}_C80n@2hY#27Rdz6c7N|GQEka}q9=TFgG9BOxgg*SeM^D!C2T8H)fA0`<C
z#i(ARatPpHgG}X>W`A`DdQAqnr~Sa&gW<2X9>B)RLD1nL!XiyB1nq@zLbI7y^<@(=
zgXZ`aiCx|XEi$i=x;c#|vWFG?W8XoH-zMsRQ|R@O0Xlje?=Y3evU^uveuDIN$<@yZ
zra$~mBwC@ER6W?vaA^i?mWAeP`TM$)fBUp}di|G0h~{)xP>f~eLRc5Vm}-#f#EAx*
zG=2SgdjI}?3+HE(od@d0%IoIH=0wcyzO1fmWbXJ1g=OX-6+W5(%L6<EbxepJrCI{h
zQF;Y~ynGV|GtigbT}o@@_X=S^_kGC9)8eB>(iVMr^|Z&zoHdFtpN|i1!J^_*KiTEF
z5mVnQ$p{Pj?q#rqtb`IoDJhDw(}6-U8K&!vqkQ^1(MJ1^T5q7ejsCfOF%1oYip5<B
zYy9xa3WZY{jQE;q{`^@nTQ;vnXpnb0AP(Xy95RNCM5YXj-$LZk(b!|>tt!-v8@|TF
z)PDSF^39)Dx&`MLFsNkfV_+r@7gWcz^++XV<DGe}5>~TRk$jx10kNnX3H9l0n|imu
zhV_Q5@EoD~cI+veSls7Zz=<BYtCsxMj*?;6*H@ODL4%rrutAN`dx!6DMI4W}CaU`S
z#CmYV;mme+Wuo*bT$O%O1|97&m$J5+)2(on)CPWVfDq|9zJf6%r_pD!atk^SK#-{<
zGNzL;$?vfMv?Uy~Qh5!A%kMPpu8u8tF;JU{E>wiC{}+C+9o7A)|J|m76tSM!?oYTD
zG<#$)xey>#{pqo^^o7B#`QKTGj5U9-BFR?#+<c3K)aD5xwTZFlk$F#sAmoF_?6Mge
zo50OT<aN%*#9RS^w)*!EO@6K`YyXA`h~IAV*BKuq&<}zx7h(TwgF5*Lp!UOTS`QtD
zRxrfXJ+{RbL|W0Zyj)Lvs$=riucD9Kyp~4?*!lELDz_`T3FO7HF^KeuvEjxBgn*DG
zzakA{M0&dZ>NbXzv_1=H@>aTp0+>Goc{aOH0OrtSIH(av+F+0OmEjClp(|P2Yas!2
zjKpE2?hc}vdphN;zy1pusc6HDw!c^X%+l4UBqU=A<POtkBxAi+2sx9%omUvl9h}zl
zZ)acvl2X%NzaBjct#i91LtZ&x1!XmmN|=Z4#4EaUkkna2*3C{e3pALmXG&U6+i1E>
zuQ*PTAu79dFM~TSTYd)sh==}r3qV>*lUu&ckw>WOJ!=)JY2cnDME7Q5ncsz|P%x)}
z(mhIAG!0;_IGO=9P_iDN+yNhdpJ<-UXiY{5Iy6&xXnTqkPd_c;?nB?YM={qLa`_5#
zR@pT&bI3Aoj&WIQS6}@l;#a~PBKEejN*`3x>JXF3FOqNnP6gD}0UtWFR7mR&mJg$W
zQ+&J@Kx3>3p$+RJzuL-@+Y4kxA^IBB$fIGeEDy*C_twcIxEQw2vT+svnWnVY)I(2%
zL6r{b;cam$=H-f<@MUqdyDI4__M<s6HX=<C%+axoff=O~%-@Z?sn01kQS`C!@9;?$
z>lwYcePv-^*z~WMBer^xq&<Siyx+<TM_IC=nhBf0SJX-C3Eias4Y4UoG`(Mn+fzug
zj+XSq$xzh^xy{u7=7t_*kCJYohdgnM{P}eMje&_QX1C8`$aI2kE@x?yU+wPhHbg!T
zu*h<*Hc%!Q<zsPL<ItoNE0bXKq%9iNs%Fe4iYVpaAy%v^7h`YWBgO>0+HP_zTY+0P
zLaG&!wMM?ZgVZAyz&}T_d&!UeQbsG>>7g<)iv=CMVo0AcAG6@1=9gW*-x;V`eO7c+
zmBq9lM3`)otvFGEBF-ev)n5CbK#|RpzVowd-`uckgspM#SZuxKM`ATn?{~fM@c6qC
zGplbGNV9!cbODj}&=F`iXY38CA%lkw_|AK5wp;JcHHw|i`!D8bSSTO(+u46x;fKHD
zytx%#0l*}V<F6}7(d~R`8a7qNnx6^g;_o0}=}cX@-x-*>@@An2?zqM?hlKGusNMG<
zUp*1CY1a(pE`P&Got_(bE>FyO?N5UlB=WE2w3v^oy|WkUFcL2fl}bP{K(7n!pVf8>
z(@4H1;R`CssoF6KWh47W&p&u^KwxhJ5*P2X@j6M95z|O#NO2<JH9!a!+w}n3{+Gxb
XrS#K7(G^B`^8%<V>mVziSfl?3GdRqK

literal 0
HcmV?d00001

diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts
index 70fddc4..7cbbc80 100644
--- a/src/types/uni-pages.d.ts
+++ b/src/types/uni-pages.d.ts
@@ -53,13 +53,18 @@ interface NavigateToOptions {
        "/pages-humanResource/personnel/standingbook" |
        "/pages-integrated/duty/index" |
        "/pages-politics/health/add" |
+       "/pages-politics/healthfollow/send" |
+       "/pages-politics/healthfollow/sendmessage" |
        "/pages-process/approvalTabbar" |
        "/pages-process/myApplyProcess" |
        "/pages-process/taskHandle" |
+       "/pages-bpm/carRental/index" |
+       "/pages-bpm/document/index" |
+       "/pages-bpm/khss/index" |
        "/pages-bpm/lawsAndRegulations/index" |
        "/pages-bpm/leaveApplication/index" |
        "/pages-bpm/OfficeEquipmentMaintenanceApplication/index" |
-       "/pages-bpm/SuperiorSystem/index";
+       "/pages-bpm/SuperiorSystem/index" |
        "/pages-bpm/unconventional/index" |
        "/pages-bpm/unconventional/stamp" |
        "/pages-bpm/zbkh/index";

From 3691d5d90f737a02bf8c1a906b338a966a889c59 Mon Sep 17 00:00:00 2001
From: yangzhq68909 <993367776@qq.com>
Date: Wed, 25 Jun 2025 09:07:54 +0800
Subject: [PATCH 06/16] =?UTF-8?q?=E5=81=A5=E5=BA=B7=E9=9A=8F=E8=AE=BF?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/humanResource/clockin/index.ts   |  11 --
 src/api/humanResource/personnel/index.ts |   9 ++
 src/api/politics/health.ts               |  17 +++
 src/api/system/index.ts                  |  26 +++-
 src/pages-humanResource/absence/add.vue  |  27 +++--
 src/pages-politics/health/followup.vue   | 145 +++++++++++++++++++++++
 src/pages.json                           |   9 ++
 src/pages/user/people.vue                |  35 ++++--
 src/static/index/index/followup.png      | Bin 0 -> 5777 bytes
 src/store/index.ts                       |   4 -
 src/types/uni-pages.d.ts                 |   1 +
 src/utils/index.ts                       | 138 ++++++---------------
 12 files changed, 279 insertions(+), 143 deletions(-)
 delete mode 100644 src/api/humanResource/clockin/index.ts
 create mode 100644 src/pages-politics/health/followup.vue
 create mode 100644 src/static/index/index/followup.png

diff --git a/src/api/humanResource/clockin/index.ts b/src/api/humanResource/clockin/index.ts
deleted file mode 100644
index 57c1f37..0000000
--- a/src/api/humanResource/clockin/index.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { http } from '@/utils/http';
-
-
-/*新增打卡记录*/
-export function addApi(config : Object) {
-	return http({
-		url: '/cxc_rlzy.wbxm.wbdk/cxcRlzyWbdk/add',
-		method: 'POST',
-		data: config
-	})
-}
\ No newline at end of file
diff --git a/src/api/humanResource/personnel/index.ts b/src/api/humanResource/personnel/index.ts
index 5c932d2..a2b7464 100644
--- a/src/api/humanResource/personnel/index.ts
+++ b/src/api/humanResource/personnel/index.ts
@@ -112,4 +112,13 @@ export function cxcRyDatAstatisticsDetails(parm) { // 员工信息统计
 		method: 'GET',
 		data: parm
 	})
+}
+
+/*新增打卡记录*/
+export function clockInApi(data : object) {
+	return http({
+		url: '/cxc_rlzy.wbxm.wbdk/cxcRlzyWbdk/add',
+		method: 'POST',
+		data
+	})
 }
\ No newline at end of file
diff --git a/src/api/politics/health.ts b/src/api/politics/health.ts
index eade129..346a12b 100644
--- a/src/api/politics/health.ts
+++ b/src/api/politics/health.ts
@@ -18,4 +18,21 @@ export function queryIf3rdGxyApi(ldhth : string) { // 根据username获取职位
 			ldhth
 		}
 	})
+}
+
+//查询登录人本月随访问题
+export function querySfwtApi() {
+	return http({
+		url: '/jksf.tbb/cxcGwjktbTbb/querySfwtByMonthLdhth',
+		method: 'GET'
+	})
+}
+
+// 提交随访问题
+export function editApi(data : object) {
+	return http({
+		url: '/jksf.tbb/cxcGwjktbTbb/editCxcGwjktbTbbZb',
+		method: 'PUT',
+		data
+	})
 }
\ No newline at end of file
diff --git a/src/api/system/index.ts b/src/api/system/index.ts
index f1c117c..a257519 100644
--- a/src/api/system/index.ts
+++ b/src/api/system/index.ts
@@ -90,10 +90,34 @@ export function getDictItemsApi(dictCode : string) { // 字典标签专用
 	})
 }
 
-export function deleteFile(config : object){//删除文件 by 闵
+export function deleteFile(config : object) {//删除文件 by 闵
 	return http({
 		url: `/sys/common/deleteFileAndCache`,
 		method: 'GET',
 		data: config
 	})
 }
+
+/*根据经纬度获取地理位置*/
+export function getLocationApi(longitude : number, latitude : number) {
+	return http({
+		url: `/sys/common/getLocation`,
+		method: 'GET',
+		data: {
+			longitude,
+			latitude
+		}
+	})
+}
+
+/*根据经纬度或城市名称获取天气信息*/
+export function getWeatherApi(longitude : number, latitude : number) {
+	return http({
+		url: `/sys/common/getWeather`,
+		method: 'GET',
+		data: {
+			longitude,
+			latitude
+		}
+	})
+}
\ No newline at end of file
diff --git a/src/pages-humanResource/absence/add.vue b/src/pages-humanResource/absence/add.vue
index 9e3d463..47d59ee 100644
--- a/src/pages-humanResource/absence/add.vue
+++ b/src/pages-humanResource/absence/add.vue
@@ -27,7 +27,7 @@
 					:rules="[{ required: true, message: '请选择结束时间' }]" :min-date="minEndtime" />
 				<wd-picker label="审批领导" prop="examineleader" v-model="model.examineleader" v-if="zwmc == '0'"
 					:columns="examineleaderData" :rules="[{ required: true, message: '请选择审批领导'}]" />
-				<wd-picker label="单位劳资员" prop="hr" v-model="model.hr" :columns="hrData" v-if="zwmc == '0'"/>
+				<wd-picker label="单位劳资员" prop="hr" v-model="model.hr" :columns="hrData" v-if="zwmc == '0'" />
 				<SelectUser label="班组长" v-model="model.teamleader" isRadioSelection v-if="zwmc == '0'"></SelectUser>
 				<wd-input label="出发地" prop="departure" v-model="model.departure"
 					:rules="[{ required: true, message: '请输入出发地' }]" />
@@ -251,8 +251,8 @@
 			} else {
 				toast.warning(res.message)
 				setTimeout(() => {
-					handleClickLeft()
-				}, 1000)
+					uni.navigateBack()
+				}, 2000)
 			}
 		})
 	}
@@ -333,13 +333,20 @@
 			roleId: '1554379432313397250',
 			orgCode: userStore.userInfo.orgCode
 		}).then(res => {
-			model.hr = res.result[0].username
-			hrData.value = res.result.map(item => {
-				return {
-					label: item.realname,
-					value: item.username
-				}
-			})
+			if (res.result.length == 0) {
+				toast.warning('请切换工作单位!')
+				setTimeout(() => {
+					uni.navigateBack()
+				}, 2000)
+			} else {
+				model.hr = res.result[0].username
+				hrData.value = res.result.map(item => {
+					return {
+						label: item.realname,
+						value: item.username
+					}
+				})
+			}
 		})
 	}
 
diff --git a/src/pages-politics/health/followup.vue b/src/pages-politics/health/followup.vue
new file mode 100644
index 0000000..ce7b71c
--- /dev/null
+++ b/src/pages-politics/health/followup.vue
@@ -0,0 +1,145 @@
+<route lang="json5" type="page">
+	{
+	layout: 'default',
+	style: {
+	navigationStyle: 'custom',
+	navigationBarTitleText: '健康随访',
+	},
+	}
+</route>
+
+<template>
+	<PageLayout navTitle="健康随访">
+		<wd-form ref="form" :model="model">
+			<wd-cell-group border>
+				<view v-for="(item, index) in list" :key="index" class="question-item">
+					<view class="question-text">{{ index + 1 }}. {{ item.tbnr }}</view>
+					<wd-radio-group v-model="answers[item.id]" class="radio-group">
+						<wd-radio value="是" class="radio-item">是</wd-radio>
+						<wd-radio value="否" class="radio-item">否</wd-radio>
+					</wd-radio-group>
+				</view>
+			</wd-cell-group>
+
+			<view class="footer" v-if="list.length">
+				<wd-button type="primary" size="large" block round @click="submitForm">提交问卷</wd-button>
+			</view>
+		</wd-form>
+	</PageLayout>
+</template>
+
+<script setup>
+	import {
+		useToast
+	} from 'wot-design-uni'
+	import {
+		querySfwtApi,
+		editApi
+	} from '@/api/politics/health'
+	const toast = useToast()
+	const model = ref({})
+	const list = ref([])
+	const answers = ref({}) // 用于存储所有问题的答案
+	const allAnswered = computed(() => {
+		return list.value.every(item => answers.value[item.id])
+	})
+
+	const getList = () => {
+		querySfwtApi().then(res => {
+			list.value = res.result
+			if (res.result.length > 0) {
+				// 检查是否已填写
+				if (res.result.every(item => item.sf)) {
+					toast.warning('本月问卷已提交!')
+					setTimeout(() => {
+						uni.navigateBack()
+					}, 2000)
+				}
+				// 初始化答案对象
+				answers.value = res.result.reduce((acc, item) => {
+					acc[item.id] = ''
+					return acc
+				}, {})
+
+			} else {
+				toast.warning('未查询到本月随访问题!')
+				setTimeout(() => {
+					uni.navigateBack()
+				}, 2000)
+			}
+		})
+	}
+
+	const submitForm = () => {
+		if (!allAnswered.value) {
+			toast.warning('请回答所有问题!')
+			return
+		}
+		editApi({
+			answers: answers.value
+		}).then(res => {
+			if (res.success) {
+				toast.success(res.message)
+				setTimeout(() => {
+					uni.navigateBack()
+				}, 2000)
+			}
+		})
+	}
+
+	onLoad(() => {
+		/*获取随访问题*/
+		getList()
+	})
+</script>
+
+<style lang="scss" scoped>
+	.question-item {
+		padding: 20rpx 24rpx;
+		border-bottom: 1rpx solid #f5f5f5;
+
+		&:last-child {
+			border-bottom: none;
+		}
+	}
+
+	.question-text {
+		font-size: 32rpx;
+		color: #333;
+		font-weight: 500;
+		margin-bottom: 24rpx;
+	}
+
+	.radio-group {
+		display: flex;
+		flex-wrap: wrap;
+		gap: 20rpx;
+	}
+
+	.radio-item {
+		flex: 1;
+
+		:deep(.wd-radio__label) {
+			font-size: 28rpx;
+		}
+
+		:deep(.wd-radio__button) {
+			border-radius: 12rpx;
+			padding: 16rpx 0;
+			text-align: center;
+			background: #f7f7f7;
+			border: none;
+			transition: all 0.3s;
+
+			&.is-checked {
+				background: #4b8df8;
+				color: #fff;
+			}
+		}
+	}
+
+	.footer {
+		padding: 12px;
+
+	}
+</style>
\ No newline at end of file
diff --git a/src/pages.json b/src/pages.json
index 88e5087..2bc63ea 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -479,6 +479,15 @@
             "navigationStyle": "custom",
             "navigationBarTitleText": "健康填报"
           }
+        },
+        {
+          "path": "health/followup",
+          "type": "page",
+          "layout": "default",
+          "style": {
+            "navigationStyle": "custom",
+            "navigationBarTitleText": "健康随访"
+          }
         }
       ]
     },
diff --git a/src/pages/user/people.vue b/src/pages/user/people.vue
index d67f01c..ccb4f7d 100644
--- a/src/pages/user/people.vue
+++ b/src/pages/user/people.vue
@@ -61,8 +61,8 @@
 	import { getEnvBaseUrl } from '@/utils/index'
 	import { queryPostByUserIdApi, editUserApi } from '@/api/system/user'
 	import { useAppStore } from '@/store'
-	import { addApi } from '@/api/humanResource/clockin'
-	
+	import { clockInApi } from '@/api/humanResource/personnel'
+
 	const appStore = useAppStore();
 	const userStore = useUserStore()
 	const toast = useToast()
@@ -156,19 +156,30 @@
 		toast.warning('H5暂不支持')
 		// #endif
 	}
-	
+
 	const clockin = () => {
 		if (loading.value) return
-		addApi({
-			weizhi: appStore.clockin
-		}).then((res : any) => {
-			if(res.success){
-				toast.success(res.message)
-			}else{
-				toast.warning(res.message)
+		loading.value = true;
+		uni.getLocation({
+			type: 'wgs84',
+			success: function (position) {
+				clockInApi({
+					longitude: position.longitude,
+					latitude: position.latitude
+				}).then((res : any) => {
+					if (res.success) {
+						toast.success(res.message)
+					} else {
+						toast.warning(res.message)
+					}
+					loading.value = false
+				})
+			},
+			fail: function (err) {
+				toast.warning('请打开系统定位再打卡!')
+				loading.value = false
 			}
-			loading.value = true
-		})
+		});
 	}
 
 
diff --git a/src/static/index/index/followup.png b/src/static/index/index/followup.png
new file mode 100644
index 0000000000000000000000000000000000000000..95bbd537b24d0594acb0a9811755476a80d98440
GIT binary patch
literal 5777
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

literal 0
HcmV?d00001

diff --git a/src/store/index.ts b/src/store/index.ts
index d23a18b..159cdf9 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -15,7 +15,6 @@ export const useAppStore = defineStore('app', {
 		isGray: 0 as 0 | 1, // 0=正常，1=灰化
 		position: null, //市
 		location: null, //省市区
-		clockin: null, //详细位置 精确到街道
 		temperature: null, //温度
 		weather: null //天气
 	}),
@@ -29,9 +28,6 @@ export const useAppStore = defineStore('app', {
 		setLocation(value : string) {
 			this.location = value
 		},
-		setClockin(value : string) {
-			this.clockin = value
-		},
 		setTemperature(value : number) {
 			this.temperature = value
 		},
diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts
index 34686a6..5b03bf8 100644
--- a/src/types/uni-pages.d.ts
+++ b/src/types/uni-pages.d.ts
@@ -53,6 +53,7 @@ interface NavigateToOptions {
        "/pages-humanResource/personnel/standingbook" |
        "/pages-integrated/duty/index" |
        "/pages-politics/health/add" |
+       "/pages-politics/health/followup" |
        "/pages-process/approvalTabbar" |
        "/pages-process/myApplyProcess" |
        "/pages-process/taskHandle" |
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 431290f..419f779 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -2,7 +2,7 @@ import { defineStore } from 'pinia'
 import { pages, subPackages, tabBar } from '@/pages.json'
 import { isMpWeixin } from './platform'
 import { useAppStore } from '@/store'
-import { upDateAppApi } from '@/api/system'
+import { upDateAppApi, getLocationApi, getWeatherApi } from '@/api/system'
 
 
 
@@ -232,11 +232,9 @@ export const useUpdateApp = defineStore('updateApp', () => {
 		try {
 			let path = ''
 			let webApp = import.meta.env.VITE_WEBAPP
-			console.log(webApp)
-			if(webApp){//如果是测试环境 ，upDateAppApi 传递参数 by min
+			if (webApp) {//如果是测试环境 ，upDateAppApi 传递参数 by min
 				path = webApp
 			}
-			console.log(path)
 			upDateAppApi(path).then(async (res : any) => {
 				let {
 					result
@@ -285,19 +283,19 @@ export const useUpdateApp = defineStore('updateApp', () => {
  * @param isWgt 是否是热资源更新 默认不是
  */
 export const hasNewVersion = (version, isWgt = false) => {
-    // #ifdef APP_PLUS
-    return new Promise((resolve) => {
-        if (isWgt) {
-            plus.runtime.getProperty(plus.runtime.appid, (widgetInfo) => {
-                const currentVersion = widgetInfo.versionCode
-                resolve(Number(version) > Number(currentVersion))
-            })
-        } else {
-            const currentVersion = plus.runtime.versionCode
-            resolve(Number(version) > Number(currentVersion))
-        }
-    })
-    // #endif
+	// #ifdef APP_PLUS
+	return new Promise((resolve) => {
+		if (isWgt) {
+			plus.runtime.getProperty(plus.runtime.appid, (widgetInfo) => {
+				const currentVersion = widgetInfo.versionCode
+				resolve(Number(version) > Number(currentVersion))
+			})
+		} else {
+			const currentVersion = plus.runtime.versionCode
+			resolve(Number(version) > Number(currentVersion))
+		}
+	})
+	// #endif
 }
 
 export function onClickUpdate(updateType : string, url) {
@@ -389,108 +387,38 @@ export const getLocation = () => {
 		type: 'wgs84',
 		success: function (position) {
 			// 成功获取位置后请求地理编码
-			uni.request({
-				url: 'https://api.tianditu.gov.cn/geocoder',
-				method: 'GET',
-				data: {
-					postStr: JSON.stringify({
-						lon: position.longitude,
-						lat: position.latitude,
-						ver: 1
-					}),
-					type: 'geocode',
-					tk: '30fe0f0c1b2320e112bde797f3ddaff4'
-				},
-				success: function (res : any) {
-					let data = res.data;
-					if (data.status == 0) {
-						const obj = data.result.addressComponent
-						store.setPosition(obj.city ? obj.city : obj.province) //市
-						store.setLocation(obj.city ? obj.province + obj.city + obj.county : obj.province + obj.county) //省市区
-						store.setClockin(data.result.formatted_address)
-						getWeather(position.latitude, position.longitude)
-					} else {
-						handleDefaultLocation()
-					}
-				},
-				fail: function (err) {
-					// uni.showToast({
-					// 	title: '位置解析失败',
-					// 	icon: 'error'
-					// })
+			getLocationApi(position.longitude, position.latitude).then((res : any) => {
+				if (res) {
+					const obj = res.addressComponent
+					store.setPosition(obj.city ? obj.city : obj.province) //市
+					store.setLocation(obj.city ? obj.province + obj.city + obj.county : obj.province + obj.county) //省市区
+					getWeather(position.longitude, position.latitude)
+				} else {
 					handleDefaultLocation()
 				}
-			});
+			})
 		},
-		fail: function (err) {
-			// 根据不同错误码处理
-			// if (err.errCode === 2 || err.errCode === 12) {
-			// 	// 2: 位置服务不可用, 12: 定位权限未开启
-			// 	uni.showToast({
-			// 		title: '请开启定位服务',
-			// 		icon: 'error'
-			// 	})
-
-			// } else {
-			// 	uni.showToast({
-			// 		title: '定位获取失败',
-			// 		icon: 'error'
-			// 	})
-			// }
+		fail: function () {
 			handleDefaultLocation()
 		}
 	});
 }
 
-const getWeather = (lat : number, lon : number) => {
-	let params = {
-		lat: lat,
-		lon: lon
-	}
-	weatherRequest(params)
-}
-
 // 处理默认位置和天气
 function handleDefaultLocation() {
 	useAppStore().setPosition('濮阳市')
-	weatherRequest({
-		q: '濮阳市'
-	})
+	getWeather(115.08784, 35.773116)  //  //油田总部经纬度
 }
 
 
-function weatherRequest(params : { lat ?: number; lon ?: number; q ?: string }) {
+function getWeather(lon : number, lat : number) {
 	const store = useAppStore()
-	uni.request({
-		url: 'https://api.openweathermap.org/data/2.5/weather',
-		method: 'GET',
-		data: {
-			...params,
-			appid: '600a60694b0e453dfbaafa862f1d1482',
-			lang: 'zh_cn'
-		},
-		success: function (res : any) {
-			if (res.data && res.data.main && res.data.weather) {
-				store.setTemperature(
-					Math.round(res.data.main.temp - 273.15)
-				)
-				store.setWeather(
-					res.data.weather[0].icon
-				)
-			} else {
-				// uni.showToast({
-				// 	title: '天气数据格式错误',
-				// 	icon: 'error'
-				// })
-			}
-		},
-		// fail: function () {
-		// 	uni.showToast({
-		// 		title: '天气获取失败',
-		// 		icon: 'error'
-		// 	})
-		// }
-	});
+	getWeatherApi(lon, lat).then((res : any) => {
+		if (res) {
+			store.setTemperature(Math.round(res.main.temp - 273.15))
+			store.setWeather(res.weather[0].icon)
+		}
+	})
 }
 
 export const imgUrl = (url : string) => {
@@ -518,7 +446,7 @@ export function getFileAccessHttpUrl(avatar, subStr) {
 /* 获取文件名 */
 export function getFilename(text : string) {
 	if (!text) {
-		return text === null ? null : ""; 
+		return text === null ? null : "";
 	}
 	if (text.indexOf(',') > 0) {
 		let arr = text.split(",")

From 3e4b0c1da9c15946f10d62b50ebb7164091b44df Mon Sep 17 00:00:00 2001
From: yangzhq68909 <993367776@qq.com>
Date: Wed, 25 Jun 2025 09:11:52 +0800
Subject: [PATCH 07/16] 1

---
 src/pages-politics/health/followup.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages-politics/health/followup.vue b/src/pages-politics/health/followup.vue
index ce7b71c..04c6fea 100644
--- a/src/pages-politics/health/followup.vue
+++ b/src/pages-politics/health/followup.vue
@@ -60,7 +60,6 @@
 					acc[item.id] = ''
 					return acc
 				}, {})
-
 			} else {
 				toast.warning('未查询到本月随访问题!')
 				setTimeout(() => {

From c979a59072519a02acc2b8ec7ec7ff6ad7d3c0f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E7=A5=A5=E7=91=9E?= <1131549607@qq.com>
Date: Thu, 26 Jun 2025 08:38:28 +0800
Subject: [PATCH 08/16] =?UTF-8?q?6.26=E5=BC=A0=E7=A5=A5=E7=91=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/healthfollow/healthfllow.ts           |  34 +++-
 .../healthfollow/HealthDetails.vue            |  77 ++++++++
 .../healthfollow/lookhealth.vue               | 173 ++++++++++++++++++
 src/pages-politics/healthfollow/send.vue      |  11 +-
 .../healthfollow/sendmessage.vue              |   2 +
 src/pages.json                                |  13 ++
 src/types/uni-pages.d.ts                      |   2 +
 7 files changed, 308 insertions(+), 4 deletions(-)
 create mode 100644 src/pages-politics/healthfollow/HealthDetails.vue
 create mode 100644 src/pages-politics/healthfollow/lookhealth.vue

diff --git a/src/api/healthfollow/healthfllow.ts b/src/api/healthfollow/healthfllow.ts
index 34bc399..631d1dd 100644
--- a/src/api/healthfollow/healthfllow.ts
+++ b/src/api/healthfollow/healthfllow.ts
@@ -2,11 +2,43 @@ import { http } from '@/utils/http';
 
 
 
-// 判断是否是三级高血压人员
+
 export function followpersonList(config : object) { // 获取随访人员信息
 	return http({
 		url: '/Hmcappselect/appselect/Hmcapplist',
 		method: 'GET',
 		data: config
 	})
+}
+
+
+// 
+export function addhealthList(config : object) { // 获取随访人员信息
+	return http({
+		url: '/tbbApp/Tbbapp/applist',
+		method: 'GET',
+		data: config
+	})
+}
+
+
+// 
+export function addByCld(config : object) { // 
+	return http({
+		url: '/jksf.tbb/cxcGwjktbTbb/addByCld',
+		method: 'GET',
+		data: config
+	})
+}
+
+
+
+/*通过id查询数据*/
+//查询人员回答问题子表
+export function queryByIdApi(id : string) {
+	return http({
+		url: '/tbbApp/Tbbapp/queryById',
+		method: 'GET',
+		data: { id }
+	})
 }
\ No newline at end of file
diff --git a/src/pages-politics/healthfollow/HealthDetails.vue b/src/pages-politics/healthfollow/HealthDetails.vue
new file mode 100644
index 0000000..315a9c9
--- /dev/null
+++ b/src/pages-politics/healthfollow/HealthDetails.vue
@@ -0,0 +1,77 @@
+<route lang="json5" type="page">
+	{
+	layout: 'default',
+	style: {
+	navigationStyle: 'custom',
+	navigationBarTitleText: '健康随访详情',
+	},
+	}
+</route>
+<template>
+	<PageLayout navTitle="健康随访详情">
+		<wd-cell-group v-for="(item, i) in info" :key="i" border>
+			<wd-cell title="填报内容:" :value="item.tbnr" />
+			<wd-cell title="是否:" :value="item.sf" />	
+		</wd-cell-group>
+	</PageLayout>
+</template>
+
+<script setup>
+	import {
+		useMessage,
+		useToast
+	} from 'wot-design-uni'
+
+	import {
+		followpersonList,
+		addhealthList,
+		queryByIdApi
+	} from '@/api/healthfollow/healthfllow'
+	import {
+		imgUrl
+	} from '@/utils/index'
+	import {
+		useUserStore
+	} from '@/store/user'
+
+	const message = useMessage()
+	const toast = useToast()
+	const userStore = useUserStore();
+	const info = ref({})
+	const path = ref([])
+	const image = ref([])
+	const resumptiontime = ref(0)
+	const minDate = ref(0)
+	const queryById = (e) => {
+		console.log("3334eeeeeeeeeee--", e)
+		queryByIdApi(e).then((res) => {
+			
+			if (res.success) {
+				info.value = res.result.records
+				console.log("res---", res.result.records)
+			}
+		})
+	}
+
+	// 处理数据排序（按sort字段升序）
+	const sortedInfo = computed(() => {
+		if (info.value && info.value.records) {
+			return [...info.value.records].sort((a, b) => {
+				return parseInt(a.sort) - parseInt(b.sort)
+			})
+		}
+		return []
+	})
+
+
+	onLoad((options) => {
+		console.log("options---传进来的id--", options)
+		queryById(options.id)
+	})
+</script>
+
+<style lang="scss" scoped>
+	.footer {
+		padding: 12px;
+	}
+</style>
\ No newline at end of file
diff --git a/src/pages-politics/healthfollow/lookhealth.vue b/src/pages-politics/healthfollow/lookhealth.vue
new file mode 100644
index 0000000..a9071fc
--- /dev/null
+++ b/src/pages-politics/healthfollow/lookhealth.vue
@@ -0,0 +1,173 @@
+<template>
+	<PageLayout :navbarShow="false">
+		<wd-card id="top1">
+			<wd-row>
+				<wd-col :span="16">
+					<wd-datetime-picker type="year-month" v-model="dataValue" label="填报时间" @confirm="getList" id="top1" />
+				</wd-col>
+				<wd-col :span="8" style="display: flex; justify-content: center;">
+					<wd-button @click="clear">重置</wd-button>
+				</wd-col>
+			</wd-row>
+		</wd-card>
+		<view v-for="(item, i) in list" :key="i" @click="jump(`./HealthDetails?id=${item.id}`)">
+			<wd-card
+				:title="item.xm+'的'+item.createTime.substring(0,4)+'年'+item.createTime.substring(5,7)+'月'+'的健康随访填报表'">
+				<view class="card-content">
+					<view class="meta-info">
+						<wd-icon name="usergroup" size="14px" color="#999"></wd-icon>
+						<text class="meta-text">{{item.depart_dictText}}</text>
+						<!-- <wd-icon name="time" size="14px" color="#999" style="margin-left: auto;"></wd-icon> -->
+						<!-- <text class="meta-text">
+							{{item.ksny}}</text> -->
+					</view>
+				</view>
+			</wd-card>
+		</view>
+	</PageLayout>
+</template>
+
+<script setup>
+	import {
+		useMessage,
+		useToast
+	} from 'wot-design-uni'
+	import SelectDept from '@/components/SelectDept/SelectDept'
+
+	import {
+		followpersonList,
+		addhealthList
+	} from '@/api/healthfollow/healthfllow'
+
+
+	const realname = ref('') //姓名查询
+	const list = ref([])
+	const total = ref(0)
+	const screenHeight = ref(0)
+	const screenWidth = ref(0)
+	const tableHeight = ref(0)
+	const range = ref([]) //日期查询
+	const dataValue = ref(Date.now())
+	let pageNo = 1
+	let pageSize = 10
+	let loading = false
+	
+	const clear = () => {
+		dataValue.value = Date.now()
+		getpersonList();
+	}
+
+//按照时间状态
+	const getList = () => {
+		const date = new Date(dataValue.value);
+		const year = date.getFullYear();
+		const month = date.getMonth() + 2;
+		let monthdate = '';
+		if(month<10){
+			monthdate = '0'+month;
+		}else{
+			monthdate = month;
+		}
+		let params = {
+			
+		}
+		console.log("res--按时间查询-params-111-",params)
+		addhealthList({
+			// ...params,
+			cxdata:  year + '-' + monthdate,
+			pageNo,
+			pageSize
+		}).then(res => {
+			console.log("res--按时间查询-222-",res)
+			if (res.success) {
+				list.value = res.result.records.map((item, index) => ({
+					...item, // 保留原有字段
+				}));
+				total.value = res.result.total
+			}
+		})
+	}
+
+
+//无时间限制
+	const getpersonList = (e)=> {
+		const date = new Date();
+		const year = date.getFullYear();
+		const month = date.getMonth() + 1;
+		let monthdate = '';
+		if(month<10){
+			monthdate = '0'+month;
+		}else{
+			monthdate = month;
+		}
+		let params = {
+			// ksny: year + '-' + monthdate +'-01'
+		}
+		console.log("res--初始化----params-111-",params)
+		addhealthList({
+				// ...params,
+				cxdata:  year + '-' + monthdate,
+				pageNo,
+				pageSize
+			}).then((res) => {
+				console.log("res--初始化---222--", res)
+				if (res.success) {
+					list.value = res.result.records.map((item, index) => ({
+						...item, // 保留原有字段
+					}));
+					total.value = res.result.total
+				}
+			})
+			.catch((err) => {
+				console.log(err);
+			});
+	}
+
+
+	/*切换页码*/
+	const handleChange = ({
+		value
+	}) => {
+		pageNo = value
+		getpersonList(1)
+	}
+
+	const calculateTableHeight = () => {
+		const systemInfo = uni.getSystemInfoSync();
+		screenWidth.value = systemInfo.screenWidth;
+		screenHeight.value = systemInfo.screenHeight;
+		// 获取页面顶部元素高度（导航栏+日期选择器）
+		const query = uni.createSelectorQuery();
+		query.select('#top1').boundingClientRect(data => {
+			const topHeight = data ? data.height : 0;
+			const navHeight = 88; // 导航栏高度
+			const margin = 20; // 上下边距
+			// 计算表格可用高度
+			tableHeight.value = screenHeight.value - topHeight - navHeight;
+		}).exec();
+	}
+	
+	const jump = (url) => {
+		uni.navigateTo({
+			url: url
+		});
+	}
+
+
+	onMounted(() => {
+		getpersonList();
+		followpersonList();
+		calculateTableHeight();
+		// 监听屏幕旋转变化
+		uni.onWindowResize(() => {
+			calculateTableHeight();
+		});
+	})
+	onReachBottom(() => {
+		if (loading) return
+		queryLeave(1); //下拉刷新传1
+	})
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/src/pages-politics/healthfollow/send.vue b/src/pages-politics/healthfollow/send.vue
index d2ee10a..9fbd012 100644
--- a/src/pages-politics/healthfollow/send.vue
+++ b/src/pages-politics/healthfollow/send.vue
@@ -17,9 +17,8 @@
 					<wd-checkbox v-model="row.checked" @change="handleCheckboxChange(row)"></wd-checkbox>
 				</template>
 			</wd-table-col>
-			<wd-table-col prop="xh" label="序号" align="center" :width="screenWidth / 5"></wd-table-col>
-			<!-- <wd-table-col prop="dw" label="单位" align="center" :width="screenWidth /5"></wd-table-col> -->
 			<wd-table-col prop="xm" label="姓名" align="center" :width="screenWidth / 5"></wd-table-col>
+			<wd-table-col prop="gfxry_dictText" label="疾病类别" align="center" :width="screenWidth /5"></wd-table-col>
 			<wd-table-col prop="nl" label="年龄" align="center" :width="screenWidth /5"></wd-table-col>
 			<wd-table-col prop="xb_dictText" label="性别" align="center" :width="screenWidth / 5"></wd-table-col>
 		</wd-table>
@@ -36,7 +35,8 @@
 	import SelectDept from '@/components/SelectDept/SelectDept'
 
 	import {
-		followpersonList
+		followpersonList,
+		addByCld
 	} from '@/api/healthfollow/healthfllow'
 
 
@@ -88,6 +88,11 @@
 		// 收集所有选中项的 ldhth 字段并以逗号拼接
 		const ldhthValues = selectedData.map(item => item.ldhth).join(',');
 		console.log('拼接后的 ldhth 值:', ldhthValues);
+		addByCld({
+			ldhths:ldhthValues
+			}).then(res=>{
+				console.log("res----",res)
+			})
 
 
 	}
diff --git a/src/pages-politics/healthfollow/sendmessage.vue b/src/pages-politics/healthfollow/sendmessage.vue
index 5f0f51e..9936d7a 100644
--- a/src/pages-politics/healthfollow/sendmessage.vue
+++ b/src/pages-politics/healthfollow/sendmessage.vue
@@ -18,6 +18,7 @@
 				<send></send>
 			</view>
 			<view v-if="current === 1">
+				<lookhealth></lookhealth>
 			</view>
 		</view>
 	</PageLayout>
@@ -42,6 +43,7 @@
 		getEnvBaseUrl
 	} from '@/utils/index'
 	import send from './send'
+	import lookhealth from './lookhealth'
 
 	const items = ref(['发送随访信息', '查看随访信息'])
 	const userStore = useUserStore(); //登录人信息
diff --git a/src/pages.json b/src/pages.json
index b7d4451..2e3b34d 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -480,6 +480,19 @@
             "navigationBarTitleText": "健康填报"
           }
         },
+        {
+          "path": "healthfollow/HealthDetails",
+          "type": "page",
+          "layout": "default",
+          "style": {
+            "navigationStyle": "custom",
+            "navigationBarTitleText": "健康随访详情"
+          }
+        },
+        {
+          "path": "healthfollow/lookhealth",
+          "type": "page"
+        },
         {
           "path": "healthfollow/send",
           "type": "page"
diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts
index 7cbbc80..258dd5c 100644
--- a/src/types/uni-pages.d.ts
+++ b/src/types/uni-pages.d.ts
@@ -53,6 +53,8 @@ interface NavigateToOptions {
        "/pages-humanResource/personnel/standingbook" |
        "/pages-integrated/duty/index" |
        "/pages-politics/health/add" |
+       "/pages-politics/healthfollow/HealthDetails" |
+       "/pages-politics/healthfollow/lookhealth" |
        "/pages-politics/healthfollow/send" |
        "/pages-politics/healthfollow/sendmessage" |
        "/pages-process/approvalTabbar" |

From cd340d4185708b503b131371bbdeb9b71568560a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E7=A5=A5=E7=91=9E?= <1131549607@qq.com>
Date: Thu, 26 Jun 2025 10:13:23 +0800
Subject: [PATCH 09/16] =?UTF-8?q?6.26=E5=BC=A0=E7=A5=A5=E7=91=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 env/.env.development                              | 2 +-
 src/pages-politics/healthfollow/HealthDetails.vue | 2 +-
 src/pages-politics/healthfollow/lookhealth.vue    | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/env/.env.development b/env/.env.development
index f347345..77103c3 100644
--- a/env/.env.development
+++ b/env/.env.development
@@ -7,7 +7,7 @@ VITE_SHOW_SOURCEMAP = true
 # 是否启用读取配置文件 min
 #VITE_WEBAPP = 'D://opt//AppUpdateTest'
 VITE_WEBAPP = ''
-VITE_SERVER_BASEURL = 'http://10.75.15.249:8080/jeecg-boot'
+VITE_SERVER_BASEURL = 'http://10.75.15.246:8080/jeecg-boot'
 #VITE_SERVER_BASEURL = 'https://36.112.48.190/jeecg-boot'
 #VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/jeecg-boot'
 
diff --git a/src/pages-politics/healthfollow/HealthDetails.vue b/src/pages-politics/healthfollow/HealthDetails.vue
index 315a9c9..76e976f 100644
--- a/src/pages-politics/healthfollow/HealthDetails.vue
+++ b/src/pages-politics/healthfollow/HealthDetails.vue
@@ -11,7 +11,7 @@
 	<PageLayout navTitle="健康随访详情">
 		<wd-cell-group v-for="(item, i) in info" :key="i" border>
 			<wd-cell title="填报内容:" :value="item.tbnr" />
-			<wd-cell title="是否:" :value="item.sf" />	
+			<wd-cell title="是否:" :value="item.sf" />
 		</wd-cell-group>
 	</PageLayout>
 </template>
diff --git a/src/pages-politics/healthfollow/lookhealth.vue b/src/pages-politics/healthfollow/lookhealth.vue
index a9071fc..a510f90 100644
--- a/src/pages-politics/healthfollow/lookhealth.vue
+++ b/src/pages-politics/healthfollow/lookhealth.vue
@@ -12,7 +12,7 @@
 		</wd-card>
 		<view v-for="(item, i) in list" :key="i" @click="jump(`./HealthDetails?id=${item.id}`)">
 			<wd-card
-				:title="item.xm+'的'+item.createTime.substring(0,4)+'年'+item.createTime.substring(5,7)+'月'+'的健康随访填报表'">
+				:title="item.xm+'的'+item.createTime.substring(0,4)+'年'+item.ksny.substring(5,7)+'月'+'的健康随访填报表'">
 				<view class="card-content">
 					<view class="meta-info">
 						<wd-icon name="usergroup" size="14px" color="#999"></wd-icon>
@@ -61,7 +61,7 @@
 	const getList = () => {
 		const date = new Date(dataValue.value);
 		const year = date.getFullYear();
-		const month = date.getMonth() + 2;
+		const month = date.getMonth() + 1;
 		let monthdate = '';
 		if(month<10){
 			monthdate = '0'+month;

From d2946c938a0fdea6e7319291f72f8f91c224a088 Mon Sep 17 00:00:00 2001
From: yangzhq68909 <993367776@qq.com>
Date: Thu, 26 Jun 2025 10:38:28 +0800
Subject: [PATCH 10/16] 1

---
 env/.env.development | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/env/.env.development b/env/.env.development
index 77103c3..f347345 100644
--- a/env/.env.development
+++ b/env/.env.development
@@ -7,7 +7,7 @@ VITE_SHOW_SOURCEMAP = true
 # 是否启用读取配置文件 min
 #VITE_WEBAPP = 'D://opt//AppUpdateTest'
 VITE_WEBAPP = ''
-VITE_SERVER_BASEURL = 'http://10.75.15.246: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'
 

From dddcccc6cda33a36fff33e934ddd188643e2816b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E7=A5=A5=E7=91=9E?= <1131549607@qq.com>
Date: Thu, 26 Jun 2025 16:17:53 +0800
Subject: [PATCH 11/16] =?UTF-8?q?6.26=E5=BC=A0=E7=A5=A5=E7=91=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../healthfollow/lookhealth.vue               |  2 +-
 src/pages-politics/healthfollow/send.vue      | 19 +++++++++++++------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/pages-politics/healthfollow/lookhealth.vue b/src/pages-politics/healthfollow/lookhealth.vue
index a510f90..f201bf0 100644
--- a/src/pages-politics/healthfollow/lookhealth.vue
+++ b/src/pages-politics/healthfollow/lookhealth.vue
@@ -5,7 +5,7 @@
 				<wd-col :span="16">
 					<wd-datetime-picker type="year-month" v-model="dataValue" label="填报时间" @confirm="getList" id="top1" />
 				</wd-col>
-				<wd-col :span="8" style="display: flex; justify-content: center;">
+				<wd-col :span="8" style="margin-top: 5px;">
 					<wd-button @click="clear">重置</wd-button>
 				</wd-col>
 			</wd-row>
diff --git a/src/pages-politics/healthfollow/send.vue b/src/pages-politics/healthfollow/send.vue
index 9fbd012..7178533 100644
--- a/src/pages-politics/healthfollow/send.vue
+++ b/src/pages-politics/healthfollow/send.vue
@@ -1,13 +1,13 @@
 <template>
 	<PageLayout :navbarShow="false">
-		<wd-card style="margin: 10px; display: flex; justify-content: center; align-items: center;" id="top1">
+		<wd-card  id="top1">
 			<wd-row>
-				<wd-col :span="12" style="display: flex; justify-content: center;">
+				<wd-col :span="16" style="margin-top: 5px;">
 					<uni-easyinput v-model="realname" placeholder="姓名模糊查询" @change="getpersonList"
-						@clear="getpersonList" />
+						@clear="getpersonList" style="width: 100%;" />
 				</wd-col>
-				<wd-col :span="12" style="display: flex; justify-content: center;">
-					<wd-button @click="sendMessage">发送消息</wd-button>
+				<wd-col :span="6" style="margin-top: 5px;margin-left: 3px;">
+					<wd-button @click="sendMessage" style="width: 100%;">发送消息</wd-button>
 				</wd-col>
 			</wd-row>
 		</wd-card>
@@ -48,6 +48,8 @@
 	const screenHeight = ref(0)
 	const screenWidth = ref(0)
 	const tableHeight = ref(0)
+	const message = useMessage()
+	const toast = useToast()
 
 	const getpersonList = (e) => {
 		if (e != 1) { //为1时是切换页码
@@ -82,7 +84,7 @@
 		const selectedData = list.value.filter(item => item.checked);
 
 		if (selectedData.length === 0) {
-			useToast().show('请先选择要发送消息的人员');
+			toast.success('请先选择要发送消息的人员')
 			return;
 		}
 		// 收集所有选中项的 ldhth 字段并以逗号拼接
@@ -91,7 +93,12 @@
 		addByCld({
 			ldhths:ldhthValues
 			}).then(res=>{
+				toast.success(res.message)
 				console.log("res----",res)
+				// if(res.success){
+				// 	toast.success(res.message)
+				// }
+				
 			})
 
 

From 2e8de0d60a5b67b02bf2e3d24e52a269c9f69f82 Mon Sep 17 00:00:00 2001
From: yangzhq68909 <993367776@qq.com>
Date: Thu, 26 Jun 2025 16:22:49 +0800
Subject: [PATCH 12/16] 6.26

---
 env/.env.production                    | 4 ++--
 src/pages-politics/health/followup.vue | 6 +++---
 src/pages.json                         | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/env/.env.production b/env/.env.production
index 6bf67f0..2a443e5 100644
--- a/env/.env.production
+++ b/env/.env.production
@@ -7,7 +7,7 @@ VITE_SHOW_SOURCEMAP = false
 # 是否启用读取配置文件 min
 #VITE_WEBAPP = 'D://opt//AppUpdateTest'
 VITE_WEBAPP = ''
-VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/jeecg-boot'
+#VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/jeecg-boot'
 #VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/wwapi'
 #VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/yjapi'
-#VITE_SERVER_BASEURL = 'http://10.75.15.247:8080/jeecg-boot'
\ No newline at end of file
+VITE_SERVER_BASEURL = 'http://10.75.15.249:8080/jeecg-boot'
\ No newline at end of file
diff --git a/src/pages-politics/health/followup.vue b/src/pages-politics/health/followup.vue
index 04c6fea..53f7160 100644
--- a/src/pages-politics/health/followup.vue
+++ b/src/pages-politics/health/followup.vue
@@ -3,13 +3,13 @@
 	layout: 'default',
 	style: {
 	navigationStyle: 'custom',
-	navigationBarTitleText: '健康随访',
+	navigationBarTitleText: '健康随访问卷',
 	},
 	}
 </route>
 
 <template>
-	<PageLayout navTitle="健康随访">
+	<PageLayout navTitle="健康随访问卷">
 		<wd-form ref="form" :model="model">
 			<wd-cell-group border>
 				<view v-for="(item, index) in list" :key="index" class="question-item">
@@ -78,7 +78,7 @@
 			answers: answers.value
 		}).then(res => {
 			if (res.success) {
-				toast.success(res.message)
+				toast.success('提交成功!')
 				setTimeout(() => {
 					uni.navigateBack()
 				}, 2000)
diff --git a/src/pages.json b/src/pages.json
index 7e94b78..a763919 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -486,7 +486,7 @@
           "layout": "default",
           "style": {
             "navigationStyle": "custom",
-            "navigationBarTitleText": "健康随访"
+            "navigationBarTitleText": "健康随访问卷"
           }
         },
         {

From e7f6f847904d4faa32596149fc09d4243014a53c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E7=A5=A5=E7=91=9E?= <1131549607@qq.com>
Date: Thu, 26 Jun 2025 16:50:26 +0800
Subject: [PATCH 13/16] =?UTF-8?q?6.26=E5=BC=A0=E7=A5=A5=E7=91=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages-politics/healthfollow/send.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages-politics/healthfollow/send.vue b/src/pages-politics/healthfollow/send.vue
index 7178533..ebf0652 100644
--- a/src/pages-politics/healthfollow/send.vue
+++ b/src/pages-politics/healthfollow/send.vue
@@ -84,7 +84,7 @@
 		const selectedData = list.value.filter(item => item.checked);
 
 		if (selectedData.length === 0) {
-			toast.success('请先选择要发送消息的人员')
+			toast.warning('请先选择要发送消息的人员')
 			return;
 		}
 		// 收集所有选中项的 ldhth 字段并以逗号拼接

From 485978e0eda890e6bdc948604992c3b586b94930 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E7=A5=A5=E7=91=9E?= <1131549607@qq.com>
Date: Thu, 26 Jun 2025 18:11:22 +0800
Subject: [PATCH 14/16] =?UTF-8?q?6.26=E5=BC=A0=E7=A5=A5=E7=91=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../device-control/office/Personaldevices.vue | 44 +++++++++++++++++++
 .../device-control/office/index.vue           | 36 +++++++++++++++
 src/pages-home/home/home.vue                  | 20 ---------
 src/pages.json                                |  8 +++-
 src/types/uni-pages.d.ts                      |  3 +-
 5 files changed, 88 insertions(+), 23 deletions(-)
 create mode 100644 src/pages-home/device-control/office/Personaldevices.vue
 create mode 100644 src/pages-home/device-control/office/index.vue
 delete mode 100644 src/pages-home/home/home.vue

diff --git a/src/pages-home/device-control/office/Personaldevices.vue b/src/pages-home/device-control/office/Personaldevices.vue
new file mode 100644
index 0000000..263a5ee
--- /dev/null
+++ b/src/pages-home/device-control/office/Personaldevices.vue
@@ -0,0 +1,44 @@
+<template>
+	<PageLayout :navbarShow="false">
+		<wd-card type="rectangle">
+		  <template #title>
+		    <view class="title">
+		      <view>2020-02-03服务到期</view>
+		      <view class="title-tip">
+		        <wd-icon name="warning" size="14px" custom-style="vertical-align: bottom" />
+		        您可以去电脑上使用该服务
+		      </view>
+		    </view>
+		  </template>
+		  <view style="height: 40px;" class="content">
+		    <image
+		      src="https://img11.360buyimg.com/imagetools/jfs/t1/143248/37/5695/265818/5f3a8546E98d998a4/745897ca9c9e474b.jpg"
+		      width="40"
+		      height="40"
+		      alt="joy"
+		      style="border-radius: 4px; margin-right: 12px;"
+		    />
+		    <view>
+		      <view style="color: rgba(0,0,0,0.85); font-size: 16px;">智催评营销</view>
+		      <view style="color: rgba(0,0,0,0.25); font-size: 12px;">高级版-快速吸粉 | 周期一年</view>
+		    </view>
+		  </view>
+		
+		  <template #footer>
+		    <view>
+		      <wd-button size="small" style="margin-right: 8px;">评价</wd-button>
+		      <wd-button size="small" plain>立即使用</wd-button>
+		    </view>
+		  </template>
+		</wd-card>
+	</PageLayout>
+</template>
+
+<script setup>
+	
+	
+	
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/src/pages-home/device-control/office/index.vue b/src/pages-home/device-control/office/index.vue
new file mode 100644
index 0000000..f9187cc
--- /dev/null
+++ b/src/pages-home/device-control/office/index.vue
@@ -0,0 +1,36 @@
+<route lang="json5" type="page">
+	{
+	layout: 'default',
+	style: {
+	navigationBarTitleText: '办公室设备列表',
+	},
+	}
+</route>
+
+<template>
+	<PageLayout navTitle="设备管理">
+		<view class="content">
+			<view v-if="current === 0">
+				<Personaldevices></Personaldevices>
+			</view>
+			<view v-if="current === 1">
+			</view>
+		</view>
+	</PageLayout>
+</template>
+
+<script setup>
+	import Personaldevices from './Personaldevices'
+	
+	const current = ref(0)
+	const items = ref(['个人使用房间设备', '全部房间设备'])
+	
+	function onClickItem(e) {
+		if (current.value != e.currentIndex) {
+			current.value = e.currentIndex;
+		}
+	}
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/src/pages-home/home/home.vue b/src/pages-home/home/home.vue
deleted file mode 100644
index 16c7130..0000000
--- a/src/pages-home/home/home.vue
+++ /dev/null
@@ -1,20 +0,0 @@
-<route lang="json5" type="page">
-	{
-	layout: 'default',
-	style: {
-	navigationBarTitleText: '',
-	},
-	}
-</route>
-
-<template>
-	<view class=""></view>
-</template>
-
-<script lang="ts" setup>
-	//
-</script>
-
-<style lang="scss" scoped>
-	//
-</style>
\ No newline at end of file
diff --git a/src/pages.json b/src/pages.json
index 7e94b78..70d7b2e 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -222,12 +222,16 @@
       "root": "pages-home",
       "pages": [
         {
-          "path": "home/home",
+          "path": "device-control/office/index",
           "type": "page",
           "layout": "default",
           "style": {
-            "navigationBarTitleText": ""
+            "navigationBarTitleText": "办公室设备列表"
           }
+        },
+        {
+          "path": "device-control/office/Personaldevices",
+          "type": "page"
         }
       ]
     },
diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts
index e64ab7f..9ab397e 100644
--- a/src/types/uni-pages.d.ts
+++ b/src/types/uni-pages.d.ts
@@ -27,7 +27,8 @@ interface NavigateToOptions {
        "/pages/production/shishishuju/nyxhSssj" |
        "/pages/production/shishishuju/trqSssj" |
        "/pages/production/shishishuju/ysjSssj" |
-       "/pages-home/home/home" |
+       "/pages-home/device-control/office/index" |
+       "/pages-home/device-control/office/Personaldevices" |
        "/pages-message/chat/chat" |
        "/pages-message/contacts/contacts" |
        "/pages-message/personPage/personPage" |

From 5eaac7320f8830b5342c352b1d07c5ebd5646d25 Mon Sep 17 00:00:00 2001
From: yangzhq68909 <993367776@qq.com>
Date: Fri, 27 Jun 2025 08:18:24 +0800
Subject: [PATCH 15/16] 1

---
 src/manifest.json | 277 +++++++++++++++++++++++-----------------------
 1 file changed, 138 insertions(+), 139 deletions(-)

diff --git a/src/manifest.json b/src/manifest.json
index 110fba0..3728d86 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -1,149 +1,148 @@
 {
-  "name": "数智产销",
-  "appid": "__UNI__9F097F0",
-  "description": "",
-  "versionName": "2.0.3",
-  "versionCode": "20250620",
-  "transformPx": false,
-  "app-plus": {
-    "usingComponents": true,
-    "nvueStyleCompiler": "uni-app",
-    "compilerVersion": 3,
-    "splashscreen": {
-      "alwaysShowBeforeRender": true,
-      "waiting": true,
-      "autoclose": true,
-      "delay": 0
-    },
-    "modules": {
-      "Maps": {},
-      "Messaging": {},
-      "Camera": {}
-    },
-    "distribute": {
-      "android": {
-        "permissions": [
-          "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-          "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-          "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-          "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-          "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-          "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-          "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-          "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-          "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-          "<uses-feature android:name=\"android.hardware.camera\"/>",
-          "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-        ],
-        "minSdkVersion": 26,
-        "targetSdkVersion": 30,
-        "abiFilters": [
-          "armeabi-v7a",
-          "arm64-v8a"
-        ]
-      },
-      "ios": {},
-      "sdkConfigs": {
-        "maps": {
-          "amap": {
-            "name": "amap_15931993294Bqxlq8EgG",
-            "appkey_ios": "c913e46ffdf548ebc56ac1cf4d883e7e",
-            "appkey_android": "c913e46ffdf548ebc56ac1cf4d883e7e"
-          }
-        }
-      },
-      "icons": {
-        "android": {
-          "hdpi": "src/static/app/icons/72x72.png",
-          "xhdpi": "src/static/app/icons/96x96.png",
-          "xxhdpi": "src/static/app/icons/144x144.png",
-          "xxxhdpi": "src/static/app/icons/192x192.png"
+    "name" : "数智产销",
+    "appid" : "__UNI__9F097F0",
+    "description" : "",
+    "versionName" : "2.0.3",
+    "versionCode" : "20250620",
+    "transformPx" : false,
+    "app-plus" : {
+        "usingComponents" : true,
+        "nvueStyleCompiler" : "uni-app",
+        "compilerVersion" : 3,
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
         },
-        "ios": {
-          "appstore": "src/static/app/icons/1024x1024.png",
-          "ipad": {
-            "app": "src/static/app/icons/76x76.png",
-            "app@2x": "src/static/app/icons/152x152.png",
-            "notification": "src/static/app/icons/20x20.png",
-            "notification@2x": "src/static/app/icons/40x40.png",
-            "proapp@2x": "src/static/app/icons/167x167.png",
-            "settings": "src/static/app/icons/29x29.png",
-            "settings@2x": "src/static/app/icons/58x58.png",
-            "spotlight": "src/static/app/icons/40x40.png",
-            "spotlight@2x": "src/static/app/icons/80x80.png"
-          },
-          "iphone": {
-            "app@2x": "src/static/app/icons/120x120.png",
-            "app@3x": "src/static/app/icons/180x180.png",
-            "notification@2x": "src/static/app/icons/40x40.png",
-            "notification@3x": "src/static/app/icons/60x60.png",
-            "settings@2x": "src/static/app/icons/58x58.png",
-            "settings@3x": "src/static/app/icons/87x87.png",
-            "spotlight@2x": "src/static/app/icons/80x80.png",
-            "spotlight@3x": "src/static/app/icons/120x120.png"
-          }
+        "modules" : {
+            "Maps" : {},
+            "Messaging" : {},
+            "Camera" : {}
+        },
+        "distribute" : {
+            "android" : {
+                "permissions" : [
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ],
+                "minSdkVersion" : 26,
+                "targetSdkVersion" : 30,
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ]
+            },
+            "ios" : {
+                "dSYMs" : false
+            },
+            "sdkConfigs" : {
+                "maps" : {
+                    "amap" : {
+                        "name" : "amap_15931993294Bqxlq8EgG",
+                        "appkey_ios" : "c913e46ffdf548ebc56ac1cf4d883e7e",
+                        "appkey_android" : "c913e46ffdf548ebc56ac1cf4d883e7e"
+                    }
+                }
+            },
+            "icons" : {
+                "android" : {
+                    "hdpi" : "src/static/app/icons/72x72.png",
+                    "xhdpi" : "src/static/app/icons/96x96.png",
+                    "xxhdpi" : "src/static/app/icons/144x144.png",
+                    "xxxhdpi" : "src/static/app/icons/192x192.png"
+                },
+                "ios" : {
+                    "appstore" : "src/static/app/icons/1024x1024.png",
+                    "ipad" : {
+                        "app" : "src/static/app/icons/76x76.png",
+                        "app@2x" : "src/static/app/icons/152x152.png",
+                        "notification" : "src/static/app/icons/20x20.png",
+                        "notification@2x" : "src/static/app/icons/40x40.png",
+                        "proapp@2x" : "src/static/app/icons/167x167.png",
+                        "settings" : "src/static/app/icons/29x29.png",
+                        "settings@2x" : "src/static/app/icons/58x58.png",
+                        "spotlight" : "src/static/app/icons/40x40.png",
+                        "spotlight@2x" : "src/static/app/icons/80x80.png"
+                    },
+                    "iphone" : {
+                        "app@2x" : "src/static/app/icons/120x120.png",
+                        "app@3x" : "src/static/app/icons/180x180.png",
+                        "notification@2x" : "src/static/app/icons/40x40.png",
+                        "notification@3x" : "src/static/app/icons/60x60.png",
+                        "settings@2x" : "src/static/app/icons/58x58.png",
+                        "settings@3x" : "src/static/app/icons/87x87.png",
+                        "spotlight@2x" : "src/static/app/icons/80x80.png",
+                        "spotlight@3x" : "src/static/app/icons/120x120.png"
+                    }
+                }
+            }
+        },
+        "android" : {
+            "webView" : {
+                "domStorageEnabled" : true,
+                "databaseEnabled" : true,
+                "allowFileAccess" : true
+            }
+        },
+        "compatible" : {
+            "ignoreVersion" : true
+        },
+        "webview" : {
+            "debug" : true,
+            "crossDomain" : true
         }
-      }
     },
-    "android": {
-      "webView": {
-        "domStorageEnabled": true,
-        "databaseEnabled": true,
-        "allowFileAccess": true
-      }
+    "quickapp" : {},
+    "mp-weixin" : {
+        "appid" : "wx8e287639924edb51",
+        "setting" : {
+            "urlCheck" : false,
+            "minified" : true
+        },
+        "usingComponents" : true
     },
-    "compatible": {
-      "ignoreVersion": true
+    "mp-alipay" : {
+        "usingComponents" : true,
+        "styleIsolation" : "shared"
     },
-    "webview": {
-      "debug": true,
-      "crossDomain": true
-    }
-  },
-  "quickapp": {},
-  "mp-weixin": {
-    "appid": "wx8e287639924edb51",
-    "setting": {
-      "urlCheck": false,
-      "minified": true
+    "mp-baidu" : {
+        "usingComponents" : true
     },
-    "usingComponents": true
-  },
-  "mp-alipay": {
-    "usingComponents": true,
-    "styleIsolation": "shared"
-  },
-  "mp-baidu": {
-    "usingComponents": true
-  },
-  "mp-toutiao": {
-    "usingComponents": true
-  },
-  "uniStatistics": {
-    "enable": false
-  },
-  "vueVersion": "3",
-  "h5": {
-    "router": {
-      "base": "/"
+    "mp-toutiao" : {
+        "usingComponents" : true
     },
-    "sdkConfigs": {
-      "maps": {
-        "amap": {
-          "key": "21f194a0d33197f874f7bbdd198419be",
-          "securityJsCode": "a46b425f31a4de445b2966d998fba851",
-          "serviceHost": ""
+    "uniStatistics" : {
+        "enable" : false
+    },
+    "vueVersion" : "3",
+    "h5" : {
+        "router" : {
+            "base" : "/"
+        },
+        "sdkConfigs" : {
+            "maps" : {
+                "amap" : {
+                    "key" : "21f194a0d33197f874f7bbdd198419be",
+                    "securityJsCode" : "a46b425f31a4de445b2966d998fba851",
+                    "serviceHost" : ""
+                }
+            }
+        }
+    },
+    "app-harmony" : {
+        "distribute" : {
+            "bundleName" : "uniapp.demo.test"
         }
-      }
     }
-  },
-  "app-harmony": {
-    "distribute": {
-      "bundleName": "uniapp.demo.test"
-    }
-  }
-}
\ No newline at end of file
+}

From c2ba2ba8836c16fb6447c53ef4903be9f707a071 Mon Sep 17 00:00:00 2001
From: yangzhq68909 <993367776@qq.com>
Date: Fri, 27 Jun 2025 08:29:15 +0800
Subject: [PATCH 16/16] 2.1.0  20250627

---
 env/.env.production       |   7 +-
 manifest.config.ts        |   4 +-
 src/manifest.json         | 285 +++++++++++++++++++-------------------
 src/pages/login/login.vue |   4 +-
 4 files changed, 152 insertions(+), 148 deletions(-)

diff --git a/env/.env.production b/env/.env.production
index 2a443e5..2984c4d 100644
--- a/env/.env.production
+++ b/env/.env.production
@@ -7,7 +7,10 @@ VITE_SHOW_SOURCEMAP = false
 # 是否启用读取配置文件 min
 #VITE_WEBAPP = 'D://opt//AppUpdateTest'
 VITE_WEBAPP = ''
-#VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/jeecg-boot'
+VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/jeecg-boot'
+
+
+
+
 #VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/wwapi'
 #VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/yjapi'
-VITE_SERVER_BASEURL = 'http://10.75.15.249:8080/jeecg-boot'
\ No newline at end of file
diff --git a/manifest.config.ts b/manifest.config.ts
index f2be00d..2a74033 100644
--- a/manifest.config.ts
+++ b/manifest.config.ts
@@ -17,8 +17,8 @@ export default defineManifestConfig({
   name: VITE_APP_TITLE,
   appid: VITE_UNI_APPID,
   description: '',
-  versionName: '2.0.3',
-  versionCode: '20250620',
+  versionName: '2.1.0',
+  versionCode: '20250627',
   transformPx: false,
   locale: VITE_FALLBACK_LOCALE, // 'zh-Hans'
   /* 5+App特有相关 */
diff --git a/src/manifest.json b/src/manifest.json
index 3728d86..6d3cf2a 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -1,148 +1,149 @@
 {
-    "name" : "数智产销",
-    "appid" : "__UNI__9F097F0",
-    "description" : "",
-    "versionName" : "2.0.3",
-    "versionCode" : "20250620",
-    "transformPx" : false,
-    "app-plus" : {
-        "usingComponents" : true,
-        "nvueStyleCompiler" : "uni-app",
-        "compilerVersion" : 3,
-        "splashscreen" : {
-            "alwaysShowBeforeRender" : true,
-            "waiting" : true,
-            "autoclose" : true,
-            "delay" : 0
-        },
-        "modules" : {
-            "Maps" : {},
-            "Messaging" : {},
-            "Camera" : {}
-        },
-        "distribute" : {
-            "android" : {
-                "permissions" : [
-                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-                ],
-                "minSdkVersion" : 26,
-                "targetSdkVersion" : 30,
-                "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ]
-            },
-            "ios" : {
-                "dSYMs" : false
-            },
-            "sdkConfigs" : {
-                "maps" : {
-                    "amap" : {
-                        "name" : "amap_15931993294Bqxlq8EgG",
-                        "appkey_ios" : "c913e46ffdf548ebc56ac1cf4d883e7e",
-                        "appkey_android" : "c913e46ffdf548ebc56ac1cf4d883e7e"
-                    }
-                }
-            },
-            "icons" : {
-                "android" : {
-                    "hdpi" : "src/static/app/icons/72x72.png",
-                    "xhdpi" : "src/static/app/icons/96x96.png",
-                    "xxhdpi" : "src/static/app/icons/144x144.png",
-                    "xxxhdpi" : "src/static/app/icons/192x192.png"
-                },
-                "ios" : {
-                    "appstore" : "src/static/app/icons/1024x1024.png",
-                    "ipad" : {
-                        "app" : "src/static/app/icons/76x76.png",
-                        "app@2x" : "src/static/app/icons/152x152.png",
-                        "notification" : "src/static/app/icons/20x20.png",
-                        "notification@2x" : "src/static/app/icons/40x40.png",
-                        "proapp@2x" : "src/static/app/icons/167x167.png",
-                        "settings" : "src/static/app/icons/29x29.png",
-                        "settings@2x" : "src/static/app/icons/58x58.png",
-                        "spotlight" : "src/static/app/icons/40x40.png",
-                        "spotlight@2x" : "src/static/app/icons/80x80.png"
-                    },
-                    "iphone" : {
-                        "app@2x" : "src/static/app/icons/120x120.png",
-                        "app@3x" : "src/static/app/icons/180x180.png",
-                        "notification@2x" : "src/static/app/icons/40x40.png",
-                        "notification@3x" : "src/static/app/icons/60x60.png",
-                        "settings@2x" : "src/static/app/icons/58x58.png",
-                        "settings@3x" : "src/static/app/icons/87x87.png",
-                        "spotlight@2x" : "src/static/app/icons/80x80.png",
-                        "spotlight@3x" : "src/static/app/icons/120x120.png"
-                    }
-                }
-            }
-        },
-        "android" : {
-            "webView" : {
-                "domStorageEnabled" : true,
-                "databaseEnabled" : true,
-                "allowFileAccess" : true
-            }
-        },
-        "compatible" : {
-            "ignoreVersion" : true
-        },
-        "webview" : {
-            "debug" : true,
-            "crossDomain" : true
+  "name": "数智产销",
+  "appid": "__UNI__9F097F0",
+  "description": "",
+  "versionName": "2.1.0",
+  "versionCode": "20250627",
+  "transformPx": false,
+  "app-plus": {
+    "usingComponents": true,
+    "nvueStyleCompiler": "uni-app",
+    "compilerVersion": 3,
+    "splashscreen": {
+      "alwaysShowBeforeRender": true,
+      "waiting": true,
+      "autoclose": true,
+      "delay": 0
+    },
+    "modules": {
+      "Maps": {},
+      "Messaging": {},
+      "Camera": {}
+    },
+    "distribute": {
+      "android": {
+        "permissions": [
+          "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+          "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+          "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+          "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+          "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+          "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+          "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+          "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+          "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+          "<uses-feature android:name=\"android.hardware.camera\"/>",
+          "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+        ],
+        "minSdkVersion": 26,
+        "targetSdkVersion": 30,
+        "abiFilters": [
+          "armeabi-v7a",
+          "arm64-v8a"
+        ]
+      },
+      "ios": {},
+      "sdkConfigs": {
+        "maps": {
+          "amap": {
+            "name": "amap_15931993294Bqxlq8EgG",
+            "appkey_ios": "c913e46ffdf548ebc56ac1cf4d883e7e",
+            "appkey_android": "c913e46ffdf548ebc56ac1cf4d883e7e"
+          }
         }
-    },
-    "quickapp" : {},
-    "mp-weixin" : {
-        "appid" : "wx8e287639924edb51",
-        "setting" : {
-            "urlCheck" : false,
-            "minified" : true
+      },
+      "icons": {
+        "android": {
+          "hdpi": "src/static/app/icons/72x72.png",
+          "xhdpi": "src/static/app/icons/96x96.png",
+          "xxhdpi": "src/static/app/icons/144x144.png",
+          "xxxhdpi": "src/static/app/icons/192x192.png"
         },
-        "usingComponents" : true
-    },
-    "mp-alipay" : {
-        "usingComponents" : true,
-        "styleIsolation" : "shared"
-    },
-    "mp-baidu" : {
-        "usingComponents" : true
-    },
-    "mp-toutiao" : {
-        "usingComponents" : true
-    },
-    "uniStatistics" : {
-        "enable" : false
-    },
-    "vueVersion" : "3",
-    "h5" : {
-        "router" : {
-            "base" : "/"
-        },
-        "sdkConfigs" : {
-            "maps" : {
-                "amap" : {
-                    "key" : "21f194a0d33197f874f7bbdd198419be",
-                    "securityJsCode" : "a46b425f31a4de445b2966d998fba851",
-                    "serviceHost" : ""
-                }
-            }
+        "ios": {
+          "appstore": "src/static/app/icons/1024x1024.png",
+          "ipad": {
+            "app": "src/static/app/icons/76x76.png",
+            "app@2x": "src/static/app/icons/152x152.png",
+            "notification": "src/static/app/icons/20x20.png",
+            "notification@2x": "src/static/app/icons/40x40.png",
+            "proapp@2x": "src/static/app/icons/167x167.png",
+            "settings": "src/static/app/icons/29x29.png",
+            "settings@2x": "src/static/app/icons/58x58.png",
+            "spotlight": "src/static/app/icons/40x40.png",
+            "spotlight@2x": "src/static/app/icons/80x80.png"
+          },
+          "iphone": {
+            "app@2x": "src/static/app/icons/120x120.png",
+            "app@3x": "src/static/app/icons/180x180.png",
+            "notification@2x": "src/static/app/icons/40x40.png",
+            "notification@3x": "src/static/app/icons/60x60.png",
+            "settings@2x": "src/static/app/icons/58x58.png",
+            "settings@3x": "src/static/app/icons/87x87.png",
+            "spotlight@2x": "src/static/app/icons/80x80.png",
+            "spotlight@3x": "src/static/app/icons/120x120.png"
+          }
         }
+      }
     },
-    "app-harmony" : {
-        "distribute" : {
-            "bundleName" : "uniapp.demo.test"
-        }
+    "android": {
+      "webView": {
+        "domStorageEnabled": true,
+        "databaseEnabled": true,
+        "allowFileAccess": true
+      }
+    },
+    "compatible": {
+      "ignoreVersion": true
+    },
+    "webview": {
+      "debug": true,
+      "crossDomain": true
     }
-}
+  },
+  "quickapp": {},
+  "mp-weixin": {
+    "appid": "wx8e287639924edb51",
+    "setting": {
+      "urlCheck": false,
+      "minified": true
+    },
+    "usingComponents": true
+  },
+  "mp-alipay": {
+    "usingComponents": true,
+    "styleIsolation": "shared"
+  },
+  "mp-baidu": {
+    "usingComponents": true
+  },
+  "mp-toutiao": {
+    "usingComponents": true
+  },
+  "uniStatistics": {
+    "enable": false
+  },
+  "vueVersion": "3",
+  "h5": {
+    "router": {
+      "base": "/"
+    },
+    "sdkConfigs": {
+      "maps": {
+        "amap": {
+          "key": "21f194a0d33197f874f7bbdd198419be",
+          "securityJsCode": "a46b425f31a4de445b2966d998fba851",
+          "serviceHost": ""
+        }
+      }
+    }
+  },
+  "app-harmony": {
+    "distribute": {
+      "bundleName": "uniapp.demo.test"
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue
index 72d8ac9..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 })
+		loginApi({ username: un, password: pw })
 		/*开发环境 begin */
-		loginApi({ username: userName.value, password: password.value, captcha: 'app' })
+		// loginApi({ username: userName.value, password: password.value, captcha: 'app' })
 			.then((res : any) => {
 				if (res.success) {
 					const { result } = res