Commit fa2c5df3 authored by 胡占生's avatar 胡占生 🇨🇳

fix:UI方面调整,修复字段显示中文

parent c2efb733
......@@ -59,7 +59,7 @@
<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="cameraName" />
<el-table-column label="摄像头视频流地址" show-overflow-tooltip align="center" prop="rtsp" />
<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">
......@@ -106,8 +106,8 @@
<el-form-item label="摄像头名" prop="cameraName">
<el-input v-model="form.cameraName" placeholder="请输入摄像头名" />
</el-form-item>
<el-form-item label="摄像头视频流地址" prop="rtsp">
<el-input v-model="form.rtsp" placeholder="请输入摄像头视频流地址" />
<el-form-item label="摄像头编号" prop="rtsp">
<el-input v-model="form.rtsp" placeholder="请输入摄像头编号" />
</el-form-item>
<el-form-item label="排序" prop="sort">
<el-input v-model="form.sort" placeholder="请输入排序" />
......
......@@ -72,8 +72,12 @@
<span v-for="item in scope.row.alarmTypes">{{ item.typeName }}</span>
</template>
</el-table-column> -->
<el-table-column label="预警检测间隔" align="center" prop="frequency" />
<el-table-column label="场景摄像头" show-overflow-tooltip align="center" prop="cameraIdList" />
<!-- <el-table-column label="预警检测间隔" align="center" prop="frequency" /> -->
<el-table-column label="场景摄像头" show-overflow-tooltip align="center" prop="cameraIdList">
<template slot-scope="scope">
<span>{{ outputName(scope.row.cameras) }}</span>
</template>
</el-table-column>
<el-table-column label="算法" align="center" prop="algorithmName" />
<!-- <el-table-column label="创建人" align="center" prop="createBy" /> -->
<el-table-column label="创建时间" align="center" prop="createTime" width="160">
......@@ -81,7 +85,7 @@
<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="sort" /> -->
<!-- <el-table-column label="是否在线" align="center" prop="live" /> -->
<el-table-column prop="status" label="状态" width="80">
<template slot-scope="scope">
......@@ -156,9 +160,9 @@
</el-option>
</el-select>
</el-form-item> -->
<el-form-item label="预警检测间隔" prop="frequency">
<!-- <el-form-item label="预警检测间隔" prop="frequency">
<el-input v-model="form.frequency" placeholder="请输入预警检测间隔" />
</el-form-item>
</el-form-item> -->
<el-form-item label="摄像头配置" prop="cameraIdList">
<el-select multiple v-model="form.cameraIdList" placeholder="请选择摄像头">
<el-option
......@@ -389,6 +393,18 @@
this.title = "修改算法场景";
});
},
outputName(arr){
var str=''
if(arr!=null&&arr.length>0){
arr.forEach(item=>{
str+=item.cameraName+','
})
}else{
str='-'
}
return str
},
handleAlgUpdate(row) {
row.isEdit=true
},
......
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