From 50cbadb0cc0e4e363acfb9f986fbe8031cb9fe46 Mon Sep 17 00:00:00 2001
From: liujiangyong <liu.jiangyong@free-sun.com.cn>
Date: Wed, 17 May 2023 10:33:08 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86&=E5=B7=A1?=
 =?UTF-8?q?=E6=A3=80=E8=AE=A1=E5=88=92=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../issueHandle/containers/patrolRecord.js    | 35 +++++++++++--------
 .../patrolManage/containers/patrolPlan.js     | 11 ++++--
 .../patrolManage/containers/patrolPlan.less   | 20 +++++++++++
 3 files changed, 50 insertions(+), 16 deletions(-)
 create mode 100644 web/client/src/sections/patrolManage/containers/patrolPlan.less

diff --git a/web/client/src/sections/issueHandle/containers/patrolRecord.js b/web/client/src/sections/issueHandle/containers/patrolRecord.js
index c8d6779..6d2d01c 100644
--- a/web/client/src/sections/issueHandle/containers/patrolRecord.js
+++ b/web/client/src/sections/issueHandle/containers/patrolRecord.js
@@ -207,20 +207,27 @@ const PatrolRecord = (props) => {
 
     return (
         <div id='patrol-record' className='global-main'>
-            <div style={{ marginBottom: 20 }}>
-                <Input style={{ width: 240, marginRight: 20 }}
-                    value={name} onChange={e => { setName(e.target.value) }}
-                    placeholder="请输入结构物名称或点位名称" allowClear />
-                <Select
-                    value={curState}
-                    onChange={e => { setCurState(e) }}
-                    style={{ width: 140, marginRight: 20 }}
-                    options={[
-                        { value: '全部', label: '全部' },
-                    ].concat(ISSUEHANDLE_STATE.map(s => {
-                        return { value: renderOptionText(s), label: renderOptionText(s) }
-                    }))} />
-                <Button type='primary' onClick={() => { queryData() }}>搜索</Button>
+            <div style={{ marginBottom: 20, display: 'flex', justifyContent: 'space-between' }}>
+                <div className='title'>
+                    <span className='line'></span>
+                    <span className='cn'>问题处理</span>
+                    <span className='en'>&nbsp;PROBLEM HANDLING</span>
+                </div>
+                <div>
+                    <Input style={{ width: 240, marginRight: 20 }}
+                        value={name} onChange={e => { setName(e.target.value) }}
+                        placeholder="请输入结构物名称或点位名称" allowClear />
+                    <Select
+                        value={curState}
+                        onChange={e => { setCurState(e) }}
+                        style={{ width: 140, marginRight: 20 }}
+                        options={[
+                            { value: '全部', label: '全部' },
+                        ].concat(ISSUEHANDLE_STATE.map(s => {
+                            return { value: renderOptionText(s), label: renderOptionText(s) }
+                        }))} />
+                    <Button type='primary' onClick={() => { queryData() }}>搜索</Button>
+                </div>
             </div>
             <Table
                 columns={columns}
diff --git a/web/client/src/sections/patrolManage/containers/patrolPlan.js b/web/client/src/sections/patrolManage/containers/patrolPlan.js
index 68d68c6..a1b3e16 100644
--- a/web/client/src/sections/patrolManage/containers/patrolPlan.js
+++ b/web/client/src/sections/patrolManage/containers/patrolPlan.js
@@ -6,6 +6,7 @@ import PlanModal from '../components/planModal';
 import { createPatrolPlan, delPatrolPlan, updatePatrolPlan, getPatrolPlan } from '../actions/plan';
 import { getPatrolTemplate } from '../actions/template';
 import moment from 'moment';
+import './patrolPlan.less'
 
 function PatrolPlan(props) {
     const { dispatch, user } = props;
@@ -124,7 +125,12 @@ function PatrolPlan(props) {
     }];
 
     return (
-        <>
+        <div className='plan-main'>
+            <div className='title'>
+                <span className='line'></span>
+                <span className='cn'>巡检计划制定</span>
+                <span className='en'>&nbsp;Inspection plan making</span>
+            </div>
             <ProTable
                 columns={columns}
                 actionRef={tableRef}
@@ -133,6 +139,7 @@ function PatrolPlan(props) {
                 rowKey='id'
                 pagination={{ pageSize: 10, size: 'default', className: 'global-pagination' }}
                 search={{
+                    className: 'search-form',
                     defaultCollapsed: false,
                     labelWidth: 'auto',
                     optionRender: (searchConfig, formProps, dom) => [
@@ -172,7 +179,7 @@ function PatrolPlan(props) {
                         }}
                     /> : null
             }
-        </>
+        </div>
     )
 }
 
diff --git a/web/client/src/sections/patrolManage/containers/patrolPlan.less b/web/client/src/sections/patrolManage/containers/patrolPlan.less
new file mode 100644
index 0000000..d0d6518
--- /dev/null
+++ b/web/client/src/sections/patrolManage/containers/patrolPlan.less
@@ -0,0 +1,20 @@
+.plan-main {
+    background: #fff;
+
+    .search-form {
+        .ant-row-start {
+            justify-content: flex-end;
+
+            .ant-col-offset-6 {
+                margin-left: 0;
+            }
+        }
+    }
+
+    .title {
+        position: absolute;
+        top: 50px;
+        left: 50px;
+        z-index: 1;
+    }
+}
\ No newline at end of file