lanjianrong 4 years atrás
parent
commit
795ce12c91
2 changed files with 16 additions and 16 deletions
  1. 1 1
      src/pages/Statistic/Software/Usage/index.jsx
  2. 15 15
      src/pages/Workbench/Dashboard/index.jsx

+ 1 - 1
src/pages/Statistic/Software/Usage/index.jsx

@@ -113,7 +113,7 @@ const Usage = () => {
           align: 'center'
         },
         {
-          title: '接',
+          title: '接',
           key: 'receive',
           dataIndex: 'receive',
           align: 'center'

+ 15 - 15
src/pages/Workbench/Dashboard/index.jsx

@@ -297,8 +297,8 @@ const Dashboard = ({ dispatch, departments = [] }) => {
           pagination={false}
         />
       </div>
-      <div className="mt-4 flex items-center flex-row">
-        <span className="mt-4 mb-4">
+      <div className="mt-4 flex flex-row ">
+        <span className="mx-4 my-4">
           <Select
             disabled={state.disabled}
             loading={state.loading}
@@ -307,18 +307,17 @@ const Dashboard = ({ dispatch, departments = [] }) => {
             defaultValue={defaultCyclicalValue}
             onChange={handleCyclicalChange}
           />
-        </span>
-        <span className="ml-4 mt-4 mb-4">
-          <PermSelect
-            loading={state.loading}
-            disabled={state.disabled}
-            onConfirm={handlePermChange}
-            dataType="workbench"
-          />
-        </span>
-        {state.params.dataPermission === 'all' ? (
-          <span className="ml-4 mr-4 mt-3 mb-4">
+          <span className="mx-4">
+            <PermSelect
+              loading={state.loading}
+              disabled={state.disabled}
+              onConfirm={handlePermChange}
+              dataType="workbench"
+            />
+          </span>
+          {state.params.dataPermission === 'all' ? (
             <TreeSelect
+              size="middle"
               style={{ width: 150 }}
               dropdownStyle={{ maxHeight: 400, overflow: 'auto' }}
               loading={state.loading}
@@ -329,8 +328,9 @@ const Dashboard = ({ dispatch, departments = [] }) => {
               allowClear
               onSelect={queryStaffList}
             />
-          </span>
-        ) : null}
+          ) : null}
+        </span>
+
         <div className="flex items-center flex-row ml-2">
           {['all', 'department'].includes(state.params.dataPermission) &&
             state.staffList.map(item => (