From 27cf8f5964beebe8f8863e3590166c29d155572f Mon Sep 17 00:00:00 2001
From: laixingyu <xingyu.lai@suwell.cn>
Date: Tue, 19 Dec 2023 01:05:10 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E4=BA=A4=E6=98=93?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E7=9B=B8=E5=85=B3=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/OperationsController.java      |   9 +-
 .../com/ruoyi/booksystem/domain/Account.java  |  43 ++-
 .../ruoyi/booksystem/domain/Operations.java   |  75 ++--
 .../ruoyi/booksystem/domain/Statistics.java   |  51 ++-
 .../booksystem/domain/StatisticsRemain.java   |  51 ++-
 .../src/views/booksystem/account/index.vue    | 135 ++-----
 .../src/views/booksystem/operations/index.vue | 328 ++++++++----------
 .../booksystem/statisticremain/index.vue      |  99 ++----
 .../src/views/booksystem/statistics/index.vue |  81 +----
 .../views/booksystem/statistictotal/index.vue | 139 +-------
 10 files changed, 338 insertions(+), 673 deletions(-)

diff --git a/book-system/src/main/java/com/ruoyi/booksystem/controller/OperationsController.java b/book-system/src/main/java/com/ruoyi/booksystem/controller/OperationsController.java
index 6a6ef4c..479611b 100644
--- a/book-system/src/main/java/com/ruoyi/booksystem/controller/OperationsController.java
+++ b/book-system/src/main/java/com/ruoyi/booksystem/controller/OperationsController.java
@@ -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;
@@ -23,7 +26,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 
 /**
  * 当日操作Controller
- * 
+ *
  * @author ruoyi
  * @date 2023-12-18
  */
@@ -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));
     }
 
diff --git a/book-system/src/main/java/com/ruoyi/booksystem/domain/Account.java b/book-system/src/main/java/com/ruoyi/booksystem/domain/Account.java
index 4db857e..a952924 100644
--- a/book-system/src/main/java/com/ruoyi/booksystem/domain/Account.java
+++ b/book-system/src/main/java/com/ruoyi/booksystem/domain/Account.java
@@ -10,7 +10,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 交易账户对象 account
- * 
+ *
  * @author ruoyi
  * @date 2023-12-18
  */
@@ -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 = "净资产")
@@ -55,84 +54,84 @@ public class Account extends BaseEntity
     @Excel(name = "用户id")
     private Long userId;
 
-    public void setId(Long id) 
+    public void setId(Long id)
     {
         this.id = id;
     }
 
-    public Long getId() 
+    public Long getId()
     {
         return id;
     }
-    public void setTradeDay(Date tradeDay) 
+    public void setTradeDay(Date tradeDay)
     {
         this.tradeDay = tradeDay;
     }
 
-    public Date getTradeDay() 
+    public Date getTradeDay()
     {
         return tradeDay;
     }
-    public void setWeekDay(Date weekDay) 
+    public void setWeekDay(String weekDay)
     {
         this.weekDay = weekDay;
     }
 
-    public Date getWeekDay() 
+    public String getWeekDay()
     {
         return weekDay;
     }
-    public void setAssets(BigDecimal assets) 
+    public void setAssets(BigDecimal assets)
     {
         this.assets = assets;
     }
 
-    public BigDecimal getAssets() 
+    public BigDecimal getAssets()
     {
         return assets;
     }
-    public void setTotalAssets(BigDecimal totalAssets) 
+    public void setTotalAssets(BigDecimal totalAssets)
     {
         this.totalAssets = totalAssets;
     }
 
-    public BigDecimal getTotalAssets() 
+    public BigDecimal getTotalAssets()
     {
         return totalAssets;
     }
-    public void setProfit(BigDecimal profit) 
+    public void setProfit(BigDecimal profit)
     {
         this.profit = profit;
     }
 
-    public BigDecimal getProfit() 
+    public BigDecimal getProfit()
     {
         return profit;
     }
-    public void setAssetsDiff(BigDecimal assetsDiff) 
+    public void setAssetsDiff(BigDecimal assetsDiff)
     {
         this.assetsDiff = assetsDiff;
     }
 
-    public BigDecimal getAssetsDiff() 
+    public BigDecimal getAssetsDiff()
     {
         return assetsDiff;
     }
-    public void setTotalDiff(BigDecimal totalDiff) 
+    public void setTotalDiff(BigDecimal totalDiff)
     {
         this.totalDiff = totalDiff;
     }
 
-    public BigDecimal getTotalDiff() 
+    public BigDecimal getTotalDiff()
     {
         return totalDiff;
     }
-    public void setUserId(Long userId) 
+    public void setUserId(Long userId)
     {
         this.userId = userId;
     }
 
-    public Long getUserId() 
+    public Long getUserId()
     {
         return userId;
     }
diff --git a/book-system/src/main/java/com/ruoyi/booksystem/domain/Operations.java b/book-system/src/main/java/com/ruoyi/booksystem/domain/Operations.java
index 3043e84..c78297d 100644
--- a/book-system/src/main/java/com/ruoyi/booksystem/domain/Operations.java
+++ b/book-system/src/main/java/com/ruoyi/booksystem/domain/Operations.java
@@ -10,7 +10,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 当日操作对象 operations
- * 
+ *
  * @author ruoyi
  * @date 2023-12-18
  */
@@ -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 = "含=账户转入转出")
@@ -87,156 +86,156 @@ public class Operations extends BaseEntity
     @Excel(name = "备注")
     private String bz;
 
-    public void setId(Long id) 
+    public void setId(Long id)
     {
         this.id = id;
     }
 
-    public Long getId() 
+    public Long getId()
     {
         return id;
     }
-    public void setCode(String code) 
+    public void setCode(String code)
     {
         this.code = code;
     }
 
-    public String getCode() 
+    public String getCode()
     {
         return code;
     }
-    public void setName(String name) 
+    public void setName(String name)
     {
         this.name = name;
     }
 
-    public String getName() 
+    public String getName()
     {
         return name;
     }
-    public void setTradeDay(Date tradeDay) 
+    public void setTradeDay(Date tradeDay)
     {
         this.tradeDay = tradeDay;
     }
 
-    public Date getTradeDay() 
+    public Date getTradeDay()
     {
         return tradeDay;
     }
-    public void setWeekDay(Date weekDay) 
+    public void setWeekDay(String weekDay)
     {
         this.weekDay = weekDay;
     }
 
-    public Date getWeekDay() 
+    public String getWeekDay()
     {
         return weekDay;
     }
-    public void setOperate(String operate) 
+    public void setOperate(String operate)
     {
         this.operate = operate;
     }
 
-    public String getOperate() 
+    public String getOperate()
     {
         return operate;
     }
-    public void setDealPrice(BigDecimal dealPrice) 
+    public void setDealPrice(BigDecimal dealPrice)
     {
         this.dealPrice = dealPrice;
     }
 
-    public BigDecimal getDealPrice() 
+    public BigDecimal getDealPrice()
     {
         return dealPrice;
     }
-    public void setVolumn(Long volumn) 
+    public void setVolumn(Long volumn)
     {
         this.volumn = volumn;
     }
 
-    public Long getVolumn() 
+    public Long getVolumn()
     {
         return volumn;
     }
-    public void setAmount(BigDecimal amount) 
+    public void setAmount(BigDecimal amount)
     {
         this.amount = amount;
     }
 
-    public BigDecimal getAmount() 
+    public BigDecimal getAmount()
     {
         return amount;
     }
-    public void setTax(BigDecimal tax) 
+    public void setTax(BigDecimal tax)
     {
         this.tax = tax;
     }
 
-    public BigDecimal getTax() 
+    public BigDecimal getTax()
     {
         return tax;
     }
-    public void setFee(BigDecimal fee) 
+    public void setFee(BigDecimal fee)
     {
         this.fee = fee;
     }
 
-    public BigDecimal getFee() 
+    public BigDecimal getFee()
     {
         return fee;
     }
-    public void setOther(BigDecimal other) 
+    public void setOther(BigDecimal other)
     {
         this.other = other;
     }
 
-    public BigDecimal getOther() 
+    public BigDecimal getOther()
     {
         return other;
     }
-    public void setOperateDiff(BigDecimal operateDiff) 
+    public void setOperateDiff(BigDecimal operateDiff)
     {
         this.operateDiff = operateDiff;
     }
 
-    public BigDecimal getOperateDiff() 
+    public BigDecimal getOperateDiff()
     {
         return operateDiff;
     }
-    public void setPreId(Long preId) 
+    public void setPreId(Long preId)
     {
         this.preId = preId;
     }
 
-    public Long getPreId() 
+    public Long getPreId()
     {
         return preId;
     }
-    public void setUserId(Long userId) 
+    public void setUserId(Long userId)
     {
         this.userId = userId;
     }
 
-    public Long getUserId() 
+    public Long getUserId()
     {
         return userId;
     }
-    public void setDealLogic(String dealLogic) 
+    public void setDealLogic(String dealLogic)
     {
         this.dealLogic = dealLogic;
     }
 
-    public String getDealLogic() 
+    public String getDealLogic()
     {
         return dealLogic;
     }
