diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue index aa1f5da..e3fedf0 100644 --- a/src/layout/components/Sidebar/Item.vue +++ b/src/layout/components/Sidebar/Item.vue @@ -19,7 +19,10 @@ export default { if (icon) { if (icon.includes('el-icon')) { vnodes.push() - } else { + } else if (icon.includes('icon-')) { + // vnodes.push() + vnodes.push() + }else { vnodes.push() } } @@ -38,4 +41,8 @@ export default { width: 1em; height: 1em; } +.myiconfont{ + width: 1em;margin: 0 20px 0 0px; + height: 1em; +} diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue index 187de36..8691f4b 100644 --- a/src/layout/components/Sidebar/index.vue +++ b/src/layout/components/Sidebar/index.vue @@ -38,7 +38,10 @@ alwaysShow: true, component: "index", meta: { - icon: "el-icon-menu", + // icon: "el-icon-menu", + + icon: "icon-shouye", + title: "首页", }, name: "", @@ -58,7 +61,7 @@ alwaysShow: true, component: "monitor", meta: { - icon: "el-icon-menu", + icon: "icon-shipin1", title: "视频中心", }, name: "", @@ -94,11 +97,31 @@ // path: "/gongyingshang/gongyingshanggaunli", // }] // }, + { + alwaysShow: true, + component: "dianzixungeng", + meta: { + icon: "icon-jingwuicon_svg-", + title: "电子巡更", + }, + name: "", + path: "/dianzixungeng/dianzixungengL", + // children: [{ + // alwaysShow: true, + // component: "index", + // meta: { + // icon: "el-icon-help", + // title: "电子巡更", + // }, + // name: "/dianzixungeng/dianzixungengL", + // path: "/dianzixungeng/dianzixungengL", + // }] + }, { alwaysShow: true, component: "renlianshibie", meta: { - icon: "el-icon-menu", + icon: "icon-renlianshibie6", title: "人脸识别", }, name: "", @@ -114,11 +137,31 @@ // path: "/renlianshibie/renlianshibieList", // }] }, + { + alwaysShow: true, + component: "xiaofangbaojing", + meta: { + icon: "icon-baojingshu", + title: "消防报警", + }, + name: "", + path: "/xiaofangbaojing/xiaofangbaojingL", + // children: [{ + // alwaysShow: true, + // component: "index", + // meta: { + // icon: "el-icon-help", + // title: "消防报警", + // }, + // name: "/xiaofangbaojing/xiaofangbaojingL", + // path: "/xiaofangbaojing/xiaofangbaojingL", + // }] + }, { alwaysShow: true, component: "shebeitaizhang", meta: { - icon: "el-icon-menu", + icon: "icon-supervision", title: "设备台账", }, name: "", @@ -138,7 +181,7 @@ alwaysShow: true, component: "baojingchaxun", meta: { - icon: "el-icon-menu", + icon: "icon-baojing", title: "报警查询", }, name: "", @@ -158,7 +201,7 @@ alwaysShow: true, component: "shebeizhuangtai", meta: { - icon: "el-icon-menu", + icon: "icon-shebeizhuangtai1", title: "设备状态", }, name: "", @@ -178,7 +221,7 @@ alwaysShow: true, component: "shebeirizhi", meta: { - icon: "el-icon-menu", + icon: "icon-nenghaoshuju", title: "设备日志", }, name: "", diff --git a/src/router/index.js b/src/router/index.js index 2d4f136..bcbc72e 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -192,6 +192,46 @@ export const constantRoutes = [ }, ], }, + ////电子巡更 + { + path: "/dianzixungengL", + component: Layout, + redirect: "/dianzixungeng/dianzixungengL", + meta: { + title: "电子巡更", + }, + children: [ + { + path: "/dianzixungeng/dianzixungengL", + component: () => import("@/views/dianzixungeng/dianzixungengL.vue"), + name: "dianzixungengL", + meta: { + title: "电子巡更", + noCache: true, + }, + }, + ], + }, + ////消防报警 + { + path: "/xiaofangbaojingL", + component: Layout, + redirect: "/xiaofangbaojing/xiaofangbaojingL", + meta: { + title: "消防报警", + }, + children: [ + { + path: "/xiaofangbaojing/xiaofangbaojingL", + component: () => import("@/views/xiaofangbaojing/xiaofangbaojingL.vue"), + name: "xiaofangbaojingL", + meta: { + title: "消防报警", + noCache: true, + }, + }, + ], + }, //// ...codemenu, diff --git a/src/views/dianzixungeng/dianzixungengL.vue b/src/views/dianzixungeng/dianzixungengL.vue new file mode 100644 index 0000000..e63312c --- /dev/null +++ b/src/views/dianzixungeng/dianzixungengL.vue @@ -0,0 +1,740 @@ + + + + + diff --git a/src/views/echarts/components/PieChartrenyuanb.vue b/src/views/echarts/components/PieChartrenyuanb.vue new file mode 100644 index 0000000..d579028 --- /dev/null +++ b/src/views/echarts/components/PieChartrenyuanb.vue @@ -0,0 +1,317 @@ + + + diff --git a/src/views/index.vue b/src/views/index.vue index b61e90a..74059ff 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -25,7 +25,7 @@
正常:36
离线:16
-
报警:15
+
@@ -86,7 +86,7 @@
视频监控
- +
@@ -130,7 +130,7 @@
-
报警消息
+
待办
更多>
@@ -144,7 +144,7 @@
-
视频消息
+
工作流
更多>
@@ -198,7 +198,27 @@ // radius: ['50%', '55%'] } + // 1.2视频监控饼图 + const shipinjiankong_Chart = { + // seriesName: '视频监控', + unit: '次', + color: ['#fe7f02', '#049f51', '#fdc004'], + Data: { + seriesData: [ + { value: 39, name: '正常' }, + { value: 16, name: '离线' }, + // { value: 12, name: '报警' } + ] + }, + label: { + normal: { + position: 'inner', + show: false + } + }, + // radius: ['50%', '55%'] +} export default { name: 'index', components: { @@ -207,6 +227,7 @@ data() { return { ruqinbaojing_Chart: ruqinbaojing_Chart, // 1.1 + shipinjiankong_Chart:shipinjiankong_Chart, token:'', Datalista: [ { title: '您有新任务了', createTime: '2023-05-23' }, diff --git a/src/views/monitor/videos/index.vue b/src/views/monitor/videos/index.vue index 4989f99..9bce13e 100644 --- a/src/views/monitor/videos/index.vue +++ b/src/views/monitor/videos/index.vue @@ -6,9 +6,14 @@
+ + + + + - + @@ -18,51 +23,139 @@ -
+

正常

- +

离线

- +
-
+

报警

- +
- + +
-
-
-
-
-
-
-
-
+ +
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+ +
+
+
+
+ +
+

布防

+

撤防

+

报警确认

+

旁路

+
+
+ + +
+
+ +
+ +
+ +
+

实时视频

+

回放视频

+
+ +
+

设备名称:1号楼1F西侧走廊像机1

+

设备编号:HK023123

+

设备IP:192.168.1.2

+
+
+ + +
+
+ +
+ +
+ +
+

开门

+
+
+ + +
+
+ +
+ +
+ +
+

布防

+

撤防

+

报警确认

+

旁路

+
+
+ +
- + + +
入侵报警
+
视频监控
+
门禁管理
+
电子围栏
-
+ - +