Web/admin-sjzx
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://pqmcc.com:3000/Web/admin-sjzx

Browse Source 
# Conflicts:
#	src/views/pqs/supervise/technology/feedbackPopup.vue
This commit is contained in:
GGJ
2025-12-19 14:08:17 +08:00
parent a67535abbf dffc735edb
commit d69a6e1e5d
22 changed files with 123 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/views/pqs/supervise/terminalNetworkDetection/components/cycleDetection/detail.vue
View File

@@ -24,7 +24,7 @@
</el-tag>
</el-descriptions-item>
<el-descriptions-item label="报告文件">
<el-icon class="elView" v-if="detailData?.reportPaths?.fileName">
<el-icon class="elView" v-if="detailData?.reportPaths?.fileName &&VITE_FLAG">
<View @click="openFile(detailData?.reportPaths?.fileName)" />
</el-icon>
<span class="aLoad" @click="download(detailData.reportPaths?.keyName)">
@@ -52,6 +52,7 @@ const { query } = useRoute() // 查询参数
const openFile = (name: any) => {
window.open(window.location.origin + '/#/previewFile?/supervision/' + name)
}
const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
const props = defineProps({
id: propTypes.string.def(undefined)
})

6
src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/detail.vue
View File

@@ -4,7 +4,7 @@
<el-icon>
<Link />
</el-icon>
<a :href="detailData?.lineFilePath.url">
<span :href="detailData?.lineFilePath.url">
{{ detailData?.lineFilePath.name }}
</span >
</el-descriptions-item>
@@ -113,7 +113,7 @@
</el-descriptions-item>
<!--文件地址-->
<el-descriptions-item label="主接线图" v-if="detailData?.mainWiringDiagram">
<el-icon class="elView" v-if="detailData?.mainWiringDiagram.name">
<el-icon class="elView" v-if="detailData?.mainWiringDiagram.name && VITE_FLAG">
<View @click="openFile(detailData?.mainWiringDiagram.name)" />
</el-icon>
<span class="aLoad" @click="download(detailData?.mainWiringDiagram.keyName)">
@@ -136,7 +136,7 @@ const openFile = (name: any) => {
window.open(window.location.origin + '/#/previewFile?/supervision/' + name)
}
defineOptions({ name: 'BpmUserReportDetail' })
const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
const { query } = useRoute() // 查询参数
const props = defineProps({

2
src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/addForm.vue
View File

@@ -969,7 +969,7 @@ const rules = ref({
electroplatingFunction: [
{
required: false,
message: '请选择电镀功能',
message: '请选择电度功能',
trigger: 'change'
}
],

18
src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/detail.vue
View File

@@ -162,7 +162,7 @@
: '-'
}}
</el-descriptions-item>
<el-descriptions-item label="电镀功能">
<el-descriptions-item label="电度功能">
{{
detailData.supervisionTempDeviceReport?.electroplatingFunction == '0'
? '否'
@@ -198,7 +198,7 @@
{{ detailData.supervisionTempDeviceReport?.contractNumber }}
</el-descriptions-item>
<el-descriptions-item label="信息安全检测报告">
<el-icon class="elView" v-if="detailData?.informationSecurityTestReport?.name">
<el-icon class="elView" v-if="detailData?.informationSecurityTestReport?.name && VITE_FLAG">
<View @click="openFile(detailData?.informationSecurityTestReport?.name)" />
</el-icon>
<span
@@ -210,7 +210,7 @@
</span>
</el-descriptions-item>
<el-descriptions-item label="验收检验报告单">
<el-icon class="elView" v-if="detailData?.acceptanceInspectionReportSingle?.name">
<el-icon class="elView" v-if="detailData?.acceptanceInspectionReportSingle?.name && VITE_FLAG">
<View @click="openFile(detailData?.acceptanceInspectionReportSingle?.name)" />
</el-icon>
<span
@@ -222,7 +222,7 @@
</span>
</el-descriptions-item>
<el-descriptions-item label="验收检验报告">
<el-icon class="elView" v-if="detailData?.acceptanceInspectionReport?.name">
<el-icon class="elView" v-if="detailData?.acceptanceInspectionReport?.name && VITE_FLAG">
<View @click="openFile(detailData?.acceptanceInspectionReport?.name)" />
</el-icon>
<span
@@ -234,7 +234,7 @@
</span>
</el-descriptions-item>
<el-descriptions-item label="型式实验报告">
<el-icon class="elView" v-if="detailData?.typeExperimentReport?.name">
<el-icon class="elView" v-if="detailData?.typeExperimentReport?.name && VITE_FLAG">
<View @click="openFile(detailData?.typeExperimentReport?.name)" />
</el-icon>
<span
@@ -246,7 +246,7 @@
</span>
</el-descriptions-item>
<el-descriptions-item label="出厂检验报告">
<el-icon class="elView" v-if="detailData?.factoryInspectionReport?.name">
<el-icon class="elView" v-if="detailData?.factoryInspectionReport?.name && VITE_FLAG">
<View @click="openFile(detailData?.factoryInspectionReport?.name)" />
</el-icon>
<span
@@ -258,7 +258,7 @@
</span>
</el-descriptions-item>
<el-descriptions-item label="性能检测报告">
<el-icon class="elView" v-if="detailData?.performanceTestReport?.name">
<el-icon class="elView" v-if="detailData?.performanceTestReport?.name && VITE_FLAG">
<View @click="openFile(detailData?.performanceTestReport?.name)" />
</el-icon>
<span
@@ -270,7 +270,7 @@
</span>
</el-descriptions-item>
<el-descriptions-item label="其他附件">
<el-icon class="elView" v-if="detailData?.otherAttachments?.name">
<el-icon class="elView" v-if="detailData?.otherAttachments?.name && VITE_FLAG">
<View @click="openFile(detailData?.otherAttachments?.name)" />
</el-icon>
<span
@@ -304,7 +304,7 @@ const { query } = useRoute() // 查询参数
const props = defineProps({
id: propTypes.string.def(undefined)
})
const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
const detailLoading = ref(false) // 表单的加载中
const detailData = ref<any>({}) // 详情数据
const queryId = query.id as unknown as string // 从 URL 传递过来的 id 编号