Skip to content

platform / fanxing_new

Go to a project
Commit 34221e15 by 潘建波
Options

提交子任务编号

1 parent 9ca2a12a
Inline Side-by-side
Showing 11 changed files with 30 additions and 14 deletions
src/App.vue
...@@ -16,7 +16,6 @@ export default { ...@@ -16,7 +16,6 @@ export default {
} }
let token = localStorage.getItem("atoken"); let token = localStorage.getItem("atoken");
if (!token) { if (!token) {
console.log('errtoken')
this.$router.push("/login"); this.$router.push("/login");
} }
}, },
......
src/assets/css/public.css
...@@ -215,3 +215,18 @@ html,body{ ...@@ -215,3 +215,18 @@ html,body{
.is-opend { .is-opend {
background: red; 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 \ No newline at end of file
src/router/index.js
...@@ -6,7 +6,7 @@ Vue.use(VueRouter); ...@@ -6,7 +6,7 @@ Vue.use(VueRouter);
export const constantRouterMap = [ export const constantRouterMap = [
{ {
path: "/", path: "/",
name: "首页", name: "交通态势",
component: resolve => require(["../views/Layout/index.vue"], resolve), component: resolve => require(["../views/Layout/index.vue"], resolve),
redirect: "/login", redirect: "/login",
children: [ children: [
......
src/views/behaviorShow/alarmEvent.vue
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<el-table-column <el-table-column
align="center" align="center"
prop="locationName" prop="locationName"
label="抓拍类型" label="数据类型"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
align="center" align="center"
......
src/views/behaviorShow/index.vue
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
</el-row> </el-row>
<el-row style="margin-top:1vh"> <el-row style="margin-top:1vh">
<div class="bottom-item-box"> <div class="bottom-item-box">
<div class="title">实时事件</div> <div class="title">实时数据</div>
<alarmEvent></alarmEvent> <alarmEvent></alarmEvent>
</div> </div>
</el-row> </el-row>
......
src/views/sceneManage/setting/index.vue
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<div class="setting-box"> <div class="setting-box">
<div class="set-header ">基础操作</div> <div class="set-header ">基础操作</div>
<div class="set-item" @click="setsounces"> <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>
<div class="set-item"> <div class="set-item">
轮询播放 轮询播放
......
src/views/taskManage/index.vue
...@@ -81,6 +81,7 @@ ...@@ -81,6 +81,7 @@
v-for="(item, index) in props.row.subTaskData" v-for="(item, index) in props.row.subTaskData"
:key="index" :key="index"
:subTaskData="item" :subTaskData="item"
:subindex="index"
:taskData="props.row" :taskData="props.row"
:freeList="freeList" :freeList="freeList"
> >
......
src/views/taskManage/subtask.vue
<template> <template>
<div class="expande-table-row"> <div class="expande-table-row">
<span class="label">{{subindex + 1}}</span>
<span class="label">视频源文件</span> <span class="label">视频源文件</span>
<span class="subtask-info">{{ subTaskData.vchan_name }}</span> <span class="subtask-info">{{ subTaskData.vchan_name }}</span>
<span class="label">设备地址</span> <span class="label">设备地址</span>
...@@ -31,7 +32,7 @@ export default { ...@@ -31,7 +32,7 @@ export default {
assign_id: "" assign_id: ""
}; };
}, },
props: ["subTaskData", "freeList", "taskData"], props: ["subTaskData", "freeList", "taskData", "subindex"],
methods: { methods: {
subMove() { subMove() {
let taskID = this.taskData.task_id; let taskID = this.taskData.task_id;
......
src/views/trafficShow/alarmEvent.vue
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<el-table-column <el-table-column
align="center" align="center"
prop="illname" prop="illname"
label="抓拍类型" label="数据类型"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
align="center" align="center"
......
src/views/trafficShow/index.vue
...@@ -53,10 +53,10 @@ ...@@ -53,10 +53,10 @@
<div class="title">重点车辆分布</div> <div class="title">重点车辆分布</div>
<div class="car-dis-info"> <div class="car-dis-info">
<div class="left-icon"> <div class="left-icon">
<span class="icon-fanxin-bianzu2"></span> <span class="icon-fanxing-zhatuchezhuapai"></span>
</div> </div>
<div class="right-content"> <div class="right-content">
<div class> <div>
<span class="car-num">10</span>辆 <span class="car-num">10</span>辆
</div> </div>
<div>渣土车抓拍</div> <div>渣土车抓拍</div>
...@@ -64,10 +64,10 @@ ...@@ -64,10 +64,10 @@
</div> </div>
<div class="car-dis-info"> <div class="car-dis-info">
<div class="left-icon"> <div class="left-icon">
<span class="icon-fanxin-bianzu2"></span> <span class="icon-fanxing-weixianpin"></span>
</div> </div>
<div class="right-content"> <div class="right-content">
<div class> <div>
<span class="car-num">10</span>辆 <span class="car-num">10</span>辆
</div> </div>
<div>危险品车</div> <div>危险品车</div>
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
</div> </div>
<div class="car-dis-info"> <div class="car-dis-info">
<div class="left-icon"> <div class="left-icon">
<span class="icon-fanxin-bianzu2"></span> <span class="icon-fanxing-zhongxingguanshi"></span>
</div> </div>
<div class="right-content"> <div class="right-content">
<div class> <div class>
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
</el-row> </el-row>
<el-row class="clearpright" style="margin-top:1vh"> <el-row class="clearpright" style="margin-top:1vh">
<div class="right-item-box"> <div class="right-item-box">
<div class="title">实时事件</div> <div class="title">实时数据</div>
<alarmEvent @event="alarmevent"></alarmEvent> <alarmEvent @event="alarmevent"></alarmEvent>
</div> </div>
</el-row> </el-row>
......
src/views/trafficShow/indexback.vue
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
<ocxplay ref="ocx"></ocxplay> <ocxplay ref="ocx"></ocxplay>
</div> </div>
<div style="background: #FFFFFF;width: 789px"> <div style="background: #FFFFFF;width: 789px">
<div class="title">实时事件</div> <div class="title">实时数据</div>
<el-table <el-table
height="349" height="349"
:data="tableData" :data="tableData"
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!