Lxy
/
RuoYi-Vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 修改交易记录相关界面

Browse Source
dev
laixingyu 2 years ago
parent 97d8f7ecee
commit 27cf8f5964
10 changed files with 338 additions and 673 deletions
Show Stats Download Patch File Download Diff File

7
book-system/src/main/java/com/ruoyi/booksystem/controller/OperationsController.java
Unescape View File

@ -2,6 +2,9 @@ package com.ruoyi.booksystem.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.utils.SecurityUtils;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@ -77,6 +80,10 @@ public class OperationsController extends BaseController
@PostMapping
public AjaxResult add(@RequestBody Operations operations)
{
LoginUser loginUser = SecurityUtils.getLoginUser();
System.out.println("[AccountBookController] userName: " + loginUser.getUsername() + " userId: " + loginUser.getUserId());
operations.setUserId(loginUser.getUserId());
//插入一条后，要更新持仓表
return toAjax(operationsService.insertOperations(operations));
}

9
book-system/src/main/java/com/ruoyi/booksystem/domain/Account.java
Unescape View File

@ -27,9 +27,8 @@ public class Account extends BaseEntity
private Date tradeDay;
/** 交易日星期 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "交易日星期", width = 30, dateFormat = "yyyy-MM-dd")
private Date weekDay;
@Excel(name = "交易日星期")
private String weekDay;
/** 净资产 */
@Excel(name = "净资产")
@ -73,12 +72,12 @@ public class Account extends BaseEntity
{
return tradeDay;
}
public void setWeekDay(Date weekDay)
public void setWeekDay(String weekDay)
{
this.weekDay = weekDay;
}
public Date getWeekDay()
public String getWeekDay()
{
return weekDay;
}

9
book-system/src/main/java/com/ruoyi/booksystem/domain/Operations.java
Unescape View File

@ -35,9 +35,8 @@ public class Operations extends BaseEntity
private Date tradeDay;
/** 交易日星期 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "交易日星期", width = 30, dateFormat = "yyyy-MM-dd")
private Date weekDay;
@Excel(name = "交易日星期")
private String weekDay;
/** 操作（含账户转入转出） */
@Excel(name = "操作", readConverterExp = "含=账户转入转出")
@ -123,12 +122,12 @@ public class Operations extends BaseEntity
{
return tradeDay;
}
public void setWeekDay(Date weekDay)
public void setWeekDay(String weekDay)
{
this.weekDay = weekDay;
}
public Date getWeekDay()
public String getWeekDay()
{
return weekDay;
}

9
book-system/src/main/java/com/ruoyi/booksystem/domain/Statistics.java
Unescape View File

@ -35,9 +35,8 @@ public class Statistics extends BaseEntity
private Date tradeDay;
/** 交易日星期 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "交易日星期", width = 30, dateFormat = "yyyy-MM-dd")
private Date weekDay;
@Excel(name = "交易日星期")
private String weekDay;
/** 操作id */
@Excel(name = "操作id")
@ -99,12 +98,12 @@ public class Statistics extends BaseEntity
{
return tradeDay;
}
public void setWeekDay(Date weekDay)
public void setWeekDay(String weekDay)
{
this.weekDay = weekDay;
}
public Date getWeekDay()
public String getWeekDay()
{
return weekDay;
}

9
book-system/src/main/java/com/ruoyi/booksystem/domain/StatisticsRemain.java
Unescape View File

@ -35,9 +35,8 @@ public class StatisticsRemain extends BaseEntity
private Date tradeDay;
/** 交易日星期 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "交易日星期", width = 30, dateFormat = "yyyy-MM-dd")
private Date weekDay;
@Excel(name = "交易日星期")
private String weekDay;
/** 总盈亏 */
@Excel(name = "总盈亏")
@ -99,12 +98,12 @@ public class StatisticsRemain extends BaseEntity
{
return tradeDay;
}
public void setWeekDay(Date weekDay)
public void setWeekDay(String weekDay)
{
this.weekDay = weekDay;
}
public Date getWeekDay()
public String getWeekDay()
{
return weekDay;
}

