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

src/global.less

@@ -131,11 +131,16 @@ input[type='reset'] {
 }
 
 .content-tab {
+  padding-left: 5px;
+  padding-top: 5px;
+  padding-right: 5px;
   height: calc(100vh - 130px);
   overflow-x: hidden;
   overflow-y: auto;
 }
 .content-title {
+  padding-left: 5px;
+  padding-right: 5px;
   height: calc(100vh - 110px);
   overflow-x: hidden;
   overflow-y: auto;
@@ -262,3 +267,19 @@ input[type='reset'] {
     font-size: 24px;
   }
 }
+
+.ant-select-selection-item {
+  font-size: 26px;
+}
+.ant-select-selector {
+  height: 40px;
+  padding: 4px 11px;
+}
+
+.ant-select-single:not(.ant-select-customize-input) .ant-select-selector {
+  height: 40px;
+  padding: 4px 11px;
+}
+.ant-select-single .ant-select-selector {
+  font-size: 26px;
+}

src/pages/Center/MyTask/Detail/WorkOrderDetail.js

@@ -138,9 +138,9 @@ const WorkOrderDetail = (props) => {
             dayjs(temp.actual_end_time).format('YYYY-MM-DD HH:mm')) ||
           '-',
         Reason: temp.detail,
-        Repairman: userList.find((item) => item.ID === temp.checker_id) || '-',
+        Repairman: userList.find((item) => item.ID === temp.operator_id) || '-',
         DispatchMan:
-          userList.find((item) => item.ID === temp.operator_id) || '-',
+          userList.find((item) => item.ID === temp.checker_id) || '-',
         OrderStatus:
           OrderStatus.find((item) => item.value === temp.status) || '-',
         MandateImages:
@@ -178,9 +178,9 @@ const WorkOrderDetail = (props) => {
           ? dayjs(result.actual_end_time.Time).format('YYYY-MM-DD HH:mm')
           : '-',
         Reason: result.note,
-        Repairman: '-',
-        DispatchMan:
+        Repairman:
           userList.find((user) => user.ID === result.operator_id) || '-',
+        DispatchMan: '-',
         OrderStatus:
           OrderStatus.find((status) => status.value === result.status) || '-',
       };
@@ -206,9 +206,9 @@ const WorkOrderDetail = (props) => {
             ? dayjs(temp.actual_end_time).format('YYYY-MM-DD HH:mm')
             : '-',
           Reason: temp.detail,
-          Repairman: '-',
-          DispatchMan:
+          Repairman:
             userList.find((user) => user.ID === temp.operator_id) || '-',
+          DispatchMan: '-',
           OrderStatus:
             OrderStatus.find((status) => status.value === temp.status) || '-',
         };
@@ -239,6 +239,7 @@ const WorkOrderDetail = (props) => {
       // 工艺
       case 1:
       case 6:
+      case 7:
         getCraftDetail({ project_id, work_id: order_id });
         break;
       // 维修

src/pages/Center/MyTask/List/WorkOrderList.less

@@ -13,6 +13,7 @@
   padding: 20px;
   margin-top: 20px;
   margin-bottom: 10px;
+  margin-left: 5px;
   border-radius: 10px;
   box-shadow: 0px 0px 8px 2px rgba(191, 191, 191, 0.2);
 }

src/pages/Center/MyTask/List/taskList.less

