Skip to content

G
GaoQuYingJiH5-ASD
Commit b9776da9 authored by lei's avatar lei
Browse files
Options

Merge branch 'gaoqucodecheck' of... 

Merge branch 'gaoqucodecheck' of http://h.gemho.cn:7099/zhaojunbao/gaoquyingjih5-asd into gaoqucodecheck
parents 9be7af28 e8d2549c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1017 additions and 434 deletions
src/_check_info.css
View file @ b9776da9
......@@ -42,6 +42,9 @@
.checklist-container .van-checkbox {
width: auto;
float: left;
margin-right: .3rem;
margin-bottom: .2rem;
}
.checklist-container .van-checkbox__label,
......
src/_check_info.html
View file @ b9776da9
......@@ -9,6 +9,8 @@
<title>消防安全检查清单</title>
<script type="text/javascript" src="../sdk/includeHead.js"></script>
<script type="text/javascript" src="_check_info_data.js"></script>
<!-- <script type="text/javascript" src="_check_info_data_detail.js"></script>
<script type="text/javascript" src="_check_info_data_detail_yh.js"></script> -->
</head>
<body>
......@@ -23,31 +25,40 @@
</div>
<div class="checklist-container">
<div class="item_title">
{{ checkData[checkPageIndex].title }}
{{ checkData[checkPageIndex].name }}
</div>
<div v-for="(item, index) in checkData[checkPageIndex]['gqCheckItemVoList']" :key="item.id" class="check-item">
<div class="item-header">
<!-- <div class="item-number">{{ index + 1 }}</div> -->
<div class="item-title">{{ index + 1 }}.{{ item.name }}</div>
<div class="item-title">{{ item.id }}.{{ item.name }}</div>
</div>
<!-- 单选按钮组 -->
<van-radio-group v-model="item.selected" @change="handleSelectionChange(item)"
<van-radio-group v-model="item.itemAnswer" @change="handleSelectionChange($event, item, index)"
:disabled="flag!=='ADD'" direction="horizontal">
<van-radio name="yes">是</van-radio>
<van-radio name="no">否</van-radio>
<van-radio name="na">不涉及</van-radio>
<van-radio :name="1">是</van-radio>
<van-radio :name="2">否</van-radio>
<van-radio :name="3">不涉及</van-radio>
</van-radio-group>
<!-- 否选项扩展内容 -->
<div v-show="item.selected === 'no'" class="expand-section">
<div v-show="item.itemAnswer === 2" class="expand-section">
<div>
<!-- 子检查项 -->
<div class="sub-checkbox-group" v-if="flag=='ADD'">
<van-checkbox v-for="(subItem, subIndex) in item.gqCheckQuestionDtoList" :key="subIndex"
v-model="subItem.check" shape="square">
{{ subItem.name}}
</van-checkbox>
<div class="sub-checkbox-group">
<van-cell v-if="item.itemType==1">
<van-checkbox v-for="(subItem, subIndex) in item.gqCheckQuestionDtoList" :key="subIndex"
v-model="subItem.check" shape="square" :disabled="flag!=='ADD'">
{{ subItem.name}}
</van-checkbox>
</van-cell>
<van-cell v-if="item.itemType==2">
<div class="limit_date_wrapper">
<span>住宿人数:</span>
<input type="text" v-model="item.gqCheckQuestionDtoList[0].content"
style="width:.8rem;height:.4rem;text-align:center;"/>
</div>
</van-cell>
</div>
......@@ -68,7 +79,7 @@
<van-cell><span class="title_require">请上传隐患图片:</span><span
style="color: red;">(格式png/jpg/jpeg,最多4张)</span>
<div>
<van-uploader style="width: 80px; height:80px;" v-model="item.photos"
<van-uploader v-model="item.rectificationImageUrlList"
:max-count="4" :after-read="handleFileUpload" class="uploader-wrapper" />
</div>
</van-cell>
......@@ -126,7 +137,7 @@
<van-cell-group v-if="flag!=='ADD'">
<van-cell>
<div class="limit_date_wrapper">
<span>整改期限: {{checkDate}}</span>
<span>整改期限: {{item.rectificationDate}}</span>
</div>
</van-cell>
</van-cell-group>
......@@ -135,19 +146,19 @@
</div>
<van-form>
<van-cell>
<van-field label="检查人员" v-model="checkPerson" readonly />
<van-field label="检查人员" v-model="checkPeopleName" readonly />
</van-cell>
<van-cell>
<van-field label="检查日期" v-model="checkDate" />
</van-cell>
<van-cell v-if="flag==='YH_XQ'||flag==='ZG_XQ'">
<van-field label="整改截止日期" v-model="checkDate" />
<van-field label="整改截止日期" v-model="rectificationDeadline" />
</van-cell>
<van-cell v-if="flag==='YH_XQ'">
<van-field label="审核日期" v-model="checkDate" />
<van-field label="审核日期" v-model="reviewDate" />
</van-cell>
<van-cell v-if="flag==='YH_XQ'">
<van-field label="审核记录" v-model="checkDate" />
<van-field label="审核记录" v-model="reviewRecord" />
</van-cell>
</van-form>
......
src/_check_info.js
View file @ b9776da9
window.onload = function() {
// 原 JavaScript 代码保持不变
let checkData = [{
id: 1,
title: '消防安全检查',
checkList: [{
id: 1,
title: '检查项目 1',
selected: 'no',
subChecks: [{
id: 1,
checked: false
},
{
id: 2,
checked: false
},
{
id: 3,
checked: false
},
{
id: 4,
checked: false
}
],
description: '',
photos: [],
deadlineDays: '',
deadlineDate: ''
}, {
id: 1,
title: '检查项目 2',
selected: null,
subChecks: [{
id: 1,
checked: false
},
{
id: 2,
checked: false
},
{
id: 3,
checked: false
},
{
id: 4,
checked: false
}
],
description: '',
photos: [],
deadlineDays: '',
deadlineDate: ''
}],
},
{
id: 2,
title: '用电安全检查',
checkList: [{
id: 1,
title: '检查项目 1',
selected: null,
subChecks: [{
id: 1,
checked: false
},
{
id: 2,
checked: false
},
{
id: 3,
checked: false
},
{
id: 4,
checked: false
}
],
description: '',
photos: [],
deadlineDays: '',
deadlineDate: ''
}],
},
{
id: 3,
title: '用电安全检查2',
checkList: [{
id: 1,
title: '检查项目 1',
selected: null,
subChecks: [{
id: 1,
checked: false
},
{
id: 2,
checked: false
},
{
id: 3,
checked: false
},
{
id: 4,
checked: false
}
],
description: '',
photos: [],
deadlineDays: '',
deadlineDate: ''
}],
},
{
id: 4,
title: '用电安全检查4',
checkList: [{
id: 1,
title: '检查项目 1',
selected: null,
subChecks: [{
id: 1,
checked: false
},
{
id: 2,
checked: false
},
{
id: 3,
checked: false
},
{
id: 4,
checked: false
}
],
description: '',
photos: [],
deadlineDays: '',
deadlineDate: ''
}],
},
];
checkData = res.data
function countSelectedNo(result) {
// 获取 checkList 中 selected 为 'no' 的对象个数
return result.reduce((total, category) => {
return total + category.checkList.filter(item => item.selected === 'no').length;
}, 0);
}
function getTotalCheckListItems(result) {
// 获取所有 checkList 子元素的总数
return result.reduce((total, category) => {
console.log(category, 'category');
return total + category.checkList.length;
return total + category.gqCheckItemVoList.filter(item => item.itemAnswer === 2).length;
}, 0);
}
function countSelectedNotNull(result) {
// 获取 checkList 中 selected 不为 null 的个数
return result.reduce((total, category) => {
return total + category.checkList.filter(item => item.selected !== null).length;
return total + category.gqCheckItemVoList.filter(item => item.itemAnswer !== 0).length;
}, 0);
}
// 统计各个状态数量
const noCount = 0// countSelectedNo(checkData); // selected=no 的个数
const totalItems = 0//getTotalCheckListItems(checkData); // checkList 子元素总数
const notNullCount = 0//countSelectedNotNull(checkData); // selected 不为 null 的个数
// 初始化检查项数据结构
function createCheckItem(id) {
return {
......@@ -205,20 +39,24 @@ window.onload = function() {
flag: 'ADD',
// flag: 'JC_XQ',
// flag: 'YH_XQ',
checkPerson: 'xxxx李先生',
checkDate: '2025-3-29',
showDeadlinePicker: false,
deadlineOptions: ['1', '3', '5', '7'],
currentEditingItem: null,
checkList: Array.from({
length: 40
}, (_, i) => createCheckItem(i + 1)),
checkData, // 提交给后端，图片使用vant结构，base64，后端处理，不走爱山东中台。（数据量大！）
checkData: [], // 提交给后端，图片使用vant结构，base64，后端处理，不走爱山东中台。（数据量大！）
checkPageIndex: 0,
currentItem: null,
noCount,
totalItems,
notNullCount
noCount:0,
totalItems: 0,
notNullCount: 0,
// 外层表单信息
checkDate: gemhoUtil.getTargetDateYMD(), // 检查日期
checkPeopleName: '',// 检查人员
rectificationDeadline: '', // 整改截止日期
reviewDate: '', // 隐患审核日期
reviewRecord: '',
originCheckData: [],
},
mounted() {
this.getDetail()
},
watch: {
checkData: {
......@@ -226,7 +64,7 @@ window.onload = function() {
const snapshot = JSON.parse(JSON.stringify(newVal));
console.log('全量变化:', snapshot);
this.noCount = countSelectedNo(newVal); // selected=no 的个数
this.totalItems = getTotalCheckListItems(newVal); // checkList 子元素总数
// this.totalItems = getTotalCheckListItems(newVal); // checkList 子元素总数
this.notNullCount = countSelectedNotNull(newVal); // selected 不为 null 的个数
},
deep: true
......@@ -246,14 +84,19 @@ window.onload = function() {
}
});
},
getOriginMatchedItemById(id) {
const result = this.originCheckData[this.checkPageIndex]['gqCheckItemVoList'].find(item => item.id === id) || []
return JSON.parse(JSON.stringify(result))
},
// 处理单选变化
handleSelectionChange(item) {
if (item.selected !== 'no') {
this.$set(item, 'description', '');
this.$set(item, 'photos', []);
this.$set(item, 'deadlineDays', '');
this.$set(item, 'deadlineDate', '');
}
handleSelectionChange(val, item, index) {
console.log(val, item, '数据改变了前')
const newItem = this.getOriginMatchedItemById(item.id)
console.log(val, newItem, '数据改变了。。。。newItem')
newItem.itemAnswer = val
// console.log(this.checkData[this.checkPageIndex]['gqCheckItemVoList'])
this.$set(this.checkData[this.checkPageIndex]['gqCheckItemVoList'], index, newItem);
console.log(val, this.checkData[this.checkPageIndex]['gqCheckItemVoList'][index], '数据改变了后', index)
},
// 文件上传处理
handleFileUpload(file) {
......@@ -276,6 +119,18 @@ window.onload = function() {
// 日期格式化
formatDate(date) {
return `${date.getFullYear()}-${(date.getMonth() + 1).toString().padStart(2, '0')}-${date.getDate().toString().padStart(2, '0')}`;
},
getDetail(){
this.checkDate = res.checkDate // 检查日期
this.checkPeopleName = res.checkPeopleName // 检查人员
this.rectificationDeadline = res.rectificationDeadline // 整改截止日期
this.reviewDate = res.reviewDate // 隐患审核日期
this.reviewRecord = res.reviewRecord
this.totalItems = res.itemAllCount,
// 表单数据
this.checkData = JSON.parse(JSON.stringify(res.data))
this.originCheckData = JSON.parse(JSON.stringify(res.data))
}
}
});
......
src/_check_info_data.js
View file @ b9776da9
This diff is collapsed.
src/_check_info_data_detail.js 0 → 100644
View file @ b9776da9
This diff is collapsed.
src/_check_info_data_detail_yh.js 0 → 100644
View file @ b9776da9
var res = {
"msg": "操作成功",
"reviewRecord": "",
"rectificationDeadline": "",
"code": 200,
"data": [
{
"id": 1,
"name": "消防安全检查",
"gqCheckItemVoList": [
{
"id": 1,
"checkTypeId": 0,
"name": "灭火器是否完好有效",
"itemType": 1,
"itemAnswer": 2,
"gqCheckQuestionDtoList": [
{
"id": 1,
"checkItemId": 0,
"name": "未配置",
"type": 0,
"check": true,
"content": ""
},
{
"id": 2,
"checkItemId": 1,
"name": "压力失效",
"type": 1,
"check": false,
"content": ""
},
{
"id": 3,
"checkItemId": 1,
"name": "压力失效",
"type": 1,
"check": false,
"content": ""
},
{
"id": 8,
"checkItemId": 1,
"name": "配置类型错误",
"type": 1,
"check": false,
"content": ""
}
],
"hiddenImageUrlList": [
"192.168.2.37:8080/profile/hidden/8qeclb1joyut5zjsjg52tylbjb63lvc.jpg",
"192.168.2.37:8080/profile/hidden/00055.jpg"
],
"rectificationImageUrlList": [
"192.168.2.37:8080/profile/hidden/8qeclb1joyut5zjsjg52tylbjb63lvc.jpg",
"192.168.2.37:8080/profile/hidden/00055.jpg"
],
"checkPeople": "超级管理员",
"rectificationDate": null,
"description": "asd"
}
]
}
],
"reviewDate": "",
"rectificationStatusName": "待整改",
"checkPeopleName": "超级管理员",
"checkDate": "2025-03-26 00:00:00"
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment