From 8b81ba1cc596293d3ddcb221746e12b699c04b19 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Fri, 1 Sep 2023 11:49:40 +0800 Subject: [PATCH] save --- package-lock.json | 18 +- package.json | 2 +- src/forge/Main/sub/Contribute.jsx | 1 - src/forge/Order/order.scss | 718 ++++++++++++++++++++++++++++++ 4 files changed, 728 insertions(+), 11 deletions(-) create mode 100644 src/forge/Order/order.scss diff --git a/package-lock.json b/package-lock.json index 219e90579..466b8c79a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3506,7 +3506,7 @@ }, "clone-deep": { "version": "4.0.1", - "resolved": "http://173.15.15.82:8081/repository/npm-all/clone-deep/-/clone-deep-4.0.1.tgz", + "resolved": "https://registry.npmmirror.com/clone-deep/-/clone-deep-4.0.1.tgz", "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==", "requires": { "is-plain-object": "^2.0.4", @@ -3516,7 +3516,7 @@ "dependencies": { "kind-of": { "version": "6.0.3", - "resolved": "http://173.15.15.82:8081/repository/npm-all/kind-of/-/kind-of-6.0.3.tgz", + "resolved": "https://registry.npmmirror.com/kind-of/-/kind-of-6.0.3.tgz", "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==" } } @@ -15880,7 +15880,7 @@ }, "sass-loader": { "version": "7.3.1", - "resolved": "http://173.15.15.82:8081/repository/npm-all/sass-loader/-/sass-loader-7.3.1.tgz", + "resolved": "https://registry.npmmirror.com/sass-loader/-/sass-loader-7.3.1.tgz", "integrity": "sha512-tuU7+zm0pTCynKYHpdqaPpe+MMTQ76I9TPZ7i4/5dZsigE350shQWe5EZNl5dBidM49TPET75tNqRbcsUZWeNA==", "requires": { "clone-deep": "^4.0.1", @@ -15892,13 +15892,13 @@ "dependencies": { "pify": { "version": "4.0.1", - "resolved": "http://173.15.15.82:8081/repository/npm-all/pify/-/pify-4.0.1.tgz", + "resolved": "https://registry.npmmirror.com/pify/-/pify-4.0.1.tgz", "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==" }, "semver": { - "version": "6.3.0", - "resolved": "http://173.15.15.82:8081/repository/npm-all/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + "version": "6.3.1", + "resolved": "https://registry.npmmirror.com/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==" } } }, @@ -16178,7 +16178,7 @@ }, "shallow-clone": { "version": "3.0.1", - "resolved": "http://173.15.15.82:8081/repository/npm-all/shallow-clone/-/shallow-clone-3.0.1.tgz", + "resolved": "https://registry.npmmirror.com/shallow-clone/-/shallow-clone-3.0.1.tgz", "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==", "requires": { "kind-of": "^6.0.2" @@ -16186,7 +16186,7 @@ "dependencies": { "kind-of": { "version": "6.0.3", - "resolved": "http://173.15.15.82:8081/repository/npm-all/kind-of/-/kind-of-6.0.3.tgz", + "resolved": "https://registry.npmmirror.com/kind-of/-/kind-of-6.0.3.tgz", "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==" } } diff --git a/package.json b/package.json index 13dddda43..42bc9642a 100644 --- a/package.json +++ b/package.json @@ -106,7 +106,7 @@ "redux": "^4.0.5", "redux-thunk": "2.3.0", "rsuite": "^4.3.4", - "sass-loader": "7.3.1", + "sass-loader": "^7.3.1", "save-dev": "0.0.1-security", "scroll-into-view": "^1.14.2", "showdown": "^1.9.1", diff --git a/src/forge/Main/sub/Contribute.jsx b/src/forge/Main/sub/Contribute.jsx index 788ac62bd..e22f8dc94 100644 --- a/src/forge/Main/sub/Contribute.jsx +++ b/src/forge/Main/sub/Contribute.jsx @@ -5,7 +5,6 @@ import axios from 'axios'; import { Pagination , Spin } from 'antd'; import NoData from '../../Nodata'; import { getImageUrl } from 'educoder'; -import { Link } from 'react-router-dom'; function Contribute(props){ const [ list , setList ] = useState(undefined); diff --git a/src/forge/Order/order.scss b/src/forge/Order/order.scss new file mode 100644 index 000000000..912ce6e80 --- /dev/null +++ b/src/forge/Order/order.scss @@ -0,0 +1,718 @@ +.topWrapper { + padding-bottom: 20px; + box-sizing: border-box; + display: flex; + justify-content: space-between; + flex-wrap: wrap; +} +.quillContent { + position: relative; + margin-bottom: 4px; +} +.quillFlag { + position: absolute; + bottom: 30px; + left: 6px; + height: 20px; + line-height: 18px; + color: red; +} +.overlayBox{ + width: 230px; +} +.hideOverlay{ + display: none; +} +.topmilepost { + box-sizing: border-box; + display: flex; + justify-content: space-between; + flex-wrap: wrap; +} +.topWrapper_nav { + display: flex; +} +.detail_p { + display: flex; +} + +.detail_right { + flex-grow: 1; + text-align: right; +} +.commit_p { + font-size: 12px; + padding-top: 10px; + padding-left: 5px; +} + +.ul_width { + width: 100%; +} +.a_btn { + border-radius: 4px; + padding: 0 12px; + margin-right: 15px; + line-height: 30px; +} +.cancel_btn { + border: 1px solid #e6e6e6; + color: #333 !important; +} +.delete_btn { + border: 1px solid red; + color: red !important; +} +.cancel_btn:hover { + background: #e6e6e6; +} +.Closeor_btn { + border: 1px solid red; + color: red; + height: 32px; + text-align: center; + border-radius: 4px; + padding: 0px 12px; + margin-right: 15px; + line-height: 32px; +} +.rectangle { + width: 8px; + height: 8px; + border-radius: 100%; + margin-top: 15px; + margin-left: -4px; + margin-bottom: 10px; + background: green; +} +.order_line { + display: flex; + height: 32px; + margin: auto; + border-left: 1px solid #eee; +} +.comment_img { + height: 25px; + width: 25px; + margin-top: 5px; + border-radius: 100%; +} + +.topWrapper_nav a, +.topWrapper_nav span { + border: 1px solid #f4f4f4; + border-radius: 5px 0px 0px 5px; + height: 34px; + line-height: 34px; + text-align: center; + padding: 0px 10px; + display: block; + cursor: pointer; +} +.topWrapper_nav a:hover { + background: #f4f4f4; +} +.topWrapper_nav a:last-child, +.topWrapper_nav span:last-child { + border-left: none; + border-radius: 0px 5px 5px 0px; +} +.topWrapper_btn { + background: #fff; + border: 1px solid $primary-color; + color: $primary-color!important ; + padding: 0px 12px; + text-align: center; + height: 32px; + line-height: 32px; + border-radius: 4px; +} +.topWrapper_type_infos{ + border:1px solid #eee; + border-radius: 3px; + height: 35px; + line-height: 35px; +} +.topWrapper_type_infos li{ + cursor: pointer; + padding:0px 10px; +} +.topWrapper_type_infos li.active{ + color: $primary-color +} +.topWrapper_type_infos li:last-child{ + border-left: 1px solid #eee; +} +.topWrapper_type,.topWrapper_type_infos { + display: flex; +} +.topWrapper_type li { + display: flex; + align-items: center; + margin-right: 30px; +} +.topWrapper_type li > span { + display: block; + height: 30px; + line-height: 30px; + padding: 0px 13px; + border-radius: 5px; + min-width: 60px; + box-sizing: border-box; + text-align: center; + background: rgba(250, 250, 250, 1); + border: 1px solid rgba(221, 221, 221, 1); + cursor: pointer; +} +.topWrapper_type li > span.active { + color: $primary-color; + border: 1px solid rgba(80, 145, 255, 1); +} +.topWrapper_select { + display: flex; + flex-wrap: wrap; + align-items: center; +} +.topWrapper .ant-btn.ant-input-search-button { + height: 30px; +} +.title_overflow { + max-width: 160px; + white-space: nowrap; + overflow: hidden; + white-space: nowrap; + -o-text-overflow: ellipsis; + text-overflow: ellipsis; +} +.topWrapper_select.wrapperStyle li{ + width:90px; +} +.topWrapper_select li { + text-align: center; + cursor: pointer; + color: #666; + width: 86px; + text-align: center; + display: inline-block; + overflow: hidden; + white-space: nowrap; + -o-text-overflow: ellipsis; + text-overflow: ellipsis; +} +.topWrapper_select li:active { + background: #f4f4f4; + border-radius: 4px; +} +.no-cursor li { + cursor: default !important; +} +.ant-dropdown-menu .ant-dropdown-menu-item { + text-align: center; + padding: 6px 30px; + cursor: pointer; +} +.setItemStyle{ + min-height:440px; +} +.setItemStyle .issueItem{ + padding:16px 0px; +} +.issueItem { + display: flex; + flex-wrap: wrap; + align-content: center; + border-bottom: 1px solid #eee; + padding: 16px 0px 16px 20px; +} +.issueIndex{ + display: inline-block; + height:19px; + line-height:19px; + background-color:rgba(213, 220, 246, 0.36); + border-radius:4px; + padding:0px 8px; + color: #666!important; +} +.issueItem:last-child{ + border-bottom: none; +} +.issueNo { + padding: 0px 5px; + border-radius: 4px; + background: #f4f4f4; + display: block; + margin-right: 8px; + color: #666; + height: 30px; + line-height: 30px; +} +.issueOpen { + background: #21ba45 !important; + color: #fff !important; +} + +.margin_detail { + margin-left: 15px; + margin-right: 15px; +} + +/* 新建 */ +.user_img { + height: 49px; + width: 49px; + border-radius: 100%; +} +.new_context { + flex: 1; + border: 1px solid #f4f4f4; + border-radius: 4px; + margin-left: 15px; + padding: 15px; + position: relative; + background: #ffffff; +} +.new_context:before { + position: absolute; + content: ""; + height: 0; + width: 0; + border: solid transparent; + border-right-color: #f4f4f4; + border-width: 9px; + top: 12px; + right: 100%; +} +.new_context::after { + position: absolute; + content: ""; + height: 0; + width: 0; + border: solid transparent; + border-right-color: #fff; + border-width: 7px; + top: 14px; + right: 100%; +} +.list-l-panel { + border: 1px solid #f4f4f4; + border-radius: 4px; + padding: 10px 15px; +} +.list-l-panel .ant-row { + margin-bottom: 0px; +} + +/*编辑任务*/ +.editingsheet { + background: #ffffff; + color: #21ba45 !important; + padding: 0px 12px; + text-align: center; + height: 32px; + line-height: 32px; +} +/*开启中 关闭中*/ +.opendetail { + display: inline-block; + background: #21ba45; + color: #ffffff !important; + padding: 0px 12px; + text-align: center; + height: 32px; + border-radius: 4px; + line-height: 32px; +} +.closedetail { + display: inline-block; + background: #e60b0b; + color: #ffffff !important; + padding: 0px 12px; + text-align: center; + height: 32px; + /*width: 110px;*/ + border-radius: 4px; + line-height: 32px; +} + +.commenttitle { + color: #21ba45 !important; +} + +.topWrapper_detali { + display: flex; + background-color: #eee; + align-items: center; + margin-bottom: 10px; +} +.towwrapper_img_detali { + display: flex; + padding-left: 80px; + margin-left: 80px; + margin-right: 20px; + border: 1px solid $primary-color; +} +.div_line { + width: 100%; + border: 10px solid $primary-color; +} +.list_img { + height: 145px; + padding: 15px; + width: 145px; +} + +.detail_context { + flex: 1; + border: 1px solid #f4f4f4; + margin-left: 15px; + padding: 10px; + position: relative; + background: #ffffff; + border-radius: 4px; + width: 0; +} +.detail_context:before { + position: absolute; + content: ""; + height: 0; + width: 0; + border: solid transparent; + border-right-color: #f4f4f4; + border-width: 9px; + top: 12px; + right: 100%; +} +.detail_context::after { + position: absolute; + content: ""; + height: 0; + width: 0; + border: solid transparent; + border-right-color: #fff; + border-width: 7px; + top: 14px; + right: 100%; +} +/* 任务标签列表 */ +.tagList > div { + border-bottom: 1px dashed #efefef; + display: flex; + justify-content: space-around; + padding: 15px 0px; +} +.divwidth { + width: 74%; +} +.listTowItems { + width: 80%; + padding-left: 80px; +} + +.tagList > div:last-child { + border-bottom: none; +} +.mr10 { + margin-right: 10px; +} +.text-right { + text-align: right; +} +.tagColor { + display: inline-block; + width: 28px; + height: 14px; + border-radius: 4px; + margin-right: 5px; + vertical-align: middle; +} + +/*里程碑*/ +.milepostdiv { + display: flex; +} +.milepostwidth { + display: flex; + width: 60%; +} +.mileposwidth { + background: #21ba45; + border-radius: 4px; + width: 40%; +} +.milepostrighe { + display: flex; + flex:1; +} +.milepostleft { + display: flex; + justify-content: center; +} +.textwidth { + display: flex; + width: 100%; +} +.newmilepostleft { + padding: 15px; + margin-right: 50px; + width: 60%; +} +.newmilepostrighe { + margin-left: 50px; + padding: 15px; + width: 30%; +} +/* 任务详情 */ +.detailContent { + padding: 15px 0px; + border-bottom: 1px solid #f4f4f4; +} +.DetailRight { + padding: 10px 15px; + border: 1px solid #f4f4f4; + border-radius: 4px; +} +.DetailRight > p { + height: 30px; + line-height: 30px; +} +.inptwidth { + width: 20%; +} +.inputcount { + width: 40%; +} +.loginDiv { + border: 1px solid #f7c977; + background: rgba(255, 204, 113, 0.3); + text-align: center; + padding: 8px 0px; + border-radius: 4px; + width: 100%; + color: #999; + margin-top: 15px; +} +.loginDiv a { + text-decoration: underline; + color: $primary-color; + margin-right: 3px; +} + +.tagdiv { + padding: 15px; + height: 75px; + box-sizing: border-box; + display: flex; + justify-content: space-between; + border: 1px solid #eeeeee; + flex-wrap: wrap; +} + +.dialogdiv { + padding: 5px; + height: 45px; + box-sizing: border-box; + display: flex; + justify-content: space-between; + flex-wrap: wrap; +} +.issue-tag-show { + padding: 3px 8px; + color: #fff; + border-radius: 6px; +} +.journal-list-item { + padding: 10px 0px; +} + +.span_title { + min-width: 40px; + margin-right: 15px; + text-align: right; + color: rgba(0, 0, 0, 0.65); +} +.target-detail-search .ant-input-group-addon { + border: none !important; +} +.target-detail-search .ant-input-search-button { + height: 32px !important; +} +a.issue-type-button.active { + background: $primary-color; + color: #fff; +} +a.issue-type-button.active:hover { + background: #f4f4f4; + color: $primary-color; +} +@media screen and (max-width: 700px) { + .topWrapper_select li { + width: auto; + } +} +.ml10 { + margin-left: 10px; +} +.lineH32 { + line-height: 32px; +} +.lineH40 { + line-height: 40px; +} +.item-list-right { + width: 74%; + border:1px solid #eee; +} +.detail_edit_action { + padding: 10px; + color: #999; + cursor: pointer; + line-height: 40px; +} +.paper-clip-color { + color: #29bd8b !important; +} +.attachment-list-a { + color: rgba(0, 0, 0, 0.65) !important; +} +.attachment-list-a>span{ + word-break: break-all; +} +.btp1 { + border-top: 1px solid #f4f4f4; +} + +.grid-item { + display: grid; + align-items: center; + grid-template-columns: max-content 1fr; +} +.grid-item-left { + display: grid; + align-items: center; + grid-template-columns: 1fr max-content; +} +.grid-item-top { + display: grid; + align-items: center; + grid-template-columns: max-content 1fr; + align-items: flex-start; +} +.fwb { + font-weight: bold; +} + +/* 发布人、指派人数量过多时要出现滚动条 */ +.ant-dropdown-menu.orderCondition { + max-height: 350px; + overflow-y: auto; +} +.ql-bubble .ql-editor img { + min-width: 100px !important; +} +.AmplifyImg .ant-modal { + padding: 0px; +} +.AmplifyImg img { + max-width: 100%; + margin: 0px auto; +} +.AmplifyImg .ant-modal-body { + padding: 25px; +} +.amplifyContent { + text-align: center; +} +.mb-0 { + margin-bottom: 0 !important; +} +.text-yellow { + color: #ff6e21; +} +.border-1f { + border-bottom: 1px solid #f4f4f4; +} +.background-f { + background: #fff; +} +.issue_detail_info { + width: 65px; + color: #888888; +} +.list-left-padding { + padding: 0 0 0 20px !important; +} +.comment-background { + background: #fff; + border-radius: 4px; + padding: 0px 30px; +} +.border-bottom-comment { + border-bottom: 1px solid #eee; +} + +.custom-comment-tabs .ant-tabs-top-bar{ + border-bottom: none; + padding-top:15px; +} +.custom-comment-tabs .search-count-button{ + line-height: 18px; + margin-left: 8px; + background-color: rgba(235,244,254,1); + color: $primary-color; + font-size: 12px; + padding: 2px 8px; + border-radius: 9px; +} +.comment-background .ant-list-item { + padding-left: 20px; + box-sizing: border-box; +} +.border-top-e { + border-top: 1px solid #e8e8e8; +} +.commentStyle { + background-color: #fff !important; +} +.reply-comment-input .add_reply_button { + background-color: #fff !important; + color: #bbb; + width: 100%; + text-align: left; + border: 1px solid rgba(238, 238, 238, 1); + box-shadow: none; +} +.children-comment-bg { + background:rgba(250,250,250,1); +} + +.display-in{ + display: flex; + align-items: flex-start; +} +.issue-form-right{ + border:1px solid #eee; +} +.issue-form-right .ant-form-item{ + margin-bottom: 8px !important; +} +.issue-form-right .ant-row label{font-size: 14px !important; font-weight: 500;} +.issue-edit-form-right{margin-bottom: 0 !important;} +.plr10{padding: 0 10px;} +.issue-form-index .editormd-toolbar{position: absolute !important;} +.list-right-item-padding{padding: 20px 35px 10px 35px;margin-bottom: 20px;} +.tagColor { + display: inline-block; + width: 28px; + height: 14px; + border-radius: 4px; + margin-right: 5px; + vertical-align: middle; +} +.boder-4{border-radius: 4px;} +.pbt20{padding: 20px 0;} +.inline-block{display: inline-block;} +.pd10{padding: 10px;} + +.searchIcon .ant-select-arrow{ + margin-top:-9px +} \ No newline at end of file