From 7078ae36265ff04cd23eb6528bfa113e58b5a21d Mon Sep 17 00:00:00 2001
From: tianyongbao <tianyongbao@haier.com>
Date: Thu, 3 Apr 2025 14:57:13 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=99=BA=E8=81=AA=E8=AE=B0=E8=B4=A6?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E6=8A=95=E8=B5=84=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=9C=9F=E8=B4=A7=E8=A1=8C=E6=83=85?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/invest/futuresDailyHistory.js         |  9 ++++
 src/views/invest/futureBaseInfor/index.vue    | 52 ++++++++++++++++++-
 .../invest/futuresDailyHistory/index.vue      | 39 +++++++++-----
 src/views/invest/stocksDailyHistory/index.vue | 13 ++---
 4 files changed, 89 insertions(+), 24 deletions(-)

diff --git a/src/api/invest/futuresDailyHistory.js b/src/api/invest/futuresDailyHistory.js
index 021ab1b..5f7065d 100644
--- a/src/api/invest/futuresDailyHistory.js
+++ b/src/api/invest/futuresDailyHistory.js
@@ -42,3 +42,12 @@ export function delFuturesDailyHistory(id) {
     method: 'delete'
   })
 }
+
+// 同步期货日行情历史列表
+export function synFuturesDailyHistory(query) {
+  return request({
+    url: '/invest/futuresDailyHistory/synFuturesDailyHistory',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/views/invest/futureBaseInfor/index.vue b/src/views/invest/futureBaseInfor/index.vue
index cd8c8c1..449da31 100644
--- a/src/views/invest/futureBaseInfor/index.vue
+++ b/src/views/invest/futureBaseInfor/index.vue
@@ -108,12 +108,31 @@
         </div>
       </template>
     </el-dialog>
+    <!-- 查询记录对话框 -->
+    <el-dialog :title="titleSyn" v-model="openSyn" width="500px" append-to-body>
+      <el-form ref="CreditQueryRecordAnalysisRef" :model="formSyn" :rules="dailyRules" label-width="100px">
+        <el-form-item label="开始日期">
+          <el-date-picker clearable v-model="formSyn.start_date" type="date" value-format="YYYY-MM-DD" placeholder="请选择开始日期"> </el-date-picker>
+        </el-form-item>
+        <el-form-item label="结束日期">
+          <el-date-picker clearable v-model="formSyn.end_date" type="date" value-format="YYYY-MM-DD" placeholder="请选择结束日期"> </el-date-picker>
+        </el-form-item>
+      </el-form>
+
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" icon="Search" @click="handleSynFuture">同步</el-button>
+        </div>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
 <script setup name="FutureBaseInfor">
 import { listFutureBaseInfor, getFutureBaseInfor, delFutureBaseInfor, addFutureBaseInfor, updateFutureBaseInfor } from '@/api/invest/futureBaseInfor'
 import { listFutureStandardInfor, getFutureStandardInfor } from '@/api/invest/futureStandardInfor'
+import { synFuturesDailyHistory } from '@/api/invest/futuresDailyHistory'
+
 // eslint-disable-next-line no-unused-vars
 import { require } from '@/utils/require'
 const { proxy } = getCurrentInstance()
@@ -131,14 +150,20 @@ const multiple = ref(true)
 const total = ref(0)
 const standardInforId = ref(null)
 const title = ref('')
+
+const openSyn = ref(false)
+const titleSyn = ref('')
+
 const operateList = ref([
   { id: 'view', icon: 'View', title: '查看', hasPermi: ['invest:futureBaseInfor:query'] },
   { id: 'edit', icon: 'Edit', title: '修改', hasPermi: ['invest:futureBaseInfor:edit'] },
   { id: 'copy', icon: 'Link', title: '复制', hasPermi: ['health:futureBaseInfor:edit'] },
+  { id: 'syn', icon: 'Refresh', title: '同步历史行情', hasPermi: ['invest:stockBaseInfor:edit'] },
   { id: 'delete', icon: 'Delete', title: '删除', hasPermi: ['invest:futureBaseInfor:remove'] }
 ])
 const data = reactive({
   form: {},
+  formSyn: {},
   queryParams: {
     pageNum: 1,
     pageSize: 10,
@@ -179,12 +204,15 @@ const handleOperate = (operate, row) => {
     case 'copy':
       handleCopy(row)
       break
+    case 'syn':
+      handleSyn(row)
+      break
     default:
       break
   }
 }
 
-const { queryParams, queryStandardParams, form, rules } = toRefs(data)
+const { queryParams, queryStandardParams, form, formSyn, rules } = toRefs(data)
 
 const handleStandardChange = (standardId) => {
   standardInforId.value = standardId
@@ -319,6 +347,28 @@ function handleCopy(row) {
   })
 }
 
+/** 同步按钮操作 */
+function handleSyn(row) {
+  formSyn.value.ts_code = row.tsCode
+  formSyn.value.ts_id = row.id
+  openSyn.value = true
+  titleSyn.value = '同步-' + row.name + '-' + row.code + '-日行情历史数据'
+}
+/** 查询记录统计按钮操作 */
+function handleSynFuture() {
+  if (formSyn.value.start_date == undefined) {
+    proxy.$modal.msgError('开始日期必须填写')
+    return
+  }
+  if (formSyn.value.end_date == undefined) {
+    proxy.$modal.msgError('结束日期必须填写')
+    return
+  }
+  synFuturesDailyHistory(formSyn.value).then((response) => {
+    proxy.$modal.msgSuccess('同步成功')
+  })
+}
+
 /** 提交按钮 */
 function submitForm() {
   proxy.$refs.futureBaseInforRef.validate((valid) => {
diff --git a/src/views/invest/futuresDailyHistory/index.vue b/src/views/invest/futuresDailyHistory/index.vue
index f997d29..f450e9d 100644
--- a/src/views/invest/futuresDailyHistory/index.vue
+++ b/src/views/invest/futuresDailyHistory/index.vue
@@ -3,11 +3,11 @@
     <div class="search-con">
       <div class="title">查询条件</div>
       <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px">
-        <el-form-item label="TS合约代码" prop="tsCode">
-          <el-input v-model="queryParams.tsCode" placeholder="请输入TS合约代码" clearable @keyup.enter="handleQuery" />
+        <el-form-item label="期货合约" prop="tsCode">
+          <el-input v-model="queryParams.tsCode" placeholder="请输入合约代码或合约名称" clearable @keyup.enter="handleQuery" />
         </el-form-item>
-        <el-form-item label="交易日期" prop="tradeDate">
-          <el-input v-model="queryParams.tradeDate" placeholder="请输入交易日期" clearable @keyup.enter="handleQuery" />
+        <el-form-item label="交易日期" prop="time">
+          <el-date-picker v-model="queryParams.time" type="daterange" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" />
         </el-form-item>
       </el-form>
       <div class="search-btn-con">
@@ -21,26 +21,28 @@
         <div class="operate-btn-con">
           <el-button @click="handleAdd" icon="Plus" v-hasPermi="['invest:futuresDailyHistory:add']">新增</el-button>
           <el-button :disabled="multiple" icon="Delete" @click="handleDelete" v-hasPermi="['invest:futuresDailyHistory:remove']">删除</el-button>
-          <el-button @click="handleExport" icon="Download" v-hasPermi="['invest:futuresDailyHistory:export']">导出</el-button>
+          <!-- <el-button @click="handleExport" icon="Download" v-hasPermi="['invest:futuresDailyHistory:export']">导出</el-button> -->
         </div>
       </div>
       <div class="content-con" v-loading="loading">
-        <el-table v-loading="loading" :data="futuresDailyHistoryList" @selection-change="handleSelectionChange">
-          <!-- <el-table-column type="selection" width="55" align="center" /> -->
-          <el-table-column label="TS合约代码" align="center" prop="tsCode" />
+        <el-table v-loading="loading" :data="futuresDailyHistoryList" @selection-change="handleSelectionChange" height="calc(100% - 0.62rem)">
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column label="期货基本合约" align="center" width="185" prop="futureName" />
+          <!-- <el-table-column label="期货代码" align="center" prop="tsCode" /> -->
           <el-table-column label="交易日期" align="center" prop="tradeDate" />
-          <el-table-column label="昨收盘价" align="center" prop="preClose" />
-          <el-table-column label="昨结算价" align="center" prop="preSettle" />
           <el-table-column label="开盘价" align="center" prop="open" />
           <el-table-column label="最高价" align="center" prop="high" />
           <el-table-column label="最低价" align="center" prop="low" />
           <el-table-column label="收盘价" align="center" prop="close" />
+          <!-- <el-table-column label="昨收盘价" align="center" prop="preClose" /> -->
           <el-table-column label="结算价" align="center" prop="settle" />
+          <el-table-column label="昨结算价" align="center" prop="preSettle" />
           <el-table-column label="收盘价涨跌" align="center" prop="change1" />
           <!-- <el-table-column label="成交量(手)" align="center" prop="vol" />
                   <el-table-column label="成交金额(万元)" align="center" prop="amount" /> -->
-          <el-table-column label="结算价涨跌" align="center" prop="change2" />
-          <el-table-column label="持仓量(手)" align="center" prop="oi" />
+          <!-- <el-table-column label="结算价涨跌" align="center" prop="change2" /> -->
+          <el-table-column label="涨跌幅" align="center" prop="pctChgName" />
+          <!-- <el-table-column label="持仓量(手)" align="center" prop="oi" /> -->
           <el-table-column label="持仓量变化" align="center" prop="oiChg" />
           <!-- <el-table-column label="交割结算价" align="center" prop="delvSettle" /> -->
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -59,7 +61,7 @@
     <!-- 添加或修改期货日行情历史对话框 -->
     <el-dialog :title="title" v-model="open" width="880px" append-to-body>
       <el-form ref="futuresDailyHistoryRef" :model="form" :inline="true" :rules="rules" label-width="120px">
-        <el-form-item label="TS合约代码" prop="tsCode">
+        <el-form-item label="期货代码" prop="tsCode">
           <el-input v-model="form.tsCode" placeholder="请输入TS合约代码" />
         </el-form-item>
         <el-form-item label="交易日期" prop="tradeDate">
@@ -128,8 +130,8 @@ import {
 } from '@/api/invest/futuresDailyHistory'
 // eslint-disable-next-line no-unused-vars
 import { require } from '@/utils/require'
+import dayjs from 'dayjs'
 const { proxy } = getCurrentInstance()
-
 const futuresDailyHistoryList = ref([])
 const open = ref(false)
 const loading = ref(true)
@@ -190,6 +192,15 @@ const { queryParams, form, rules } = toRefs(data)
 /** 查询期货日行情历史列表 */
 function getList() {
   loading.value = true
+  const timeRange = queryParams.value.time
+  let st = ''
+  let et = ''
+  if (timeRange && timeRange.length === 2) {
+    st = dayjs(timeRange[0]).format('YYYY-MM-DD')
+    et = dayjs(timeRange[1]).format('YYYY-MM-DD')
+  }
+  queryParams.value.startTime = st
+  queryParams.value.endTime = et
   listFuturesDailyHistory(queryParams.value).then((response) => {
     futuresDailyHistoryList.value = response.rows
     total.value = response.total
diff --git a/src/views/invest/stocksDailyHistory/index.vue b/src/views/invest/stocksDailyHistory/index.vue
index 9560d65..d30cee8 100644
--- a/src/views/invest/stocksDailyHistory/index.vue
+++ b/src/views/invest/stocksDailyHistory/index.vue
@@ -20,12 +20,7 @@
         <div class="title">基本信息</div>
         <div class="operate-btn-con">
           <el-button @click="handleAdd" icon="Plus" v-hasPermi="['invest:stocksDailyHistory:add']">新增</el-button>
-          <!--  <el-button
-              :disabled="multiple"
-              icon="Delete"
-              @click="handleDelete"
-              v-hasPermi="['invest:stocksDailyHistory:remove']"
-          >删除</el-button> -->
+          <el-button :disabled="multiple" icon="Delete" @click="handleDelete" v-hasPermi="['invest:stocksDailyHistory:remove']">删除</el-button>
           <!-- <el-button
               @click="handleExport"
               icon="Download"
@@ -34,8 +29,8 @@
         </div>
       </div>
       <div class="content-con" v-loading="loading">
-        <el-table v-loading="loading" :data="stocksDailyHistoryList" @selection-change="handleSelectionChange">
-          <!-- <el-table-column type="selection" width="55" align="center" /> -->
+        <el-table v-loading="loading" :data="stocksDailyHistoryList" @selection-change="handleSelectionChange" height="calc(100% - 0.62rem)">
+          <el-table-column type="selection" width="55" align="center" />
           <el-table-column label="股票名称" align="center" prop="stockName" />
           <el-table-column label="股票代码" align="center" prop="tsCode" />
           <el-table-column label="交易日期" align="center" prop="tradeDate" />
@@ -64,7 +59,7 @@
     <!-- 添加或修改股票日行情历史对话框 -->
     <el-dialog :title="title" v-model="open" width="880px" append-to-body>
       <el-form ref="stocksDailyHistoryRef" :model="form" :inline="true" :rules="rules" label-width="120px">
-        <el-form-item label="TS合约代码" prop="tsCode">
+        <el-form-item label="股票代码" prop="tsCode">
           <el-input v-model="form.tsCode" placeholder="请输入TS合约代码" />
         </el-form-item>
         <el-form-item label="交易日期" prop="tradeDate">