v1.2.1版本，优化调整了很多，整改验收阶段新加字段
This commit is contained in:
王利强
@@ -181,7 +181,8 @@ import {
|
||||
updateLicense,
|
||||
deleteLicense
|
||||
} from '@/request/three_one_api/license.js';
|
||||
import { baseUrl, getToken, toImageUrl } from '@/request/request.js';
|
||||
import { toImageUrl } from '@/request/request.js';
|
||||
import { uploadSingleWithLoading } from '@/utils/upload.js';
|
||||
|
||||
// 证照列表
|
||||
const licenseList = ref([]);
|
||||
@@ -435,41 +436,22 @@ const chooseImage = () => {
|
||||
});
|
||||
};
|
||||
|
||||
// 上传图片
|
||||
const uploadImage = (filePath) => {
|
||||
uni.showLoading({ title: '上传中...' });
|
||||
|
||||
uni.uploadFile({
|
||||
url: baseUrl + '/frontend/attachment/upload',
|
||||
filePath: filePath,
|
||||
name: 'file',
|
||||
header: {
|
||||
'Authorization': getToken()
|
||||
},
|
||||
success: (uploadRes) => {
|
||||
uni.hideLoading();
|
||||
try {
|
||||
const data = JSON.parse(uploadRes.data);
|
||||
if (data.code === 0 && data.data) {
|
||||
formData.photo = data.data.url || data.data;
|
||||
uni.showToast({ title: '上传成功', icon: 'success' });
|
||||
} else {
|
||||
uni.showToast({ title: data.msg || '上传失败', icon: 'none' });
|
||||
formData.photoPreview = '';
|
||||
}
|
||||
} catch (e) {
|
||||
console.error('解析上传结果失败:', e);
|
||||
uni.showToast({ title: '上传失败', icon: 'none' });
|
||||
formData.photoPreview = '';
|
||||
}
|
||||
},
|
||||
fail: (err) => {
|
||||
uni.hideLoading();
|
||||
console.error('上传失败:', err);
|
||||
uni.showToast({ title: '上传失败', icon: 'none' });
|
||||
formData.photoPreview = '';
|
||||
}
|
||||
});
|
||||
// 上传图片（七牛直传，提交表单时使用完整 URL）
|
||||
const uploadImage = async (filePath) => {
|
||||
try {
|
||||
const { url } = await uploadSingleWithLoading(filePath);
|
||||
formData.photo = url;
|
||||
formData.photoPreview = url;
|
||||
uni.showToast({ title: '上传成功', icon: 'success' });
|
||||
} catch (e) {
|
||||
console.error('上传失败:', e);
|
||||
formData.photo = '';
|
||||
formData.photoPreview = '';
|
||||
uni.showToast({
|
||||
title: e?.msg || e?.message || '上传失败',
|
||||
icon: 'none'
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
// 移除图片
|
||||
|
||||
@@ -58,7 +58,7 @@
|
||||
</view>
|
||||
<view class="card-body">
|
||||
<view class="info-row">
|
||||
<text class="text-gray">隐患来源：</text>
|
||||
<text class="text-gray">检查形式：</text>
|
||||
<text>{{ sourceOptions[hazardFormData.source]?.title || '-' }}</text>
|
||||
</view>
|
||||
<view class="info-row">
|
||||
@@ -104,6 +104,19 @@
|
||||
<text class="text-blue text-bold" style="cursor: pointer; padding: 0 10rpx; color: #2667E9; font-weight: bold;" @click="clearDraft(true)">清空草稿</text>
|
||||
</view>
|
||||
<view class="flex margin-bottom">
|
||||
<view class="text-gray">检查形式</view>
|
||||
<view class="text-red">*</view>
|
||||
</view>
|
||||
<view class="source-choose-scroll">
|
||||
<up-choose
|
||||
v-model="hazardFormData.source"
|
||||
:options="sourceOptions"
|
||||
:wrap="false"
|
||||
item-width="152rpx"
|
||||
item-height="64rpx"
|
||||
></up-choose>
|
||||
</view>
|
||||
<view class="flex margin-bottom margin-top">
|
||||
<view class="text-gray">隐患图片</view>
|
||||
<view class="text-red">*</view>
|
||||
</view>
|
||||
@@ -136,12 +149,6 @@
|
||||
item-width="183rpx"
|
||||
item-height="72rpx"
|
||||
></up-choose>
|
||||
<view class="flex margin-bottom margin-top">
|
||||
<view class="text-gray">隐患来源</view>
|
||||
<view class="text-red">*</view>
|
||||
</view>
|
||||
<up-choose v-model="hazardFormData.source" :options="sourceOptions" :wrap="false" item-width="183rpx"
|
||||
item-height="72rpx"></up-choose>
|
||||
<view class="flex margin-bottom margin-top">
|
||||
<view class="text-gray">隐患位置</view>
|
||||
<view class="text-red">*</view>
|
||||
@@ -266,8 +273,8 @@
|
||||
import { ref, reactive, computed, nextTick, watch, getCurrentInstance } from 'vue';
|
||||
import { onLoad } from '@dcloudio/uni-app';
|
||||
import { enterCheckPlan, submitCheckResult, addHiddenDanger, getHiddenDangerLabelList, getRegulationList, analyzeHazardImage } from '@/request/api.js';
|
||||
import { baseUrl, getToken, toImageUrl, imageBaseUrl } from '@/request/request.js';
|
||||
import { addTimestampWatermark } from '@/utils/watermark.js';
|
||||
import { toImageUrl } from '@/request/request.js';
|
||||
import { createUploadListHandlers, buildAttachmentItem } from '@/utils/upload.js';
|
||||
import { getAreaList } from '@/request/three_one_api/area.js';
|
||||
|
||||
// 页面参数
|
||||
@@ -476,12 +483,12 @@
|
||||
{ id: 3, title: '重大隐患' }
|
||||
]);
|
||||
|
||||
// 隐患来源选项
|
||||
// 检查形式选项
|
||||
const sourceOptions = ref([
|
||||
{ id: 1, title: '随手拍' },
|
||||
{ id: 2, title: '企业自查' },
|
||||
{ id: 3, title: '行业互查' },
|
||||
{ id: 4, title: '专家诊查' }
|
||||
{ id: 1, title: '部门检查' },
|
||||
{ id: 2, title: '都导检查' },
|
||||
{ id: 3, title: '企业自查' },
|
||||
{ id: 4, title: '行业互查' }
|
||||
]);
|
||||
|
||||
// 隐患标签选项
|
||||
@@ -578,75 +585,15 @@
|
||||
}, 300);
|
||||
};
|
||||
|
||||
// 删除图片
|
||||
const deletePic = (event) => {
|
||||
hazardFileList.value.splice(event.index, 1);
|
||||
};
|
||||
|
||||
// 新增图片
|
||||
const afterRead = async (event) => {
|
||||
let lists = [].concat(event.file);
|
||||
let fileListLen = hazardFileList.value.length;
|
||||
lists.map((item) => {
|
||||
hazardFileList.value.push({
|
||||
...item,
|
||||
status: 'uploading',
|
||||
message: '上传中',
|
||||
});
|
||||
});
|
||||
for (let i = 0; i < lists.length; i++) {
|
||||
let watermarkedUrl = lists[i].url;
|
||||
try {
|
||||
const instance = getCurrentInstance();
|
||||
watermarkedUrl = await addTimestampWatermark({
|
||||
tempFilePath: lists[i].url,
|
||||
canvasId: 'watermarkCanvas',
|
||||
canvasWidthRef: canvasWidth,
|
||||
canvasHeightRef: canvasHeight,
|
||||
instance
|
||||
});
|
||||
} catch (e) {
|
||||
console.error('加水印失败，将使用原图上传:', e);
|
||||
}
|
||||
const result = await uploadFilePromise(watermarkedUrl);
|
||||
let item = hazardFileList.value[fileListLen];
|
||||
const serverPath = typeof result === 'string' ? result : (result?.url || result?.path || '');
|
||||
hazardFileList.value.splice(fileListLen, 1, {
|
||||
...item,
|
||||
status: 'success',
|
||||
message: '',
|
||||
url: toImageUrl(serverPath),
|
||||
serverPath: serverPath,
|
||||
});
|
||||
fileListLen++;
|
||||
const inspectionUploadInstance = getCurrentInstance();
|
||||
const { afterRead, deletePic } = createUploadListHandlers(hazardFileList, {
|
||||
watermark: {
|
||||
canvasId: 'watermarkCanvas',
|
||||
canvasWidthRef: canvasWidth,
|
||||
canvasHeightRef: canvasHeight,
|
||||
instance: inspectionUploadInstance
|
||||
}
|
||||
};
|
||||
|
||||
// 上传文件
|
||||
const uploadFilePromise = (filePath) => {
|
||||
return new Promise((resolve, reject) => {
|
||||
uni.uploadFile({
|
||||
url: baseUrl + '/frontend/attachment/upload',
|
||||
filePath: filePath,
|
||||
name: 'file',
|
||||
header: {
|
||||
'Authorization': getToken()
|
||||
},
|
||||
success: (res) => {
|
||||
const data = JSON.parse(res.data);
|
||||
if (data.code === 0) {
|
||||
resolve(data.data);
|
||||
} else {
|
||||
reject(data.msg || '上传失败');
|
||||
}
|
||||
},
|
||||
fail: (err) => {
|
||||
console.error('上传失败:', err);
|
||||
reject(err);
|
||||
}
|
||||
});
|
||||
});
|
||||
};
|
||||
});
|
||||
|
||||
// AI 识别隐患
|
||||
const handleAiAnalyze = async () => {
|
||||
@@ -730,24 +677,9 @@
|
||||
// 如果选择异常，先调用新增隐患接口
|
||||
if (radiovalue1.value === '异常' && hasHazardData.value) {
|
||||
// 构建附件列表
|
||||
const attachments = hazardFileList.value.map(file => {
|
||||
let url = '';
|
||||
if (typeof file.url === 'string') {
|
||||
url = file.url;
|
||||
} else if (file.url && typeof file.url === 'object') {
|
||||
url = file.url.url || file.url.path || '';
|
||||
}
|
||||
if (typeof url === 'string' && url.startsWith('http')) {
|
||||
url = url.replace(imageBaseUrl, '');
|
||||
}
|
||||
const fileName = (typeof url === 'string' && url) ? url.split('/').pop() : (file.name || '');
|
||||
return {
|
||||
fileName: fileName || '',
|
||||
filePath: url || '',
|
||||
fileType: file.type || 'image/png',
|
||||
fileSize: file.size || 0
|
||||
};
|
||||
});
|
||||
const attachments = hazardFileList.value
|
||||
.filter((f) => f.status === 'success')
|
||||
.map((file) => buildAttachmentItem(file));
|
||||
|
||||
// 获取隐患标签ID
|
||||
const selectedTag = tagOptions.value[hazardFormData.tagIndex];
|
||||
@@ -758,7 +690,7 @@
|
||||
taskId: checkData.value?.taskId,
|
||||
checkPointId: checkData.value?.checkPointId,
|
||||
title: hazardFormData.title,
|
||||
level: hazardFormData.level + 1,
|
||||
level: levelOptions.value[hazardFormData.level]?.id || 2,
|
||||
lng: hazardLng.value || 0,
|
||||
lat: hazardLat.value || 0,
|
||||
address: hazardAddress.value || '',
|
||||
@@ -1244,6 +1176,43 @@
|
||||
.popup-body {
|
||||
padding: 30rpx;
|
||||
}
|
||||
|
||||
// 检查形式横向滚动，露出第 4 项一角提示可滑动
|
||||
.source-choose-scroll {
|
||||
width: 100%;
|
||||
overflow: hidden;
|
||||
|
||||
:deep(.up-choose) {
|
||||
width: 100%;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
:deep(.u-tag-wrapper) {
|
||||
margin-right: 12rpx;
|
||||
}
|
||||
|
||||
:deep(.u-tag) {
|
||||
display: flex !important;
|
||||
align-items: center !important;
|
||||
justify-content: center !important;
|
||||
box-sizing: border-box;
|
||||
padding: 0 8rpx !important;
|
||||
line-height: normal !important;
|
||||
}
|
||||
|
||||
:deep(.u-tag__content) {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
flex: 1;
|
||||
}
|
||||
|
||||
:deep(.u-tag__text) {
|
||||
font-size: 24rpx !important;
|
||||
line-height: 1.3 !important;
|
||||
text-align: center;
|
||||
}
|
||||
}
|
||||
|
||||
// AI 识别按钮样式
|
||||
.ai-btn-wrapper {
|
||||
|
||||
@@ -97,7 +97,7 @@ const openEditPopup = async (item) => {
|
||||
currentEditId.value = item.id;
|
||||
editData.value = {
|
||||
name: res.data.name || '',
|
||||
color: res.data.color || '#FF5733'
|
||||
color: res.data.color || '#D92121'
|
||||
};
|
||||
showPopup.value = true;
|
||||
}
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
<template>
|
||||
<view class="padding page">
|
||||
<view class="padding bg-white radius margin-bottom card-item" v-for="(item,index) in hazardList" :key="index">
|
||||
<view class="padding bg-white radius margin-bottom card-item" v-for="item in hazardList" :key="item.hazardId || item.id">
|
||||
<view class="flex justify-between margin-bottom">
|
||||
<view class="text-bold text-black" style="flex: 1; margin-right: 16rpx;">{{item.hazardTitle}}</view>
|
||||
<view class="status-tag" :class="getStatusClass(item.verifyResultName)">{{item.verifyResultName || '未知'}}</view>
|
||||
<view class="status-tag" :class="getStatusClass(item)">{{item.verifyResultName || '未知'}}</view>
|
||||
</view>
|
||||
<view class="flex margin-bottom">
|
||||
<view class="text-gray">隐患日期：</view>
|
||||
@@ -24,7 +24,7 @@
|
||||
</view>
|
||||
<view class="flex justify-between">
|
||||
<view></view>
|
||||
<view><button class="bg-blue round cu-btn lg" @click="editor()">查看详情</button></view>
|
||||
<view><button class="bg-blue round cu-btn lg" @click="editor(item)">查看详情</button></view>
|
||||
</view>
|
||||
</view>
|
||||
<button class="cuIcon-add bg-blue round margin-top" @click="openAddPopup">新增</button>
|
||||
@@ -54,30 +54,17 @@
|
||||
<view class="flex margin-bottom margin-top">
|
||||
<view>整改时限</view>
|
||||
</view>
|
||||
<view class="picker-input" @click="showDatePicker = true">
|
||||
<text :class="formData.rectifyDeadline ? '' : 'text-gray'">{{ formData.rectifyDeadline || '请选择整改时限' }}</text>
|
||||
<view class="picker-input readonly">
|
||||
<text :class="formData.rectifyDeadline ? '' : 'text-gray'">{{ formData.rectifyDeadline || '请先选择隐患' }}</text>
|
||||
</view>
|
||||
<up-datetime-picker
|
||||
v-if="false" :show="showDatePicker"
|
||||
v-model="dateValue"
|
||||
mode="datetime"
|
||||
@confirm="onDateConfirm"
|
||||
@cancel="showDatePicker = false"
|
||||
@close="showDatePicker = false"
|
||||
></up-datetime-picker>
|
||||
<view class="margin-bottom margin-top">隐患治理责任单位</view>
|
||||
<view class="picker-input" @click="showDeptPicker = true">
|
||||
<text :class="selectedDeptName ? '' : 'text-gray'">{{ selectedDeptName || '请选择隐患治理责任单位' }}</text>
|
||||
<view class="picker-input readonly">
|
||||
<text :class="selectedDeptName ? '' : 'text-gray'">{{ selectedDeptName || '请先选择隐患' }}</text>
|
||||
</view>
|
||||
<up-picker
|
||||
v-if="false" :show="showDeptPicker"
|
||||
:columns="deptColumns"
|
||||
@confirm="onDeptConfirm"
|
||||
@cancel="showDeptPicker = false"
|
||||
@close="showDeptPicker = false"
|
||||
></up-picker>
|
||||
<view class="margin-bottom margin-top">主要负责人</view>
|
||||
<up-input v-model="formData.responsiblePerson" placeholder="请输入主要负责人"></up-input>
|
||||
<view class="picker-input readonly">
|
||||
<text :class="formData.responsiblePerson ? '' : 'text-gray'">{{ formData.responsiblePerson || '请先选择隐患' }}</text>
|
||||
</view>
|
||||
<view class="ai-btn-wrapper margin-top margin-bottom">
|
||||
<button class="ai-analyze-btn" :loading="aiGenerating" :disabled="aiGenerating" @click="handleAiGenerate">
|
||||
<text v-if="!aiGenerating" class="cuIcon-magic ai-btn-icon"></text>
|
||||
@@ -107,34 +94,16 @@
|
||||
@close="showHazardPicker = false"
|
||||
></up-picker>
|
||||
|
||||
<up-datetime-picker
|
||||
:show="showDatePicker"
|
||||
v-model="dateValue"
|
||||
mode="datetime"
|
||||
@confirm="onDateConfirm"
|
||||
@cancel="showDatePicker = false"
|
||||
@close="showDatePicker = false"
|
||||
></up-datetime-picker>
|
||||
|
||||
<up-picker
|
||||
:show="showDeptPicker"
|
||||
:columns="deptColumns"
|
||||
@confirm="onDeptConfirm"
|
||||
@cancel="showDeptPicker = false"
|
||||
@close="showDeptPicker = false"
|
||||
></up-picker>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { ref, reactive, onMounted } from 'vue'
|
||||
import { getMyWriteOffList, applyDelete, getAcceptanceList, getDepartmentPersonUsers, getHiddenDangerDetail, getRectifyDetail, generateWriteoffContent } from '@/request/api.js';
|
||||
import { getMyWriteOffList, applyDelete, getAcceptanceList, getHiddenDangerDetail, getRectifyDetail, generateWriteoffContent } from '@/request/api.js';
|
||||
|
||||
// 弹窗控制
|
||||
const showAddPopup = ref(false);
|
||||
const showHazardPicker = ref(false);
|
||||
const showDatePicker = ref(false);
|
||||
const showDeptPicker = ref(false);
|
||||
|
||||
// 隐患选择
|
||||
const selectedHazard = ref('');
|
||||
@@ -143,14 +112,8 @@
|
||||
const acceptanceHazardList = ref([]); // 存储可申请销号的隐患数据
|
||||
const hazardList = ref([]); // 存储销号申请列表
|
||||
|
||||
// 部门选择
|
||||
// 隐患关联的只读展示字段
|
||||
const selectedDeptName = ref('');
|
||||
const selectedDeptId = ref('');
|
||||
const deptColumns = ref([['暂无数据']]);
|
||||
const deptList = ref([]); // 存储部门列表
|
||||
|
||||
// 日期选择
|
||||
const dateValue = ref(Date.now());
|
||||
|
||||
// AI生成状态
|
||||
const aiGenerating = ref(false);
|
||||
@@ -198,94 +161,41 @@
|
||||
}
|
||||
};
|
||||
|
||||
// 获取部门列表
|
||||
const fetchDeptList = async () => {
|
||||
try {
|
||||
const res = await getDepartmentPersonUsers();
|
||||
if (res.code === 0 && res.data) {
|
||||
const users = [];
|
||||
res.data.forEach(dept => {
|
||||
if (dept.users && dept.users.length > 0) {
|
||||
dept.users.forEach(user => {
|
||||
users.push({
|
||||
userId: user.userId,
|
||||
deptId: dept.deptId,
|
||||
name: `${user.nickName}（${dept.deptName}）`
|
||||
});
|
||||
});
|
||||
}
|
||||
});
|
||||
deptList.value = users;
|
||||
// 转换为 picker 需要的格式
|
||||
if (users.length > 0) {
|
||||
deptColumns.value = [users.map(item => item.name)];
|
||||
} else {
|
||||
deptColumns.value = [['暂无人员数据']];
|
||||
}
|
||||
console.log('部门人员列表:', users);
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('获取部门人员列表失败:', error);
|
||||
}
|
||||
};
|
||||
|
||||
// 部门选择确认
|
||||
const onDeptConfirm = (e) => {
|
||||
console.log('选择的人员:', e);
|
||||
if (e.value && e.value.length > 0) {
|
||||
selectedDeptName.value = e.value[0];
|
||||
// 找到对应的用户ID和部门ID
|
||||
const index = e.indexs[0];
|
||||
if (deptList.value[index]) {
|
||||
selectedDeptId.value = deptList.value[index].deptId;
|
||||
formData.responsibleDeptId = deptList.value[index].deptId;
|
||||
}
|
||||
}
|
||||
showDeptPicker.value = false;
|
||||
};
|
||||
|
||||
// 打开新增弹窗
|
||||
const openAddPopup = () => {
|
||||
resetForm();
|
||||
fetchAcceptanceList(); // 获取可申请销号的隐患列表
|
||||
fetchDeptList(); // 获取部门列表
|
||||
showAddPopup.value = true;
|
||||
};
|
||||
|
||||
// 根据选中的隐患回显只读字段
|
||||
const fillHazardRelatedFields = (hazard) => {
|
||||
formData.rectifyDeadline = hazard.deadline || '';
|
||||
selectedDeptName.value = hazard.deptName || '';
|
||||
formData.responsiblePerson = hazard.rectifierName || '';
|
||||
formData.responsibleDeptId = hazard.deptId || '';
|
||||
};
|
||||
|
||||
// 隐患选择确认
|
||||
const onHazardConfirm = (e) => {
|
||||
console.log('选择的隐患:', e);
|
||||
if (e.value && e.value.length > 0) {
|
||||
selectedHazard.value = e.value[0];
|
||||
// 找到对应的隐患ID
|
||||
const index = e.indexs[0];
|
||||
if (acceptanceHazardList.value[index]) {
|
||||
selectedHazardId.value = acceptanceHazardList.value[index].hazardId;
|
||||
const hazard = acceptanceHazardList.value[index];
|
||||
if (hazard) {
|
||||
selectedHazardId.value = hazard.hazardId;
|
||||
fillHazardRelatedFields(hazard);
|
||||
}
|
||||
}
|
||||
showHazardPicker.value = false;
|
||||
};
|
||||
|
||||
// 日期时间选择确认
|
||||
const onDateConfirm = (e) => {
|
||||
console.log('选择的日期时间:', e);
|
||||
const date = new Date(e.value);
|
||||
const year = date.getFullYear();
|
||||
const month = String(date.getMonth() + 1).padStart(2, '0');
|
||||
const day = String(date.getDate()).padStart(2, '0');
|
||||
const hours = String(date.getHours()).padStart(2, '0');
|
||||
const minutes = String(date.getMinutes()).padStart(2, '0');
|
||||
const seconds = String(date.getSeconds()).padStart(2, '0');
|
||||
formData.rectifyDeadline = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
|
||||
showDatePicker.value = false;
|
||||
};
|
||||
|
||||
// 重置表单
|
||||
const resetForm = () => {
|
||||
selectedHazard.value = '';
|
||||
selectedHazardId.value = '';
|
||||
selectedDeptName.value = '';
|
||||
selectedDeptId.value = '';
|
||||
formData.rectifyDeadline = '';
|
||||
formData.responsibleDeptId = '';
|
||||
formData.responsiblePerson = '';
|
||||
@@ -386,20 +296,26 @@
|
||||
}
|
||||
};
|
||||
|
||||
const editor = () => {
|
||||
const editor = (item) => {
|
||||
if (!item?.id) {
|
||||
uni.showToast({ title: '缺少申请ID', icon: 'none' });
|
||||
return;
|
||||
}
|
||||
uni.navigateTo({
|
||||
url: '/pages/closeout/editor'
|
||||
})
|
||||
url: `/pages/closeout/editor?applyId=${item.id}`
|
||||
});
|
||||
};
|
||||
|
||||
// 根据审核状态返回对应样式类
|
||||
const getStatusClass = (status) => {
|
||||
switch (status) {
|
||||
case '待审核': return 'status-pending';
|
||||
case '已通过': return 'status-passed';
|
||||
case '已驳回': return 'status-rejected';
|
||||
default: return 'status-pending';
|
||||
}
|
||||
const getStatusClass = (item) => {
|
||||
const statusName = item?.verifyResultName || '';
|
||||
if (statusName === '待审核') return 'status-pending';
|
||||
if (statusName === '审核通过' || statusName === '已通过') return 'status-passed';
|
||||
if (statusName === '审核驳回' || statusName === '已驳回') return 'status-rejected';
|
||||
if (statusName === '已重新申请') return 'status-reapply';
|
||||
if (item?.verifyResult === 1) return 'status-passed';
|
||||
if (item?.verifyResult === 2) return 'status-rejected';
|
||||
return 'status-default';
|
||||
};
|
||||
|
||||
// 页面加载时获取销号申请列表
|
||||
@@ -441,6 +357,16 @@
|
||||
color: #F5222D;
|
||||
}
|
||||
|
||||
.status-reapply {
|
||||
background: #E6F7FF;
|
||||
color: #1890FF;
|
||||
}
|
||||
|
||||
.status-default {
|
||||
background: #F5F5F5;
|
||||
color: #8C8C8C;
|
||||
}
|
||||
|
||||
.popup-content {
|
||||
width: 600rpx;
|
||||
background: #fff;
|
||||
@@ -534,12 +460,15 @@
|
||||
border-radius: 8rpx;
|
||||
padding: 24rpx 20rpx;
|
||||
margin-bottom: 20rpx;
|
||||
// border: 1rpx solid #F6F6F6;
|
||||
border: 1rpx solid #eee;
|
||||
|
||||
text {
|
||||
font-size: 28rpx;
|
||||
// color: #333;
|
||||
}
|
||||
|
||||
&.readonly {
|
||||
background: #f5f5f5;
|
||||
color: #666;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@@ -1,132 +1,138 @@
|
||||
<template>
|
||||
<view class="padding page">
|
||||
<view class="padding bg-white radius">
|
||||
<view class="flex margin-bottom">
|
||||
<view class="text-gray">隐患</view>
|
||||
</view>
|
||||
<up-input v-model="formData.hazardTitle" placeholder="" disabled></up-input>
|
||||
<view class="text-gray margin-bottom margin-top">隐患日期</view>
|
||||
<up-input v-model="formData.hazardCreatedAt" placeholder="" disabled></up-input>
|
||||
<view class="text-gray margin-bottom">隐患名称</view>
|
||||
<up-input v-model="formData.hazardName" placeholder="暂无" disabled></up-input>
|
||||
|
||||
<view class="text-gray margin-bottom margin-top">整改时限</view>
|
||||
<up-input v-model="formData.deadline" placeholder="暂无" disabled></up-input>
|
||||
|
||||
<view class="text-gray margin-bottom margin-top">隐患治理责任单位</view>
|
||||
<up-input v-model="formData.responsibleDeptName" placeholder="请输入" :disabled="!canEdit"></up-input>
|
||||
<up-input v-model="formData.responsibilityUnit" placeholder="暂无" disabled></up-input>
|
||||
|
||||
<view class="text-gray margin-bottom margin-top">主要负责人</view>
|
||||
<up-input v-model="formData.responsiblePerson" placeholder="请输入" :disabled="!canEdit"></up-input>
|
||||
<view class="text-gray margin-bottom margin-top">创建时间</view>
|
||||
<up-input v-model="formData.createdAt" placeholder="" disabled></up-input>
|
||||
<up-input v-model="formData.mainPerson" placeholder="暂无" disabled></up-input>
|
||||
|
||||
<view class="text-gray margin-bottom margin-top">主要治理内容</view>
|
||||
<up-textarea v-model="formData.mainGovernanceContent" placeholder="暂无" disabled autoHeight></up-textarea>
|
||||
|
||||
<view class="text-gray margin-bottom margin-top">隐患治理完成内容</view>
|
||||
<up-textarea v-model="formData.governanceCompleteContent" placeholder="暂无" disabled autoHeight></up-textarea>
|
||||
|
||||
<view class="text-gray margin-bottom margin-top">状态</view>
|
||||
<up-input v-model="formData.statusName" placeholder="" disabled></up-input>
|
||||
<view class="flex justify-center margin-top-xl" style="gap: 30rpx;">
|
||||
<up-input :modelValue="statusText" placeholder="暂无" disabled></up-input>
|
||||
|
||||
<template v-if="hasRejectReason">
|
||||
<view class="text-gray margin-bottom margin-top">驳回理由</view>
|
||||
<up-textarea v-model="formData.rejectReason" placeholder="暂无" disabled autoHeight></up-textarea>
|
||||
</template>
|
||||
|
||||
<template v-if="hasSignature">
|
||||
<view class="text-gray margin-bottom margin-top">电子签名</view>
|
||||
<view class="signature-box">
|
||||
<image
|
||||
:src="signatureUrl"
|
||||
class="signature-img"
|
||||
mode="aspectFit"
|
||||
@click="previewSignature"
|
||||
@error="onSignatureImageError"
|
||||
></image>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<view class="flex justify-center margin-top-xl">
|
||||
<button class="round cu-btn lg" @click="handleCancel">返回</button>
|
||||
<!-- <button v-if="canEdit" class="bg-blue round cu-btn lg" @click="handleSubmit">保存</button> -->
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { ref, reactive, onMounted } from 'vue'
|
||||
import { ref, reactive, computed } from 'vue'
|
||||
import { onLoad } from '@dcloudio/uni-app'
|
||||
import {getMyWriteOffList } from '@/request/api.js';
|
||||
|
||||
// 获取页面参数的方法
|
||||
const getPageOptions = () => {
|
||||
const pages = getCurrentPages();
|
||||
const currentPage = pages[pages.length - 1];
|
||||
return currentPage?.options || {};
|
||||
};
|
||||
|
||||
// 页面参数
|
||||
const pageId = ref('');
|
||||
const canEdit = ref(false); // 是否可编辑（待审核状态可编辑）
|
||||
|
||||
// 表单数据
|
||||
import { getWriteOffApplyDetail } from '@/request/api.js'
|
||||
import { toSubmitFileUrl } from '@/utils/upload.js'
|
||||
|
||||
const applyId = ref('')
|
||||
const signatureUrl = ref('')
|
||||
|
||||
const formData = reactive({
|
||||
id: '',
|
||||
hazardId: '',
|
||||
hazardTitle: '', // 隐患标题
|
||||
hazardCreatedAt: '', // 隐患日期
|
||||
responsibleDeptName: '', // 隐患治理责任单位
|
||||
responsiblePerson: '', // 主要负责人
|
||||
createdAt: '', // 创建时间
|
||||
statusName: '' // 状态
|
||||
hazardName: '',
|
||||
deadline: '',
|
||||
responsibilityUnit: '',
|
||||
mainPerson: '',
|
||||
mainGovernanceContent: '',
|
||||
governanceCompleteContent: '',
|
||||
status: '',
|
||||
rejectReason: ''
|
||||
})
|
||||
|
||||
const statusText = computed(() => {
|
||||
const val = Number(formData.status);
|
||||
if (val === 1) return '通过';
|
||||
if (val === 2) return '不通过';
|
||||
return '';
|
||||
});
|
||||
|
||||
// 获取详情
|
||||
|
||||
const hasRejectReason = computed(() => Boolean(String(formData.rejectReason || '').trim()));
|
||||
const hasSignature = computed(() => Boolean(signatureUrl.value));
|
||||
|
||||
const applySignature = (signPath) => {
|
||||
signatureUrl.value = signPath ? toSubmitFileUrl(signPath) : ''
|
||||
}
|
||||
|
||||
const previewSignature = () => {
|
||||
if (!signatureUrl.value) return
|
||||
uni.previewImage({
|
||||
urls: [signatureUrl.value],
|
||||
current: signatureUrl.value
|
||||
})
|
||||
}
|
||||
|
||||
const onSignatureImageError = () => {
|
||||
console.error('签名图片加载失败:', signatureUrl.value)
|
||||
}
|
||||
|
||||
const fetchDetail = async (id) => {
|
||||
console.log('=== fetchDetail 被调用 ===, id:', id);
|
||||
if (!id) {
|
||||
uni.showToast({ title: '缺少申请ID', icon: 'none' })
|
||||
return
|
||||
}
|
||||
try {
|
||||
const res = await getMyWriteOffList();
|
||||
console.log('接口返回:', res);
|
||||
if (res.code === 0 && res.data && res.data.length > 0) {
|
||||
const list = res.data;
|
||||
// 如果有 id 就按 id 找，否则取第一条
|
||||
let data = null;
|
||||
if (id) {
|
||||
data = list.find(item => item.id == id);
|
||||
}
|
||||
// 如果没找到，取第一条
|
||||
if (!data) {
|
||||
data = list[0];
|
||||
}
|
||||
|
||||
console.log('绑定数据:', data);
|
||||
// 绑定数据
|
||||
formData.id = data.id;
|
||||
formData.hazardId = data.hazardId;
|
||||
formData.hazardTitle = data.hazardTitle || '';
|
||||
formData.hazardCreatedAt = data.hazardCreatedAt || '';
|
||||
formData.responsibleDeptName = data.responsibleDeptName || '';
|
||||
formData.responsiblePerson = data.responsiblePerson || '';
|
||||
formData.createdAt = data.createdAt || '';
|
||||
formData.statusName = data.statusName || '';
|
||||
|
||||
// 根据返回数据的状态判断是否可编辑（待审核 status=1 可编辑）
|
||||
if (data.status == 1 || data.statusName === '待审核') {
|
||||
canEdit.value = true;
|
||||
console.log('状态为待审核，可以编辑');
|
||||
} else {
|
||||
canEdit.value = false;
|
||||
console.log('状态为已审核，不可编辑');
|
||||
}
|
||||
uni.showLoading({ title: '加载中...' })
|
||||
const res = await getWriteOffApplyDetail(id)
|
||||
if (res.code === 0 && res.data) {
|
||||
const data = res.data
|
||||
formData.hazardId = data.hazardId || ''
|
||||
formData.hazardName = data.hazardName || ''
|
||||
formData.deadline = data.deadline || ''
|
||||
formData.responsibilityUnit = data.responsibilityUnit || ''
|
||||
formData.mainPerson = data.mainPerson || ''
|
||||
formData.mainGovernanceContent = data.mainGovernanceContent || ''
|
||||
formData.governanceCompleteContent = data.governanceCompleteContent || ''
|
||||
formData.status = data.status ?? ''
|
||||
formData.rejectReason = data.rejectReason || ''
|
||||
applySignature(data.signPath)
|
||||
} else {
|
||||
uni.showToast({ title: res.msg || '获取详情失败', icon: 'none' })
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('获取详情失败:', error);
|
||||
console.error('获取销号申请详情失败:', error)
|
||||
uni.showToast({ title: '获取详情失败', icon: 'none' })
|
||||
} finally {
|
||||
uni.hideLoading()
|
||||
}
|
||||
};
|
||||
|
||||
// 返回
|
||||
}
|
||||
|
||||
const handleCancel = () => {
|
||||
uni.navigateBack();
|
||||
};
|
||||
|
||||
// 保存
|
||||
const handleSubmit = async () => {
|
||||
console.log('保存数据:', formData);
|
||||
// TODO: 调用更新接口
|
||||
uni.showToast({ title: '保存成功', icon: 'success' });
|
||||
setTimeout(() => {
|
||||
uni.navigateBack();
|
||||
}, 1500);
|
||||
};
|
||||
|
||||
// 页面加载
|
||||
uni.navigateBack()
|
||||
}
|
||||
|
||||
onLoad((options) => {
|
||||
console.log('=== onLoad 触发 ===');
|
||||
console.log('options:', options);
|
||||
pageId.value = options?.id || '';
|
||||
fetchDetail(pageId.value);
|
||||
});
|
||||
|
||||
// 备用：onMounted
|
||||
onMounted(() => {
|
||||
console.log('=== onMounted 触发 ===');
|
||||
if (!pageId.value) {
|
||||
const options = getPageOptions();
|
||||
console.log('备用获取参数:', options);
|
||||
pageId.value = options?.id || '';
|
||||
fetchDetail(pageId.value);
|
||||
}
|
||||
});
|
||||
applyId.value = options?.applyId || ''
|
||||
fetchDetail(applyId.value)
|
||||
})
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
@@ -134,5 +140,18 @@
|
||||
min-height: 100vh;
|
||||
background: #EBF2FC;
|
||||
}
|
||||
|
||||
</style>
|
||||
|
||||
.signature-box {
|
||||
width: 100%;
|
||||
height: 240rpx;
|
||||
background: #f8f8f8;
|
||||
border: 1rpx dashed #dcdfe6;
|
||||
border-radius: 8rpx;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.signature-img {
|
||||
width: 100%;
|
||||
height: 240rpx;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -299,7 +299,7 @@
|
||||
import { ref, reactive, onMounted, computed } from 'vue'
|
||||
import { onShow } from '@dcloudio/uni-app'
|
||||
import { getEnterpriseinfo, addEnterprise, updateEnterprise, getEnterprisetype, getindustry } from '@/request/api.js'
|
||||
import { baseUrl, getToken } from '@/request/request.js'
|
||||
import { createUploadListHandlers, mapServerFileToUploadItem } from '@/utils/upload.js'
|
||||
|
||||
// 企业信息
|
||||
const enterpriseInfo = ref({})
|
||||
@@ -520,11 +520,7 @@ const openEditPopup = () => {
|
||||
if (enterpriseInfo.value.certificates) {
|
||||
try {
|
||||
const certs = JSON.parse(enterpriseInfo.value.certificates)
|
||||
certificateFiles.value = certs.map(cert => ({
|
||||
url: cert.filePath || cert.url,
|
||||
name: cert.fileName || cert.name,
|
||||
status: 'success'
|
||||
}))
|
||||
certificateFiles.value = certs.map((cert) => mapServerFileToUploadItem(cert))
|
||||
} catch (e) {
|
||||
certificateFiles.value = []
|
||||
}
|
||||
@@ -535,60 +531,7 @@ const openEditPopup = () => {
|
||||
showPopup.value = true
|
||||
}
|
||||
|
||||
// 上传文件
|
||||
const afterRead = async (event) => {
|
||||
let lists = [].concat(event.file)
|
||||
let fileListLen = certificateFiles.value.length
|
||||
lists.forEach((item) => {
|
||||
certificateFiles.value.push({
|
||||
...item,
|
||||
status: 'uploading',
|
||||
message: '上传中'
|
||||
})
|
||||
})
|
||||
for (let i = 0; i < lists.length; i++) {
|
||||
const result = await uploadFilePromise(lists[i].url)
|
||||
let item = certificateFiles.value[fileListLen]
|
||||
certificateFiles.value.splice(fileListLen, 1, {
|
||||
...item,
|
||||
status: 'success',
|
||||
message: '',
|
||||
url: result
|
||||
})
|
||||
fileListLen++
|
||||
}
|
||||
}
|
||||
|
||||
// 删除文件
|
||||
const deleteCertificate = (event) => {
|
||||
certificateFiles.value.splice(event.index, 1)
|
||||
}
|
||||
|
||||
// 上传文件Promise
|
||||
const uploadFilePromise = (filePath) => {
|
||||
return new Promise((resolve, reject) => {
|
||||
uni.uploadFile({
|
||||
url: baseUrl + '/frontend/attachment/upload',
|
||||
filePath: filePath,
|
||||
name: 'file',
|
||||
header: {
|
||||
'Authorization': getToken()
|
||||
},
|
||||
success: (res) => {
|
||||
const data = JSON.parse(res.data)
|
||||
if (data.code === 0) {
|
||||
resolve(data.data)
|
||||
} else {
|
||||
reject(data.msg || '上传失败')
|
||||
}
|
||||
},
|
||||
fail: (err) => {
|
||||
console.error('上传失败:', err)
|
||||
reject(err)
|
||||
}
|
||||
})
|
||||
})
|
||||
}
|
||||
const { afterRead, deletePic: deleteCertificate } = createUploadListHandlers(certificateFiles)
|
||||
|
||||
// 提交表单
|
||||
const handleSubmit = async () => {
|
||||
@@ -606,11 +549,12 @@ const handleSubmit = async () => {
|
||||
return
|
||||
}
|
||||
|
||||
// 构建资质证书JSON
|
||||
const certificates = certificateFiles.value.map(file => ({
|
||||
fileName: file.name || file.url.split('/').pop(),
|
||||
filePath: file.url
|
||||
}))
|
||||
const certificates = certificateFiles.value
|
||||
.filter((f) => f.status === 'success')
|
||||
.map((file) => ({
|
||||
fileName: file.name || (file.serverPath || file.url || '').split('/').pop(),
|
||||
filePath: file.serverPath || file.url
|
||||
}))
|
||||
|
||||
const params = {
|
||||
deptId: Number(formData.deptId) || Number(getDeptId()),
|
||||
|
||||
@@ -200,19 +200,28 @@
|
||||
</view>
|
||||
|
||||
<!-- 从检查库添加的检查项卡片 -->
|
||||
<view class="check-card" v-for="(item, index) in checkItems" :key="'lib-' + index">
|
||||
<view class="check-card library-card" v-for="(item, index) in libraryCheckItems" :key="'lib-' + item.pointId">
|
||||
<view class="card-tag library-tag">检查库</view>
|
||||
<view class="check-info">
|
||||
<view class="info-row">
|
||||
<text class="info-label">关联表名：</text>
|
||||
<text class="info-value">{{ item.tableName }}</text>
|
||||
<text class="info-label">来源检查库：</text>
|
||||
<text class="info-value">{{ item.sourceLibraryName || '-' }}</text>
|
||||
</view>
|
||||
<view class="info-row">
|
||||
<text class="info-label">检查项数量：</text>
|
||||
<text class="info-value">{{ item.count }}项</text>
|
||||
<text class="info-label">检查项名称：</text>
|
||||
<text class="info-value">{{ item.name }}</text>
|
||||
</view>
|
||||
<view class="info-row">
|
||||
<text class="info-label">检查内容：</text>
|
||||
<text class="info-value">{{ item.point }}</text>
|
||||
</view>
|
||||
<view class="info-row">
|
||||
<text class="info-label">参考法规：</text>
|
||||
<text class="info-value">{{ item.regulation || '-' }}</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="check-action">
|
||||
<button class="btn-delete" @click="deleteCheckItem(index)">删除</button>
|
||||
<button class="btn-delete" @click="deleteLibraryCheckItem(index)">删除</button>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@@ -647,15 +656,25 @@ const onEndDateConfirm = (e) => {
|
||||
// 手动添加的检查项列表
|
||||
const manualCheckItems = ref([]);
|
||||
|
||||
// 从检查库添加的检查项
|
||||
const checkItems = ref([]);
|
||||
// 从检查库展开添加的检查项（每一条检查点一项）
|
||||
const libraryCheckItems = ref([]);
|
||||
|
||||
// 检查项数量（手动添加的数量 + 检查库的数量）
|
||||
// 检查项数量（手动添加 + 检查库展开项）
|
||||
const checkItemCount = computed(() => {
|
||||
const libraryCount = checkItems.value.reduce((sum, item) => sum + item.count, 0);
|
||||
return manualCheckItems.value.length + libraryCount;
|
||||
return manualCheckItems.value.length + libraryCheckItems.value.length;
|
||||
});
|
||||
|
||||
const getExistingPointIds = () => {
|
||||
const ids = new Set();
|
||||
manualCheckItems.value.forEach((item) => {
|
||||
if (item.id) ids.add(Number(item.id));
|
||||
});
|
||||
libraryCheckItems.value.forEach((item) => {
|
||||
if (item.pointId) ids.add(Number(item.pointId));
|
||||
});
|
||||
return ids;
|
||||
};
|
||||
|
||||
// 删除手动添加的检查项（调用接口删除）
|
||||
const deleteManualCheckItem = (item, index) => {
|
||||
uni.showModal({
|
||||
@@ -691,15 +710,15 @@ const deleteManualCheckItem = (item, index) => {
|
||||
});
|
||||
};
|
||||
|
||||
// 删除检查库中的检查项（只从本地暂存删除，不调用接口）
|
||||
const deleteCheckItem = (index) => {
|
||||
// 删除检查库展开的检查项（只从本地暂存删除，不调用接口）
|
||||
const deleteLibraryCheckItem = (index) => {
|
||||
uni.showModal({
|
||||
title: '提示',
|
||||
content: '确定要删除该检查项吗？',
|
||||
confirmColor: '#F56C6C',
|
||||
success: (res) => {
|
||||
if (res.confirm) {
|
||||
checkItems.value.splice(index, 1);
|
||||
libraryCheckItems.value.splice(index, 1);
|
||||
uni.showToast({ title: '删除成功', icon: 'success' });
|
||||
}
|
||||
}
|
||||
@@ -955,37 +974,92 @@ const toggleLibrarySelect = (item) => {
|
||||
}
|
||||
};
|
||||
|
||||
// 拉取检查库详情全部分页数据
|
||||
const fetchLibraryDetailAll = async (libraryId) => {
|
||||
const pageSize = 50;
|
||||
let pageNum = 1;
|
||||
let allRecords = [];
|
||||
let total = 0;
|
||||
|
||||
while (true) {
|
||||
const res = await getCheckItemListDetail({
|
||||
id: libraryId,
|
||||
pageNum,
|
||||
pageSize
|
||||
});
|
||||
if (res.code !== 0 || !res.data) break;
|
||||
|
||||
const records = res.data.records || [];
|
||||
total = Number(res.data.total) || 0;
|
||||
allRecords = [...allRecords, ...records];
|
||||
|
||||
if (records.length === 0 || allRecords.length >= total) break;
|
||||
pageNum += 1;
|
||||
}
|
||||
|
||||
return allRecords;
|
||||
};
|
||||
|
||||
const getLibraryDisplayName = (libraryId, records) => {
|
||||
const library = libraryList.value.find((item) => String(item.id) === String(libraryId));
|
||||
if (library?.name) return library.name;
|
||||
if (records.length > 0) return records[0].name || '';
|
||||
return '';
|
||||
};
|
||||
|
||||
const appendLibraryRecords = (libraryId, records, sourceLibraryName) => {
|
||||
const existingPointIds = getExistingPointIds();
|
||||
let addedCount = 0;
|
||||
|
||||
records.forEach((record) => {
|
||||
if (!record.pointId) return;
|
||||
const pointId = Number(record.pointId);
|
||||
if (existingPointIds.has(pointId)) return;
|
||||
|
||||
existingPointIds.add(pointId);
|
||||
libraryCheckItems.value.push({
|
||||
pointId,
|
||||
itemId: record.itemId,
|
||||
sourceLibraryId: libraryId,
|
||||
sourceLibraryName,
|
||||
name: record.name || '',
|
||||
point: record.point || '',
|
||||
industry: record.industry || '',
|
||||
leadDept: record.leadDept || '',
|
||||
regulation: record.regulation || ''
|
||||
});
|
||||
addedCount += 1;
|
||||
});
|
||||
|
||||
return addedCount;
|
||||
};
|
||||
|
||||
// 添加选中的检查库
|
||||
const addSelectedLibrary = async () => {
|
||||
if (selectedLibraries.value.length === 0) {
|
||||
uni.showToast({ title: '请选择检查库', icon: 'none' });
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
uni.showLoading({ title: '加载中...' });
|
||||
|
||||
|
||||
try {
|
||||
// 遍历选中的检查库，获取详情
|
||||
let totalAdded = 0;
|
||||
|
||||
for (const id of selectedLibraries.value) {
|
||||
const res = await getCheckItemListDetail({ id: id });
|
||||
if (res.code === 0 && res.data) {
|
||||
const records = res.data.records || [];
|
||||
const total = res.data.total || 0;
|
||||
// 获取关联表名（第一项的name）
|
||||
const tableName = records.length > 0 ? records[0].name : '';
|
||||
|
||||
// 添加到检查项列表
|
||||
checkItems.value.push({
|
||||
itemId: id,
|
||||
tableName: tableName,
|
||||
count: total,
|
||||
details: records // 保存详情数据，以便后续使用
|
||||
});
|
||||
}
|
||||
const records = await fetchLibraryDetailAll(id);
|
||||
const sourceLibraryName = getLibraryDisplayName(id, records);
|
||||
totalAdded += appendLibraryRecords(id, records, sourceLibraryName);
|
||||
}
|
||||
|
||||
|
||||
uni.hideLoading();
|
||||
uni.showToast({ title: '添加成功', icon: 'success' });
|
||||
|
||||
if (totalAdded === 0) {
|
||||
uni.showToast({ title: '没有可添加的新检查项', icon: 'none' });
|
||||
return;
|
||||
}
|
||||
|
||||
uni.showToast({ title: `已添加${totalAdded}项`, icon: 'success' });
|
||||
showLibraryPopup.value = false;
|
||||
selectedLibraries.value = [];
|
||||
} catch (error) {
|
||||
@@ -1032,22 +1106,16 @@ const handleSave = async () => {
|
||||
return;
|
||||
}
|
||||
|
||||
// 构建 items 数组（关联检查项id列表）
|
||||
// 构建 checkPointIds 数组（检查点 id 列表）
|
||||
const items = [];
|
||||
// 添加手动添加的检查项id
|
||||
manualCheckItems.value.forEach(item => {
|
||||
manualCheckItems.value.forEach((item) => {
|
||||
if (item.id) {
|
||||
items.push(item.id );
|
||||
items.push(Number(item.id));
|
||||
}
|
||||
});
|
||||
// 添加从检查库选择的检查项详情中的所有项的 itemId
|
||||
checkItems.value.forEach(lib => {
|
||||
if (lib.details && lib.details.length > 0) {
|
||||
lib.details.forEach(detail => {
|
||||
if (detail.itemId) {
|
||||
items.push(detail.itemId);
|
||||
}
|
||||
});
|
||||
libraryCheckItems.value.forEach((item) => {
|
||||
if (item.pointId) {
|
||||
items.push(Number(item.pointId));
|
||||
}
|
||||
});
|
||||
|
||||
@@ -1070,13 +1138,13 @@ const handleSave = async () => {
|
||||
'每季度一次': 4
|
||||
};
|
||||
|
||||
// 构建 itemIds 数组（从检查库选择的检查库id列表）
|
||||
const itemIds = [];
|
||||
checkItems.value.forEach(lib => {
|
||||
if (lib.itemId) {
|
||||
itemIds.push(lib.itemId);
|
||||
}
|
||||
});
|
||||
// 构建 itemIds 数组（从检查库选择的检查库 id 列表，去重）
|
||||
const itemIds = [...new Set(
|
||||
libraryCheckItems.value
|
||||
.map((item) => item.sourceLibraryId)
|
||||
.filter(Boolean)
|
||||
.map((id) => Number(id))
|
||||
)];
|
||||
|
||||
// 构建提交参数
|
||||
const params = {
|
||||
@@ -1271,7 +1339,8 @@ onMounted(() => {
|
||||
}
|
||||
|
||||
// 手动添加的检查项卡片（带第x项标签）
|
||||
.manual-card {
|
||||
.manual-card,
|
||||
.library-card {
|
||||
padding-top: 50rpx;
|
||||
|
||||
.card-tag {
|
||||
@@ -1286,6 +1355,10 @@ onMounted(() => {
|
||||
}
|
||||
}
|
||||
|
||||
.library-card .library-tag {
|
||||
background: #67C23A;
|
||||
}
|
||||
|
||||
// 添加按钮组
|
||||
.add-btns {
|
||||
display: flex;
|
||||
|
||||
@@ -59,6 +59,7 @@
|
||||
ref,
|
||||
reactive
|
||||
} from 'vue';
|
||||
import { createUploadListHandlers } from '@/utils/upload.js';
|
||||
|
||||
// 基本案列数据
|
||||
const radiolist1 = reactive([{
|
||||
@@ -90,14 +91,8 @@
|
||||
console.log('radioChange', n);
|
||||
};
|
||||
|
||||
// 图片上传
|
||||
const fileList1 = ref([]);
|
||||
const afterRead = (event) => {
|
||||
console.log(event);
|
||||
};
|
||||
const deletePic = (event) => {
|
||||
console.log(event);
|
||||
};
|
||||
const { afterRead, deletePic } = createUploadListHandlers(fileList1);
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
|
||||
@@ -61,7 +61,7 @@
|
||||
</view>
|
||||
|
||||
<!-- 新增弹窗 -->
|
||||
<u-popup :show="showAddPopup" mode="center" round="20" @close="showAddPopup = false">
|
||||
<u-popup :show="showAddPopup" mode="center" round="20" :safe-area-inset-bottom="false" @close="showAddPopup = false">
|
||||
<view class="popup-content">
|
||||
<view class="popup-header">
|
||||
<view class="popup-title text-bold">新增隐患排查</view>
|
||||
@@ -69,6 +69,20 @@
|
||||
</view>
|
||||
<scroll-view class="popup-body" scroll-y>
|
||||
<view class="flex margin-bottom">
|
||||
<view class="text-gray">检查形式</view>
|
||||
<view class="text-red">*</view>
|
||||
</view>
|
||||
<view class="source-choose-scroll">
|
||||
<up-choose
|
||||
v-model="formData.source"
|
||||
:options="sourceOptions"
|
||||
:wrap="false"
|
||||
item-width="152rpx"
|
||||
item-height="64rpx"
|
||||
></up-choose>
|
||||
</view>
|
||||
<!-- <view class="text-gray text-sm margin-top-xs">左右滑动可查看更多来源</view> -->
|
||||
<view class="flex margin-bottom margin-top">
|
||||
<view class="text-gray">隐患图片</view>
|
||||
<view class="text-red">*</view>
|
||||
</view>
|
||||
@@ -101,12 +115,6 @@
|
||||
item-width="183rpx"
|
||||
item-height="72rpx"
|
||||
></up-choose>
|
||||
<view class="flex margin-bottom margin-top">
|
||||
<view class="text-gray">隐患来源</view>
|
||||
<view class="text-red">*</view>
|
||||
</view>
|
||||
<up-choose v-model="formData.source" :options="sourceOptions" :wrap="false" item-width="183rpx"
|
||||
item-height="72rpx"></up-choose>
|
||||
<view class="flex margin-bottom margin-top">
|
||||
<view class="text-gray">隐患位置</view>
|
||||
<view class="text-red">*</view>
|
||||
@@ -158,7 +166,7 @@
|
||||
</u-popup>
|
||||
|
||||
<!-- 选择法规弹出框 -->
|
||||
<u-popup :show="showLawPopup" mode="center" round="20" @close="showLawPopup = false">
|
||||
<u-popup :show="showLawPopup" mode="center" round="20" :safe-area-inset-bottom="false" @close="showLawPopup = false">
|
||||
<view class="law-popup">
|
||||
<view class="popup-header">
|
||||
<view class="popup-title">选择法律依据</view>
|
||||
@@ -249,13 +257,8 @@
|
||||
analyzeHazardImage
|
||||
} from '@/request/api.js'
|
||||
import { getAreaList } from '@/request/three_one_api/area.js'
|
||||
import { addTimestampWatermark } from '@/utils/watermark.js'
|
||||
import {
|
||||
baseUrl,
|
||||
getToken,
|
||||
toImageUrl,
|
||||
imageBaseUrl
|
||||
} from '@/request/request.js'
|
||||
import { toImageUrl } from '@/request/request.js'
|
||||
import { createUploadListHandlers, buildAttachmentItem } from '@/utils/upload.js'
|
||||
|
||||
// 弹窗控制
|
||||
const showAddPopup = ref(false);
|
||||
@@ -533,16 +536,9 @@
|
||||
return;
|
||||
}
|
||||
|
||||
const attachments = fileList1.value.map(file => {
|
||||
const path = file.serverPath || '';
|
||||
const fileName = path ? path.split('/').pop() : (file.name || '');
|
||||
return {
|
||||
fileName: fileName || '',
|
||||
filePath: path,
|
||||
fileType: file.type || 'image/png',
|
||||
fileSize: file.size || 0
|
||||
};
|
||||
});
|
||||
const attachments = fileList1.value
|
||||
.filter((f) => f.status === 'success')
|
||||
.map((file) => buildAttachmentItem(file));
|
||||
|
||||
// 获取隐患标签ID
|
||||
const selectedTag = tagOptions.value[formData.tagIndex];
|
||||
@@ -640,9 +636,11 @@
|
||||
})
|
||||
}
|
||||
const Rectification = (item) => {
|
||||
uni.navigateTo({
|
||||
url: `/pages/hiddendanger/rectification?hazardId=${item.hazardId}&assignId=${item.assignId}`
|
||||
})
|
||||
let url = `/pages/hiddendanger/rectification?hazardId=${item.hazardId}&assignId=${item.assignId}`
|
||||
if (item.deadline) {
|
||||
url += `&deadline=${encodeURIComponent(item.deadline)}`
|
||||
}
|
||||
uni.navigateTo({ url })
|
||||
}
|
||||
|
||||
// 编辑整改信息（待验收状态）
|
||||
@@ -664,77 +662,15 @@
|
||||
})
|
||||
}
|
||||
const fileList1 = ref([]);
|
||||
|
||||
// 删除图片
|
||||
const deletePic = (event) => {
|
||||
fileList1.value.splice(event.index, 1);
|
||||
};
|
||||
|
||||
// 新增图片
|
||||
const afterRead = async (event) => {
|
||||
// 当设置 mutiple 为 true 时, file 为数组格式，否则为对象格式
|
||||
let lists = [].concat(event.file);
|
||||
let fileListLen = fileList1.value.length;
|
||||
lists.map((item) => {
|
||||
fileList1.value.push({
|
||||
...item,
|
||||
status: 'uploading',
|
||||
message: '上传中',
|
||||
});
|
||||
});
|
||||
for (let i = 0; i < lists.length; i++) {
|
||||
let watermarkedUrl = lists[i].url;
|
||||
try {
|
||||
const instance = getCurrentInstance();
|
||||
watermarkedUrl = await addTimestampWatermark({
|
||||
tempFilePath: lists[i].url,
|
||||
canvasId: 'watermarkCanvas',
|
||||
canvasWidthRef: canvasWidth,
|
||||
canvasHeightRef: canvasHeight,
|
||||
instance
|
||||
});
|
||||
} catch (e) {
|
||||
console.error('加水印失败，将使用原图上传:', e);
|
||||
}
|
||||
const result = await uploadFilePromise(watermarkedUrl);
|
||||
let item = fileList1.value[fileListLen];
|
||||
const serverPath = typeof result === 'string' ? result : (result?.url || result?.path || '');
|
||||
fileList1.value.splice(fileListLen, 1, {
|
||||
...item,
|
||||
status: 'success',
|
||||
message: '',
|
||||
// url: baseUrl + serverPath,
|
||||
url: toImageUrl(serverPath),
|
||||
serverPath: serverPath,
|
||||
});
|
||||
fileListLen++;
|
||||
const uploadInstance = getCurrentInstance();
|
||||
const { afterRead, deletePic } = createUploadListHandlers(fileList1, {
|
||||
watermark: {
|
||||
canvasId: 'watermarkCanvas',
|
||||
canvasWidthRef: canvasWidth,
|
||||
canvasHeightRef: canvasHeight,
|
||||
instance: uploadInstance
|
||||
}
|
||||
};
|
||||
|
||||
const uploadFilePromise = (filePath) => {
|
||||
return new Promise((resolve, reject) => {
|
||||
uni.uploadFile({
|
||||
url: baseUrl + '/frontend/attachment/upload',
|
||||
filePath: filePath,
|
||||
name: 'file',
|
||||
header: {
|
||||
'Authorization': getToken()
|
||||
},
|
||||
success: (res) => {
|
||||
const data = JSON.parse(res.data);
|
||||
if (data.code === 0) {
|
||||
resolve(data.data);
|
||||
} else {
|
||||
reject(data.msg || '上传失败');
|
||||
}
|
||||
},
|
||||
fail: (err) => {
|
||||
console.error('上传失败:', err);
|
||||
reject(err);
|
||||
}
|
||||
});
|
||||
});
|
||||
};
|
||||
});
|
||||
|
||||
// AI 识别隐患
|
||||
const aiAnalyzing = ref(false);
|
||||
@@ -833,19 +769,19 @@
|
||||
//隐患来源
|
||||
const sourceOptions = ref([{
|
||||
id: 1,
|
||||
title: '随手拍'
|
||||
title: '部门检查'
|
||||
},
|
||||
{
|
||||
id: 2,
|
||||
title: '企业自查'
|
||||
title: '都导检查'
|
||||
},
|
||||
{
|
||||
id: 3,
|
||||
title: '行业互查'
|
||||
title: '企业自查'
|
||||
},
|
||||
{
|
||||
id: 4,
|
||||
title: '专家诊查'
|
||||
title: '行业互查'
|
||||
}
|
||||
])
|
||||
|
||||
@@ -1013,6 +949,43 @@
|
||||
overflow-y: auto;
|
||||
}
|
||||
|
||||
// 检查形式横向滚动，露出第 4 项一角提示可滑动
|
||||
.source-choose-scroll {
|
||||
width: 100%;
|
||||
overflow: hidden;
|
||||
|
||||
:deep(.up-choose) {
|
||||
width: 100%;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
:deep(.u-tag-wrapper) {
|
||||
margin-right: 12rpx;
|
||||
}
|
||||
|
||||
:deep(.u-tag) {
|
||||
display: flex !important;
|
||||
align-items: center !important;
|
||||
justify-content: center !important;
|
||||
box-sizing: border-box;
|
||||
padding: 0 8rpx !important;
|
||||
line-height: normal !important;
|
||||
}
|
||||
|
||||
:deep(.u-tag__content) {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
flex: 1;
|
||||
}
|
||||
|
||||
:deep(.u-tag__text) {
|
||||
font-size: 24rpx !important;
|
||||
line-height: 1.3 !important;
|
||||
text-align: center;
|
||||
}
|
||||
}
|
||||
|
||||
.popup-footer {
|
||||
display: flex;
|
||||
border-top: 1rpx solid #eee;
|
||||
|
||||
@@ -8,9 +8,33 @@
|
||||
<view style="word-break: break-all; line-height: 1.6; color: #333;">{{ rectifyData.rectifyPlan || '暂无' }}</view>
|
||||
</view>
|
||||
<view class="margin-top">
|
||||
<view style="color: #999; margin-bottom: 10rpx;">完成情况：</view>
|
||||
<view style="color: #999; margin-bottom: 10rpx;">整改措施：</view>
|
||||
<view style="word-break: break-all; line-height: 1.6; color: #333;">{{ rectifyData.rectificationMeasures || '暂无' }}</view>
|
||||
</view>
|
||||
<view class="margin-top">
|
||||
<view style="color: #999; margin-bottom: 10rpx;">管控措施：</view>
|
||||
<view style="word-break: break-all; line-height: 1.6; color: #333;">{{ rectifyData.controlMeasures || '暂无' }}</view>
|
||||
</view>
|
||||
<view class="margin-top">
|
||||
<view style="color: #999; margin-bottom: 10rpx;">整改完成情况：</view>
|
||||
<view style="word-break: break-all; line-height: 1.6; color: #333;">{{ rectifyData.rectifyResult || '暂无' }}</view>
|
||||
</view>
|
||||
<view class="margin-top">
|
||||
<view style="color: #999; margin-bottom: 10rpx;">计划投资资金：</view>
|
||||
<view style="word-break: break-all; line-height: 1.6; color: #333;">{{ formatMoney(rectifyData.planCost) }}</view>
|
||||
</view>
|
||||
<view class="margin-top">
|
||||
<view style="color: #999; margin-bottom: 10rpx;">实际投资资金：</view>
|
||||
<view style="word-break: break-all; line-height: 1.6; color: #333;">{{ formatMoney(rectifyData.actualCost) }}</view>
|
||||
</view>
|
||||
<view class="margin-top">
|
||||
<view style="color: #999; margin-bottom: 10rpx;">整改责任人：</view>
|
||||
<view style="word-break: break-all; line-height: 1.6; color: #333;">{{ rectifyData.rectifierName || '暂无' }}</view>
|
||||
</view>
|
||||
<view class="margin-top">
|
||||
<view style="color: #999; margin-bottom: 10rpx;">完成情况：</view>
|
||||
<view style="word-break: break-all; line-height: 1.6; color: #333;">{{ rectifyData.rectifyStatusName || '暂无' }}</view>
|
||||
</view>
|
||||
<view class="margin-top-sm">
|
||||
<view>整改附件：</view>
|
||||
<view class="flex margin-top-xs" style="flex-wrap: wrap; gap: 10rpx;" v-if="rectifyAttachments.length > 0">
|
||||
@@ -84,8 +108,12 @@
|
||||
import { ref, reactive, watch, nextTick, getCurrentInstance } from 'vue';
|
||||
import { onLoad } from '@dcloudio/uni-app';
|
||||
import { acceptanceRectification, getHiddenDangerDetail } from '@/request/api.js';
|
||||
import { baseUrl, getToken, toImageUrl, imageBaseUrl } from '@/request/request.js';
|
||||
import { addTimestampWatermark } from '@/utils/watermark.js';
|
||||
import { toImageUrl } from '@/request/request.js';
|
||||
import {
|
||||
createUploadListHandlers,
|
||||
buildAttachmentItem,
|
||||
uploadToCloud
|
||||
} from '@/utils/upload.js';
|
||||
|
||||
// 页面参数
|
||||
const rectifyId = ref('');
|
||||
@@ -95,9 +123,26 @@
|
||||
// 整改记录数据
|
||||
const rectifyData = reactive({
|
||||
rectifyPlan: '',
|
||||
rectifyResult: ''
|
||||
rectificationMeasures: '',
|
||||
controlMeasures: '',
|
||||
rectifyResult: '',
|
||||
planCost: null,
|
||||
actualCost: null,
|
||||
rectifierName: '',
|
||||
rectifyStatusName: ''
|
||||
});
|
||||
|
||||
const formatMoney = (value) => {
|
||||
if (value === null || value === undefined || value === '') {
|
||||
return '暂无';
|
||||
}
|
||||
const num = Number(value);
|
||||
if (Number.isNaN(num)) {
|
||||
return '暂无';
|
||||
}
|
||||
return `${num.toFixed(2)} 元`;
|
||||
};
|
||||
|
||||
// 整改附件
|
||||
const rectifyAttachments = ref([]);
|
||||
|
||||
@@ -148,25 +193,52 @@
|
||||
});
|
||||
};
|
||||
|
||||
// 从 assigns 中找到包含整改记录的那一项
|
||||
const resolveAssignWithRectify = (assigns) => {
|
||||
if (!assigns?.length) return null;
|
||||
if (rectifyId.value) {
|
||||
const byRectifyId = assigns.find(
|
||||
(item) => item.rectify && String(item.rectify.rectifyId) === String(rectifyId.value)
|
||||
);
|
||||
if (byRectifyId) return byRectifyId;
|
||||
}
|
||||
if (assignId.value) {
|
||||
const byAssignId = assigns.find(
|
||||
(item) => String(item.assignId) === String(assignId.value) && item.rectify
|
||||
);
|
||||
if (byAssignId) return byAssignId;
|
||||
}
|
||||
return assigns.find((item) => item.rectify) || null;
|
||||
};
|
||||
|
||||
const applyRectifyData = (rectify) => {
|
||||
if (!rectify) return;
|
||||
rectifyData.rectifyPlan = rectify.rectifyPlan || '';
|
||||
rectifyData.rectificationMeasures = rectify.rectificationMeasures || '';
|
||||
rectifyData.controlMeasures = rectify.controlMeasures || '';
|
||||
rectifyData.rectifyResult = rectify.rectifyResult || '';
|
||||
rectifyData.planCost = rectify.planCost ?? null;
|
||||
rectifyData.actualCost = rectify.actualCost ?? null;
|
||||
rectifyData.rectifierName = rectify.rectifierName || '';
|
||||
rectifyData.rectifyStatusName = rectify.rectifyStatusName || '';
|
||||
rectifyAttachments.value = rectify.attachments || [];
|
||||
};
|
||||
|
||||
// 获取隐患详情
|
||||
const fetchDetail = async () => {
|
||||
if (!hazardId.value || !assignId.value) return;
|
||||
|
||||
if (!hazardId.value) return;
|
||||
|
||||
try {
|
||||
const res = await getHiddenDangerDetail({ hazardId: hazardId.value, assignId: assignId.value });
|
||||
const res = await getHiddenDangerDetail({
|
||||
hazardId: hazardId.value,
|
||||
assignId: assignId.value
|
||||
});
|
||||
if (res.code === 0 && res.data) {
|
||||
// 提取整改信息：assigns[0].rectify
|
||||
if (res.data.assigns && res.data.assigns.length > 0) {
|
||||
const assign = res.data.assigns[0];
|
||||
if (assign.rectify) {
|
||||
rectifyData.rectifyPlan = assign.rectify.rectifyPlan || '';
|
||||
rectifyData.rectifyResult = assign.rectify.rectifyResult || '';
|
||||
if (assign.rectify.attachments) {
|
||||
rectifyAttachments.value = assign.rectify.attachments;
|
||||
}
|
||||
console.log('整改记录:', rectifyData);
|
||||
console.log('整改附件:', rectifyAttachments.value);
|
||||
}
|
||||
const assign = resolveAssignWithRectify(res.data.assigns);
|
||||
if (assign?.rectify) {
|
||||
applyRectifyData(assign.rectify);
|
||||
console.log('整改记录:', rectifyData);
|
||||
console.log('整改附件:', rectifyAttachments.value);
|
||||
}
|
||||
} else {
|
||||
uni.showToast({ title: res.msg || '获取详情失败', icon: 'none' });
|
||||
@@ -176,23 +248,7 @@
|
||||
uni.showToast({ title: '请求失败', icon: 'none' });
|
||||
}
|
||||
};
|
||||
|
||||
onLoad((options) => {
|
||||
if (options.rectifyId) {
|
||||
rectifyId.value = options.rectifyId;
|
||||
}
|
||||
if (options.hazardId) {
|
||||
hazardId.value = options.hazardId;
|
||||
}
|
||||
if (options.assignId) {
|
||||
assignId.value = options.assignId;
|
||||
}
|
||||
console.log('验收页面参数:', { rectifyId: rectifyId.value, hazardId: hazardId.value, assignId: assignId.value });
|
||||
|
||||
// 获取隐患详情
|
||||
fetchDetail();
|
||||
});
|
||||
|
||||
|
||||
// 取消
|
||||
const handleCancel = () => {
|
||||
uni.navigateBack();
|
||||
@@ -240,25 +296,9 @@
|
||||
// 真正调取后台接口提交验收
|
||||
const executeSubmit = async () => {
|
||||
// 构建附件列表
|
||||
const attachments = fileList1.value.map(file => {
|
||||
let url = '';
|
||||
if (typeof file.url === 'string') {
|
||||
url = file.url;
|
||||
} else if (file.url && typeof file.url === 'object') {
|
||||
url = file.url.url || file.url.path || '';
|
||||
}
|
||||
// 将预览绝对路径还原为服务端相对路径，避免后端保存带域名的绝对地址
|
||||
if (typeof url === 'string' && url.startsWith('http')) {
|
||||
url = url.replace(imageBaseUrl, '');
|
||||
}
|
||||
const fileName = (typeof url === 'string' && url) ? url.split('/').pop() : (file.name || '');
|
||||
return {
|
||||
fileName: fileName || '',
|
||||
filePath: url || '',
|
||||
fileType: file.type || 'image/png',
|
||||
fileSize: file.size || 0
|
||||
};
|
||||
});
|
||||
const attachments = fileList1.value
|
||||
.filter((f) => f.status === 'success')
|
||||
.map((file) => buildAttachmentItem(file));
|
||||
|
||||
const params = {
|
||||
rectifyId: Number(rectifyId.value),
|
||||
@@ -300,91 +340,15 @@
|
||||
}
|
||||
};
|
||||
|
||||
// 删除图片
|
||||
const deletePic = (event) => {
|
||||
fileList1.value.splice(event.index, 1);
|
||||
};
|
||||
|
||||
// 新增图片
|
||||
/**
|
||||
* 在前端为图片进行实时渲染，添加当前系统时间戳水印（防作弊）
|
||||
* @param {string} tempFilePath 原始选择的图片临时路径
|
||||
* @returns {Promise<string>} 渲染后的带水印图片临时文件路径
|
||||
*/
|
||||
const addWatermark = (tempFilePath) => {
|
||||
const instance = getCurrentInstance();
|
||||
return addTimestampWatermark({
|
||||
tempFilePath,
|
||||
const acceptUploadInstance = getCurrentInstance();
|
||||
const { afterRead, deletePic } = createUploadListHandlers(fileList1, {
|
||||
watermark: {
|
||||
canvasId: 'watermarkCanvas',
|
||||
canvasWidthRef: canvasWidth,
|
||||
canvasHeightRef: canvasHeight,
|
||||
instance
|
||||
});
|
||||
};
|
||||
|
||||
// 新增图片（自动加入实时前端水印渲染防作弊功能）
|
||||
const afterRead = async (event) => {
|
||||
let lists = [].concat(event.file);
|
||||
let fileListLen = fileList1.value.length;
|
||||
lists.map((item) => {
|
||||
fileList1.value.push({
|
||||
...item,
|
||||
status: 'uploading',
|
||||
message: '处理中...',
|
||||
});
|
||||
});
|
||||
for (let i = 0; i < lists.length; i++) {
|
||||
try {
|
||||
// 1. 进行前端实时渲染绘制水印，得到新图片临时路径
|
||||
const watermarkedUrl = await addWatermark(lists[i].url);
|
||||
|
||||
// 2. 将加完水印的新图片进行服务器上传
|
||||
const result = await uploadFilePromise(watermarkedUrl);
|
||||
|
||||
let item = fileList1.value[fileListLen];
|
||||
fileList1.value.splice(fileListLen, 1, {
|
||||
...item,
|
||||
status: 'success',
|
||||
message: '',
|
||||
url: toImageUrl(result.url || result.filePath || result),
|
||||
});
|
||||
} catch (e) {
|
||||
console.error('加水印或上传失败:', e);
|
||||
let item = fileList1.value[fileListLen];
|
||||
fileList1.value.splice(fileListLen, 1, {
|
||||
...item,
|
||||
status: 'failed',
|
||||
message: '处理失败',
|
||||
});
|
||||
}
|
||||
fileListLen++;
|
||||
}
|
||||
};
|
||||
|
||||
const uploadFilePromise = (filePath) => {
|
||||
return new Promise((resolve, reject) => {
|
||||
uni.uploadFile({
|
||||
url: baseUrl + '/frontend/attachment/upload',
|
||||
filePath: filePath,
|
||||
name: 'file',
|
||||
header: {
|
||||
'Authorization': getToken()
|
||||
},
|
||||
success: (res) => {
|
||||
const data = JSON.parse(res.data);
|
||||
if (data.code === 0) {
|
||||
resolve(data.data);
|
||||
} else {
|
||||
reject(data.msg || '上传失败');
|
||||
}
|
||||
},
|
||||
fail: (err) => {
|
||||
console.error('上传失败:', err);
|
||||
reject(err);
|
||||
}
|
||||
});
|
||||
});
|
||||
};
|
||||
instance: acceptUploadInstance
|
||||
}
|
||||
});
|
||||
|
||||
// 电子签名画布手写线条变动回调
|
||||
const onSignatureChange = () => {
|
||||
@@ -557,13 +521,12 @@
|
||||
// 签名导出成功回调
|
||||
const onSignatureConfirm = async (tempFilePath) => {
|
||||
try {
|
||||
// 上传签名
|
||||
const res = await uploadFilePromise(tempFilePath);
|
||||
// 兼容后端返回对象或者单纯字符串路径
|
||||
const path = (res && typeof res === 'object') ? (res.url || res.filePath || '') : (res || '');
|
||||
signatureServerPath.value = path;
|
||||
signatureUrl.value = path.startsWith('http') ? path : (baseUrl.replace('/api', '') + path);
|
||||
|
||||
const { url } = await uploadToCloud(tempFilePath);
|
||||
signatureServerPath.value = url;
|
||||
signatureUrl.value = url;
|
||||
showCanvas.value = false;
|
||||
isSignatureEmpty.value = false;
|
||||
|
||||
if (isSubmitting.value) {
|
||||
await executeSubmit();
|
||||
}
|
||||
|
||||
@@ -10,19 +10,61 @@
|
||||
<text class="text-blue text-bold" style="cursor: pointer; padding: 0 10rpx; color: #2667E9; font-weight: bold;" @click="clearDraft(true)">清空草稿</text>
|
||||
</view>
|
||||
<view class="flex margin-bottom">
|
||||
<view class="text-gray">整改人员</view>
|
||||
<view class="text-gray">整改责任人</view>
|
||||
<view class="text-red">*</view>
|
||||
</view>
|
||||
<view class="picker-input" @click="showUserPicker = true">
|
||||
<text :class="selectedUser ? '' : 'text-gray'">{{ selectedUser || '请选择整改人员' }}</text>
|
||||
<view class="select-trigger" @click="openUserPopup">
|
||||
<view class="select-content" :class="{ 'text-gray': !selectedUser }">
|
||||
{{ selectedUser || '请选择整改责任人' }}
|
||||
</view>
|
||||
<text class="cuIcon-unfold"></text>
|
||||
</view>
|
||||
<up-picker
|
||||
:show="showUserPicker"
|
||||
:columns="userColumns"
|
||||
@confirm="onUserConfirm"
|
||||
@cancel="showUserPicker = false"
|
||||
@close="showUserPicker = false"
|
||||
></up-picker>
|
||||
|
||||
<!-- 整改责任人：部门-人员级联单选弹窗 -->
|
||||
<u-popup :show="showUserPopup" mode="bottom" round="20" @close="cancelUserSelect">
|
||||
<view class="user-popup cascader-user-popup">
|
||||
<view class="popup-header">
|
||||
<view class="popup-title text-bold">选择整改责任人</view>
|
||||
<view class="popup-close" @click="cancelUserSelect">×</view>
|
||||
</view>
|
||||
<view v-if="userPickerSelectedId" class="selected-summary">
|
||||
<text class="summary-label">已选：</text>
|
||||
<text class="summary-text">{{ userPickerSelectedText }}</text>
|
||||
</view>
|
||||
<view class="cascader-body">
|
||||
<scroll-view class="cascader-col dept-col" scroll-y>
|
||||
<view
|
||||
v-for="(dept, index) in deptList"
|
||||
:key="dept.deptId"
|
||||
:class="['cascader-item', { active: activeDeptIndex === index }]"
|
||||
@click="activeDeptIndex = index"
|
||||
>
|
||||
<text class="cascader-item-text">{{ dept.deptName }}</text>
|
||||
<text v-if="deptHasSelectedUser(dept)" class="dept-dot"></text>
|
||||
</view>
|
||||
</scroll-view>
|
||||
<scroll-view class="cascader-col user-col" scroll-y :key="'dept-users-' + activeDeptIndex">
|
||||
<view v-if="currentDeptUsers.length === 0" class="empty-tip">该部门暂无人员</view>
|
||||
<view v-else>
|
||||
<view
|
||||
class="user-item"
|
||||
v-for="user in currentDeptUsers"
|
||||
:key="'user-' + user.userId"
|
||||
:class="{ active: String(userPickerSelectedId) === String(user.userId) }"
|
||||
@click="onUserItemClick(user.userId)"
|
||||
>
|
||||
<text class="user-item-text">{{ formatUserDisplayName(user) }}</text>
|
||||
<text v-if="String(userPickerSelectedId) === String(user.userId)" class="cuIcon-check text-blue"></text>
|
||||
</view>
|
||||
</view>
|
||||
</scroll-view>
|
||||
</view>
|
||||
<view class="popup-footer">
|
||||
<button class="btn-cancel" @click="cancelUserSelect">取消</button>
|
||||
<button class="btn-confirm bg-blue" @click="confirmUserSelect">确定</button>
|
||||
</view>
|
||||
</view>
|
||||
</u-popup>
|
||||
|
||||
<view class="flex margin-bottom margin-top">
|
||||
<view class="text-gray">整改期限</view>
|
||||
@@ -49,7 +91,7 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { ref, reactive, watch, nextTick } from 'vue';
|
||||
import { ref, computed, watch, nextTick } from 'vue';
|
||||
import { onLoad } from '@dcloudio/uni-app';
|
||||
import { getDepartmentPersonUsers,assignHiddenDanger } from '@/request/api.js';
|
||||
|
||||
@@ -58,11 +100,63 @@
|
||||
const assignId = ref('');
|
||||
|
||||
// 整改人员选择
|
||||
const showUserPicker = ref(false);
|
||||
const showUserPopup = ref(false);
|
||||
const selectedUser = ref('');
|
||||
const selectedUserId = ref('');
|
||||
const userColumns = ref([['暂无数据']]);
|
||||
const userList = ref([]); // 存储完整用户数据
|
||||
const deptList = ref([]);
|
||||
const activeDeptIndex = ref(0);
|
||||
const userPickerSelectedId = ref('');
|
||||
|
||||
const formatUserDisplayName = (user) => {
|
||||
if (user.postName) {
|
||||
return `${user.nickName}_${user.postName}`;
|
||||
}
|
||||
return user.nickName || '';
|
||||
};
|
||||
|
||||
const currentDeptUsers = computed(() => {
|
||||
const dept = deptList.value[activeDeptIndex.value];
|
||||
return dept?.users || [];
|
||||
});
|
||||
|
||||
const userPickerSelectedText = computed(() => {
|
||||
if (!userPickerSelectedId.value) return '';
|
||||
for (const dept of deptList.value) {
|
||||
const user = (dept.users || []).find((u) => String(u.userId) === String(userPickerSelectedId.value));
|
||||
if (user) return formatUserDisplayName(user);
|
||||
}
|
||||
return '';
|
||||
});
|
||||
|
||||
const deptHasSelectedUser = (dept) => {
|
||||
if (!userPickerSelectedId.value || !dept.users?.length) return false;
|
||||
return dept.users.some((user) => String(user.userId) === String(userPickerSelectedId.value));
|
||||
};
|
||||
|
||||
const onUserItemClick = (userId) => {
|
||||
userPickerSelectedId.value = String(userId);
|
||||
};
|
||||
|
||||
const openUserPopup = () => {
|
||||
userPickerSelectedId.value = selectedUserId.value;
|
||||
const firstDeptWithUsers = deptList.value.findIndex((dept) => dept.users?.length > 0);
|
||||
activeDeptIndex.value = firstDeptWithUsers >= 0 ? firstDeptWithUsers : 0;
|
||||
showUserPopup.value = true;
|
||||
};
|
||||
|
||||
const cancelUserSelect = () => {
|
||||
showUserPopup.value = false;
|
||||
};
|
||||
|
||||
const confirmUserSelect = () => {
|
||||
if (!userPickerSelectedId.value) {
|
||||
uni.showToast({ title: '请选择整改责任人', icon: 'none' });
|
||||
return;
|
||||
}
|
||||
selectedUserId.value = String(userPickerSelectedId.value);
|
||||
selectedUser.value = userPickerSelectedText.value;
|
||||
showUserPopup.value = false;
|
||||
};
|
||||
|
||||
// 整改期限选择
|
||||
const showDatePicker = ref(false);
|
||||
@@ -74,41 +168,14 @@
|
||||
try {
|
||||
const res = await getDepartmentPersonUsers();
|
||||
if (res.code === 0 && res.data) {
|
||||
const users = [];
|
||||
res.data.forEach(dept => {
|
||||
if (dept.users && dept.users.length > 0) {
|
||||
dept.users.forEach(user => {
|
||||
users.push({
|
||||
id: String(user.userId),
|
||||
name: `${user.nickName}（${dept.deptName}）`
|
||||
});
|
||||
});
|
||||
}
|
||||
});
|
||||
userList.value = users;
|
||||
// 转换为 picker 需要的格式
|
||||
userColumns.value = [users.map(u => u.name)];
|
||||
console.log('整改人员列表:', users);
|
||||
deptList.value = res.data;
|
||||
console.log('部门人员树:', deptList.value);
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('获取部门人员失败:', error);
|
||||
}
|
||||
};
|
||||
|
||||
// 人员选择确认
|
||||
const onUserConfirm = (e) => {
|
||||
console.log('选择的人员:', e);
|
||||
if (e.value && e.value.length > 0) {
|
||||
selectedUser.value = e.value[0];
|
||||
// 找到对应的用户ID
|
||||
const user = userList.value.find(u => u.name === e.value[0]);
|
||||
if (user) {
|
||||
selectedUserId.value = user.id;
|
||||
}
|
||||
}
|
||||
showUserPicker.value = false;
|
||||
};
|
||||
|
||||
// 日期时间选择确认
|
||||
const onDateConfirm = (e) => {
|
||||
console.log('选择的日期时间:', e);
|
||||
@@ -280,6 +347,194 @@
|
||||
color: #333;
|
||||
}
|
||||
}
|
||||
|
||||
.select-trigger {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
background: #fff;
|
||||
border: 1rpx solid #dcdfe6;
|
||||
border-radius: 8rpx;
|
||||
padding: 20rpx 24rpx;
|
||||
margin-bottom: 20rpx;
|
||||
|
||||
.select-content {
|
||||
flex: 1;
|
||||
font-size: 28rpx;
|
||||
color: #333;
|
||||
}
|
||||
}
|
||||
|
||||
.user-popup {
|
||||
background: #fff;
|
||||
|
||||
.popup-header {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
padding: 30rpx;
|
||||
border-bottom: 1rpx solid #eee;
|
||||
|
||||
.popup-title {
|
||||
font-size: 32rpx;
|
||||
color: #333;
|
||||
}
|
||||
|
||||
.popup-close {
|
||||
font-size: 40rpx;
|
||||
color: #999;
|
||||
line-height: 1;
|
||||
}
|
||||
}
|
||||
|
||||
&.cascader-user-popup {
|
||||
.selected-summary {
|
||||
padding: 16rpx 30rpx;
|
||||
background: #f5f7fa;
|
||||
border-bottom: 1rpx solid #eee;
|
||||
font-size: 24rpx;
|
||||
line-height: 1.5;
|
||||
|
||||
.summary-label {
|
||||
color: #909399;
|
||||
}
|
||||
|
||||
.summary-text {
|
||||
color: #333;
|
||||
}
|
||||
}
|
||||
|
||||
.cascader-body {
|
||||
display: flex;
|
||||
height: 600rpx;
|
||||
}
|
||||
|
||||
.cascader-col {
|
||||
height: 600rpx;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
.dept-col {
|
||||
width: 38%;
|
||||
background: #f7f8fa;
|
||||
border-right: 1rpx solid #eee;
|
||||
}
|
||||
|
||||
.user-col {
|
||||
width: 62%;
|
||||
padding: 10rpx 20rpx;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
.cascader-item {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
padding: 28rpx 24rpx;
|
||||
font-size: 28rpx;
|
||||
color: #333;
|
||||
border-bottom: 1rpx solid #eef0f3;
|
||||
|
||||
&.active {
|
||||
background: #fff;
|
||||
color: #2667E9;
|
||||
font-weight: 600;
|
||||
position: relative;
|
||||
|
||||
&::before {
|
||||
content: '';
|
||||
position: absolute;
|
||||
left: 0;
|
||||
top: 0;
|
||||
bottom: 0;
|
||||
width: 6rpx;
|
||||
background: #2667E9;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.cascader-item-text {
|
||||
flex: 1;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.dept-dot {
|
||||
width: 12rpx;
|
||||
height: 12rpx;
|
||||
border-radius: 50%;
|
||||
background: #2667E9;
|
||||
margin-left: 8rpx;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
.empty-tip {
|
||||
padding: 80rpx 20rpx;
|
||||
text-align: center;
|
||||
color: #909399;
|
||||
font-size: 26rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.user-item {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
padding: 24rpx 0;
|
||||
border-bottom: 1rpx solid #f5f5f5;
|
||||
|
||||
&:last-child {
|
||||
border-bottom: none;
|
||||
}
|
||||
|
||||
&.active {
|
||||
.user-item-text {
|
||||
color: #2667E9;
|
||||
font-weight: 600;
|
||||
}
|
||||
}
|
||||
|
||||
.user-item-text {
|
||||
flex: 1;
|
||||
font-size: 28rpx;
|
||||
color: #333;
|
||||
}
|
||||
}
|
||||
|
||||
.popup-footer {
|
||||
display: flex;
|
||||
gap: 24rpx;
|
||||
padding: 24rpx 30rpx;
|
||||
padding-bottom: calc(24rpx + env(safe-area-inset-bottom));
|
||||
background: #fff;
|
||||
|
||||
button {
|
||||
flex: 1;
|
||||
height: 80rpx;
|
||||
line-height: 80rpx;
|
||||
border-radius: 40rpx;
|
||||
font-size: 30rpx;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
|
||||
&::after {
|
||||
border: none;
|
||||
}
|
||||
}
|
||||
|
||||
.btn-cancel {
|
||||
background: #fff;
|
||||
color: #2667E9;
|
||||
border: 2rpx solid #2667E9;
|
||||
}
|
||||
|
||||
.btn-confirm {
|
||||
color: #fff;
|
||||
border: none;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.btn-group {
|
||||
display: flex;
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,75 +1,100 @@
|
||||
<template>
|
||||
<view class="padding page">
|
||||
<view class="padding bg-white radius">
|
||||
<view class="flex">
|
||||
<view class="text-gray">隐患图片/视频</view>
|
||||
<view class="flex margin-bottom">
|
||||
<view class="text-gray">检查形式</view>
|
||||
<view class="text-red">*</view>
|
||||
</view>
|
||||
<view class="read-only-box">{{ detailData.source || '暂无' }}</view>
|
||||
|
||||
<view class="flex margin-bottom margin-top">
|
||||
<view class="text-gray">隐患图片</view>
|
||||
<view class="text-red">*</view>
|
||||
</view>
|
||||
<view class="margin-bottom">
|
||||
<view v-if="detailData.attachments && detailData.attachments.length > 0" class="margin-top">
|
||||
<view v-if="detailData.attachments && detailData.attachments.length > 0" class="margin-top-xs">
|
||||
<view class="flex" style="flex-wrap: wrap; gap: 10rpx;">
|
||||
<image v-for="(img, idx) in detailData.attachments" :key="idx" :src="getFullPath(img.filePath)" style="width: 136rpx;height: 136rpx;border-radius: 16rpx;" mode="aspectFill" @click="previewHazardImage(idx)"></image>
|
||||
<image
|
||||
v-for="(img, idx) in detailData.attachments"
|
||||
:key="idx"
|
||||
:src="getFullPath(img.filePath)"
|
||||
style="width: 136rpx;height: 136rpx;border-radius: 16rpx;"
|
||||
mode="aspectFill"
|
||||
@click="previewHazardImage(idx)"
|
||||
></image>
|
||||
</view>
|
||||
</view>
|
||||
<view v-else class="text-gray text-sm">暂无图片</view>
|
||||
<view class="text-gray text-sm margin-top-xs">必填：请上传现场照片或者视频作为隐患证据</view>
|
||||
<view class="text-gray text-sm margin-top-xs">必填：请上传现场照片作为隐患证据</view>
|
||||
</view>
|
||||
<view class="flex margin-bottom">
|
||||
|
||||
<view class="flex margin-bottom margin-top">
|
||||
<view class="text-gray">隐患标题</view>
|
||||
<view class="text-red">*</view>
|
||||
</view>
|
||||
<up-input v-model="detailData.title" disabled="true" disabledColor="#F6F6F6" border="surround"/>
|
||||
<view class="margin-bottom text-gray text-sm margin-top-xs" >请用简洁的语言概括隐患要点</view>
|
||||
<view class="flex margin-bottom">
|
||||
<up-input v-model="detailData.title" disabled disabledColor="#F6F6F6" border="surround" placeholder="暂无" />
|
||||
<view class="text-sm text-gray margin-top-xs">请用简洁的语言概括隐患要点</view>
|
||||
|
||||
<view class="flex margin-bottom margin-top">
|
||||
<view class="text-gray">隐患等级</view>
|
||||
<view class="text-red">*</view>
|
||||
</view>
|
||||
<view class="flex col-3" style="gap: 10rpx;">
|
||||
<view :class="detailData.level === 1 ? 'bg-blue light' : 'bg-gray'" style="padding: 16rpx 40rpx;">轻微隐患</view>
|
||||
<view :class="detailData.level === 2 ? 'bg-blue light' : 'bg-gray'" style="padding: 16rpx 40rpx;">一般隐患</view>
|
||||
<view :class="detailData.level === 3 ? 'bg-blue light' : 'bg-gray'" style="padding: 16rpx 40rpx;">重大隐患</view>
|
||||
<view class="flex col-2" style="gap: 10rpx;">
|
||||
<view :class="detailData.level === 2 ? 'bg-blue light' : 'bg-gray'" class="level-item">一般隐患</view>
|
||||
<view :class="detailData.level === 3 ? 'bg-blue light' : 'bg-gray'" class="level-item">重大隐患</view>
|
||||
</view>
|
||||
<view class="text-gray text-sm margin-top-xs margin-bottom">请用隐患可能造成的危害程度选择等级</view>
|
||||
<view class="flex">
|
||||
|
||||
<view class="flex margin-bottom margin-top">
|
||||
<view class="text-gray">隐患位置</view>
|
||||
<view class="text-red">*</view>
|
||||
</view>
|
||||
<view class="address-box margin-top-sm margin-bottom-sm">
|
||||
<input
|
||||
class="address-input"
|
||||
v-model="detailData.address"
|
||||
placeholder="暂无地址"
|
||||
disabled
|
||||
/>
|
||||
<button class="address-btn bg-blue">选择地址</button>
|
||||
<up-input v-model="detailData.address" disabled disabledColor="#F6F6F6" border="surround" placeholder="暂无地址" />
|
||||
<view class="text-gray text-sm margin-top-xs">如：办公楼3层东侧消防通道、生产车间A区设备旁等，或点击"选择地址"按钮在地图上选择</view>
|
||||
|
||||
<view class="flex margin-bottom margin-top">
|
||||
<view class="text-gray">法律依据</view>
|
||||
</view>
|
||||
<view class="text-gray text-sm">如：办公楼3层东侧消防通道，生产车间A区设备旁等，或点击"选择地址"按钮在地图上选择</view>
|
||||
|
||||
<!-- 隐患区域 -->
|
||||
<view class="text-gray margin-top margin-bottom">隐患区域</view>
|
||||
<view class="bg-gray padding radius">{{ detailData.areaName || '暂无' }}</view>
|
||||
|
||||
<view class="read-only-select">
|
||||
<view class="select-value" :class="{ placeholder: !legalBasisText }">
|
||||
{{ legalBasisText || '暂无' }}
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="flex margin-bottom margin-top">
|
||||
<view class="text-gray">隐患区域</view>
|
||||
</view>
|
||||
<view class="read-only-select">
|
||||
<view class="flex align-center">
|
||||
<view
|
||||
v-if="detailData.areaColor"
|
||||
class="area-color-dot"
|
||||
:style="{ backgroundColor: detailData.areaColor }"
|
||||
></view>
|
||||
<view class="select-value" :class="{ placeholder: !detailData.areaName }">
|
||||
{{ detailData.areaName || '暂无' }}
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="flex margin-bottom margin-top">
|
||||
<view class="text-gray">隐患描述</view>
|
||||
<view class="text-red">*</view>
|
||||
</view>
|
||||
<up-textarea v-model="detailData.description" placeholder="暂无描述" disabled></up-textarea>
|
||||
<view class="text-gray text-sm margin-top-xs margin-bottom">请详细说明隐患现状、潜在风险及影响范围</view>
|
||||
<view class="text-gray margin-bottom">隐患来源</view>
|
||||
<view class="bg-gray padding radius">{{ detailData.source || '暂无' }}</view>
|
||||
<view class="text-gray margin-top margin-bottom">创建时间</view>
|
||||
<view class="bg-gray padding radius">{{ detailData.createdAt || '暂无' }}</view>
|
||||
<up-textarea v-model="detailData.description" placeholder="暂无描述" disabled autoHeight></up-textarea>
|
||||
<view class="text-gray text-sm margin-top-xs">请详细说明隐患现状、潜在风险及影响范围</view>
|
||||
|
||||
<view class="text-gray margin-bottom margin-top">隐患标签</view>
|
||||
<view class="read-only-box">{{ detailData.tagName || '暂无' }}</view>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { ref, reactive } from 'vue'
|
||||
import { ref, reactive, computed } from 'vue'
|
||||
import { onLoad } from '@dcloudio/uni-app'
|
||||
import { getHiddenDangerDetail } from '@/request/api.js'
|
||||
import { toImageUrl } from '@/request/request.js'
|
||||
|
||||
// 详情数据
|
||||
|
||||
const detailData = reactive({
|
||||
hazardId: '',
|
||||
assignId: '',
|
||||
@@ -79,69 +104,47 @@
|
||||
source: '',
|
||||
description: '',
|
||||
address: '',
|
||||
areaName: '', // 隐患区域名称
|
||||
createdAt: '',
|
||||
areaName: '',
|
||||
areaColor: '',
|
||||
tagName: '',
|
||||
legalBasis: '',
|
||||
regulationName: '',
|
||||
attachments: []
|
||||
});
|
||||
|
||||
// 整改附件（单独存储）
|
||||
const rectifyAttachments = ref([]);
|
||||
|
||||
// 获取完整图片路径
|
||||
const getFullPath = (filePath) => {
|
||||
return toImageUrl(filePath);
|
||||
};
|
||||
|
||||
// 图片预览 - 隐患图片
|
||||
})
|
||||
|
||||
const legalBasisText = computed(() => detailData.legalBasis || detailData.regulationName || '')
|
||||
|
||||
const getFullPath = (filePath) => toImageUrl(filePath)
|
||||
|
||||
const previewHazardImage = (index) => {
|
||||
if (!detailData.attachments || detailData.attachments.length === 0) return;
|
||||
const urls = detailData.attachments.map(item => getFullPath(item.filePath));
|
||||
if (!detailData.attachments || detailData.attachments.length === 0) return
|
||||
uni.previewImage({
|
||||
current: index,
|
||||
urls: urls
|
||||
});
|
||||
};
|
||||
|
||||
// 图片预览 - 整改图片
|
||||
const previewRectifyImage = (index) => {
|
||||
const urls = rectifyAttachments.value.map(item => getFullPath(item.filePath));
|
||||
uni.previewImage({
|
||||
current: index,
|
||||
urls: urls
|
||||
});
|
||||
};
|
||||
|
||||
// 获取隐患详情
|
||||
urls: detailData.attachments.map(item => getFullPath(item.filePath))
|
||||
})
|
||||
}
|
||||
|
||||
const fetchDetail = async (hazardId, assignId) => {
|
||||
try {
|
||||
const res = await getHiddenDangerDetail({ hazardId, assignId });
|
||||
const params = { hazardId }
|
||||
if (assignId) params.assignId = assignId
|
||||
const res = await getHiddenDangerDetail(params)
|
||||
if (res.code === 0 && res.data) {
|
||||
Object.assign(detailData, res.data);
|
||||
console.log('隐患详情数据:', res.data);
|
||||
console.log('隐患附件:', res.data.attachments);
|
||||
|
||||
// 提取整改附件：assigns[0].rectify.attachments
|
||||
if (res.data.assigns && res.data.assigns.length > 0) {
|
||||
const assign = res.data.assigns[0];
|
||||
if (assign.rectify && assign.rectify.attachments) {
|
||||
rectifyAttachments.value = assign.rectify.attachments;
|
||||
console.log('整改附件:', rectifyAttachments.value);
|
||||
}
|
||||
}
|
||||
Object.assign(detailData, res.data)
|
||||
} else {
|
||||
uni.showToast({ title: res.msg || '获取详情失败', icon: 'none' });
|
||||
uni.showToast({ title: res.msg || '获取详情失败', icon: 'none' })
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('获取隐患详情失败:', error);
|
||||
uni.showToast({ title: '请求失败', icon: 'none' });
|
||||
console.error('获取隐患详情失败:', error)
|
||||
uni.showToast({ title: '请求失败', icon: 'none' })
|
||||
}
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
onLoad((options) => {
|
||||
if (options.hazardId && options.assignId) {
|
||||
fetchDetail(options.hazardId, options.assignId);
|
||||
if (options.hazardId) {
|
||||
fetchDetail(options.hazardId, options.assignId)
|
||||
}
|
||||
});
|
||||
})
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
@@ -149,30 +152,45 @@
|
||||
min-height: 100vh;
|
||||
background: #EBF2FC;
|
||||
}
|
||||
|
||||
.address-box {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 20rpx;
|
||||
}
|
||||
|
||||
.address-input {
|
||||
flex: 1;
|
||||
height: 80rpx;
|
||||
background: #F6F6F6;
|
||||
border-radius: 12rpx;
|
||||
padding: 0 24rpx;
|
||||
|
||||
.read-only-box {
|
||||
background: #f5f5f5;
|
||||
border-radius: 8rpx;
|
||||
padding: 20rpx 24rpx;
|
||||
font-size: 28rpx;
|
||||
color: #333;
|
||||
}
|
||||
|
||||
.address-btn {
|
||||
flex-shrink: 0;
|
||||
height: 80rpx;
|
||||
line-height: 80rpx;
|
||||
padding: 0 32rpx;
|
||||
border-radius: 12rpx;
|
||||
|
||||
.read-only-select {
|
||||
background: #f5f5f5;
|
||||
border: 1rpx solid #dcdfe6;
|
||||
border-radius: 8rpx;
|
||||
padding: 20rpx 24rpx;
|
||||
|
||||
.select-value {
|
||||
font-size: 28rpx;
|
||||
color: #333;
|
||||
line-height: 1.5;
|
||||
word-break: break-all;
|
||||
|
||||
&.placeholder {
|
||||
color: #999;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.level-item {
|
||||
padding: 16rpx 40rpx;
|
||||
border-radius: 8rpx;
|
||||
text-align: center;
|
||||
font-size: 28rpx;
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
.area-color-dot {
|
||||
width: 24rpx;
|
||||
height: 24rpx;
|
||||
border-radius: 50%;
|
||||
margin-right: 16rpx;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -428,9 +428,11 @@
|
||||
|
||||
// 立即整改（待整改状态）
|
||||
const goRectification = (item) => {
|
||||
uni.navigateTo({
|
||||
url: `/pages/hiddendanger/rectification?hazardId=${item.hazardId}&assignId=${item.assignId}`
|
||||
})
|
||||
let url = `/pages/hiddendanger/rectification?hazardId=${item.hazardId}&assignId=${item.assignId}`
|
||||
if (item.deadline) {
|
||||
url += `&deadline=${encodeURIComponent(item.deadline)}`
|
||||
}
|
||||
uni.navigateTo({ url })
|
||||
}
|
||||
|
||||
// 编辑整改信息（待验收状态）
|
||||
|
||||
@@ -67,7 +67,8 @@
|
||||
|
||||
<script setup>
|
||||
import { ref, reactive, onMounted } from 'vue';
|
||||
import { baseUrl, getToken, toImageUrl } from '@/request/request.js';
|
||||
import { toImageUrl } from '@/request/request.js';
|
||||
import { uploadSingleWithLoading } from '@/utils/upload.js';
|
||||
import { getProfileDetail, updateProfile } from '@/request/three_one_api/info.js';
|
||||
|
||||
const saving = ref(false);
|
||||
@@ -75,7 +76,7 @@ const defaultAvatar = 'https://ossweb-img.qq.com/images/lol/web201310/skin/big81
|
||||
const avatarPreview = ref(''); // 用于显示选择的图片临时预览
|
||||
|
||||
const userInfo = reactive({
|
||||
avatar: '', // 保存相对路径，用于提交
|
||||
avatar: '', // 七牛完整 URL，用于提交
|
||||
nickName: '',
|
||||
phonenumber: '',
|
||||
email: '',
|
||||
@@ -128,40 +129,20 @@ const chooseAvatar = () => {
|
||||
});
|
||||
};
|
||||
|
||||
// 上传头像获取链接
|
||||
const uploadAvatar = (filePath) => {
|
||||
uni.showLoading({ title: '上传中...' });
|
||||
|
||||
uni.uploadFile({
|
||||
url: baseUrl + '/frontend/attachment/upload',
|
||||
filePath: filePath,
|
||||
name: 'file',
|
||||
header: {
|
||||
'Authorization': getToken()
|
||||
},
|
||||
success: (uploadRes) => {
|
||||
uni.hideLoading();
|
||||
try {
|
||||
const data = JSON.parse(uploadRes.data);
|
||||
if (data.code === 0 && data.data) {
|
||||
// 上传成功，保存相对路径（用于提交）
|
||||
userInfo.avatar = data.data.url || data.data;
|
||||
uni.showToast({ title: '上传成功', icon: 'success' });
|
||||
} else {
|
||||
avatarPreview.value = ''; // 上传失败，清除预览
|
||||
uni.showToast({ title: data.msg || '上传失败', icon: 'none' });
|
||||
}
|
||||
} catch (e) {
|
||||
avatarPreview.value = '';
|
||||
uni.showToast({ title: '上传失败', icon: 'none' });
|
||||
}
|
||||
},
|
||||
fail: () => {
|
||||
uni.hideLoading();
|
||||
avatarPreview.value = '';
|
||||
uni.showToast({ title: '上传失败', icon: 'none' });
|
||||
}
|
||||
});
|
||||
// 上传头像（七牛直传）
|
||||
const uploadAvatar = async (filePath) => {
|
||||
try {
|
||||
const { url } = await uploadSingleWithLoading(filePath);
|
||||
userInfo.avatar = url;
|
||||
avatarPreview.value = url;
|
||||
uni.showToast({ title: '上传成功', icon: 'success' });
|
||||
} catch (e) {
|
||||
avatarPreview.value = '';
|
||||
uni.showToast({
|
||||
title: e?.msg || e?.message || '上传失败',
|
||||
icon: 'none'
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
// 保存
|
||||
@@ -179,7 +160,7 @@ const handleSave = async () => {
|
||||
phonenumber: userInfo.phonenumber,
|
||||
email: userInfo.email,
|
||||
sex: userInfo.sex,
|
||||
avatar: userInfo.avatar // 提交相对路径
|
||||
avatar: userInfo.avatar
|
||||
};
|
||||
|
||||
const res = await updateProfile(params);
|
||||
|
||||
Reference in New Issue
Block a user