From 521e8ba3e006eccf6b241ccb222695ae479a1e83 Mon Sep 17 00:00:00 2001
From: yunkexin <760754045@qq.com>
Date: Tue, 28 Oct 2025 08:40:05 +0800
Subject: [PATCH 01/10] 1

---
 pages.json                  |  11 +
 pages/apply/jobList.vue     | 499 ++++++++++++++++++++++++++++++++++++
 pages/apply/jobRiskShow.vue |  89 +++++++
 services/apply.js           |  10 +
 services/common.js          |  28 ++
 style/css/newTemplate.css   | 152 +++++++++++
 6 files changed, 789 insertions(+)
 create mode 100644 pages/apply/jobList.vue
 create mode 100644 pages/apply/jobRiskShow.vue
 create mode 100644 style/css/newTemplate.css

diff --git a/pages.json b/pages.json
index 5aa860a..828c22f 100644
--- a/pages.json
+++ b/pages.json
@@ -79,6 +79,17 @@
 				"navigationBarTitleText": "视频播放"
 			}
 		},
+		{
+			"path": "pages/apply/jobList",
+			"style": {
+				"navigationBarTitleText": "岗位风险"
+			}
+		}, {
+			"path": "pages/apply/jobRiskShow",
+			"style": {
+				"navigationBarTitleText": "岗位风险"
+			}
+		},
 		{
 			"path": "pages/apply/complete",
 			"style": {
diff --git a/pages/apply/jobList.vue b/pages/apply/jobList.vue
new file mode 100644
index 0000000..d348bb4
--- /dev/null
+++ b/pages/apply/jobList.vue
@@ -0,0 +1,499 @@
+<template>
+	<view class="todo-page">
+		<view class="background"></view>
+
+		<view class="card">
+			<u--form labelWidth="auto" :model="model" ref="wForm" class="demo-ruleForm">
+				<view style="position: relative;">
+					<view style="position: absolute;left: -10px;color: #3d4b70;top: -3px;">*</view>
+				</view>
+
+				<view style="font-size: 15px; font-weight: bold;color: #3d4b70;margin-bottom: 10px;">筛选条件</view>
+				<u-form-item label="辨识部门" prop="RISK_AREA_NAME" borderBottom ref="item1" @click="handleShowSheet({title: '辨识部门'})">
+					<u--input fontSize="14px" disabled disabledColor="#ffffff" v-model="(model.Nav_Department||{}).NAME" border="none" suffixIcon="arrow-right" customStyle="margin:0px;display:flex;padding:3px 9px"
+						suffixIconStyle="font-size:12px"></u--input>
+				</u-form-item>
+				<u-form-item label="辨识岗位" prop="RISK_AREA_NAME" borderBottom ref="item1" @click="handleShowSheet({title: '辨识岗位'})">
+					<u--input fontSize="14px" disabled disabledColor="#ffffff" v-model="(model.Nav_Post||{}).NAME" border="none" suffixIcon="arrow-right" customStyle="margin:0px;display:flex;padding:3px 9px"
+						suffixIconStyle="font-size:12px"></u--input>
+				</u-form-item>
+				<u-button type="primary" text="查询" @click="filterData"></u-button>
+
+			</u--form>
+			<u--form labelWidth="auto" :model="model" ref="wForm" class="demo-ruleForm" style="margin-top: 20px;">
+				<view style="position: relative;">
+					<view style="position: absolute;left: -10px;color: #3d4b70;top: -3px;">*</view>
+				</view>
+
+				<view style="font-size: 15px; font-weight: bold;color: #3d4b70;margin-bottom: 10px;">岗位风险清单</view>
+				<u-checkbox-group :value="checkedItems" placement="column" @change="handleCheckboxChange">
+					<u-checkbox :customStyle="{marginBottom: '8px'}" label="全选" name="all">
+					</u-checkbox>
+					<view v-for="(item, index) in filterDatas.Nav_Librarys" :key="index" style="margin-top: 10px;">
+
+
+						<u-checkbox :customStyle="{marginBottom: '8px'}" :key="index" :label="index+1+'.生产单元：'+item.MINE_NAME" :name="item.ID">
+						</u-checkbox>
+
+						<u-form-item label="辨识区域" prop="Nav_Contents.CHECKCONTENT" borderBottom>
+							<u--input fontSize="14px" disabled disabledColor="#fff" v-model="item.AREA_NAME" border="none" inputAlign="right"></u--input>
+
+						</u-form-item>
+						<u-form-item label="风险名称" prop="HIDDEN_PLACE" borderBottom>
+							<u--input fontSize="14px" disabled disabledColor="#fff" v-model="item.RISK_NAME" border="none" inputAlign="right"></u--input>
+						</u-form-item>
+						<u-form-item label="风险描述" prop="HIDDEN_PLACE" borderBottom>
+						</u-form-item>
+						<u--textarea fontSize="14px" disabled disabledColor="#fff" v-model="item.RISK_DESCRIPTION" border="none" inputAlign="right" autoHeight></u--textarea>
+						<u-form-item label="风险类别" prop="HIDDEN_PLACE" borderBottom>
+							<u--input fontSize="14px" disabled disabledColor="#fff" v-model="item.TYPE_NAME" border="none" inputAlign="right"></u--input>
+						</u-form-item>
+						<u-form-item label="风险等级" prop="HIDDEN_PLACE" borderBottom>
+							<u--input fontSize="14px" disabled disabledColor="#fff" v-model="item.EVALUATE_LEVELName" border="none" inputAlign="right"></u--input>
+						</u-form-item>
+					</view>
+				</u-checkbox-group>
+
+
+			</u--form>
+
+		</view>
+		<view style="padding: 10px 16px;" class="bottom-button">
+			<u-button type="primary" @click="submit" color="#3d4b70">生产岗位告知卡</u-button>
+		</view>
+		<query-selector :show="selectorInfo.showPopup" :defaultChecked="selectorInfo.defaultChecked" :title="selectorInfo.title" :lists="selectorInfo.dataLists" @search="handleSearch" @select="handleSelected"
+			@close="selectorInfo.showPopup=false" :total="selectorInfo.totalCount" />
+	</view>
+</template>
+
+<script>
+	import {
+		GetPostRiskList,
+		PagedRisk
+	} from '../../services/apply'
+	import {
+		DepartOrderPaged,
+		PostOrderPaged,
+		getEnum
+	} from '../../services/common.js'
+	import config from '../../config/common'
+	import {
+		initFilter,
+		extendRule,
+		extendFilterGroupGroupRules
+	} from '../../utils/common'
+	export default {
+		data() {
+			return {
+				OrgId: '',
+				pageIndex: 0,
+				pageSize: 20,
+				total: 0,
+				baseUrl: config.uni_app_web_source_url,
+				allData: [],
+				// 新增选中项数组，存储选中item的唯一标识
+				checkedItems: [],
+				// 存储完整的选中对象（可选）
+				selectedItems: [],
+				filterDatas: {
+					Nav_Librarys: []
+				},
+				model: {
+					RISK_AREA_NAME: '请选择区域',
+					RISK_AREA_ID: '',
+					ISDOWN: '否',
+					SchedulingType: '',
+					COUNT_WORKER: '',
+					COUNT_LEVEL: '',
+					START_TIME: '',
+					END_TIME: '',
+					SchedulingNEXTTIME: '',
+					LISTPERSON_SCHEDULING: [{
+						NAME: ''
+					}],
+					LISTUSER_LEAVE: [{
+						NAME: ''
+					}],
+					ListShow: []
+				},
+				radiolist: [{
+					value: false,
+					name: '否'
+				}, {
+					value: true,
+					name: '是'
+				}],
+				selectorInfo: {
+					showPopup: false,
+					totalCount: 0,
+					title: '班组名称',
+					// itemData: {},
+					index: 0,
+					dataLists: [],
+					defaultText: '',
+					defaultValue: '',
+					name: '',
+					defaultChecked: []
+				},
+				enumsData: {}, // 存储所有枚举数据（键：枚举名称，值：处理后的枚举列表）
+				enumsText: {} // 存储枚举文本列表（用于下拉选择等场景）
+			}
+		},
+		onLoad(option) {
+			this.OrgId = option.OrgId // 'B043B28B-BBC3-C452-6052-4FBA1457ABFA'
+			// const orgId = uni.getStorageSync('orgId')
+			this.fetchEnums(['SKEvaluateLevelEnum']);
+		},
+		// onReady() {
+		// 	//如果需要兼容微信小程序，并且校验规则中含有方法等，只能通过setRules方法设置规则。
+		// 	this.$refs.uForm.setRules(this.rules)
+		// },
+		methods: {
+			async fetchEnums(enumNames) {
+				try {
+					// 存储所有枚举请求的Promise
+					const enumPromises = enumNames.map(name => {
+						return getEnum({
+							name
+						}).then(res => {
+							// 统一处理枚举格式：添加name/code字段，便于后续映射
+							return {
+								enumName: name,
+								data: res.Data.map(item => ({
+									...item,
+									name: item.NAME, // 统一显示名称字段
+									code: item.ID // 统一值字段
+								}))
+							};
+						});
+					});
+
+					// 等待所有枚举请求完成
+					const results = await Promise.all(enumPromises);
+					// 存储枚举结果到data中（键为枚举名称，值为处理后的数据）
+					results.forEach(({
+						enumName,
+						data
+					}) => {
+						this.enumsData[enumName] = data;
+						// 生成文本列表（如需要）
+						this.enumsText[enumName] = data.map(item => item.name);
+					});
+					// 所有枚举获取完成后，执行loadData
+					this.loadData();
+				} catch (error) {
+					console.error('枚举请求失败:', error);
+					uni.showToast({
+						title: '枚举数据加载失败',
+						icon: 'none'
+					});
+				}
+			},
+			loadData() {
+				const json = initFilter(this.OrgId, "", "")
+				json.IgnoreDataRule = true
+				GetPostRiskList(json).then(res => {
+					this.allData = res.Data
+					this.allData.map(item => {
+						if (item.Nav_Librarys && item.Nav_Librarys.length > 0) {
+							item.Nav_Librarys.map(item1 => {
+								item1.EVALUATE_LEVELName = item1.EVALUATE_LEVEL !== undefined ? this.enumsData['SKEvaluateLevelEnum'].find(item => item.code === item1.EVALUATE_LEVEL).name : '';
+							})
+						}
+					})
+					// this.total = res.TotalCount
+
+
+
+				})
+			},
+			handleCheckboxChange(e) {
+				// 检查当前操作是否包含全选标识
+				const hasAll = e.includes('all');
+				// 获取所有可选项的ID列表
+				const allIds = this.filterDatas.Nav_Librarys.map(item => item.ID);
+				// 判断当前是否处于全选状态
+				const isAllSelected = this.checkedItems.includes('all');
+
+				if (this.checkedItems.length > e.length) {
+					//取消选项
+					if (hasAll) {
+						//当前有全选
+						if (isAllSelected) {
+							//上一次有全选
+							let arr = []
+							const diff = this.checkedItems.filter(item => !e.includes(item));
+							arr.push('all')
+							arr.push(...diff)
+							let arrs = []
+							arrs = this.checkedItems.filter(item => !arr.includes(item));
+							this.checkedItems = arrs
+						} else {
+							//lenth不对
+						}
+
+					} else {
+						//当前没有全选
+						if (isAllSelected) {
+							//取消全选
+							// const remainingIds = allIds.filter(id => e.includes(id));
+							this.checkedItems = [];
+
+						} else {
+							const diff = this.checkedItems.filter(item => !e.includes(item));
+							const newArr = this.checkedItems.filter(item => item !== diff[0]);
+							this.checkedItems = newArr
+						}
+					}
+
+				} else {
+					//新增选项
+					if (hasAll) {
+						//当前有全选
+						if (isAllSelected) {
+							//上一次有全选 /选中其他选项 lenth不成立
+						} else {
+							//上一次没有全选
+							// 点击全选：选中所有选项（包含全选自身）
+							this.checkedItems = ['all', ...allIds];
+						}
+
+					} else {
+						//当前没有全选
+						if (isAllSelected) {
+							//上一次有全选 lenth不成立
+
+						} else {
+							const diff = e.filter(item => !this.checkedItems.includes(item));
+							this.checkedItems.unshift(...diff);
+							if (e.length === allIds.length && allIds.length > 0) {
+								this.checkedItems.unshift('all');
+							}
+							// const diff = this.checkedItems.filter(item => !e.includes(item));
+
+							// // 取消其他选项
+							// this.checkedItems = e.filter(item => item !== 'all');
+
+							// // 检查是否所有选项都被选中，如果是则自动勾选全选
+							// if (this.checkedItems.length === allIds.length && allIds.length > 0) {
+							// 	this.checkedItems.unshift('all');
+							// }
+						}
+					}
+				}
+			},
+			filterData() {
+				this.allData.map(item => {
+					if (item.DEPARTMENT_ID == this.model.DEPARTMENT_ID && item.POST_NAME == this.model.Nav_Post.NAME) {
+						this.filterDatas = item
+						console.log(this.filterDatas, 'this.filterData')
+					}
+				})
+			},
+			checkChange(e) {
+				console.log(e, '888')
+			},
+			submit() {
+				console.log(this.checkedItems, '9999')
+				console.log(this.filterDatas, '9999')
+				let arr = []
+				this.filterDatas.Nav_Librarys.map(item => {
+					this.checkedItems.map(item1 => {
+						if (item.ID == item1) {
+							arr.push(item)
+						}
+					})
+				})
+				console.log(arr, 'arr')
+				//MEASURES_NAME处理
+				const groupedData = arr.reduce((acc, item) => {
+					const riskName = item.RISK_NAME;
+					// 提取当前项的所有措施，并去重（避免同一项内的重复措施）
+					const currentMeasures = [...new Set(
+						item.Nav_Details.map(detail => detail.MEASURES_NAME)
+					)];
+
+					if (!acc[riskName]) {
+						// 若该风险名称首次出现，初始化数组
+						acc[riskName] = currentMeasures;
+					} else {
+						// 若已存在，合并并去重（避免不同项的重复措施）
+						acc[riskName] = [...new Set([...acc[riskName], ...currentMeasures])];
+					}
+					return acc;
+				}, {});
+				//
+				// 1. 按 RISK_NAME 分组，收集所有对应的 RISK_DESCRIPTION
+				
+				
+				let newarr = {
+					departName: this.filterDatas.Nav_Department ? this.filterDatas.Nav_Department.NAME : '',
+					userName: this.filterDatas.USER_NAME,
+					phone: this.filterDatas.PHONE,
+					postName: this.filterDatas.POST_NAME,
+					RISK_NAME: [...new Set(
+						arr.map(item => item.RISK_NAME.trim())
+					)].join(' ；'),
+					EVALUATE_LEVELName: [...new Set(
+						arr.map(item => item.EVALUATE_LEVELName.trim())
+					)].join(' ；'),
+					RISK_TYPE: [...new Set(
+						arr.map(item => item.Nav_Type.NAME.trim())
+					)].join(' ；'),
+					RISK_DESCRIPTION: [...new Set(
+						arr.map(item => item.RISK_DESCRIPTION.trim())
+					)].join(' ；'),
+					MEASURES_NAME: Object.entries(groupedData)
+						.map(([riskName, measures], index) => {
+							// 生成带序号的措施（1.xxx 2.yyy）
+							const measuresList = measures
+								.map((measure, mIndex) => `${mIndex + 1}.${measure}`)
+								.join('\n  ');
+
+							// 不同风险组之间用换行分隔（首组不加前缀换行）
+							return index === 0 ?
+								`${riskName}：\n  ${measuresList}` :
+								`\n${riskName}：\n  ${measuresList}`;
+						})
+						.join(''),
+					RISK_DESCRIPTION: this.handleData(arr,'RISK_DESCRIPTION'),
+					EMERGENCY: this.handleData(arr,'EMERGENCY')
+				}
+
+				console.log(newarr, 'nnnnnnnnnnnnn')
+
+
+
+				uni.setStorageSync('detailData', newarr);
+				uni.navigateTo({
+					url: '/pages/apply/jobRiskShow'
+				})
+			},
+			handleData(arr,namekey){
+				const oneData = {};
+				arr.forEach(item => {
+				  const name = item.RISK_NAME;
+				  const desc = item[namekey];
+				  // 若该名称已存在，追加描述；否则新建键值对
+				  if (oneData[name]) {
+				    oneData[name].add(desc);
+				  } else {
+				    oneData[name] = new Set([desc]);
+				  }
+				});
+				const resultArr = [];
+				for (const [name, descList] of Object.entries(oneData)) {
+				  // Set 转数组，再拼接为 “名称：描述1；描述2” 格式
+				   const descStr = Array.from(descList).join('；');
+				   resultArr.push(`${name}：${descStr}`);
+				}
+				
+				// 3. 所有名称的拼接结果用 “\n” 连接，得到最终字符串
+				const finalResult = resultArr.join('\n');
+				return finalResult
+			},
+			closePicker() {
+				this.comPickerInfo = {
+					showSheet: false,
+					columns: [],
+					title: '',
+					name: '',
+					formIndex: undefined
+				}
+			},
+
+			//显示组件
+			handleChange() {
+				this.selectorInfo.showPopup = true
+				this.selectorInfo.title = '班组名称'
+				this.handleSearch()
+			},
+
+			//数据加载
+			handleSearch(val, pageIndex) {
+				var p = {
+					name: this.selectorInfo.name,
+					title: this.selectorInfo.title,
+					val: val,
+					pageIndex: pageIndex
+				}
+				this.handleShowSheet(p)
+			},
+			async handleShowSheet(p) {
+				uni.showLoading({
+					title: '加载中...'
+				})
+				this.pageIndex = 0
+				var defaultChecked = []
+				let dataSelect = []
+				const json = initFilter(this.OrgId, null, "NAME", 0, (p.pageIndex ?? 1));
+				json.IgnoreDataRule = true
+				json.Limit = 20
+				if (p.val) {
+					// extendFilterGroupGroupRules(json, 'NAME', 9, p.val)
+					extendRule(json, "NAME", 9, p.val)
+				}
+				if (p.title == '辨识部门') {
+					dataSelect = await DepartOrderPaged(json).then(res => {
+						uni.hideLoading()
+						this.selectorInfo.totalCount = res.TotalCount
+						if (res != undefined && res.Data.length > 0) {
+							for (let i = 0; i < res.Data.length; i++) {
+								res.Data[i].name = res.Data[i].NAME
+								res.Data[i].code = res.Data[i].CODE
+							}
+						}
+						return res.Data
+					})
+				} else {
+					if (this.model.DEPARTMENT_ID && this.model.DEPARTMENT_ID !== null) {
+						// extendRule(json, "DEPARTMENT_ID", 1, this.model.DEPARTMENT_ID)
+						json.Keyword = this.model.DEPARTMENT_ID
+					}
+					dataSelect = await PostOrderPaged(json).then(res => {
+						uni.hideLoading()
+						this.selectorInfo.totalCount = res.TotalCount
+						if (res != undefined && res.Data.length > 0) {
+							for (let i = 0; i < res.Data.length; i++) {
+								res.Data[i].name = res.Data[i].NAME
+								res.Data[i].code = res.Data[i].CODE
+							}
+						}
+						return res.Data
+					})
+				}
+
+
+				if (defaultChecked == null)
+					defaultChecked = []
+				if (dataSelect.length) {
+					this.selectorInfo = {
+						totalCount: this.selectorInfo.totalCount,
+						showPopup: true,
+						title: p.title,
+						name: p.name,
+						dataLists: dataSelect,
+						defaultChecked: defaultChecked
+					}
+				} else {
+					// 暂无数据
+				}
+			},
+			handleSelected(e) {
+				this.selectorInfo.showPopup = false
+				if (this.selectorInfo.title == '辨识部门') {
+					this.model.Nav_Department = e
+					this.model.DEPARTMENT_ID = e.ID
+				} else {
+					this.model.Nav_Post = e
+					this.model.POST_ID = e.ID
+				}
+				// this.WorkerScheduling()
+			}
+		},
+	}
+</script>
+
+<style>
+	@import url("../../style/css/newTemplate.css");
+</style>
\ No newline at end of file
diff --git a/pages/apply/jobRiskShow.vue b/pages/apply/jobRiskShow.vue
new file mode 100644
index 0000000..9194939
--- /dev/null
+++ b/pages/apply/jobRiskShow.vue
@@ -0,0 +1,89 @@
+<template>
+	<view class="todo-page">
+		<view class="background"></view>
+
+		<view class="card">
+			<u--form labelWidth="auto" :model="detailData" ref="wForm" class="demo-ruleForm">
+				<view style="position: relative;">
+					<view style="position: absolute;left: -10px;color: #3d4b70;top: -3px;">*</view>
+				</view>
+
+				<view style="font-size: 15px; font-weight: bold;color: #3d4b70;margin-bottom: 10px;">{{detailData.postName}}岗位安全风险告知卡</view>
+				<u-form-item label="风险名称" prop="HIDDEN_PLACE" borderBottom>
+				</u-form-item>
+				<u--textarea fontSize="14px" disabled disabledColor="#fff" v-model="detailData.RISK_NAME" border="none" inputAlign="right" autoHeight></u--textarea>
+				<u-form-item label="风险等级" prop="HIDDEN_PLACE" borderBottom>
+				</u-form-item>
+				<u--textarea fontSize="14px" disabled disabledColor="#fff" v-model="detailData.EVALUATE_LEVELName" border="none" inputAlign="right" autoHeight></u--textarea>
+				<u-form-item label="事故后果" prop="HIDDEN_PLACE" borderBottom>
+				</u-form-item>
+				<u--textarea fontSize="14px" disabled disabledColor="#fff" v-model="detailData.RISK_TYPE" border="none" inputAlign="right" autoHeight></u--textarea>
+				<u-form-item label="风险描述" prop="HIDDEN_PLACE" borderBottom>
+				</u-form-item>
+				<u--textarea fontSize="14px" disabled disabledColor="#fff" v-model="detailData.RISK_DESCRIPTION" border="none" inputAlign="right" autoHeight></u--textarea>
+				<u-form-item label="安全标志" prop="HIDDEN_PLACE" borderBottom>
+				</u-form-item>
+				<!-- <u--textarea fontSize="14px" disabled disabledColor="#fff" v-model="detailData.RISK_DESCRIPTION" border="none" inputAlign="right" autoHeight></u--textarea> -->
+				<u-form-item label="管控措施" prop="HIDDEN_PLACE" borderBottom>
+				</u-form-item>
+				<u--textarea fontSize="14px" disabled disabledColor="#fff" v-model="detailData.MEASURES_NAME" border="none" inputAlign="right" autoHeight></u--textarea>
+				<u-form-item label="应急处置" prop="HIDDEN_PLACE" borderBottom>
+				</u-form-item>
+				<u--textarea fontSize="14px" disabled disabledColor="#fff" v-model="detailData.EMERGENCY" border="none" inputAlign="right" autoHeight></u--textarea>
+				<u-form-item label="责任单位" prop="HIDDEN_PLACE" borderBottom>
+				</u-form-item>
+				<u--textarea fontSize="14px" disabled disabledColor="#fff" v-model="detailData.departName" border="none" inputAlign="right" autoHeight></u--textarea>
+				<u-form-item label="责任人" prop="HIDDEN_PLACE" borderBottom>
+				</u-form-item>
+				<u--textarea fontSize="14px" disabled disabledColor="#fff" v-model="detailData.userName" border="none" inputAlign="right" autoHeight></u--textarea>
+				<u-form-item label="联系方式" prop="HIDDEN_PLACE" borderBottom>
+				</u-form-item>
+				<u--textarea fontSize="14px" disabled disabledColor="#fff" v-model="detailData.phone" border="none" inputAlign="right" autoHeight></u--textarea>
+			</u--form>
+
+
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		GetPostRiskList,
+		PagedRisk
+	} from '../../services/apply'
+	import {
+		DepartOrderPaged,
+		PostOrderPaged,
+		getEnum
+	} from '../../services/common.js'
+	import config from '../../config/common'
+	import {
+		initFilter,
+		extendRule
+	} from '../../utils/common'
+	export default {
+		data() {
+			return {
+				detailData: {},
+				model: {}
+			}
+		},
+		onLoad(option) {
+			this.detailData = uni.getStorageSync('detailData');
+			console.log(this.detailData, 'this.detailData')
+		},
+		onUnload() {
+			// 可选：用完删除，避免占用存储
+			uni.removeStorageSync('detailData');
+		},
+		// onReady() {
+		// 	//如果需要兼容微信小程序，并且校验规则中含有方法等，只能通过setRules方法设置规则。
+		// 	this.$refs.uForm.setRules(this.rules)
+		// },
+		methods: {},
+	}
+</script>
+
+<style>
+	@import url("../../style/css/newTemplate.css");
+</style>
\ No newline at end of file
diff --git a/services/apply.js b/services/apply.js
index 5ef770c..ec17266 100644
--- a/services/apply.js
+++ b/services/apply.js
@@ -87,4 +87,14 @@ export const PagedDangerJob = (params) => {
 		method: 'post',
 		data: params,
 	})
+}
+
+//危险作业查看
+export const GetPostRiskList = (params) => {
+	params.isAll=true
+	return request.send({
+		url: '/BI/H5Controller/GetPostRiskList',
+		method: 'post',
+		data: params,
+	})
 }
\ No newline at end of file
diff --git a/services/common.js b/services/common.js
index 76c81cf..1859022 100644
--- a/services/common.js
+++ b/services/common.js
@@ -35,4 +35,32 @@ export const AreaEntities = (params) => {
 		method: 'post',
 		data: params,
 	})
+}
+//辨识部门
+export const DepartOrderPaged = (params) => {
+	params.isAll=true
+	return request.send({
+		url: '/BI/H5Controller/DepartOrderPaged',
+		method: 'post',
+		data: params,
+	})
+}
+//辨识岗位
+export const PostOrderPaged = (params) => {
+	params.isAll=true
+	return request.send({
+		url: '/BI/H5Controller/PostOrderPaged',
+		method: 'post',
+		data: params,
+	})
+}
+
+//辨识岗位
+export const getEnum = (params) => {
+	// params.isAll=true
+	return request.send({
+		url: '/PF/Extend/GetEnum',
+		method: 'get',
+		data: params,
+	})
 }
\ No newline at end of file
diff --git a/style/css/newTemplate.css b/style/css/newTemplate.css
new file mode 100644
index 0000000..328bfaf
--- /dev/null
+++ b/style/css/newTemplate.css
@@ -0,0 +1,152 @@
+/* .todo-page>>>.u-steps-item__line {
+		width: 187.6px !important;
+	} */
+/* 进度条步骤少于3 */
+.page-wrap {
+	padding-bottom: 150px;
+}
+.allview {
+	padding: 0px 0px 180px 0px;
+}
+
+.video {
+	padding: 16px 16px 10px;
+}
+
+.background {
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	background: #edf1fd;
+	z-index: -1;
+}
+
+.richtext {
+	font-size: 14px;
+}
+
+.card {
+	margin: 20px 16px 140px 16px;
+	/* border: 1px solid #EBEEF5; */
+	padding: 20px 30px 80px 30px;
+	/* box-shadow: rgba(0, 0, 0, 0.08) 0px 0px 3px 1px; */
+	background-color: #ffffff;
+	border-radius: 10px;
+}
+
+.upload-title {
+	font-size: 14px;
+	color: #8e8b9c;
+	line-height: 22px;
+	padding: 8px 0px;
+}
+
+.demo-ruleForm>>>.u-form-item__body__left__content__label {
+	font-size: 14px;
+	color: #8e8b9c;
+	/* justify-content: flex-start; */
+}
+
+.demo-ruleForm>>>.u-form-item__body__left__content__ {
+	left: -11px;
+	top: 0px
+}
+
+.demo-ruleForm>>>.u-textarea__field {
+	font-size: 14px;
+}
+
+.demo-ruleForm>>>.u-cell__title-text {
+	font-size: 14px;
+}
+
+.check-p>>>.u-form-item__body__right__content__slot {
+	justify-content: flex-end;
+}
+
+.bottom-button {
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	width: 100%;
+	padding: 10px 16px;
+	box-sizing: border-box;
+	background: #edf1fd;
+	z-index: 999;
+}
+
+.sub-form>>>.u-form-item__body__left__content__label {
+	font-size: 14px;
+	/* justify-content: flex-start; */
+}
+
+.sub-form>>>.u-textarea__field {
+	font-size: 14px;
+}
+
+.sub-form>>>.u-cell__title-text {
+	font-size: 14px;
+}
+
+.uni-collapse-item {
+	box-sizing: border-box;
+
+}
+
+.sub-form>>>.uni-collapse-item__title {
+	display: flex;
+	width: 100%;
+	box-sizing: border-box;
+	flex-direction: row;
+	align-items: center;
+	transition: border-bottom-color .3s;
+	border-bottom: 1px solid #ebeef5;
+}
+
+.sub-form>>>.uni-collapse-item__title-wrap {
+	/* width: 100%; */
+	flex: 1;
+}
+.sub-form>>>.uni-collapse-item__title-box {
+	padding: 0px;
+}
+
+.uni-collapse-item__title-box {
+	padding: 0px;
+	display: flex;
+	width: 100%;
+	box-sizing: border-box;
+	flex-direction: row;
+	justify-content: space-between;
+	align-items: center;
+	height: 48px;
+	line-height: 48px;
+	background-color: #fff;
+	color: #303133;
+	font-size: 13px;
+	font-weight: 500;
+	cursor: pointer;
+	outline: none;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	flex: 1;
+
+}
+
+.uni-collapse-item__title-text {
+	flex: 1;
+	font-size: 14px;
+	white-space: nowrap;
+	color: inherit;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+.right-align {
+	display: flex;
+	flex-wrap: wrap;
+	justify-content: end;
+	flex: 1;
+}
\ No newline at end of file

From 658191f0e22968c4a00c3ac03514d35225b05fb0 Mon Sep 17 00:00:00 2001
From: yunkexin <760754045@qq.com>
Date: Tue, 28 Oct 2025 11:17:06 +0800
Subject: [PATCH 02/10] 1

---
 pages/apply/jobList.vue     | 53 ++++++++++++++-------------
 pages/apply/jobRiskShow.vue | 71 ++++++++++++++++++++++++++++++++++---
 2 files changed, 93 insertions(+), 31 deletions(-)

diff --git a/pages/apply/jobList.vue b/pages/apply/jobList.vue
index d348bb4..f05eaaf 100644
--- a/pages/apply/jobList.vue
+++ b/pages/apply/jobList.vue
@@ -20,7 +20,7 @@
 				<u-button type="primary" text="查询" @click="filterData"></u-button>
 
 			</u--form>
-			<u--form labelWidth="auto" :model="model" ref="wForm" class="demo-ruleForm" style="margin-top: 20px;">
+			<u--form labelWidth="auto" :model="model" ref="wForm" class="demo-ruleForm" style="margin-top: 20px;" v-if="filterDatas&&filterDatas.Nav_Librarys&&filterDatas.Nav_Librarys.length>0">
 				<view style="position: relative;">
 					<view style="position: absolute;left: -10px;color: #3d4b70;top: -3px;">*</view>
 				</view>
@@ -36,7 +36,7 @@
 						</u-checkbox>
 
 						<u-form-item label="辨识区域" prop="Nav_Contents.CHECKCONTENT" borderBottom>
-							<u--input fontSize="14px" disabled disabledColor="#fff" v-model="item.AREA_NAME" border="none" inputAlign="right"></u--input>
+							<u--input fontSize="14px" disabled disabledColor="#fff" v-model="(item.Nav_Area||{}).NAME" border="none" inputAlign="right"></u--input>
 
 						</u-form-item>
 						<u-form-item label="风险名称" prop="HIDDEN_PLACE" borderBottom>
@@ -46,7 +46,7 @@
 						</u-form-item>
 						<u--textarea fontSize="14px" disabled disabledColor="#fff" v-model="item.RISK_DESCRIPTION" border="none" inputAlign="right" autoHeight></u--textarea>
 						<u-form-item label="风险类别" prop="HIDDEN_PLACE" borderBottom>
-							<u--input fontSize="14px" disabled disabledColor="#fff" v-model="item.TYPE_NAME" border="none" inputAlign="right"></u--input>
+							<u--input fontSize="14px" disabled disabledColor="#fff" v-model="(item.Nav_Type||{}).NAME" border="none" inputAlign="right"></u--input>
 						</u-form-item>
 						<u-form-item label="风险等级" prop="HIDDEN_PLACE" borderBottom>
 							<u--input fontSize="14px" disabled disabledColor="#fff" v-model="item.EVALUATE_LEVELName" border="none" inputAlign="right"></u--input>
@@ -58,7 +58,7 @@
 			</u--form>
 
 		</view>
-		<view style="padding: 10px 16px;" class="bottom-button">
+		<view style="padding: 10px 16px;" class="bottom-button" v-if="filterDatas&&filterDatas.Nav_Librarys&&filterDatas.Nav_Librarys.length>0">
 			<u-button type="primary" @click="submit" color="#3d4b70">生产岗位告知卡</u-button>
 		</view>
 		<query-selector :show="selectorInfo.showPopup" :defaultChecked="selectorInfo.defaultChecked" :title="selectorInfo.title" :lists="selectorInfo.dataLists" @search="handleSearch" @select="handleSelected"
@@ -142,7 +142,7 @@
 		onLoad(option) {
 			this.OrgId = option.OrgId // 'B043B28B-BBC3-C452-6052-4FBA1457ABFA'
 			// const orgId = uni.getStorageSync('orgId')
-			this.fetchEnums(['SKEvaluateLevelEnum']);
+			this.fetchEnums(['SKEvaluateLevelEnum','SKProductionUnit']);
 		},
 		// onReady() {
 		// 	//如果需要兼容微信小程序，并且校验规则中含有方法等，只能通过setRules方法设置规则。
@@ -198,6 +198,10 @@
 						if (item.Nav_Librarys && item.Nav_Librarys.length > 0) {
 							item.Nav_Librarys.map(item1 => {
 								item1.EVALUATE_LEVELName = item1.EVALUATE_LEVEL !== undefined ? this.enumsData['SKEvaluateLevelEnum'].find(item => item.code === item1.EVALUATE_LEVEL).name : '';
+								if(!item1.MINE_NAME){
+									item1.MINE_NAME = item1.MineType !== undefined ? this.enumsData['SKProductionUnit'].find(item => item.code === item1.MineType).name : '';
+								}
+								
 							})
 						}
 					})
