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

.umirc.ts

@@ -18,6 +18,7 @@ export default defineConfig({
     { 'http-equiv': 'expires', content: '0' },
     { 'http-equiv': 'X-UA-Compatible', content: 'IE=EmulateIE9' },
     { name: 'transparent', content: 'true' },
+    { name: 'viewport', content: 'width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0' },
   ],
   proxy: {
     '/api': {

src/global.less

@@ -182,7 +182,7 @@ input[type='reset'] {
   background-color: #eee;
 }
 
-:where(.css-dev-only-do-not-override-byeoj0).ant-btn-primary {
+.ant-btn-primary {
   background: #4a90e2;
   font-size: 16px;
   padding-top: 0;

src/pages/DeviceManager/index.js

@@ -272,19 +272,19 @@ const Device = ({ projectId }) => {
           className={`${styles.btn} ${type == 0 ? styles.active : ''}`}
           onClick={() => handleBtnClick(0)}
         >
-          全部
+          <span style={{ lineHeight: '60px' }}>全部</span>
         </div>
         <div
           className={`${styles.btn} ${type == 1 ? styles.active : ''}`}
           onClick={() => handleBtnClick(1)}
         >
-          维修
+          <span style={{ lineHeight: '60px' }}>维修</span>
         </div>
         <div
           className={`${styles.btn} ${type == 2 ? styles.active : ''}`}
           onClick={() => handleBtnClick(2)}
         >
-          保养
+          <span style={{ lineHeight: '60px' }}>保养</span>
         </div>
       </Space>
       {type == 0 && (

src/pages/DeviceManager/index.less

@@ -67,13 +67,12 @@
     align-items: center;
   }
   .btns {
-    margin: 34px 0;
+    margin: 24px 0;
     .btn {
-      width: 148px;
+      width: 150px;
       height: 60px;
       font-size: 30px;
       color: #4a4a4a;
-      line-height: 60px;
       text-align: center;
       background-image: url('@/assets/deviceManager/deviceBtn1.png');
       background-size: 100% 100%;

src/pages/Home/index.js

@@ -123,7 +123,7 @@ const SelfInspection = connect(({ eqSelfInspection, loading }) => ({
 
   const renderStatus = () => {
     if (loading) return <LoadingOutlined />;
-    if (autoReport.warningTotalNum) {
+    if (autoReport.Status > 0) {
       return <span style={{ color: '#FE5850' }}>异常</span>;
     }
     return <span style={{ color: '#F5A623' }}>正常</span>;

src/pages/Menu/index.less

@@ -12,7 +12,7 @@
   cursor: pointer;
 
   &.active {
-    color: #000;
+    color: #4A90E2;
     font-weight: bold;
   }
 }