-    public void setBz(String bz) 
+    public void setBz(String bz)
     {
         this.bz = bz;
     }
 
-    public String getBz() 
+    public String getBz()
     {
         return bz;
     }
diff --git a/book-system/src/main/java/com/ruoyi/booksystem/domain/Statistics.java b/book-system/src/main/java/com/ruoyi/booksystem/domain/Statistics.java
index 6ccf2e2..e11ebaa 100644
--- a/book-system/src/main/java/com/ruoyi/booksystem/domain/Statistics.java
+++ b/book-system/src/main/java/com/ruoyi/booksystem/domain/Statistics.java
@@ -10,7 +10,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 单笔操作统计对象 statistics
- * 
+ *
  * @author ruoyi
  * @date 2023-12-18
  */
@@ -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")
@@ -63,102 +62,102 @@ public class Statistics extends BaseEntity
     @Excel(name = "备注")
     private String bz;
 
-    public void setId(Long id) 
+    public void setId(Long id)
     {
         this.id = id;
     }
 
-    public Long getId() 
+    public Long getId()
     {
         return id;
     }
-    public void setCode(String code) 
+    public void setCode(String code)
     {
         this.code = code;
     }
 
-    public String getCode() 
+    public String getCode()
     {
         return code;
     }
-    public void setName(String name) 
+    public void setName(String name)
     {
         this.name = name;
     }
 
-    public String getName() 
+    public String getName()
     {
         return name;
     }
-    public void setTradeDay(Date tradeDay) 
+    public void setTradeDay(Date tradeDay)
     {
         this.tradeDay = tradeDay;
     }
 
-    public Date getTradeDay() 
+    public Date getTradeDay()
     {
         return tradeDay;
     }
-    public void setWeekDay(Date weekDay) 
+    public void setWeekDay(String weekDay)
     {
         this.weekDay = weekDay;
     }
 
-    public Date getWeekDay() 
+    public String getWeekDay()
     {
         return weekDay;
     }
-    public void setOperationsId(String operationsId) 
+    public void setOperationsId(String operationsId)
     {
         this.operationsId = operationsId;
     }
 
-    public String getOperationsId() 
+    public String getOperationsId()
     {
         return operationsId;
     }
-    public void setProfit(BigDecimal profit) 
+    public void setProfit(BigDecimal profit)
     {
         this.profit = profit;
     }
 
-    public BigDecimal getProfit() 
+    public BigDecimal getProfit()
     {
         return profit;
     }
-    public void setDiff(Long diff) 
+    public void setDiff(Long diff)
     {
         this.diff = diff;
     }
 
-    public Long getDiff() 
+    public Long getDiff()
     {
         return diff;
     }
-    public void setOperateionId(Long operateionId) 
+    public void setOperateionId(Long operateionId)
     {
         this.operateionId = operateionId;
     }
 
-    public Long getOperateionId() 
+    public Long getOperateionId()
     {
         return operateionId;
     }
-    public void setUserId(Long userId) 
+    public void setUserId(Long userId)
     {
         this.userId = userId;
     }
 
-    public Long getUserId() 
+    public Long getUserId()
     {
         return userId;
     }
-    public void setBz(String bz) 
+    public void setBz(String bz)
     {
         this.bz = bz;
     }
 
-    public String getBz() 
+    public String getBz()
     {
         return bz;
     }
diff --git a/book-system/src/main/java/com/ruoyi/booksystem/domain/StatisticsRemain.java b/book-system/src/main/java/com/ruoyi/booksystem/domain/StatisticsRemain.java
index cd50201..31c3672 100644
--- a/book-system/src/main/java/com/ruoyi/booksystem/domain/StatisticsRemain.java
+++ b/book-system/src/main/java/com/ruoyi/booksystem/domain/StatisticsRemain.java
@@ -10,7 +10,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 当日持仓统计对象 statistics_remain
- * 
+ *
  * @author ruoyi
  * @date 2023-12-18
  */
@@ -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 = "总盈亏")
@@ -63,102 +62,102 @@ public class StatisticsRemain extends BaseEntity
     @Excel(name = "备注")
     private String bz;
 
-    public void setId(Long id) 
+    public void setId(Long id)
     {
         this.id = id;
     }
 
-    public Long getId() 
+    public Long getId()
     {
         return id;
     }
-    public void setCode(String code) 
+    public void setCode(String code)
     {
         this.code = code;
     }
 
-    public String getCode() 
+    public String getCode()
     {
         return code;
     }
-    public void setName(String name) 
+    public void setName(String name)
     {
         this.name = name;
     }
 