@@ -269,15 +273,6 @@
 							if (e.length === allIds.length && allIds.length > 0) {
 								this.checkedItems.unshift('all');
 							}
-							// const diff = this.checkedItems.filter(item => !e.includes(item));
-
-							// // 取消其他选项
-							// this.checkedItems = e.filter(item => item !== 'all');
-
-							// // 检查是否所有选项都被选中，如果是则自动勾选全选
-							// if (this.checkedItems.length === allIds.length && allIds.length > 0) {
-							// 	this.checkedItems.unshift('all');
-							// }
 						}
 					}
 				}
@@ -286,16 +281,10 @@
 				this.allData.map(item => {
 					if (item.DEPARTMENT_ID == this.model.DEPARTMENT_ID && item.POST_NAME == this.model.Nav_Post.NAME) {
 						this.filterDatas = item
-						console.log(this.filterDatas, 'this.filterData')
 					}
 				})
 			},
-			checkChange(e) {
-				console.log(e, '888')
-			},
 			submit() {
-				console.log(this.checkedItems, '9999')
-				console.log(this.filterDatas, '9999')
 				let arr = []
 				this.filterDatas.Nav_Librarys.map(item => {
 					this.checkedItems.map(item1 => {
@@ -304,7 +293,6 @@
 						}
 					})
 				})
