Merge remote-tracking branch 'origin/dev-v15' into dev-v15

This commit is contained in:
root 2025-12-11 13:16:51 +08:00
commit c97cbbf7e1
5 changed files with 4 additions and 10 deletions

2
.gitignore vendored
View File

@ -15,7 +15,7 @@ Desktop.ini
*.njsproj *.njsproj
*.sln *.sln
*.swp *.swp
OrbbecSDK.log.txt
# ========================== # ==========================
# Logs # Logs
# ========================== # ==========================

View File

@ -2,7 +2,7 @@
<div class="ImageDetails-box"> <div class="ImageDetails-box">
<div class="ImageDetails-header"> <div class="ImageDetails-header">
<div>{{ ImageDetailsInfo.id }}</div> <div>{{ ImageDetailsInfo.id }}</div>
<img src="@/assets/archive/close2.png" alt="" style="cursor: pointer;" @click="handleCancel"> <img src="@/assets/header/closepage.png" alt="" style="cursor: pointer;" @click="handleCancel">
</div> </div>
<div class="ImageDetails-imgbgbox"> <div class="ImageDetails-imgbgbox">
<div class="ImageDetails-leftbutton" @click="clickleft"> <div class="ImageDetails-leftbutton" @click="clickleft">

View File

@ -2,7 +2,7 @@
<div class="ImageDetailsCompare-box"> <div class="ImageDetailsCompare-box">
<div class="ImageDetailsCompare-header"> <div class="ImageDetailsCompare-header">
<div></div> <div></div>
<img src="@/assets/archive/close2.png" alt="" style="cursor: pointer;" @click="handleCancel"> <img src="@/assets/header/closepage.png" alt="" style="cursor: pointer;" @click="handleCancel">
</div> </div>
<div class="ImageDetailsCompare-imgbgbox"> <div class="ImageDetailsCompare-imgbgbox">
<div class="ImageDetailsCompare-display" v-if="indexActive == 0"> <div class="ImageDetailsCompare-display" v-if="indexActive == 0">

View File

@ -390,7 +390,6 @@ function closeViewPDF(){
isViewPDF.value = false isViewPDF.value = false
} }
function clickImg(item,index){ function clickImg(item,index){
debugger
selectIndex.value = index selectIndex.value = index
isImageDetails.value =true isImageDetails.value =true
} }
@ -572,12 +571,7 @@ function deleteClick(row){
} }
function fileClick(row){ function fileClick(row){
pdfUrl.value = BACKEND_URL + '/' + row.detection_report pdfUrl.value = BACKEND_URL + '/' + row.detection_report
debugger
isViewPDF.value = true isViewPDF.value = true
// ElMessage.success({
// message: '',
// duration: 3000
// });
} }
function selectedChange(val){ function selectedChange(val){

View File

@ -3,7 +3,7 @@
<div class="selectdata-box"> <div class="selectdata-box">
<div class="selectdata-header"> <div class="selectdata-header">
<div>选择数据</div> <div>选择数据</div>
<img src="@/assets/archive/close2.png" alt="" style="cursor: pointer;" @click="cancel(false)"> <img src="@/assets/header/closepage.png" alt="" style="cursor: pointer;" @click="cancel(false)">
</div> </div>
<div class="selectdata-imgbgbox"> <div class="selectdata-imgbgbox">
<el-checkbox-group v-model="checkboxGroup" size="large" @change="selectedChange" > <el-checkbox-group v-model="checkboxGroup" size="large" @change="selectedChange" >