@@ -1,6 +1,7 @@
 .cardContainer {
   width: 100%;
   padding: 20px 20px 10px 20px;
+  margin-left: 5px;
   background-color: white;
 
   .collapseLabel {

src/pages/Center/MyTask/index.less

@@ -4,7 +4,7 @@
   overflow-y: scroll;
 
   .listItem {
-    margin: 20px 20px 20px 0;
+    margin: 20px 20px 20px 5px;
     height: 120px;
     box-shadow: 0 0 6px 3px rgba(0, 150, 255, 10%);
     border-radius: 10px;

src/pages/Smart/OptimizationTasks.js

@@ -81,9 +81,11 @@ const Produce = ({ projectId }) => {
           <i />
           生产调度类
         </div>
-        <div className={styles.btnBlue} onClick={openDetail}>
-          查看任务
-        </div>
+        {mandateID && (
+          <div className={styles.btnBlue} onClick={openDetail}>
+            查看任务
+          </div>
+        )}
       </h3>
       {data?.length > 0 && (
         <>
@@ -179,9 +181,11 @@ const Cost = ({ projectId }) => {
           <i style={{ background: '#F5A623' }} />
           成本节约类
         </div>
-        <div className={styles.btnOrange} onClick={openDetail}>
-          查看任务
-        </div>
+        {mandateID && (
+          <div className={styles.btnOrange} onClick={openDetail}>
+            查看任务
+          </div>
+        )}
       </h3>
       {data?.length > 0 && (
         <>

src/pages/SmartOps/OperationRecord.js

@@ -206,7 +206,7 @@ const OperationRecord = (props) => {
         <span style={{ marginLeft: '20px' }}>来源:</span>
         <Select
           placeholder="请选择来源"
-          style={{ width: 200 }}
+          style={{ width: 250 }}
           onChange={(value) => handleParamsChange('cause_type', value)}
           allowClear
         >

src/pages/SmartReport/index.js

@@ -246,17 +246,17 @@ const SmartReport = () => {
     <PageContent closeable={false}>
       <ConfigProvider locale={zhCN}>
         <div className={styles.head}>
-          <div>
-            <div className={styles.name}>
-              <LeftOutlined
-                onClick={handleOnClick}
-                style={{ fontSize: 36, cursor: 'pointer', marginRight: '20px' }}
-              />
-              智慧运营报告
-            </div>
-            <div className={styles.photo}>
-              {dayjs(date.stime).format('MM月DD日')}-
-              {dayjs(date.etime).format('MM月DD日')}
+          <div className={styles.nameContainer}>
+            <LeftOutlined
+              onClick={handleOnClick}
+              style={{ fontSize: 36, cursor: 'pointer', marginRight: '20px' }}
+            />
+            <div>
+              <div className={styles.name}>智慧运营报告</div>
+              <div className={styles.photo}>
+                {dayjs(date.stime).format('MM月DD日')}-
+                {dayjs(date.etime).format('MM月DD日')}
+              </div>
             </div>
           </div>
           <div className={styles.headRight}>
@@ -284,7 +284,9 @@ const SmartReport = () => {
                 ]}
               />
             </div>
-            <div>{showRange && <RangePicker onChange={onChange} />}</div>
+            <div>
+              {showRange && <RangePicker inputReadOnly onChange={onChange} />}
+            </div>
           </div>
         </div>
         <Spin spinning={loading}>

src/pages/SmartReport/index.less

@@ -9,6 +9,12 @@
   font-weight: 400;
   color: #4a4a4a;
 }
+
+.nameContainer {
+  display: flex;
+  justify-content: center;
+}
+
 .name {
   font-size: 34px;
   font-family: PingFangSC, PingFang SC;
@@ -17,7 +23,7 @@
   line-height: 48px;
 }
 .photo {
-  margin-left: 60px;
+  font-size: 24px;
 }
 
 .head {
@@ -38,15 +44,6 @@
     display: flex;
     flex-direction: column;
     align-items: flex-end;
-    .headRightSelect :global {
-      .ant-select-selection-item {
-        font-size: 26px;
-      }
-      .ant-select-selector {
-        height: 40px;
-        padding: 4px 11px;
-      }
-    }
   }
 }
 

src/pages/TaskManage/Detail/TaskList/taskList.less

@@ -1,6 +1,7 @@
 .cardContainer {
   width: 100%;
   padding: 20px 20px 10px 20px;
+  margin-left: 5px;
   background-color: white;
 
   .collapseLabel {

src/pages/TaskManage/Detail/WorkOrderList/WorkOrderList.less

@@ -13,6 +13,7 @@
   padding: 20px;
   margin-top: 20px;
   margin-bottom: 10px;
+  margin-left: 5px;
   border-radius: 10px;
   box-shadow: 0px 0px 8px 2px rgba(191, 191, 191, 0.2);
 }

src/pages/TaskManage/index.less

@@ -4,7 +4,7 @@
   overflow-y: auto;
 
   .listItem {
-    margin: 20px 20px 20px 0;
+    margin: 20px 20px 20px 5px;
     height: 120px;
     box-shadow: 0 0 6px 3px rgba(0, 150, 255, 10%);
     border-radius: 10px;