diff --git a/app.go b/app.go index d972b23..a4049d9 100644 --- a/app.go +++ b/app.go @@ -1123,8 +1123,8 @@ func (a *App) GetIndustryRank(sort string, cnt int) []any { res := data.NewMarketNewsApi().GetIndustryRank(sort, cnt) return res["data"].([]any) } -func (a *App) GetIndustryMoneyRankSina(fenlei string) []map[string]any { - res := data.NewMarketNewsApi().GetIndustryMoneyRankSina(fenlei) +func (a *App) GetIndustryMoneyRankSina(fenlei, sort string) []map[string]any { + res := data.NewMarketNewsApi().GetIndustryMoneyRankSina(fenlei, sort) return res } func (a *App) GetMoneyRankSina(sort string) []map[string]any { diff --git a/backend/data/market_news_api.go b/backend/data/market_news_api.go index f1c5ad8..f10600f 100644 --- a/backend/data/market_news_api.go +++ b/backend/data/market_news_api.go @@ -240,8 +240,8 @@ func (m MarketNewsApi) GetIndustryRank(sort string, cnt int) map[string]any { return res } -func (m MarketNewsApi) GetIndustryMoneyRankSina(fenlei string) []map[string]any { - url := fmt.Sprintf("https://vip.stock.finance.sina.com.cn/quotes_service/api/json_v2.php/MoneyFlow.ssl_bkzj_bk?page=1&num=20&sort=netamount&asc=0&fenlei=%s", fenlei) +func (m MarketNewsApi) GetIndustryMoneyRankSina(fenlei, sort string) []map[string]any { + url := fmt.Sprintf("https://vip.stock.finance.sina.com.cn/quotes_service/api/json_v2.php/MoneyFlow.ssl_bkzj_bk?page=1&num=20&sort=%s&asc=0&fenlei=%s", sort, fenlei) response, _ := resty.New().SetTimeout(time.Duration(5)*time.Second).R(). SetHeader("Host", "vip.stock.finance.sina.com.cn"). diff --git a/backend/data/market_news_api_test.go b/backend/data/market_news_api_test.go index 3c0bd39..6d28745 100644 --- a/backend/data/market_news_api_test.go +++ b/backend/data/market_news_api_test.go @@ -36,7 +36,7 @@ func TestGetIndustryRank(t *testing.T) { } } func TestGetIndustryMoneyRankSina(t *testing.T) { - res := NewMarketNewsApi().GetIndustryMoneyRankSina("2") + res := NewMarketNewsApi().GetIndustryMoneyRankSina("0", "netamount") for i, re := range res { logger.SugaredLogger.Debugf("key: %+v, value: %+v", i, re) diff --git a/frontend/src/components/industryMoneyRank.vue b/frontend/src/components/industryMoneyRank.vue new file mode 100644 index 0000000..813fbcb --- /dev/null +++ b/frontend/src/components/industryMoneyRank.vue @@ -0,0 +1,94 @@ + + + + + \ No newline at end of file diff --git a/frontend/src/components/market.vue b/frontend/src/components/market.vue index ee8e6f2..b1a7bd6 100644 --- a/frontend/src/components/market.vue +++ b/frontend/src/components/market.vue @@ -17,6 +17,7 @@ import {ExportPDF} from "@vavt/v3-extension"; import {MdEditor, MdPreview} from "md-editor-v3"; import { useRoute } from 'vue-router' import RankTable from "./rankTable.vue"; +import IndustryMoneyRank from "./industryMoneyRank.vue"; const route = useRoute() const icon = ref('https://raw.githubusercontent.com/ArvinLovegood/go-stock/master/build/appicon.png'); @@ -50,7 +51,8 @@ const sysPromptOptions=ref([]) const userPromptOptions=ref([]) const promptTemplates=ref([]) const industryRanks=ref([]) -const sort = ref("") +const industryMoneyRankSina=ref([]) +const sort = ref("0") const sortIcon= ref(h(CaretDown)) const nowTab=ref("市场快讯") const indexInterval= ref(null) @@ -142,12 +144,17 @@ function getAreaName(code){ return "其他" } } -function industryRank(){ +function changeIndustryRankSort() { if(sort.value==="0"){ sort.value="1" }else{ sort.value="0" } + industryRank() +} + +function industryRank(){ + GetIndustryRank(sort.value,150).then(result => { if(result.length>0){ console.log(result) @@ -388,30 +395,64 @@ function ReFlesh(source){ - - - - 行业名称 - 行业涨幅 - 行业5日涨幅 - 行业20日涨幅 - 领涨股 - 涨幅 - 最新价 - - - - - {{ item.bd_name }} - {{item.bd_zdf}}% - {{item.bd_zdf5}}% - {{item.bd_zdf20}}% - {{item.nzg_name}} {{item.nzg_code}} - {{item.nzg_zdf}}% - {{item.nzg_zxj}} - - - + + + + + + 行业名称 + 行业涨幅 + 行业5日涨幅 + 行业20日涨幅 + 领涨股 + 涨幅 + 最新价 + + + + + {{ item.bd_name }} + {{item.bd_zdf}}% + {{item.bd_zdf5}}% + {{item.bd_zdf20}}% + {{item.nzg_name}} {{item.nzg_code}} + {{item.nzg_zdf}}% + {{item.nzg_zxj}} + + + + + + + 行业名称 + 行业涨幅 + 行业5日涨幅 + 行业20日涨幅 + 领涨股 + 涨幅 + 最新价 + + + + + {{ item.bd_name }} + {{item.bd_zdf}}% + {{item.bd_zdf5}}% + {{item.bd_zdf20}}% + {{item.nzg_name}} {{item.nzg_code}} + {{item.nzg_zdf}}% + {{item.nzg_zxj}} + + + + + + + + + + + diff --git a/frontend/wailsjs/go/main/App.d.ts b/frontend/wailsjs/go/main/App.d.ts index d06bb3e..0168198 100644 --- a/frontend/wailsjs/go/main/App.d.ts +++ b/frontend/wailsjs/go/main/App.d.ts @@ -33,7 +33,7 @@ export function GetGroupList():Promise>; export function GetGroupStockList(arg1:number):Promise>; -export function GetIndustryMoneyRankSina(arg1:string):Promise>>; +export function GetIndustryMoneyRankSina(arg1:string,arg2:string):Promise>>; export function GetIndustryRank(arg1:string,arg2:number):Promise>; diff --git a/frontend/wailsjs/go/main/App.js b/frontend/wailsjs/go/main/App.js index e6045fc..d7d5acb 100644 --- a/frontend/wailsjs/go/main/App.js +++ b/frontend/wailsjs/go/main/App.js @@ -62,8 +62,8 @@ export function GetGroupStockList(arg1) { return window['go']['main']['App']['GetGroupStockList'](arg1); } -export function GetIndustryMoneyRankSina(arg1) { - return window['go']['main']['App']['GetIndustryMoneyRankSina'](arg1); +export function GetIndustryMoneyRankSina(arg1, arg2) { + return window['go']['main']['App']['GetIndustryMoneyRankSina'](arg1, arg2); } export function GetIndustryRank(arg1, arg2) {