li.shaoyi 4 jaren geleden
bovenliggende
commit
d01166173d

+ 1 - 1
public/config/app.config.json

@@ -1,3 +1,3 @@
 {
     "apiUrl": "http://192.168.31.203:8080/cfg?key=test_203"
-}
+}

+ 3 - 5
src/common/setup/table/tableQuote.ts

@@ -2,7 +2,7 @@ import { QueryQuoteDayRsp } from '@/services/go/quote/interface';
 import { addSubscribeQuotation, removeSubscribeQuotation } from '@/services/socket/quota';
 import TimerUtils from '@/utils/timer/timerUtil';
 import { v4 } from 'uuid';
-import { onBeforeUnmount, onMounted, Ref, ref, watchEffect } from "vue";
+import { onBeforeUnmount, onMounted, Ref, ref, watchEffect, nextTick } from "vue";
 
 /**
  * 订阅商品行情
@@ -13,12 +13,10 @@ import { onBeforeUnmount, onMounted, Ref, ref, watchEffect } from "vue";
 export function subcriteGoodsQuote(goodsCodes: string[], itemTableHeight = 31, selector = '.ant-table-body') {
     const beforeScrollTop = ref<number>(0)
     const uuid = v4();
-    onMounted(() => {
+
+    nextTick(() => {
         listenSrcoll(document.querySelector(selector)!)
     });
-    onBeforeUnmount(() => {
-        stopSubcribe()
-    })
 
     // 第一次自动订阅当前可视区域的数据
     const stop = watchEffect(() => {

+ 3 - 3
src/services/bus/goods.ts

@@ -1,7 +1,7 @@
 import { TradeMode } from '@/common/constants/enumCommon';
 import { initData } from '@/common/methods';
 import APP from '@/services';
-import { Ref, ref, UnwrapRef, toRefs } from 'vue';
+import { Ref, ref, toRefs } from 'vue';
 import { Goods, GoodsQuote } from '../go/ermcp/goodsInfo/interface';
 import { QueryQuoteDayRsp } from '../go/quote/interface';
 import { Goodsgroup, Market } from '../go/useInfo/interface';
@@ -55,7 +55,7 @@ export function getQutoGoodsByTradeMode(trademode: TradeMode) {
 }
 
 export function getGoodsByCode(goodsCode: string): Goods | undefined {
-    return getGoodsList().find(e => e.goodscode.toLowerCase() === goodsCode.toLowerCase())
+    return getGoodsList().find(e => e.goodscode.toUpperCase() === goodsCode.toUpperCase())
 }
 
 // 获取全部盘面信息
@@ -65,7 +65,7 @@ export function getAllQuoteDayInfo(): QueryQuoteDayRsp[] {
 
 // 通过goodscode获取对应的商品盘面信息
 export function getQuoteDayInfoByCode(goodsCode: string): QueryQuoteDayRsp | undefined {
-    return getAllQuoteDayInfo().find(e => e.goodscode === goodsCode)
+    return getAllQuoteDayInfo().find(e => e.goodscode.toUpperCase() === goodsCode.toUpperCase())
 }
 
 // 通过goodcode 获取商品最新价

+ 2 - 2
src/services/go/ermcp/goodsInfo/index.ts

@@ -248,12 +248,12 @@ export function QueryMiddleGoodsDetail(middlegoodsid?: number): Promise<Ermcp3Mi
  */
 export function GetErmcpGoods(lastUpdateTime?: string): Promise<string> {
     const param = lastUpdateTime ? { lastUpdateTime } : {}
-    return commonSearch_go('/Ermcp/GetErmcpGoods', param).then(res => {
+    return commonSearch_go('/Ermcp/GetErmcpGoods', param).then(async res => {
 
         if (res.length) {
             const result = res.reduce((acc: string, obj: Goods) => acc + obj.goodscode + ',', '')
             // 登录的时候或者刷新的时候,需要获取一次盘面信息
-            QueryQuoteDay(result)
+            await QueryQuoteDay(result)
         }
         // console.log('查询企业风管期货商品信息', res);
         APP.set('Goods', res)

+ 28 - 2
src/views/information/account_info/compoments/managers-permission-modify/index.vue

@@ -290,5 +290,31 @@ export default defineComponent({
         }
     }
 }
-</style
->;
+.ant-tree-checkbox {
+    margin-right: 2px;
+    .ant-tree-checkbox-inner {
+        background: @m-grey21;
+        border: 1px solid @m-grey14;
+        border-radius: 3px;
+        &::after {
+            border-color: @m-blue0;
+        }
+    }
+    &::after {
+        border-color: @m-blue0;
+    }
+}
+
+.ant-tree-title {
+    color: @m-white0;
+}
+.anticon {
+    color: @m-white0;
+}
+.ant-tree li .ant-tree-node-content-wrapper.ant-tree-node-selected {
+    background: none;
+}
+.ant-tree li .ant-tree-node-content-wrapper:hover {
+    background: none;
+}
+</style>

+ 5 - 1
src/views/market/futures/setup.tsx

@@ -3,7 +3,7 @@ import { initData } from '@/common/methods';
 import APP from '@/services';
 import { GoodsQuote } from '@/services/go/ermcp/goodsInfo/interface';
 import { Externalexchange } from '@/services/go/useInfo/interface';
-import { ref } from 'vue';
+import { ref, onBeforeUnmount } from 'vue';
 import { quoteChange, quoteAmplitude } from '@/common/setup/table/tableQuote';
 import { getGoodsQuoteList } from '@/services/bus/goods';
 import { subcriteGoodsQuote } from '@/common/setup/table/tableQuote';
@@ -228,5 +228,9 @@ export const useExternalexchange = () => {
         }
     })
 
+    onBeforeUnmount(() => {
+        stopSubcribe();
+    })
+
     return { loading, exchangeId, tabList, tableList, changeTab, }
 }