From 451674dd4dd784fa0725b4ba052d94449d892712 Mon Sep 17 00:00:00 2001
From: jhzh <1628036192@qq.com>
Date: Sat, 28 Sep 2024 15:12:16 +0800
Subject: [PATCH] Merge branch '6-29印度股票' of http://124.156.157.155:8060/r/dg/dabao_admin into 6-29印度股票
---
src/views/product/shares.vue | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/src/views/product/shares.vue b/src/views/product/shares.vue
index bb1db4e..d6934b9 100644
--- a/src/views/product/shares.vue
+++ b/src/views/product/shares.vue
@@ -12,6 +12,15 @@
</a-select>
</a-form-item>
</a-col>
+
+ <a-col :md="12" :lg="6" :sm="24">
+ <a-form-item label="股票市场">
+ <a-select v-model="queryParam.stockGid" placeholder="请选择股票市场">
+ <a-select-option value="nse">nse</a-select-option>
+ <a-select-option value="bse">bse</a-select-option>
+ </a-select>
+ </a-form-item>
+ </a-col>
<a-col :md="12" :lg="6" :sm="24">
<a-form-item label="显示状态">
@@ -65,7 +74,7 @@
<template>
<div>
<span style="margin-right: 10px">{{ record.stockName }}</span>
- <a-tag color="green">{{ record.stockSpell }} </a-tag>
+ <a-tag color="green">{{ record.stockCode }} </a-tag>
</div>
<!-- stockSpell -->
@@ -264,12 +273,12 @@
align: 'center',
scopedSlots: { customRender: 'stockName' },
},
- // {
- // title: '沪深京股',
- // dataIndex: 'stockType',
- // align: 'center',
- // scopedSlots: { customRender: 'stockType' }
- // },
+ {
+ title: '股票市场',
+ dataIndex: 'stockGid',
+ align: 'center',
+ scopedSlots: { customRender: 'stockGid' }
+ },
{
title: '现价',
dataIndex: 'nowPrice',
@@ -342,6 +351,7 @@
stockType: undefined,
showState: undefined,
lockState: undefined,
+ stockGid: undefined
},
datalist: [],
labelCol: {
@@ -435,6 +445,7 @@
stockType: undefined,
showState: undefined,
lockState: undefined,
+ stockGid:undefined
}
},
getinit() {
--
Gitblit v1.9.3