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

src/global.less

@@ -198,6 +198,7 @@ input[type='reset'] {
   }
   .tabs-item {
     flex: 1;
+    text-align: center;
     padding: 0.16rem 0.24rem;
     font-size: 0.24rem;
     font-weight: 400;

src/pages/DeviceManager/index.js

@@ -36,11 +36,17 @@ const DeviceManager = () => {
     // 重置默认显示tab
     localStorage.deviceTab = '1';
   }, []);
+
+  const onChange = (tab) => {
+    setDefaultActiveKey(tab);
+    UnityAction.sendMsg('SparePart');
+  };
+
   return (
     <PageContent tabs>
       <TabsContent
         defaultActiveKey={defaultActiveKey}
-        onChange={setDefaultActiveKey}
+        onChange={onChange}
         items={[
           {
             label: `设备管理`,

src/pages/EqSelfInspection/index.js

@@ -91,6 +91,12 @@ const EqSelfInspection = (props) => {
       message.info('未查询到相关任务');
     }
   };
+  //消息跳转过来近具体自检报告详情页面
+  const handleJumpDetail = (id) => {
+    history.push(
+      `/self-inspection/detail/${projectId}/${id}?JWT-TOKEN=${GetTokenFromUrl()}`,
+    );
+  };
 
   useEffect(() => {
     if (routeId) {
@@ -110,6 +116,12 @@ const EqSelfInspection = (props) => {
         ProjectId: projectId * 1,
       },
     });
+
+    UnityAction.on('notiZiJian', (id) => {
+      handleJumpDetail(id);
+    });
+
+    return UnityAction.off('notiZiJian');
   }, []);
 
   useEffect(() => {
@@ -128,7 +140,7 @@ const EqSelfInspection = (props) => {
             className={`${styles.itemMain} card-box`}
             style={{ padding: '0.2rem 0.24rem', position: 'relative' }}
           >
-            <div style={{ fontSize: "0.28rem", color: 'rgb(110, 110, 110)' }}>
+            <div style={{ fontSize: '0.28rem', color: 'rgb(110, 110, 110)' }}>
               自检间隔：{autoReport?.RouteInfo?.PlanDur}分钟
             </div>
 
@@ -284,7 +296,7 @@ const Item = (props) => {
   };
   return (
     <div className={`${styles.itemMain} card-box`}>
-      <div className={styles.item} style={{ height: children ? "0.8rem" : '' }}>
+      <div className={styles.item} style={{ height: children ? '0.8rem' : '' }}>
         <span className={styles.itemName}>{name}</span>
         {/* <span className={styles.warningText}>{warningText}</span> */}
         {renderRight(status)}

src/pages/Menu/index.less

@@ -1,12 +1,15 @@
 .main {
+  margin: 1rem 0;
   float: right;
-  width: 1.98rem;
-  height: 100vh;
+  width: 1.89rem;
+  height: calc(100vh - 2rem);
   display: flex;
   flex-direction: column;
   align-items: flex-end;
   background: url('@/assets/menu/right_bg.png') no-repeat center;
   background-size: 100% 100%;
+  border-radius: 0.74rem 0 0 0.74rem;
+  box-shadow: 0.03rem 0.49rem 1rem 0rem rgba(60, 93, 133, 0.72);
 }
 .menu {
   width: 100%;

src/pages/MessageCenter/index.js

@@ -12,7 +12,7 @@ const icon2 = require('@/assets/message/check.png');
 
 const MessageCenter = () => {
   const { projectId } = useParams();
-  const [tab, setTab] = useState('1');
+  const [tab, setTab] = useState('2');
   //, msgType: 工况：11， 自检：12
   const { data, run, loading } = useRequest(() =>
     getNotificationList({ projectId, msgType: 11 }),
@@ -37,11 +37,11 @@ const MessageCenter = () => {
 
   const handlerSeeClick = (item) => {
     if (tab === '1') {
-      UnityAction.sendMsg('notiZiJian', item.ID);
-    } else {
       if (item?.MandateId) {
         UnityAction.sendMsg('OpenTaskModal', `mandate_id=${item.MandateId}`);
       }
+    } else {
+      UnityAction.sendMsg('notiZiJian', item.ID);
     }
   };
 
@@ -78,7 +78,7 @@ const MessageCenter = () => {
     <PageContent tabs>
       <TabsContent
         center={false}
-        defaultActiveKey="1"
+        defaultActiveKey="2"
         onChange={handleTabsChange}
         items={[
           {

src/pages/SafetyManagement/index.js

@@ -54,13 +54,13 @@ const DeviceManager = () => {
       UnityAction.sendMsg('camData', JSON.stringify(dataVList?.list));
   }, [data, dataVList]);
 
-  const onHandleSelect = (name) => {
-    setSelected(name);
+  const onHandleSelect = (id, name) => {
+    setSelected(id);
     UnityAction.sendMsg('safetyItem', name);
   };
 
   useEffect(() => {
-    UnityAction.addEventListener('safetyItem', (name) => {
+    UnityAction.on('safetyItem', (name) => {
       setSelected(name);
     });
 
@@ -124,8 +124,7 @@ const DeviceManager = () => {
     </PageContent>
   );
 };
-const Video = ({ data, dataOnline, loading }) => {
-  const [selected, setSelected] = useState();
+const Video = ({ data, dataOnline, loading, selected, setSelected }) => {
   const renderRed = (item) => {
     return (
       <div className={styles.cardItem}>
@@ -167,7 +166,7 @@ const Video = ({ data, dataOnline, loading }) => {
             {data?.map((item, idx) => (
               <div
                 key={`video_${idx}`}
-                onClick={() => setSelected(idx)}
+                onClick={() => setSelected(idx, item.Name)}
                 className={`card-box ${styles.listItem} ${
                   selected == item.Name || selected == idx ? 'card-select' : ''
                 }`}
@@ -252,7 +251,7 @@ const Door = ({
             {data?.map((item, idx) => (
               <div
                 key={`door_${idx}`}
-                onClick={() => setSelected(idx)}
+                onClick={() => setSelected(idx, item.name)}
                 className={`card-box ${styles.listItem} ${
                   selected == item.name || selected == idx ? 'card-select' : ''
                 }`}

src/utils/utils.js

@@ -1,9 +1,8 @@
-
 export const clearToken = () => {
   localStorage.setItem('JWT-TOKEN', '');
 };
 
-export const storeToken = token => {
+export const storeToken = (token) => {
   localStorage.setItem('JWT-TOKEN', token);
 };
 
@@ -19,7 +18,6 @@ export const getToken = () => {
  * <a href="url" download/>
  */
 export const downloadFile = (url, fileName, encode = true) => {
-  
   const downloadLink = document.createElement('a');
   const body = document.documentElement || document.body;
   body.appendChild(downloadLink);
@@ -48,7 +46,9 @@ export function IsImageFile(fileName) {
 }
 
 export function IsVedio(fileName) {
-  return fileName.lastIndexOf('.mp4') !== -1 || fileName.lastIndexOf('.avi') !== -1;
+  return (
+    fileName.lastIndexOf('.mp4') !== -1 || fileName.lastIndexOf('.avi') !== -1
+  );
 }
 
 export function GetTokenFromUrl() {
@@ -95,7 +95,7 @@ export function getUser(params) {
     return;
   } else {
     return (arr = params
-      .map(item => {
+      .map((item) => {
         return item.Operator?.CName;
       })
       .join(','));
@@ -123,7 +123,7 @@ export const UnityAction = {
   emit(type, e) {
     if (!UnityAction.event[type]) return;
     console.log('emit====== type:', type, '====== event:', e);
-    UnityAction.event[type].forEach(item => {
+    UnityAction.event[type].forEach((item) => {
       item && item(e);
     });
   },
@@ -144,9 +144,13 @@ export const UnityAction = {
     }
   },
 };
+// alert(window.vuplex);
 if (window.vuplex) {
-  window.vuplex.addEventListener('message', e => {
-    console.log('============================getMessageForUnity============================');
+  window.vuplex.addEventListener('message', (e) => {
+    // alert('99999999');
+    console.log(
+      '============================getMessageForUnity============================',
+    );
     const data = JSON.parse(e.data);
     console.log(data);
     UnityAction.emit(data.type, data.message);