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

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%;