feats\

config/config.dev.js

@@ -1,6 +1,9 @@
 // https://umijs.org/config/
 import { defineConfig } from 'umi';
 export default defineConfig({
+  define: {
+    API_BASE: '',
+  },
   //
   plugins: [
     // https://github.com/zthxxx/react-dev-inspector

config/config.js

@@ -7,7 +7,9 @@ import routes from './routes';
 const { REACT_APP_ENV } = process.env;
 
 export default defineConfig({
-  // 以下是 umi 参数
+  define: {
+    API_BASE: 'http://sgl-v2.njyunzhi.com',
+  },
   hash: true,
   antd: {},
   dva: {

src/components/ScreenBox/TitleBox/style.less

@@ -14,7 +14,7 @@
     height: 10px;
     background: linear-gradient(-45deg, #ee7752, #e73c7e, #23a6d5, #23d5ab);
     background-size: 400% 400%;
-    animation: gradient 5s ease infinite;
+    animation: gradient 2s ease infinite;
   }
   .TitleBox-ListBox-value {
     margin-left: 12px;

src/pages/MonitoringScreen/components/MachineryStatus.jsx

@@ -23,7 +23,9 @@ const colorList = ['#FB9900', '#23E8AE', '#E63404', '#51D4FF', '#B8B2A9', '#C579
 });
 
 const defaultOpt = {
-  tooltip: {},
+  tooltip: {
+    extraCssText: 'width:160px;height:40px;',
+  },
   grid: {
     top: 20,
     right: 10,

src/pages/MonitoringScreen/components/MachineryType.jsx

@@ -23,7 +23,9 @@ const colorList = ['#FB9900', '#23E8AE', '#E63404'].map((x) => {
 });
 
 const defaultOpt = {
-  tooltip: {},
+  tooltip: {
+    extraCssText: 'width:160px;height:40px;',
+  },
   legend: {},
   grid: {
     top: 20,

src/pages/MonitoringScreen/components/WorkArea.jsx

@@ -3,10 +3,10 @@ import BasicChart from './BasicChart';
 import deepCopy from '@/utils/deepCopy';
 
 const defaultOpt = {
-  tooltip: {
-    trigger: 'item',
-    formatter: '{b} : {c} ({d}%)',
-  },
+  // tooltip: {
+  //   trigger: 'item',
+  //   formatter: '{b} : {c} ({d}%)',
+  // },
   legend: {
     orient: 'vertical',
     left: 'right',
@@ -17,12 +17,10 @@ const defaultOpt = {
   series: [
     {
       type: 'pie',
-      radius: ['30%', '60%'],
+      radius: ['40%', '55%'],
       center: ['40%', '50%'],
-      roseType: 'area',
-      itemStyle: {
-        borderRadius: 5,
-      },
+      selectedMode: 'single',
+      avoidLabelOverlap: false,
       label: {
         color: '#fff',
         formatter: '{b} \n{d}%',
@@ -38,6 +36,7 @@ const defaultOpt = {
 export default (props) => {
   const option = useMemo(() => deepCopy(defaultOpt), []);
   option.series[0].data = props.source;
+  (option.series[0].data[0] || {}).selected = true; // 设置第一个是选中状态
 
   return <BasicChart title="农机作业量面积统计" option={option} />;
 };

src/pages/MonitoringScreen/components/WorkData.jsx

@@ -3,23 +3,24 @@ import BasicChart from './BasicChart';
 import deepCopy from '@/utils/deepCopy';
 
 const defaultOpt = {
-  tooltip: {
-    trigger: 'item',
-    formatter: '{b} : {c} ({d}%)',
-  },
+  // tooltip: {
+  //   trigger: 'item',
+  //   formatter: '{b} : {c} ({d}%)',
+  // },
   legend: {
     orient: 'vertical',
     left: 'left',
     top: '5%',
     textStyle: { color: '#fff' },
   },
-  toolbox: {},
   series: [
     {
       type: 'pie',
-      radius: ['30%', '60%'],
+      radius: ['45%', '65%'],
       itemStyle: {
-        borderRadius: 5,
+        borderRadius: 4,
+        borderColor: '#041B38',
+        borderWidth: 2,
       },
       // itemStyle: {
       //   borderRadius: 10,
@@ -29,13 +30,13 @@ const defaultOpt = {
       label: {
         show: false,
         position: 'center',
+        formatter: '{b}\n{d}%',
       },
       emphasis: {
         label: {
-          color: '#fff',
+          color: '#25E1AA',
           show: true,
-          fontSize: '28',
-          fontWeight: 'bold',
+          fontSize: '18',
         },
       },
       labelLine: {

src/pages/MonitoringScreen/index.jsx

@@ -49,13 +49,12 @@ export default (props) => {
   ]);
 
   useEffect(() => {
-    console.log('-------process------->', process);
-
     getWeather('邓州市').then((res) => {
       if (res && res.length) {
         const { casts } = res[0];
         const { dayweather, nighttemp, daytemp } = casts[0];
-        const [min, max] = nighttemp > daytemp ? [daytemp, nighttemp] : [nighttemp, daytemp];
+        const [min, max] =
+          parseInt(nighttemp) > parseInt(daytemp) ? [daytemp, nighttemp] : [nighttemp, daytemp];
         setWeather(`${dayweather} ${min}-${max} °C`);
       } else {
         setWeather('暂无天气信息');
@@ -94,7 +93,7 @@ export default (props) => {
           </div>
           <div className={Styles['grail-right']}>
             <div className="flex flex-column full-height">
-              <div className="flex-0" style={{ minHeight: '37%' }}>
+              <div className="flex-0" style={{ minHeight: '46%' }}>
                 <WorkData source={workData} />
               </div>
               <div className="flex-1" style={{ marginTop: '30px' }}>

src/utils/request.js

@@ -24,8 +24,7 @@ function requestInterceptor(url, options) {
     ? { Authorization: localStorage.getItem('token') }
     : {};
 
-  const prefix =
-    process.env.NODE_ENV === 'production' ? 'http://sgl-v2.njyunzhi.com/api/admin' : '/api/admin';
+  const prefix = `${process.env.API_BASE}/api/admin`;
 
   return {
     url: `${prefix}${url}`,