-				console.log(arr, 'arr')
 				//MEASURES_NAME处理
 				const groupedData = arr.reduce((acc, item) => {
 					const riskName = item.RISK_NAME;
@@ -325,7 +313,22 @@
 				//
 				// 1. 按 RISK_NAME 分组，收集所有对应的 RISK_DESCRIPTION
 				
+				const allPhotos = [];
+				const photoNames = new Set(); // 用于记录已添加的图片name，实现去重
 				
+				arr.forEach(item => {
+				  // 确保当前对象存在 Nav_Photo 且是数组，避免报错
+				  if (Array.isArray(item.Nav_Photo)) {
+				    item.Nav_Photo.forEach(photo => {
+				      // 判断图片name是否已存在，不存在则添加
+				      if (!photoNames.has(photo.name)) {
+				        allPhotos.push(photo);
+				        photoNames.add(photo.name);
+				      }
+				    });
+				  }
+				});
+				// 此时 allPhotos 已包含所有 Nav_Photo 中的图片对象
 				let newarr = {
 					departName: this.filterDatas.Nav_Department ? this.filterDatas.Nav_Department.NAME : '',
 					userName: this.filterDatas.USER_NAME,
@@ -357,13 +360,9 @@
 						})
 						.join(''),
 					RISK_DESCRIPTION: this.handleData(arr,'RISK_DESCRIPTION'),
-					EMERGENCY: this.handleData(arr,'EMERGENCY')
+					EMERGENCY: this.handleData(arr,'EMERGENCY'),
+					Nav_Photo:allPhotos
 				}
