Commit 951203a4 authored by 胡占生's avatar 胡占生 🇨🇳

fix: 整体细节调整,问题优化

parent 026bd786
......@@ -8,7 +8,7 @@
<template v-slot:header>
<el-form :model="queryParams" ref="queryRef" :inline="true" >
<el-form-item label="摄像头" prop="algorithmName">
<el-select v-model="queryParams.deptName" placeholder="请选择所属部门" clearable style="width: 200px">
<el-select v-model="queryParams.deptName" placeholder="请选择摄像头" clearable style="width: 200px">
<el-option
v-for="dict in deviceList"
:key="dict.id"
......@@ -145,7 +145,6 @@
getList()
}
/** 查询定时任务列表 */
function getDeviceList() {
listDevice().then(response => {
deviceList.value = response.rows;
......
......@@ -53,11 +53,25 @@
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="预警等级" prop="alarmLevel">
<el-select v-model="form.alarmLevel" placeholder="请选择预警等级" clearable >
<el-option
v-for="disc in levelList"
:key="disc.id"
:label="disc.alarmName"
:value="disc.id"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="卡片文案" prop="cardCopywriting">
<el-input v-model="form.cardCopywriting" type="textarea" :rows="8" placeholder="请输入内容" />
<el-input v-model="form.cardCopywriting" type="textarea" :rows="2" placeholder="请输入内容" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="卡片图片" prop="cardImg">
<ImageUpload :modelValue="form.cardImg" :limit='1' :fileSize="5" @update:modelValue="getImageUrl"/>
......@@ -152,17 +166,31 @@
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="卡片文案" prop="cardCopywriting">
<el-input v-model="form.cardCopywriting" type="textarea" :rows="8" placeholder="请输入内容" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="卡片图片" prop="cardImg">
<ImageUpload :modelValue="form.cardImg" :limit='1' :fileSize="5" @update:modelValue="getImageUrl"/>
</el-form-item>
</el-col>
</el-row>
<el-col :span="12">
<el-form-item label="预警等级" prop="alarmLevel">
<el-select v-model="form.alarmLevel" placeholder="请选择预警等级" clearable >
<el-option
v-for="disc in levelList"
:key="disc.id"
:label="disc.alarmName"
:value="disc.id"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="卡片文案" prop="cardCopywriting">
<el-input v-model="form.cardCopywriting" type="textarea" :rows="2" placeholder="请输入内容" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="卡片图片" prop="cardImg">
<ImageUpload :modelValue="form.cardImg" :limit='1' :fileSize="5" @update:modelValue="getImageUrl"/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10" class="mb8" style="justify-content: space-between;">
<el-col :span="1.5">
<div class="form-title" style="display: flex;justify-content: flex-start;align-items: center;">
......@@ -466,6 +494,7 @@
import { addAlg, updateAlg , detailAlg , listAlgFile, addListAlgorithmCase , listCase} from "@/api/algorithmList/index.js";
import { listScene, detailScene , addScene, updateScene, deleteScene} from "@/api/algorithmList/scene.js";
import { listBoundary, detailBoundary , addBoundary, updateBoundary, deleteBoundary} from "@/api/algorithmList/boundary.js";
import { listAlgLevel} from "@/api/algorithmList/algorithmDown.js";
const { proxy } = getCurrentInstance();
const { algorithm_scen, algorithm_case } = proxy.useDict("algorithm_scen", "algorithm_case");
const emit = defineEmits();
......@@ -489,6 +518,7 @@ const wrapList = ref([
]);
const sceneList = ref([]);
const boundaryList = ref([]);
const levelList = ref([]);
const ids = ref([]);
const data = reactive({
form: {},
......@@ -511,6 +541,14 @@ const data = reactive({
const { queryParams, form, formScene,formBoundary, rules } = toRefs(data);
/** 查询预警等级列表 */
function getLevelList() {
listAlgLevel().then(response => {
levelList.value = response.rows;
});
}
getLevelList()
function getImageUrl(url){
form.value.cardImg=url
}
......
......@@ -67,7 +67,7 @@
v-hasPermi="['monitor:job:remove']"
>删除</el-button>
</el-col> -->
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button
type="warning"
plain
......@@ -75,7 +75,7 @@
@click="handleExport"
v-hasPermi="['monitor:job:export']"
>导入</el-button>
</el-col>
</el-col> -->
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
......
......@@ -94,7 +94,7 @@
:type=" item.algorithmStatus=='0'?'success':'danger'"
effect="dark"
>
{{ item.algorithmStatus=='0'?'已启用':'' }}
{{ item.algorithmStatus=='0'?'已启用':'' }}
</el-tag>
</div>
</template>
......@@ -110,7 +110,7 @@
</p>
<div style="display: flex;justify-content: flex-end;position: absolute;right: 15px;bottom: 10px;" >
<el-button link type="primary" icon="Bottom" @click.stop="handleUpdate(item)" >下载</el-button>
<el-button link type="primary" icon="Edit" @click.stop="handleEnable(item)" >{{item.algorithmStatus=='0'?'':'启用' }}</el-button>
<el-button link type="primary" icon="Edit" @click.stop="handleEnable(item)" >{{item.algorithmStatus=='0'?'':'启用' }}</el-button>
<el-button link type="primary" icon="Delete" @click.stop="handleDelete(item)">删除</el-button>
<!-- <el-dropdown trigger="click" @command.stop="handleSetSize">
<el-button link type="primary">
......
......@@ -86,7 +86,7 @@
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="设备名称" width="100" align="center" prop="deviceName" />
<el-table-column label="设备编码" align="center" prop="deviceNo" :show-overflow-tooltip="true" />
<el-table-column label="设备视频流地址" align="center" prop="videoUrl" />
<el-table-column label="设备视频流地址" align="center" prop="videoUrl" :show-overflow-tooltip="true" />
<el-table-column label="创建人" align="center" prop="createBy" :show-overflow-tooltip="true" />
<el-table-column label="创建时间" align="center" prop="createTime" :show-overflow-tooltip="true" />
<el-table-column label="设备是否有效" align="center" prop="isEffective" :show-overflow-tooltip="true" >
......
......@@ -21,7 +21,7 @@
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="所属部门" prop="deptId">
<!-- <el-form-item label="所属部门" prop="deptId">
<el-select v-model="queryParams.deptId" placeholder="请选择所属部门" clearable style="width: 200px">
<el-option
v-for="dict in sys_job_status"
......@@ -30,7 +30,7 @@
:value="dict.value"
/>
</el-select>
</el-form-item>
</el-form-item> -->
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
......
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