diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue index 9e13426..5f4bd1b 100644 --- a/src/layout/components/Sidebar/index.vue +++ b/src/layout/components/Sidebar/index.vue @@ -122,7 +122,7 @@ component: "renlianshibie", meta: { icon: "icon-renlianshibie6", - title: "人脸识别", + title: "质物监测", }, name: "", path: "/renlianshibie/renlianshibieList", @@ -131,7 +131,7 @@ // component: "index", // meta: { // icon: "el-icon-help", - // title: "人脸识别", + // title: "质物监测", // }, // name: "/renlianshibie/renlianshibieList", // path: "/renlianshibie/renlianshibieList", @@ -177,6 +177,26 @@ // path: "/shebeitaizhang/shebeitaizhangList", // }] }, + { + alwaysShow: true, + component: "cangkuguanli", + meta: { + icon: "el-icon-menu", + title: "仓库管理", + }, + name: "", + path: "/cangkuguanli/cangkuguanliList", + // children: [{ + // alwaysShow: true, + // component: "index", + // meta: { + // icon: "el-icon-help", + // title: "仓库管理", + // }, + // name: "/cangkuguanli/cangkuguanliList", + // path: "/cangkuguanli/cangkuguanliList", + // }] + }, { alwaysShow: true, component: "baojingchaxun", diff --git a/src/layout/index.vue b/src/layout/index.vue index 494ea84..320d503 100644 --- a/src/layout/index.vue +++ b/src/layout/index.vue @@ -11,7 +11,7 @@
平台首页 - 环境监控 + 监控中心
diff --git a/src/router/index.js b/src/router/index.js index 4f50ffe..60012ef 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -75,33 +75,33 @@ export const constantRoutes = [ ], }, //// - // { - // path: "/gongyingshanggaunli", - // component: Layout, - // redirect: "/gongyingshang/gongyingshanggaunli", - // meta: { - // title: "视频中心1", - // }, - // children: [ - // { - // path: "/gongyingshang/gongyingshanggaunli", - // component: () => - // import("@/views/gongyingshang/gongyingshanggaunli.vue"), - // name: "gongyingshanggaunli", - // meta: { - // title: "视频中心1", - // noCache: true, - // }, - // }, - // ], - // }, - ////人脸识别 + { + path: "/gongyingshanggaunli", + component: Layout, + redirect: "/gongyingshang/gongyingshanggaunli", + meta: { + title: "视频中心1", + }, + children: [ + { + path: "/gongyingshang/gongyingshanggaunli", + component: () => + import("@/views/gongyingshang/gongyingshanggaunli.vue"), + name: "gongyingshanggaunli", + meta: { + title: "视频中心1", + noCache: true, + }, + }, + ], + }, + ////质物监测 { path: "/renlianshibieList", component: Layout, redirect: "/renlianshibie/renlianshibieList", meta: { - title: "人脸识别", + title: "质物监测", }, children: [ { @@ -109,7 +109,7 @@ export const constantRoutes = [ component: () => import("@/views/renlianshibie/renlianshibieList.vue"), name: "renlianshibieList", meta: { - title: "人脸识别", + title: "质物监测", noCache: true, }, }, @@ -136,6 +136,35 @@ export const constantRoutes = [ }, ], }, + ////仓库管理 + { + path: "/cangkuguanliList", + component: Layout, + redirect: "/cangkuguanli/cangkuguanliList", + meta: { + title: "仓库管理", + }, + children: [ + { + path: "/cangkuguanli/cangkuguanliList", + component: () => import("@/views/cangkuguanli/cangkuguanliList.vue"), + name: "cangkuguanliList", + meta: { + title: "仓库管理", + noCache: true, + }, + }, + { + path: "/cangkuguanli/shebeiList", + component: () => import("@/views/cangkuguanli/shebei/shebeiList.vue"), + name: "shebeiList", + meta: { + title: "设备", + noCache: true, + }, + }, + ], + }, ////报警查询 { path: "/baojingchaxunList", diff --git a/src/views/cangkuguanli/cangkuguanliAdd.vue b/src/views/cangkuguanli/cangkuguanliAdd.vue new file mode 100644 index 0000000..f4ff2a2 --- /dev/null +++ b/src/views/cangkuguanli/cangkuguanliAdd.vue @@ -0,0 +1,524 @@ + + + + diff --git a/src/views/cangkuguanli/cangkuguanliInfo.vue b/src/views/cangkuguanli/cangkuguanliInfo.vue new file mode 100644 index 0000000..9c9f080 --- /dev/null +++ b/src/views/cangkuguanli/cangkuguanliInfo.vue @@ -0,0 +1,245 @@ + + + + + diff --git a/src/views/cangkuguanli/cangkuguanliList.vue b/src/views/cangkuguanli/cangkuguanliList.vue new file mode 100644 index 0000000..69deb18 --- /dev/null +++ b/src/views/cangkuguanli/cangkuguanliList.vue @@ -0,0 +1,690 @@ + + + + + diff --git a/src/views/cangkuguanli/shebei/shebeiAdd.vue b/src/views/cangkuguanli/shebei/shebeiAdd.vue new file mode 100644 index 0000000..2548bf5 --- /dev/null +++ b/src/views/cangkuguanli/shebei/shebeiAdd.vue @@ -0,0 +1,369 @@ + + + + diff --git a/src/views/cangkuguanli/shebei/shebeiInfo.vue b/src/views/cangkuguanli/shebei/shebeiInfo.vue new file mode 100644 index 0000000..97e4bbb --- /dev/null +++ b/src/views/cangkuguanli/shebei/shebeiInfo.vue @@ -0,0 +1,199 @@ + + + + + diff --git a/src/views/cangkuguanli/shebei/shebeiList.vue b/src/views/cangkuguanli/shebei/shebeiList.vue new file mode 100644 index 0000000..1e7650a --- /dev/null +++ b/src/views/cangkuguanli/shebei/shebeiList.vue @@ -0,0 +1,608 @@ + + + + + diff --git a/src/views/index.vue b/src/views/index.vue index 0ad2e13..22b518e 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -58,7 +58,7 @@
-
+
@@ -104,23 +104,23 @@ -
+
-
提醒任务
+
报警信息
更多>
-
+
{{item.title}}
{{item.createTime}}
@@ -130,11 +130,11 @@
-
待办
+
提醒任务
更多>
-
+
{{item.title}}
{{item.createTime}}
@@ -144,7 +144,7 @@
-
工作流
+
待办
更多>
@@ -156,9 +156,9 @@
-
+ +
@@ -329,12 +330,16 @@ title: '报警消息', dangerouslyUseHTMLString: true, // // message: "" + data.messageContent, - message: "" + "新的报警待处理", - position: 'bottom-right', + // message: "" + "新的报警待处理", + + message: "
" + "新的报警待处理
", + position: 'bottom-right', onClick: () => { alert("这是一条新订单") // this.playText('你有一条报警信息未读') // this.getServicePageLists() + + }, duration: 3000, }) @@ -487,7 +492,7 @@ justify-content: space-around; } .news { - width: 25%; + width: calc(100% / 3); margin: 0 20px 0 0; background-color: #fff; box-shadow:0px 0px 10px #E9E9E9;border-radius: 5px; diff --git a/src/views/monitor/videos/index.vue b/src/views/monitor/videos/index.vue index b3e4c68..64dff4c 100644 --- a/src/views/monitor/videos/index.vue +++ b/src/views/monitor/videos/index.vue @@ -1,6 +1,6 @@