-
-				console.log(newarr, 'nnnnnnnnnnnnn')
-
-
-
 				uni.setStorageSync('detailData', newarr);
 				uni.navigateTo({
 					url: '/pages/apply/jobRiskShow'
diff --git a/pages/apply/jobRiskShow.vue b/pages/apply/jobRiskShow.vue
index 9194939..dcd209a 100644
--- a/pages/apply/jobRiskShow.vue
+++ b/pages/apply/jobRiskShow.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="todo-page">
+	<view class="todo-page" style="padding-bottom: 10px;">
 		<view class="background"></view>
 
 		<view class="card">
@@ -21,8 +21,27 @@
 				<u-form-item label="风险描述" prop="HIDDEN_PLACE" borderBottom>
 				</u-form-item>
 				<u--textarea fontSize="14px" disabled disabledColor="#fff" v-model="detailData.RISK_DESCRIPTION" border="none" inputAlign="right" autoHeight></u--textarea>
-				<u-form-item label="安全标志" prop="HIDDEN_PLACE" borderBottom>
+				<u-form-item label="安全标志" prop="HIDDEN_PLACE" >
 				</u-form-item>
+				<!-- 安全标志图片列表 -->
+				<view class="safety-sign-list">
+				  <!-- 循环展示所有图片 -->
+				  <view class="safety-sign-item" v-for="(photo, index) in detailData.Nav_Photo" :key="index">
+				    <!-- 图片展示 -->
+				    <image 
+				      :src="hosturl +photo.Nav_ImgFile.FILE_PATH" 
+				      mode="widthFix" 
+				      class="sign-image"
+				      alt="安全标志图片"
+				    ></image>
+				    <!-- 图片对应的名称 -->
+				    <view class="sign-name">{{ photo.NAME }}</view>
+				  </view>
+				  <!-- 没有图片时的提示 -->
+				  <view v-if="!detailData.Nav_Photo || detailData.Nav_Photo.length === 0" class="no-data">
+				    暂无安全标志图片
+				  </view>
+				</view>
 				<!-- <u--textarea fontSize="14px" disabled disabledColor="#fff" v-model="detailData.RISK_DESCRIPTION" border="none" inputAlign="right" autoHeight></u--textarea> -->
 				<u-form-item label="管控措施" prop="HIDDEN_PLACE" borderBottom>
 				</u-form-item>
@@ -65,12 +84,12 @@
 		data() {
 			return {
 				detailData: {},
-				model: {}
+				model: {},
+				hosturl:config.uni_app_web_source_url
 			}
 		},
 		onLoad(option) {
 			this.detailData = uni.getStorageSync('detailData');
-			console.log(this.detailData, 'this.detailData')
 		},
 		onUnload() {
 			// 可选：用完删除，避免占用存储
@@ -86,4 +105,48 @@
 
 <style>
 	@import url("../../style/css/newTemplate.css");
+.safety-sign-list {
+  padding: 0 16px;
+  /* margin-bottom: 5px; */
+  /* 启用 Flex 布局 */
+  display: flex;
+  /* 允许换行 */
+  flex-wrap: wrap;
+  /* 子元素之间的间距（可选，调整水平间距） */
+  gap: 10px;
+}
+
+.safety-sign-item {
+  /* 每个元素占 1/3 宽度（减去间距的容错） */
+  width: calc(33.33% - 10px);
+  margin-bottom: 15px;
+  text-align: center;
+  /* 避免内容溢出时压缩元素宽度 */
+  box-sizing: border-box;
+}
+
+/* 其他样式保持不变 */
+.sign-image {
+  width: 100%; /* 图片自适应父元素宽度 */
+  max-width: 300px;
+  border-radius: 4px;
+  margin-bottom: 5px;
+}
+
+.sign-name {
+  font-size: 14px;
+  color: #333;
+  line-height: 1.5;
+  /* 文字超长时自动换行 */
+  word-wrap: break-word;
+}
+
+.no-data {
+  font-size: 14px;
+  color: #999;
+  padding: 10px 0;
+  text-align: center;
+  /* 占满整行 */
+  width: 100%;
+}
 </style>
\ No newline at end of file

From d7f01a30697634b0a4989486fe0529c75ba21804 Mon Sep 17 00:00:00 2001
From: yunkexin <760754045@qq.com>
Date: Tue, 28 Oct 2025 11:25:01 +0800
Subject: [PATCH 03/10] 1

---
 pages/apply/jobList.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pages/apply/jobList.vue b/pages/apply/jobList.vue
index f05eaaf..7f19765 100644
--- a/pages/apply/jobList.vue
+++ b/pages/apply/jobList.vue
@@ -281,6 +281,10 @@
 				this.allData.map(item => {
 					if (item.DEPARTMENT_ID == this.model.DEPARTMENT_ID && item.POST_NAME == this.model.Nav_Post.NAME) {
 						this.filterDatas = item
+						//默认全选
+						const allIds= this.filterDatas.Nav_Librarys.map(item => item.ID);
+						this.checkedItems = ['all', ...allIds];
+						
 					}
 				})
 			},

From b7378267cfbfec40984b5b6568ee68bf88a7530d Mon Sep 17 00:00:00 2001
From: yunkexin <760754045@qq.com>
Date: Wed, 29 Oct 2025 09:01:04 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E3=80=81=E5=86=8D=E6=AC=A1=E6=9F=A5=E8=AF=A2=E6=9C=AA=E6=B8=B2?=
 =?UTF-8?q?=E6=9F=93=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/apply/jobList.vue | 74 +++++++++++++++++++++--------------------
 1 file changed, 38 insertions(+), 36 deletions(-)

diff --git a/pages/apply/jobList.vue b/pages/apply/jobList.vue
index 7f19765..0b87972 100644
--- a/pages/apply/jobList.vue
+++ b/pages/apply/jobList.vue
@@ -142,7 +142,7 @@
 		onLoad(option) {
 			this.OrgId = option.OrgId // 'B043B28B-BBC3-C452-6052-4FBA1457ABFA'
 			// const orgId = uni.getStorageSync('orgId')
-			this.fetchEnums(['SKEvaluateLevelEnum','SKProductionUnit']);
+			this.fetchEnums(['SKEvaluateLevelEnum', 'SKProductionUnit']);
 		},
 		// onReady() {
 		// 	//如果需要兼容微信小程序，并且校验规则中含有方法等，只能通过setRules方法设置规则。
@@ -198,10 +198,10 @@
 						if (item.Nav_Librarys && item.Nav_Librarys.length > 0) {
 							item.Nav_Librarys.map(item1 => {
 								item1.EVALUATE_LEVELName = item1.EVALUATE_LEVEL !== undefined ? this.enumsData['SKEvaluateLevelEnum'].find(item => item.code === item1.EVALUATE_LEVEL).name : '';
-								if(!item1.MINE_NAME){
+								if (!item1.MINE_NAME) {
 									item1.MINE_NAME = item1.MineType !== undefined ? this.enumsData['SKProductionUnit'].find(item => item.code === item1.MineType).name : '';
 								}
-								
+
 							})
 						}
 					})
@@ -278,13 +278,15 @@
 				}
 			},
 			filterData() {
+				this.checkedItems = []
 				this.allData.map(item => {
 					if (item.DEPARTMENT_ID == this.model.DEPARTMENT_ID && item.POST_NAME == this.model.Nav_Post.NAME) {
-						this.filterDatas = item
-						//默认全选
-						const allIds= this.filterDatas.Nav_Librarys.map(item => item.ID);
-						this.checkedItems = ['all', ...allIds];
-						
+						this.$set(this, 'filterDatas', item);
+						this.$nextTick(() => { // 等待 DOM 渲染新数据后再全选
+							const allIds = this.filterDatas.Nav_Librarys.map(item1 => item1.ID);
+							this.checkedItems = ['all', ...allIds];
+						});
+
 					}
 				})
 			},
