Commit fa0ff678 authored by 沈翠玲's avatar 沈翠玲

增加登录日志和ip和mac,修改样式

parent db4e4862
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
<head> <head>
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<link rel="icon" type="image/png" href="/logo1.png" /> <link rel="icon" type="image/png" href="/logo1.png" />
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Noto+Sans+SC:100,300,400,500,700,900">
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>易数通</title> <title>易数通</title>
</head> </head>
......
import request from '@/utils/http/index';
export const getloginLogPage = (params) => {
return request.get('/loginLog/page', params);
};
...@@ -12,3 +12,9 @@ ...@@ -12,3 +12,9 @@
font-family: DIN; font-family: DIN;
src: url('./DIN.otf'); src: url('./DIN.otf');
} }
body {
font-family: Noto Sans SC !important;
font-style: normal;
font-weight: 400;
--vxe-ui-font-family:Noto Sans SC;
}
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1740040622818" class="icon" viewBox="0 0 1044 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="33821" xmlns:xlink="http://www.w3.org/1999/xlink" width="203.90625" height="200"><path d="M840.454 62.442h-638.605c-76.445 0-139.409 63.68-139.409 141.007v614.048c0 77.326 62.963 141.007 139.408 141.007h638.605c76.454 0 139.408-63.68 139.408-141.007v-614.048c0-77.326-58.454-141.007-139.408-141.007zM912.409 822.050c0 40.931-31.473 72.772-71.954 72.772h-638.605c-40.473 0-71.954-31.84-71.954-72.772v-618.603c0-40.931 31.481-72.772 71.954-72.772h638.605c40.481 0 71.954 31.84 71.954 72.772v618.603zM399.73 285.32l-98.936 100.065-44.973-45.477c-13.5-13.647-35.981-13.647-44.973 0-13.5 13.638-13.5 36.386 0 45.477l71.954 72.781c4.5 4.546 13.492 9.092 26.981 9.092 13.5 0 13.5-4.546 26.981-9.092l121.426-122.813c13.5-13.647 13.5-36.386 0-45.487-26.981-13.638-44.973-13.638-58.463-4.546zM813.473 339.908h-310.308c-22.481 0-31.481 13.638-31.481 31.84 0 22.739 13.5 31.84 31.481 31.84h310.316c22.481 0 31.473-13.647 31.473-31.84 0-18.202-13.5-31.84-31.481-31.84zM318.775 544.584c-58.463 0-103.436 45.487-103.436 104.62 0 59.125 44.973 104.611 103.436 104.611 58.473 0 103.436-45.487 103.436-104.611 0-63.68-49.463-104.62-103.436-104.62zM318.775 681.043c-22.481 0-35.973-13.647-35.973-36.386 0-22.747 13.492-36.395 35.973-36.395 22.492 0 35.981 13.647 35.981 36.395 0 22.739-17.992 36.386-35.981 36.386zM813.473 612.808h-310.308c-22.481 0-31.481 13.647-31.481 31.849 0 18.184 13.5 31.84 31.481 31.84h310.316c22.481 0 31.473-13.647 31.473-31.84 0-18.202-13.5-31.84-31.481-31.84z" fill="#234ca3" p-id="33822"></path></svg> <?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1740040622818" class="icon" viewBox="0 0 1044 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="33821" xmlns:xlink="http://www.w3.org/1999/xlink" width="203.90625" height="200"><path d="M840.454 62.442h-638.605c-76.445 0-139.409 63.68-139.409 141.007v614.048c0 77.326 62.963 141.007 139.408 141.007h638.605c76.454 0 139.408-63.68 139.408-141.007v-614.048c0-77.326-58.454-141.007-139.408-141.007zM912.409 822.050c0 40.931-31.473 72.772-71.954 72.772h-638.605c-40.473 0-71.954-31.84-71.954-72.772v-618.603c0-40.931 31.481-72.772 71.954-72.772h638.605c40.481 0 71.954 31.84 71.954 72.772v618.603zM399.73 285.32l-98.936 100.065-44.973-45.477c-13.5-13.647-35.981-13.647-44.973 0-13.5 13.638-13.5 36.386 0 45.477l71.954 72.781c4.5 4.546 13.492 9.092 26.981 9.092 13.5 0 13.5-4.546 26.981-9.092l121.426-122.813c13.5-13.647 13.5-36.386 0-45.487-26.981-13.638-44.973-13.638-58.463-4.546zM813.473 339.908h-310.308c-22.481 0-31.481 13.638-31.481 31.84 0 22.739 13.5 31.84 31.481 31.84h310.316c22.481 0 31.473-13.647 31.473-31.84 0-18.202-13.5-31.84-31.481-31.84zM318.775 544.584c-58.463 0-103.436 45.487-103.436 104.62 0 59.125 44.973 104.611 103.436 104.611 58.473 0 103.436-45.487 103.436-104.611 0-63.68-49.463-104.62-103.436-104.62zM318.775 681.043c-22.481 0-35.973-13.647-35.973-36.386 0-22.747 13.492-36.395 35.973-36.395 22.492 0 35.981 13.647 35.981 36.395 0 22.739-17.992 36.386-35.981 36.386zM813.473 612.808h-310.308c-22.481 0-31.481 13.647-31.481 31.849 0 18.184 13.5 31.84 31.481 31.84h310.316c22.481 0 31.473-13.647 31.473-31.84 0-18.202-13.5-31.84-31.481-31.84z" fill="#4e5969" p-id="33822"></path></svg>
\ No newline at end of file \ No newline at end of file
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1740040294711" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7432" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M512 959.595789A447.595789 447.595789 0 1 1 959.595789 512 448.134737 448.134737 0 0 1 512 959.595789z m0-814.349473A366.753684 366.753684 0 1 0 878.753684 512 367.023158 367.023158 0 0 0 512 145.246316z" fill="#234ca3" p-id="7433"></path><path d="M616.825263 524.665263h-209.650526a40.421053 40.421053 0 0 1 0-80.842105h209.650526a40.421053 40.421053 0 0 1 0 80.842105zM616.825263 675.84h-209.650526a40.421053 40.421053 0 0 1 0-80.842105h209.650526a40.421053 40.421053 0 0 1 0 80.842105z" fill="#234ca3" p-id="7434"></path><path d="M512 769.347368a40.421053 40.421053 0 0 1-40.421053-40.421052v-247.107369a40.421053 40.421053 0 1 1 80.842106 0v247.107369a40.421053 40.421053 0 0 1-40.421053 40.421052z" fill="#234ca3" p-id="7435"></path><path d="M512 465.650526a40.690526 40.690526 0 0 1-28.564211-11.856842 40.151579 40.151579 0 0 1 0-57.128421l130.15579-130.155789a40.151579 40.151579 0 0 1 57.128421 0 40.690526 40.690526 0 0 1 0 57.128421l-130.155789 130.155789a40.690526 40.690526 0 0 1-28.564211 11.856842z" fill="#234ca3" p-id="7436"></path><path d="M512 465.650526a40.690526 40.690526 0 0 1-28.564211-11.856842L353.28 323.368421a40.690526 40.690526 0 0 1 0-57.128421 40.151579 40.151579 0 0 1 57.128421 0l130.15579 130.155789a40.151579 40.151579 0 0 1 0 57.128422 40.690526 40.690526 0 0 1-28.564211 12.126315z" fill="#234ca3" p-id="7437"></path></svg> <?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1740040294711" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7432" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M512 959.595789A447.595789 447.595789 0 1 1 959.595789 512 448.134737 448.134737 0 0 1 512 959.595789z m0-814.349473A366.753684 366.753684 0 1 0 878.753684 512 367.023158 367.023158 0 0 0 512 145.246316z" fill="#4e5969" p-id="7433"></path><path d="M616.825263 524.665263h-209.650526a40.421053 40.421053 0 0 1 0-80.842105h209.650526a40.421053 40.421053 0 0 1 0 80.842105zM616.825263 675.84h-209.650526a40.421053 40.421053 0 0 1 0-80.842105h209.650526a40.421053 40.421053 0 0 1 0 80.842105z" fill="#4e5969" p-id="7434"></path><path d="M512 769.347368a40.421053 40.421053 0 0 1-40.421053-40.421052v-247.107369a40.421053 40.421053 0 1 1 80.842106 0v247.107369a40.421053 40.421053 0 0 1-40.421053 40.421052z" fill="#4e5969" p-id="7435"></path><path d="M512 465.650526a40.690526 40.690526 0 0 1-28.564211-11.856842 40.151579 40.151579 0 0 1 0-57.128421l130.15579-130.155789a40.151579 40.151579 0 0 1 57.128421 0 40.690526 40.690526 0 0 1 0 57.128421l-130.155789 130.155789a40.690526 40.690526 0 0 1-28.564211 11.856842z" fill="#4e5969" p-id="7436"></path><path d="M512 465.650526a40.690526 40.690526 0 0 1-28.564211-11.856842L353.28 323.368421a40.690526 40.690526 0 0 1 0-57.128421 40.151579 40.151579 0 0 1 57.128421 0l130.15579 130.155789a40.151579 40.151579 0 0 1 0 57.128422 40.690526 40.690526 0 0 1-28.564211 12.126315z" fill="#4e5969" p-id="7437"></path></svg>
\ No newline at end of file \ No newline at end of file
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1740041986415" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="40801" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M522.666667 761.6c27.733333 0 41.6-11.733333 41.6-46.933333v-48c0-3.2 3.2-5.333333 6.4-5.333334h64c28.8 0 43.733333-23.466667 43.733333-39.466666s-14.933333-39.466667-43.733333-39.466667h-64c-3.2 0-6.4-2.133333-6.4-5.333333v-26.666667c0-3.2 3.2-5.333333 6.4-5.333333h64c28.8 0 43.733333-23.466667 43.733333-39.466667s-14.933333-39.466667-43.733333-39.466667h-28.8c-5.333333 0-7.466667-4.266667-5.333334-8.533333l53.333334-68.266667c5.333333-7.466667 9.6-13.866667 12.8-19.2 2.133333-3.2 3.2-6.4 3.2-10.666666 1.066667-9.6-2.133333-20.266667-11.733334-26.666667-6.4-4.266667-13.866667-6.4-23.466666-6.4-7.466667 0-13.866667 1.066667-19.2 3.2-5.333333 2.133333-9.6 5.333333-12.8 9.6-3.2 3.2-7.466667 8.533333-10.666667 13.866667-4.266667 5.333333-7.466667 10.666667-10.666667 14.933333L526.933333 437.333333c-2.133333 3.2-8.533333 3.2-10.666666 0l-64-74.666666c-8.533333-11.733333-16-20.266667-22.4-25.6-6.4-5.333333-14.933333-8.533333-25.6-8.533334s-19.2 3.2-25.6 8.533334c-6.4 5.333333-9.6 12.8-9.6 21.333333 0 5.333333 1.066667 9.6 3.2 13.866667 2.133333 4.266667 7.466667 10.666667 14.933333 20.266666l56.533333 66.133334c3.2 3.2 0 8.533333-5.333333 8.533333h-27.733333c-29.866667 0-44.8 23.466667-44.8 39.466667s14.933333 39.466667 44.8 39.466666h64c3.2 0 6.4 2.133333 6.4 5.333334v26.666666c0 3.2-3.2 5.333333-6.4 5.333334h-64c-29.866667 0-44.8 23.466667-44.8 39.466666s14.933333 39.466667 44.8 39.466667h64c3.2 0 6.4 2.133333 6.4 5.333333V714.666667c-1.066667 35.2 13.866667 46.933333 41.6 46.933333z" fill="#234ca3" p-id="40802"></path><path d="M512 86.4c-70.4 0-138.666667 17.066667-200.533333 50.133333L289.066667 96c-8.533333-17.066667-33.066667-14.933333-39.466667 3.2l-65.066667 132.266667c-3.2 9.6 2.133333 21.333333 12.8 24.533333l149.333334 24.533333c18.133333 6.4 34.133333-12.8 25.6-29.866666L352 212.266667c49.066667-26.666667 103.466667-40.533333 160-40.533334 187.733333 0 341.333333 153.6 341.333333 341.333334s-153.6 341.333333-341.333333 341.333333-341.333333-153.6-341.333333-341.333333c0-21.333333 2.133333-42.666667 5.333333-62.933334 4.266667-23.466667-10.666667-45.866667-34.133333-50.133333-23.466667-4.266667-45.866667 10.666667-50.133334 34.133333-4.266667 25.6-6.4 52.266667-6.4 78.933334 0 235.733333 190.933333 426.666667 426.666667 426.666666s426.666667-190.933333 426.666667-426.666666-190.933333-426.666667-426.666667-426.666667z" fill="#234ca3" p-id="40803"></path></svg> <?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1740041986415" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="40801" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M522.666667 761.6c27.733333 0 41.6-11.733333 41.6-46.933333v-48c0-3.2 3.2-5.333333 6.4-5.333334h64c28.8 0 43.733333-23.466667 43.733333-39.466666s-14.933333-39.466667-43.733333-39.466667h-64c-3.2 0-6.4-2.133333-6.4-5.333333v-26.666667c0-3.2 3.2-5.333333 6.4-5.333333h64c28.8 0 43.733333-23.466667 43.733333-39.466667s-14.933333-39.466667-43.733333-39.466667h-28.8c-5.333333 0-7.466667-4.266667-5.333334-8.533333l53.333334-68.266667c5.333333-7.466667 9.6-13.866667 12.8-19.2 2.133333-3.2 3.2-6.4 3.2-10.666666 1.066667-9.6-2.133333-20.266667-11.733334-26.666667-6.4-4.266667-13.866667-6.4-23.466666-6.4-7.466667 0-13.866667 1.066667-19.2 3.2-5.333333 2.133333-9.6 5.333333-12.8 9.6-3.2 3.2-7.466667 8.533333-10.666667 13.866667-4.266667 5.333333-7.466667 10.666667-10.666667 14.933333L526.933333 437.333333c-2.133333 3.2-8.533333 3.2-10.666666 0l-64-74.666666c-8.533333-11.733333-16-20.266667-22.4-25.6-6.4-5.333333-14.933333-8.533333-25.6-8.533334s-19.2 3.2-25.6 8.533334c-6.4 5.333333-9.6 12.8-9.6 21.333333 0 5.333333 1.066667 9.6 3.2 13.866667 2.133333 4.266667 7.466667 10.666667 14.933333 20.266666l56.533333 66.133334c3.2 3.2 0 8.533333-5.333333 8.533333h-27.733333c-29.866667 0-44.8 23.466667-44.8 39.466667s14.933333 39.466667 44.8 39.466666h64c3.2 0 6.4 2.133333 6.4 5.333334v26.666666c0 3.2-3.2 5.333333-6.4 5.333334h-64c-29.866667 0-44.8 23.466667-44.8 39.466666s14.933333 39.466667 44.8 39.466667h64c3.2 0 6.4 2.133333 6.4 5.333333V714.666667c-1.066667 35.2 13.866667 46.933333 41.6 46.933333z" fill="#4e5969" p-id="40802"></path><path d="M512 86.4c-70.4 0-138.666667 17.066667-200.533333 50.133333L289.066667 96c-8.533333-17.066667-33.066667-14.933333-39.466667 3.2l-65.066667 132.266667c-3.2 9.6 2.133333 21.333333 12.8 24.533333l149.333334 24.533333c18.133333 6.4 34.133333-12.8 25.6-29.866666L352 212.266667c49.066667-26.666667 103.466667-40.533333 160-40.533334 187.733333 0 341.333333 153.6 341.333333 341.333334s-153.6 341.333333-341.333333 341.333333-341.333333-153.6-341.333333-341.333333c0-21.333333 2.133333-42.666667 5.333333-62.933334 4.266667-23.466667-10.666667-45.866667-34.133333-50.133333-23.466667-4.266667-45.866667 10.666667-50.133334 34.133333-4.266667 25.6-6.4 52.266667-6.4 78.933334 0 235.733333 190.933333 426.666667 426.666667 426.666666s426.666667-190.933333 426.666667-426.666666-190.933333-426.666667-426.666667-426.666667z" fill="#4e5969" p-id="40803"></path></svg>
\ No newline at end of file \ No newline at end of file
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1740040154697" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="26853" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M1024 512A512 512 0 1 0 0 512a512 512 0 0 0 1024 0z m-950.857 0a438.857 438.857 0 1 1 804.206 243.2C766.245 693.175 642.56 658.286 512 658.286c-130.633 0-254.171 34.889-365.349 96.914A436.81 436.81 0 0 1 73.143 512z m642.194-130.194a203.337 203.337 0 1 0-406.674 0 203.337 203.337 0 0 0 406.674 0zM512 950.857c-125.806 0-239.177-52.882-319.122-137.655C291.108 760.54 398.848 731.43 512 731.43c113.152 0 220.891 29.11 319.122 81.773A437.614 437.614 0 0 1 512 950.857zM381.806 381.806a130.194 130.194 0 1 1 260.388 0 130.194 130.194 0 0 1-260.388 0z" fill="#234ca3" p-id="26854"></path></svg> <?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1740040154697" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="26853" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M1024 512A512 512 0 1 0 0 512a512 512 0 0 0 1024 0z m-950.857 0a438.857 438.857 0 1 1 804.206 243.2C766.245 693.175 642.56 658.286 512 658.286c-130.633 0-254.171 34.889-365.349 96.914A436.81 436.81 0 0 1 73.143 512z m642.194-130.194a203.337 203.337 0 1 0-406.674 0 203.337 203.337 0 0 0 406.674 0zM512 950.857c-125.806 0-239.177-52.882-319.122-137.655C291.108 760.54 398.848 731.43 512 731.43c113.152 0 220.891 29.11 319.122 81.773A437.614 437.614 0 0 1 512 950.857zM381.806 381.806a130.194 130.194 0 1 1 260.388 0 130.194 130.194 0 0 1-260.388 0z" fill="#4e5969" p-id="26854"></path></svg>
\ No newline at end of file \ No newline at end of file
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
:deep(.el-form-item__label) { :deep(.el-form-item__label) {
color: #606266; color: #606266;
font-size: 14px !important; font-size: 14px !important;
font-weight: 700; font-weight: 400;
} }
} }
</style> </style>
...@@ -268,7 +268,7 @@ ...@@ -268,7 +268,7 @@
text-align: center !important; text-align: center !important;
} }
.vxe-cell--title { .vxe-cell--title {
font-size: 14px !important; font-size: 12px !important;
color: #909399; color: #909399;
} }
} }
...@@ -280,6 +280,7 @@ ...@@ -280,6 +280,7 @@
.vxe-table--render-default .vxe-footer--column, .vxe-table--render-default .vxe-footer--column,
.vxe-table--render-default .vxe-header--column { .vxe-table--render-default .vxe-header--column {
line-height: 15px !important; line-height: 15px !important;
font-size: 12px;
} }
.vxe-table--render-default.size--small .vxe-header--column.col--ellipsis { .vxe-table--render-default.size--small .vxe-header--column.col--ellipsis {
height: 40px !important; height: 40px !important;
...@@ -347,7 +348,7 @@ td { ...@@ -347,7 +348,7 @@ td {
margin: 10px; margin: 10px;
border-radius: 5px; border-radius: 5px;
display: flex; display: flex;
width: 75%; width: 100%;
justify-content: space-between; justify-content: space-between;
padding-right: 15px; padding-right: 15px;
align-items: center; align-items: center;
...@@ -357,14 +358,14 @@ td { ...@@ -357,14 +358,14 @@ td {
height: 90px; height: 90px;
display: flex; display: flex;
border-radius: 5px; border-radius: 5px;
box-shadow: 0 0 5px 0 rgba(0, 0, 0, 0.25); box-shadow: 2px 2px 4px 2px rgba(0,0,0,.1);
padding: 5px 10px; padding: 5px 10px;
align-items: center; align-items: center;
} }
.img_warp { .img_warp {
line-height: 1.15; line-height: 1.15;
display: inline-block; display: inline-block;
width: 60px; width: 55px;
height: 100%; height: 100%;
margin-right: 10px; margin-right: 10px;
position: relative; position: relative;
...@@ -389,7 +390,7 @@ td { ...@@ -389,7 +390,7 @@ td {
line-height: 25px; line-height: 25px;
} }
.items1 { .items1 {
font-size: 18px; font-size: 21px;
color: #333; color: #333;
} }
} }
......
...@@ -21,6 +21,9 @@ body, ...@@ -21,6 +21,9 @@ body,
.el-form-item__label { .el-form-item__label {
font-size: 13px !important; font-size: 13px !important;
} }
input::placeholder, .el-select__placeholder {
font-size: 12px !important;
}
.el-input__inner { .el-input__inner {
height: 28px !important; height: 28px !important;
line-height: 28px !important; line-height: 28px !important;
...@@ -45,4 +48,10 @@ body, ...@@ -45,4 +48,10 @@ body,
} }
.vxe-loading.is--visible { .vxe-loading.is--visible {
display: none; display: none;
}
.vxe-body--column {
font-size: 12px;
}
.vxe-header--column {
font-size: 12px;
} }
\ No newline at end of file
...@@ -643,7 +643,7 @@ ...@@ -643,7 +643,7 @@
display: flex; display: flex;
.number-box { .number-box {
font-size: 15px; font-size: 15px;
width: 235px; width: 30%;
padding: 5px 0 5px 15px; padding: 5px 0 5px 15px;
border: 1px solid rgba(0, 0, 0, 0.1); border: 1px solid rgba(0, 0, 0, 0.1);
height: 50px; height: 50px;
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
> >
<template #table_top> <template #table_top>
<div class="style-lable"> <div class="style-lable">
<div class="item_warp"> <div class="item_warp" style="width: 32%">
<div class="img_warp" style="width: 18%"> <div class="img_warp" style="width: 18%">
<img src="@/assets/images/caselist.svg" /> <img src="@/assets/images/caselist.svg" />
</div> </div>
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<div class="item items1">{{ statisis.caseNum }}</div> <div class="item items1">{{ statisis.caseNum }}</div>
</div> </div>
</div> </div>
<div class="item_warp"> <div class="item_warp" style="width: 32%">
<div class="img_warp" style="width: 18%"> <div class="img_warp" style="width: 18%">
<img src="@/assets/images/userlist.svg" /> <img src="@/assets/images/userlist.svg" />
</div> </div>
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<div class="item items1">{{ statisis.borrowerNum }}</div> <div class="item items1">{{ statisis.borrowerNum }}</div>
</div> </div>
</div> </div>
<div class="item_warp"> <div class="item_warp" style="width: 32%">
<div class="img_warp" style="width: 18%"> <div class="img_warp" style="width: 18%">
<img src="@/assets/images/money.svg" /> <img src="@/assets/images/money.svg" />
</div> </div>
......
...@@ -644,7 +644,7 @@ ...@@ -644,7 +644,7 @@
display: flex; display: flex;
.number-box { .number-box {
font-size: 15px; font-size: 15px;
width: 235px; width: 30%;
padding: 5px 0 5px 15px; padding: 5px 0 5px 15px;
border: 1px solid rgba(0, 0, 0, 0.1); border: 1px solid rgba(0, 0, 0, 0.1);
height: 50px; height: 50px;
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
> >
<template #table_top> <template #table_top>
<div class="style-lable"> <div class="style-lable">
<div class="item_warp"> <div class="item_warp" style="width: 32%">
<div class="img_warp" style="width: 18%"> <div class="img_warp" style="width: 18%">
<img src="@/assets/images/caselist.svg" /> <img src="@/assets/images/caselist.svg" />
</div> </div>
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<div class="item items1">{{ statisis.caseNum }}</div> <div class="item items1">{{ statisis.caseNum }}</div>
</div> </div>
</div> </div>
<div class="item_warp"> <div class="item_warp" style="width: 32%">
<div class="img_warp" style="width: 18%"> <div class="img_warp" style="width: 18%">
<img src="@/assets/images/userlist.svg" /> <img src="@/assets/images/userlist.svg" />
</div> </div>
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<div class="item items1">{{ statisis.borrowerNum }}</div> <div class="item items1">{{ statisis.borrowerNum }}</div>
</div> </div>
</div> </div>
<div class="item_warp"> <div class="item_warp" style="width: 32%">
<div class="img_warp" style="width: 18%"> <div class="img_warp" style="width: 18%">
<img src="@/assets/images/money.svg" /> <img src="@/assets/images/money.svg" />
</div> </div>
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
> >
<template #table_top> <template #table_top>
<div class="style-lable" style="width: 100%"> <div class="style-lable" style="width: 100%">
<div class="item_warp" style="width: 19%"> <div class="item_warp" style="width: 23%">
<div class="img_warp"> <div class="img_warp">
<img src="@/assets/images/caselist.svg" /> <img src="@/assets/images/caselist.svg" />
</div> </div>
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<div class="item items1">{{ statisis.caseNum }}</div> <div class="item items1">{{ statisis.caseNum }}</div>
</div> </div>
</div> </div>
<div class="item_warp" style="width: 19%"> <div class="item_warp" style="width: 23%">
<div class="img_warp"> <div class="img_warp">
<img src="@/assets/images/userlist.svg" /> <img src="@/assets/images/userlist.svg" />
</div> </div>
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<div class="item items1">{{ statisis.cpeNum }}</div> <div class="item items1">{{ statisis.cpeNum }}</div>
</div> </div>
</div> </div>
<div class="item_warp" style="width: 19%"> <div class="item_warp" style="width: 23%">
<div class="img_warp"> <div class="img_warp">
<img src="@/assets/images/money.svg" /> <img src="@/assets/images/money.svg" />
</div> </div>
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
<div class="item items1">{{ statisis.amount }}</div> <div class="item items1">{{ statisis.amount }}</div>
</div> </div>
</div> </div>
<div class="item_warp" style="width: 19%"> <div class="item_warp" style="width: 23%">
<div class="img_warp"> <div class="img_warp">
<img src="@/assets/images/tocrash.svg" /> <img src="@/assets/images/tocrash.svg" />
</div> </div>
......
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
</div> </div>
<div class="box-content"> <div class="box-content">
<div class="style-lable" style="width: 100%"> <div class="style-lable" style="width: 100%">
<div class="item_warp" style="width: 19%"> <div class="item_warp" style="width: 23%">
<div class="img_warp"> <div class="img_warp">
<img src="@/assets/images/money.svg" /> <img src="@/assets/images/money.svg" />
</div> </div>
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
<div class="item items1">{{ sumCase.commissionAmount }}</div> <div class="item items1">{{ sumCase.commissionAmount }}</div>
</div> </div>
</div> </div>
<div class="item_warp" style="width: 19%"> <div class="item_warp" style="width: 23%">
<div class="img_warp"> <div class="img_warp">
<img src="@/assets/images/money.svg" /> <img src="@/assets/images/money.svg" />
</div> </div>
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
<div class="item items1">{{ sumCase.sumReductionAmount }}</div> <div class="item items1">{{ sumCase.sumReductionAmount }}</div>
</div> </div>
</div> </div>
<div class="item_warp" style="width: 19%"> <div class="item_warp" style="width: 23%">
<div class="img_warp"> <div class="img_warp">
<img src="@/assets/images/money.svg" /> <img src="@/assets/images/money.svg" />
</div> </div>
...@@ -143,7 +143,7 @@ ...@@ -143,7 +143,7 @@
<div class="item items1">{{ sumCase.sumRepayAmount }}</div> <div class="item items1">{{ sumCase.sumRepayAmount }}</div>
</div> </div>
</div> </div>
<div class="item_warp" style="width: 19%"> <div class="item_warp" style="width: 23%">
<div class="img_warp"> <div class="img_warp">
<img src="@/assets/images/money.svg" /> <img src="@/assets/images/money.svg" />
</div> </div>
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
> >
<template #table_top> <template #table_top>
<div class="style-lable" style="width: 100%"> <div class="style-lable" style="width: 100%">
<div class="item_warp" style="width: 19%"> <div class="item_warp" style="width: 23%">
<div class="img_warp"> <div class="img_warp">
<img src="@/assets/images/caselist.svg" /> <img src="@/assets/images/caselist.svg" />
</div> </div>
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<div class="item items1">{{ statisis.caseNum }}</div> <div class="item items1">{{ statisis.caseNum }}</div>
</div> </div>
</div> </div>
<div class="item_warp" style="width: 19%"> <div class="item_warp" style="width: 23%">
<div class="img_warp"> <div class="img_warp">
<img src="@/assets/images/userlist.svg" /> <img src="@/assets/images/userlist.svg" />
</div> </div>
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<div class="item items1">{{ statisis.cpeNum }}</div> <div class="item items1">{{ statisis.cpeNum }}</div>
</div> </div>
</div> </div>
<div class="item_warp" style="width: 19%"> <div class="item_warp" style="width: 23%">
<div class="img_warp"> <div class="img_warp">
<img src="@/assets/images/money.svg" /> <img src="@/assets/images/money.svg" />
</div> </div>
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
<div class="item items1">{{ statisis.amount }}</div> <div class="item items1">{{ statisis.amount }}</div>
</div> </div>
</div> </div>
<div class="item_warp" style="width: 19%"> <div class="item_warp" style="width: 23%">
<div class="img_warp"> <div class="img_warp">
<img src="@/assets/images/tocrash.svg" /> <img src="@/assets/images/tocrash.svg" />
</div> </div>
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
show-footer show-footer
esc-closable esc-closable
> >
<el-form ref="formRef" inline :model="form" :rules="rules" label-width="80px"> <el-form ref="formRef" inline :model="form" :rules="rules" label-width="120px">
<el-row :gutter="10"> <el-row :gutter="10">
<el-col :span="24"> <el-col :span="24">
<el-form-item class="w-full" label="手机号" prop="phone"> <el-form-item class="w-full" label="手机号" prop="phone">
...@@ -65,6 +65,24 @@ ...@@ -65,6 +65,24 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24">
<el-form-item class="w-full" label="是否启用白名单" prop="whitelistStatus">
<el-radio-group v-model="form.whitelistStatus">
<el-radio value="Y"></el-radio>
<el-radio value="N"></el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="24" v-if="form.whitelistStatus === 'Y'">
<el-form-item class="w-full" label="IP地址" prop="ip">
<el-input v-model="form.ip" placeholder="请输入IP地址" clearable />
</el-form-item>
</el-col>
<el-col :span="24" v-if="form.whitelistStatus === 'Y'">
<el-form-item class="w-full" label="MAC地址" prop="mac">
<el-input v-model="form.mac" placeholder="请输入MAC地址" clearable />
</el-form-item>
</el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item class="w-full" label="状态" prop="status"> <el-form-item class="w-full" label="状态" prop="status">
<el-radio-group v-model="form.status"> <el-radio-group v-model="form.status">
...@@ -99,11 +117,14 @@ ...@@ -99,11 +117,14 @@
const loading = ref(false); const loading = ref(false);
const form = ref({ const form = ref({
username: '', username: '',
ip: '',
mac: '',
roles: [], roles: [],
phone: '', phone: '',
departmentId: null, departmentId: null,
tenant: null, tenant: null,
status: 'enable', status: 'enable',
whitelistStatus: 'N'
}); });
const options = ref([]); const options = ref([]);
const departlist = ref([]); const departlist = ref([]);
...@@ -120,6 +141,8 @@ ...@@ -120,6 +141,8 @@
}; };
const rules = ref({ const rules = ref({
username: { required: true, message: '请输入用户名称', trigger: 'blur' }, username: { required: true, message: '请输入用户名称', trigger: 'blur' },
ip: { required: true, message: '请输入IP地址', trigger: 'blur' },
mac: { required: true, message: '请输入MAC地址', trigger: 'blur' },
phone: [ phone: [
{ required: true, message: '请输入手机号', trigger: 'blur' }, { required: true, message: '请输入手机号', trigger: 'blur' },
{ validator: validatePhone, trigger: 'blur' }, { validator: validatePhone, trigger: 'blur' },
...@@ -162,11 +185,14 @@ ...@@ -162,11 +185,14 @@
const onHide = () => { const onHide = () => {
form.value = { form.value = {
username: '', username: '',
ip: '',
mac: '',
roles: [], roles: [],
phone: '', phone: '',
departmentId: null, departmentId: null,
tenant: null, tenant: null,
status: 'enable', status: 'enable',
whitelistStatus: 'N'
}; };
formRef.value.clearValidate(); formRef.value.clearValidate();
currentAccount.value = null; currentAccount.value = null;
......
...@@ -106,6 +106,32 @@ ...@@ -106,6 +106,32 @@
}, },
}, },
}, },
{
field: 'whitelistStatus',
title: '是否启用白名单',
width: 100,
enum: Status,
search: { el: 'select', props: { clearable: true }, labelWidth: 85 },
slots: {
default: ({ row }) => {
return (
<ElTag type={row.whitelistStatus == 'Y' ? 'primary' : 'danger'}>
{row.whitelistStatus == 'Y' ? '是' : '否'}
</ElTag>
);
},
},
},
{
field: 'ip',
title: 'IP地址',
width: 170,
},
{
field: 'mac',
title: 'MAC地址',
width: 170,
},
{ {
field: 'createTime', field: 'createTime',
title: '创建时间', title: '创建时间',
......
<template> <template>
<div class="card content-box"> <div class="table-box">
<span class="text"> 系统日志(待完善) 🍓🍇🍈🍉</span> <ProTable
ref="proTable"
:config="config"
:api="getloginLogPage"
:paramCallback="paramCallback"
>
</ProTable>
</div> </div>
</template> </template>
<script setup name="systemLog"></script> <script setup lang="jsx" name="ManageOrg">
import { ref, reactive, onMounted } from 'vue';
import { Plus, Delete, Edit, Setting } from '@element-plus/icons-vue';
import { getloginLogPage } from '@/api/systemlog';
import { ElMessageBox, ElMessage, ElButton, ElTag } from 'element-plus';
const proTable = ref(null);
const ManageOrgModalRef = ref(null);
const allocationUserModalRef = ref(null);
const config = reactive({
columns: [
{ field: 'loginName', title: '登录用户名称', showOverflow: 'tooltip', search: {
el: 'input',
labelWidth: 105,
props: { clearable: true }
} },
{ field: 'loginTime', title: '登录时间', showOverflow: 'tooltip', search: {
labelWidth: 105,
el: 'date-picker',
props: { type: 'date', valueFormat: 'YYYY-MM-DD' },
labelWidth: 105,
} },
{ field: 'ip', title: '登录IP', showOverflow: 'tooltip', search: {
labelWidth: 105,
el: 'input',
props: { clearable: true }
} },
{ field: 'device', title: '登录设备', showOverflow: 'tooltip', search: {
el: 'input',
labelWidth: 105,
props: { clearable: true }
} },
{ field: 'mac', title: 'MAC地址', showOverflow: 'tooltip', search: {
labelWidth: 105,
el: 'input',
props: { clearable: true }
} },
],
});
const paramCallback = (param) => {
const obj = JSON.parse(JSON.stringify(param));
return obj;
};
const query = () => proTable.value?.search();
onMounted(() => {
query();
});
</script>
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
> >
<template #table_top> <template #table_top>
<div class="style-lable" style="width: 100%"> <div class="style-lable" style="width: 100%">
<div class="item_warp" style="width: 19%"> <div class="item_warp" style="width: 23%">
<div class="img_warp"> <div class="img_warp">
<img src="@/assets/images/caselist.svg" /> <img src="@/assets/images/caselist.svg" />
</div> </div>
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<div class="item items1">{{ statisis.caseNum }}</div> <div class="item items1">{{ statisis.caseNum }}</div>
</div> </div>
</div> </div>
<div class="item_warp" style="width: 19%"> <div class="item_warp" style="width: 23%">
<div class="img_warp"> <div class="img_warp">
<img src="@/assets/images/userlist.svg" /> <img src="@/assets/images/userlist.svg" />
</div> </div>
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<div class="item items1">{{ statisis.cpeNum }}</div> <div class="item items1">{{ statisis.cpeNum }}</div>
</div> </div>
</div> </div>
<div class="item_warp" style="width: 19%"> <div class="item_warp" style="width: 23%">
<div class="img_warp"> <div class="img_warp">
<img src="@/assets/images/money.svg" /> <img src="@/assets/images/money.svg" />
</div> </div>
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
<div class="item items1">{{ statisis.amount }}</div> <div class="item items1">{{ statisis.amount }}</div>
</div> </div>
</div> </div>
<div class="item_warp" style="width: 19%"> <div class="item_warp" style="width: 23%">
<div class="img_warp"> <div class="img_warp">
<img src="@/assets/images/tocrash.svg" /> <img src="@/assets/images/tocrash.svg" />
</div> </div>
......
...@@ -55,9 +55,9 @@ export default defineConfig(({ command, mode }) => { ...@@ -55,9 +55,9 @@ export default defineConfig(({ command, mode }) => {
port: VITE_PORT, port: VITE_PORT,
proxy: { proxy: {
'/api': { '/api': {
// target: 'http://192.168.31.187:8080', target: 'http://192.168.31.187:8080',
// target: 'http://192.168.31.128:8080', // target: 'http://192.168.31.128:8080',
target: 'http://8.152.205.9:8080', // target: 'http://8.152.205.9:8080',
ws:true, ws:true,
changeOrigin: true, changeOrigin: true,
rewrite: (path) => path.replace(/^\/api/, ''), rewrite: (path) => path.replace(/^\/api/, ''),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment