Skip to content

R
RuoYi-Vue-ui
Commit 9e7a0bb1 authored by 胡占生's avatar 胡占生 🇨🇳
Browse files
Options

fix:变更页面表单内容，使其符合交付文档。

parent f2481089
Hide whitespace changes
Inline Side-by-side
Showing with 59 additions and 27 deletions
src/views/algorithm/base/index.vue
View file @ 9e7a0bb1
......@@ -56,11 +56,11 @@
<el-table v-loading="loading" :data="baseList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="主键id" align="center" prop="id" />
<!-- <el-table-column label="主键id" align="center" prop="id" /> -->
<el-table-column label="算法名称" align="center" prop="algorithmName" />
<el-table-column label="算法唯一标识" align="center" prop="algorithmKey" />
<el-table-column label="预警类型" align="center" prop="types" />
<el-table-column label="创建人" align="center" prop="createBy" />
<!-- <el-table-column label="预警类型" align="center" prop="types" /> -->
<!-- <el-table-column label="创建人" align="center" prop="createBy" /> -->
<el-table-column label="创建时间" align="center" prop="createTime" width="160">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
......@@ -109,6 +109,16 @@
<el-form-item label="算法唯一标识" prop="algorithmKey">
<el-input v-model="form.algorithmKey" placeholder="请输入算法唯一标识" />
</el-form-item>
<!-- <el-form-item label="预警类型" prop="algorithmId">
<el-select @change="sceneChange" v-model="form.algorithmId" placeholder="请选择场景算法">
<el-option
v-for="item in sceneOptions"
:key="item.id"
:label="item.algorithmName"
:value="item.id">
</el-option>
</el-select>
</el-form-item> -->
<el-form-item label="排序" prop="sort">
<el-input-number v-model="form.sort" :min="0" :max="100"></el-input-number>
</el-form-item>
......
src/views/algorithm/camera/index.vue
View file @ 9e7a0bb1
......@@ -20,7 +20,7 @@
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<el-form-item label="状态" prop="status">
<!-- <el-form-item label="状态" prop="status">
<el-select
v-model="queryParams.status"
placeholder="状态"
......@@ -34,7 +34,7 @@
:value="dict.value"
/>
</el-select>
</el-form-item>
</el-form-item> -->
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
......@@ -57,10 +57,10 @@
<el-table v-loading="loading" :data="baseList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="主键id" align="center" prop="id" />
<!-- <el-table-column label="主键id" align="center" prop="id" /> -->
<el-table-column label="摄像头名" align="center" prop="cameraName" />
<el-table-column label="摄像头视频流地址" align="center" prop="rtsp" />
<el-table-column label="创建人" align="center" prop="createBy" />
<el-table-column label="摄像头视频流地址" show-overflow-tooltip align="center" prop="rtsp" />
<!-- <el-table-column label="创建人" align="center" prop="createBy" /> -->
<el-table-column label="创建时间" align="center" prop="createTime" width="160">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
......@@ -112,6 +112,21 @@
<el-form-item label="排序" prop="sort">
<el-input v-model="form.sort" placeholder="请输入排序" />
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select
v-model="form.status"
placeholder="状态"
clearable
style="width: 240px"
>
<el-option
v-for="dict in dict.type.sys_normal_disable"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
......
src/views/algorithm/piece/index.vue
View file @ 9e7a0bb1
......@@ -57,10 +57,18 @@
<el-table v-loading="loading" :data="baseList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="主键id" align="center" prop="id" />
<!-- <el-table-column label="主键id" align="center" prop="id" /> -->
<el-table-column label="算法块名" align="center" prop="pieceName" />
<el-table-column label="所需参数" align="center" prop="variables" />
<el-table-column label="创建人" align="center" prop="createBy" />
<el-table-column label="所需参数" show-overflow-tooltip align="center" prop="variables">
<template slot-scope="scope">
<div v-for="item in scope.row.variables">
<div>参数名称：{{item.variableName}};</div>
<div>参数唯一标识：{{item.variableKey}};</div>
</div>
<!-- <div>参数类型：{{scope.row.variables[0].variableType}}</div> -->
</template>
</el-table-column>
<!-- <el-table-column label="创建人" align="center" prop="createBy" /> -->
<el-table-column label="创建时间" align="center" prop="createTime" width="160">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
......
src/views/algorithm/scene/index.vue
View file @ 9e7a0bb1
......@@ -4,19 +4,19 @@
<el-form-item label="场景名" prop="sceneName">
<el-input
v-model="queryParams.sceneName"
placeholder="请输入场景名"
placeholder="请输入场景名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="算法id" prop="algorithmId">
<!-- <el-form-item label="算法id" prop="algorithmId">
<el-input
v-model="queryParams.algorithmId"
placeholder="请输入算法id"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-form-item> -->
<el-form-item label="创建时间">
<el-date-picker
v-model="dateRange"
......@@ -67,22 +67,22 @@
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="主键id" align="center" prop="id" /> -->
<el-table-column label="场景名称" align="center" prop="sceneName" />
<el-table-column label="分流预警类型" align="center" prop="alarmTypes">
<!-- <el-table-column label="分流预警类型" align="center" prop="alarmTypes">
<template slot-scope="scope">
<span v-for="item in scope.row.alarmTypes">{{ item.typeName }}，</span>
</template>
</el-table-column>
<el-table-column label="每秒帧数" align="center" prop="frameSecond" />
</el-table-column> -->
<el-table-column label="预警检测间隔" align="center" prop="frameSecond" />
<el-table-column label="场景摄像头" show-overflow-tooltip align="center" prop="cameraIdList" />
<el-table-column label="算法" align="center" prop="algorithmName" />
<el-table-column label="创建人" align="center" prop="createBy" />
<!-- <el-table-column label="创建人" align="center" prop="createBy" /> -->
<el-table-column label="创建时间" align="center" prop="createTime" width="160">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column label="排序" align="center" prop="sort" />
<el-table-column label="是否在线" align="center" prop="live" />
<!-- <el-table-column label="是否在线" align="center" prop="live" /> -->
<el-table-column prop="status" label="状态" width="80">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
......@@ -96,7 +96,7 @@
icon="el-icon-edit"
@click="editStatus(scope.row)"
v-hasPermi="['system:algorithmScene:editStatus']"
>{{scope.row.status==1?'启用':'禁用'}}</el-button>
>{{scope.row.status==1?'启动':'停止'}}</el-button>
<el-button
size="mini"
type="text"
......@@ -111,13 +111,13 @@
@click="handleDelete(scope.row)"
v-hasPermi="['system:algorithmScene:remove']"
>删除</el-button>
<el-button
<!-- <el-button
size="mini"
type="text"
icon="el-icon-document-copy"
@click="copyAlgorithm(scope.row)"
v-hasPermi="['system:algorithmScene:copy']"
>复制</el-button>
>复制</el-button> -->
</template>
</el-table-column>
</el-table>
......@@ -146,7 +146,7 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="分流预警类型" prop="alarmTypes">
<!-- <el-form-item label="分流预警类型" prop="alarmTypes">
<el-select multiple v-model="form.alarmTypes" placeholder="请选择分流预警类型">
<el-option
v-for="item in typeOptions"
......@@ -155,9 +155,9 @@
:value="item.typeKey">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="每秒帧数" prop="frameSecond">
<el-input v-model="form.frameSecond" placeholder="请输入每秒帧数" />
</el-form-item> -->
<el-form-item label="预警检测间隔" prop="frameSecond">
<el-input v-model="form.frameSecond" placeholder="请输入预警检测间隔" />
</el-form-item>
<el-form-item label="摄像头配置" prop="cameraIdList">
<el-select multiple v-model="form.cameraIdList" placeholder="请选择摄像头">
......@@ -457,7 +457,6 @@
editStatus(row){
editStatus({id:row.id,status:row.status==1?0:1}).then(res=>{
this.getList();
console.log('%c [ res ]-432', 'font-size:13px; background:pink; color:#bf2c9f;', res)
})
},
/** 提交按钮 */
......
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