133
ruoyi-ui/src/views/booksystem/account/index.vue
Unescape View File

@ -9,68 +9,6 @@
placeholder="选择交易日期">
</el-date-picker>
</el-form-item>
<el-form-item label="交易日星期" prop="weekDay">
<el-date-picker clearable size="small"
v-model="queryParams.weekDay"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择交易日星期">
</el-date-picker>
</el-form-item>
<el-form-item label="净资产" prop="assets">
<el-input
v-model="queryParams.assets"
placeholder="请输入净资产"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="总资产" prop="totalAssets">
<el-input
v-model="queryParams.totalAssets"
placeholder="请输入总资产"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="当日盈亏" prop="profit">
<el-input
v-model="queryParams.profit"
placeholder="请输入当日盈亏"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="当日净资产盈亏比例" prop="assetsDiff">
<el-input
v-model="queryParams.assetsDiff"
placeholder="请输入当日净资产盈亏比例"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="当日总资产盈亏比例" prop="totalDiff">
<el-input
v-model="queryParams.totalDiff"
placeholder="请输入当日总资产盈亏比例"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="用户id" prop="userId">
<el-input
v-model="queryParams.userId"
placeholder="请输入用户id"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@ -125,41 +63,35 @@
<el-table v-loading="loading" :data="accountList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="${comment}" align="center" prop="id" />
<el-table-column label="交易日期" align="center" prop="tradeDay" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.tradeDay, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="交易日星期" align="center" prop="weekDay" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.weekDay, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="星期" align="center" prop="weekDay" width="180" />
<el-table-column label="净资产" align="center" prop="assets" />
<el-table-column label="总资产" align="center" prop="totalAssets" />
<el-table-column label="当日盈亏" align="center" prop="profit" />
<el-table-column label="当日净资产盈亏比例" align="center" prop="assetsDiff" />
<el-table-column label="当日总资产盈亏比例" align="center" prop="totalDiff" />
<el-table-column label="用户id" align="center" prop="userId" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['booksystem:account:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['booksystem:account:remove']"
>删除</el-button>
</template>
</el-table-column>
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-edit"-->
<!-- @click="handleUpdate(scope.row)"-->
<!-- v-hasPermi="['booksystem:account:edit']"-->
<!-- >修改</el-button>-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-delete"-->
<!-- @click="handleDelete(scope.row)"-->
<!-- v-hasPermi="['booksystem:account:remove']"-->
<!-- >删除</el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
<pagination
@ -175,20 +107,13 @@
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="交易日期" prop="tradeDay">
<el-date-picker clearable size="small"
@change="handleChange"
v-model="form.tradeDay"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择交易日期">
</el-date-picker>
</el-form-item>
<el-form-item label="交易日星期" prop="weekDay">
<el-date-picker clearable size="small"
v-model="form.weekDay"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择交易日星期">
</el-date-picker>
</el-form-item>
<el-form-item label="净资产" prop="assets">
<el-input v-model="form.assets" placeholder="请输入净资产" />
</el-form-item>
@ -258,7 +183,11 @@ export default {
form: {},
// 表单校验
rules: {
}
},
//计算星期
weekOptions :['周日','周一', '周二', '周三', '周四', '周五', '周六'],
checkedWeek: [],
};
},
created() {
@ -361,7 +290,17 @@ export default {
this.download('booksystem/account/export', {
...this.queryParams
}, `account_${new Date().getTime()}.xlsx`)
}
},
handleChange(value)
{
let currentDate = new Date(this.queryParams.tradeDay);
const getWeek = currentDate.getDay();
const weekArr=['周日','周一', '周二', '周三', '周四', '周五', '周六']
if(!value) return
let week = weekArr[getWeek]
this.form.weekDay = week;
console.log(' to handleDateChange week is: ',week)
},
}
};
</script>

326
ruoyi-ui/src/views/booksystem/operations/index.vue
Unescape View File

