Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

src/global.less

@@ -401,6 +401,9 @@ input[type='reset'] {
     font-size: 24px;
   }
 }
+.ant-tabs .ant-tabs-tab {
+  font-size: 26px;
+}
 // react-zmage样式修改
 #zmageControl {
   transform: scale(0.4);

src/pages/DeviceManager/deviceRepairDetail.js

@@ -2,7 +2,10 @@ import PageContent from '@/components/PageContent';
 import PageTitle from '@/components/PageTitle';
 import { useParams } from '@umijs/max';
 import { Table } from 'antd';
+import dayjs from 'dayjs';
+import ReactZmage from 'react-zmage';
 import styles from './detail.less';
+
 const {
   DeviceCode,
   DeviceName,
@@ -33,36 +36,34 @@ export default function DeviceMaintainDetail() {
       title: type == 1 ? '维修资料' : '保养资料',
       dataIndex: 'Name',
       render: (text, item) => {
-        return <PreviewFile name={item.Name} src={item.Url} />;
+        return (
+          <ReactZmage
+            controller={{
+              // 关闭按钮
+              close: true,
+              // 缩放按钮
+              zoom: false,
+              // 下载按钮
+              download: false,
+              // 翻页按钮
+              flip: false,
+              // 多页指示
+              pagination: false,
+            }}
+            backdrop="rgba(255,255,255,0.5)"
+            style={{ width: '3.5rem' }}
+            src={item.Url}
+          />
+        );
       },
     },
     {
       title: '创建时间',
       dataIndex: 'CreatedTime',
       render: (text) => {
-        return text ? moment(text).format('YYYY年MM月DD日  HH:mm:ss') : null;
+        return text ? dayjs(text).format('YYYY年MM月DD日  HH:mm:ss') : null;
       },
     },
-    {
-      title: '操作',
-      width: '20%',
-      render: (record) => (
-        <Fragment>
-          {this.showJurisdiction('func-01-ops-1-2-3-01') && (
-            <>
-              &nbsp;&nbsp;
-              <a
-                style={{ color: '#7BFFFB' }}
-                onClick={() => this.checkFile(record)}
-                download
-              >
-                下载
-              </a>
-            </>
-          )}
-        </Fragment>
-      ),
-    },
   ];
 
   function getUser(params) {

src/pages/SafetyManagement/Command/index.less

@@ -7,8 +7,8 @@
   .upItem {
     font-size: 26px;
     margin-right: 10px;
-    width: 64px;
-    height: 64px;
+    width: 72px;
+    height: 72px;
     display: flex;
     align-items: center;
     justify-content: center;
@@ -19,10 +19,10 @@
 .modal {
   :global {
     .ant-modal {
-      transform: scale(1.3);
+      // transform: scale(1.3);
     }
     .ant-modal-title {
-      font-size: 26px;
+      font-size: 30px;
     }
     .ant-modal-close {
       top: 24px;
@@ -39,11 +39,11 @@
 }
 .numberItem {
   width: 33%;
-  height: 90px;
-  font-size: 28px;
+  height: 100px;
+  font-size: 32px;
   user-select: none;
   font-weight: bold;
-  line-height: 90px;
+  line-height: 100px;
   text-align: center;
   border: 1px solid rgba(128, 128, 128, 0.592);
 }
@@ -54,10 +54,10 @@
 
 :global {
   .ant-modal-title {
-    font-size: 28px;
-    line-height: 28px;
+    font-size: 32px;
+    line-height: 32px;
   }
   .ant-modal-close-x {
-    font-size: 28px;
+    font-size: 32px;
   }
 }

src/pages/SafetyManagement/index.js

@@ -130,6 +130,13 @@ const DeviceManager = () => {
   );
 };
 const Video = ({ data, dataOnline, loading, selected, setSelected }) => {
+
+  useEffect(() => {
+    let current = data?.find(item => item.Name == selected)
+    if(current) {
+      localStorage.preview = current.EventPath;
+    }
+  }, [selected])
   const renderRed = (item) => {
     return (
       <div className={styles.cardItem}>
@@ -174,7 +181,6 @@ const Video = ({ data, dataOnline, loading, selected, setSelected }) => {
                 id={item.Name}
                 key={`video_${idx}`}
                 onClick={() => {
-                  localStorage.preview = item.EventPath;
                   setSelected(idx, item.Name);
                 }}
                 className={`card-box ${styles.listItem} ${