Compare commits

...

4 Commits

@ -2,7 +2,7 @@
* @Author: Chengliang 1546584672@qq.com
* @Date: 2022-08-04 10:22:55
* @LastEditors: Chengliang 1546584672@qq.com
* @LastEditTime: 2022-12-16 11:24:29
* @LastEditTime: 2023-02-22 11:31:21
* @FilePath: /org-chart-frant/.umirc.ts
* @Description: ,`customMade`, koroFileHeader : https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
@ -26,7 +26,7 @@ export default defineConfig({
proxy: {
'/api': {
// 标识需要进行转换的请求的url
target: 'http://localhost:8686/api', // 服务端域名 / http://localhost:8686
target: 'http://localhost:9003/api', // 服务端域名 / http://localhost:8686
changeOrigin: true, // 允许域名进行转换
pathRewrite: { '^/api': '' }, // 将请求url里的ci去掉
},

@ -87,7 +87,7 @@ export default function userPage() {
//
useEffect(() => {
document.cookie =
'Webstorm-3d4d3ad4=b8ca5bef-a131-4c2b-81da-6f8595481dc2; ecology_JSessionid=aaad2HRSW843U9BJFcUuy; JSESSIONID=aaad2HRSW843U9BJFcUuy; loginidweaver=1; languageidweaver=7; loginuuids=1; __randcode__=47f1e1cc-51de-48b3-af04-3875b717805f';
'ecology_JSessionid=aaaQKkWJWQLM6eox6XOKy; JSESSIONID=aaaQKkWJWQLM6eox6XOKy; loginidweaver=1; languageidweaver=7; loginuuids=1; __randcode__=13e398ec-5b11-4307-ab75-4242e70a71b8';
d3.json(
// "/user/data"
'/api/bs/hrmorganization/orgchart/userData?fclass=0&root=0&date=' +
@ -360,7 +360,7 @@ export default function userPage() {
</div>
</div>
</div>`;
} else if (d.data.ftype == 3) {
} else if (d.data.ftype == 3 && d.data.this_dept != null) {
return `<div>
<div style="position: relative;">
<img src="./img/user-card/card-label-start.png" />
@ -374,12 +374,8 @@ export default function userPage() {
font-size: 16px;
font-family: Microsoft YaHei-Bold, Microsoft YaHei;
font-weight: bold;
color: #000000;
" onclick="if(${
d.data.fisvitual
}==1) return;window.open('${jobtitleUrl}', '_blank')">${
d.data.fname
}</span>
color: ${d.data.this_dept == '0' ? 'red' : '#000000'};
" onclick="if(${d.data.fisvitual}==1) return;">部门负责人</span>
<span style="margin-left: 70px;">
<img src="./img/user-card/line1.png" />
<img src="./img/user-card/line2.png" />
@ -394,11 +390,11 @@ export default function userPage() {
font-size: 13px;
font-family: Microsoft YaHei-Bold, Microsoft YaHei;
font-weight: bold;
color: #333333;
color: ${d.data.this_dept == '0' ? 'red' : '#333333'};
margin-bottom: 23px;
" onclick="if(${
d.data.fisvitual
}==1) return;window.open('${jobtitleUrl}', '_blank')">${
}==1) return;window.open('${postUserUrl}', '_blank')">${
d.data.fname
}</div>
<div style="
@ -408,18 +404,19 @@ export default function userPage() {
color: #333333;
display: ${d.data.fisvitual == 0 ? 'flex' : 'none'};
">
<span>编制${d.data.fplan}</span>
<span style="margin-left: 10px;" onclick="if(${
d.data.fisvitual
}==1) return;window.open('${addressBookPostUrl}', '_blank')">在岗${
d.data.fonjob
<span style="margin-left: 10px;color: ${
d.data.this_dept == '0' ? 'red' : '#333333'
};" onclick="if(${
d.data.fisvitual
}==1) return;window.open('${addressBookPostUrl}', '_blank')">${
d.data.fleaderjob
}</span>
</div>
</div>
</div>
</div>
</div>`;
} else if (d.data.ftype == 4) {
} else if (d.data.ftype == 3) {
return `<div>
<div style="position: relative;" >
<img src="./img/user-card/card-label-start.png" />

Loading…
Cancel
Save