From 0fc8d7c19c660486c76b6380e44d87aa843a6f62 Mon Sep 17 00:00:00 2001
From: xingyongchun <xing.yongchun@free-sun.com.cn>
Date: Fri, 29 Jul 2022 11:02:53 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E4=B8=80=E8=A1=8C?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/client/src/sections/fillion/components/bridgeTable.js | 4 ++--
 .../src/sections/fillion/components/enforceTable.js       | 2 +-
 web/client/src/sections/fillion/components/fileTable.js   | 2 +-
 .../src/sections/fillion/components/highwaysTable.js      | 2 +-
 web/client/src/sections/fillion/components/inforTable.js  | 2 +-
 .../src/sections/fillion/components/operationalTable.js   | 8 ++++----
 web/client/src/sections/fillion/components/patrolTable.js | 2 +-
 .../src/sections/fillion/components/promotionalTable.js   | 2 +-
 web/client/src/sections/fillion/components/publicTable.js | 4 ++--
 .../sections/fillion/components/transportationTable.js    | 8 ++++----
 10 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/web/client/src/sections/fillion/components/bridgeTable.js b/web/client/src/sections/fillion/components/bridgeTable.js
index 2fcaf7d8..8a2cd2cb 100644
--- a/web/client/src/sections/fillion/components/bridgeTable.js
+++ b/web/client/src/sections/fillion/components/bridgeTable.js
@@ -1501,7 +1501,7 @@ const BrideTable = (props) => {
                 dataIndex: 'creatTime',
                 valueType: 'dateTimeRange',
                 hideInSearch: true,
-                width: 120,
+                width: 160,
                 fixed: 'right',
                 render: (dom, record) => {
                     return <div><Button type="link"
@@ -1685,7 +1685,7 @@ const BrideTable = (props) => {
                 dataIndex: 'creatTime',
                 valueType: 'dateTimeRange',
                 hideInSearch: true,
-                width: 120,
+                width: 160,
                 fixed: 'right',
                 render: (dom, record) => {
                     return <div><Button type="link"
diff --git a/web/client/src/sections/fillion/components/enforceTable.js b/web/client/src/sections/fillion/components/enforceTable.js
index c5eef424..7ddc2662 100644
--- a/web/client/src/sections/fillion/components/enforceTable.js
+++ b/web/client/src/sections/fillion/components/enforceTable.js
@@ -1502,7 +1502,7 @@ const openModal = (type, record) => {
                 dataIndex: 'creatTime',
                 valueType: 'dateTimeRange',
                 hideInSearch: true,
-                width: 120,
+                width: 160,
                 fixed: 'right',
                 render: (dom, record) => {
                     return <div><Button type="link"
diff --git a/web/client/src/sections/fillion/components/fileTable.js b/web/client/src/sections/fillion/components/fileTable.js
index a58840f3..fd415420 100644
--- a/web/client/src/sections/fillion/components/fileTable.js
+++ b/web/client/src/sections/fillion/components/fileTable.js
@@ -120,7 +120,7 @@ const DetailList = (props) => {
             align: 'center'
         }, {
             title: '操作',
-            width: 200,
+            width: 160,
             key: 'option',
             valueType: 'option',
             align: 'center',
diff --git a/web/client/src/sections/fillion/components/highwaysTable.js b/web/client/src/sections/fillion/components/highwaysTable.js
index 87fb9798..ccb7dd53 100644
--- a/web/client/src/sections/fillion/components/highwaysTable.js
+++ b/web/client/src/sections/fillion/components/highwaysTable.js
@@ -69,7 +69,7 @@ const hightModal = (type, record) => {
                 dataIndex: 'creatTime',
                 valueType: 'dateTimeRange',
                 hideInSearch: true,
-                width: 120,
+                width: 160,
                 fixed: 'right',
                 render: (dom, record) => {
                     return <div><Button type="link"
diff --git a/web/client/src/sections/fillion/components/inforTable.js b/web/client/src/sections/fillion/components/inforTable.js
index c090c0da..e5e492d3 100644
--- a/web/client/src/sections/fillion/components/inforTable.js
+++ b/web/client/src/sections/fillion/components/inforTable.js
@@ -347,7 +347,7 @@ const InForTable = (props) => {
                 dataIndex: 'creatTime',
                 valueType: 'dateTimeRange',
                 hideInSearch: true,
-                width: 120,
+                width: 160,
                 fixed: 'right',
                 render: (dom, record) => {
                     return <div><Button type="link"
diff --git a/web/client/src/sections/fillion/components/operationalTable.js b/web/client/src/sections/fillion/components/operationalTable.js
index 05ec484b..d61da928 100644
--- a/web/client/src/sections/fillion/components/operationalTable.js
+++ b/web/client/src/sections/fillion/components/operationalTable.js
@@ -104,7 +104,7 @@ const OperaTionalTable = (props) => {
                 dataIndex: 'creatTime',
                 valueType: 'dateTimeRange',
                 hideInSearch: true,
-                width: 120,
+                width: 160,
                 fixed: 'right',
                 render: (dom, record) => {
                     return <div><Button type="link"
@@ -691,7 +691,7 @@ const OperaTionalTable = (props) => {
                 dataIndex: 'creatTime55',
                 valueType: 'dateTimeRange',
                 hideInSearch: true,
-                width: 120,
+                width: 160,
                 fixed: 'right',
                 render: (dom, record) => {
                     return <div><Button type="link"
@@ -1324,7 +1324,7 @@ const OperaTionalTable = (props) => {
                 dataIndex: 'creatTime',
                 valueType: 'dateTimeRange',
                 hideInSearch: true,
-                width: 120,
+                width: 160,
                 fixed: 'right',
                 render: (dom, record) => {
                     return <div><Button type="link"
@@ -1794,7 +1794,7 @@ const OperaTionalTable = (props) => {
                 dataIndex: 'creatTime',
                 valueType: 'dateTimeRange',
                 hideInSearch: true,
-                width: 120,
+                width: 160,
                 fixed: 'right',
                 render: (dom, record) => {
                     return <div><Button type="link"
diff --git a/web/client/src/sections/fillion/components/patrolTable.js b/web/client/src/sections/fillion/components/patrolTable.js
index 0d3221bb..56cd5959 100644
--- a/web/client/src/sections/fillion/components/patrolTable.js
+++ b/web/client/src/sections/fillion/components/patrolTable.js
@@ -136,7 +136,7 @@ const DetailList = (props) => {
             align: 'center'
         }, {
             title: '操作',
-            width: 200,
+            width: 160,
             key: 'option',
             valueType: 'option',
             align: 'center',
diff --git a/web/client/src/sections/fillion/components/promotionalTable.js b/web/client/src/sections/fillion/components/promotionalTable.js
index 8922356e..ff5a746f 100644
--- a/web/client/src/sections/fillion/components/promotionalTable.js
+++ b/web/client/src/sections/fillion/components/promotionalTable.js
@@ -69,7 +69,7 @@ const promotionalTable = (props) => {
          dataIndex: 'creatTime',
          valueType: 'dateTimeRange',
          hideInSearch: true,
-         width: 120,
+         width: 160,
          fixed: 'right',
          render: (dom, record) => {
             return <div style={{ position: 'relative', marginTop: '-30px' }}>
diff --git a/web/client/src/sections/fillion/components/publicTable.js b/web/client/src/sections/fillion/components/publicTable.js
index 66510447..d8035979 100644
--- a/web/client/src/sections/fillion/components/publicTable.js
+++ b/web/client/src/sections/fillion/components/publicTable.js
@@ -402,7 +402,7 @@ const PublicTable = (props) => {
                 dataIndex: 'creatTime',
                 valueType: 'dateTimeRange',
                 hideInSearch: true,
-                width: 120,
+                width: 160,
                 fixed: 'right',
                 render: (dom, record) => {
                     return <div><Button type="link"
@@ -1097,7 +1097,7 @@ const PublicTable = (props) => {
                 dataIndex: 'creatTime',
                 valueType: 'dateTimeRange',
                 hideInSearch: true,
-                width: 120,
+                width: 160,
                 fixed: 'right',
                 render: (dom, record) => {
                     return <div><Button type="link"
diff --git a/web/client/src/sections/fillion/components/transportationTable.js b/web/client/src/sections/fillion/components/transportationTable.js
index b21154da..c6dafcdd 100644
--- a/web/client/src/sections/fillion/components/transportationTable.js
+++ b/web/client/src/sections/fillion/components/transportationTable.js
@@ -1170,7 +1170,7 @@ const TransporTationTable = (props) => {
                 dataIndex: 'creatTime',
                 valueType: 'dateTimeRange',
                 hideInSearch: true,
-                width: 120,
+                width: 160,
                 fixed: 'right',
                 render: (dom, record) => {
                     // node = renderRemoveUser('移除');
@@ -2328,7 +2328,7 @@ const TransporTationTable = (props) => {
                 dataIndex: 'creatTime',
                 valueType: 'dateTimeRange',
                 hideInSearch: true,
-                width: 120,
+                width: 160,
                 fixed: 'right',
                 render: (dom, record) => {
                     return <div><Button type="link"
@@ -3485,7 +3485,7 @@ const TransporTationTable = (props) => {
                 dataIndex: 'creatTime',
                 valueType: 'dateTimeRange',
                 hideInSearch: true,
-                width: 120,
+                width: 160,
                 fixed: 'right',
                 render: (dom, record) => {
                     return <div><Button type="link"
@@ -3672,7 +3672,7 @@ const TransporTationTable = (props) => {
                 dataIndex: 'creatTime',
                 valueType: 'dateTimeRange',
                 hideInSearch: true,
-                width: 120,
+                width: 160,
                 fixed: 'right',
                 render: (dom, record) => {
                     return <div><Button type="link"

From a1d99bebabf3807354badd429d146f57385c5501 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98lijianhao=E2=80=99?= <li.jianhao@free-sun.com.cn>
Date: Fri, 29 Jul 2022 11:08:39 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=9B=BE=E7=89=87=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../quanju/containers/footer/conserve/left/left-center.js       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/client/src/sections/quanju/containers/footer/conserve/left/left-center.js b/web/client/src/sections/quanju/containers/footer/conserve/left/left-center.js
index 07350e7e..f06c470e 100644
--- a/web/client/src/sections/quanju/containers/footer/conserve/left/left-center.js
+++ b/web/client/src/sections/quanju/containers/footer/conserve/left/left-center.js
@@ -114,7 +114,7 @@ const LeftCenter = (props) => {
                     axisLabel: {
                         show: true,
                         backgroundColor: {
-                            image: 'assets/images/quanju/kelvhua_bdbg.png',
+                            image: '/assets/images/quanju/kelvhua_bdbg.png',
                         },
                         width: 70,
                         height: 22,