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

src/pages/DeviceManager/detail.js

@@ -401,7 +401,7 @@ const SparePartDetail = () => {
   return (
     <PageContent closeable={false}>
       <PageTitle children={titles[type]} returnable />
-      <div className="content-title" style={{ marginTop: '0.1rem' }}>
+      <div className="content-tab" style={{ marginTop: '0.1rem' }}>
         {Number(type) !== PageType.warning && Number(type) !== PageType.base ? (
           <Table
             sticky={{ offsetHeader: 0 }}

src/pages/DeviceManager/deviceRepairDetail.js

@@ -87,93 +87,95 @@ export default function DeviceMaintainDetail() {
   return (
     <PageContent style={{ background: '#fff', borderRadius: 12 }}>
       <PageTitle>设备维修</PageTitle>
-      <div className={styles.detailBox}>
-        <span>
-          <label>设备位号:</label>
-          {DeviceCode}
-        </span>
-        <span>
-          <label>维修人:</label>
-          {getUser(Operators)}
-        </span>
-        <span>
-          <label>设备名称:</label>
-          {DeviceName}
-        </span>
-        <span>
-          <label>维修日期:</label>
-          {RepairTime}
-        </span>
-        <span>
-          <label>维修原因:</label>
-          {Reason}
-        </span>
-        <span>
-          <label>维修内容简述:</label>
-          {Desc}
-        </span>
+      <div className="content-tab">
+        <div className={styles.detailBox}>
+          <span>
+            <label>设备位号:</label>
+            {DeviceCode}
+          </span>
+          <span>
+            <label>维修人:</label>
+            {getUser(Operators)}
+          </span>
+          <span>
+            <label>设备名称:</label>
+            {DeviceName}
+          </span>
+          <span>
+            <label>维修日期:</label>
+            {RepairTime}
+          </span>
+          <span>
+            <label>维修原因:</label>
+            {Reason}
+          </span>
+          <span>
+            <label>维修内容简述:</label>
+            {Desc}
+          </span>
 
-        <span>
-          <label>计划日期:</label>
-          {PlanTime}
-        </span>
-        <span>
-          <label>物料消耗:</label>
-          {MaterialConsumption}
-        </span>
+          <span>
+            <label>计划日期:</label>
+            {PlanTime}
+          </span>
+          <span>
+            <label>物料消耗:</label>
+            {MaterialConsumption}
+          </span>
 
-        <span>
-          <label>维修方式:</label>
-          {RepairType}
-        </span>
-        <span>
-          <label>验收人:</label>
-          {AcceptorUser?.CName}
-        </span>
+          <span>
+            <label>维修方式:</label>
+            {RepairType}
+          </span>
+          <span>
+            <label>验收人:</label>
+            {AcceptorUser?.CName}
+          </span>
 
-        <span>
-          <label>是否计划内:</label>
-          {String(IsPlan) == 0 ? '否' : '是'}
-        </span>
-        <span>
-          <label>验收状态:</label>
-          {getStatus(AcceptanceTime, AcceptanceStatus)}
-        </span>
+          <span>
+            <label>是否计划内:</label>
+            {String(IsPlan) == 0 ? '否' : '是'}
+          </span>
+          <span>
+            <label>验收状态:</label>
+            {getStatus(AcceptanceTime, AcceptanceStatus)}
+          </span>
 
-        <span>
-          <label>难度级别:</label>
-          {DifficultyLevel}
-        </span>
-        <span>
-          <label>级别:</label>
-          {Level}
-        </span>
-        <span>
-          <label>维修状态:</label>
-          {AcceptanceStatus}
-        </span>
-        <span>
-          <label>验收意见:</label>
-          {AcceptanceOpinion}
-        </span>
+          <span>
+            <label>难度级别:</label>
+            {DifficultyLevel}
+          </span>
+          <span>
+            <label>级别:</label>
+            {Level}
+          </span>
+          <span>
+            <label>维修状态:</label>
+            {AcceptanceStatus}
+          </span>
+          <span>
+            <label>验收意见:</label>
+            {AcceptanceOpinion}
+          </span>
 
-        <span>
-          <label>评估分数:</label>
-          {EvaluationScore * 100}
-        </span>
-        <span>
-          <label>保养备注:</label>
-          {Note?.split('|').map((item) => (
-            <div>{item}</div>
-          ))}
-        </span>
+          <span>
+            <label>评估分数:</label>
+            {EvaluationScore * 100}
+          </span>
+          <span>
+            <label>保养备注:</label>
+            {Note?.split('|').map((item) => (
+              <div>{item}</div>
+            ))}
+          </span>
+        </div>
+        <Table
+          style={{ marginTop: '0.1rem' }}
+          dataSource={Files}
+          columns={columns}
+          pagination={false}
+        />
       </div>
-      <Table
-        style={{ marginTop: '0.1rem' }}
-        dataSource={Files}
-        columns={columns}
-        pagination={false}
-      />
     </PageContent>
   );
 }

src/pages/DeviceManager/storage.js

@@ -141,82 +141,84 @@ const StorageOverview = ({ projectId }) => {
   };
 
   return (
-    <Spin className="content-title" spinning={loading}>
-      <div className={`card-box  ${styles.tipContent2}`}>
-        <div
-          style={{
-            display: 'flex',
-            justifyContent: 'space-between',
-            alignItems: 'center',
-          }}
-        >
-          <ModuleTitle title="备品报告：" />
-          <Button type="primary" onClick={goDetail}>
-            详情
-          </Button>
+    <Spin spinning={loading}>
+      <div className="content-tab">
+        <div className={`card-box  ${styles.tipContent2}`}>
+          <div
+            style={{
+              display: 'flex',
+              justifyContent: 'space-between',
+              alignItems: 'center',
+            }}
+          >
+            <ModuleTitle title="备品报告：" />
+            <Button type="primary" onClick={goDetail}>
+              详情
+            </Button>
+          </div>
+          <div style={{ marginTop: '0.2rem' }}>{warningData}</div>
         </div>
-        <div style={{ marginTop: '0.2rem' }}>{warningData}</div>
-      </div>
-      <div className={`card-box ${styles.itemContent}`}>
-        <ModuleTitle title="物料种类库存占比" />
-        <div style={{ height: '3.3rem' }}>
-          {data?.pieData && <PieChartModule data={data.pieData} />}
+        <div className={`card-box ${styles.itemContent}`}>
+          <ModuleTitle title="物料种类库存占比" />
+          <div style={{ height: '3.3rem' }}>
+            {data?.pieData && <PieChartModule data={data.pieData} />}
+          </div>
         </div>
-      </div>
-      <div className={`card-box ${styles.itemContent}`}>
-        <ModuleTitle title="物料库存排名前十统计" />
-        <ul
-          style={{
-            height: '3.3rem',
-            display: 'flex',
-            flexDirection: 'column',
-          }}
-        >
-          {data?.kind && data.kind.length != 0 ? (
-            data.kind
-              ?.sort((a, b) => b.value - a.value)
-              .map((item) => {
-                return (
-                  <li
-                    className={styles.li}
-                    key={`kind_${item.item}`}
-                    style={{ flexGrow: 1 }}
-                  >
-                    <div
-                      style={{
-                        width: '0.8rem',
-                        textAlign: 'right',
-                        fontSize: '0.18rem',
-                        whiteSpace: 'nowrap',
-                      }}
+        <div className={`card-box ${styles.itemContent}`}>
+          <ModuleTitle title="物料库存排名前十统计" />
+          <ul
+            style={{
+              height: '3.3rem',
+              display: 'flex',
+              flexDirection: 'column',
+            }}
+          >
+            {data?.kind && data.kind.length != 0 ? (
+              data.kind
+                ?.sort((a, b) => b.value - a.value)
+                .map((item) => {
+                  return (
+                    <li
+                      className={styles.li}
+                      key={`kind_${item.item}`}
+                      style={{ flexGrow: 1 }}
                     >
-                      {item.item}
-                    </div>
-                    <div
-                      className={styles.line}
-                      style={{
-                        width: `${(70 * item.value) / data?.maxKind}%`,
-                      }}
-                    />
-                    {item.value}
-                  </li>
-                );
-              })
-          ) : (
-            <Empty />
-          )}
-        </ul>
-      </div>
-      <div className={`card-box ${styles.itemContent}`}>
-        <ModuleTitle title="物料报废统计" />
-        <div style={{ height: '4.4rem' }}>
-          {data?.radarData && <RadarChartModule {...data.radarData} />}
+                      <div
+                        style={{
+                          width: '0.8rem',
+                          textAlign: 'right',
+                          fontSize: '0.18rem',
+                          whiteSpace: 'nowrap',
+                        }}
+                      >
+                        {item.item}
+                      </div>
+                      <div
+                        className={styles.line}
+                        style={{
+                          width: `${(70 * item.value) / data?.maxKind}%`,
+                        }}
+                      />
+                      {item.value}
+                    </li>
+                  );
+                })
+            ) : (
+              <Empty />
+            )}
+          </ul>
         </div>
-      </div>
-      <div className={`card-box ${styles.itemContent}`}>
-        <ModuleTitle title="出入库统计" />
-        <div style={{ height: '4rem' }}>
-          {data?.barData && <BarChartModule {...data.barData} />}
+        <div className={`card-box ${styles.itemContent}`}>
+          <ModuleTitle title="物料报废统计" />
+          <div style={{ height: '4.4rem' }}>
+            {data?.radarData && <RadarChartModule {...data.radarData} />}
+          </div>
+        </div>
+        <div className={`card-box ${styles.itemContent}`}>
+          <ModuleTitle title="出入库统计" />
+          <div style={{ height: '4rem' }}>
+            {data?.barData && <BarChartModule {...data.barData} />}
+          </div>
         </div>
       </div>
     </Spin>

src/pages/Home/ChemCostComparison.js

@@ -322,7 +322,7 @@ export const ChemCost = ({ open, showTip = false }) => {
   }, []);
 
   return (
-    <div style={{ position: 'relative' }}>
+    <div className="content-tab" style={{ position: 'relative' }}>
       {showTip && <div className={styles.pageTip}>{snapshot?.resultText}</div>}
       <div style={{ padding: '0.2rem 0rem' }}>
         <div className="card-box">

src/pages/Home/EnergyCostComparison.js

@@ -286,6 +286,7 @@ export const EnergyCost = ({ open, detailClick, showTip }) => {
 
   return (
     <div
+      className="content-tab"
       style={{ padding: '0.2rem', position: 'relative', marginTop: '0.1rem' }}
     >
       {showTip && <div className={styles.pageTip}>{snapshot?.resultText}</div>}

src/pages/Home/QualityMng.js

@@ -147,7 +147,10 @@ export const WaterQuality = ({ showTip = false }) => {
   };
 
   return (
-    <div style={{ marginTop: '0.1rem', position: 'relative' }}>
+    <div
+      className="content-tab"
+      style={{ marginTop: '0.1rem', position: 'relative' }}
+    >
       {showTip && <div className={styles.pageTip}>{status}</div>}
       <div className="card-box">
         <ul className={styles.pageTop}>

src/pages/Home/WaterAmtMng.js

@@ -139,7 +139,7 @@ export const WaterAmt = ({ showTip }) => {
 
   return (
     <Spin spinning={loading}>
-      <div style={{ padding: '0.2rem' }}>
+      <div className="content-tab" style={{ padding: '0.2rem' }}>
         {showTip && <div className={styles.pageTip}>{status}</div>}
         <div className="card-box">
           <ul className={styles.pageTop}>

src/pages/Home/backlog.js

@@ -30,7 +30,7 @@ const CostComparison = () => {
         待办事项
       </PageTitle>
 
-      <div className={styles.backlog}>
+      <div className={`content-tab ${styles.backlog}`}>
         <div>
           {data?.map((item) => (
             <div

src/pages/Home/backlog.less

@@ -1,8 +1,6 @@
 .backlog {
   margin-right: 6px;
   margin-bottom: 40px;
-  overflow-y: auto;
-  height: 100%;
   color: #3b3b3b;
   .item {
     padding: 8px 0;

src/pages/MessageCenter/index.js

@@ -63,45 +63,43 @@ const MessageCenter = () => {
     }
   };
 
-  const renderItem = (item) => {
-    const time = item?.CreatedOn
-      ? dayjs(item.CreatedOn).format('YYYY-MM-DD HH:mm')
-      : '';
-    let icon = '';
-    switch (tab) {
-      case '1':
-        icon = icon1;
-        break;
-      case '2':
-        icon = icon2;
-        break;
-      case '3':
-        icon = icon3;
-        break;
-    }
+  const RenderContent = ({ loading, data, icon }) => {
     return (
-      <div className={`card-box ${styles.itemContent}`}>
-        <div className={styles.left}>
-          <img className={styles.img} src={icon} />
-          <div>
-            <div className={styles.text}>{item.MsgBody}</div>
-            <div className={styles.time}>{time}</div>
-          </div>
-        </div>
+      <Spin spinning={loading}>
+        <div className="content-tab">
+          {data?.map((item) => {
+            const time = item?.CreatedOn
+              ? dayjs(item.CreatedOn).format('YYYY-MM-DD HH:mm')
+              : '';
+            return (
+              <div key={item.ID} className={`card-box ${styles.itemContent}`}>
+                <div className={styles.left}>
+                  <img className={styles.img} src={icon} />
+                  <div>
+                    <div className={styles.text}>{item.MsgBody}</div>
+                    <div className={styles.time}>{time}</div>
+                  </div>
+                </div>
 
-        <div className={styles.right}>
-          <div
-            className={item?.ReadStatus ? styles.redPoint : styles.nonePoint}
-          />
-          <Button
-            className={styles.btn}
-            type="primary"
-            onClick={() => handlerSeeClick(item)}
-          >
-            查看
-          </Button>
+                <div className={styles.right}>
+                  <div
+                    className={
+                      item?.ReadStatus ? styles.redPoint : styles.nonePoint
+                    }
+                  />
+                  <Button
+                    className={styles.btn}
+                    type="primary"
+                    onClick={() => handlerSeeClick(item)}
+                  >
+                    查看
+                  </Button>
+                </div>
+              </div>
+            );
+          })}
         </div>
-      </div>
+      </Spin>
     );
   };
   return (
@@ -115,27 +113,29 @@ const MessageCenter = () => {
             label: `系统自检`,
             key: '2',
             children: (
-              <Spin spinning={loadingSelf}>
-                {dataSelf?.list?.map((item) => renderItem(item))}
-              </Spin>
+              <RenderContent
+                loading={loadingSelf}
+                data={dataSelf?.list}
+                icon={icon2}
+              />
             ),
           },
           {
             label: `预警数据`,
             key: '3',
             children: (
-              <Spin spinning={loadingWarning}>
-                {dataWarning?.list?.map((item) => renderItem(item))}
-              </Spin>
+              <RenderContent
+                loading={loadingWarning}
+                data={dataWarning?.list}
+                icon={icon3}
+              />
             ),
           },
           {
             label: `水厂工况`,
             key: '1',
             children: (
-              <Spin spinning={loading}>
-                {data?.list?.map((item) => renderItem(item))}
-              </Spin>
+              <RenderContent loading={loading} data={data?.list} icon={icon1} />
             ),
           },
         ]}

src/pages/Smart/ConditionDetection.js

@@ -49,7 +49,7 @@ const ConditionDetection = (props) => {
     <PageContent closeable={false}>
       <PageTitle returnable>工况检测</PageTitle>
 
-      <div className="content-title">
+      <div className="content-tab">
         <div className={styles.circle}>
           {/* <CircleScore big>
             <span className={styles.circleText}>{score}</span>

src/pages/Smart/ConditionDetection.less

@@ -102,3 +102,7 @@
   margin-bottom: 0.1rem;
   letter-spacing: 0.02rem;
 }
+.scrollContent {
+  overflow-y: auto;
+  height: calc(100vh - 0.9rem);
+}

src/pages/SmartOps/Analysis.js

@@ -187,7 +187,6 @@ const Analysis = (props) => {
                     onClick: () => onSelectRow(record, index),
                   })}
                   pagination={false}
-                  scroll={{ y: document.body.clientHeight - 730 }}
                 />
               ),
             };

src/pages/SmartOps/ChartPage.js

@@ -37,6 +37,7 @@ const ChartPage = (props) => {
   const [searchParams, setSearchParams] = useSearchParams();
   const type = searchParams.get('type') || 2;
   const data = searchParams.get('data');
+  const deviceCode = searchParams.get('device_code');
 
   const [loading, setLoading] = useState(false);
   const [options, setOptions] = useState({});

src/pages/SmartOps/WorkAnalysisDetail.js

@@ -190,7 +190,7 @@ function WorkAnalysisDetail(props) {
   return (
     <PageContent closeable={false}>
       <PageTitle onReturn={handleBackClick}>返回</PageTitle>
-      <div className={styles.pageContent}>
+      <div className={`content-tab ${styles.pageContent}`}>
         <div className={styles.title}>
           {parentName}：{name}
           <span>

src/pages/SmartOps/index.js

@@ -351,7 +351,7 @@ function SmartOps(props) {
             },
             {
               label: `预测分析`,
-              key: '6',
+              key: '5',
               children: <PredictionAnalysis />,
             },
             {
@@ -377,7 +377,7 @@ function SmartOps(props) {
             },
             {
               label: `经营分析`,
-              key: '5',
+              key: '6',
               children: <OperationManage />,
             },
           ]}

src/pages/SmartOps/operationManage/index.js

@@ -68,15 +68,17 @@ const OperationManage = () => {
   const onTabsChange = () => {};
 
   return (
-    <TabsContent
-      small
-      bold={false}
-      spacing={2.5}
-      center={false}
-      defaultActiveKey="1"
-      items={items}
-      onChange={onTabsChange}
-    />
+    <div style={{ height: 'calc(100vh - 5.6rem)', overflow: 'auto' }}>
+      <TabsContent
+        small
+        bold={false}
+        spacing={2.5}
+        center={false}
+        defaultActiveKey="1"
+        items={items}
+        onChange={onTabsChange}
+      />
+    </div>
   );
 };
 

src/pages/SmartOps/predictionAnalysis/PredictionAnalysis.js

@@ -26,7 +26,7 @@ const PredictionAnalysis = () => {
       SysName: '超滤工艺单元',
       SysDevs: devs,
     };
-    UnityAction.sendMsg('ProcessAnalysisDetail', JSON.stringify(msg));
+    UnityAction.sendMsg('ProcessPredictDetail', JSON.stringify(msg));
 
     history.push(`/smart-ops/prediction/${projectId}?code=${code}`);
   };

src/pages/SmartOps/predictionAnalysis/PredictionDetail.js

@@ -47,7 +47,7 @@ const PredictionDetail = () => {
   });
 
   const handleBackClick = () => {
-    UnityAction.sendMsg('ProcessAnalysisDetailBack');
+    UnityAction.sendMsg('ProcessPredictBack');
     history.back();
   };
 

src/pages/SmartReport/index.js

@@ -187,20 +187,18 @@ const SmartReport = () => {
 
   const TwoBoxItem = ({ label, value, unit }) => {
     return (
-      <div className={styles.longWhiteBox}>
-        <div className={styles.longWhiteBoxIn}>
-          <div>{label}</div>
-          <span className={styles.value}>
-            {value}
-            {unit && <span className={styles.unit}>{unit}</span>}
-          </span>
-        </div>
+      <div className={`card-box ${styles.longWhiteBox}`}>
+        <div>{label}</div>
+        <span className={styles.value}>
+          {value}
+          {unit && <span className={styles.unit}>{unit}</span>}
+        </span>
       </div>
     );
   };
   const ThreeBoxContent = ({ data }) => {
     return (
-      <div className={styles.threeContent}>
+      <div className={`card-box ${styles.threeContent}`}>
         {data?.map((item) => (
           <div className={styles.threeItem}>
             <div className={styles.value}>
@@ -272,7 +270,6 @@ const SmartReport = () => {
       <ConfigProvider locale={zhCN}>
         <PageTitle children="智慧运营报告" returnable />
         <div className={styles.head}>
-          {/* <div className={styles.name}>智慧运营报告</div> */}
           <div className={styles.photo}>
             {dayjs(date.stime).format('MM月DD日')}-
             {dayjs(date.etime).format('MM月DD日')}

src/pages/SmartReport/index.less

@@ -136,14 +136,8 @@
   .longWhiteBox {
     width: 48%;
     white-space: nowrap;
-    padding: 0.02rem;
-    box-shadow: 0 0.05rem 0.14rem 0 rgba(141, 141, 141, 0.2);
-    border-radius: 0.95rem;
-    background-image: linear-gradient(
-      178deg,
-      rgba(0, 166, 255, 1),
-      rgba(255, 255, 255, 0)
-    );
+    padding: 0.3rem 0 0.02rem;
+    text-align: center;
   }
   .longWhiteBoxIn {
     text-align: center;
@@ -175,10 +169,10 @@
     display: flex;
     width: 100%;
     height: 1.86rem;
-    background: #ecf8fd;
-    box-shadow: 0rem 0.05rem 0.14rem 0rem rgba(141, 141, 141, 0.2);
-    border-radius: 2.78rem;
-    border: 0.01rem solid #00a6ff;
+    // background: #ecf8fd;
+    // box-shadow: 0rem 0.05rem 0.14rem 0rem rgba(141, 141, 141, 0.2);
+    // border-radius: 2.78rem;
+    // border: 0.01rem solid #00a6ff;
     .blueText;
   }
   .threeItem {

src/pages/TaskManage/Detail/TaskDetail/TaskDetail.tsx

@@ -291,12 +291,17 @@ const DispatchTaskModal = (props: any) => {
           rules={[{ required: true, message: '请选择操作人' }]}
         >
           <Select
-            options={userList.map((item) => {
-              return {
-                label: item.CName,
-                value: item.ID,
-              };
-            })}
+            options={userList
+              .filter(
+                (item) =>
+                  item.RoleID.includes('43') || item.RoleID.includes('49'),
+              )
+              ?.map((item) => {
+                return {
+                  label: item.CName,
+                  value: item.ID,
+                };
+              })}
             placeholder="请选择操作人"
           />
         </Form.Item>

src/pages/TaskManage/Popup/WorkOrderModal.js

@@ -322,53 +322,54 @@ const WorkOrderModal = (props) => {
         />
         <Divider style={{ margin: '0 0 0.1rem 0' }} />
         <Spin spinning={loading}>
-          <div>
-            <div>
-              <SubTitle title="工单信息" radius />
-              <div className={styles.basicalInfo}>
-                <Row style={{ marginTop: '0' }}>
-                  <Col span={13} className={styles.fontS32}>
-                    工单类型：
-                    {OrderType.find((item) => item.value === order_type)
-                      ?.label || '-'}
-                  </Col>
-                  <Col span={8} className={styles.fontS32}>
-                    {/*// @ts-ignore*/}
-                    工单负责人：{orderInfo?.Repairman?.CName || '-'}
-                  </Col>
-                </Row>
+          <div
+            className="content-tab"
+            style={{ height: 'calc(100vh - 1.9rem)' }}
+          >
+            <SubTitle title="工单信息" radius />
+            <div className={styles.basicalInfo}>
+              <Row style={{ marginTop: '0' }}>
+                <Col span={13} className={styles.fontS32}>
+                  工单类型：
+                  {OrderType.find((item) => item.value === order_type)?.label ||
+                    '-'}
+                </Col>
+                <Col span={8} className={styles.fontS32}>
+                  {/*// @ts-ignore*/}
+                  工单负责人：{orderInfo?.Repairman?.CName || '-'}
+                </Col>
+              </Row>
+              <Row>
+                <Col span={13} className={styles.fontS32}>
+                  工单状态：{orderInfo?.OrderStatus?.label}
+                </Col>
+                <Col span={8} className={styles.fontS32}>
+                  派单人员：{orderInfo?.DispatchMan?.CName}
+                </Col>
+              </Row>
+              <Row>
+                <Col className={styles.fontS32}>
+                  派单时间：{orderInfo?.CreateTime || '-'}
+                </Col>
+              </Row>
+              <Row>
+                <Col span={13} className={styles.fontS32}>
+                  计划完成时间：{orderInfo?.PlanTime || '-'}
+                </Col>
+              </Row>
+              <Row>
+                <Col className={styles.fontS32}>
+                  实际完成时间：{orderInfo?.RepairTime || '-'}
+                </Col>
+              </Row>
+              {orderInfo?.MandateImages?.length > 0 && (
                 <Row>
-                  <Col span={13} className={styles.fontS32}>
-                    工单状态：{orderInfo?.OrderStatus?.label}
-                  </Col>
-                  <Col span={8} className={styles.fontS32}>
-                    派单人员：{orderInfo?.DispatchMan?.CName}
+                  <Col className={styles.fontS32} span={4}>
+                    任务图片：
                   </Col>
+                  {renderImg()}
                 </Row>
-                <Row>
-                  <Col className={styles.fontS32}>
-                    派单时间：{orderInfo?.CreateTime || '-'}
-                  </Col>
-                </Row>
-                <Row>
-                  <Col span={13} className={styles.fontS32}>
-                    计划完成时间：{orderInfo?.PlanTime || '-'}
-                  </Col>
-                </Row>
-                <Row>
-                  <Col className={styles.fontS32}>
-                    实际完成时间：{orderInfo?.RepairTime || '-'}
-                  </Col>
-                </Row>
-                {orderInfo?.MandateImages?.length > 0 && (
-                  <Row>
-                    <Col className={styles.fontS32} span={4}>
-                      任务图片：
-                    </Col>
-                    {renderImg()}
-                  </Row>
-                )}
-              </div>
+              )}
             </div>
             {order_type === 3 && (
               <div>

src/pages/TaskManage/Popup/WorkOrderModal.less

@@ -10,7 +10,7 @@
   border-radius: 0.5rem;
   background-color: white;
   height: 9rem;
-  overflow-y: scroll;
+  overflow-y: hidden;
   &::-webkit-scrollbar {
     display: none;
   }
@@ -32,9 +32,15 @@
 }
 
 .modalTitle {
-  font-size: 0.28rem;
+  width: calc(100% - 1rem);
+  height: 0.68rem;
+  font-size: 0.32rem;
   font-weight: 600;
-  padding-bottom: 0.1rem;
+  padding: 0.15rem 0 0.06rem 0;
+
+  // font-size: 0.28rem;
+  // font-weight: 600;
+  // padding-bottom: 0.1rem;
 }
 
 .basicalInfo {

src/pages/TaskManage/Popup/index.js

@@ -141,14 +141,19 @@ const TaskModal = (props) => {
           <>
             {modalTitle}
             <Divider style={{ margin: '0.1rem 0' }} />
-            <MandateDetail
-              mandateID={mandateIDs}
-              userList={userList}
-              projectID={projectID}
-              ignoreTask={onIgnoreTaskConfirm}
-              dispatchTask={onDispatchTaskConfirm}
-              autoHandleTask={onAutoHandleTaskConfirm}
-            />
+            <div
+              className="content-tab"
+              style={{ height: 'calc(100vh - 1.9rem)' }}
+            >
+              <MandateDetail
+                mandateID={mandateIDs}
+                userList={userList}
+                projectID={projectID}
+                ignoreTask={onIgnoreTaskConfirm}
+                dispatchTask={onDispatchTaskConfirm}
+                autoHandleTask={onAutoHandleTaskConfirm}
+              />
+            </div>
           </>
         )}
       </div>

src/pages/TaskManage/Popup/index.less

@@ -12,7 +12,7 @@
   border-radius: 0.5rem;
   padding: 0 0.3rem;
   height: 9rem;
-  overflow-y: scroll;
+  overflow-y: hidden;
 
   :global {
     .ant-tabs > .ant-tabs-nav,

src/pages/TaskManage/components/MandateDetail.js

@@ -689,12 +689,17 @@ const DispatchTaskModal = (props) => {
           rules={[{ required: true, message: '请选择操作人' }]}
         >
           <Select
-            options={userList.map((item) => {
-              return {
-                label: item.CName,
-                value: item.ID,
-              };
-            })}
+            options={userList
+              ?.filter(
+                (item) =>
+                  item.RoleID.includes('43') || item.RoleID.includes('49'),
+              )
+              ?.map((item) => {
+                return {
+                  label: item.CName,
+                  value: item.ID,
+                };
+              })}
             placeholder="请选择操作人"
           />
         </Form.Item>