Merge branch 'develop' of http://120.27.195.166:3000/chenglb/PMS_Frontend_v1.0.0.git into develop

src/assets/css/base.scss

@@ -44,6 +44,15 @@ body {
 a {
   color: var(--a);
 }
+.right-list .cc-result-flow .table-wrap .yisa-table .ant-table-thead th {
+  background-color: #616b83 !important;
+}
+.right-list .cc-result-flow .table-wrap .yisa-table .ant-table-tbody td {
+  background-color: #3e4557 !important;
+}
+.right-list .cc-result-flow .table-wrap .yisa-table .ant-table-tbody tr:nth-child(even) td {
+  background-color: #3e4557 !important;
+}
 .colorBtn {
   width: 90px;
   height: 36px;

src/assets/css/mixin.scss

@@ -11,7 +11,7 @@
   &::-webkit-scrollbar-track-piece,
   &::-webkit-scrollbar-corner,
   &::-webkit-scrollbar-track {
-    background: #{$back};
+    background: #3B97FF;
   }
   &::-webkit-scrollbar {
     width: 4px;

src/pages/InRoadMgm/PersonMgm/Attendance/Fence/index.scss

@@ -172,7 +172,6 @@ $color-primary : var(--color-primary);
     background: #fff;
     border: none;
     border-radius: 4px;
-    color: #3e4557;
     cursor: pointer;
     margin-left: 20px;
     }
@@ -213,7 +212,6 @@ $color-primary : var(--color-primary);
     background: #fff;
     border: none;
     border-radius: 4px;
-    color: #3e4557;
     cursor: pointer;
     margin-left: 20px;
     }
@@ -241,7 +239,6 @@ $color-primary : var(--color-primary);
     background: #fff;
     border: none;
     border-radius: 4px;
-    color: #3e4557;
     cursor: pointer;
     margin-left: 20px;
     }

src/pages/InRoadMgm/PersonMgm/Attendance/Fence/loadable.jsx

@@ -372,7 +372,7 @@ function Fence(props) {
                         options={getCanCaDer}
                         onChange={onChangeList}
                         changeOnSelect
-                        style={{ width: 270, marginLeft: 29 }}
+                        style={{ width: 270, marginLeft: 28 }}
                         fieldNames={{
                             label: 'name',
                             value: 'id',
@@ -385,7 +385,7 @@ function Fence(props) {
                     <Input
                         placeholder="请输入"
                         value={formData.parkName}
-                        style={{ width: 270, marginLeft: 15 }}
+                        style={{ width: 272, marginLeft: 13 }}
                         // allowClear
                         onChange={handleLoginName}
                     />

src/pages/InRoadMgm/PersonMgm/Attendance/ScheduleMgm/index.scss

@@ -235,7 +235,6 @@ $color-primary : var(--color-primary);
     background: #fff;
     border: none;
     border-radius: 4px;
-    color: #3e4557;
     cursor: pointer;
     margin-left: 20px;
     }
@@ -263,7 +262,6 @@ $color-primary : var(--color-primary);
     background: #fff;
     border: none;
     border-radius: 4px;
-    color: #3e4557;
     cursor: pointer;
     margin-left: 20px;
     }

src/pages/InRoadMgm/PersonMgm/Attendance/ScheduleMgm/loadable.jsx

@@ -632,11 +632,11 @@ function ScheduleMgm(props) {
                 </div>
                 <div className="yisa-search">
                     <label>上班时间</label>
-                    <TimePicker onChange={goingEditWork} format={format} value={moment(editModal.onTime, 'HH:mm')} style={{ marginLeft: 30 }} />
+                    <TimePicker onChange={goingEditWork} format={format} value={moment(editModal.onTime, 'HH:mm')} style={{ marginLeft: 30 ,width:100}} />
                 </div>
                 <div className="yisa-search">
                     <label>下班时间</label>
-                    <TimePicker onChange={leavingEditWork} format={format} value={moment(editModal.offTime, 'HH:mm')} style={{ marginLeft: 30 }} />
+                    <TimePicker onChange={leavingEditWork} format={format} value={moment(editModal.offTime, 'HH:mm')} style={{ marginLeft: 30 ,width:100}} />
                 </div>
                 <div className="yisa-search">
                     <label>上班时间后</label>

src/pages/InRoadMgm/PersonMgm/Attendance/WorkerAttendance/loadable.jsx

@@ -364,7 +364,7 @@ function WorkerAttendance(props) {
                 <div className="yisa-search">
                     <label>角色</label>
                     <Select
-                        style={{ width: 256, marginLeft: 41 }}
+                        style={{ width: 256, marginLeft: 42 }}
                         // allowClear
                         placeholder="请选择"
                         value={formData.pdaManagerRole}

src/pages/InRoadMgm/PersonMgm/Attendance/WorkerSchedule/index.scss

@@ -291,7 +291,6 @@ $color-primary : var(--color-primary);
     background: #fff;
     border: none;
     border-radius: 4px;
-    color: #3e4557;
     cursor: pointer;
     margin-left: 20px;
     }