From acfccfdb14903905631462fc13e3c92cdde70a12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E9=91=AB?= <zhangxin@zhehekeji.com>
Date: Thu, 24 Dec 2020 11:13:35 +0800
Subject: [PATCH] =?UTF-8?q?Ant=20Design-tags=E7=BB=84=E4=BB=B6=E6=8C=89?=
 =?UTF-8?q?=E9=9C=80=E6=B3=A8=E5=86=8C=EF=BC=8CparamBehind=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E6=9B=B4=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/plugins/antd.js                    |  2 ++
 src/router/index.js                    |  7 ++---
 src/views/checkManage/index.vue        | 36 ++++++++++++++++++++++++--
 src/views/realTimeMonitoring/index.vue |  2 +-
 src/views/realTimeMonitoring/model.vue |  2 +-
 5 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/src/plugins/antd.js b/src/plugins/antd.js
index 9de6fc8..2622d27 100644
--- a/src/plugins/antd.js
+++ b/src/plugins/antd.js
@@ -20,6 +20,7 @@ import {
     Select,
     Popconfirm,
     Tooltip,
+    Tag,
     Drawer,
     Divider
 } from "ant-design-vue";
@@ -42,6 +43,7 @@ Vue.use(Col);
 Vue.use(Select);
 Vue.use(Popconfirm)
 Vue.use(Tooltip)
+Vue.use(Tag)
 Vue.use(Drawer)
 Vue.use(Divider)
 Vue.prototype.$message = message;
diff --git a/src/router/index.js b/src/router/index.js
index 52db9f9..090a2ca 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -76,7 +76,6 @@ const routes = [{
         //         },
         //     ]
         // },
-
         {
             path: 'checkManage',
             name: 'checkManage',
@@ -94,7 +93,8 @@ const routes = [{
                 name: '巷道管理'
             },
             component: () => import('@/views/roadwayManage/index')
-        }, {
+        },
+        {
             path: 'cameraManage',
             name: 'cameraManage',
             meta: {
@@ -102,7 +102,8 @@ const routes = [{
                 name: '球机管理'
             },
             component: () => import('@/views/cameraManage/index')
-        },{
+        },
+        {
             path: 'center',
             name: 'center',
             meta: {
diff --git a/src/views/checkManage/index.vue b/src/views/checkManage/index.vue
index a38b638..830e0ec 100644
--- a/src/views/checkManage/index.vue
+++ b/src/views/checkManage/index.vue
@@ -1,5 +1,37 @@
 <template>
-    <div>
-        盘点管理
+    <div class="check-page">
+        <div class="title-info">
+            <span class="explain">颜色说明：</span>
+            <span class="info-text">
+                <a-tag color="#d81e06" style="width:30px;height:20px"></a-tag>
+                盘点错误
+            </span>
+            <span class="info-text">
+                 <a-tag color="#1afa29" style="width:30px;height:20px"></a-tag>
+                盘点正确
+            </span>
+            <span class="info-text">
+                 <a-tag color="#bfbfbf" style="width:30px;height:20px"></a-tag>
+                未盘点
+            </span>
+        </div>
     </div>
 </template>
+<style lang="scss" scoped>
+    .check-page{
+        .title-info{
+            display: flex;
+            align-items: center;
+            justify-content: start;
+            .explain{
+                font-weight:600;
+            }
+            .info-text{
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                margin-right: 15px;
+            }
+        }
+    }
+</style>
diff --git a/src/views/realTimeMonitoring/index.vue b/src/views/realTimeMonitoring/index.vue
index 1bc0526..491e030 100644
--- a/src/views/realTimeMonitoring/index.vue
+++ b/src/views/realTimeMonitoring/index.vue
@@ -105,7 +105,7 @@ export default {
                                 data:{
                                     "sourceUrl":item.rtsp,
                                     "paramBefore": "-y -i",
-                                    "paramBehind": "-f mpegts -codec:v mpeg1video -an -s 480*270 -b:v 1000k -r 20 -bf 0 -codec:a mp2 -ar 44100 -ac 1 -b:a 128k"
+                                    "paramBehind": "-f mpegts -vcodec mpeg1video -an -s 480*270 -b:v 1000k -r 20 -bf 0 -codec:a mp2 -ar 44100 -ac 1 -b:a 128k"
                                 }
                             }).then(res => {
                                 console.log(res.data)
diff --git a/src/views/realTimeMonitoring/model.vue b/src/views/realTimeMonitoring/model.vue
index cbbfab8..8ada40f 100644
--- a/src/views/realTimeMonitoring/model.vue
+++ b/src/views/realTimeMonitoring/model.vue
@@ -146,7 +146,7 @@ export default {
                 data:{
                     "sourceUrl":data.rtsp,
                     "paramBefore": "-y -i",
-                    "paramBehind": "-f mpegts -codec:v mpeg1video -an -s 1707*960 -b:v 1000k -r 20 -bf 0 -codec:a mp2 -ar 44100 -ac 1 -b:a 128k"
+                    "paramBehind": "-f mpegts -vcodec mpeg1video -an -s 1707*960 -b:v 1000k -r 20 -bf 0 -codec:a mp2 -ar 44100 -ac 1 -b:a 128k"
                 }
             }).then(res => {
                 console.log(res.data)