五院杭州中心需求

src/components/toolBar/index.jsx

@@ -26,6 +26,15 @@ export default class ToolBar extends React.Component {
     };
   }
 
+  // componentDidMount() {
+  //   // 浏览器强制要求全屏 API 必须由用户手势触发，所以你的 onFullscreen 必须绑定到按钮的 onClick 事件上，而不能在 componentDidMount 或 useEffect 里自动调用。
+  //   setTimeout(() => {
+  //     debugger;
+  //     const fullscreenBtn = document.querySelector(`.${styles.toolBarItem}[src*="fullscreen"]`);
+  //     if (fullscreenBtn) fullscreenBtn.click();
+  //   }, 1000);
+  // }
+
   handleMouseDown(e) {
     this.clientY = e.clientY;
     this.originalY = e.clientY;

src/components/topBar/index.jsx

@@ -225,11 +225,11 @@ export class TopBar extends React.Component {
     return (
       <div className={style.topbarWrapper}>
         <Row>
-          <Col span={6}>
+          <Col span={8}>
             {getLabel(547293, labelData)}：
             <Select
               defaultValue="0"
-              style={{ width: 140 }}
+              style={{ width: 240 }}
               value={this.state.requestData.fclass}
               onChange={(value) => {
                 const requestData = {
@@ -274,9 +274,26 @@ export class TopBar extends React.Component {
               treeIcon
             />
           </Col>
-          <Col span={5}>
+
+          <Col span={8}>
+            {getLabel(547299, labelData)}：
+            <Select
+              defaultValue="3"
+              style={{ width: 140 }}
+              value={this.state.requestData.level}
+              onChange={(value) => this.handleFormChange({ level: value })}
+            >
+              <Option value="1">{getLabel(547301, labelData)}</Option>
+              <Option value="2">{getLabel(547463, labelData)}</Option>
+              <Option value="3">{getLabel(547464, labelData)}</Option>
+              <Option value="4">{getLabel(547465, labelData)}</Option>
+            </Select>
+          </Col>
+        </Row>
+        <Row style={{ marginTop: '15px' }}>
+          <Col span={8}>
             <Checkbox
-              style={{ marginTop: '5px', marginLeft: 100 }}
+              style={{ marginTop: '5px' }}
               checked={this.state.requestData.hidedept == '1'}
               onChange={(e) =>
                 this.handleFormChange({
@@ -296,23 +313,8 @@ export class TopBar extends React.Component {
               />
             </Tooltip>
           </Col>
-          <Col span={5}>
-            {getLabel(547299, labelData)}：
-            <Select
-              defaultValue="3"
-              style={{ width: 140 }}
-              value={this.state.requestData.level}
-              onChange={(value) => this.handleFormChange({ level: value })}
-            >
-              <Option value="1">{getLabel(547301, labelData)}</Option>
-              <Option value="2">{getLabel(547463, labelData)}</Option>
-              <Option value="3">{getLabel(547464, labelData)}</Option>
-              <Option value="4">{getLabel(547465, labelData)}</Option>
-            </Select>
-          </Col>
-        </Row>
-        <Row style={{ marginTop: '15px' }}>
-          <Col span={6}>
+
+          <Col span={8}>
             <Checkbox
               style={{ marginTop: '5px' }}
               checked={this.state.requestData.fisvitual == '1'}
@@ -335,39 +337,39 @@ export class TopBar extends React.Component {
             </Tooltip>
           </Col>
 
-          <Col span={10}>
+          <Col span={8}>
             {/* {this.state.requestData.fclass == '0' && (
-              <span>
-                <Button
-                  type="primary"
-                  style={{ marginRight: '10px' }}
-                  disabled={disabled}
-                  onClick={() => {
-                    this.setState({ open: true });
-                  }}
-                >
-                  {getLabel(547305, labelData)}
-                </Button>
-                <Button
-                  type="primary"
-                  style={{ marginRight: '10px' }}
-                  onClick={() => {
-                    window.open('#/dragtree', 'blank');
-                  }}
-                >
-                  {getLabel(547310, labelData)}
-                </Button>
-                <Button
-                  type="primary"
-                  style={{ marginRight: '10px' }}
-                  onClick={() => {
-                    window.open('#/statistics', 'blank');
-                  }}
-                >
-                  {getLabel(547313, labelData)}
-                </Button>
-              </span>
-            )} */}
+                <span>
+                  <Button
+                    type="primary"
+                    style={{ marginRight: '10px' }}
+                    disabled={disabled}
+                    onClick={() => {
+                      this.setState({ open: true });
+                    }}
+                  >
+                    {getLabel(547305, labelData)}
+                  </Button>
+                  <Button
+                    type="primary"
+                    style={{ marginRight: '10px' }}
+                    onClick={() => {
+                      window.open('#/dragtree', 'blank');
+                    }}
+                  >
+                    {getLabel(547310, labelData)}
+                  </Button>
+                  <Button
+                    type="primary"
+                    style={{ marginRight: '10px' }}
+                    onClick={() => {
+                      window.open('#/statistics', 'blank');
+                    }}
+                  >
+                    {getLabel(547313, labelData)}
+                  </Button>
+                </span>
+              )} */}
 
             <Button
               type="primary"

src/pages/company.jsx

@@ -166,7 +166,7 @@ export default function companyPage() {
     let statisticsStyle = fclass == 0 ? 'block' : 'none';
     if (d.data.ftype == 0) {
       return `<div style="text-align: center;">
-          <div style="display: inline-block;  margin-left: 5px;">
+          <div style="display: inline-block;margin-top: 10px; width: 230px;">
             <div style="
               font-size: 24px;
               font-family: Microsoft YaHei-Bold, Microsoft YaHei;

src/pages/index.less

@@ -129,9 +129,9 @@
 }
 
 .tooltip .tooltitle {
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
+  // overflow: hidden;
+  // white-space: nowrap;
+  // text-overflow: ellipsis;
 }
 
 .tooltip .tooltiptext {

src/pages/user.jsx

@@ -99,7 +99,7 @@ export default function userPage() {
   // 获取数据
   useEffect(() => {
     document.cookie =
-      'ecology_JSessionid=aaaqrj0Xm5_P2f6K0bavz; JSESSIONID=aaaqrj0Xm5_P2f6K0bavz; Systemlanguid=7; languageidweaver=7; loginuuids=1; __randcode__=0d52a82a-5780-4c3b-90cb-a9b216117fa2; loginidweaver=sysadmin';
+      'ecology_JSessionid=aaaPFXzAh9afa9ho8YPAz; JSESSIONID=aaaPFXzAh9afa9ho8YPAz; Systemlanguid=7; languageidweaver=7; loginuuids=1; loginidweaver=sysadmin;';
     d3.json(
       '/api/bs/hrmorganization/orgchart/userData?fclass=0&fisvitual=0&root=0&level=3&id=0',
     ).then((data) => {