Commit 550aaa18 authored by 胡占生's avatar 胡占生 🇨🇳

fix: 修复项目展示问题,修复算法管理页面布局问题

parent 64b3652e
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<el-upload <el-upload
multiple multiple
:action="uploadImgUrl" :action="uploadImgUrl"
:list-type="isImgLayout?'picture-card':''" :list-type="isImgLayout?'picture-card':'text'"
:on-success="handleUploadSuccess" :on-success="handleUploadSuccess"
:before-upload="handleBeforeUpload" :before-upload="handleBeforeUpload"
:limit="limit" :limit="limit"
...@@ -153,7 +153,7 @@ watch(() => props.modelValue, val => { ...@@ -153,7 +153,7 @@ watch(() => props.modelValue, val => {
// 上传前loading加载 // 上传前loading加载
function handleBeforeUpload(file) { function handleBeforeUpload(file) {
console.log("🚀 ~ handleBeforeUpload ~ file:", file)
let isImg = false; let isImg = false;
if (props.fileType.length) { if (props.fileType.length) {
let fileExtension = ""; let fileExtension = "";
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="算法场景" prop="applicationScenarios"> <el-form-item label="算法场景" prop="applicationScenarios">
<el-select v-model="form.applicationScenarios" placeholder="请选择硬件平台" clearable > <el-select v-model="form.applicationScenarios" placeholder="请选择算法场景" clearable >
<el-option <el-option
v-for="disc in algorithm_scen" v-for="disc in algorithm_scen"
:key="disc.value" :key="disc.value"
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="卡片文案" prop="cardCopywriting"> <el-form-item label="卡片文案" prop="cardCopywriting">
<el-input v-model="form.cardCopywriting" type="textarea" :rows="2" placeholder="请输入内容" /> <el-input v-model="form.cardCopywriting" type="textarea" :rows="4" placeholder="请输入卡片文案" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -180,7 +180,7 @@ ...@@ -180,7 +180,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="卡片文案" prop="cardCopywriting"> <el-form-item label="卡片文案" prop="cardCopywriting">
<el-input v-model="form.cardCopywriting" type="textarea" :rows="2" placeholder="请输入内容" /> <el-input v-model="form.cardCopywriting" type="textarea" :rows="4" placeholder="请输入内容" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
......
...@@ -14,13 +14,14 @@ ...@@ -14,13 +14,14 @@
/> />
</el-form-item> </el-form-item>
<el-form-item label="算法场景" prop="applicationScenarios"> <el-form-item label="算法场景" prop="applicationScenarios">
<el-input <el-select style="width: 200px" v-model="queryParams.applicationScenarios" placeholder="请选择算法场景" clearable >
v-model="queryParams.applicationScenarios" <el-option
placeholder="请输入算法场景" v-for="disc in algorithm_scen"
clearable :key="disc.value"
style="width: 200px" :label="disc.label"
@keyup.enter="handleQuery" :value="disc.value"
/> />
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="创建时间" > <el-form-item label="创建时间" >
<el-date-picker <el-date-picker
...@@ -47,45 +48,16 @@ ...@@ -47,45 +48,16 @@
@click="handleAdd" @click="handleAdd"
>新增</el-button> >新增</el-button>
</el-col> </el-col>
<!-- <el-col :span="1.5">
<el-button
type="success"
plain
icon="Edit"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['monitor:job:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="Delete"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['monitor:job:remove']"
>删除</el-button>
</el-col> -->
<!-- <el-col :span="1.5">
<el-button
type="warning"
plain
icon="Download"
@click="handleExport"
v-hasPermi="['monitor:job:export']"
>导入</el-button>
</el-col> -->
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="algList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="algList" @selection-change="handleSelectionChange">
<el-table-column label="算法名称" width="150" align="center" prop="algorithmName" :show-overflow-tooltip="true" /> <el-table-column label="算法名称" width="150" align="left" prop="algorithmName" :show-overflow-tooltip="true" />
<el-table-column label="算法英文" align="center" prop="algorithmEnglish" :show-overflow-tooltip="true" /> <el-table-column label="算法英文" align="left" prop="algorithmEnglish" width="200" :show-overflow-tooltip="true" />
<el-table-column label="硬件平台" align="center" width="100" prop="algorithmPlat"> <el-table-column label="硬件平台" align="left" width="150" prop="algorithmPlat">
</el-table-column> </el-table-column>
<el-table-column label="算法场景" align="center" width="100" prop="applicationScenarios" :show-overflow-tooltip="true" /> <el-table-column label="算法场景" align="left" width="150" prop="applicationScenarios" :show-overflow-tooltip="true" />
<el-table-column label="卡片文案" align="center" prop="cardCopywriting" :show-overflow-tooltip="true" /> <el-table-column label="卡片文案" align="left" prop="cardCopywriting" :show-overflow-tooltip="true" />
<el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
<template #default="scope"> <template #default="scope">
......
...@@ -23,9 +23,9 @@ ...@@ -23,9 +23,9 @@
</el-form> </el-form>
<el-table v-loading="loading" :data="CameraLogList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="CameraLogList" @selection-change="handleSelectionChange">
<el-table-column label="摄像头名称" width="200" align="center" prop="areaBelong" /> <el-table-column label="摄像头名称" width="200" align="center" prop="cameraNo" />
<el-table-column label="算法编号" align="center" prop="cameraNo" :show-overflow-tooltip="true" /> <el-table-column label="点位名称" align="center" prop="areaBelong" :show-overflow-tooltip="true" />
<el-table-column label="日志详情" align="center" prop="logDesc" :show-overflow-tooltip="true" > <el-table-column label="日志描述" align="center" prop="logDesc" :show-overflow-tooltip="true" >
</el-table-column> </el-table-column>
<!-- <el-table-column label="检测结果" align="center" prop="operParam" :show-overflow-tooltip="true" > <!-- <el-table-column label="检测结果" align="center" prop="operParam" :show-overflow-tooltip="true" >
</el-table-column> </el-table-column>
...@@ -122,9 +122,6 @@ ...@@ -122,9 +122,6 @@
</div> </div>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize" @pagination="getAllList" /> v-model:limit="queryParams.pageSize" @pagination="getAllList" />
</el-card> </el-card>
...@@ -313,6 +310,7 @@ function reset() { ...@@ -313,6 +310,7 @@ function reset() {
concurrent: 1, concurrent: 1,
status: "0", status: "0",
}; };
proxy.resetForm("jobRef"); proxy.resetForm("jobRef");
} }
...@@ -325,6 +323,7 @@ function handleQuery() { ...@@ -325,6 +323,7 @@ function handleQuery() {
/** 重置按钮操作 */ /** 重置按钮操作 */
function resetQuery() { function resetQuery() {
proxy.resetForm("queryRef"); proxy.resetForm("queryRef");
dateRange.value = [];
handleQuery(); handleQuery();
} }
......
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