From 8f2f0eb0ed849554f88fd8d0987e66848b547b57 Mon Sep 17 00:00:00 2001
From: wenlele <wen.lele@free-sun.com.cn>
Date: Fri, 12 Aug 2022 16:05:21 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../application/actions/application.js        |  2 +-
 .../containers/applicationCenter.jsx          | 21 +++++++++++++------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/code/VideoAccess-VCMP/web/client/src/sections/application/actions/application.js b/code/VideoAccess-VCMP/web/client/src/sections/application/actions/application.js
index 6472ddf..e0fb457 100644
--- a/code/VideoAccess-VCMP/web/client/src/sections/application/actions/application.js
+++ b/code/VideoAccess-VCMP/web/client/src/sections/application/actions/application.js
@@ -24,7 +24,7 @@ export function putApplication (data) {
          actionType: "PUT_APPLICATION",
          data,
          url: `${ApiTable.putApplication}`,
-         msg: { option: data?.forbidden ? "启用" : "禁用" }, //禁用摄像头
+         msg: { option: data?.forbidden ? "禁用" : "启用" }, //禁用摄像头
          reducer: {},
       });
 }
diff --git a/code/VideoAccess-VCMP/web/client/src/sections/application/containers/applicationCenter.jsx b/code/VideoAccess-VCMP/web/client/src/sections/application/containers/applicationCenter.jsx
index 5327461..a9b28ab 100644
--- a/code/VideoAccess-VCMP/web/client/src/sections/application/containers/applicationCenter.jsx
+++ b/code/VideoAccess-VCMP/web/client/src/sections/application/containers/applicationCenter.jsx
@@ -48,9 +48,17 @@ const ApplicationCenter = (props) => {
          dataIndex: "name",
          key: "name",
          render: (text, r, index) => {
-            return r?.name.length > 8 ? `${r?.name.substr(0, 8)}...` : r?.name
+            return r?.name.length > 8 ? <Popover
+               position='top'
+               content={
+                  <article style={{ padding: 12 }}>
+                     {r?.name}
+                  </article>
+               }
+            >{
+                  `${r?.name.substr(0, 8)}...`}
+            </Popover> : r?.name
          },
-
       },
       {
          title: "APPID",
@@ -142,7 +150,7 @@ const ApplicationCenter = (props) => {
             dataIndex: "createTime",
             key: "createTime",
             render: (_, r, index) => {
-               return r?.createUser?.name
+               return moment(r.createTime).format("YYYY-MM-DD HH:mm:ss");
             },
          },
          {
@@ -150,7 +158,7 @@ const ApplicationCenter = (props) => {
             dataIndex: "createUserId",
             key: "account",
             render: (_, r, index) => {
-               return moment(r.createTime).format("YYYY-MM-DD HH:MM:SS");
+               return r?.createUser?.name
             },
          },
          {
@@ -158,8 +166,9 @@ const ApplicationCenter = (props) => {
             dataIndex: "type",
             key: "applicationType",
             render: (_, r, index) => {
-               const type = r?.type?.map((item, index) => item + ';')
-               return type
+               const types = { web: 'web', app: 'app', wxapp: '小程序', other: '其他' }
+               return r?.type?.map((item, index) => types[item] + ';')
+
             },
          },
       ];