Commit 8fff25e0 authored by krysent's avatar krysent

集成

parent ed6ec515
...@@ -161,11 +161,11 @@ const AvatarDropdown = ({ menu }) => { ...@@ -161,11 +161,11 @@ const AvatarDropdown = ({ menu }) => {
const menuHeaderDropdown = ( const menuHeaderDropdown = (
<Menu className={styles.menu} selectedKeys={[]} onClick={onMenuClick}> <Menu className={styles.menu} selectedKeys={[]} onClick={onMenuClick}>
<Menu.Item key="changepwd"> {/* <Menu.Item key="changepwd">
<LockOutlined /> <LockOutlined />
修改密码 修改密码
</Menu.Item> </Menu.Item>
<Menu.Divider /> <Menu.Divider /> */}
<Menu.Item key="logout"> <Menu.Item key="logout">
<LogoutOutlined /> <LogoutOutlined />
退出登录 退出登录
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
-webkit-line-clamp: 2; -webkit-line-clamp: 2;
} }
html, html,
body, body,
#root { #root {
...@@ -19,6 +20,7 @@ body, ...@@ -19,6 +20,7 @@ body,
.colorWeak { .colorWeak {
filter: invert(80%); filter: invert(80%);
} }
.ant-pro-sider.ant-layout-sider.ant-pro-sider-fixed { .ant-pro-sider.ant-layout-sider.ant-pro-sider-fixed {
left: unset; left: unset;
} }
...@@ -33,6 +35,15 @@ body { ...@@ -33,6 +35,15 @@ body {
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
} }
main>div:nth-child(2)>div>div {
height: 100% !important;
>div {
height: 100% !important;
}
}
ul, ul,
ol { ol {
list-style: none; list-style: none;
...@@ -42,12 +53,15 @@ ol { ...@@ -42,12 +53,15 @@ ol {
.ant-table { .ant-table {
width: 100%; width: 100%;
overflow-x: auto; overflow-x: auto;
&-thead > tr,
&-tbody > tr { &-thead>tr,
> th, &-tbody>tr {
> td {
>th,
>td {
white-space: pre; white-space: pre;
> span {
>span {
display: block; display: block;
} }
} }
...@@ -56,8 +70,9 @@ ol { ...@@ -56,8 +70,9 @@ ol {
} }
// Compatible with IE11 // Compatible with IE11
@media screen and(-ms-high-contrast: active), (-ms-high-contrast: none) { @media screen and(-ms-high-contrast: active),
body .ant-design-pro > .ant-layout { (-ms-high-contrast: none) {
body .ant-design-pro>.ant-layout {
min-height: 100vh; min-height: 100vh;
} }
} }
...@@ -83,10 +98,12 @@ ol { ...@@ -83,10 +98,12 @@ ol {
.ant-card-body { .ant-card-body {
padding: 12px !important; padding: 12px !important;
} }
.ant-card-head { .ant-card-head {
padding: 0 20px !important; padding: 0 20px !important;
} }
} }
.ant-drawer-content { .ant-drawer-content {
overflow-x: hidden !important; overflow-x: hidden !important;
} }
...@@ -96,6 +113,7 @@ ol { ...@@ -96,6 +113,7 @@ ol {
padding: 0 !important; padding: 0 !important;
} }
} }
.ant-pro-table-list-toolbar-container { .ant-pro-table-list-toolbar-container {
padding: 0px !important; padding: 0px !important;
padding-bottom: 8px !important; padding-bottom: 8px !important;
...@@ -108,12 +126,14 @@ ol { ...@@ -108,12 +126,14 @@ ol {
justify-content: space-between !important; justify-content: space-between !important;
padding: 10px 0 10px 0 !important; padding: 10px 0 10px 0 !important;
} }
.ant-pro-form-login-container { .ant-pro-form-login-container {
height: auto !important; height: auto !important;
margin-top: -10vh; margin-top: -10vh;
padding: 0 !important; padding: 0 !important;
background: transparent !important; background: transparent !important;
} }
.ant-pro-form-login-main { .ant-pro-form-login-main {
margin-top: 30px !important; margin-top: 30px !important;
} }
...@@ -125,42 +145,51 @@ pre { ...@@ -125,42 +145,51 @@ pre {
"Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !important; "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !important;
white-space: pre-wrap !important; white-space: pre-wrap !important;
} }
.gongyiStep { .gongyiStep {
height: 100%; height: 100%;
.ant-steps-item-title { .ant-steps-item-title {
width: 100% !important; width: 100% !important;
} }
} }
.center { .center {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
} }
.spread { .spread {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
width: 100%; width: 100%;
} }
.columns { .columns {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
} }
.specialpropertiesCard { .specialpropertiesCard {
.ant-card-body { .ant-card-body {
padding: 5px !important; padding: 5px !important;
} }
} }
.oneText { .oneText {
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
.ant-picker-cell-inner { .ant-picker-cell-inner {
display: flex !important; display: flex !important;
justify-content: center; justify-content: center;
.ant-picker-calendar-date-content { .ant-picker-calendar-date-content {
flex: 1 !important; flex: 1 !important;
} }
...@@ -170,16 +199,17 @@ pre { ...@@ -170,16 +199,17 @@ pre {
.ant-tabs-nav { .ant-tabs-nav {
padding: 0 16px; padding: 0 16px;
} }
.ant-tabs-content-holder { .ant-tabs-content-holder {
max-height: 520px; max-height: 520px;
padding: 0 16px; padding: 0 16px;
overflow-y: auto; overflow-y: auto;
} }
} }
.ant-input[disabled], .ant-input[disabled],
.ant-picker-input > input[disabled], .ant-picker-input>input[disabled],
.ant-select-disabled.ant-select:not(.ant-select-customize-input) .ant-select-disabled.ant-select:not(.ant-select-customize-input) .ant-select-selector,
.ant-select-selector,
.ant-select-disabled.ant-select-multiple .ant-select-selection-item { .ant-select-disabled.ant-select-multiple .ant-select-selection-item {
color: rgba(0, 0, 0, 0.85) !important; color: rgba(0, 0, 0, 0.85) !important;
} }
...@@ -191,6 +221,7 @@ pre { ...@@ -191,6 +221,7 @@ pre {
} }
} }
} }
.row-dragging { .row-dragging {
z-index: 999999999999; z-index: 999999999999;
background: #fafafa; background: #fafafa;
...@@ -204,6 +235,7 @@ pre { ...@@ -204,6 +235,7 @@ pre {
.row-dragging .drag-visible { .row-dragging .drag-visible {
visibility: visible; visibility: visible;
} }
//reset end //reset end
.img { .img {
...@@ -213,21 +245,26 @@ pre { ...@@ -213,21 +245,26 @@ pre {
background-position: center; background-position: center;
background-size: cover; background-size: cover;
} }
.cover { .cover {
position: absolute; position: absolute;
width: 100%; width: 100%;
height: 100%; height: 100%;
background-color: rgba(0, 0, 0, 0.8); background-color: rgba(0, 0, 0, 0.8);
img { img {
width: 30%; width: 30%;
margin: 30px 0 0 30px; margin: 30px 0 0 30px;
} }
} }
.ant-pro-form-login-desc { .ant-pro-form-login-desc {
margin-bottom: 0 !important; margin-bottom: 0 !important;
} }
.ant-layout-footer { .ant-layout-footer {
background-color: transparent !important; background-color: transparent !important;
.ant-pro-global-footer { .ant-pro-global-footer {
margin: 0 !important; margin: 0 !important;
padding: 0 !important; padding: 0 !important;
...@@ -238,62 +275,79 @@ pre { ...@@ -238,62 +275,79 @@ pre {
.ant-tabs-nav-wrap { .ant-tabs-nav-wrap {
display: inline-block !important; display: inline-block !important;
} }
.ant-tabs-tab-active { .ant-tabs-tab-active {
font-size: 16px !important; font-size: 16px !important;
} }
.ant-layout-footer { .ant-layout-footer {
background-color: #23394a !important; background-color: #23394a !important;
.ant-pro-global-footer { .ant-pro-global-footer {
margin: 0 0 20px 0 !important; margin: 0 0 20px 0 !important;
padding: 0 !important; padding: 0 !important;
* { * {
color: rgba(255, 255, 255, 0.6) !important; color: rgba(255, 255, 255, 0.6) !important;
} }
.ant-pro-global-footer-copyright { .ant-pro-global-footer-copyright {
color: rgba(255, 255, 255, 0.3) !important; color: rgba(255, 255, 255, 0.3) !important;
} }
} }
} }
.ant-input-affix-wrapper { .ant-input-affix-wrapper {
background-color: rgba(255, 255, 255, 0.3) !important; background-color: rgba(255, 255, 255, 0.3) !important;
border: none !important; border: none !important;
input { input {
color: #fff !important; color: #fff !important;
background-color: rgba(255, 255, 255, 0) !important; background-color: rgba(255, 255, 255, 0) !important;
} }
} }
.ant-select-selector { .ant-select-selector {
background-color: rgba(255, 255, 255, 0.3) !important; background-color: rgba(255, 255, 255, 0.3) !important;
border: none !important; border: none !important;
input { input {
color: #fff !important; color: #fff !important;
background-color: rgba(255, 255, 255, 0) !important; background-color: rgba(255, 255, 255, 0) !important;
} }
} }
.ant-input { .ant-input {
color: #fff !important; color: #fff !important;
background-color: rgba(255, 255, 255, 0.3) !important; background-color: rgba(255, 255, 255, 0.3) !important;
border: none !important; border: none !important;
} }
.ant-select-selection-item { .ant-select-selection-item {
color: #fff !important; color: #fff !important;
} }
.anticon-close-circle { .anticon-close-circle {
color: #fff !important; color: #fff !important;
} }
.anticon { .anticon {
color: #fff !important; color: #fff !important;
} }
.ant-select-clear { .ant-select-clear {
background-color: transparent !important; background-color: transparent !important;
} }
.ant-select-selection-item-content, .ant-select-selection-item-content,
.ant-select-selection-item-remove { .ant-select-selection-item-remove {
color: #000 !important; color: #000 !important;
.anticon { .anticon {
color: #000 !important; color: #000 !important;
} }
} }
.ant-select-selection-overflow { .ant-select-selection-overflow {
display: flex !important; display: flex !important;
flex-wrap: nowrap !important; flex-wrap: nowrap !important;
...@@ -306,38 +360,48 @@ pre { ...@@ -306,38 +360,48 @@ pre {
font-weight: normal !important; font-weight: normal !important;
} }
} }
.ant-layout-header { .ant-layout-header {
transition: all 200ms !important; transition: all 200ms !important;
transition-timing-function: ease-out !important; transition-timing-function: ease-out !important;
} }
.ant-pro-global-header { .ant-pro-global-header {
padding-left: 6px !important; padding-left: 6px !important;
} }
table { table {
min-width: calc(100% - 6px) !important; min-width: calc(100% - 6px) !important;
} }
.ant-drawer-open { .ant-drawer-open {
transform: none !important; transform: none !important;
} }
.ant-pro-table-list-toolbar { .ant-pro-table-list-toolbar {
overflow: hidden !important; overflow: hidden !important;
} }
.ant-select-selector { .ant-select-selector {
overflow: hidden !important; overflow: hidden !important;
} }
.ant-breadcrumb { .ant-breadcrumb {
span { span {
> span { >span {
max-width: 600px !important; max-width: 600px !important;
} }
} }
} }
.ant-tree .ant-tree-treenode { .ant-tree .ant-tree-treenode {
width: 100%; width: 100%;
> span:last-child {
>span:last-child {
flex: 1; flex: 1;
} }
} }
.ant-input-number-affix-wrapper, .ant-input-number-affix-wrapper,
.ant-input-number { .ant-input-number {
width: 100% !important; width: 100% !important;
...@@ -350,6 +414,7 @@ table { ...@@ -350,6 +414,7 @@ table {
} }
@media print { @media print {
html, html,
body { body {
height: initial !important; height: initial !important;
...@@ -365,20 +430,25 @@ table { ...@@ -365,20 +430,25 @@ table {
page-break-after: always; page-break-after: always;
} }
} }
.ant-pro-card-body { .ant-pro-card-body {
padding: 12px !important; padding: 12px !important;
} }
.ant-pagination.ant-pagination-mini .ant-pagination-options-size-changer { .ant-pagination.ant-pagination-mini .ant-pagination-options-size-changer {
max-width: 100px !important; max-width: 100px !important;
} }
.ant-pagination-options { .ant-pagination-options {
display: flex !important; display: flex !important;
min-width: 210px !important; min-width: 210px !important;
} }
#large { #large {
.header { .header {
background-color: transparent !important; background-color: transparent !important;
} }
.header-item, .header-item,
.ceil { .ceil {
height: auto !important; height: auto !important;
...@@ -390,16 +460,20 @@ table { ...@@ -390,16 +460,20 @@ table {
word-break: break-all !important; word-break: break-all !important;
border: #000 1px solid !important; border: #000 1px solid !important;
} }
.header-item{
.header-item {
font-weight: bolder !important; font-weight: bolder !important;
} }
.header-item + .header-item {
.header-item+.header-item {
margin-left: -1px !important; margin-left: -1px !important;
} }
.ceil { .ceil {
margin-top: -1px; margin-top: -1px;
} }
.ceil + .ceil {
.ceil+.ceil {
margin-left: -1px !important; margin-left: -1px !important;
} }
...@@ -409,10 +483,11 @@ table { ...@@ -409,10 +483,11 @@ table {
line-height: 1 !important; line-height: 1 !important;
background-color: transparent !important; background-color: transparent !important;
} }
* { * {
overflow: visible !important; overflow: visible !important;
font-size: 20px !important; font-size: 20px !important;
white-space: pre-wrap !important; white-space: pre-wrap !important;
word-break: break-all !important; word-break: break-all !important;
} }
} }
\ No newline at end of file
...@@ -2,12 +2,13 @@ import React, { useState } from "react"; ...@@ -2,12 +2,13 @@ import React, { useState } from "react";
import AutoTable from "@/components/AutoTable"; import AutoTable from "@/components/AutoTable";
import DrawInitForm from "@/components/DrawInitForm"; import DrawInitForm from "@/components/DrawInitForm";
import { Button } from "antd"; import { Button } from "antd";
import bg from "../../public/home.jpg";
function Table({ route }) { function Table({ route }) {
const style = { const style = {
width: "100%", width: "100%",
height: "100%", height: "100%",
backgroundImage: `url(${require("../../public/home.jpg")})`, backgroundImage: `url(${bg})`,
backgroundPosition: "0 0", backgroundPosition: "0 0",
backgroundSize: "cover", backgroundSize: "cover",
backgroundRepeat: "no-repeat", backgroundRepeat: "no-repeat",
......
...@@ -30,7 +30,7 @@ const codeMessage = { ...@@ -30,7 +30,7 @@ const codeMessage = {
const errorHandler = (error) => { const errorHandler = (error) => {
const { response } = error; const { response } = error;
console.log("异常处理",error); console.log("异常处理", error);
if (response.status === 200) { if (response.status === 200) {
return; return;
} }
...@@ -149,7 +149,9 @@ request.interceptors.response.use(async (response, options) => { ...@@ -149,7 +149,9 @@ request.interceptors.response.use(async (response, options) => {
if (data?.code != "0000") { if (data?.code != "0000") {
message.destroy(); message.destroy();
message.warn(data?.msg); if (data?.code == "9999") {
message.warn(data?.msg);
}
if (data?.code == "0001" && window.location.href.indexOf("login") == -1) { if (data?.code == "0001" && window.location.href.indexOf("login") == -1) {
localStorage.clear(); localStorage.clear();
history.replace("/user/login"); history.replace("/user/login");
......
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