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

src/pages/MessageCenter/index.js

@@ -15,16 +15,14 @@ const MessageCenter = () => {
   const [tab, setTab] = useState('2');
   //, msgType: 工况：11， 自检：12
   const { data, run, loading } = useRequest(() =>
-    getNotificationList({ projectId, msgType: 11 }),
+    getNotificationList({ projectId, msgType: 11 }, { manual: true }),
   );
 
   const {
     data: dataSelf,
     run: runSelf,
     loading: loadingSelf,
-  } = useRequest(() => getNotificationList({ projectId, msgType: 12 }), {
-    manual: true,
-  });
+  } = useRequest(() => getNotificationList({ projectId, msgType: 12 }));
 
   const handleTabsChange = (tab) => {
     setTab(tab);
@@ -37,9 +35,9 @@ const MessageCenter = () => {
 
   const handlerSeeClick = (item) => {
     if (tab === '1') {
-      if (item?.MandateId) {
-        UnityAction.sendMsg('OpenTaskModal', `mandate_id=${item.MandateId}`);
-      }
+      // if (item?.MandateId) {
+      UnityAction.sendMsg('OpenTaskModal', `mandate_id=${item.MandateId}`);
+      // }
     } else {
       UnityAction.sendMsg('notiZiJian', item.ID);
     }

src/pages/SmartOps/HistoryRecord.js

@@ -186,6 +186,7 @@ const HistoryRecord = (props) => {
         />
         <Button
           className={styles.marginLeft}
+          style={{ height: '0.42rem' }}
           type="primary"
           onClick={() => handleSearch()}
         >

src/pages/SmartOps/components/VideoAnalysis.less

@@ -9,7 +9,7 @@
     display: flex;
     align-items: flex-start;
     font-size: 0.24rem;
-    line-height: 0.28rem;
+    line-height: 0.9rem;
     color: #454444;
     .label {
       width: 1.14rem;

src/pages/SmartOps/index.less

@@ -107,7 +107,7 @@
   line-height: 0.2rem;
   padding: 0.1rem;
   height: auto !important;
-  // background-color: #2f4d83;
+  background-color: #c4d3e9;
 }
 .btnSelect {
   .btnDate;
@@ -115,9 +115,9 @@
 }
 
 .anaBtn {
-  font-size: 0.12rem !important;
-  padding: 0.06rem;
-  line-height: 0.12rem;
+  font-size: 0.18rem !important;
+  padding: 0.06rem 0.04rem;
+  line-height: 0.18rem;
   height: auto !important;
 }
 

src/pages/TaskManage/Detail/TaskDetail/TaskDetail.tsx

@@ -253,33 +253,19 @@ function TaskDetail(props: IPropsType) {
         },
       });
       console.log(mandateChild[0]);
-
-      // dataSource.push(
-      //   ...Object.entries(JSON.parse(mandateChild[0]?.Payload)).map(
-      //     (item: any) => {
-      //       const [key, value] = item;
-      //       return {
-      //         detail: {
-      //           text:
-      //             value['item_alias'] +
-      //             ' 现有数值：' +
-      //             value['old_value'] +
-      //             ' 建议调整数值' +
-      //             value['new_value'],
-      //           key: key,
-      //         },
-      //       };
-      //     },
-      //   ),
-      // );
       setMandateTable(dataSource);
       return;
     }
 
     const dataSource = mandateChild.map((item, index) => {
-      if (item.MandateClass === 2) {
+      if (item.MandateClass === 3 || item.MandateClass === 6) {
+        return {
+          detail: {
+            text: item.Content,
+            key: item.Title + index + item.Content,
+          },
+        };
       }
-
       return {
         detail: {
           text: item.Title + item.Content,

src/pages/TaskManage/Popup/WorkOrderModal.less

@@ -2,6 +2,7 @@
   padding: 0.2rem 0.3rem 0rem 0.3rem;
   background-color: white;
   border-radius: 0.5rem;
+  min-height: 9.5rem;
 }
 
 .closeModalBtn {

src/pages/TaskManage/Popup/index.less

@@ -5,6 +5,7 @@
   background-color: white;
   border-radius: 0.5rem;
   padding: 0.3rem;
+  min-height: 9.5rem;
   height: 100vh;
   overflow-y: scroll;
   :global {

src/services/eqSelfInspection.js

@@ -1,7 +1,7 @@
 import { stringify } from 'qs';
 import { request } from 'umi';
 
-//获取指定路线巡检结果
+// 获取指定路线巡检结果
 export async function getRecentAutoPatrolByRouteId(params) {
   return request(
     `/api/v1/patrol/auto/data/${params.projectId}?${stringify(params)}`,
@@ -92,7 +92,7 @@ export async function patrolOverviewPie(params) {
  */
 export async function getMandateIDs(params) {
   const res = await request(
-    `/api/v1//patrol/relation-task?${stringify(params)}`,
+    `/api/v1/patrol/relation-task?${stringify(params)}`,
   );
   return res?.data || [];
 }