@ -27,104 +27,6 @@
placeholder="选择交易日期">
</el-date-picker>
</el-form-item>
<el-form-item label="交易日星期" prop="weekDay">
<el-date-picker clearable size="small"
v-model="queryParams.weekDay"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择交易日星期">
</el-date-picker>
</el-form-item>
<el-form-item label="操作" prop="operate">
<el-input
v-model="queryParams.operate"
placeholder="请输入操作"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="交易价格" prop="dealPrice">
<el-input
v-model="queryParams.dealPrice"
placeholder="请输入交易价格"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="成交量" prop="volumn">
<el-input
v-model="queryParams.volumn"
placeholder="请输入成交量"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="成交额" prop="amount">
<el-input
v-model="queryParams.amount"
placeholder="请输入成交额"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="印花税" prop="tax">
<el-input
v-model="queryParams.tax"
placeholder="请输入印花税"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="手续费" prop="fee">
<el-input
v-model="queryParams.fee"
placeholder="请输入手续费"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="其他费用" prop="other">
<el-input
v-model="queryParams.other"
placeholder="请输入其他费用"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="操作时涨跌" prop="operateDiff">
<el-input
v-model="queryParams.operateDiff"
placeholder="请输入操作时涨跌"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="关联操作id" prop="preId">
<el-input
v-model="queryParams.preId"
placeholder="请输入关联操作id"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="用户id" prop="userId">
<el-input
v-model="queryParams.userId"
placeholder="请输入用户id"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@ -179,7 +81,6 @@
<el-table v-loading="loading" :data="operationsList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="${comment}" align="center" prop="id" />
<el-table-column label="股票代码" align="center" prop="code" />
<el-table-column label="股票名称" align="center" prop="name" />
<el-table-column label="交易日期" align="center" prop="tradeDay" width="180">
@ -187,11 +88,7 @@
<span>{{ parseTime(scope.row.tradeDay, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="交易日星期" align="center" prop="weekDay" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.weekDay, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="星期" align="center" prop="weekDay" width="180"/>
<el-table-column label="操作" align="center" prop="operate" />
<el-table-column label="交易价格" align="center" prop="dealPrice" />
<el-table-column label="成交量" align="center" prop="volumn" />
@ -201,27 +98,26 @@
<el-table-column label="其他费用" align="center" prop="other" />
<el-table-column label="操作时涨跌" align="center" prop="operateDiff" />
<el-table-column label="关联操作id" align="center" prop="preId" />
<el-table-column label="用户id" align="center" prop="userId" />
<el-table-column label="操作逻辑" align="center" prop="dealLogic" />
<el-table-column label="备注" align="center" prop="bz" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['booksystem:operations:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['booksystem:operations:remove']"
>删除</el-button>
</template>
</el-table-column>
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-edit"-->
<!-- @click="handleUpdate(scope.row)"-->
<!-- v-hasPermi="['booksystem:operations:edit']"-->
<!-- >修改</el-button>-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-delete"-->
<!-- @click="handleDelete(scope.row)"-->
<!-- v-hasPermi="['booksystem:operations:remove']"-->
<!-- >删除</el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
<pagination
@ -233,66 +129,103 @@
/>
<!-- 添加或修改当日操作对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="70%" append-to-body :before-close="handleClose">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="股票代码" prop="code">
<el-input v-model="form.code" placeholder="请输入股票代码" />
</el-form-item>
<el-form-item label="股票名称" prop="name">
<el-input v-model="form.name" placeholder="请输入股票名称" />
</el-form-item>
<el-form-item label="交易日期" prop="tradeDay">
<el-date-picker clearable size="small"
v-model="form.tradeDay"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择交易日期">
</el-date-picker>
</el-form-item>
<el-form-item label="交易日星期" prop="weekDay">
<el-date-picker clearable size="small"
v-model="form.weekDay"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择交易日星期">
</el-date-picker>
</el-form-item>
<el-form-item label="操作" prop="operate">
<el-input v-model="form.operate" placeholder="请输入操作" />
</el-form-item>
<el-form-item label="交易价格" prop="dealPrice">
<el-input v-model="form.dealPrice" placeholder="请输入交易价格" />
</el-form-item>
<el-form-item label="成交量" prop="volumn">
<el-input v-model="form.volumn" placeholder="请输入成交量" />
</el-form-item>
<el-form-item label="成交额" prop="amount">
<el-input v-model="form.amount" placeholder="请输入成交额" />
</el-form-item>
<el-form-item label="印花税" prop="tax">
<el-input v-model="form.tax" placeholder="请输入印花税" />
</el-form-item>
<el-form-item label="手续费" prop="fee">
<el-input v-model="form.fee" placeholder="请输入手续费" />
</el-form-item>
<el-form-item label="其他费用" prop="other">
<el-input v-model="form.other" placeholder="请输入其他费用" />
</el-form-item>
<el-form-item label="操作时涨跌" prop="operateDiff">
<el-input v-model="form.operateDiff" placeholder="请输入操作时涨跌" />
</el-form-item>
<el-form-item label="关联操作id" prop="preId">
<el-input v-model="form.preId" placeholder="请输入关联操作id" />
</el-form-item>
<el-form-item label="用户id" prop="userId">
<el-input v-model="form.userId" placeholder="请输入用户id" />
</el-form-item>
<el-form-item label="操作逻辑" prop="dealLogic">
<el-input v-model="form.dealLogic" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-form-item label="备注" prop="bz">
<el-input v-model="form.bz" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-row>
<el-col span="8">
<el-form-item label="股票代码" prop="code">
<el-input v-model="form.code" placeholder="请输入股票代码" />
</el-form-item>
</el-col>
<el-col span="8">
<el-form-item label="股票名称" prop="name">
<el-input v-model="form.name" placeholder="请输入股票名称" />
</el-form-item>
</el-col>
<el-col span="8">
<el-form-item label="交易日期" prop="tradeDay">
<el-date-picker clearable size="small"
@change="handleChange"
v-model="form.tradeDay"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择交易日期">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col span="8">
<el-form-item label="操作" prop="operate">
<el-select v-model="form.operate" placeholder="请输入操作">
<el-option
v-for="item in operate_options"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col span="8">
<el-form-item label="交易价格" prop="dealPrice">
<el-input v-model="form.dealPrice" placeholder="请输入交易价格" />
</el-form-item>
</el-col>
<el-col span="8">
<el-form-item label="成交量" prop="volumn">
<el-input v-model="form.volumn" placeholder="请输入成交量" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col span="8">
<el-form-item label="成交额" prop="amount">
<el-input v-model="form.amount" placeholder="请输入成交额" />
</el-form-item>
</el-col>
<el-col span="8">
<el-form-item label="印花税" prop="tax">
<el-input v-model="form.tax" placeholder="请输入印花税" />
</el-form-item>
</el-col>
<el-col span="8">
<el-form-item label="手续费" prop="fee">
<el-input v-model="form.fee" placeholder="请输入手续费" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col span="8">
<el-form-item label="其他费用" prop="other">
<el-input v-model="form.other" placeholder="请输入其他费用" />
</el-form-item>
</el-col>
<el-col span="8">
<el-form-item label="操作时涨跌" prop="operateDiff">
<el-input v-model="form.operateDiff" placeholder="请输入操作时涨跌" />
</el-form-item>
</el-col>
<el-col span="8">
<el-form-item label="关联操作id" prop="preId">
<el-input v-model="form.preId" placeholder="请输入关联操作id" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col span="24">
<el-form-item label="操作逻辑" prop="dealLogic">
<el-input v-model="form.dealLogic" type="textarea" placeholder="请输入内容" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col span="24">
<el-form-item label="备注" prop="bz">
<el-input v-model="form.bz" type="textarea" placeholder="请输入内容" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
@ -358,7 +291,15 @@ export default {
operate: [
{ required: true, message: "操作不能为空", trigger: "blur" }
],
}
},
//操作的下拉选择
operate_options: [{
value: '买入',
label: '买入'
}, {
value: '卖出',
label: '卖出'
}],
};
},
created() {
@ -469,6 +410,25 @@ export default {
this.download('booksystem/operations/export', {
...this.queryParams
}, `operations_${new Date().getTime()}.xlsx`)
},
//计算星期
handleChange(value)
{
let currentDate = new Date(this.queryParams.tradeDay);
const getWeek = currentDate.getDay();
const weekArr=['周日','周一', '周二', '周三', '周四', '周五', '周六']
if(!value) return
let week = weekArr[getWeek]
this.form.weekDay = week;
console.log(' to handleDateChange week is: ',week)
},
//处理新增数据对话框关闭
handleClose(done) {
this.$confirm('确认退出添加操作吗？')
.then(_ => {
done();
})
.catch(_ => {});
}
}
};

