多语言修复

src/components/drawer/index.jsx

@@ -70,7 +70,7 @@ export default class DrawerComponents extends React.Component {
   }
 
   //获取数据
-  getDeatilDatas(params, type = 'chart', showJob = '1') {
+  getDeatilDatas(params, type = 'chart', showJob = '0') {
     this.setState({ spinning: true, data: [], dataSource: [] });
     d3.json(
       '/api/bs/hrmorganization/orgchart/getDepartmentDetail?' +
@@ -257,8 +257,8 @@ export default class DrawerComponents extends React.Component {
                         <div class="dept-box" style="font-size: 15px;font-family: Microsoft YaHei-Regular, Microsoft YaHei;font-weight: 900;color: #333333;height: 25px;line-height: 25px;width:110px,white-space:nowrap;overflow:hidden;text-overflow:ellipsis;">
                             ${d.data.fname}
                         </div>        
-                        <div style="font-size: 13px;font-family: Microsoft YaHei-Bold, Microsoft YaHei;color: #333333;height: 25px;line-height: 25px;">
+                        <div style="font-size: 13px;font-family: Microsoft YaHei-Bold, Microsoft YaHei;color: #333333;line-height: 25px;">
-                          ${getLabel(547322, labelData)}:${d.data.fleader}
+                          ${getLabel(547190, labelData)}:${d.data.fleader}
                         </div>
                         <div style="display:flex" >
                             <div style="height: 25px; line-height: 25px; min-width: 80px;">
@@ -310,11 +310,16 @@ export default class DrawerComponents extends React.Component {
                           d.data.fname
                         }</div>
                     </div>
-                    <div style="font-size: 13px;font-family: Microsoft YaHei-Regular, Microsoft YaHei;font-weight: 400;color: #333333;display: flex;height: 25px;line-height: 25px;">
+                    <div style="font-size: 13px;font-family: Microsoft YaHei-Regular, Microsoft YaHei;font-weight: 400;color: #333333;display: flex;line-height: 25px;">
                         <span>${getLabel(547324, labelData)}: ${
         d.data.companyWorkYear
       } ${getLabel(547526, labelData)}</span>
                     </div>
+                     <div style="font-size: 13px;font-family: Microsoft YaHei-Regular, Microsoft YaHei;font-weight: 400;color: #333333;display: flex;line-height: 25px;">
+                        <span>${getLabel(547333, labelData)}: ${
+        d.data.jobName
+      }</span>
+                    </div>
                 </div>
                 </div>
              </div>`;
@@ -333,7 +338,7 @@ export default class DrawerComponents extends React.Component {
   changeDetail = () => {
     const { detailType, params } = this.state;
     let type = detailType == 'chart' ? 'table' : 'chart';
-    const showJob = this.state.showJob ? '1' : '0';
+    const showJob = '0';
     this.setState({
       detailType: type,
     });
@@ -359,7 +364,7 @@ export default class DrawerComponents extends React.Component {
       arr.push({ label: `${getLabel(547315, labelData)}`, key: '1' });
       //arr.push({ label: '导出PDF', key: '2' });
     } else {
-      arr.push({ label: '导出表格', key: '3' });
+      arr.push({ label: `${getLabel(547448, labelData)}`, key: '3' });
     }
 
     const menu = <Menu onClick={this.handleExport.bind(this)} items={arr} />;
@@ -375,25 +380,6 @@ export default class DrawerComponents extends React.Component {
         }}
         extra={
           <Space>
-            {detailType == 'chart' && params && params.fclass == '0' && (
-              <Checkbox
-                style={{ marginTop: '5px', marginLeft: 100 }}
-                checked={showJob}
-                onChange={(e) => {
-                  this.setState({
-                    showJob: e.target.checked,
-                  });
-
-                  this.getDeatilDatas(
-                    params,
-                    detailType,
-                    e.target.checked ? '1' : '0',
-                  );
-                }}
-              >
-                {getLabel(547447, labelData)}
-              </Checkbox>
-            )}
             <Dropdown overlay={menu}>
               <Button type="primary">{getLabel(547314, labelData)}</Button>
             </Dropdown>
@@ -430,7 +416,6 @@ export default class DrawerComponents extends React.Component {
             <Table
               dataSource={dataSource}
               columns={columns}
-              scroll={{ y: 600 }}
               loading={spinning}
               pagination={{
                 showSizeChanger: false,

src/components/topBar/index.jsx

@@ -305,17 +305,6 @@ export class TopBar extends React.Component {
             </Tooltip>
           </Col>
           <Col span={16}>
-            <Button
-              type="primary"
-              style={{ marginRight: '10px' }}
-              disabled={disabled}
-              onClick={() => {
-                this.setState({ open: true });
-              }}
-            >
-              {getLabel(547305, labelData)}
-            </Button>
-
             <Button
               type="primary"
               style={{ marginRight: '10px' }}

src/pages/company.jsx

@@ -479,13 +479,6 @@ export default function companyPage() {
           onZoomIn={(progressBtn) => handleZoomIn(progressBtn)}
           onZoomBehavior={(value) => handleZoomBehavior(value)}
         />
-        <TimeLine
-          ref={(r) => (timeLine = r)}
-          onClick={(timeline) => {
-            timeLineSearch(timeline);
-          }}
-          url={'/api/bs/hrmorganization/orgchart/timeLines?fclass=0'}
-        />
         <Spin size="large" spinning={spinning}>
           <OrgChartComponent
             setChart={(chart) => (orgChart = chart)}

src/pages/user.jsx

@@ -99,7 +99,7 @@ export default function userPage() {
   // 获取数据
   useEffect(() => {
     document.cookie =
-      'ecology_JSessionid=aaayUiSEKCD-Z-Y9A1i-y; JSESSIONID=aaayUiSEKCD-Z-Y9A1i-y; loginuuids=1; Systemlanguid=7; loginidweaver=sysadmin; languageidweaver=8; __randcode__=4ba2aadd-0de6-4ebc-b9d4-584ba46c0969';
+      'ecology_JSessionid=aaandPcwzDCbpb6Ci0Jaz; JSESSIONID=aaandPcwzDCbpb6Ci0Jaz; Systemlanguid=7; loginidweaver=sysadmin; loginuuids=1; languageidweaver=8; __randcode__=4fb17586-6f53-4658-92b1-9edc9831cc02';
     d3.json(
       '/api/bs/hrmorganization/orgchart/userData?fclass=0&fisvitual=0&root=0&level=3&id=0',
     ).then((data) => {