From b5d71d87051508b2a1ab4ec4ce3a375f119912c3 Mon Sep 17 00:00:00 2001 From: "zyc@123456" <784479659@qq.com> Date: Fri, 26 May 2023 20:15:09 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8E=AF=E5=A2=83=E7=9B=91=E6=8E=A7=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E7=9B=91=E6=8E=A7=E4=B8=AD=E5=BF=83=20=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E5=8E=BB=E6=8E=89=E7=94=B5=E5=AD=90=E5=B7=A1=E6=9B=B4?= =?UTF-8?q?=E3=80=82=20=E9=A6=96=E9=A1=B5=E5=8E=BB=E6=8E=89=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E6=B5=81=EF=BC=8C=E9=97=A8=E7=A6=81=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E6=8A=A5=E8=AD=A6=E4=BF=A1=E6=81=AF=EF=BC=8C?= =?UTF-8?q?=E6=94=BE=E5=9C=A8=E6=9C=80=E5=B7=A6=E4=BE=A7=E3=80=82=20?= =?UTF-8?q?=E8=A7=86=E9=A2=91=E4=B8=AD=E5=BF=83=EF=BC=9A=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E6=A5=BC=E6=A0=8B=E5=92=8C=E6=A5=BC=E5=B1=82=EF=BC=8C=E5=B0=86?= =?UTF-8?q?=E6=AD=A3=E5=B8=B8=E3=80=81=E7=A6=BB=E7=BA=BF=E3=80=81=E6=8A=A5?= =?UTF-8?q?=E8=AD=A6=E9=BB=98=E8=AE=A4=E4=B8=BA=E5=85=A8=E9=83=A8=E9=80=89?= =?UTF-8?q?=E4=B8=AD=EF=BC=8C=E5=8F=AF=E7=82=B9=E5=87=BB=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E9=80=89=E4=B8=AD=E3=80=82=20=E4=BA=BA=E8=84=B8=E8=AF=86?= =?UTF-8?q?=E5=88=AB=EF=BC=9A=E5=90=8D=E7=A7=B0=E6=94=B9=E4=B8=BA=E2=80=9C?= =?UTF-8?q?=E8=B4=A8=E7=89=A9=E7=9B=91=E6=B5=8B=E2=80=9D=EF=BC=8C=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E5=85=88=E4=B8=8D=E5=8F=98=EF=BC=8C=E4=BB=A5=E5=90=8E?= =?UTF-8?q?=E7=94=A8=E4=BA=8E=E9=95=BF=E6=9C=9F=E4=B8=8D=E5=8A=A8=E7=9A=84?= =?UTF-8?q?=E8=B4=A7=E7=89=A9=E5=AE=9A=E6=9C=9F=E6=8B=8D=E7=85=A7=EF=BC=8C?= =?UTF-8?q?=E5=B9=B6=E8=BF=9B=E8=A1=8C=E5=9B=BE=E7=89=87=E5=AF=B9=E6=AF=94?= =?UTF-8?q?=E6=9D=A5=E8=AF=86=E5=88=AB=E8=B4=A8=E6=8A=BC=E7=89=A9=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E6=9C=89=E5=8F=98=E5=8C=96=E3=80=82=20=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E5=8F=B0=E5=B8=90=EF=BC=9A=E6=96=B0=E5=A2=9E=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E9=9C=80=E8=A6=81=E4=B8=8E=E4=BB=93=E5=82=A8=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=AD=90=E6=A8=A1=E5=9D=97=E7=9A=84=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E5=AF=B9=E5=BA=94=E4=B8=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/components/Sidebar/index.vue | 24 +- src/layout/index.vue | 2 +- src/router/index.js | 75 +- src/views/cangkuguanli/cangkuguanliAdd.vue | 524 ++++++++ src/views/cangkuguanli/cangkuguanliInfo.vue | 245 ++++ src/views/cangkuguanli/cangkuguanliList.vue | 690 ++++++++++ src/views/cangkuguanli/shebei/shebeiAdd.vue | 369 +++++ src/views/cangkuguanli/shebei/shebeiInfo.vue | 199 +++ src/views/cangkuguanli/shebei/shebeiList.vue | 608 +++++++++ src/views/index.vue | 35 +- src/views/monitor/videos/index.vue | 326 +++-- src/views/renlianshibie/renlianshibieList.vue | 4 +- .../shebeitaizhang/shebeitaizhangAdd.vue | 28 +- .../shebeitaizhang/shebeitaizhangInfo.vue | 11 +- .../shebeitaizhang/shebeitaizhangList.vue | 1186 +++++++++-------- 15 files changed, 3619 insertions(+), 707 deletions(-) create mode 100644 src/views/cangkuguanli/cangkuguanliAdd.vue create mode 100644 src/views/cangkuguanli/cangkuguanliInfo.vue create mode 100644 src/views/cangkuguanli/cangkuguanliList.vue create mode 100644 src/views/cangkuguanli/shebei/shebeiAdd.vue create mode 100644 src/views/cangkuguanli/shebei/shebeiInfo.vue create mode 100644 src/views/cangkuguanli/shebei/shebeiList.vue 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 @@