97
ruoyi-ui/src/views/booksystem/statisticremain/index.vue
Unescape View File

@ -27,59 +27,6 @@
placeholder="选择交易日期">
</el-date-picker>
</el-form-item>
<el-form-item label="交易日星期" prop="weekDay">
<el-date-picker clearable size="small"
v-model="queryParams.weekDay"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择交易日星期">
</el-date-picker>
</el-form-item>
<el-form-item label="总盈亏" prop="totalProfit">
<el-input
v-model="queryParams.totalProfit"
placeholder="请输入总盈亏"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="总盈亏比例" prop="totalDiff">
<el-input
v-model="queryParams.totalDiff"
placeholder="请输入总盈亏比例"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="总盈亏占整体盈亏比例" prop="totalDiffOverall">
<el-input
v-model="queryParams.totalDiffOverall"
placeholder="请输入总盈亏占整体盈亏比例"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="剩余数量" prop="remaining">
<el-input
v-model="queryParams.remaining"
placeholder="请输入剩余数量"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="用户id" prop="userId">
<el-input
v-model="queryParams.userId"
placeholder="请输入用户id"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@ -134,7 +81,6 @@
<el-table v-loading="loading" :data="statisticremainList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="${comment}" align="center" prop="id" />
<el-table-column label="股票代码" align="center" prop="code" />
<el-table-column label="股票名称" align="center" prop="name" />
<el-table-column label="交易日期" align="center" prop="tradeDay" width="180">
@ -142,35 +88,30 @@
<span>{{ parseTime(scope.row.tradeDay, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="交易日星期" align="center" prop="weekDay" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.weekDay, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="星期" align="center" prop="weekDay" />
<el-table-column label="总盈亏" align="center" prop="totalProfit" />
<el-table-column label="总盈亏比例" align="center" prop="totalDiff" />
<el-table-column label="总盈亏占整体盈亏比例" align="center" prop="totalDiffOverall" />
<el-table-column label="剩余数量" align="center" prop="remaining" />
<el-table-column label="用户id" align="center" prop="userId" />
<el-table-column label="备注" align="center" prop="bz" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['booksystem:statisticremain:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['booksystem:statisticremain:remove']"
>删除</el-button>
</template>
</el-table-column>
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-edit"-->
<!-- @click="handleUpdate(scope.row)"-->
<!-- v-hasPermi="['booksystem:statisticremain:edit']"-->
<!-- >修改</el-button>-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-delete"-->
<!-- @click="handleDelete(scope.row)"-->
<!-- v-hasPermi="['booksystem:statisticremain:remove']"-->
<!-- >删除</el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
<pagination

79
ruoyi-ui/src/views/booksystem/statistics/index.vue
Unescape View File

@ -27,59 +27,6 @@
placeholder="选择交易日期">
</el-date-picker>
</el-form-item>
<el-form-item label="交易日星期" prop="weekDay">
<el-date-picker clearable size="small"
v-model="queryParams.weekDay"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择交易日星期">
</el-date-picker>
</el-form-item>
<el-form-item label="操作id" prop="operationsId">
<el-input
v-model="queryParams.operationsId"
placeholder="请输入操作id"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="当笔当日盈亏" prop="profit">
<el-input
v-model="queryParams.profit"
placeholder="请输入当笔当日盈亏"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="当笔当日盈亏盈亏比例" prop="diff">
<el-input
v-model="queryParams.diff"
placeholder="请输入当笔当日盈亏盈亏比例"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="操作id" prop="operateionId">
<el-input
v-model="queryParams.operateionId"
placeholder="请输入操作id"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="用户id" prop="userId">
<el-input
v-model="queryParams.userId"
placeholder="请输入用户id"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@ -134,7 +81,6 @@
<el-table v-loading="loading" :data="statisticsList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="${comment}" align="center" prop="id" />
<el-table-column label="股票代码" align="center" prop="code" />
<el-table-column label="股票名称" align="center" prop="name" />
<el-table-column label="交易日期" align="center" prop="tradeDay" width="180">
@ -142,35 +88,12 @@
<span>{{ parseTime(scope.row.tradeDay, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="交易日星期" align="center" prop="weekDay" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.weekDay, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="星期" align="center" prop="weekDay" />
<el-table-column label="操作id" align="center" prop="operationsId" />
<el-table-column label="当笔当日盈亏" align="center" prop="profit" />
<el-table-column label="当笔当日盈亏盈亏比例" align="center" prop="diff" />
<el-table-column label="操作id" align="center" prop="operateionId" />
<el-table-column label="用户id" align="center" prop="userId" />
<el-table-column label="备注" align="center" prop="bz" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['booksystem:statistics:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['booksystem:statistics:remove']"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination

137
ruoyi-ui/src/views/booksystem/statistictotal/index.vue
Unescape View File

@ -35,105 +35,6 @@
placeholder="选择清仓交易日星期">
</el-date-picker>
</el-form-item>
<el-form-item label="总盈亏" prop="totalProfit">
<el-input
v-model="queryParams.totalProfit"
placeholder="请输入总盈亏"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="总盈亏比例" prop="totalDiff">
<el-input
v-model="queryParams.totalDiff"
placeholder="请输入总盈亏比例"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="建仓交易价格" prop="startPrice">
<el-input
v-model="queryParams.startPrice"
placeholder="请输入建仓交易价格"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="建仓交易价格" prop="endPrice">
<el-input
v-model="queryParams.endPrice"
placeholder="请输入建仓交易价格"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="总成交量" prop="volumnTotal">
<el-input
v-model="queryParams.volumnTotal"
placeholder="请输入总成交量"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="总成交额" prop="amountTotal">
<el-input
v-model="queryParams.amountTotal"
placeholder="请输入总成交额"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="交易次数" prop="operateTimes">
<el-input
v-model="queryParams.operateTimes"
placeholder="请输入交易次数"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="总手续费" prop="fee">
<el-input
v-model="queryParams.fee"
placeholder="请输入总手续费"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="总印花税" prop="tax">
<el-input
v-model="queryParams.tax"
placeholder="请输入总印花税"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="总其他费用" prop="other">
<el-input
v-model="queryParams.other"
placeholder="请输入总其他费用"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="用户id" prop="userId">
<el-input
v-model="queryParams.userId"
placeholder="请输入用户id"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@ -188,7 +89,6 @@
<el-table v-loading="loading" :data="statistictotalList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="${comment}" align="center" prop="id" />
<el-table-column label="股票代码" align="center" prop="code" />
<el-table-column label="股票名称" align="center" prop="name" />
<el-table-column label="建仓交易日期" align="center" prop="startTradeDay" width="180">
@ -211,26 +111,25 @@
<el-table-column label="总手续费" align="center" prop="fee" />
<el-table-column label="总印花税" align="center" prop="tax" />
<el-table-column label="总其他费用" align="center" prop="other" />
<el-table-column label="用户id" align="center" prop="userId" />
<el-table-column label="备注" align="center" prop="bz" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['booksystem:statistictotal:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['booksystem:statistictotal:remove']"
>删除</el-button>
</template>
</el-table-column>
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-edit"-->
<!-- @click="handleUpdate(scope.row)"-->
<!-- v-hasPermi="['booksystem:statistictotal:edit']"-->
<!-- >修改</el-button>-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-delete"-->
<!-- @click="handleDelete(scope.row)"-->
<!-- v-hasPermi="['booksystem:statistictotal:remove']"-->
<!-- >删除</el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
<pagination

Write Preview
Loading…
Cancel
Save