Commit 31dd16d6 authored by 胡占生's avatar 胡占生 🇨🇳

fix: 左侧菜单页 背景修复,

算法管理 增加版本切换,算法详情修复算法边界展示问题,点位管理切换字段
parent 9041e125
...@@ -100,3 +100,8 @@ function hasTitle(title){ ...@@ -100,3 +100,8 @@ function hasTitle(title){
} }
} }
</script> </script>
<style lang="scss" >
.el-popper.is-light{
background: #29d;
}
</style>
\ No newline at end of file
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
<!-- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" <!-- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
>版本内容</el-button> --> >版本内容</el-button> -->
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)">删除</el-button> <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
<el-button link type="primary" icon="Sort" @click="useNewFile(scope.row.id)">版本切换</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -87,7 +88,7 @@ ...@@ -87,7 +88,7 @@
</template> </template>
<script setup> <script setup>
import { addFile, deleteFile, updateFile, listFile } from "@/api/algorithmList/algorithmFile.js"; import { addFile, deleteFile, updateFile, listFile ,useCurrentFil} from "@/api/algorithmList/algorithmFile.js";
import FileAlgUpload from '@/components/FileAlgUpload' import FileAlgUpload from '@/components/FileAlgUpload'
const { proxy } = getCurrentInstance(); const { proxy } = getCurrentInstance();
const emit = defineEmits(); const emit = defineEmits();
...@@ -168,6 +169,14 @@ function handleDelete(row) { ...@@ -168,6 +169,14 @@ function handleDelete(row) {
}).catch(() => { }); }).catch(() => { });
} }
/** 算法切换*/
function useNewFile(id) {
useCurrentFil(id).then(response => {
proxy.$modal.msgSuccess("变更成功");
getList()
});
}
/** 提交按钮 */ /** 提交按钮 */
function submitForm() { function submitForm() {
proxy.$refs["algRef"].validate(valid => { proxy.$refs["algRef"].validate(valid => {
......
...@@ -141,7 +141,7 @@ ...@@ -141,7 +141,7 @@
</div> </div>
<el-divider /> <el-divider />
<div class="img-box gird-layout"> <div class="img-box gird-layout">
<div class="img-item" v-for="item in invalidImgList" :key="item.id"> <div class="img-item" v-for="item in effectiveImgList" :key="item.id">
<ImagePreview style="height: 100%;" :src="item.caseFile"/> <ImagePreview style="height: 100%;" :src="item.caseFile"/>
</div> </div>
</div> </div>
...@@ -235,9 +235,11 @@ function getDetials(){ ...@@ -235,9 +235,11 @@ function getDetials(){
}) })
listBoundary({ algorithmId: roleId}).then(res=>{ listBoundary({ algorithmId: roleId}).then(res=>{
effectiveList.value = res.rows.filter(item => item.caseType === '0') effectiveList.value = res.rows.filter(item => item.caseType === '0')
effectiveImgList.value = res.rows.filter(item => item.caseType === '0'&&item.caseFile)
console.log("🚀 ~ listBoundary ~ effectiveImgList.value:", effectiveImgList.value)
invalidList.value = res.rows.filter(item => item.caseType === '1') invalidList.value = res.rows.filter(item => item.caseType === '1')
invalidImgList.value = res.rows.filter(item => item.caseType === '1'&&item.caseFile) invalidImgList.value = res.rows.filter(item => item.caseType === '1'&&item.caseFile)
effectiveImgList.value = res.rows.filter(item => item.caseType === '0'&&item.caseFile) console.log("🚀 ~ listBoundary ~ invalidImgList.value:", invalidImgList.value)
}) })
} }
/** 查询案例文件列表 */ /** 查询案例文件列表 */
......
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
<template #default="scope"> <template #default="scope">
<!-- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" <!-- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
>版本内容</el-button> --> >版本内容</el-button> -->
<el-button link type="primary" icon="Delete" @click="useNewFile(scope.row.id)">版本切换</el-button> <el-button link type="primary" icon="Sort" @click="useNewFile(scope.row.id)">版本切换</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -140,7 +140,7 @@ function getList(id) { ...@@ -140,7 +140,7 @@ function getList(id) {
wrapList.value = response.rows; wrapList.value = response.rows;
}); });
} }
/** 获取文件列表*/ /** 算法切换*/
function useNewFile(id) { function useNewFile(id) {
useCurrentFil(id).then(response => { useCurrentFil(id).then(response => {
proxy.$modal.msgSuccess("变更成功"); proxy.$modal.msgSuccess("变更成功");
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
:model="unref(algorithmManage.form)" :model="unref(algorithmManage.form)"
:rules="rules" :rules="rules"
label-position="left" label-position="left"
label-width="110px" label-width="120px"
class="demo-form-inline" class="demo-form-inline"
> >
<el-form-item <el-form-item
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
><template #suffix>/秒</template></el-input ><template #suffix>/秒</template></el-input
> >
</el-form-item> </el-form-item>
<el-form-item label="拉流间隔时间" prop="inferenceInterval"> <el-form-item label="识别间隔(跳帧)" prop="inferenceInterval">
<el-input v-model="unref(algorithmManage.form).inferenceInterval" <el-input v-model="unref(algorithmManage.form).inferenceInterval"
><template #suffix>/秒</template></el-input ><template #suffix>/秒</template></el-input
> >
...@@ -162,7 +162,7 @@ ...@@ -162,7 +162,7 @@
> >
<el-button @click="getNewPhoto" v-else>重新取图</el-button> <el-button @click="getNewPhoto" v-else>重新取图</el-button>
<el-button type="primary" @click="clearDraw">重绘标记</el-button> <el-button type="primary" @click="clearDraw">重绘标记</el-button>
<el-button type="primary" @click="++drawIndex">重绘下一个</el-button> <el-button type="primary" @click="++drawIndex">绘制下一个</el-button>
</div> </div>
<div class="right-draw-content"> <div class="right-draw-content">
<template v-if="algorithmManage.form.value.liveMap"> <template v-if="algorithmManage.form.value.liveMap">
...@@ -258,9 +258,9 @@ ...@@ -258,9 +258,9 @@
v-model="unref(aiAlgorithm.form).continueWarnTime" v-model="unref(aiAlgorithm.form).continueWarnTime"
/> />
</el-form-item> </el-form-item>
<el-form-item label="识别间隔(跳帧)" prop="identifyIntervals"> <!-- <el-form-item label="识别间隔(跳帧)" prop="identifyIntervals">
<el-input v-model="unref(aiAlgorithm.form).identifyIntervals" /> <el-input v-model="unref(aiAlgorithm.form).identifyIntervals" />
</el-form-item> </el-form-item> -->
<el-form-item label="标签阈值" prop="labelThreshold"> <el-form-item label="标签阈值" prop="labelThreshold">
<el-input v-model="unref(aiAlgorithm.form).labelThreshold" /> <el-input v-model="unref(aiAlgorithm.form).labelThreshold" />
</el-form-item> </el-form-item>
......
...@@ -154,17 +154,23 @@ ...@@ -154,17 +154,23 @@
<el-table-column <el-table-column
label="操作" label="操作"
width="180" width="180"
align="center" align="left"
class-name="small-padding fixed-width" class-name="small-padding fixed-width"
> >
<template #default="scope"> <template #default="scope">
<el-button <el-tooltip content="修改" placement="top" v-if="scope.row.runningState=='1'">
<el-button link type="primary" icon="Edit" @click="algorithmManage.toEdit(scope.row)" ></el-button>
</el-tooltip>
<el-tooltip content="删除" placement="top" v-if="scope.row.runningState=='1'">
<el-button link type="primary" icon="Delete" @click="algorithmManage.toDel(scope.row)" ></el-button>
</el-tooltip>
<!-- <el-button
link link
type="primary" type="primary"
icon="Edit" icon="Edit"
@click="algorithmManage.toEdit(scope.row)" @click="algorithmManage.toEdit(scope.row)"
v-hasPermi="['system:post:edit']" v-hasPermi="['system:post:edit']"
>修改</el-button ></el-button
> >
<el-button <el-button
link link
...@@ -173,8 +179,8 @@ ...@@ -173,8 +179,8 @@
icon="Delete" icon="Delete"
@click="algorithmManage.toDel(scope.row)" @click="algorithmManage.toDel(scope.row)"
v-hasPermi="['system:post:remove']" v-hasPermi="['system:post:remove']"
>删除</el-button ></el-button
> > -->
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment