Skip to content

platform / fanxing_new

Go to a project
Commit dcb9d66c by 潘建波
Options

🐛修改任务下发后再获取下发设备显示依旧是空的问题

1 parent c790af3c
Inline Side-by-side
Showing 5 changed files with 38 additions and 21 deletions
dist.zip
No preview for this file type
public/js/version.json
{"commit":"57400486932693cf04f4dc6ea790f673324fbf76","commitDate":"2020-7-14 18:27","buildDate":"2020-7-15 16:56","version":"2.0.5","info":"fix🐛 【BUG】效果展示”界面内抓拍结果的“抓拍时间”和“违法类型”项空白 【BUG】效果展示”界面无法点播视频 【BUG】选中的模型线类型与实际画线效果不一致 【BUG】新添加模型框移动标定线会消失 【NEW】新增云台控制拉近拉远 【NEW】设备管理,无法显示出设备类型"}
\ No newline at end of file \ No newline at end of file
{"commit":"c790af3c1814219815649c0ceaa1a520d7bfde97","commitDate":"2020-7-15 16:58","buildDate":"2020-7-15 18:13","version":"2.0.5","info":"fix🐛 修改事件导出bug"}
\ No newline at end of file \ No newline at end of file
src/api/baseUrl.js
...@@ -4,7 +4,7 @@ console.log(process.env.NODE_ENV); ...@@ -4,7 +4,7 @@ console.log(process.env.NODE_ENV);
switch (process.env.NODE_ENV) { switch (process.env.NODE_ENV) {
case "development": case "development":
// baseUrl = "http://192.168.9.234:20080"; // 测试环境url // baseUrl = "http://192.168.9.234:20080"; // 测试环境url
baseUrl = "http://192.168.9.133:20080"; // 测试环境url baseUrl = "http://192.168.9.233:20080"; // 测试环境url
// baseUrl = "http://192.168.9.82:8080"; // 测试环境url // baseUrl = "http://192.168.9.82:8080"; // 测试环境url
// baseUrl = "http://192.168.9.61:8086"; // baseUrl = "http://192.168.9.61:8086";
// baseUrl = 'http://vion-panda.51vip.biz:52510'; // baseUrl = 'http://vion-panda.51vip.biz:52510';
......
src/views/taskManage/index.vue
...@@ -335,6 +335,7 @@ export default { ...@@ -335,6 +335,7 @@ export default {
} else { } else {
//关闭主任务 //关闭主任务
row.isexpand = false; row.isexpand = false;
row.subTaskData = [];
} }
}, },
statusFormatter(row) { statusFormatter(row) {
......
src/views/taskManage/subtask.vue
<template> <template>
<div class="expande-table-row"> <div class="expande-table-row">
<span class="label labelindex">{{ subindex + 1 }}</span> <span class="label labelindex">{{ subindex + 1 }}</span>
<span class="subtask-info taskstatus" v-html="formater(subTaskData)" @click="showinfo(subTaskData)"></span> <span
class="subtask-info taskstatus"
v-html="formater(subTaskData)"
@click="showinfo(subTaskData)"
></span>
<span class="label">视频源文件</span> <span class="label">视频源文件</span>
<span class="subtask-info" :title="subTaskData.vchan_name">{{ subTaskData.vchan_name }}</span> <span class="subtask-info" :title="subTaskData.vchan_name">{{
subTaskData.vchan_name
}}</span>
<span class="label">任务ID</span> <span class="label">任务ID</span>
<span class="subtask-info">{{ subTaskData.subtask_id }}</span> <span class="subtask-info">{{ subTaskData.subtask_id }}</span>
<!-- <span class="label">设备地址</span> <!-- <span class="label">设备地址</span>
...@@ -14,8 +20,8 @@ ...@@ -14,8 +20,8 @@
<span class="subtask-info">{{ subTaskData.video_total }}</span> --> <span class="subtask-info">{{ subTaskData.video_total }}</span> -->
<span class="label">任务信息</span> <span class="label">任务信息</span>
<span class="subtask-info">{{ subTaskData.info }}</span> <span class="subtask-info">{{ subTaskData.info }}</span>
<span class="label">分析设备</span> <span class="label" hidden>分析设备</span>
<span class="subtask-info"> <span class="subtask-info" hidden>
<el-select v-model="assign_id"> <el-select v-model="assign_id">
<!-- <el-option <!-- <el-option
v-for="(item, index) in freeList" v-for="(item, index) in freeList"
...@@ -31,9 +37,20 @@ ...@@ -31,9 +37,20 @@
v-for="(item, index) in freeList" v-for="(item, index) in freeList"
:key="index" :key="index"
:value="item.device_id" :value="item.device_id"
:label="item.in_ip + item.license_info.platType" :label="
`${item.in_ip} ${(item.license_info.platType =
item.license_info.platType != item.in_ip
? item.license_info.platType
: '')}`
"
> >
{{ item.in_ip }} {{ item.license_info.platType }} {{ item.in_ip }}
{{
(item.license_info.platType =
item.license_info.platType != item.in_ip
? item.license_info.platType
: "")
}}
</el-option> </el-option>
<!-- <el-option <!-- <el-option
v-for="(item, index) in freeList" v-for="(item, index) in freeList"
...@@ -52,7 +69,7 @@ ...@@ -52,7 +69,7 @@
</el-option> --> </el-option> -->
</el-select> </el-select>
</span> </span>
<span class="label sub-btn" @click="subMove">确定</span> <span class="label sub-btn" @click="subMove" hidden>确定</span>
</div> </div>
</template> </template>
...@@ -75,15 +92,12 @@ export default { ...@@ -75,15 +92,12 @@ export default {
} }
let taskID = this.taskData.task_id; let taskID = this.taskData.task_id;
let subTaksID = this.subTaskData.subtask_id; let subTaksID = this.subTaskData.subtask_id;
this.$api.task.getTaskParams(taskID, subTaksID).then(res => { let obj = {};
let obj = {}; obj.assign_to = {
obj.mtasks = res.mtasks; id: this.assign_id,
obj.assign_to = { flag: 0
id: this.assign_id, };
flag: 0 this.subRoi(taskID, subTaksID, obj);
};
this.subRoi(taskID, subTaksID, obj);
});
}, },
subRoi(taskid, subtaskid, postObj) { subRoi(taskid, subtaskid, postObj) {
this.$api.task this.$api.task
...@@ -127,10 +141,13 @@ export default { ...@@ -127,10 +141,13 @@ export default {
} }
}, },
created() { created() {
this.assign_id = "";
// console.log(this.subTaskData); // console.log(this.subTaskData);
}, },
watch: {}, watch: {},
mounted() {} mounted() {
this.assign_id = this.subTaskData.assign_id;
}
}; };
</script> </script>
...@@ -143,7 +160,7 @@ export default { ...@@ -143,7 +160,7 @@ export default {
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;
overflow: hidden; overflow: hidden;
} }
span:last-child{ span:last-child {
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;
cursor: pointer; cursor: pointer;
} }
...@@ -181,7 +198,6 @@ export default { ...@@ -181,7 +198,6 @@ export default {
} }
.subtask-info:nth-child(10) { .subtask-info:nth-child(10) {
width: 10vw; width: 10vw;
} }
.subtask-info:nth-child(12) { .subtask-info:nth-child(12) {
width: 3vw; width: 3vw;
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!