#146

public/config/readMe.txt

@@ -16,6 +16,9 @@ http://192.168.30.211:8080/cfg?key=test_211
 仓单贸易："apiUrl": "http://192.168.31.118:8080/cfg?key=test_118"
 "apiUrl": "http://192.168.31.174:8080/cfg?key=test_174" // 邓工环境
 
+// 千海金 客户环境 "apiUrl":"http://103.40.249.123:8280/cfg?key=mtp_20"
+账号： qhjadmin 密码：123456
+
 31.175 账号
     110000000001
     199990000012

src/views/information/account_info/list/account_info_business/index.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 业务账户 -->
-  <div class="account_info_business"
+  <div class="account_info_business account_info_container"
        :loading="loading">
     <filterCustomTable @search="search"></filterCustomTable>
     <div class="tltLeft">
@@ -12,51 +12,53 @@
         {{getUserName()}}
       </span>
     </div>
-    <a-collapse class="spotCollapse"
-                v-for="(item, i) in tableList"
-                :key="i + '11'"
-                :bordered="false">
-      <template #expandIcon="props">
-        <svg class="icon svg-icon"
-             aria-hidden="true"
-             v-if="props.isActive == 0">
-          <use xlink:href="#icon-shouqi1"></use>
-        </svg>
-        <svg class="icon svg-icon"
-             aria-hidden="true"
-             v-else>
-          <use xlink:href="#icon-shouqi2"></use>
-        </svg>
-      </template>
-      <a-collapse-panel>
-        <template #header>
-          <a-row class="headRow">
-            <a-col :span="12">{{item.rolename}}({{item.userlist.length}})</a-col>
-            <a-col :span="12">
-              <BtnList :btnList="firstBtn"
-                       :record="item"
-                       @click="openComponent" />
-            </a-col>
-          </a-row>
+    <div class="a-collapse-container">
+      <a-collapse class="spotCollapse"
+                  v-for="(item, i) in tableList"
+                  :key="i + '11'"
+                  :bordered="false">
+        <template #expandIcon="props">
+          <svg class="icon svg-icon"
+               aria-hidden="true"
+               v-if="props.isActive == 0">
+            <use xlink:href="#icon-shouqi1"></use>
+          </svg>
+          <svg class="icon svg-icon"
+               aria-hidden="true"
+               v-else>
+            <use xlink:href="#icon-shouqi2"></use>
+          </svg>
         </template>
-        <a-collapse class="busyCollapse"
-                    v-for="(sub, j) in item.userlist"
-                    :key="j + '11'"
-                    :bordered="false">
-          <a-collapse-panel :show-arrow="false">
-            <template #header>
-              <a-row class="contRow">
-                <a-col :span="12">{{sub.loginname}}-{{sub.logincode}}</a-col>
-                <a-col :span="12">{{getLoginStatusEnumItemName(sub.loginstatus)}}</a-col>
-              </a-row>
-            </template>
-            <BtnList :btnList="sub.btnList"
-                     :record="sub"
-                     @click="openComponent" />
-          </a-collapse-panel>
-        </a-collapse>
-      </a-collapse-panel>
-    </a-collapse>
+        <a-collapse-panel>
+          <template #header>
+            <a-row class="headRow">
+              <a-col :span="12">{{item.rolename}}({{item.userlist.length}})</a-col>
+              <a-col :span="12">
+                <BtnList :btnList="firstBtn"
+                         :record="item"
+                         @click="openComponent" />
+              </a-col>
+            </a-row>
+          </template>
+          <a-collapse class="busyCollapse"
+                      v-for="(sub, j) in item.userlist"
+                      :key="j + '11'"
+                      :bordered="false">
+            <a-collapse-panel :show-arrow="false">
+              <template #header>
+                <a-row class="contRow">
+                  <a-col :span="12">{{sub.loginname}}-{{sub.logincode}}</a-col>
+                  <a-col :span="12">{{getLoginStatusEnumItemName(sub.loginstatus)}}</a-col>
+                </a-row>
+              </template>
+              <BtnList :btnList="sub.btnList"
+                       :record="sub"
+                       @click="openComponent" />
+            </a-collapse-panel>
+          </a-collapse>
+        </a-collapse-panel>
+      </a-collapse>
+    </div>
     <component :is="componentId"
                v-if="componentId"
                :selectedRow="selectedData"

src/views/information/account_info/list/account_info_futures/index.vue

@@ -1,97 +1,97 @@
 <template>
