Merge branch 'master' of http://47.101.159.18:3000/Muchinfo/MTP2.0_WEB

src/common/components/echart/echart-timeline/index.vue

@@ -14,6 +14,7 @@ import moment from 'moment';
 
 export default defineComponent({
     name: 'EchartTime',
+    emits: ['change'],
     components: {
         EchartBase,
     },
@@ -171,7 +172,7 @@ export default defineComponent({
                     isEmpty.value = false;
                     handleData(res);
                     // 调用父级函数查询tik数据 (不合理的逻辑处理，待优化)
-                    emit('change', res.endTime);
+                    emit('change', res.startTime, res.endTime);
                 } else {
                     isEmpty.value = true;
                 }

src/views/business/purchase/components/funds/setup.ts

@@ -5,15 +5,15 @@ import { reactive, ref, UnwrapRef } from "vue";
  */
 export function handleForm() {
     interface FormState {
-        payType: number 
+        payType: number
         Amount: number | null
-        Remark:String
+        Remark: string
     }
     const formRef = ref();
     const formState: UnwrapRef<FormState> = reactive({
         payType: 1,
         Amount: null,
-        Remark:''
+        Remark: ''
     })
     const rules = {
         Amount: [{ required: true, message: '请输入登记价格', trigger: 'blur', type: 'number' }],

src/views/business/purchase/components/setup.ts

@@ -47,7 +47,7 @@ export function settlementReq(spotcontractid: string, req: SettlementReq, loadin
 /**
  * 款项登记
  */
-export function fundsReq(spotcontractid: string, req: FundsReq, loading: Ref<boolean>, Remark: String): Promise<string> {
+export function fundsReq(spotcontractid: string, req: FundsReq, loading: Ref<boolean>, Remark: string): Promise<string> {
     return operationContractRsp(3,
         operationContractReqBuilder(req, spotcontractid, 3),
         loading)
@@ -56,7 +56,7 @@ export function fundsReq(spotcontractid: string, req: FundsReq, loading: Ref<boo
 /**
  * 发票登记
  */
-export function invoiceReq(spotcontractid: string, req: InvoiceReq, loading: Ref<boolean>, attachUrl?: String): Promise<string> {
+export function invoiceReq(spotcontractid: string, req: InvoiceReq, loading: Ref<boolean>, attachUrl?: string): Promise<string> {
     return operationContractRsp(4,
         operationContractReqBuilder(req, spotcontractid, 4, "", attachUrl),
         loading)
@@ -69,7 +69,7 @@ export function invoiceReq(spotcontractid: string, req: InvoiceReq, loading: Ref
  * @param id 操作的合同id
  * @param type 操作类型
  */
-export function operationContractReqBuilder(req: Object, id: string, type: number, Remark?: String, attachUrl?: String): ErmcpContractOperateApplyReq {
+export function operationContractReqBuilder(req: Object, id: string, type: number, Remark?: string, attachUrl?: string): ErmcpContractOperateApplyReq {
     return {
         OperateType: 1, // uint32 操作类型-1:登记2:确认3：拒绝4：撤销
         Remark: '',

src/views/business/sell/components/funds/index.vue

@@ -1,174 +1,138 @@
 <template>
-  <!-- 款项登记-->
-  <a-modal class="commonModal paddingDialog funds"
-           title="款项登记"
-           v-model:visible="visible"
-           centered
-           @cancel="cancel"
-           width="890px">
-    <template #footer>
-      <a-button key="submit"
-                class="cancelBtn"
-                @click="cancel">取消
-      </a-button>
-      <a-button key="submit"
-                type="primary"
-                :loading="loading"
-                @click="submit">款项登记
-      </a-button>
-    </template>
-    <fieldset class="formFieldSet">
-      <legend>合同基本信息</legend>
-      <a-form class="inlineForm">
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="合同编号">
-              <span class="white">{{ formatValue(selectedRow.contractno) }}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="定价类型">
-              <span class="white">{{ getPriceTypeName(selectedRow.pricetype) }}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="采购方">
-              <span class="white">{{ formatValue(selectedRow.accountname) }}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="现货品种">
-              <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="暂定价货款总额">
-              <span
-                    class="white">{{ selectedRow.pricetype === 3 ? formatValue(selectedRow.loanamount) : 0 }}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </a-form>
-    </fieldset>
+    <!-- 款项登记-->
+    <a-modal class="commonModal paddingDialog funds" title="款项登记" v-model:visible="visible" centered @cancel="cancel" width="890px">
+        <template #footer>
+            <a-button key="submit" class="cancelBtn" @click="cancel">取消 </a-button>
+            <a-button key="submit" type="primary" :loading="loading" @click="submit">款项登记 </a-button>
+        </template>
+        <fieldset class="formFieldSet">
+            <legend>合同基本信息</legend>
+            <a-form class="inlineForm">
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item label="合同编号">
+                            <span class="white">{{ formatValue(selectedRow.contractno) }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="定价类型">
+                            <span class="white">{{ getPriceTypeName(selectedRow.pricetype) }}</span>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item label="采购方">
+                            <span class="white">{{ formatValue(selectedRow.accountname) }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="现货品种">
+                            <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</span>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item label="暂定价货款总额">
+                            <span class="white">{{ selectedRow.pricetype === 3 ? formatValue(selectedRow.loanamount) : 0 }}</span>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+            </a-form>
+        </fieldset>
 
-    <fieldset class="formFieldSet">
-      <legend>已登记信息</legend>
-      <a-form class="inlineForm">
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="已定价额">
-              <span class="white">{{ selectedRow.pricedamount + " 元"}}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="调整金额">
-              <span class="white">{{ selectedRow.reckonadjustamount + " 元"}}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
+        <fieldset class="formFieldSet">
+            <legend>已登记信息</legend>
+            <a-form class="inlineForm">
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item label="已定价额">
+                            <span class="white">{{ selectedRow.pricedamount + ' 元' }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="调整金额">
+                            <span class="white">{{ selectedRow.reckonadjustamount + ' 元' }}</span>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
 
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="货款总额">
-              <span
-                    class="white">{{ selectedRow.pricedamount + selectedRow.reckonadjustamount }}{{handleCurrencyname(selectedRow.currencyname) + " 元"}}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="保证金">
-              <span
-                    class="white">{{ selectedRow.margin }}{{handleCurrencyname(selectedRow.currencyname) + " 元"}}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item label="货款总额">
+                            <span class="white">{{ selectedRow.pricedamount + selectedRow.reckonadjustamount }}{{ handleCurrencyname(selectedRow.currencyname) + ' 元' }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="保证金">
+                            <span class="white">{{ selectedRow.margin }}{{ handleCurrencyname(selectedRow.currencyname) + ' 元' }}</span>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
 
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="其他费用">
-              <span
-                    class="white">{{ selectedRow.reckonotheramount }}{{handleCurrencyname(selectedRow.currencyname)  + " 元"}}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="合计总额">
-              <span
-                    class="white">{{ formatValue(selectedRow.totalamount) }}{{handleCurrencyname(selectedRow.currencyname)  + " 元"}}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item label="其他费用">
+                            <span class="white">{{ selectedRow.reckonotheramount }}{{ handleCurrencyname(selectedRow.currencyname) + ' 元' }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="合计总额">
+                            <span class="white">{{ formatValue(selectedRow.totalamount) }}{{ handleCurrencyname(selectedRow.currencyname) + ' 元' }}</span>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
 
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="已收付额">
-              <span
-                    class="white">{{ selectedRow.payamount }}{{handleCurrencyname(selectedRow.currencyname)  + " 元"}}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="预收款额">
-              <span
-                    class="white">{{ selectedRow.prepayamount }}{{handleCurrencyname(selectedRow.currencyname)  + " 元"}}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </a-form>
-    </fieldset>
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item label="已收付额">
+                            <span class="white">{{ selectedRow.payamount }}{{ handleCurrencyname(selectedRow.currencyname) + ' 元' }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="预收款额">
+                            <span class="white">{{ selectedRow.prepayamount }}{{ handleCurrencyname(selectedRow.currencyname) + ' 元' }}</span>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+            </a-form>
+        </fieldset>
 
-    <fieldset class="formFieldSet">
-      <legend>本次款项信息</legend>
-      <a-form class="inlineForm"
-              ref="formRef"
-              :model="formState"
-              :rules="rules">
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="应收款额"
-                         name="unpayamount">
-              <span class="white">{{selectedRow.unpayamount}}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="款项类型">
-              <a-radio-group class="commonRadioGroup"
-                             v-model:value="formState.payType">
-                <a-radio :value="1">收款通知</a-radio>
-                <a-radio :value="2">退款申请</a-radio>
-              </a-radio-group>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="登记金额"
-                         name="Amount">
-              <a-input-number class="dialogInput"
-                              style="width: 200px"
-                              suffix="元"
-                              :min="0"
-                              type="number"
-                              placeholder="请输入登记金额"
-                              v-model:value="formState.Amount" />
-              {{handleCurrencyname(selectedRow.currencyname)}}
-            </a-form-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-item label="备注"
-                         name="PricedQty"
-                         class="relative">
-              <a-input class="dialogInput"
-                       style="width: 608px"
-                       placeholder="请输入备注信息"
-                       v-model:value="formState.Remark" />
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </a-form>
-    </fieldset>
-  </a-modal>
+        <fieldset class="formFieldSet">
+            <legend>本次款项信息</legend>
+            <a-form class="inlineForm" ref="formRef" :model="formState" :rules="rules">
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item label="应收款额" name="unpayamount">
+                            <span class="white">{{ selectedRow.unpayamount }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="款项类型">
+                            <a-radio-group class="commonRadioGroup" v-model:value="formState.payType">
+                                <a-radio :value="1">收款通知</a-radio>
+                                <a-radio :value="2">退款申请</a-radio>
+                            </a-radio-group>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item label="登记金额" name="Amount">
+                            <a-input-number class="dialogInput" style="width: 200px" suffix="元" :min="0" type="number" placeholder="请输入登记金额" v-model:value="formState.Amount" />
+                            {{ handleCurrencyname(selectedRow.currencyname) }}
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="24">
+                        <a-form-item label="备注" name="PricedQty" class="relative">
+                            <a-input class="dialogInput" style="width: 608px" placeholder="请输入备注信息" v-model:value="formState.Remark" />
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+            </a-form>
+        </fieldset>
+    </a-modal>
 </template>
 
 <script lang="ts">

src/views/business/sell/components/funds/setup.ts

@@ -5,15 +5,15 @@ import { reactive, ref, UnwrapRef } from "vue";
  */
 export function handleForm() {
     interface FormState {
-        payType: number 
+        payType: number
         Amount: number | null
-        Remark:String
+        Remark: string
     }
     const formRef = ref();
     const formState: UnwrapRef<FormState> = reactive({
         payType: 1,
         Amount: null,
-        Remark:''
+        Remark: ''
     })
     const rules = {
         Amount: [{ required: true, message: '请输入登记价格', trigger: 'blur', type: 'number' }],

src/views/market/spot_trade/components/goods-chart/chart/index.vue

@@ -1,169 +1,133 @@
 <template>
-  <!-- 交易图表  -->
-  <div class="chart-container">
-    <div class="chart-content">
-      <div class="chart-content__header">
-        <a-menu class="chart-content__tabs"
-                v-model:selectedKeys="activeCycleName"
-                mode="horizontal"
-                @click="changeCycleType">
-          <a-menu-item v-for="item in chartType"
-                       :key="item.name">{{ item.label }}</a-menu-item>
-        </a-menu>
-        <a-menu class="chart-content__tabs"
-                v-model:selectedKeys="activeSeriesType"
-                mode="horizontal"
-                v-show="activeCycleType !== CycleType.time">
-          <a-menu-item key="MACD">MACD</a-menu-item>
-          <a-menu-item key="VOL">VOL</a-menu-item>
-          <a-menu-item key="KDJ">KDJ</a-menu-item>
-          <a-menu-item key="CCI">CCI</a-menu-item>
-        </a-menu>
-      </div>
-      <echart-time class="chart-content__main"
-                   :quote-data="selectedRow"
-                   @change="getHistoryTikDatas"
-                   v-if="activeCycleType === CycleType.time"></echart-time>
-      <echart-kline class="chart-content__main"
-                    :quote-data="selectedRow"
-                    :cycle-type="activeCycleType"
-                    :series-type="activeSeriesType[0]"
-                    v-else></echart-kline>
-      <div class="chart-content__footer"></div>
-    </div>
-    <div class="chart-slider">
-      <div class="chart-slider__button"></div>
-    </div>
-    <div class="chart-tips">
-      <div>
-        <div class="chart-tips__nav">
-          <div class="content content--left">{{ selectedRow.goodscode }}</div>
-          <div class="content content--right">{{ selectedRow.goodsname }}</div>
-        </div>
-        <div class="chart-tips__last">
-          <div
-               :class="['content content--left', handleQuotePriceColor(selectedRow.last, selectedRow.presettle)]">
-            {{ handleNoneValue(selectedRow.last) }}</div>
-          <div class="content content--right">
-            <span
-                  :class="handleQuotePriceColor(selectedRow.last, selectedRow.presettle)">{{ quoteChange(selectedRow) }}</span>
-            <span
-                  :class="handleQuotePriceColor(selectedRow.last, selectedRow.presettle)">{{ quoteAmplitude(selectedRow) }}</span>
-          </div>
-        </div>
-        <div class="chart-tips__volume">
-          <a-row>
-            <a-col :span="8">卖一</a-col>
-            <a-col :class="handleQuotePriceColor(selectedRow.ask, selectedRow.presettle)"
-                   :span="8">{{ handleNoneValue(selectedRow.ask) }}</a-col>
-            <a-col :class="handleQuotePriceColor(selectedRow.askvolume, selectedRow.presettle)"
-                   :span="8">{{ handleNoneValue(selectedRow.askvolume) }}</a-col>
-          </a-row>
-          <a-row>
-            <a-col :span="8">买一</a-col>
-            <a-col :class="handleQuotePriceColor(selectedRow.bid, selectedRow.presettle)"
-                   :span="8">{{ handleNoneValue(selectedRow.bid) }}</a-col>
-            <a-col :class="handleQuotePriceColor(selectedRow.bidvolume, selectedRow.presettle)"
-                   :span="8">{{ handleNoneValue(selectedRow.bidvolume) }}</a-col>
-          </a-row>
+    <!-- 交易图表  -->
+    <div class="chart-container">
+        <div class="chart-content">
+            <div class="chart-content__header">
+                <a-menu class="chart-content__tabs" v-model:selectedKeys="activeCycleName" mode="horizontal" @click="changeCycleType">
+                    <a-menu-item v-for="item in chartType" :key="item.name">{{ item.label }}</a-menu-item>
+                </a-menu>
+                <a-menu class="chart-content__tabs" v-model:selectedKeys="activeSeriesType" mode="horizontal" v-show="activeCycleType !== CycleType.time">
+                    <a-menu-item key="MACD">MACD</a-menu-item>
+                    <a-menu-item key="VOL">VOL</a-menu-item>
+                    <a-menu-item key="KDJ">KDJ</a-menu-item>
+                    <a-menu-item key="CCI">CCI</a-menu-item>
+                </a-menu>
+            </div>
+            <echart-time class="chart-content__main" :quote-data="selectedRow" @change="getHistoryTikDatas" v-if="activeCycleType === CycleType.time"></echart-time>
+            <echart-kline class="chart-content__main" :quote-data="selectedRow" :cycle-type="activeCycleType" :series-type="activeSeriesType[0]" v-else></echart-kline>
+            <div class="chart-content__footer"></div>
         </div>
-      </div>
-      <div class="chart-tips__tik">
-        <div class="row-header">
-          <h4>分时成交</h4>
-          <a-row>
-            <a-col :span="8">时间</a-col>
-            <a-col :span="8">价格</a-col>
-            <a-col :span="8">现量</a-col>
-          </a-row>
+        <div class="chart-slider">
+            <div class="chart-slider__button"></div>
         </div>
-        <div class="row-content">
-          <a-row v-for="(item, index) in tradedList"
-                 :key="index + '11'">
-            <a-col :span="8">{{ formatTime(item.TS, 'hm') }}</a-col>
-            <a-col :class="handleQuotePriceColor(item.PE, selectedRow.presettle)"
-                   :span="8">{{ item.PE }}</a-col>
-            <a-col :class="handleQuotePriceColor(item.Vol, selectedRow.presettle)"
-                   :span="8">{{ item.Vol }}</a-col>
-          </a-row>
+        <div class="chart-tips">
+            <div>
+                <div class="chart-tips__nav">
+                    <div class="content content--left">{{ selectedRow.goodscode }}</div>
+                    <div class="content content--right">{{ selectedRow.goodsname }}</div>
+                </div>
+                <div class="chart-tips__last">
+                    <div :class="['content content--left', handleQuotePriceColor(selectedRow.last, selectedRow.presettle)]"> {{ handleNoneValue(selectedRow.last) }}</div>
+                    <div class="content content--right">
+                        <span :class="handleQuotePriceColor(selectedRow.last, selectedRow.presettle)">{{ quoteChange(selectedRow) }}</span>
+                        <span :class="handleQuotePriceColor(selectedRow.last, selectedRow.presettle)">{{ quoteAmplitude(selectedRow) }}</span>
+                    </div>
+                </div>
+                <div class="chart-tips__volume">
+                    <a-row>
+                        <a-col :span="8">卖一</a-col>
+                        <a-col :class="handleQuotePriceColor(selectedRow.ask, selectedRow.presettle)" :span="8">{{ handleNoneValue(selectedRow.ask) }}</a-col>
+                        <a-col :class="handleQuotePriceColor(selectedRow.askvolume, selectedRow.presettle)" :span="8">{{ handleNoneValue(selectedRow.askvolume) }}</a-col>
+                    </a-row>
+                    <a-row>
+                        <a-col :span="8">买一</a-col>
+                        <a-col :class="handleQuotePriceColor(selectedRow.bid, selectedRow.presettle)" :span="8">{{ handleNoneValue(selectedRow.bid) }}</a-col>
+                        <a-col :class="handleQuotePriceColor(selectedRow.bidvolume, selectedRow.presettle)" :span="8">{{ handleNoneValue(selectedRow.bidvolume) }}</a-col>
+                    </a-row>
+                </div>
+            </div>
+            <div class="chart-tips__tik">
+                <div class="row-header">
+                    <h4>分时成交</h4>
+                    <a-row>
+                        <a-col :span="8">时间</a-col>
+                        <a-col :span="8">价格</a-col>
+                        <a-col :span="8">现量</a-col>
+                    </a-row>
+                </div>
+                <div class="row-content">
+                    <a-row v-for="(item, index) in tradedList" :key="index + '11'">
+                        <a-col :span="8">{{ formatTime(item.TS, 'hm') }}</a-col>
+                        <a-col :class="handleQuotePriceColor(item.PE, selectedRow.presettle)" :span="8">{{ item.PE }}</a-col>
+                        <a-col :class="handleQuotePriceColor(item.Vol, selectedRow.presettle)" :span="8">{{ item.Vol }}</a-col>
+                    </a-row>
+                </div>
+            </div>
+            <div class="chart-tips__info">
+                <a-row>
+                    <a-col :span="4">最新</a-col>
+                    <a-col :class="handleQuotePriceColor(selectedRow.last, selectedRow.presettle)" :span="8">{{ handleNoneValue(selectedRow.last) }}</a-col>
+                    <a-col :span="4">均价</a-col>
+                    <a-col :class="handleQuotePriceColor(selectedRow.averageprice, selectedRow.presettle)" :span="8">{{ handleNoneValue(selectedRow.averageprice) }}</a-col>
+                </a-row>
+                <a-row>
+                    <a-col :span="4">涨跌</a-col>
+                    <a-col :class="handleQuotePriceColor(selectedRow.last, selectedRow.presettle)" :span="8">{{ quoteChange(selectedRow) }}</a-col>
+                    <a-col :span="4">今开</a-col>
+                    <a-col :class="handleQuotePriceColor(selectedRow.opened, selectedRow.presettle)" :span="8">{{ handleNoneValue(selectedRow.opened) }}</a-col>
+                </a-row>
+                <a-row>
+                    <a-col :span="4">涨幅</a-col>
+                    <a-col :class="handleQuotePriceColor(selectedRow.last, selectedRow.presettle)" :span="8">{{ quoteAmplitude(selectedRow) }}</a-col>
+                    <a-col :span="4">最高</a-col>
+                    <a-col :class="handleQuotePriceColor(selectedRow.highest, selectedRow.presettle)" :span="8">{{ handleNoneValue(selectedRow.highest) }}</a-col>
+                </a-row>
+                <a-row>
+                    <a-col :span="4">总量</a-col>
+                    <a-col :span="8">{{ handleNoneValue(selectedRow.totalvolume) }}</a-col>
+                    <a-col :span="4">最低</a-col>
+                    <a-col :class="handleQuotePriceColor(selectedRow.lowest, selectedRow.presettle)" :span="8">{{ handleNoneValue(selectedRow.lowest) }}</a-col>
+                </a-row>
+                <a-row>
+                    <a-col :span="4">金额</a-col>
+                    <a-col :span="8" style="color: #0d96ff">{{ changeUnit(selectedRow.totalturnover) }}</a-col>
+                    <a-col :span="4">量比</a-col>
+                    <a-col :span="8">{{ '--' }}</a-col>
+                </a-row>
+                <a-row>
+                    <a-col :span="4">涨停</a-col>
+                    <a-col class="red1" :span="8">{{ handleNoneValue(selectedRow.limitup) }}</a-col>
+                    <a-col :span="4">跌停</a-col>
+                    <a-col class="green" :span="8">{{ handleNoneValue(selectedRow.limitdown) }}</a-col>
+                </a-row>
+                <a-row>
+                    <a-col :span="4">外盘</a-col>
+                    <a-col :span="8">{{ handleNoneValue(selectedRow.totalbidvolume) }}</a-col>
+                    <a-col :span="4">内盘</a-col>
+                    <a-col :span="8">{{ handleNoneValue(selectedRow.totalaskvolume) }}</a-col>
+                </a-row>
+                <a-row>
+                    <a-col :span="4">持仓</a-col>
+                    <a-col :span="8">{{ handleNoneValue(selectedRow.holdvolume) }}</a-col>
+                    <a-col :span="4">结算</a-col>
+                    <a-col :span="8">{{ handleNoneValue(selectedRow.settle) }}</a-col>
+                </a-row>
+                <a-row>
+                    <a-col :span="4">仓差</a-col>
+                    <a-col :span="8">{{ '--' }}</a-col>
+                    <a-col :span="4">昨结</a-col>
+                    <a-col :span="8">{{ handleNoneValue(selectedRow.presettle) }}</a-col>
+                </a-row>
+                <a-row>
+                    <a-col :span="4">日增</a-col>
+                    <a-col :span="8">{{ '--' }}</a-col>
+                    <a-col :span="4">开平</a-col>
+                    <a-col :span="8">{{ '--' }}</a-col>
+                </a-row>
+            </div>
+            <div @click="watchMore" class="watchMore">查看更多</div>
         </div>
-      </div>
-      <div class="chart-tips__info">
-        <a-row>
-          <a-col :span="4">最新</a-col>
-          <a-col :class="handleQuotePriceColor(selectedRow.last, selectedRow.presettle)"
-                 :span="8">{{ handleNoneValue(selectedRow.last) }}</a-col>
-          <a-col :span="4">均价</a-col>
-          <a-col :class="handleQuotePriceColor(selectedRow.averageprice, selectedRow.presettle)"
-                 :span="8">{{ handleNoneValue(selectedRow.averageprice) }}</a-col>
-        </a-row>
-        <a-row>
-          <a-col :span="4">涨跌</a-col>
-          <a-col :class="handleQuotePriceColor(selectedRow.last, selectedRow.presettle)"
-                 :span="8">{{ quoteChange(selectedRow) }}</a-col>
-          <a-col :span="4">今开</a-col>
-          <a-col :class="handleQuotePriceColor(selectedRow.opened, selectedRow.presettle)"
-                 :span="8">{{ handleNoneValue(selectedRow.opened) }}</a-col>
-        </a-row>
-        <a-row>
-          <a-col :span="4">涨幅</a-col>
-          <a-col :class="handleQuotePriceColor(selectedRow.last, selectedRow.presettle)"
-                 :span="8">{{ quoteAmplitude(selectedRow) }}</a-col>
-          <a-col :span="4">最高</a-col>
-          <a-col :class="handleQuotePriceColor(selectedRow.highest, selectedRow.presettle)"
-                 :span="8">{{ handleNoneValue(selectedRow.highest) }}</a-col>
-        </a-row>
-        <a-row>
-          <a-col :span="4">总量</a-col>
-          <a-col :span="8">{{ handleNoneValue(selectedRow.totalvolume) }}</a-col>
-          <a-col :span="4">最低</a-col>
-          <a-col :class="handleQuotePriceColor(selectedRow.lowest, selectedRow.presettle)"
-                 :span="8">{{ handleNoneValue(selectedRow.lowest) }}</a-col>
-        </a-row>
-        <a-row>
-          <a-col :span="4">金额</a-col>
-          <a-col :span="8"
-                 style="color: #0d96ff">{{ changeUnit(selectedRow.totalturnover) }}</a-col>
-          <a-col :span="4">量比</a-col>
-          <a-col :span="8">{{ '--' }}</a-col>
-        </a-row>
-        <a-row>
-          <a-col :span="4">涨停</a-col>
-          <a-col class="red1"
-                 :span="8">{{ handleNoneValue(selectedRow.limitup) }}</a-col>
-          <a-col :span="4">跌停</a-col>
-          <a-col class="green"
-                 :span="8">{{ handleNoneValue(selectedRow.limitdown) }}</a-col>
-        </a-row>
-        <a-row>
-          <a-col :span="4">外盘</a-col>
-          <a-col :span="8">{{ handleNoneValue(selectedRow.totalbidvolume) }}</a-col>
-          <a-col :span="4">内盘</a-col>
-          <a-col :span="8">{{ handleNoneValue(selectedRow.totalaskvolume) }}</a-col>
-        </a-row>
-        <a-row>
-          <a-col :span="4">持仓</a-col>
-          <a-col :span="8">{{ handleNoneValue(selectedRow.holdvolume) }}</a-col>
-          <a-col :span="4">结算</a-col>
-          <a-col :span="8">{{ handleNoneValue(selectedRow.settle) }}</a-col>
-        </a-row>
-        <a-row>
-          <a-col :span="4">仓差</a-col>
-          <a-col :span="8">{{ '--' }}</a-col>
-          <a-col :span="4">昨结</a-col>
-          <a-col :span="8">{{ handleNoneValue(selectedRow.presettle) }}</a-col>
-        </a-row>
-        <a-row>
-          <a-col :span="4">日增</a-col>
-          <a-col :span="8">{{ '--' }}</a-col>
-          <a-col :span="4">开平</a-col>
-          <a-col :span="8">{{ '--' }}</a-col>
-        </a-row>
-      </div>
-      <div @click="watchMore"
-           class="watchMore">查看更多</div>
     </div>
-  </div>
 </template>
 
 <script lang="ts">
@@ -221,11 +185,12 @@ export default defineComponent({
         };
 
         // Tik列表
-        const getHistoryTikDatas = (endTime: string) => {
+        const getHistoryTikDatas = (startTime: string, endTime: string) => {
             if (!tradedList.value.length) {
                 const param = {
                     goodsCode: props.selectedRow.goodscode,
                     count: 20,
+                    startTime: moment(startTime).format('YYYY-MM-DD HH:mm:ss'),
                     endTime: moment(endTime).format('YYYY-MM-DD HH:mm:ss'),
                 };
                 QueryHistoryTikDatas(param).then((res) => {