Forráskód Böngészése

Merge branch 'master' of 192.168.30.132:MTP2.0/MTP20_IF

zhou.xiaoning 3 éve
szülő
commit
7f75fe867b
2 módosított fájl, 9 hozzáadás és 228 törlés
  1. 5 5
      config/config.xml
  2. 4 223
      config/pcweb_menu/pcweb_menu_ermcp.json

+ 5 - 5
config/config.xml

@@ -13,11 +13,11 @@
     <DbAddress value="192.168.31.88"/>
     <DbName value="orcl"/>
     <DbPort value="1521"/>
-    <DbUser value="mtp2_test137"/>
+    <DbUser value="mtp2_test203"/>
     <DbPwd value="muchinfo"/>
   </DbSetting>
   <RedisSetting>
-    <Address value="192.168.31.137"/>
+    <Address value="192.168.31.203"/>
     <Port value="5007"/>
     <Timeout value="3"/>
     <ConnNum value="1"/>
@@ -29,7 +29,7 @@
     <Exchange value="entry"/>
   </MqSetting>
   <MongoDBSetting>
-    <HostName value="192.168.31.137"/>
+    <HostName value="192.168.31.203"/>
     <Port value="5025"/>
     <DBName value="HistoryQuote"/>
     <Username value="quote_test01"/>
@@ -38,8 +38,8 @@
   <MySQLSetting>
     <Host value="192.168.30.72"/>
     <Port value="3306"/>
-    <DBName value="historyquote_test137"/>
-    <Username value="quote_test137"/>
+    <DBName value="historyquote_test203"/>
+    <Username value="quote_test203"/>
     <Password value="123456"/>
   </MySQLSetting>
 </Configuration>

+ 4 - 223
config/pcweb_menu/pcweb_menu_ermcp.json

