Commit 48105429 by 潘建波

🐛 1.【标定设置】保存后视频播放窗口会黑屏,实际视频还在播放<br/>2.场景设置只显示运行中的任务

1 parent 6d9e8b1d
No preview for this file type
......@@ -4,7 +4,7 @@ console.log(process.env.NODE_ENV);
switch (process.env.NODE_ENV) {
case "development":
// baseUrl = "http://192.168.9.234:20080"; // 测试环境url
baseUrl = "http://192.168.9.62:20080"; // 测试环境url
baseUrl = "http://192.168.9.149:20080"; // 测试环境url
// baseUrl = "http://192.168.9.82:8080"; // 测试环境url
// baseUrl = "http://192.168.9.61:8086";
// baseUrl = 'http://vion-panda.51vip.biz:52510';
......
......@@ -18,7 +18,7 @@
v-for="(item, index) in taskdata"
:key="index"
@click="selecttask(item, index)"
v-if=" item.status == 'Running'"
v-if="item.status == 'Running'"
>
<span
:class="{
......@@ -45,6 +45,7 @@
:title="subTask.subtask_name"
v-for="subTask in subTasks"
:key="subTask.subtask_id"
v-show="subTask.enableStatus != 1"
:class="[
{ subtaskActive: subTask.subtask_id == currentSubtaskId },
{ disabledColor: subTask.enableStatus == 5 }
......@@ -105,7 +106,7 @@ export default {
taskdata: [],
subtaskdata: "",
subTasks: [],
vchandata:{},
vchandata: {},
subindex: -1,
playurl: "",
taskID: "",
......@@ -128,6 +129,7 @@ export default {
});
},
subTasksClick(vdata) {
console.log(vdata);
//删除中的任务不能点击
if (vdata.enableStatus == 5) {
return;
......@@ -135,7 +137,6 @@ export default {
this.$store.commit("setocxstate", 1);
this.currentSubtaskId = vdata.subtask_id;
this.subtaskdata = vdata;
console.log('vdata',vdata)
this.$refs.setting.TaskParams(vdata.subtask_id);
if (vdata.running_status != "Running") {
this.$message({
......@@ -163,7 +164,7 @@ export default {
let data = {
send_stream: true,
task_id: this.currentSubtaskId,
is_analyse: true,
is_analyse: true
};
this.$api.task
.getStream(this.dev_unid, vdata.vchan.vchan_refid, data)
......
......@@ -801,6 +801,7 @@ export default {
this.XMLstr = this.oParse.writeXML(obj);
this.$parent.submit(this.XMLstr, "calibration", this.taskData);
this.dialogVisible = false;
this.handleClose();
},
clear: function() {
(this.traffic = {
......
......@@ -70,7 +70,7 @@
:visible-arrow="false"
>
<span
class="el-icon-delete delIcon"
:class="{'el-icon-delete':true, 'delIcon':true,'nodel': scope.row.enableStatus == 5?true:false}"
@click="delFun(scope.$index, scope.row)"
></span>
</el-tooltip>
......@@ -265,6 +265,9 @@ export default {
console.log("b", data);
},
delFun(index, data, action = "tree") {
if (data.enableStatus == 5) {
return;
}
if (!data.subtask_id) {
this.tableData.forEach((ele, i) => {
if (ele.vchan_refid == data.vchan_refid) {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!