-    <!-- 期货账户 -->
-    <div class="account_info_futures" :loading="loading">
-        <filterCustomTable @search="search"></filterCustomTable>
-        <div class="tltLeft">
-            <span class="blue">
-                <svg class="icon svg-icon" aria-hidden="true">
-                    <use xlink:href="#icon-shuzhuangtu" />
-                </svg>
-                {{getUserName()}}
-            </span>
-            <BtnList :btnList="firstBtn" />
-        </div>
-        <a-collapse
-            class="spotCollapse"
-            v-for="(item, i) in tableList"
-            :key="i + '11'"
-            :bordered="false"
-        >
-            <template #expandIcon="props">
-                <svg class="icon svg-icon" aria-hidden="true" v-if="props.isActive == 0">
-                    <use xlink:href="#icon-shouqi1" />
-                </svg>
-                <svg class="icon svg-icon" aria-hidden="true" v-else>
-                    <use xlink:href="#icon-shouqi2" />
-                </svg>
-            </template>
-            <a-collapse-panel>
-                <template #header>
-                    <a-row class="headRow">
-                        <a-col :span="12">
-                            {{item.mainAcc.accountname}} {{ '-' + item.mainAcc.hedgeaccountcode}}
-                            ({{item.subacclist.length}}）{{item.mainAcc.fcname}}
-                        </a-col>
-                        <a-col :span="12">
-                            <BtnList :btnList="secondBtn" @onClick="secondeClick(item)" />
-                        </a-col>
-                    </a-row>
-                </template>
-                <a-collapse class="futureCollapse" accordion :bordered="false">
-                    <a-collapse-panel
-                        :show-arrow="false"
-                        v-for="(sub, i) in item.subacclist"
-                        :key="i + '11'"
-                    >
-                        <template #header>
-                            <a-row class="contRow">
-                                <a-col :span="12">{{sub.accountname}}-{{sub.accountid}}</a-col>
-                                <a-col :span="12">{{getTaAccountStatus(sub.tradestatus)}}</a-col>
-                            </a-row>
-                        </template>
-                        <BtnList
-                            :btnList="getBtnList(sub.tradestatus)"
-                            @onClick="thirdClick(item, sub)"
-                        />
-                    </a-collapse-panel>
-                </a-collapse>
+  <!-- 期货账户 -->
+  <div class="account_info_futures account_info_container"
+       :loading="loading">
+    <filterCustomTable @search="search"></filterCustomTable>
+    <div class="tltLeft">
+      <span class="blue">
+        <svg class="icon svg-icon"
+             aria-hidden="true">
+          <use xlink:href="#icon-shuzhuangtu" />
+        </svg>
+        {{getUserName()}}
+      </span>
+      <BtnList :btnList="firstBtn" />
+    </div>
+    <div class="a-collapse-container">
+      <a-collapse class="spotCollapse"
+                  v-for="(item, i) in tableList"
+                  :key="i + '11'"
+                  :bordered="false">
+        <template #expandIcon="props">
+          <svg class="icon svg-icon"
+               aria-hidden="true"
+               v-if="props.isActive == 0">
+            <use xlink:href="#icon-shouqi1" />
+          </svg>
+          <svg class="icon svg-icon"
+               aria-hidden="true"
+               v-else>
+            <use xlink:href="#icon-shouqi2" />
+          </svg>
+        </template>
+        <a-collapse-panel>
+          <template #header>
+            <a-row class="headRow">
+              <a-col :span="12">
+                {{item.mainAcc.accountname}} {{ '-' + item.mainAcc.hedgeaccountcode}}
+                ({{item.subacclist.length}}）{{item.mainAcc.fcname}}
+              </a-col>
+              <a-col :span="12">
+                <BtnList :btnList="secondBtn"
+                         @onClick="secondeClick(item)" />
+              </a-col>
+            </a-row>
+          </template>
+          <a-collapse class="futureCollapse"
+                      accordion
+                      :bordered="false">
+            <a-collapse-panel :show-arrow="false"
+                              v-for="(sub, i) in item.subacclist"
+                              :key="i + '11'">
+              <template #header>
+                <a-row class="contRow">
+                  <a-col :span="12">{{sub.accountname}}-{{sub.accountid}}</a-col>
+                  <a-col :span="12">{{getTaAccountStatus(sub.tradestatus)}}</a-col>
+                </a-row>
+              </template>
+              <BtnList :btnList="getBtnList(sub.tradestatus)"
+                       @onClick="thirdClick(item, sub)" />
             </a-collapse-panel>
-        </a-collapse>
-        <Add @refresh="queryTable" />
-        <AddChild
-            :selectedData="firstData"
-            :userList="userList"
-            :marginList="marginList"
-            :feeList="feeList"
-            @updateTrader="queryUserList"
-            @refresh="queryTable"
-        />
-        <Modify :selectedData="firstData" @refresh="queryTable" />
-        <ModifyChild
-            @refresh="queryTable"
-            :userList="userList"
-            :marginList="marginList"
-            :feeList="feeList"
-            :secondeData="secondeData"
-            :selectedData="firstData"
-        />
-        <Detail
-            :selectedData="firstData"
+          </a-collapse>
+        </a-collapse-panel>
+      </a-collapse>
+    </div>
+    <Add @refresh="queryTable" />
+    <AddChild :selectedData="firstData"
+              :userList="userList"
+              :marginList="marginList"
+              :feeList="feeList"
+              @updateTrader="queryUserList"
+              @refresh="queryTable" />
+    <Modify :selectedData="firstData"
+            @refresh="queryTable" />
+    <ModifyChild @refresh="queryTable"
+                 :userList="userList"
+                 :marginList="marginList"
+                 :feeList="feeList"
+                 :secondeData="secondeData"
+                 :selectedData="firstData" />
+    <Detail :selectedData="firstData"
             :secondeData="secondeData"
             :userList="userList"
             :marginList="marginList"
-            :feeList="feeList"
-        />
-        <Cancel
-            @refresh="queryTable"
+            :feeList="feeList" />
+    <Cancel @refresh="queryTable"
             :userList="userList"
             :marginList="marginList"
             :feeList="feeList"
             :secondeData="secondeData"
+            :selectedData="firstData" />
+    <Credit @refresh="queryTable"
             :selectedData="firstData"
-        />
-        <Credit @refresh="queryTable" :selectedData="firstData" :secondeData="secondeData" />
-    </div>
+            :secondeData="secondeData" />
+  </div>
 </template>
 
 <script lang="ts">

src/views/information/account_info/list/account_info_manager/index.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 管理账户 -->
-  <div class="account_info_manager"
+  <div class="account_info_manager account_info_container"
        :loading="loading">
     <filterCustomTable @search="search"></filterCustomTable>
     <div class="tltLeft">
@@ -13,52 +13,53 @@
       </span>
       <BtnList :btnList="firstBtn" />
     </div>
-
-    <a-collapse class="spotCollapse"
-                v-for="(item, i) in tableList"
-                :key="i + '11'"
-                :bordered="false">
-      <template #expandIcon="props">
-        <svg class="icon svg-icon"
-             aria-hidden="true"
-             v-if="props.isActive == 0">
-          <use xlink:href="#icon-shouqi1"></use>
-        </svg>
-        <svg class="icon svg-icon"
-             aria-hidden="true"
-             v-else>
-          <use xlink:href="#icon-shouqi2"></use>
-        </svg>
-      </template>
-      <a-collapse-panel>
-        <template #header>
-          <a-row class="headRow">
-            <a-col :span="12">{{item.rolename}}({{item.userlist.length}}）</a-col>
-            <a-col :span="12">
-              <BtnList :selectedData="item"
-                       :btnList="secondBtn"
-                       @onClick="openAction" />
-            </a-col>
-          </a-row>
+    <div class="a-collapse-container">
+      <a-collapse class="spotCollapse"
+                  v-for="(item, i) in tableList"
+                  :key="i + '11'"
+                  :bordered="false">
+        <template #expandIcon="props">
+          <svg class="icon svg-icon"
+               aria-hidden="true"
+               v-if="props.isActive == 0">
+            <use xlink:href="#icon-shouqi1"></use>
+          </svg>
+          <svg class="icon svg-icon"
+               aria-hidden="true"
+               v-else>
+            <use xlink:href="#icon-shouqi2"></use>
+          </svg>
         </template>
-        <a-collapse class="busyCollapse"
-                    v-for="(sub, i) in item.userlist"
-                    :key="i + '11'"
-                    :bordered="false">
-          <a-collapse-panel :show-arrow="false">
-            <template #header>
-              <a-row class="contRow">
-                <a-col :span="12">{{sub.loginname}}-{{sub.logincode}}</a-col>
-                <a-col :span="12">{{getLoginStatusEnumItemName(sub.loginstatus)}}</a-col>
-              </a-row>
-            </template>
-            <BtnList :btnList="sub.btnList"
-                     :selectedData="sub"
-                     @onClick="moreOptenAction" />
-          </a-collapse-panel>
-        </a-collapse>
-      </a-collapse-panel>
-    </a-collapse>
+        <a-collapse-panel>
+          <template #header>
+            <a-row class="headRow">
+              <a-col :span="12">{{item.rolename}}({{item.userlist.length}}）</a-col>
+              <a-col :span="12">
+                <BtnList :selectedData="item"
+                         :btnList="secondBtn"
+                         @onClick="openAction" />
+              </a-col>
+            </a-row>
+          </template>
+          <a-collapse class="busyCollapse"
+                      v-for="(sub, i) in item.userlist"
+                      :key="i + '11'"
+                      :bordered="false">
+            <a-collapse-panel :show-arrow="false">
+              <template #header>
+                <a-row class="contRow">
+                  <a-col :span="12">{{sub.loginname}}-{{sub.logincode}}</a-col>
+                  <a-col :span="12">{{getLoginStatusEnumItemName(sub.loginstatus)}}</a-col>
+                </a-row>
+              </template>
+              <BtnList :btnList="sub.btnList"
+                       :selectedData="sub"
+                       @onClick="moreOptenAction" />
+            </a-collapse-panel>
+          </a-collapse>
+        </a-collapse-panel>
+      </a-collapse>
+    </div>
     <Add @refresh="handleBtnAction"
          :tableList="tableList" />
     <Modify :tableList="tableList"

src/views/information/account_info/list/account_info_trade/index.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 交易账户 -->
-  <div class="account_info_trade"
+  <div class="account_info_trade account_info_container"
        :loading="loading">
     <filterCustomTable @search="search"></filterCustomTable>
     <div class="tltLeft">
@@ -13,51 +13,53 @@
       </span>
       <BtnList :btnList="firstBtn" />
     </div>
-    <a-collapse class="spotCollapse"
-                v-for="(item, i) in tableList"
-                :key="i + '11'"
-                :bordered="false">
-      <template #expandIcon="props">
-        <svg class="icon svg-icon"
-             aria-hidden="true"
-             v-if="props.isActive == 0">
-          <use xlink:href="#icon-shouqi1"></use>
-        </svg>
-        <svg class="icon svg-icon"
-             aria-hidden="true"
-             v-else>
-          <use xlink:href="#icon-shouqi2"></use>
-        </svg>
-      </template>
-      <a-collapse-panel>
-        <template #header>
-          <a-row class="headRow">
-            <a-col :span="12">
-              {{item.rolename}}({{item.userlist.length}})
-            </a-col>
-            <a-col :span="12">
-              <BtnList :btnList="secondBtn"
-                       @onClick="btnClick(item)" />
-            </a-col>
-          </a-row>
+    <div class="a-collapse-container">
+      <a-collapse class="spotCollapse"
+                  v-for="(item, i) in tableList"
+                  :key="i + '11'"
+                  :bordered="false">
+        <template #expandIcon="props">
+          <svg class="icon svg-icon"
+               aria-hidden="true"
+               v-if="props.isActive == 0">
+            <use xlink:href="#icon-shouqi1"></use>
+          </svg>
+          <svg class="icon svg-icon"
+               aria-hidden="true"
+               v-else>
+            <use xlink:href="#icon-shouqi2"></use>
+          </svg>
         </template>
-        <a-collapse class="busyCollapse"
-                    v-for="(sub, i) in item.userlist"
-                    :key="i + '11'"
-                    :bordered="false">
-          <a-collapse-panel :show-arrow="false">
-            <template #header>
-              <a-row class="contRow">
-                <a-col :span="12">{{sub.loginname}}-{{sub.logincode}}</a-col>
-                <a-col :span="12">{{getRoleTypeName(sub.loginstatus)}}</a-col>
-              </a-row>
-            </template>
-            <BtnList :btnList="sub.btnList"
-                     @onClick="btnClick(item, sub)" />
-          </a-collapse-panel>
-        </a-collapse>
-      </a-collapse-panel>
-    </a-collapse>
+        <a-collapse-panel>
+          <template #header>
+            <a-row class="headRow">
+              <a-col :span="12">
+                {{item.rolename}}({{item.userlist.length}})
+              </a-col>
+              <a-col :span="12">
+                <BtnList :btnList="secondBtn"
+                         @onClick="btnClick(item)" />
+              </a-col>
+            </a-row>
+          </template>
+          <a-collapse class="busyCollapse"
+                      v-for="(sub, i) in item.userlist"
+                      :key="i + '11'"
+                      :bordered="false">
+            <a-collapse-panel :show-arrow="false">
+              <template #header>
+                <a-row class="contRow">
+                  <a-col :span="12">{{sub.loginname}}-{{sub.logincode}}</a-col>
+                  <a-col :span="12">{{getRoleTypeName(sub.loginstatus)}}</a-col>
+                </a-row>
+              </template>
+              <BtnList :btnList="sub.btnList"
+                       @onClick="btnClick(item, sub)" />
+            </a-collapse-panel>
+          </a-collapse>
+        </a-collapse-panel>
+      </a-collapse>
+    </div>
     <Add @refresh="handleBtnAction" />
     <AddChild @refresh="handleBtnAction"
               :accountList="accountList"