taoge_xiaodi/td_official
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决冲突

Browse Source
This commit is contained in:
Teo
2025-08-02 16:51:07 +08:00
parent 7154bbbbcc 760b707116
commit fe872490d5
8 changed files with 251 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/safety/recognizeRecord/index.vue
View File

@ -42,7 +42,7 @@
</el-table-column>
<el-table-column label="图片路径" align="center" prop="picture" width="100">
<template #default="scope">
<image-preview :src="scope.row.picture" :width="50" :height="50" />
<image-preview :src="'http://58.17.134.85:8919' + scope.row.picture" :width="50" :height="50" />
</template>
</el-table-column>
<el-table-column label="故障描述" align="center" prop="describe" />

2
src/views/safety/safetyInspection/component/SafetyInspectionDetailDialog.vue
View File

@ -72,7 +72,7 @@
<image-preview :src="item.path" width="200px" />
</span>
<span v-else>
<el-link :href="`${item.url}`" :underline="false" target="_blank">
<el-link :href="`${'http://58.17.134.85:8919' + item.url}`" :underline="false" target="_blank">
<span> {{ item.originalName }} </span>
</el-link>
</span>

3
src/views/safety/teamMeeting/component/TeamMeetingDetailDrawer.vue
View File

@ -13,7 +13,7 @@
<el-descriptions-item :span="2" label="班会图片">
<el-space wrap>
<span :key="item" v-for="item in teamMeetingDetail?.pictureUrlList">
<image-preview :src="item" width="200px" />
<image-preview :src="'http://xny.yj-3d.com:7363' + item" width="200px" />
</span>
</el-space>
</el-descriptions-item>
@ -38,6 +38,7 @@ const get = async () => {
const res = await getTeamMeeting({ id: props.teamMeetingId });
if (res.data && res.code === 0) {
teamMeetingDetail.value = res.data;
teamMeetingDetail.value.pictureUrlList = res.data?.picture.split(',');
}
loading.value = false;
};

2
src/views/safety/violationRecord/component/violationRecordDetailDialog.vue
View File

@ -41,7 +41,7 @@
<el-space wrap>
<div v-for="item in safetyInspectionDetail.checkAttachment" :key="item.ossId">
<span v-if="['png', 'jpg', 'jpeg'].includes(item.fileType)">
<image-preview :src="item.path" width="200px" />
<image-preview :src="'http://58.17.134.85:8919' + item.path" width="200px" />
</span>
<span v-else>
<el-link :href="`${item.path}`" type="primary" :underline="false" target="_blank">