-    public String getName() 
+    public String getName()
     {
         return name;
     }
-    public void setTradeDay(Date tradeDay) 
+    public void setTradeDay(Date tradeDay)
     {
         this.tradeDay = tradeDay;
     }
 
-    public Date getTradeDay() 
+    public Date getTradeDay()
     {
         return tradeDay;
     }
-    public void setWeekDay(Date weekDay) 
+    public void setWeekDay(String weekDay)
     {
         this.weekDay = weekDay;
     }
 
-    public Date getWeekDay() 
+    public String getWeekDay()
     {
         return weekDay;
     }
-    public void setTotalProfit(BigDecimal totalProfit) 
+    public void setTotalProfit(BigDecimal totalProfit)
     {
         this.totalProfit = totalProfit;
     }
 
-    public BigDecimal getTotalProfit() 
+    public BigDecimal getTotalProfit()
     {
         return totalProfit;
     }
-    public void setTotalDiff(BigDecimal totalDiff) 
+    public void setTotalDiff(BigDecimal totalDiff)
     {
         this.totalDiff = totalDiff;
     }
 
-    public BigDecimal getTotalDiff() 
+    public BigDecimal getTotalDiff()
     {
         return totalDiff;
     }
-    public void setTotalDiffOverall(BigDecimal totalDiffOverall) 
+    public void setTotalDiffOverall(BigDecimal totalDiffOverall)
     {
         this.totalDiffOverall = totalDiffOverall;
     }
 
-    public BigDecimal getTotalDiffOverall() 
+    public BigDecimal getTotalDiffOverall()
     {
         return totalDiffOverall;
     }
-    public void setRemaining(BigDecimal remaining) 
+    public void setRemaining(BigDecimal remaining)
     {
         this.remaining = remaining;
     }
 
-    public BigDecimal getRemaining() 
+    public BigDecimal getRemaining()
     {
         return remaining;
     }
-    public void setUserId(Long userId) 
+    public void setUserId(Long userId)
     {
         this.userId = userId;
     }
 
-    public Long getUserId() 
+    public Long getUserId()
     {
         return userId;
     }
-    public void setBz(String bz) 
+    public void setBz(String bz)
     {
         this.bz = bz;
     }
 
-    public String getBz() 
+    public String getBz()
     {
         return bz;
     }
diff --git a/ruoyi-ui/src/views/booksystem/account/index.vue b/ruoyi-ui/src/views/booksystem/account/index.vue
index a6eb9be..07eb210 100644
--- a/ruoyi-ui/src/views/booksystem/account/index.vue
+++ b/ruoyi-ui/src/views/booksystem/account/index.vue
@@ -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,43 +63,37 @@
 
     <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
       v-show="total>0"
       :total="total"
@@ -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>
diff --git a/ruoyi-ui/src/views/booksystem/operations/index.vue b/ruoyi-ui/src/views/booksystem/operations/index.vue
index cb96de0..232b9d4 100644
--- a/ruoyi-ui/src/views/booksystem/operations/index.vue
+++ b/ruoyi-ui/src/views/booksystem/operations/index.vue
@@ -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,29 +98,28 @@
       <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
       v-show="total>0"
       :total="total"
@@ -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(_ => {});
     }
   }
 };
diff --git a/ruoyi-ui/src/views/booksystem/statisticremain/index.vue b/ruoyi-ui/src/views/booksystem/statisticremain/index.vue
index ccee9f2..ba05cf5 100644
--- a/ruoyi-ui/src/views/booksystem/statisticremain/index.vue
+++ b/ruoyi-ui/src/views/booksystem/statisticremain/index.vue
@@ -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,37 +88,32 @@
           <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
       v-show="total>0"
       :total="total"
diff --git a/ruoyi-ui/src/views/booksystem/statistics/index.vue b/ruoyi-ui/src/views/booksystem/statistics/index.vue
index bcb4024..167b1c2 100644
--- a/ruoyi-ui/src/views/booksystem/statistics/index.vue
+++ b/ruoyi-ui/src/views/booksystem/statistics/index.vue
@@ -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,37 +88,14 @@
           <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
       v-show="total>0"
       :total="total"
diff --git a/ruoyi-ui/src/views/booksystem/statistictotal/index.vue b/ruoyi-ui/src/views/booksystem/statistictotal/index.vue
index 0151cc4..8eeb040 100644
--- a/ruoyi-ui/src/views/booksystem/statistictotal/index.vue
+++ b/ruoyi-ui/src/views/booksystem/statistictotal/index.vue
@@ -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,28 +111,27 @@
       <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
       v-show="total>0"
       :total="total"