feats

config/routes.js

@@ -35,7 +35,7 @@ export default [
   {
     path: '/MonitoringScreen2',
     layout: false,
-    name: '数据大屏2',
+    name: '作业大屏',
     icon: 'DesktopOutlined',
     component: './MonitoringScreen2',
     access: 'screen',

src/components/ScreenBox/ScreenHeader/index.jsx

@@ -6,7 +6,7 @@ export default (props) => {
   return (
     <div className={Styles['screen-header-box']}>
       <div className={Styles['screen-header-left']}>
-        <div>数据概览</div>
+        <div>{props.title || '数据概览'}</div>
       </div>
       <div className={Styles['screen-header-left']}>
         <Clock className={Styles['clock-date']} />

src/pages/MonitoringScreen2/components/Banner.jsx

@@ -1,13 +1,13 @@
 import React from 'react';
 import StatisCard from '@/components/ScreenBox/StatisCard';
-import { getBasic } from '@/services/monitoringScreen';
+import { getDeviceStatis } from '@/services/monitoringScreen';
 
 export default (props) => {
   const [basic, setBasic] = React.useState();
 
   React.useEffect(() => {
     //顶部基本数据
-    getBasic()
+    getDeviceStatis()
       .then((res) => {
         var data = {};
         for (let i = 0; i < res.length; i++) {
@@ -32,11 +32,16 @@ export default (props) => {
       <StatisCard
         color="#0BDAFF"
         icon="icon2"
-        value={basic?.totalMachineryUsed}
-        title="农机使用数（台）"
+        value={basic?.totalDeviceNum}
+        title="设备总数（台）"
       />
-      <StatisCard color="#F5CC5C" icon="icon3" value={basic?.totalOrderNum} title="总预约数" />
-      <StatisCard color="#C579FF" icon="icon4" value={basic?.totalServiceNum} title="总服务数" />
+      <StatisCard
+        color="#F5CC5C"
+        icon="icon3"
+        value={basic?.totalOnlineDeviceNum}
+        title="在线设备（台）"
+      />
+      <StatisCard color="#C579FF" icon="icon4" value={basic?.totalAreaNum} title="作业面积（亩）" />
     </>
   );
 };

src/pages/MonitoringScreen2/components/MachineryInfo.jsx

@@ -36,7 +36,7 @@ export default React.forwardRef((props, ref) => {
       </Row>
       <Row gutter={16}>
         <Col span={8}>位置信息</Col>
-        <Col span={16}>{data.loc || ''}</Col>
+        <Col span={16}>{data.address || ''}</Col>
       </Row>
     </div>
   );

src/pages/MonitoringScreen2/index.jsx

@@ -75,38 +75,7 @@ export default (props) => {
   useEffect(() => {
     const params = deviceType ? { deviceType } : undefined;
     getDeviceMachineryList(params).then((res) => {
-      const locIds = [];
-      const locList = [];
-      const list = res || [];
-
-      for (let item of list) {
-        if (item.location && item.location.indexOf('0.0') === -1) {
-          locIds.push(item.machineryId);
-          locList.push(item.location);
-        }
-      }
-
-      if (locList.length > 0) {
-        // 高德接口, 请求地址的描述
-        regeo({ location: locList.join('|') })
-          .then((regs) => {
-            if (regs.status === '1') {
-              regs.regeocodes.forEach((addrs, inx) => {
-                const addr = addrs['formatted_address'];
-                const addressComponent = addrs.addressComponent;
-                const machine = list.filter((x) => x.machineryId === locIds[inx])[0];
-                machine.loc = addr.replace(addressComponent.province, ''); // 去掉省
-              });
-            }
-
-            setMachines(list);
-          })
-          .catch((er) => {
-            console.error(er);
-
-            setMachines(list);
-          });
-      }
+      setMachines(res || []);
     });
   }, [deviceType]);
 
@@ -135,7 +104,7 @@ export default (props) => {
       <div id={Styles['particles-js']} />
       <div className={Styles['grail-layout']}>
         <div className={Styles['grail-header']}>
-          <ScreenHeader weather={weather} />
+          <ScreenHeader title="作业监管" weather={weather} />
         </div>
         <div className={classNames(Styles['grail-container'], Styles['mg-tp-30'])}>
           <div className={classNames(Styles['grail-content'], Styles['pd-lr-40'])}>

src/services/monitoringScreen.js

@@ -65,3 +65,9 @@ export const getMessageList = (params) => request('/screen-data/message', { para
  */
 export const getDeviceMachineryList = (params) =>
   request('/screen-data/machinery-device', { params });
+
+/**
+ *  获取设备统计数据
+ * @returns
+ */
+export const getDeviceStatis = () => request('/screen-data/device-basic');