@@ -316,21 +318,21 @@
 				}, {});
 				//
 				// 1. 按 RISK_NAME 分组，收集所有对应的 RISK_DESCRIPTION
-				
+
 				const allPhotos = [];
 				const photoNames = new Set(); // 用于记录已添加的图片name，实现去重
-				
+
 				arr.forEach(item => {
-				  // 确保当前对象存在 Nav_Photo 且是数组，避免报错
-				  if (Array.isArray(item.Nav_Photo)) {
-				    item.Nav_Photo.forEach(photo => {
-				      // 判断图片name是否已存在，不存在则添加
-				      if (!photoNames.has(photo.name)) {
-				        allPhotos.push(photo);
-				        photoNames.add(photo.name);
-				      }
-				    });
-				  }
+					// 确保当前对象存在 Nav_Photo 且是数组，避免报错
+					if (Array.isArray(item.Nav_Photo)) {
+						item.Nav_Photo.forEach(photo => {
+							// 判断图片name是否已存在，不存在则添加
+							if (!photoNames.has(photo.NAME)) {
+								allPhotos.push(photo);
+								photoNames.add(photo.NAME);
+							}
+						});
+					}
 				});
 				// 此时 allPhotos 已包含所有 Nav_Photo 中的图片对象
 				let newarr = {
@@ -363,34 +365,34 @@
 								`\n${riskName}：\n  ${measuresList}`;
 						})
 						.join(''),
-					RISK_DESCRIPTION: this.handleData(arr,'RISK_DESCRIPTION'),
-					EMERGENCY: this.handleData(arr,'EMERGENCY'),
-					Nav_Photo:allPhotos
+					RISK_DESCRIPTION: this.handleData(arr, 'RISK_DESCRIPTION'),
+					EMERGENCY: this.handleData(arr, 'EMERGENCY'),
+					Nav_Photo: allPhotos
 				}
 				uni.setStorageSync('detailData', newarr);
 				uni.navigateTo({
 					url: '/pages/apply/jobRiskShow'
 				})
 			},
-			handleData(arr,namekey){
+			handleData(arr, namekey) {
 				const oneData = {};
 				arr.forEach(item => {
-				  const name = item.RISK_NAME;
-				  const desc = item[namekey];
-				  // 若该名称已存在，追加描述；否则新建键值对
-				  if (oneData[name]) {
-				    oneData[name].add(desc);
-				  } else {
-				    oneData[name] = new Set([desc]);
-				  }
+					const name = item.RISK_NAME;
+					const desc = item[namekey];
+					// 若该名称已存在，追加描述；否则新建键值对
+					if (oneData[name]) {
+						oneData[name].add(desc);
+					} else {
+						oneData[name] = new Set([desc]);
+					}
 				});
 				const resultArr = [];
 				for (const [name, descList] of Object.entries(oneData)) {
-				  // Set 转数组，再拼接为 “名称：描述1；描述2” 格式
-				   const descStr = Array.from(descList).join('；');
-				   resultArr.push(`${name}：${descStr}`);
+					// Set 转数组，再拼接为 “名称：描述1；描述2” 格式
+					const descStr = Array.from(descList).join('；');
+					resultArr.push(`${name}：${descStr}`);
 				}
-				
+
 				// 3. 所有名称的拼接结果用 “\n” 连接，得到最终字符串
 				const finalResult = resultArr.join('\n');
 				return finalResult

From 96084d9ceb4d9ae4364746f5e2671f9ea288955c Mon Sep 17 00:00:00 2001
From: yunkexin <760754045@qq.com>
Date: Thu, 30 Oct 2025 12:14:32 +0800
Subject: [PATCH 05/10] 1

---
 pages/apply/jobList.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pages/apply/jobList.vue b/pages/apply/jobList.vue
index 0b87972..fcc4b41 100644
--- a/pages/apply/jobList.vue
+++ b/pages/apply/jobList.vue
@@ -289,6 +289,12 @@
 
 					}
 				})