@@ -1,7 +1,7 @@
 [
     {
         "title": "底部单据菜单",
-        "rulekey": "",
+        "rulekey": "client_pc_web_order_bottom",
         "code": "bottom",
         "sort": 1,
         "isshow": true,
@@ -74,213 +74,6 @@
                 ]
             },
             {
-                "title": "现货仓单",
-                "rulekey": "",
-                "code": "spot_warrant",
-                "sort": 1,
-                "isshow": true,
-                "component": "views/order/spot_warran/index.vue",
-                "path": "",
-                "url": "",
-                "remark": "",
-                "children": [
-                    {
-                        "title": "现货汇总",
-                        "rulekey": "",
-                        "code": "spot_warrant_spot_summary",
-                        "sort": 1,
-                        "isshow": true,
-                        "component": "components/spot_warrant_spot_summary/index.vue",
-                        "path": "",
-                        "url": "",
-                        "remark": "",
-                        "auth": [
-                            {
-                                "label": "查看库存",
-                                "rulekey": "",
-                                "code": "check",
-                                "isshow": true,
-                                "remark": ""
-                            }
-                        ]
-                    },
-                    {
-                        "title": "库存汇总",
-                        "rulekey": "",
-                        "code": "spot_warrant_inventory_summary",
-                        "sort": 1,
-                        "isshow": true,
-                        "component": "components/spot_warrant_inventory_summary/index.vue",
-                        "path": "",
-                        "url": "",
-                        "remark": "",
-                        "auth": []
-                    },
-                    {
-                        "title": "现货明细",
-                        "rulekey": "",
-                        "code": "spot_warrant_spot_details",
-                        "sort": 1,
-                        "isshow": true,
-                        "component": "components/spot_warrant_spot_details/index.vue",
-                        "path": "",
-                        "url": "",
-                        "remark": "",
-                        "auth": [
-                            {
-                                "label": "挂牌",
-                                "rulekey": "",
-                                "code": "listed",
-                                "isshow": true,
-                                "remark": ""
-                            },
-                            {
-                                "label": "提货",
-                                "rulekey": "",
-                                "code": "pick_up",
-                                "isshow": true,
-                                "remark": ""
-                            }
-                        ]
-                    },
-                    {
-                        "title": "挂单",
-                        "rulekey": "",
-                        "code": "spot_warrant_pending_order",
-                        "sort": 1,
-                        "isshow": true,
-                        "component": "components/spot_warrant_pending_order/index.vue",
-                        "path": "",
-                        "url": "",
-                        "remark": "",
-                        "auth": [
-                            {
-                                "label": "撤单",
-                                "rulekey": "",
-                                "code": "cancel",
-                                "isshow": true,
-                                "remark": ""
-                            },
-                            {
-                                "label": "议价单",
-                                "rulekey": "",
-                                "code": "bargain",
-                                "isshow": true,
-                                "remark": ""
-                            },
-                            {
-                                "label": "详情",
-                                "rulekey": "",
-                                "code": "detail",
-                                "isshow": true,
-                                "remark": ""
-                            }
-                        ]
-                    },
-                    {
-                        "title": "议价",
-                        "rulekey": "",
-                        "code": "spot_warrant_bargain",
-                        "sort": 1,
-                        "isshow": true,
-                        "component": "components/spot_warrant_bargain/index.vue",
-                        "path": "",
-                        "url": "",
-                        "remark": "",
-                        "auth": [
-                            {
-                                "label": "详情",
-                                "rulekey": "",
-                                "code": "detail",
-                                "isshow": true,
-                                "remark": ""
-                            }
-                        ]
-                    },
-                    {
-                        "title": "成交",
-                        "rulekey": "",
-                        "code": "spot_warrant_deal",
-                        "sort": 1,
-                        "isshow": true,
-                        "component": "components/spot_warrant_deal/index.vue",
-                        "path": "",
-                        "url": "",
-                        "remark": "",
-                        "auth": [
-                            {
-                                "label": "详情",
-                                "rulekey": "",
-                                "code": "detail",
-                                "isshow": true,
-                                "remark": ""
-                            }
-                        ]
-                    },
-                    {
-                        "title": "指定成交",
-                        "rulekey": "",
-                        "code": "spot_warrant_designated_deal",
-                        "sort": 1,
-                        "isshow": true,
-                        "component": "components/spot_warrant_designated_deal/index.vue",
-                        "path": "",
-                        "url": "",
-                        "remark": "",
-                        "auth": [
-                            {
-                                "label": "purchase",
-                                "rulekey": "",
-                                "code": "确定购买",
-                                "isshow": true,
-                                "remark": ""
-                            },
-                            {
-                                "label": "ignore",
-                                "rulekey": "",
-                                "code": "忽略",
-                                "isshow": true,
-                                "remark": ""
-                            },
-                            {
-                                "label": "resell",
-                                "rulekey": "",
-                                "code": "撤销出售",
-                                "isshow": true,
-                                "remark": ""
-                            }
-                        ]
-                    },
-                    {
-                        "title": "提货",
-                        "rulekey": "",
-                        "code": "spot_warrant_in_and_out_warehouse",
-                        "sort": 1,
-                        "isshow": true,
-                        "component": "components/spot_warrant_in_and_out_warehouse/index.vue",
-                        "path": "",
-                        "url": "",
-                        "remark": "",
-                        "auth": [
-                            {
-                                "label": "pick_up",
-                                "rulekey": "",
-                                "code": "确认提货",
-                                "isshow": true,
-                                "remark": ""
-                            },
-                            {
-                                "label": "cacel",
-                                "rulekey": "",
-                                "code": "撤销",
-                                "isshow": true,
-                                "remark": ""
-                            }
-                        ]
-                    }
-                ]
-            },
-            {
                 "title": "资金信息",
                 "rulekey": "client_pc_web_qiyefengguan_funding_information",
                 "code": "funding_information",
@@ -321,7 +114,7 @@
     },
     {
         "title": "市场",
-        "rulekey": "",
+        "rulekey": "client_pc_web_common_market",
         "code": "market",
         "path": "/market",
         "component": "Layout",
@@ -330,7 +123,7 @@
         "children": [
             {
                 "title": "期货市场",
-                "rulekey": "",
+                "rulekey": "client_pc_web_market_futures",
                 "code": "market_futures",
                 "path": "market_futures",
                 "component": "Main",
@@ -341,7 +134,7 @@
                 "children": [
                     {
                         "title": "期货市场",
-                        "rulekey": "",
+                        "rulekey": "client_pc_web_market_futures_tab",
                         "code": "market_futures_tab",
                         "path": "market_futures_tab",
                         "component": "views/market/futures/index.vue",
@@ -366,18 +159,6 @@
                         ]
                     }
                 ]
-            },
-            {
-                "title": "现货市场",
-                "rulekey": "",
-                "code": "market_spot",
-                "path": "market_spot",
-                "component": "Main",
-                "sort": 20,
-                "isshow": false,
-                "url": "",
-                "remark": "",
-                "children": []
             }
         ]
     },