修改issue详情页

This commit is contained in:
sylor_huang@126.com 2020-05-28 11:37:17 +08:00
parent 4b2cfb21fd
commit 417fc53c90
4 changed files with 726 additions and 466 deletions

View File

@ -198,8 +198,9 @@ class CopyDetail extends Component {
<Form>
<div className="f-wrap-between mt20" style={{ alignItems: "flex-start" }}>
<div className="list-right df">
<Link to={``}><img className="user_img"
src={getImageUrl(`images/${current_user && current_user.image_url}`)} alt="" /></Link>
<Link to={`/users/${current_user && current_user.login}/projects`} className="show-user-link">
<img className="user_img" src={getImageUrl(`images/${current_user && current_user.image_url}`)} alt="" />
</Link>
<div className="new_context">
<Form.Item>
{getFieldDecorator('subject', {

File diff suppressed because it is too large Load Diff

View File

@ -503,7 +503,7 @@
/*text-align: right;*/
/*}*/
.span_title{
min-width: 90px;
min-width: 40px;
margin-right: 15px;
text-align: right;
color: rgba(0, 0, 0, 0.65);
@ -532,6 +532,8 @@ a.issue-type-button.active:hover{background: #f4f4f4; color: #4CACFF;}
.attachment-list-a{color: rgba(0, 0, 0, 0.65) !important;}
.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 ;}
.fwb{font-weight: bold;}
/* 发布人、指派人数量过多时要出现滚动条 */
@ -555,4 +557,13 @@ a.issue-type-button.active:hover{background: #f4f4f4; color: #4CACFF;}
.amplifyContent{
text-align: center;
}
.mb-0{margin-bottom: 0 !important;}
.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;
margin-right: 15px;
text-align: right;
color:#888888;
}

View File

@ -1,8 +1,7 @@
import React, { Component } from "react";
import { Input, Dropdown, Menu, Icon, Pagination, Spin, Button, DatePicker } from "antd";
import { Input, Dropdown, Menu, Icon, Pagination, Spin } from "antd";
import "./order.css";
const { RangePicker } = DatePicker;
import NoneData from "../Nodata";
import OrderItem from "./OrderItem";
@ -60,8 +59,6 @@ class order extends Component {
order_name: undefined,
order_type: undefined,
search: undefined,
start_date:undefined,
due_date: undefined,
page: 1,
limit: 15,
},
@ -158,20 +155,13 @@ class order extends Component {
this.state.select_params.page = 1;
this.state[`${id}s`] = name;
if (current_user) {
if (
this.state.select_params.author_id &&
parseInt(this.state.select_params.author_id) === current_user.user_id
) {
if ( this.state.select_params.author_id && parseInt(this.state.select_params.author_id) === current_user.user_id) {
this.state.author_id = current_user.user_id;
} else {
this.state.author_id = undefined;
}
if (
this.state.select_params.assigned_to_id &&
parseInt(this.state.select_params.assigned_to_id) ===
current_user.user_id
) {
if (this.state.select_params.assigned_to_id && parseInt(this.state.select_params.assigned_to_id) === current_user.user_id ) {
this.state.assigned_to_id = current_user.user_id;
} else {
this.state.assigned_to_id = undefined;
@ -228,8 +218,6 @@ class order extends Component {
});
if (type) {
this.setState({
author_id: undefined,
assigned_to_id: undefined,
status_type: type,
issue_tag_ids: "标签",
tracker_ids: "所有分类",
@ -377,42 +365,8 @@ class order extends Component {
);
return (
<div className="main">
<div className="topWrapper" style={{ borderBottom: "none", padding: "0" }}>
<div>
<span className="mr40">
<span className="mr8 color-grey">所有:</span>
<Button size="small">{data && data.all_count}</Button>
</span>
<span className="mr40">
<span className="mr8 color-grey">开启中:</span>
<Button size="small">{data && data.open_count}</Button>
</span>
<span>
<span className="mr8 color-grey">已关闭:</span>
<Button size="small">{data && data.close_count}</Button>
</span>
</div>
<Button type="primary" onClick={() => this.islogin()}><Icon type="plus" size="16"></Icon></Button>
</div>
<div className="topWrapper" style={{ borderBottom: "none" }}>
<div className="target-detail-search">
<Search
placeholder="搜索"
enterButton="搜索"
onSearch={this.searchFunc}
style={{ width: 350 }}
/>
</div>
<DatePicker showTime onChange={onChange} onOk={onOk} />
<br />
<RangePicker
showTime={{ format: 'HH:mm' }}
format="YYYY-MM-DD HH:mm"
onChange={onChange}
onOk={onOk}
/>
{/* <p className="topWrapper_type">
<p className="topWrapper_type">
<li
className={status_type === "1" ? "active" : ""}
onClick={() => this.openorder("1")}
@ -425,9 +379,9 @@ class order extends Component {
>
{data && data.close_count}个已关闭
</li>
</p> */}
</p>
{/* <div className="topWrapper_select">
<div className="topWrapper_select">
<div className="target-detail-search">
<Search
placeholder="搜索"
@ -439,7 +393,7 @@ class order extends Component {
<a className="topWrapper_btn ml10" onClick={() => this.islogin()}>
创建任务
</a>
</div> */}
</div>
</div>
<Spin spinning={isSpin}>
<div className="f-wrap-between mb20">