diff --git a/src/components/topBar/index.jsx b/src/components/topBar/index.jsx
index ef912c4..16ad292 100644
--- a/src/components/topBar/index.jsx
+++ b/src/components/topBar/index.jsx
@@ -29,7 +29,6 @@ export class TopBar extends React.Component {
level: '3',
fisvitual: '0',
},
- colSpan: props.type == 'user' ? 5 : 4,
};
}
@@ -82,7 +81,7 @@ export class TopBar extends React.Component {
return (
-
+
数据日期:
-
+
维度:
`;
} else if (d.data.ftype == 1) {
- return `
+ return `
@@ -170,7 +172,9 @@ export default function companyPage() {
`;
} else if (d.data.ftype == 2) {
return `
-
+
diff --git a/src/pages/user.jsx b/src/pages/user.jsx
index e1efd38..027946a 100644
--- a/src/pages/user.jsx
+++ b/src/pages/user.jsx
@@ -268,15 +268,15 @@ export default function userPage() {
font-family: Microsoft YaHei-Bold, Microsoft YaHei;
font-weight: bold;
color: #000000;
- " onclick="window.open('${
- d.data.ftype == 0
- ? companyUrl
- : d.data.ftype == 1
- ? subcompanyUrl
- : d.data.ftype == 2
- ? departmentUrl
- : ''
- }', '_blank')">${d.data.fname}
+ " onclick="if(${d.data.fisvitual}==1) return;window.open('${
+ d.data.ftype == 0
+ ? companyUrl
+ : d.data.ftype == 1
+ ? subcompanyUrl
+ : d.data.ftype == 2
+ ? departmentUrl
+ : ''
+ }', '_blank')">${d.data.fname}
@@ -295,9 +295,9 @@ export default function userPage() {
}" style="width: 58px; height: 58px;position:absolute;left:29px; border-radius: 50%; margin-top: 16px;position:absolute;left:29px;z-index:999"/>
-
+
+
编制: ${
d.data.fplan
}
-
在岗: ${d.data.fonjob}
+
在岗: ${d.data.fonjob}
@@ -353,7 +357,11 @@ export default function userPage() {
font-family: Microsoft YaHei-Bold, Microsoft YaHei;
font-weight: bold;
color: #000000;
- " onclick="window.open('${jobtitleUrl}', '_blank')">${d.data.fname}
+ " onclick="if(${
+ d.data.fisvitual
+ }==1) return;window.open('${jobtitleUrl}', '_blank')">${
+ d.data.fname
+ }
@@ -370,15 +378,24 @@ export default function userPage() {
font-weight: bold;
color: #333333;
margin-bottom: 23px;
- " onclick="window.open('${jobtitleUrl}', '_blank')">${d.data.fname}
+ " onclick="if(${
+ d.data.fisvitual
+ }==1) return;window.open('${jobtitleUrl}', '_blank')">${
+ d.data.fname
+ }
+ display: ${d.data.fisvitual == 0 ? 'flex' : 'none'};
+ ">
编制:${d.data.fplan}
- 在岗:${d.data.fonjob}
+ 在岗:${
+ d.data.fonjob
+ }
@@ -405,7 +422,9 @@ export default function userPage() {
}" style="width: 58px; height: 58px; border-radius: 50%; margin-top: 16px;z-index:999"/>
-