Commit 2f89847c authored by 胡占生's avatar 胡占生 🇨🇳

feat: 算法场景 表单内容字段调整,

parent 08ff6f53
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
/> />
<!-- 添加或修改算法场景对话框 --> <!-- 添加或修改算法场景对话框 -->
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="150px"> <el-form ref="form" :model="form" :rules="rules" label-width="150px">
<el-form-item label="场景名称" prop="sceneName"> <el-form-item label="场景名称" prop="sceneName">
<el-input v-model="form.sceneName" placeholder="请输入场景名称" /> <el-input v-model="form.sceneName" placeholder="请输入场景名称" />
...@@ -144,7 +144,6 @@ ...@@ -144,7 +144,6 @@
<el-form-item label="摄像头配置" prop="cameraIdList"> <el-form-item label="摄像头配置" prop="cameraIdList">
<el-select multiple v-model="form.cameraIdList" placeholder="请选择摄像头"> <el-select multiple v-model="form.cameraIdList" placeholder="请选择摄像头">
<el-option <el-option
v-for="item in cameraOptions" v-for="item in cameraOptions"
:key="item.id" :key="item.id"
:label="item.cameraName" :label="item.cameraName"
...@@ -154,10 +153,10 @@ ...@@ -154,10 +153,10 @@
</el-form-item> </el-form-item>
<el-form-item label="算法块" prop="pieceDtos"> <el-form-item label="算法块" prop="pieceDtos">
<el-table v-loading="loading" :data="form.pieceDtos" > <el-table v-loading="loading" :data="form.pieceDtos" >
<el-table-column label="算法块名称" align="center" prop="sceneName"> <el-table-column label="算法块名称" align="center" prop="id">
<template slot-scope="scope"> <template slot-scope="scope">
<div> <div>
<el-select :disabled="!scope.row.isEdit" @change="pieceChange(scope.row)" v-model="scope.row.sceneName" placeholder="请选择"> <el-select :disabled="!scope.row.isEdit" @change="pieceChange(scope.row)" v-model="scope.row.id" placeholder="请选择">
<el-option <el-option
v-for="item in pieceOptions" v-for="item in pieceOptions"
:key="item.id" :key="item.id"
...@@ -168,10 +167,10 @@ ...@@ -168,10 +167,10 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="算法块配置" align="center" prop="algConfig" > <el-table-column label="算法块配置" align="center" prop="variables" >
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="!scope.row.isEdit"> <div v-if="!scope.row.isEdit">
<span v-for="item in scope.row.algConfig"> {{ item.variableName+':'+item.variableValue }}</span> <span v-for="item in scope.row.variables"> {{ item.variableName+':'+item.variableValue }}</span>
</div> </div>
<div v-else> <div v-else>
<el-popover <el-popover
...@@ -179,7 +178,7 @@ ...@@ -179,7 +178,7 @@
width="300" width="300"
v-model="visible"> v-model="visible">
<div> <div>
<el-table :show-header="false" :data="scope.row.algConfig"> <el-table :show-header="false" :data="scope.row.variables">
<el-table-column label="算法块名称" align="center" prop="variableKey" witdh="200"> <el-table-column label="算法块名称" align="center" prop="variableKey" witdh="200">
<template slot-scope="scopes"> <template slot-scope="scopes">
<div style="display: flex;" > <div style="display: flex;" >
...@@ -198,11 +197,11 @@ ...@@ -198,11 +197,11 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="排序" align="center" prop="sort" > <el-table-column label="排序" align="center" prop="sort" width="220">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="!scope.row.isEdit">{{ scope.row.sort }}</div> <div v-if="!scope.row.isEdit">{{ scope.row.sort }}</div>
<div v-else> <div v-else>
<el-input v-model="scope.row.sort"></el-input> <el-input-number v-model="scope.row.sort" :min="0" :max="100"></el-input-number>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
...@@ -374,8 +373,8 @@ ...@@ -374,8 +373,8 @@
}, },
algAdd(){ algAdd(){
this.form.pieceDtos.push({ this.form.pieceDtos.push({
sceneName:'', id:'',
algConfig:[ variables:[
{ {
algorithmPieceBaseId: 1, algorithmPieceBaseId: 1,
variableKey: "frame", variableKey: "frame",
...@@ -407,9 +406,9 @@ ...@@ -407,9 +406,9 @@
}) })
}, },
pieceChange(e){ pieceChange(e){
variableList(e.sceneName).then(res=>{ variableList(e.id).then(res=>{
console.log('%c [ res ]-411', 'font-size:13px; background:pink; color:#bf2c9f;', res) console.log('%c [ res ]-411', 'font-size:13px; background:pink; color:#bf2c9f;', res)
e.algConfig=res.data e.variables=res.data
// this.typeOptions=res.data // this.typeOptions=res.data
}) })
}, },
......
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