This commit is contained in:
Teo
2025-09-09 09:40:08 +08:00
parent 910b24019e
commit 4cd7efcfe4
34 changed files with 1898 additions and 71 deletions

View File

@ -86,6 +86,7 @@
<RecyclingStation ref="RecyclingStationRef"></RecyclingStation>
</el-tab-pane>
</el-tabs>
<bigUploader></bigUploader>
</div>
</template>
<script lang="ts">
@ -141,7 +142,7 @@ export default defineComponent({
parentPid: '0', //父级的id 默认为0
fileType: 0, //文件 或压缩文件
list: [
{ id: 1, name: '文件下载', callback: onExport, auth: 'api/v1/system/documentSafetyMeeting/safetyDataUniFileDownload' },
// { id: 1, name: '文件下载', callback: onExport, auth: 'api/v1/system/documentSafetyMeeting/safetyDataUniFileDownload' },
{ id: 2, name: '文件删除', callback: onDeleteFile, auth: 'api/v1/system/documentSafetyMeeting/delete' }
],
relativePath: '', //文件下载需要相对路径
@ -177,7 +178,7 @@ export default defineComponent({
}
let obj = {
filePath: {
url,
url: '/file/' + url,
name: filename,
size: totalSize,
fileType: '.' + fileType1 //后缀名
@ -466,12 +467,12 @@ export default defineComponent({
z-index: 999;
background-color: rgb(0 0 0 / 56%);
width: 120px;
height: 100px;
height: 50px;
top: 0;
left: 0;
display: none;
border-radius: 6px;
padding: 14px 4px;
padding: 4px 4px;
> div {
font-size: 16px;
font-weight: bold;

View File

@ -3,8 +3,8 @@
<div class="move_pop" id="detial_pop">
<!-- <span>{{ title }}</span> -->
<div class="box">
<img v-if="type == 2" src="../icon/suo.png" @click="onFull(1)" />
<img v-else src="../icon/full.png" @click="onFull(2)" />
<img v-if="type == 2" src="/image/suo.png" @click="onFull(1)" />
<img v-else src="/image/full.png" @click="onFull(2)" />
<span class="close" @click="onClose"></span>
</div>
</div>

View File

@ -3,8 +3,8 @@
<div class="move_pop" id="detial_edit">
<!-- <span>{{ title }}</span> -->
<div class="box">
<img v-if="type == 2" src="../icon/full.png" @click="onFull(1)" />
<img v-else src="../icon/suo.png" @click="onFull(2)" />
<img v-if="type == 2" src="/image/full.png" @click="onFull(1)" />
<img v-else src="/image/suo.png" @click="onFull(2)" />
<span class="close" @click="onClose"></span>
</div>
</div>

View File

@ -11,13 +11,13 @@
<el-descriptions :column="2" border style="margin-top: 8px" label-width="160px" size="large">
<el-descriptions-item label-align="center" label="检查项目" :span="2" class-name="zebra">{{ currentProject?.name }} </el-descriptions-item>
<el-descriptions-item label-align="center" label="检查类型" label-class-name="white">
<dict-tag :options="safety_inspection_check_type" :value="safetyInspectionDetail?.checkType" />
{{ safetyInspectionDetail?.studyTypeName }}
</el-descriptions-item>
<el-descriptions-item label-align="center" label="违章类型" label-class-name="white">
<dict-tag :options="safety_inspection_violation_type" :value="safetyInspectionDetail?.violationType" />
{{ safetyInspectionDetail?.tourTypeName }}
</el-descriptions-item>
<el-descriptions-item label-align="center" label="检查时间" class-name="zebra">{{ safetyInspectionDetail?.checkTime }} </el-descriptions-item>
<el-descriptions-item label-align="center" label="检查人" class-name="zebra">{{ safetyInspectionDetail?.creatorName }} </el-descriptions-item>
<el-descriptions-item label-align="center" label="检查人" class-name="zebra">{{ safetyInspectionDetail?.abarbeitung }} </el-descriptions-item>
<el-descriptions-item label-align="center" label="整改人" label-class-name="white"
>{{ safetyInspectionDetail?.abarbeitung }}
</el-descriptions-item>
@ -30,7 +30,7 @@
</el-descriptions>
<el-descriptions :column="2" border label-width="160px" size="large">
<el-descriptions-item label-align="center" label="内容" :span="2" label-class-name="white"
>{{ safetyInspectionDetail?.hiddenDanger }}
>{{ safetyInspectionDetail?.inspectionResult }}
</el-descriptions-item>
<el-descriptions-item label-align="center" label="检查附件" :span="2" label-class-name="white">
<el-space wrap>
@ -69,7 +69,7 @@
<el-space wrap>
<div v-for="item in safetyInspectionDetail.checkAttachment" :key="item.id">
<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="`${'http://58.17.134.85:8919' + item.url}`" :underline="false" target="_blank">
@ -96,16 +96,16 @@
</div>
<!-- </el-card> -->
<div class="dialog-footer">
<!-- <div class="dialog-footer">
<div class="btn-item" @click="handleExport">
<img src="../../../../assets/icons/svg/derived.png" />
<span>导出</span>
</div>
<!-- <div class="btn-item" v-print="'#printMe'">
<div class="btn-item" v-print="'#printMe'">
<img src="../../../../assets/icons/svg/print.png" />
<span>打印</span>
</div> -->
</div>
</div>
</div> -->
</template>
<script setup lang="ts">
@ -198,7 +198,7 @@ watch(
}
.dialog-footer {
height: 200px;
height: 100px;
display: flex;
flex-direction: column;

View File

@ -65,9 +65,9 @@
<span>{{ filterType(scope.row.studyType) }}</span>
</template>
</el-table-column>
<el-table-column label="违章类型" align="center" prop="violationType">
<el-table-column label="违章类型" align="center" prop="tourType">
<template #default="scope">
<span>{{ filterTypeS(scope.row.violationType) }}</span>
<span>{{ filterTypeS(scope.row.tourType) }}</span>
</template>
</el-table-column>
<el-table-column label="巡检结果" align="center" prop="inspectionResult">

View File

@ -18,13 +18,11 @@
{{ safetyInspectionDetail?.level }}
</el-descriptions-item>
<el-descriptions-item label-align="center" label="检查时间" class-name="zebra"
>{{ safetyInspectionDetail?.violationTime }}
</el-descriptions-item>
<el-descriptions-item label-align="center" label="检查人" class-name="zebra"
>{{ safetyInspectionDetail?.createByName }}
>{{ safetyInspectionDetail?.reviewTime }}
</el-descriptions-item>
<el-descriptions-item label-align="center" label="检查人" class-name="zebra">{{ safetyInspectionDetail?.reviewName }} </el-descriptions-item>
<el-descriptions-item label-align="center" label="整改人" label-class-name="white"
>{{ safetyInspectionDetail?.handlerName }}
>{{ safetyInspectionDetail?.openidName }}
</el-descriptions-item>
<el-descriptions-item label-align="center" label="要求整改期限" label-class-name="white">
{{ safetyInspectionDetail?.disposeDeadline ? dayjs(safetyInspectionDetail?.disposeDeadline).format('YYYY - MM - DD ') : '' }}
@ -119,7 +117,7 @@ const inspectionType = computed(() => {
const get = async () => {
loading.value = true;
const res = await getViolationRecord({ id: props.violationRecordId });
const res = await getViolationRecord(props.violationRecordId as string);
if (res.data && res.code === 0) {
safetyInspectionDetail.value = res.data;
}
@ -181,7 +179,7 @@ watch(
}
.dialog-footer {
height: 200px;
height: 100px;
display: flex;
flex-direction: column;