+				if(!this.filterDatas||!this.filterDatas.Nav_Librarys||this.filterDatas.Nav_Librarys.length==0){
+					uni.showToast({
+						icon:'error',
+						title:'暂无当前岗位数据'
+					})
+				}
 			},
 			submit() {
 				let arr = []

From ef4d8b48b8a699cfc8fb526adc14ecaca71e3e2b Mon Sep 17 00:00:00 2001
From: yunkexin <760754045@qq.com>
Date: Thu, 30 Oct 2025 12:27:06 +0800
Subject: [PATCH 06/10] 1

---
 pages/apply/jobList.vue     | 2 +-
 pages/apply/jobRiskShow.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/apply/jobList.vue b/pages/apply/jobList.vue
index fcc4b41..f086549 100644
--- a/pages/apply/jobList.vue
+++ b/pages/apply/jobList.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="todo-page">
+	<view class="todo-page" style="padding-bottom: 140px;">
 		<view class="background"></view>
 
 		<view class="card">
diff --git a/pages/apply/jobRiskShow.vue b/pages/apply/jobRiskShow.vue
index dcd209a..aaa572c 100644
--- a/pages/apply/jobRiskShow.vue
+++ b/pages/apply/jobRiskShow.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="todo-page" style="padding-bottom: 10px;">
+	<view class="todo-page" style="padding-bottom: 140px;">
 		<view class="background"></view>
 
 		<view class="card">

From ea18b23aff986d6218a7f3baab52afe45b3212a3 Mon Sep 17 00:00:00 2001
From: yunkexin <760754045@qq.com>
Date: Thu, 30 Oct 2025 16:03:11 +0800
Subject: [PATCH 07/10] 1

---
 pages/apply/jobList.vue | 140 +++++++++++++++++++++++++++-------------
 pages/index/index.vue   |  17 ++---
 2 files changed, 102 insertions(+), 55 deletions(-)

diff --git a/pages/apply/jobList.vue b/pages/apply/jobList.vue
index f086549..bbe7162 100644
--- a/pages/apply/jobList.vue
+++ b/pages/apply/jobList.vue
@@ -17,7 +17,7 @@
 					<u--input fontSize="14px" disabled disabledColor="#ffffff" v-model="(model.Nav_Post||{}).NAME" border="none" suffixIcon="arrow-right" customStyle="margin:0px;display:flex;padding:3px 9px"
 						suffixIconStyle="font-size:12px"></u--input>
 				</u-form-item>
-				<u-button type="primary" text="查询" @click="filterData"></u-button>
+				<u-button type="primary" text="查询" @click="filterData" :disabled="loading"></u-button>
 
 			</u--form>
 			<u--form labelWidth="auto" :model="model" ref="wForm" class="demo-ruleForm" style="margin-top: 20px;" v-if="filterDatas&&filterDatas.Nav_Librarys&&filterDatas.Nav_Librarys.length>0">
@@ -26,40 +26,60 @@
 				</view>
 
 				<view style="font-size: 15px; font-weight: bold;color: #3d4b70;margin-bottom: 10px;">岗位风险清单</view>
-				<u-checkbox-group :value="checkedItems" placement="column" @change="handleCheckboxChange">
-					<u-checkbox :customStyle="{marginBottom: '8px'}" label="全选" name="all">
-					</u-checkbox>
-					<view v-for="(item, index) in filterDatas.Nav_Librarys" :key="index" style="margin-top: 10px;">
-
-
-						<u-checkbox :customStyle="{marginBottom: '8px'}" :key="index" :label="index+1+'.生产单元：'+item.MINE_NAME" :name="item.ID">
+				<uni-collapse :border="false" accordion>
+					<u-checkbox-group :value="checkedItems" placement="column" @change="handleCheckboxChange">
+						<u-checkbox :customStyle="{marginBottom: '8px'}" label="全选" name="all">
 						</u-checkbox>
+						<view v-for="(item, index) in filterDatas.Nav_Librarys" :key="index" style="margin-top: 10px;">
 
-						<u-form-item label="辨识区域" prop="Nav_Contents.CHECKCONTENT" borderBottom>
-							<u--input fontSize="14px" disabled disabledColor="#fff" v-model="(item.Nav_Area||{}).NAME" border="none" inputAlign="right"></u--input>
 
-						</u-form-item>
-						<u-form-item label="风险名称" prop="HIDDEN_PLACE" borderBottom>
-							<u--input fontSize="14px" disabled disabledColor="#fff" v-model="item.RISK_NAME" border="none" inputAlign="right"></u--input>
-						</u-form-item>
-						<u-form-item label="风险描述" prop="HIDDEN_PLACE" borderBottom>
-						</u-form-item>
-						<u--textarea fontSize="14px" disabled disabledColor="#fff" v-model="item.RISK_DESCRIPTION" border="none" inputAlign="right" autoHeight></u--textarea>
-						<u-form-item label="风险类别" prop="HIDDEN_PLACE" borderBottom>
-							<u--input fontSize="14px" disabled disabledColor="#fff" v-model="(item.Nav_Type||{}).NAME" border="none" inputAlign="right"></u--input>
-						</u-form-item>
-						<u-form-item label="风险等级" prop="HIDDEN_PLACE" borderBottom>
-							<u--input fontSize="14px" disabled disabledColor="#fff" v-model="item.EVALUATE_LEVELName" border="none" inputAlign="right"></u--input>
-						</u-form-item>
-					</view>
-				</u-checkbox-group>
+							<uni-collapse-item title-border="none" :border="false">
+								<template v-slot:title>
+									<view class="uni-collapse-item__title-box">
+
+										<u-checkbox :key="index" :name="item.ID">
+										</u-checkbox>
+										<view class="uni-collapse-item__title-text">
+											{{item.RISK_DESCRIPTION?index+1+'.'+item.RISK_DESCRIPTION:index+1+'.'}}
+										</view>
+									</view>
+								</template>
+								<view class="content" style="padding: 0px 0px 0px 10px;">
+									<u-form-item label="生产单元" prop="Nav_Contents.CHECKCONTENT" borderBottom>
+										<u--input fontSize="14px" disabled disabledColor="#fff" v-model="item.MINE_NAME" border="none" inputAlign="right"></u--input>
+
+									</u-form-item>
+									<u-form-item label="辨识区域" prop="Nav_Contents.CHECKCONTENT" borderBottom>
+										<u--input fontSize="14px" disabled disabledColor="#fff" v-model="(item.Nav_Area||{}).NAME" border="none" inputAlign="right"></u--input>
+
+									</u-form-item>
+									<u-form-item label="风险名称" prop="HIDDEN_PLACE" borderBottom>
+										<u--input fontSize="14px" disabled disabledColor="#fff" v-model="item.RISK_NAME" border="none" inputAlign="right"></u--input>
+									</u-form-item>
+									<u-form-item label="风险描述" prop="HIDDEN_PLACE" borderBottom>
+									</u-form-item>
+									<u--textarea fontSize="14px" disabled disabledColor="#fff" v-model="item.RISK_DESCRIPTION" border="none" inputAlign="right" autoHeight></u--textarea>
+									<u-form-item label="风险类别" prop="HIDDEN_PLACE" borderBottom>
+										<u--input fontSize="14px" disabled disabledColor="#fff" v-model="(item.Nav_Type||{}).NAME" border="none" inputAlign="right"></u--input>
+									</u-form-item>
+									<u-form-item label="风险等级" prop="HIDDEN_PLACE" borderBottom>
+										<u--input fontSize="14px" disabled disabledColor="#fff" v-model="item.EVALUATE_LEVELName" border="none" inputAlign="right"></u--input>
+									</u-form-item>
+								</view>
+
+
+							</uni-collapse-item>
+
+						</view>
+					</u-checkbox-group>
+				</uni-collapse>
 
 
 			</u--form>
 
 		</view>
 		<view style="padding: 10px 16px;" class="bottom-button" v-if="filterDatas&&filterDatas.Nav_Librarys&&filterDatas.Nav_Librarys.length>0">
-			<u-button type="primary" @click="submit" color="#3d4b70">生产岗位告知卡</u-button>
+			<u-button type="primary" @click="submit" color="#3d4b70">生成岗位告知卡</u-button>
 		</view>
 		<query-selector :show="selectorInfo.showPopup" :defaultChecked="selectorInfo.defaultChecked" :title="selectorInfo.title" :lists="selectorInfo.dataLists" @search="handleSearch" @select="handleSelected"
 			@close="selectorInfo.showPopup=false" :total="selectorInfo.totalCount" />
@@ -89,6 +109,7 @@
 				pageIndex: 0,
 				pageSize: 20,
 				total: 0,
+				loading:true,
 				baseUrl: config.uni_app_web_source_url,
 				allData: [],
 				// 新增选中项数组，存储选中item的唯一标识
@@ -99,22 +120,12 @@
 					Nav_Librarys: []
 				},
 				model: {
-					RISK_AREA_NAME: '请选择区域',
-					RISK_AREA_ID: '',
-					ISDOWN: '否',
-					SchedulingType: '',
-					COUNT_WORKER: '',
-					COUNT_LEVEL: '',
-					START_TIME: '',
-					END_TIME: '',
-					SchedulingNEXTTIME: '',
-					LISTPERSON_SCHEDULING: [{
+					Nav_Post: {
 						NAME: ''
-					}],
-					LISTUSER_LEAVE: [{
+					},
+					Nav_Department: {
 						NAME: ''
-					}],
-					ListShow: []
+					},
 				},
 				radiolist: [{
 					value: false,
@@ -141,6 +152,10 @@
 		},
 		onLoad(option) {
 			this.OrgId = option.OrgId // 'B043B28B-BBC3-C452-6052-4FBA1457ABFA'
+			this.model.DEPARTMENT_ID = option.DEPARTMENT_ID
+			this.model.POST_ID = option.POST_ID
+			this.inntData()
+
 			// const orgId = uni.getStorageSync('orgId')
 			this.fetchEnums(['SKEvaluateLevelEnum', 'SKProductionUnit']);
 		},
@@ -149,6 +164,29 @@
 		// 	this.$refs.uForm.setRules(this.rules)
 		// },
 		methods: {
+			inntData() {
+				if (this.model.DEPARTMENT_ID) {
+					const json = initFilter(this.OrgId, null, "NAME", 0, 1)
+					json.IgnoreDataRule = true
+					extendRule(json, "ID", 1, this.model.DEPARTMENT_ID)
+					DepartOrderPaged(json).then(res => {
+						if (res != undefined && res.Data.length > 0) {
+							this.model.Nav_Department.NAME = res.Data[0].NAME
+						}
+					})
+				}
+				if (this.model.POST_ID) {
+					const jsons = initFilter(this.OrgId, null, "NAME", 0, 1)
+					jsons.IgnoreDataRule = true
+					extendRule(jsons, "ID", 1, this.model.POST_ID)
+					PostOrderPaged(jsons).then(res => {
+						if (res != undefined && res.Data.length > 0) {
+							this.model.Nav_Post.NAME = res.Data[0].NAME
+						}
+					})
+				}
+				
+			},
 			async fetchEnums(enumNames) {
 				try {
 					// 存储所有枚举请求的Promise
@@ -193,6 +231,7 @@
 				const json = initFilter(this.OrgId, "", "")
 				json.IgnoreDataRule = true
 				GetPostRiskList(json).then(res => {
+					this.loading = false
 					this.allData = res.Data
 					this.allData.map(item => {
 						if (item.Nav_Librarys && item.Nav_Librarys.length > 0) {
@@ -206,7 +245,9 @@
 						}
 					})
 					// this.total = res.TotalCount
-
+					if (this.model.DEPARTMENT_ID && this.model.POST_ID) {
+						this.filterData()
+					}
 
 
 				})
@@ -278,9 +319,18 @@
 				}
 			},
 			filterData() {
+			
+				if (!this.model.DEPARTMENT_ID || !this.model.POST_ID) {
+					uni.showToast({
+						icon: 'error',
+						title: '请选择部门和岗位'
+					})
+					return
+				}
 				this.checkedItems = []
 				this.allData.map(item => {
-					if (item.DEPARTMENT_ID == this.model.DEPARTMENT_ID && item.POST_NAME == this.model.Nav_Post.NAME) {
+					// item.POST_ID == this.model.POST_ID
+					if (item.DEPARTMENT_ID == this.model.DEPARTMENT_ID && item.POST_ID == this.model.POST_ID) {
 						this.$set(this, 'filterDatas', item);
 						this.$nextTick(() => { // 等待 DOM 渲染新数据后再全选
 							const allIds = this.filterDatas.Nav_Librarys.map(item1 => item1.ID);
@@ -289,10 +339,10 @@
 
 					}
 				})
-				if(!this.filterDatas||!this.filterDatas.Nav_Librarys||this.filterDatas.Nav_Librarys.length==0){
+				if (!this.filterDatas || !this.filterDatas.Nav_Librarys || this.filterDatas.Nav_Librarys.length == 0) {
 					uni.showToast({
-						icon:'error',
-						title:'暂无当前岗位数据'
+						icon: 'error',
+						title: '暂无当前岗位数据',
 					})
 				}
 			},
diff --git a/pages/index/index.vue b/pages/index/index.vue
index e70e1c4..0a65cd3 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -2,26 +2,21 @@
 	<view class="content">
 		<u-form>
 			<view>
-				<u-form-item label="公司名称" @click="handleChange()" label-width='150px' style="margin: 0 20px 0 30px;"
-					prop="OrgId" borderBottom>
-					<u--input disabledColor="#fff" v-model="NAME" placeholder="请选择公司名称" border="none"
-						inputAlign="right"></u--input>
-					<u-icon v-if="!OrgId||OrgId.length<1" style="margin-left: 4px;" slot="right"
-						name="arrow-down"></u-icon>
+				<u-form-item label="公司名称" @click="handleChange()" label-width='150px' style="margin: 0 20px 0 30px;" prop="OrgId" borderBottom>
+					<u--input disabledColor="#fff" v-model="NAME" placeholder="请选择公司名称" border="none" inputAlign="right"></u--input>
+					<u-icon v-if="!OrgId||OrgId.length<1" style="margin-left: 4px;" slot="right" name="arrow-down"></u-icon>
 				</u-form-item>
 			</view>
 			<view class="list">
 				<u-grid :border="false" :col="2">
 					<u-grid-item v-for="(baseListItem,baseListIndex) in baseList" :key="baseListIndex" bgColor="#fff">
-						<u-icon :customStyle="{paddingTop:20+'rpx'}" :name="baseListItem.iconName" :size="42"
-							@click="menuClick(baseListItem)" color="#304ffe"></u-icon>
+						<u-icon :customStyle="{paddingTop:20+'rpx'}" :name="baseListItem.iconName" :size="42" @click="menuClick(baseListItem)" color="#304ffe"></u-icon>
 						<text class="grid-text">{{baseListItem.name}}</text>
 					</u-grid-item>
 				</u-grid>
 			</view>
 		</u-form>
-		<query-selector :show="selectorInfo.showPopup" :defaultChecked="selectorInfo.defaultChecked"
-			:title="selectorInfo.title" :lists="selectorInfo.dataLists" @search="handleSearch" @select="handleSelected"
+		<query-selector :show="selectorInfo.showPopup" :defaultChecked="selectorInfo.defaultChecked" :title="selectorInfo.title" :lists="selectorInfo.dataLists" @search="handleSearch" @select="handleSelected"
 			@close="selectorInfo.showPopup=false" />
 	</view>
 </template>
@@ -148,6 +143,8 @@
 					urlTo += '&RISK_AREA_ID=' + this.RISK_AREA_ID
 				if (this.DEPARTMENT_ID && this.DEPARTMENT_ID != undefined && this.DEPARTMENT_ID.length > 1)
 					urlTo += '&DEPARTMENT_ID=' + this.DEPARTMENT_ID
+				if (this.POST_ID && this.POST_ID != undefined && this.POST_ID.length > 1)
+					urlTo += '&POST_ID=' + this.POST_ID
 
 				uni.navigateTo({
 					url: urlTo

From 51264fb6a2b5839cf6fb4595b7649ef6ac5288f8 Mon Sep 17 00:00:00 2001
From: yunkexin <760754045@qq.com>
Date: Fri, 31 Oct 2025 14:55:59 +0800
Subject: [PATCH 08/10] =?UTF-8?q?=E9=A3=8E=E9=99=A9=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/apply/jobList.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pages/apply/jobList.vue b/pages/apply/jobList.vue
index bbe7162..04f0ef2 100644
--- a/pages/apply/jobList.vue
+++ b/pages/apply/jobList.vue
@@ -40,7 +40,7 @@
 										<u-checkbox :key="index" :name="item.ID">
 										</u-checkbox>
 										<view class="uni-collapse-item__title-text">
-											{{item.RISK_DESCRIPTION?index+1+'.'+item.RISK_DESCRIPTION:index+1+'.'}}
+											{{item.RISK_NAME?index+1+'.风险名称：'+item.RISK_NAME:index+1+'.风险名称：'}}
 										</view>
 									</view>
 								</template>
@@ -53,10 +53,10 @@
 										<u--input fontSize="14px" disabled disabledColor="#fff" v-model="(item.Nav_Area||{}).NAME" border="none" inputAlign="right"></u--input>
 
 									</u-form-item>
-									<u-form-item label="风险名称" prop="HIDDEN_PLACE" borderBottom>
+									<!-- <u-form-item label="风险名称" prop="HIDDEN_PLACE" borderBottom>
 										<u--input fontSize="14px" disabled disabledColor="#fff" v-model="item.RISK_NAME" border="none" inputAlign="right"></u--input>
-									</u-form-item>
-									<u-form-item label="风险描述" prop="HIDDEN_PLACE" borderBottom>
+									</u-form-item> -->
+									<u-form-item label="风险描述" prop="HIDDEN_PLACE" >
 									</u-form-item>
 									<u--textarea fontSize="14px" disabled disabledColor="#fff" v-model="item.RISK_DESCRIPTION" border="none" inputAlign="right" autoHeight></u--textarea>
 									<u-form-item label="风险类别" prop="HIDDEN_PLACE" borderBottom>

From ab3be1bc822e9c2923ff53e82f8ebe24be217b87 Mon Sep 17 00:00:00 2001
From: yunkexin <760754045@qq.com>
Date: Wed, 21 Jan 2026 14:57:55 +0800
Subject: [PATCH 09/10] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=AC=E5=8F=B8?=
 =?UTF-8?q?=E7=BC=96=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/apply/index.vue | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pages/apply/index.vue b/pages/apply/index.vue
index 4621e50..fbbae45 100644
--- a/pages/apply/index.vue
+++ b/pages/apply/index.vue
@@ -9,6 +9,9 @@
 					</view>
 
 					<view style="font-size: 15px; font-weight: bold;color: #3d4b70;margin-bottom: 10px;">基本信息填写</view>
+					<u-form-item label="公司"  borderBottom ref="item1">
+						<u--input disabled v-model="decodedStr" border="none" customStyle="margin:0px;display:flex;padding:3px 9px"></u--input>
+					</u-form-item>
 					<u-form-item label="姓名" prop="userInfo.Name" borderBottom ref="item1">
 						<u--input v-model="model1.userInfo.Name" border="none" customStyle="margin:0px;display:flex;padding:3px 9px"></u--input>
 					</u-form-item>
@@ -128,11 +131,15 @@
 					},
 				},
 				radio: '',
-				switchVal: false
+				switchVal: false,
+				decodedStr:'',
 			}
 		},
 		
 		onLoad(option) {
+			if(option.sysName){
+				 this.decodedStr = this.decodeBase64(option.sysName).replace(/^-/, '');;
+			}
 			// this.model.ID = option.ID
 			// this.model.TaskID = option.taskID
 			// this.TaskID = option.taskID

From 7c7d0685a507cee7a868bd2ae7deeeaff1ca79d3 Mon Sep 17 00:00:00 2001
From: yunkexin <760754045@qq.com>
Date: Wed, 21 Jan 2026 16:11:45 +0800
Subject: [PATCH 10/10] 1

---
 pages/apply/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/apply/index.vue b/pages/apply/index.vue
index fbbae45..31a4d3d 100644
--- a/pages/apply/index.vue
+++ b/pages/apply/index.vue
@@ -9,7 +9,7 @@
 					</view>
 
 					<view style="font-size: 15px; font-weight: bold;color: #3d4b70;margin-bottom: 10px;">基本信息填写</view>
-					<u-form-item label="公司"  borderBottom ref="item1">
+					<u-form-item label="公司"  borderBottom ref="item1"  v-if="decodedStr!==''">
 						<u--input disabled v-model="decodedStr" border="none" customStyle="margin:0px;display:flex;padding:3px 9px"></u--input>
 					</u-form-item>
 					<u-form-item label="姓名" prop="userInfo.Name" borderBottom ref="item1">