Compare commits

...

3 Commits

Author SHA1 Message Date
Mlin 8180d91a9f 人员显示修复 2023-03-01 18:17:39 +08:00
Mlin aa47404b27 部门负责人显示颜色修改 2023-03-01 17:34:53 +08:00
Chengliang 62a97a3b2e 人员显示颜色修改 2023-03-01 15:39:59 +08:00
2 changed files with 13 additions and 9 deletions

View File

@ -2,7 +2,7 @@
* @Author: Chengliang 1546584672@qq.com * @Author: Chengliang 1546584672@qq.com
* @Date: 2022-08-04 10:22:55 * @Date: 2022-08-04 10:22:55
* @LastEditors: Chengliang 1546584672@qq.com * @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 * @FilePath: /org-chart-frant/.umirc.ts
* @Description: ,`customMade`, koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: ,`customMade`, koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/ */
@ -26,7 +26,7 @@ export default defineConfig({
proxy: { proxy: {
'/api': { '/api': {
// 标识需要进行转换的请求的url // 标识需要进行转换的请求的url
target: 'http://localhost:8686/api', // 服务端域名 / http://localhost:8686 target: 'http://localhost:9005/api', // 服务端域名 / http://localhost:8686
changeOrigin: true, // 允许域名进行转换 changeOrigin: true, // 允许域名进行转换
pathRewrite: { '^/api': '' }, // 将请求url里的ci去掉 pathRewrite: { '^/api': '' }, // 将请求url里的ci去掉
}, },

View File

@ -87,7 +87,7 @@ export default function userPage() {
// //
useEffect(() => { useEffect(() => {
document.cookie = 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'; 'Webstorm-3d4d3ad4=b8ca5bef-a131-4c2b-81da-6f8595481dc2; ecology_JSessionid=aaap23kDZ0ldP8JGBGSzy; JSESSIONID=aaap23kDZ0ldP8JGBGSzy; Systemlanguid=7; loginidweaver=1; languageidweaver=7; loginuuids=1; langType=zh_CN; ecology_JSessionId=abc5qFfEfVOtpgAwYd3zy; __randcode__=c92e9ed1-3d66-4e6b-bdb6-c01df6c639a1';
d3.json( d3.json(
// "/user/data" // "/user/data"
'/api/bs/hrmorganization/orgchart/userData?fclass=0&root=0&date=' + '/api/bs/hrmorganization/orgchart/userData?fclass=0&root=0&date=' +
@ -374,7 +374,7 @@ export default function userPage() {
font-size: 16px; font-size: 16px;
font-family: Microsoft YaHei-Bold, Microsoft YaHei; font-family: Microsoft YaHei-Bold, Microsoft YaHei;
font-weight: bold; font-weight: bold;
color: #000000; color: ${d.data.this_dept == '0' ? 'red' : '#000000'};
" onclick="if(${ " onclick="if(${
d.data.fisvitual d.data.fisvitual
}==1) return;window.open('${jobtitleUrl}', '_blank')">${ }==1) return;window.open('${jobtitleUrl}', '_blank')">${
@ -394,7 +394,7 @@ export default function userPage() {
font-size: 13px; font-size: 13px;
font-family: Microsoft YaHei-Bold, Microsoft YaHei; font-family: Microsoft YaHei-Bold, Microsoft YaHei;
font-weight: bold; font-weight: bold;
color: #333333; color: ${d.data.this_dept == '0' ? 'red' : '#333333'};
margin-bottom: 23px; margin-bottom: 23px;
" onclick="if(${ " onclick="if(${
d.data.fisvitual d.data.fisvitual
@ -408,10 +408,14 @@ export default function userPage() {
color: #333333; color: #333333;
display: ${d.data.fisvitual == 0 ? 'flex' : 'none'}; display: ${d.data.fisvitual == 0 ? 'flex' : 'none'};
"> ">
<span>编制${d.data.fplan}</span> <span style="color: ${
<span style="margin-left: 10px;" onclick="if(${ d.data.this_dept == '0' ? 'red' : '#333333'
d.data.fisvitual };">编制${d.data.fplan}</span>
}==1) return;window.open('${addressBookPostUrl}', '_blank')">在岗${ <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.fonjob d.data.fonjob
}</span> }</span>
</div> </div>