修改样式

src/components/ManagementPage/PieChartModule.js

@@ -80,7 +80,7 @@ const defaultOption = {
         { value: 300, name: 'Video Ads' },
       ],
       label: {
-        fontSize: 18,
+        fontSize: 12,
       },
       emphasis: {
         itemStyle: {
@@ -89,7 +89,7 @@ const defaultOption = {
           shadowColor: 'rgba(0, 0, 0, 0.5)',
         },
         label: {
-          fontSize: 24,
+          fontSize: 12,
         },
       },
     },

src/components/ManagementPage/RadarChartModule.js

@@ -80,7 +80,7 @@ const defaultOption = {
   radar: {
     name: {
       textStyle: {
-        fontSize: 18,
+        fontSize: 12,
       },
     },
     splitArea: {

src/components/ManagementPage/chartModule.js

@@ -202,7 +202,7 @@ const defaultOption = {
   tooltip: {
     trigger: 'axis',
     textStyle: {
-      fontSize: 24,
+      fontSize: 12,
     },
   },
   grid: {
@@ -215,10 +215,10 @@ const defaultOption = {
     boundaryGap: false,
     axisTick: { show: false },
     nameTextStyle: {
-      fontSize: 24,
+      fontSize: 12,
     },
     axisLabel: {
-      fontSize: 24,
+      fontSize: 12,
     },
     data: [
       '00:00',
@@ -237,12 +237,12 @@ const defaultOption = {
       name: '000',
       top: 20,
       nameTextStyle: {
-        fontSize: 24,
+        fontSize: 12,
         // align: 'left',
         padding: [0, 0, 20, 0],
       },
       axisLabel: {
-        fontSize: 24,
+        fontSize: 12,
       },
       axisLine: {
         show: false,
@@ -262,7 +262,7 @@ const defaultOption = {
       top: 20,
       position: 'right',
       nameTextStyle: {
-        fontSize: 24,
+        fontSize: 12,
         // align: 'left',
         padding: [0, 0, 20, 0],
       },
@@ -285,7 +285,7 @@ const defaultOption = {
       position: 'right',
       offset: 80,
       nameTextStyle: {
-        fontSize: 24,
+        fontSize: 12,
         // align: 'left',
         padding: [0, 0, 20, 0],
       },
@@ -411,7 +411,7 @@ const defaultOption = {
       },
       title: {
         offsetCenter: [0, '25%'],
-        fontSize: 24,
+        fontSize: 14,
       },
       detail: {
         show: false,
@@ -427,7 +427,7 @@ const defaultOption = {
     data: ['进水水量', '预测出水量', '实际出水量'],
     lineStyle: {},
     textStyle: {
-      fontSize: 24,
+      fontSize: 12,
     },
   },
   // toolbox: {

src/components/PageTitle/index.less

@@ -36,5 +36,5 @@
 }
 .tabs {
   position: absolute;
-  top: 0.52rem;
+  top: 0.4rem;
 }

src/components/ScrollLoading/index.js

@@ -24,7 +24,10 @@ export default function ScrollLoading({
       <div
         ref={scrollContent}
         onScroll={handleScroll}
-        style={{ overflowY: 'scroll', height: `calc(100vh - ${height}px)` }}
+        style={{
+          overflowY: 'scroll',
+          height: `calc(100vh - ${height / 100}rem)`,
+        }}
       >
         {children}
       </div>

src/pages/DeviceManager/storage.js

@@ -177,13 +177,13 @@ const StorageOverview = () => {
             </div>
             <div className={styles.thereItem}>
               <ModuleTitle title="物料报废统计" />
-              <div style={{ height: '3.3rem' }}>
+              <div style={{ height: '4.4rem' }}>
                 {data?.radarData && <RadarChartModule {...data.radarData} />}
               </div>
             </div>
             <div className={styles.twoItem}>
               <ModuleTitle title="出入库统计" />
-              <div style={{ height: '3.3rem' }}>
+              <div style={{ height: '4rem' }}>
                 {data?.barData && <BarChartModule {...data.barData} />}
               </div>
             </div>

src/pages/EqSelfInspection/ReportDetail.js

@@ -22,7 +22,7 @@ const ReportDetail = (props) => {
   return (
     <PageContent closeable={false}>
       <PageTitle returnable>自检报告</PageTitle>
-      <div className="content-title" style={{ marginTop: 20 }}>
+      <div className="content-title" style={{ marginTop: '0.2rem' }}>
         <Detail data={data} projectId={projectId} loading={loading} />
       </div>
     </PageContent>

src/pages/EqSelfInspection/Statistics.js

@@ -140,7 +140,10 @@ const Statistics = (props) => {
   return (
     <PageContent closeable={false}>
       <PageTitle returnable>系统自检统计</PageTitle>
-      <div className={`${styles.itemMain2} card-box`} style={{padding: '0.44rem 0'}}>
+      <div
+        className={`${styles.itemMain2} card-box`}
+        style={{ padding: '0.44rem 0' }}
+      >
         <div style={{ display: 'flex' }}>
           {overviewData?.map((item) => (
             <Text num={item.num} label={item.label} />
@@ -152,7 +155,7 @@ const Statistics = (props) => {
         <Spin spinning={loading}>
           <div
             ref={lineDomRef}
-            style={{ height: '3.4rem', margin: '0.1rem 0 0.1rem 0' }}
+            style={{ height: '4rem', margin: '0.1rem 0 0.1rem 0' }}
           />
         </Spin>
       </div>
@@ -160,7 +163,7 @@ const Statistics = (props) => {
         <Spin spinning={pieLoading}>
           <div
             ref={pieDomRef}
-            style={{ height: '3.4rem', margin: '0.1rem 0 0.1rem 0' }}
+            style={{ height: '4rem', margin: '0.1rem 0 0.1rem 0' }}
           />
         </Spin>
       </div>
@@ -174,7 +177,7 @@ const Text = (props) => {
   return (
     <div className={styles.statisticsText}>
       <div className={styles.num}>{num}</div>
-      <div className={styles.label} style={{ fontSize: 22 }}>
+      <div className={styles.label} style={{ fontSize: '0.22rem' }}>
         {label}
       </div>
     </div>
@@ -205,7 +208,7 @@ const getLineOption = (time, chartData, name) => {
         },
       },
       textStyle: {
-        fontSize: 24
+        fontSize: 18,
       },
     },
     // grid: {
@@ -224,7 +227,7 @@ const getLineOption = (time, chartData, name) => {
         },
       },
       axisLabel: {
-        fontSize: 16,
+        fontSize: 12,
       },
       data: time,
     },
@@ -244,7 +247,7 @@ const getLineOption = (time, chartData, name) => {
           color: '#555',
         },
         axisLabel: {
-          fontSize: 16,
+          fontSize: 12,
           color: '#555',
         },
         axisLine: {
@@ -269,19 +272,19 @@ const getLineOption = (time, chartData, name) => {
     legend: {
       textStyle: {
         color: '#555',
-        fontSize: 18,
+        fontSize: 14,
       },
       lineStyle: {},
     },
     title: {
       text: name,
-      top: '92%',
+      top: '88%',
       left: '50%',
       textAlign: 'center',
       textStyle: {
         color: '#555',
         fontWeight: 'normal',
-        fontSize: 18,
+        fontSize: 14,
       },
     },
     // textStyle: {
@@ -331,13 +334,13 @@ const getPieOption = (chartData, name) => {
   const option = {
     title: {
       text: name,
-      top: '92%',
+      top: '88%',
       left: '50%',
       textAlign: 'center',
       textStyle: {
         color: '#555',
         fontWeight: 'normal',
-        fontSize: 18,
+        fontSize: 14,
       },
     },
     color: [
@@ -354,7 +357,7 @@ const getPieOption = (chartData, name) => {
     tooltip: {
       trigger: 'item',
       textStyle: {
-        fontSize: 24
+        fontSize: 18,
       },
     },
     legend: {
@@ -362,7 +365,7 @@ const getPieOption = (chartData, name) => {
       // left: 'left',
       textStyle: {
         color: '#555',
-        fontSize: 18,
+        fontSize: 14,
       },
     },
     series: [

src/pages/EqSelfInspection/components/Detail.js

@@ -1672,7 +1672,7 @@ function Empty() {
     <div>
       <img
         src={require('@/assets/self-empty.png')}
-        style={{ margin: '0.2rem 0', width: '1.6rem' }}
+        style={{ margin: '0.2rem 0', width: '1rem' }}
       />
       <p style={{ textAlign: 'center', color: '#555' }}>自检正常</p>
     </div>

src/pages/EqSelfInspection/components/PatrolReportDetail.less

@@ -78,7 +78,7 @@
   .orderIcon {
     width: 0.92rem;
     height: 0.92rem;
-    border-radius: 50%;
+    border-radius: 0.46rem;
     margin-right: 0.16rem;
     color: #12ceb3;
     border: 0.06rem solid #12ceb3;

src/pages/Home/index.js

@@ -312,7 +312,9 @@ const Backlog = (props) => {
                 handleClick(item);
               }}
             >
-              <div className={styles.createTime}>{item.time}</div>
+              <div className={styles.createTime}>
+                {dayjs(item.time).format('MM-DD HH:mm')}
+              </div>
               <div className={styles.titleCon}>
                 <div className={styles.point} />
                 <div className={styles.titleText}>{item.title}</div>

src/pages/Home/index.less

@@ -193,11 +193,11 @@
   height: 260px;
   color: #3b3b3b;
   .item {
-    padding: 8px 0 20px;
+    padding: 8px 0 14px;
     width: 100%;
     font-size: 22px;
     line-height: 50px;
-    border-bottom: 1px solid #ffffff;
+    border-bottom: 1px solid #d8d8d8;
   }
   .titleCon {
     display: flex;
@@ -217,7 +217,9 @@
     margin: 0 20px;
   }
   .bottomCon {
+    margin-left: 24px;
     font-size: 18px;
+    line-height: 36px;
     word-wrap: break-word;
   }
 }

src/pages/SafetyManagement/doorDetail.js

@@ -23,21 +23,18 @@ const DoorDetail = () => {
       dataIndex: 'created_time',
       key: 'created_time',
       align: 'center',
-      width: 160,
     },
     {
       title: '人员',
       dataIndex: 'user_name',
       key: 'user_name',
       align: 'center',
-      width: 110,
     },
     {
       title: '门禁名称',
       dataIndex: 'gate_name',
       key: 'gate_name',
       align: 'center',
-      width: 140,
     },
     {
       title: '事件',
@@ -50,14 +47,12 @@ const DoorDetail = () => {
       dataIndex: 'check_type',
       key: 'check_type',
       align: 'center',
-      width: 140,
     },
     {
       title: '出入状态',
       dataIndex: 'status',
       key: 'status',
       align: 'center',
-      width: 140,
     },
   ];
 
@@ -72,7 +67,6 @@ const DoorDetail = () => {
       >
         <Table
           loading={loading}
-          style={{ marginTop: '0.3rem' }}
           dataSource={list}
           columns={columns}
           pagination={false}

src/pages/SmartOps/ChartPage.js

@@ -126,6 +126,7 @@ const ChartPage = (props) => {
   }, []);
 
   const getData = async (list) => {
+    if (!list) return;
     const data = await Promise.all(
       list?.map((item) => {
         return getDeviceRealDataByTime(item).then((res) => res.data);
@@ -191,12 +192,9 @@ const ChartPage = (props) => {
               <Button
                 key={item.type}
                 type="primary"
-                style={{
-                  marginRight: 20,
-                  fontSize: 24,
-                  height: 50,
-                  background: timeActive == index ? '#329BFE' : '#2F4D83',
-                }}
+                className={
+                  timeActive == index ? styles.btnSelect : styles.btnDate
+                }
                 onClick={() => {
                   setTimeActive(index);
                   changeTime(item.value);
@@ -215,7 +213,7 @@ const ChartPage = (props) => {
           {options ? (
             <ChartModule chartType="line" {...options} />
           ) : (
-            <Empty style={{ marginTop: 140 }} />
+            <Empty style={{ marginTop: '0.4rem' }} />
           )}
         </div>
       </Spin>

src/pages/SmartOps/HistoryRecord.js

@@ -193,7 +193,6 @@ const HistoryRecord = (props) => {
         </Button>
       </div>
       <ScrollLoading
-        height={182}
         loading={loading}
         pagination={pagination}
         handleLoadData={(current) => handleParamsChange('page', current)}

src/pages/SmartOps/OperationRecord.js

@@ -223,7 +223,6 @@ const OperationRecord = (props) => {
         </Button>
       </div>
       <ScrollLoading
-        height={182}
         loading={loading}
         pagination={pagination}
         handleLoadData={(current) => handleParamsChange('page', current)}

src/pages/SmartOps/WorkAnalysisDetail.js

@@ -771,14 +771,14 @@ function getOption(data = [], active) {
         type: 'shadow',
       },
       textStyle: {
-        fontSize: 24,
+        fontSize: 12,
       },
       formatter,
     },
     legend: {
       textStyle: {
         // color: '#fff',
-        fontSize: 24,
+        fontSize: 14,
       },
       type: 'scroll',
     },
@@ -793,10 +793,10 @@ function getOption(data = [], active) {
       type: 'category',
       data: xAxis,
       nameTextStyle: {
-        fontSize: 24,
+        fontSize: 12,
       },
       axisLabel: {
-        fontSize: 24,
+        fontSize: 12,
       },
     },
     yAxis: {
@@ -804,10 +804,10 @@ function getOption(data = [], active) {
       type: 'value',
       boundaryGap: [0, 0.01],
       nameTextStyle: {
-        fontSize: 24,
+        fontSize: 14,
       },
       axisLabel: {
-        fontSize: 24,
+        fontSize: 12,
       },
       splitNumber: 5,
     },

src/pages/SmartOps/WorkAnalysisDetail.less

@@ -5,7 +5,7 @@
   font-size: 0.32rem;
   color: #4a90e2;
   padding: 0.4rem 0.2rem;
-  margin-top: 0.52rem;
+  margin-bottom: 0.2rem;
 
   background: #d9e7f9;
   box-shadow: 0rem 0rem 0.12rem 0.07rem rgba(40, 94, 120, 0.03);

src/pages/SmartOps/index.less

@@ -101,6 +101,17 @@
   }
 }
 
+.btnDate {
+  margin-right: 0.2rem;
+  font-size: 0.24rem;
+  height: 0.5rem;
+  background-color: #2f4d83;
+}
+.btnSelect {
+  .btnDate;
+  background-color: #329bfe;
+}
+
 .anaBtn {
   font-size: 0.12rem !important;
   padding: 0.06rem;
@@ -148,7 +159,6 @@
   color: #4a4a4a;
   font-size: 0.24rem;
   white-space: nowrap;
-  margin-top: 0.4rem;
   :global {
     .ant-select {
       margin: 0 0.4rem 0 0.1rem;