Commit 34221e15 by 潘建波

提交子任务编号

1 parent 9ca2a12a
......@@ -16,7 +16,6 @@ export default {
}
let token = localStorage.getItem("atoken");
if (!token) {
console.log('errtoken')
this.$router.push("/login");
}
},
......
......@@ -214,4 +214,19 @@ html,body{
}
.is-opend {
background: red;
}
/* 菜单 */
.el-menu .is-opened{
background:rgba(239,239,239,1);
}
.el-menu .is-opened li {
background:rgba(247,247,247,1);
}
.el-menu-item.is-active{
color: #000000;
}
.el-menu-item.is-active .submenuicon{
background:rgba(0,105,255,1)!important;
}
\ No newline at end of file
......@@ -6,7 +6,7 @@ Vue.use(VueRouter);
export const constantRouterMap = [
{
path: "/",
name: "首页",
name: "交通态势",
component: resolve => require(["../views/Layout/index.vue"], resolve),
redirect: "/login",
children: [
......
......@@ -11,7 +11,7 @@
<el-table-column
align="center"
prop="locationName"
label="抓拍类型"
label="数据类型"
></el-table-column>
<el-table-column
align="center"
......
......@@ -49,7 +49,7 @@
</el-row>
<el-row style="margin-top:1vh">
<div class="bottom-item-box">
<div class="title">实时事件</div>
<div class="title">实时数据</div>
<alarmEvent></alarmEvent>
</div>
</el-row>
......
......@@ -39,7 +39,7 @@
<div class="setting-box">
<div class="set-header ">基础操作</div>
<div class="set-item" @click="setsounces">
场景添加 <span class="set-icon el-icon-circle-plus"></span>
场景配置 <span class="set-icon el-icon-circle-plus"></span>
</div>
<div class="set-item">
轮询播放
......
......@@ -81,6 +81,7 @@
v-for="(item, index) in props.row.subTaskData"
:key="index"
:subTaskData="item"
:subindex="index"
:taskData="props.row"
:freeList="freeList"
>
......
<template>
<div class="expande-table-row">
<span class="label">{{subindex + 1}}</span>
<span class="label">视频源文件</span>
<span class="subtask-info">{{ subTaskData.vchan_name }}</span>
<span class="label">设备地址</span>
......@@ -31,7 +32,7 @@ export default {
assign_id: ""
};
},
props: ["subTaskData", "freeList", "taskData"],
props: ["subTaskData", "freeList", "taskData", "subindex"],
methods: {
subMove() {
let taskID = this.taskData.task_id;
......
......@@ -10,7 +10,7 @@
<el-table-column
align="center"
prop="illname"
label="抓拍类型"
label="数据类型"
></el-table-column>
<el-table-column
align="center"
......
......@@ -53,10 +53,10 @@
<div class="title">重点车辆分布</div>
<div class="car-dis-info">
<div class="left-icon">
<span class="icon-fanxin-bianzu2"></span>
<span class="icon-fanxing-zhatuchezhuapai"></span>
</div>
<div class="right-content">
<div class>
<div>
<span class="car-num">10</span>
</div>
<div>渣土车抓拍</div>
......@@ -64,10 +64,10 @@
</div>
<div class="car-dis-info">
<div class="left-icon">
<span class="icon-fanxin-bianzu2"></span>
<span class="icon-fanxing-weixianpin"></span>
</div>
<div class="right-content">
<div class>
<div>
<span class="car-num">10</span>
</div>
<div>危险品车</div>
......@@ -75,7 +75,7 @@
</div>
<div class="car-dis-info">
<div class="left-icon">
<span class="icon-fanxin-bianzu2"></span>
<span class="icon-fanxing-zhongxingguanshi"></span>
</div>
<div class="right-content">
<div class>
......@@ -94,7 +94,7 @@
</el-row>
<el-row class="clearpright" style="margin-top:1vh">
<div class="right-item-box">
<div class="title">实时事件</div>
<div class="title">实时数据</div>
<alarmEvent @event="alarmevent"></alarmEvent>
</div>
</el-row>
......
......@@ -65,7 +65,7 @@
<ocxplay ref="ocx"></ocxplay>
</div>
<div style="background: #FFFFFF;width: 789px">
<div class="title">实时事件</div>
<div class="title">实时数据</div>
<el-table
height="349"
:data="tableData"
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!