文件目录变更

src/App.vue

@@ -1,166 +1,163 @@
 <template>
-  <div class="app-container"
-       @contextmenu.prevent>
-    <a-spin :tip="tip"
-            :spinning="spinning"
-            size="large">
-      <router-view />
-    </a-spin>
-  </div>
+    <div class="app-container" @contextmenu.prevent>
+        <a-spin :tip="tip" :spinning="spinning" size="large">
+            <router-view />
+        </a-spin>
+    </div>
 </template>
 
 <script lang="ts">
-import { defineComponent, ref, watchEffect, provide } from 'vue';
-import { globalDataRefresh } from '@/services/bus/index';
-import { notice } from '@/services/bus/system';
-import eventBus from '@/utils/eventBus/index';
-import TimerUtils from '@/utils/tool/timerUtil';
-import Router from '@/router';
-import APP from '@/services';
-import { Modal } from 'ant-design-vue';
-import { setLoadComplete } from '@/setup/methods/index';
-import { isLogin, logout } from '@/services/bus/login';
-let lastTime = new Date().getTime();
+    import { defineComponent, ref, watchEffect, provide } from 'vue';
+    import { globalDataRefresh } from '@/services/bus/index';
+    import { notice } from '@/services/bus/system';
+    import eventBus from '@/utils/eventBus/index';
+    import TimerUtils from '@/utils/timer/timerUtil';
+    import Router from '@/router';
+    import APP from '@/services';
+    import { Modal } from 'ant-design-vue';
+    import { setLoadComplete } from '@/setup/methods/index';
+    import { isLogin, logout } from '@/services/bus/login';
+    let lastTime = new Date().getTime();
 
-function logoutAction() {
-    logout();
-    APP.closeServer();
-    Router.replace('/login');
-}
+    function logoutAction() {
+        logout();
+        APP.closeServer();
+        Router.replace('/login');
+    }
 
-// 设置太久没有操作界面，自动退出界面功能
-function setOvertime() {
-    window.addEventListener('mousemove', () => {
-        lastTime = new Date().getTime(); //更新当前时间
-    });
-    const mimut = 30;
-    const timeOut = mimut * 60 * 1000; //设置超时时间: 5分钟
-    TimerUtils.setInterval(
-        () => {
-            const currentTime = new Date().getTime();
-            if (currentTime - lastTime > timeOut) {
-                //判断是否超时
-                if (isLogin()) {
-                    Modal.info({
-                        title: '系统提示:',
-                        content: `您已超过${mimut}分钟没有进行任何操作，已自动退出登录！`,
-                        okType: 'primary',
-                        okText: '确定',
-                        keyboard: false,
-                    });
-                    logoutAction();
+    // 设置太久没有操作界面，自动退出界面功能
+    function setOvertime() {
+        window.addEventListener('mousemove', () => {
+            lastTime = new Date().getTime(); //更新当前时间
+        });
+        const mimut = 30;
+        const timeOut = mimut * 60 * 1000; //设置超时时间: 5分钟
+        TimerUtils.setInterval(
+            () => {
+                const currentTime = new Date().getTime();
+                if (currentTime - lastTime > timeOut) {
+                    //判断是否超时
+                    if (isLogin()) {
+                        Modal.info({
+                            title: '系统提示:',
+                            content: `您已超过${mimut}分钟没有进行任何操作，已自动退出登录！`,
+                            okType: 'primary',
+                            okText: '确定',
+                            keyboard: false,
+                        });
+                        logoutAction();
+                    }
                 }
-            }
-        },
-        timeOut,
-        'overtimeInterval'
-    );
-}
-
-export default defineComponent({
-    name: 'app',
-    components: {},
-    setup() {
-        let spinning = ref<boolean>(false);
-        const tip = ref<string>('');
+            },
+            timeOut,
+            'overtimeInterval'
+        );
+    }
 
-        // 登出状态展示
-        eventBus.$onOnly('logout', () => {
-            // debugger;
-            tip.value = '跳转中...';
-            spinning.value = true;
-            TimerUtils.setTimeout(
-                () => {
-                    spinning.value = false;
-                    logoutAction();
-                },
-                1000,
-                'logoutTimer'
-            );
-        });
-        // 登录成功
-        // eventBus.$onOnly('loginSuccess', setOvertime);
-        // 监听路由的变化
-        watchEffect(() => Router.currentRoute && provide('current-route', Router.currentRoute));
+    export default defineComponent({
+        name: 'app',
+        components: {},
+        setup() {
+            let spinning = ref<boolean>(false);
+            const tip = ref<string>('');
 
-        // 监听刷新事件
-        window.addEventListener(
-            'load',
-            () => {
-                tip.value = '数据初始化...';
-                lastTime = new Date().getTime(); //更新当前时间
+            // 登出状态展示
+            eventBus.$onOnly('logout', () => {
+                // debugger;
+                tip.value = '跳转中...';
                 spinning.value = true;
-                // 注册全局loadComplete事件 保证loadComplete变量及时更新
-                setLoadComplete(false);
-                globalDataRefresh()
-                    .then((res) => {
-                        setLoadComplete(true);
-                        eventBus.$emit('loadComplete');
+                TimerUtils.setTimeout(
+                    () => {
                         spinning.value = false;
-                    })
-                    .catch((err) => {
-                        console.error(err);
-                        spinning.value = false;
-                    });
-            },
-            true
-        );
+                        logoutAction();
+                    },
+                    1000,
+                    'logoutTimer'
+                );
+            });
+            // 登录成功
+            // eventBus.$onOnly('loginSuccess', setOvertime);
+            // 监听路由的变化
+            watchEffect(() => Router.currentRoute && provide('current-route', Router.currentRoute));
 
-        // setOvertime();
-        // 订阅交易通知
-        notice((msg: string) => {
-            Modal.info({
-                title: '系统提示:',
-                content: `${msg},请重新登录。`,
-                okType: 'primary',
-                okText: '确定',
-                keyboard: false,
-                onOk() {
-                    Router.replace('/login');
+            // 监听刷新事件
+            window.addEventListener(
+                'load',
+                () => {
+                    tip.value = '数据初始化...';
+                    lastTime = new Date().getTime(); //更新当前时间
+                    spinning.value = true;
+                    // 注册全局loadComplete事件 保证loadComplete变量及时更新
+                    setLoadComplete(false);
+                    globalDataRefresh()
+                        .then((res) => {
+                            setLoadComplete(true);
+                            eventBus.$emit('loadComplete');
+                            spinning.value = false;
+                        })
+                        .catch((err) => {
+                            console.error(err);
+                            spinning.value = false;
+                        });
                 },
+                true
+            );
+
+            // setOvertime();
+            // 订阅交易通知
+            notice((msg: string) => {
+                Modal.info({
+                    title: '系统提示:',
+                    content: `${msg},请重新登录。`,
+                    okType: 'primary',
+                    okText: '确定',
+                    keyboard: false,
+                    onOk() {
+                        Router.replace('/login');
+                    },
+                });
             });
-        });
 
-        return {
-            tip,
-            spinning,
-        };
-    },
-});
+            return {
+                tip,
+                spinning,
+            };
+        },
+    });
 </script>
 
 <style lang="less">
-.app-container {
-    width: 100%;
-    height: auto;
-    min-height: 100%;
-}
-#app {
-    width: 100%;
-    height: auto;
-    min-height: 100%;
-    font-family: Avenir, Helvetica, Arial, sans-serif;
-    -webkit-font-smoothing: antialiased;
-    -moz-osx-font-smoothing: grayscale;
-    text-align: center;
-    color: #2c3e50;
-    background-color: #fffefe;
-    display: flex;
-    justify-content: center;
-    overflow-y: hidden;
-    img {
-        cursor: pointer;
+    .app-container {
+        width: 100%;
+        height: auto;
+        min-height: 100%;
     }
-}
-
-#nav {
-    padding: 30px;
-    a {
-        font-weight: bold;
+    #app {
+        width: 100%;
+        height: auto;
+        min-height: 100%;
+        font-family: Avenir, Helvetica, Arial, sans-serif;
+        -webkit-font-smoothing: antialiased;
+        -moz-osx-font-smoothing: grayscale;
+        text-align: center;
         color: #2c3e50;
-        &.router-link-exact-active {
-            color: #42b983;
+        background-color: #fffefe;
+        display: flex;
+        justify-content: center;
+        overflow-y: hidden;
+        img {
+            cursor: pointer;
+        }
+    }
+
+    #nav {
+        padding: 30px;
+        a {
+            font-weight: bold;
+            color: #2c3e50;
+            &.router-link-exact-active {
+                color: #42b983;
+            }
         }
     }
-}
 </style>

src/goServiceAPI/ermcp/exposure/index.ts

@@ -1,106 +0,0 @@
-import APP from "@/services";
-import {commonSearch_go} from "@/goServiceAPI";
-import {
-    Ermcp3AreaSpot,
-    Ermcp3AreaSpotDetail,
-    Ermcp3AreaSpotDetailReq,
-    Ermcp3ExposureDetail,
-    Ermcp3ExposureReq,
-    ErmcpExposurePostion,
-    ErmcpExposurePostionReq,
-    ErmcpHedgePosition,
-    ErmcpHedgePositionDetail,
-    ErmcpHedgePositionDetailReq,
-    ErmcpRealExposureModel
-} from "@/goServiceAPI/ermcp/exposure/interface";
-
-/** ================================= 敞口 ================================**/
-
-/**
- * 请求实时敞口 (敞口 -> 实时敞口) /Ermcp/QueryRealtimeExposure
- * @constructor
- */
-export function QueryActualExposure() : Promise<ErmcpRealExposureModel[]>{
-    const AreaUserID = APP.get('userAccount').memberuserid; // 所属机构id
-    return commonSearch_go('/Ermcp/QueryRealtimeExposure', {AreaUserID})
-        .catch(err => {
-            throw new Error(`查询敞口 -> 实时敞口: ${err.message}`);
-        })
-}
-
-/**
- * 请求实时敞口现货明细信息 (敞口 ->实时敞口 -> 现货明细) /Ermcp3/QueryExposureDetail
- * @param req.middlegoodsid 套保商品
- * @constructor
- */
-export function QueryActualExposureDetail(req: Ermcp3ExposureReq) : Promise<Ermcp3ExposureDetail[]>{
-    const areauserid = APP.get('userAccount').memberuserid; // 所属机构id
-    return commonSearch_go('/Ermcp3/QueryExposureDetail', {areauserid, ...req})
-        .catch(err => {
-            throw new Error(`查询敞口 ->实时敞口 -> 现货明细: ${err.message}`);
-        })
-}
-
-/**
- * 查询实时敞口期货头寸明细 (敞口 ->实时敞口 -> 期货明细) /Ermcp/QueryRealtimeExposurePosition
- * @param req.middleGoodsId 套保商品ID
- * @constructor
- */
-export function QueryAutualExposurePosition(req: ErmcpExposurePostionReq): Promise<ErmcpExposurePostion[]>{
-    const areaUserId = APP.get('userAccount').memberuserid; // 所属机构id
-    return commonSearch_go('/Ermcp3/QueryExposureDetail', {areaUserId, ...req})
-        .catch(err => {
-            throw new Error(`查询敞口 ->实时敞口 -> 期货明细: ${err.message}`);
-        })
-}
-
-/**
- * 请求敞口现货头寸 (敞口 -> 现货头寸) /Ermcp3/QueryExposureSpot
- * @constructor
- */
-export function QuerySpotPosition() : Promise<Ermcp3AreaSpot[]>{
-    const areauserid = APP.get('userAccount').memberuserid; // 所属机构id
-    return commonSearch_go('/Ermcp3/QueryExposureSpot', {areauserid})
-        .catch(err => {
-            throw new Error(`查询敞口 -> 现货头寸: ${err.message}`);
-        })
-}
-
-/**
- * 查询敞口现货头寸明细(敞口 -> 现货头寸 -> 现货明细) /Ermcp3/QueryExposureSpotDetail
- * req.deliverygoodsid  现货品种ID
- * @constructor
- */
-export function QuerySpotPositionDetail(req: Ermcp3AreaSpotDetailReq) : Promise<Ermcp3AreaSpotDetail[]>{
-    const areauserid = APP.get('userAccount').memberuserid; // 所属机构id
-    return commonSearch_go('/Ermcp3/QueryExposureSpotDetail', {areauserid, ...req})
-        .catch(err => {
-            throw new Error(`查询敞口 -> 现货头寸 -> 现货明细: ${err.message}`);
-        })
-}
-
-/**
- * 查询敞口期货头寸(菜单:敞口-> 期货头寸) /Ermcp/QueryExposureHedgePosition
- * @constructor
- */
-export function QueryExposureHedgePosition() : Promise<ErmcpHedgePosition>{
-    const areaUserId = APP.get('userAccount').memberuserid; // 所属机构id
-    return commonSearch_go('/Ermcp/QueryExposureHedgePosition', {areaUserId})
-        .catch(err => {
-            throw new Error(`查询敞口 -> 期货头寸: ${err.message}`);
-        })
-}
-
-/**
- * 查询敞口期货头寸期货明细(菜单:敞口 -> 期货头寸 -> 期货明细) /Ermcp/QueryExposureHedgePositionDetail
- * @param req.goodsId  商品id
- * @constructor
- */
-export function QueryExposureHedgePositionDetail(req : ErmcpHedgePositionDetailReq) :Promise<ErmcpHedgePositionDetail[]>{
-    const areaUserId = APP.get('userAccount').memberuserid; // 所属机构id
-    return commonSearch_go('/Ermcp/QueryExposureHedgePositionDetail', {areaUserId, ...req})
-        .catch(err => {
-            throw new Error(`查询敞口->期货头寸->期货明细: ${err.message}`);
-        })
-}
-

src/goServiceAPI/ermcp/inventory-report/index.ts

@@ -1,33 +0,0 @@
-/** ================================= 库存报表 ================================**/
-import APP from '@/services';
-import * as type from './interface';
-import {commonSearch_go} from '@/goServiceAPI/index';
-import {QueryAreaStockReportReq} from "./interface";
-import {QueryAreaStockReportDetailReq} from "./interface";
-/**
- * 查询库存报表
- * @param queryInfo 查询信息 
- * @returns 库存报表
- */
-export async function QueryAreaStockReport(queryInfo:QueryAreaStockReportReq):Promise<type.QueryAreaStockReportRsp[]>
-{
-    try {
-        return commonSearch_go('/Ermcp3/QueryAreaStockReport',  queryInfo );
-    } catch (err) {
-        throw new Error(err.message);
-    }
-}
-
-/**
- * 查询库存明细报表
- * @param queryInfo 查询信息 
- * @returns 库存明细报表
- */
-export async function QueryAreaStockReportDetail(queryInfo:QueryAreaStockReportDetailReq):Promise<type.QueryAreaStockReportDetailRsp[]>
-{
-    try {
-        return commonSearch_go('/Ermcp3/QueryAreaStockReportDetail',  queryInfo );
-    } catch (err) {
-        throw new Error(err.message);
-    }
-}

src/goServiceAPI/ermcp/spot-report/index.ts

@@ -1,64 +0,0 @@
-/** ================================= 现货报表 ================================**/
-import APP from '@/services';
-import * as type from './interface';
-import {commonSearch_go} from '@/goServiceAPI/index';
-import {QuerySpotDayReportReq} from "./interface";
-import {QuerySpotDayReportDetailReq} from "./interface";
-import {QuerySpotMonthReportReq} from "./interface";
-import {QuerySpotMonthReportDetailReq} from "./interface";
-/**
- * 查询现货报表
- * @param queryInfo 查询信息 
- * @returns 现货报表
- */
- export async function QuerySpotDayReport(queryInfo:QuerySpotDayReportReq):Promise<type.QuerySpotDayReportRsp[]>
- {
-     try {
-         return commonSearch_go('/Ermcp/QryReportDaySpot',  queryInfo );
-     } catch (err) {
-         throw new Error(err.message);
-     }
- }
- 
- /**
-  * 查询现货明细报表
-  * @param queryInfo 查询信息 
-  * @returns 现货明细报表
-  */
- export async function QuerySpotDayReportDetail(queryInfo:QuerySpotDayReportDetailReq):Promise<type.QuerySpotDayReportDetailRsp[]>
- {
-     try {
-         return commonSearch_go('/Ermcp/QryReportDaySpotDetail',  queryInfo );
-     } catch (err) {
-         throw new Error(err.message);
-     }
- }
-
-
- /**
- * 查询现货月报表
- * @param queryInfo 查询信息
- * @returns 现货月报表数据
- */
-  export async function QuerySpotMonthReport(queryInfo:QuerySpotMonthReportReq):Promise<type.QuerySpotMonthReportRsp[]>
-  {
-      try {
-          return commonSearch_go('/Ermcp/QryReportMonthSpot', { queryInfo });
-      } catch (err) {
-          throw new Error(err.message);
-      }
-  }
-
-   /**
-  * 查询现货月报表明细
-  * @param queryInfo 查询信息 
-  * @returns 现货月报表明细
-  */
- export async function QuerySpotMonthReportDetail(queryInfo:QuerySpotMonthReportDetailReq):Promise<type.QuerySpotMonthReportDetailRsp[]>
- {
-     try {
-         return commonSearch_go('/Ermcp/QryReportMonthSpotDetail', { queryInfo });
-     } catch (err) {
-         throw new Error(err.message);
-     }
- }

src/services/bus/index.ts

@@ -1,5 +1,5 @@
-import { GetPCMenus, QueryTableDefine } from '@/goServiceAPI/commonService/index';
-import { LoginQuery } from '@/goServiceAPI/useInfo/index';
+import { GetPCMenus, QueryTableDefine } from '@/services/go/commonService/index';
+import { LoginQuery } from '@/services/go/useInfo/index';
 import APP from '@/services';
 import { getAccoutIdList } from '@/services/bus/account';
 import { isLogin } from '@/services/bus/login';
@@ -104,11 +104,11 @@ export async function queryAfterLogin(): Promise<string> {
             }),
             isArea()
                 ? queryAreaRoleMarket().catch((err: string) => {
-                    throw '投资者查根据经纪会员查市场权限 查询失败: ' + err;
-                })
+                      throw '投资者查根据经纪会员查市场权限 查询失败: ' + err;
+                  })
                 : queryTaAccountMarket().catch((err: string) => {
-                    throw '非投资者查资金市场权限 查询失败: ' + err;
-                }),
+                      throw '非投资者查资金市场权限 查询失败: ' + err;
+                  }),
             querySystemParam().catch(() => {
                 throw '查询系统参数 查询失败';
             }),

src/services/bus/login.ts

@@ -1,5 +1,5 @@
-import { GetPCMenus, getServerTime, QueryTableDefine } from '@/goServiceAPI/commonService/index';
-import { GetLoginID, LoginQuery } from '@/goServiceAPI/useInfo/index';
+import { GetPCMenus, getServerTime, QueryTableDefine } from '@/services/go/commonService/index';
+import { GetLoginID, LoginQuery } from '@/services/go/useInfo/index';
 import APP from '@/services';
 import { checkTokenLoop } from '@/services/bus/token';
 import { sessionStorageUtil } from '@/utils/tool/storage/index';

src/services/bus/table.ts

@@ -1,4 +1,4 @@
-import { Column, TableDefineRsp } from '@/goServiceAPI/commonService/interface';
+import { Column, TableDefineRsp } from '@/services/go/commonService/interface';
 import APP from '@/services';
 
 interface CustomRender {
@@ -9,7 +9,7 @@ export interface ColumnType {
     key: string;
     dataIndex: string;
     title: string;
-    align: string;  //  AlignType 对齐方式 - 1:居中对齐 2:左对齐 3:右对齐
+    align: string; //  AlignType 对齐方式 - 1:居中对齐 2:左对齐 3:右对齐
     filteredValue?: string | null;
     slots?: CustomRender;
     onFilter?: Function;
@@ -26,5 +26,5 @@ interface TableKey {
  */
 export function getTableHead(tableKey: keyof TableKey): Column[] {
     const result = APP.get('tableHead').find((e: TableDefineRsp) => e.tablekey === tableKey);
-    return result ? result.columns : []
-}
+    return result ? result.columns : [];
+}

src/services/bus/token.ts

@@ -1,6 +1,6 @@
 import APP from '@/services';
 import { tokenCheck } from '@/services/socket/login/index';
-import timerUtil from '@/utils/tool/timerUtil';
+import timerUtil from '@/utils/timer/timerUtil';
 import { getLoginData } from '@/services/bus/login';
 import Router from '@/router';
 

src/services/dataCenter/initDataModel/account.ts

@@ -1,6 +1,6 @@
 import { LastUpdateTime, TradeDate } from '@/services/dataCenter/interafce/account';
 import Long from 'long';
-import { Loginaccount, Userinfo, Useraccount }from '@/goServiceAPI/useInfo/interface'
+import { Loginaccount, Userinfo, Useraccount } from '@/services/go/useInfo/interface';
 
 /**
  *  获取最后更新时间模型类
@@ -31,41 +31,41 @@ export class UserInfoModel implements Userinfo {
     bankcardfrontphotourl = '';
     bankid = '';
     bankname = '';
-    biznature  = 0;
+    biznature = 0;
     bizscope = '';
     cardbackphotourl = '';
     cardfrontphotourl = '';
     cardnum = '';
-    cardtypeid  = 0;
-    cityid  = 0;
+    cardtypeid = 0;
+    cityid = 0;
     company = '';
     contactname = '';
-    countryid  = 0;
+    countryid = 0;
     createtime = '';
-    creatorid  = 0;
+    creatorid = 0;
     customername = '';
-    districtid  = 0;
+    districtid = 0;
     email = '';
     fax = '';
     halfbodyphotourl = '';
-    hasencrypt  = 0;
+    hasencrypt = 0;
     headurl = '';
     legalcardbackphotourl = '';
     legalcardfrontphotourl = '';
     legalpersonname = '';
     mobile = '';
     mobile2 = '';
-    modifierid  = 0;
+    modifierid = 0;
     modifiertime = '';
-    needinvoice: 1
+    needinvoice: 1;
     nickname = '';
-    openmode  = 0;
+    openmode = 0;
     otherurl = '';
     postalcode = '';
-    provinceid  = 0;
+    provinceid = 0;
     qq = '';
     remark = '';
-    sex  = 0;
+    sex = 0;
     signpdfurl = '';
     telphone = '';
     userid = 0;
@@ -91,8 +91,8 @@ export class TradeDateModel implements TradeDate {
 }
 
 export class LoginaccountModel implements Loginaccount {
-    canoutin  = 0;
-    clientroleid  = 0;
+    canoutin = 0;
+    clientroleid = 0;
     haslogined = 0;
     hasupdatedpwd = 0;
     lastloginip = '';

src/services/dataCenter/interface.ts

@@ -1,5 +1,5 @@
-import { OperationTabMenu, TableDefineRsp } from '@/goServiceAPI/commonService/interface';
-import * as useInfo from '@/goServiceAPI/useInfo/interface';
+import { OperationTabMenu, TableDefineRsp } from '@/services/go/commonService/interface';
+import * as useInfo from '@/services/go/useInfo/interface';
 import * as mineType from '@/services/http/mine/interface';
 import * as Type from '@/services/http/notice/interface';
 import * as advert from '../http/advert/interface';
@@ -35,7 +35,6 @@ export interface NeedClearSourceDataType {
     menus: OperationTabMenu[]; // 交易端菜单
     tableHead: TableDefineRsp[]; // 动态表头
 
-
     queryClientFixedADConfigs: advert.fixedADConfigs[]; //首页图片广告
     checkTokenTimeDiff: number; // 轮休校验token时间差
     accountList: AccountListItem[]; // 资金账户列表

src/goServiceAPI/ermcp/customInfo/index.ts → src/services/go/ermcp/customInfo/index.ts

@@ -1,9 +1,9 @@
 /** ================================= 客户资料 ================================**/
 
-import {BaseResponse, commonSearch_go, commonUpdate_go} from '@/goServiceAPI/index';
+import { BaseResponse, commonSearch_go, commonUpdate_go } from '@/services/go/index';
 import APP from '@/services';
-import {QueryCustomInfoEnum} from './type';
-import {AddUserInfoApplyReq, ModifyUserInfoApplyReq, QueryCustomInfoType} from "./interface";
+import { QueryCustomInfoEnum } from './type';
+import { AddUserInfoApplyReq, ModifyUserInfoApplyReq, QueryCustomInfoType } from './interface';
 
 /**
  * 查询客户资料
@@ -13,10 +13,9 @@ import {AddUserInfoApplyReq, ModifyUserInfoApplyReq, QueryCustomInfoType} from "
  */
 export function QueryCustomInfo(queryType: QueryCustomInfoEnum): Promise<QueryCustomInfoType[]> {
     const MemberUserID = APP.get('userAccount').memberuserid;
-    return commonSearch_go('/Ermcp/QueryUserInfo', {MemberUserID, queryType})
-        .catch(err => {
-            throw new Error(`查询客户资料: ${err.message}`);
-        })
+    return commonSearch_go('/Ermcp/QueryUserInfo', { MemberUserID, queryType }).catch((err) => {
+        throw new Error(`查询客户资料: ${err.message}`);
+    });
 }
 
 /**
@@ -25,10 +24,9 @@ export function QueryCustomInfo(queryType: QueryCustomInfoEnum): Promise<QueryCu
  * @constructor
  */
 export function QueryAddUserInfoApply(userInfoApply: AddUserInfoApplyReq): Promise<BaseResponse> {
-    return commonUpdate_go('/Erms3/AddUserInfoApply', userInfoApply)
-        .catch(err => {
-            throw new Error(`新增客户申请: ${err.message}`);
-        })
+    return commonUpdate_go('/Erms3/AddUserInfoApply', userInfoApply).catch((err) => {
+        throw new Error(`新增客户申请: ${err.message}`);
+    });
 }
 
 /**
@@ -37,10 +35,9 @@ export function QueryAddUserInfoApply(userInfoApply: AddUserInfoApplyReq): Promi
  * @constructor
  */
 export function QueryModifyUserInfoApply(userInfoApply: ModifyUserInfoApplyReq): Promise<BaseResponse> {
-    return commonUpdate_go('/Erms3/ModifyUserInfoApply', userInfoApply)
-        .catch(err => {
-            throw new Error(`修改客户申请: ${err.message}`);
-        })
+    return commonUpdate_go('/Erms3/ModifyUserInfoApply', userInfoApply).catch((err) => {
+        throw new Error(`修改客户申请: ${err.message}`);
+    });
 }
 
 /**
@@ -49,11 +46,7 @@ export function QueryModifyUserInfoApply(userInfoApply: ModifyUserInfoApplyReq):
  * @constructor
  */
 export function QueryDeleteUserInfoApply(userId: number): Promise<BaseResponse> {
-    return commonUpdate_go('/Erms3/DeleteUserInfoApply', {userId}, "get")
-        .catch(err => {
-            throw new Error(`删除客户申请: ${err.message}`);
-        })
+    return commonUpdate_go('/Erms3/DeleteUserInfoApply', { userId }, 'get').catch((err) => {
+        throw new Error(`删除客户申请: ${err.message}`);
+    });
 }
-
-
-

src/goServiceAPI/ermcp/exposure-report/index.ts → src/services/go/ermcp/exposure-report/index.ts

@@ -2,20 +2,18 @@
 
 import APP from '@/services';
 import * as type from './interface';
-import {commonSearch_go} from '@/goServiceAPI/index';
-import {QueryExposureDayReportReq} from "./interface";
+import { commonSearch_go } from '@/services/go/index';
+import { QueryExposureDayReportReq } from './interface';
 
 /**
  * 查询敞口日报表
  * @param queryInfo 查询信息
  * @returns 敞口日报表
  */
-export async function QueryExposureDayReport(queryInfo:QueryExposureDayReportReq):Promise<type.QueryExposureDayReportRsp[]>
-{
+export async function QueryExposureDayReport(queryInfo: QueryExposureDayReportReq): Promise<type.QueryExposureDayReportRsp[]> {
     try {
-        return commonSearch_go('/Ermcp/QryReportDayExposure',  queryInfo );
+        return commonSearch_go('/Ermcp/QryReportDayExposure', queryInfo);
     } catch (err) {
         throw new Error(err.message);
     }
 }
-

src/services/go/ermcp/exposure/index.ts

@@ -0,0 +1,86 @@
+import APP from '@/services';
+import { commonSearch_go } from '@/services/go';
+import { Ermcp3AreaSpot, Ermcp3AreaSpotDetail, Ermcp3AreaSpotDetailReq, Ermcp3ExposureDetail, Ermcp3ExposureReq, ErmcpExposurePostion, ErmcpExposurePostionReq, ErmcpHedgePosition, ErmcpHedgePositionDetail, ErmcpHedgePositionDetailReq, ErmcpRealExposureModel } from '@/services/go/ermcp/exposure/interface';
+
+/** ================================= 敞口 ================================**/
+
+/**
+ * 请求实时敞口 (敞口 -> 实时敞口) /Ermcp/QueryRealtimeExposure
+ * @constructor
+ */
+export function QueryActualExposure(): Promise<ErmcpRealExposureModel[]> {
+    const AreaUserID = APP.get('userAccount').memberuserid; // 所属机构id
+    return commonSearch_go('/Ermcp/QueryRealtimeExposure', { AreaUserID }).catch((err) => {
+        throw new Error(`查询敞口 -> 实时敞口: ${err.message}`);
+    });
+}
+
+/**
+ * 请求实时敞口现货明细信息 (敞口 ->实时敞口 -> 现货明细) /Ermcp3/QueryExposureDetail
+ * @param req.middlegoodsid 套保商品
+ * @constructor
+ */
+export function QueryActualExposureDetail(req: Ermcp3ExposureReq): Promise<Ermcp3ExposureDetail[]> {
+    const areauserid = APP.get('userAccount').memberuserid; // 所属机构id
+    return commonSearch_go('/Ermcp3/QueryExposureDetail', { areauserid, ...req }).catch((err) => {
+        throw new Error(`查询敞口 ->实时敞口 -> 现货明细: ${err.message}`);
+    });
+}
+
+/**
+ * 查询实时敞口期货头寸明细 (敞口 ->实时敞口 -> 期货明细) /Ermcp/QueryRealtimeExposurePosition
+ * @param req.middleGoodsId 套保商品ID
+ * @constructor
+ */
+export function QueryAutualExposurePosition(req: ErmcpExposurePostionReq): Promise<ErmcpExposurePostion[]> {
+    const areaUserId = APP.get('userAccount').memberuserid; // 所属机构id
+    return commonSearch_go('/Ermcp3/QueryExposureDetail', { areaUserId, ...req }).catch((err) => {
+        throw new Error(`查询敞口 ->实时敞口 -> 期货明细: ${err.message}`);
+    });
+}
+
+/**
+ * 请求敞口现货头寸 (敞口 -> 现货头寸) /Ermcp3/QueryExposureSpot
+ * @constructor
+ */
+export function QuerySpotPosition(): Promise<Ermcp3AreaSpot[]> {
+    const areauserid = APP.get('userAccount').memberuserid; // 所属机构id
+    return commonSearch_go('/Ermcp3/QueryExposureSpot', { areauserid }).catch((err) => {
+        throw new Error(`查询敞口 -> 现货头寸: ${err.message}`);
+    });
+}
+
+/**
+ * 查询敞口现货头寸明细(敞口 -> 现货头寸 -> 现货明细) /Ermcp3/QueryExposureSpotDetail
+ * req.deliverygoodsid  现货品种ID
+ * @constructor
+ */
+export function QuerySpotPositionDetail(req: Ermcp3AreaSpotDetailReq): Promise<Ermcp3AreaSpotDetail[]> {
+    const areauserid = APP.get('userAccount').memberuserid; // 所属机构id
+    return commonSearch_go('/Ermcp3/QueryExposureSpotDetail', { areauserid, ...req }).catch((err) => {
+        throw new Error(`查询敞口 -> 现货头寸 -> 现货明细: ${err.message}`);
+    });
+}
+
+/**
+ * 查询敞口期货头寸(菜单:敞口-> 期货头寸) /Ermcp/QueryExposureHedgePosition
+ * @constructor
+ */
+export function QueryExposureHedgePosition(): Promise<ErmcpHedgePosition> {
+    const areaUserId = APP.get('userAccount').memberuserid; // 所属机构id
+    return commonSearch_go('/Ermcp/QueryExposureHedgePosition', { areaUserId }).catch((err) => {
+        throw new Error(`查询敞口 -> 期货头寸: ${err.message}`);
+    });
+}
+
+/**
+ * 查询敞口期货头寸期货明细(菜单:敞口 -> 期货头寸 -> 期货明细) /Ermcp/QueryExposureHedgePositionDetail
+ * @param req.goodsId  商品id
+ * @constructor
+ */
+export function QueryExposureHedgePositionDetail(req: ErmcpHedgePositionDetailReq): Promise<ErmcpHedgePositionDetail[]> {
+    const areaUserId = APP.get('userAccount').memberuserid; // 所属机构id
+    return commonSearch_go('/Ermcp/QueryExposureHedgePositionDetail', { areaUserId, ...req }).catch((err) => {
+        throw new Error(`查询敞口->期货头寸->期货明细: ${err.message}`);
+    });
+}

src/goServiceAPI/ermcp/finance-report/index.ts → src/services/go/ermcp/finance-report/index.ts

@@ -2,19 +2,18 @@
 
 import APP from '@/services';
 import * as type from './interface';
-import {commonSearch_go} from '@/goServiceAPI/index';
-import {QueryFinanceDayReportReq} from "./interface";
-import {QueryFinanceMonthReportReq} from "./interface";
+import { commonSearch_go } from '@/services/go/index';
+import { QueryFinanceDayReportReq } from './interface';
+import { QueryFinanceMonthReportReq } from './interface';
 
 /**
  * 查询财务日报表
  * @param queryInfo 查询信息
  * @returns 财务日报表数据
  */
-export async function QueryFinanceDayReport(queryInfo:QueryFinanceDayReportReq):Promise<type.QueryFinanceDayReportRsp[]>
-{
+export async function QueryFinanceDayReport(queryInfo: QueryFinanceDayReportReq): Promise<type.QueryFinanceDayReportRsp[]> {
     try {
-        return commonSearch_go('/Ermcp/QryReportDayFinance',  queryInfo );
+        return commonSearch_go('/Ermcp/QryReportDayFinance', queryInfo);
     } catch (err) {
         throw new Error(err.message);
     }
@@ -25,10 +24,9 @@ export async function QueryFinanceDayReport(queryInfo:QueryFinanceDayReportReq):
  * @param queryInfo 查询信息
  * @returns 财务发票日报表
  */
-export async function QueryFinanceInvoiceDayReport(queryInfo:QueryFinanceDayReportReq):Promise<type.QueryFinanceInvoiceDayReportRsp[]>
-{
+export async function QueryFinanceInvoiceDayReport(queryInfo: QueryFinanceDayReportReq): Promise<type.QueryFinanceInvoiceDayReportRsp[]> {
     try {
-        return commonSearch_go('/Ermcp/QryReportDayFinanceFp', queryInfo );
+        return commonSearch_go('/Ermcp/QryReportDayFinanceFp', queryInfo);
     } catch (err) {
         throw new Error(err.message);
     }
@@ -39,8 +37,7 @@ export async function QueryFinanceInvoiceDayReport(queryInfo:QueryFinanceDayRepo
  * @param queryInfo 查询信息
  * @returns 财务付款日报表
  */
-export async function QueryFinancePayDayReport(queryInfo:QueryFinanceDayReportReq):Promise<type.QueryFinancePayDayReportRsp[]>
-{
+export async function QueryFinancePayDayReport(queryInfo: QueryFinanceDayReportReq): Promise<type.QueryFinancePayDayReportRsp[]> {
     try {
         return commonSearch_go('/Ermcp/QryReportDayFinanceKx', { queryInfo });
     } catch (err) {
@@ -53,11 +50,10 @@ export async function QueryFinancePayDayReport(queryInfo:QueryFinanceDayReportRe
  * @param queryInfo 查询信息
  * @returns 财务月报表数据
  */
- export async function QueryFinanceMonthReport(queryInfo:QueryFinanceMonthReportReq):Promise<type.QueryFinanceMonthReportRsp[]>
- {
-     try {
-         return commonSearch_go('/Ermcp/QryReportMonthFinance', { queryInfo });
-     } catch (err) {
-         throw new Error(err.message);
-     }
- }
+export async function QueryFinanceMonthReport(queryInfo: QueryFinanceMonthReportReq): Promise<type.QueryFinanceMonthReportRsp[]> {
+    try {
+        return commonSearch_go('/Ermcp/QryReportMonthFinance', { queryInfo });
+    } catch (err) {
+        throw new Error(err.message);
+    }
+}

src/goServiceAPI/ermcp/goodsInfo/index.ts → src/services/go/ermcp/goodsInfo/index.ts

@@ -1,9 +1,8 @@
 /** ================================= 商品信息 ================================**/
 
-
 import APP from '@/services';
-import {commonSearch_go} from '@/goServiceAPI/index';
-import {Ermcp3Brand, Ermcp3Wrstandard, ErmcpDeliveryGoodsReq, ErmcpDeliveryGoodsRsp} from "./interface";
+import { commonSearch_go } from '@/services/go/index';
+import { Ermcp3Brand, Ermcp3Wrstandard, ErmcpDeliveryGoodsReq, ErmcpDeliveryGoodsRsp } from './interface';
 
 /**
  * 查询现货商品 /Ermcp3/QueryDeliveryGoods
@@ -12,10 +11,9 @@ import {Ermcp3Brand, Ermcp3Wrstandard, ErmcpDeliveryGoodsReq, ErmcpDeliveryGoods
  */
 export function QueryDeliveryGoods(req: ErmcpDeliveryGoodsReq): Promise<ErmcpDeliveryGoodsRsp[]> {
     const areauserid = APP.get('userAccount').memberuserid; // 所属机构id
-    return commonSearch_go('/Ermcp3/QueryDeliveryGoods', {areauserid, ...req})
-        .catch(err => {
-            throw new Error(`查询现货商品: ${err.message}`);
-        })
+    return commonSearch_go('/Ermcp3/QueryDeliveryGoods', { areauserid, ...req }).catch((err) => {
+        throw new Error(`查询现货商品: ${err.message}`);
+    });
 }
 
 /**
@@ -25,10 +23,9 @@ export function QueryDeliveryGoods(req: ErmcpDeliveryGoodsReq): Promise<ErmcpDel
  */
 export function QueryGoodsWrstandard(deliverygoodsid: number): Promise<Ermcp3Wrstandard[]> {
     const areauserid = APP.get('userAccount').memberuserid; // 所属机构id
-    return commonSearch_go('/Ermcp3/QueryGoodsWrstandard', {areauserid, deliverygoodsid})
-        .catch(err => {
-            throw new Error(`查询商品品类: ${err.message}`);
-        })
+    return commonSearch_go('/Ermcp3/QueryGoodsWrstandard', { areauserid, deliverygoodsid }).catch((err) => {
+        throw new Error(`查询商品品类: ${err.message}`);
+    });
 }
 
 /**
@@ -37,19 +34,7 @@ export function QueryGoodsWrstandard(deliverygoodsid: number): Promise<Ermcp3Wrs
  */
 export function QueryGoodsbrand(): Promise<Ermcp3Brand[]> {
     const areauserid = APP.get('userAccount').memberuserid; // 所属机构id
-    return commonSearch_go('/Ermcp3/QueryGoodsbrand', {areauserid})
-        .catch(err => {
-            throw new Error(`查询商品品牌: ${err.message}`);
-        })
+    return commonSearch_go('/Ermcp3/QueryGoodsbrand', { areauserid }).catch((err) => {
+        throw new Error(`查询商品品牌: ${err.message}`);
+    });
 }
-
-
-
-
-
-
-
-
-
-
-

src/services/go/ermcp/inventory-report/index.ts

@@ -0,0 +1,31 @@
+/** ================================= 库存报表 ================================**/
+import APP from '@/services';
+import * as type from './interface';
+import { commonSearch_go } from '@/services/go/index';
+import { QueryAreaStockReportReq } from './interface';
+import { QueryAreaStockReportDetailReq } from './interface';
+/**
+ * 查询库存报表
+ * @param queryInfo 查询信息
+ * @returns 库存报表
+ */
+export async function QueryAreaStockReport(queryInfo: QueryAreaStockReportReq): Promise<type.QueryAreaStockReportRsp[]> {
+    try {
+        return commonSearch_go('/Ermcp3/QueryAreaStockReport', queryInfo);
+    } catch (err) {
+        throw new Error(err.message);
+    }
+}
+
+/**
+ * 查询库存明细报表
+ * @param queryInfo 查询信息
+ * @returns 库存明细报表
+ */
+export async function QueryAreaStockReportDetail(queryInfo: QueryAreaStockReportDetailReq): Promise<type.QueryAreaStockReportDetailRsp[]> {
+    try {
+        return commonSearch_go('/Ermcp3/QueryAreaStockReportDetail', queryInfo);
+    } catch (err) {
+        throw new Error(err.message);
+    }
+}

src/goServiceAPI/ermcp/inventory-review/index.ts → src/services/go/ermcp/inventory-review/index.ts

@@ -1,5 +1,5 @@
-import {commonSearch_go} from "@/goServiceAPI";
-import {Ermcp3AreaStockApply, QueryAreaStockApplyReq} from "@/goServiceAPI/ermcp/inventory-review/interface";
+import { commonSearch_go } from '@/services/go';
+import { Ermcp3AreaStockApply, QueryAreaStockApplyReq } from '@/services/go/ermcp/inventory-review/interface';
 
 /** ================================= 库存审核 ================================**/
 
@@ -9,8 +9,7 @@ import {Ermcp3AreaStockApply, QueryAreaStockApplyReq} from "@/goServiceAPI/ermcp
  * @constructor
  */
 export function QueryAreaStock(req: QueryAreaStockApplyReq): Promise<Ermcp3AreaStockApply[]> {
-    return commonSearch_go('/Ermcp3/QueryAreaStockApply', req)
-        .catch(err => {
-            throw new Error(`查询库存申请: ${err.message}`);
-        })
-}
+    return commonSearch_go('/Ermcp3/QueryAreaStockApply', req).catch((err) => {
+        throw new Error(`查询库存申请: ${err.message}`);
+    });
+}

src/goServiceAPI/ermcp/plan/index.ts → src/services/go/ermcp/plan/index.ts

@@ -1,5 +1,5 @@
-import {commonSearch_go} from "@/goServiceAPI";
-import {Ermcp3HedgePlan} from "@/goServiceAPI/ermcp/plan/interface";
+import { commonSearch_go } from '@/services/go';
+import { Ermcp3HedgePlan } from '@/services/go/ermcp/plan/interface';
 
 /** ================================= 计划 ================================**/
 
@@ -10,8 +10,7 @@ import {Ermcp3HedgePlan} from "@/goServiceAPI/ermcp/plan/interface";
  * @constructor
  */
 export function QueryHedgePlan(userId: number, hedgeplanstatus: string): Promise<Ermcp3HedgePlan[]> {
-    return commonSearch_go('/Erms3/QueryHedgePlan', {userId, hedgeplanstatus})
-        .catch(err => {
-            throw new Error(`查询套保计划: ${err.message}`);
-        })
-}
+    return commonSearch_go('/Erms3/QueryHedgePlan', { userId, hedgeplanstatus }).catch((err) => {
+        throw new Error(`查询套保计划: ${err.message}`);
+    });
+}

src/goServiceAPI/ermcp/purchase/index.ts → src/services/go/ermcp/purchase/index.ts

@@ -1,5 +1,5 @@
-import {commonSearch_go} from "@/goServiceAPI";
-import {Ermcp3SellBuyContract, SellBuyContractReq} from "@/goServiceAPI/ermcp/purchase/interface";
+import { commonSearch_go } from '@/services/go';
+import { Ermcp3SellBuyContract, SellBuyContractReq } from '@/services/go/ermcp/purchase/interface';
 
 /** ================================= 采购 ================================**/
 /**
@@ -12,9 +12,8 @@ import {Ermcp3SellBuyContract, SellBuyContractReq} from "@/goServiceAPI/ermcp/pu
  * @param req.contractid 合同ID(SpotContractId)
  * @constructor
  */
-export function QueryPurchase( req : SellBuyContractReq) : Promise<Ermcp3SellBuyContract[]>{
-    return commonSearch_go('/Ermcp3/QuerySpotContractBS', req)
-        .catch(err => {
-            throw new Error(`查询采购信息: ${err.message}`);
-        })
-}
+export function QueryPurchase(req: SellBuyContractReq): Promise<Ermcp3SellBuyContract[]> {
+    return commonSearch_go('/Ermcp3/QuerySpotContractBS', req).catch((err) => {
+        throw new Error(`查询采购信息: ${err.message}`);
+    });
+}

src/goServiceAPI/ermcp/sell/index.ts → src/services/go/ermcp/sell/index.ts

@@ -1,6 +1,6 @@
 /** ================================= 销售 ================================**/
-import {Ermcp3SellBuyContract, SellBuyContractReq} from "@/goServiceAPI/ermcp/purchase/interface";
-import {commonSearch_go} from "@/goServiceAPI";
+import { Ermcp3SellBuyContract, SellBuyContractReq } from '@/services/go/ermcp/purchase/interface';
+import { commonSearch_go } from '@/services/go';
 
 /**
  * 查询销售信息(这个接口和采购是同一个接口) /Ermcp3/QuerySpotContractBS
@@ -12,9 +12,8 @@ import {commonSearch_go} from "@/goServiceAPI";
  * @param req.contractid 合同ID(SpotContractId)
  * @constructor
  */
-export function QueryWareHouse(req : SellBuyContractReq) : Promise<Ermcp3SellBuyContract[]>{
-    return commonSearch_go('/Ermcp3/QuerySpotContractBS', req)
-        .catch(err => {
-            throw new Error(`查询销售信息: ${err.message}`);
-        })
-}
+export function QueryWareHouse(req: SellBuyContractReq): Promise<Ermcp3SellBuyContract[]> {
+    return commonSearch_go('/Ermcp3/QuerySpotContractBS', req).catch((err) => {
+        throw new Error(`查询销售信息: ${err.message}`);
+    });
+}

src/goServiceAPI/ermcp/spot-contract/index.ts → src/services/go/ermcp/spot-contract/index.ts

@@ -1,6 +1,6 @@
 /** ================================= 现货合同 ================================**/
-import { commonSearch_go } from "@/goServiceAPI";
-import { Ermcp3ContractReq, Ermcp3ContractRsp } from "@/goServiceAPI/ermcp/spot-contract/interface";
+import { commonSearch_go } from '@/services/go';
+import { Ermcp3ContractReq, Ermcp3ContractRsp } from '@/services/go/ermcp/spot-contract/interface';
 
 /**
  * 查询现货合同 /Ermcp3/QuerySpotContract
@@ -13,8 +13,7 @@ import { Ermcp3ContractReq, Ermcp3ContractRsp } from "@/goServiceAPI/ermcp/spot-
 export function QuerySpotContract(req: Ermcp3ContractReq): Promise<Ermcp3ContractRsp[]> {
     // const areauserid = APP.get('userAccount').memberuserid; // 所属机构id
     const areauserid = 10000; // 所属机构id
-    return commonSearch_go('/Ermcp3/QuerySpotContract', { areauserid, ...req })
-        .catch(err => {
-            throw new Error(`查询现货合同: ${err.message}`);
-        })
-}
+    return commonSearch_go('/Ermcp3/QuerySpotContract', { areauserid, ...req }).catch((err) => {
+        throw new Error(`查询现货合同: ${err.message}`);
+    });
+}

src/services/go/ermcp/spot-report/index.ts

@@ -0,0 +1,59 @@
+/** ================================= 现货报表 ================================**/
+import APP from '@/services';
+import * as type from './interface';
+import { commonSearch_go } from '@/services/go/index';
+import { QuerySpotDayReportReq } from './interface';
+import { QuerySpotDayReportDetailReq } from './interface';
+import { QuerySpotMonthReportReq } from './interface';
+import { QuerySpotMonthReportDetailReq } from './interface';
+/**
+ * 查询现货报表
+ * @param queryInfo 查询信息
+ * @returns 现货报表
+ */
+export async function QuerySpotDayReport(queryInfo: QuerySpotDayReportReq): Promise<type.QuerySpotDayReportRsp[]> {
+    try {
+        return commonSearch_go('/Ermcp/QryReportDaySpot', queryInfo);
+    } catch (err) {
+        throw new Error(err.message);
+    }
+}
+
+/**
+ * 查询现货明细报表
+ * @param queryInfo 查询信息
+ * @returns 现货明细报表
+ */
+export async function QuerySpotDayReportDetail(queryInfo: QuerySpotDayReportDetailReq): Promise<type.QuerySpotDayReportDetailRsp[]> {
+    try {
+        return commonSearch_go('/Ermcp/QryReportDaySpotDetail', queryInfo);
+    } catch (err) {
+        throw new Error(err.message);
+    }
+}
+
+/**
+ * 查询现货月报表
+ * @param queryInfo 查询信息
+ * @returns 现货月报表数据
+ */
+export async function QuerySpotMonthReport(queryInfo: QuerySpotMonthReportReq): Promise<type.QuerySpotMonthReportRsp[]> {
+    try {
+        return commonSearch_go('/Ermcp/QryReportMonthSpot', { queryInfo });
+    } catch (err) {
+        throw new Error(err.message);
+    }
+}
+
+/**
+ * 查询现货月报表明细
+ * @param queryInfo 查询信息
+ * @returns 现货月报表明细
+ */
+export async function QuerySpotMonthReportDetail(queryInfo: QuerySpotMonthReportDetailReq): Promise<type.QuerySpotMonthReportDetailRsp[]> {
+    try {
+        return commonSearch_go('/Ermcp/QryReportMonthSpotDetail', { queryInfo });
+    } catch (err) {
+        throw new Error(err.message);
+    }
+}

src/goServiceAPI/ermcp/warehouse-info/index.ts → src/services/go/ermcp/warehouse-info/index.ts

@@ -1,6 +1,6 @@
 /** ================================= 仓库信息 ================================**/
-import { commonSearch_go } from "@/goServiceAPI";
-import {Ermcp3AreaStock, ErmcpWareHouseInfo, WareHouseInfoReq} from "@/goServiceAPI/ermcp/warehouse-info/interface";
+import { commonSearch_go } from '@/services/go';
+import { Ermcp3AreaStock, ErmcpWareHouseInfo, WareHouseInfoReq } from '@/services/go/ermcp/warehouse-info/interface';
 
 /**
  * 查询仓库信息 /Ermcp/QueryWarehouseInfo
@@ -9,10 +9,9 @@ import {Ermcp3AreaStock, ErmcpWareHouseInfo, WareHouseInfoReq} from "@/goService
  * @constructor
  */
 export function QueryWareHouse(req: WareHouseInfoReq): Promise<ErmcpWareHouseInfo[]> {
-    return commonSearch_go('/Ermcp/QueryWarehouseInfo', req)
-        .catch(err => {
-            throw new Error(`查询仓库信息: ${err.message}`);
-        })
+    return commonSearch_go('/Ermcp/QueryWarehouseInfo', req).catch((err) => {
+        throw new Error(`查询仓库信息: ${err.message}`);
+    });
 }
 
 /**
@@ -21,8 +20,7 @@ export function QueryWareHouse(req: WareHouseInfoReq): Promise<ErmcpWareHouseInf
  * @constructor
  */
 export function QueryAreaStock(userid: number): Promise<Ermcp3AreaStock[]> {
-    return commonSearch_go('/Ermcp3/QueryAreaStock', {userid})
-        .catch(err => {
-            throw new Error(`查询机构库存(库存管理/当前库存): ${err.message}`);
-        })
-}
+    return commonSearch_go('/Ermcp3/QueryAreaStock', { userid }).catch((err) => {
+        throw new Error(`查询机构库存(库存管理/当前库存): ${err.message}`);
+    });
+}

src/services/http/notice/index.ts

@@ -2,10 +2,10 @@ import { request, goCommonSearchUrl } from '@/utils/request/index';
 import { getLongTypeLoginID } from '@/services/bus/login';
 import { AxiosPromise } from 'axios';
 import * as Type from './interface';
-import timerUtil from '@/utils/tool/timerUtil';
+import timerUtil from '@/utils/timer/timerUtil';
 import APP from '@/services';
 import moment from 'moment';
-import { queryNoticeRsp } from '@/services/http/notice/interface'
+import { queryNoticeRsp } from '@/services/http/notice/interface';
 
 /**
  * 通知公告系统消息查询

src/services/http/quote/index.ts

@@ -2,7 +2,7 @@ import * as type from './interface';
 import { request, goCommonSearchUrl } from '@/utils/request/index';
 import APP from '@/services';
 import { QueryHsbyTopGoodsesReponse } from '@/services/http/goodsList/interface';
-import timerUtil from '@/utils/tool/timerUtil';
+import timerUtil from '@/utils/timer/timerUtil';
 
 /**
  * 查询行情历史数据
@@ -41,10 +41,10 @@ export async function updateQuoteDay() {
     const goodsCodes = list.reduce((accumulator: string, currentValue: QueryHsbyTopGoodsesReponse) => {
         return accumulator + currentValue.goodscode + ',';
     }, '');
-    const codes = goodsCodes ? goodsCodes.substring(0, goodsCodes.length - 1): '';
+    const codes = goodsCodes ? goodsCodes.substring(0, goodsCodes.length - 1) : '';
     if (codes) {
         // 获取盘面
-        QueryQuoteDay(codes).then(quoteDayInfo => {
+        QueryQuoteDay(codes).then((quoteDayInfo) => {
             APP.set('quoteDayInfo', quoteDayInfo);
             // 更新价格
             list.forEach((el: QueryHsbyTopGoodsesReponse) => {

src/services/index.ts

@@ -1,8 +1,8 @@
-import { funCode } from '@/funcode/index';
+import { funCode } from '@/services/funcode/index';
 import { checkTokenLoop } from '@/services/bus/token';
 import { NeedClearSourceDataType, NoClearSourceDataType } from '@/services/dataCenter/interface';
 import { serviceURL } from '@/utils/request/index';
-import timerUtil from '@/utils/tool/timerUtil';
+import timerUtil from '@/utils/timer/timerUtil';
 import { Callback, MTP2WebSocket, ReconnectChangeState } from '@/utils/websocket/index';
 import { Package40, Package50 } from '@/utils/websocket/package';
 import eventBus from '../utils/eventBus';
@@ -29,10 +29,10 @@ export default new (class LifeCycleCtr {
         trade: new MTP2WebSocket<Package50>(1),
     };
 
-    constructor() { }
+    constructor() {}
 
     /** 数据中心初始化 */
-    initDataCenter(): void { }
+    initDataCenter(): void {}
 
     /**
      * 从数据中心获取普通数据

src/services/socket/protobuf/buildReq.ts

@@ -1,6 +1,6 @@
 import ProtobufCtr from '@/services/socket/protobuf/index';
 import { Package50 } from '@/utils/websocket/package';
-import { funCode } from '@/funcode/index';
+import { funCode } from '@/services/funcode/index';
 import { v4 as uuidv4 } from 'uuid';
 import { SoleSearchParam, CommonSearchParam, ParseRsp } from './interface';
 import * as type from './interface';

src/services/socket/quota/adapter/index.ts

@@ -3,7 +3,7 @@ import { getToken } from '@/services/bus/token';
 import { isLogin, getLongTypeLoginID } from '@/services/bus/login';
 import { subscribeInfoType } from '../interface';
 import { Package40 } from '@/utils/websocket/package';
-import { funCode } from '@/funcode/index';
+import { funCode } from '@/services/funcode/index';
 import APP from '@/services';
 import { queryQuoteDay } from '@/services/http/quote/interface';
 import { mergeObjSameProperty } from '@/utils/tool/set';

src/services/socket/quota/index.ts

@@ -1,4 +1,4 @@
-import { funCode } from '@/funcode/index';
+import { funCode } from '@/services/funcode/index';
 import APP from '@/services';
 import { buildSubscribePeq, parseSubscribeRsp } from '@/services/socket/quota/adapter/index';
 import { Callback } from '@/utils/websocket/index';

src/setup/router/index.ts

@@ -1,4 +1,4 @@
-import { OperationTabMenu } from '@/goServiceAPI/commonService/interface';
+import { OperationTabMenu } from '@/services/go/commonService/interface';
 import APP from '@/services';
 import { provide, ref, unref } from 'vue';
 import { Router, useRouter } from 'vue-router';
@@ -7,30 +7,30 @@ import { Router, useRouter } from 'vue-router';
 function mateRouter(router: Router) {
     const menuList = APP.getRef('menus');
     const list = unref(menuList);
-    const pathArr = router.currentRoute.value.fullPath.split('/')
-    let result: OperationTabMenu[] = []
+    const pathArr = router.currentRoute.value.fullPath.split('/');
+    let result: OperationTabMenu[] = [];
     if (pathArr.length > 1) {
         if (list.length && list[0].children && list[0].children.length) {
             const path = pathArr[1];
             for (let i = 0; i < list.length; i++) {
                 for (let j = 0; j < list[i].children.length; j++) {
                     if (path === list[i].children[j].code) {
-                        result = list[i].children[j].children
+                        result = list[i].children[j].children;
                         break;
                     }
                 }
             }
         }
     }
-    return result
+    return result;
 }
 
 export function handleRouterMenu() {
     const router = useRouter();
-    const list = ref<OperationTabMenu[]>([])
+    const list = ref<OperationTabMenu[]>([]);
     // 获取动态路由
     function getMenuList() {
-        list.value = mateRouter(router)
+        list.value = mateRouter(router);
     }
     // 切换路由
     function selectMenu(item: any) {
@@ -38,6 +38,6 @@ export function handleRouterMenu() {
 
         router.push({ name: item.code });
     }
-    provide('thirdMenuList', list)
+    provide('thirdMenuList', list);
     return { list, selectMenu, getMenuList };
-}
+}

src/utils/tool/common.ts

@@ -1,5 +1,5 @@
-import timerUtil from '@/utils/tool/timerUtil';
-import { TimeoutTimerNames } from '@/utils/tool/timerUtil';
+import timerUtil from '@/utils/timer/timerUtil';
+import { TimeoutTimerNames } from '@/utils/timer/timerUtil';
 /**
  * 防抖(debounce)
  * @param fn 需要防抖的函数
@@ -57,12 +57,14 @@ export function changeUnit(value: number, decimals = 3): string {
     if (num <= 4) {
         newValue[1] = '千';
         newValue[0] = parseInt((value / 1000).toFixed(decimals)) + '';
-    } else if (num <= 8) { // 万
+    } else if (num <= 8) {
+        // 万
         const text1 = parseInt((num - 4).toFixed(decimals)) / 3 > 1 ? '千万' : '万';
         const fm = '万' === text1 ? 10000 : 10000000;
         newValue[1] = text1;
-        newValue[0] = (value / fm) + '';
-    } else if (num <= 16) {// 亿
+        newValue[0] = value / fm + '';
+    } else if (num <= 16) {
+        // 亿
         let text1 = (num - 8) / 3 > 1 ? '千亿' : '亿';
         text1 = (num - 8) / 4 > 1 ? '万亿' : text1;
         text1 = (num - 8) / 7 > 1 ? '千万亿' : text1;

src/utils/websocket/index.ts

@@ -1,5 +1,5 @@
 import { Package40, Package50 } from './package';
-import timerUtil from '@/utils/tool/timerUtil';
+import timerUtil from '@/utils/timer/timerUtil';
 /** 重连状态 */
 export enum ReconnectChangeState {
     /** 开始重连 */

src/views/business/purchase/list/forward/index.vue

@@ -1,83 +1,83 @@
 <template>
-  <!-- 采购: 现货头寸-->
-  <div class="spot-contract-peddding">
-    采购: 现货头寸
-  </div>
+    <!-- 采购: 现货头寸-->
+    <div class="spot-contract-peddding">
+        采购: 现货头寸
+    </div>
 </template>
 
 <script lang="ts">
-import { defineComponent, ref } from 'vue';
-import { QueryCustomInfo } from '@/goServiceAPI/ermcp/customInfo/index';
-import { QueryCustomInfoType } from '@/goServiceAPI/ermcp/customInfo/interface';
-import { message } from 'ant-design-vue';
-import { initData } from '@/setup/methods/index';
+    import { defineComponent, ref } from 'vue';
+    import { QueryCustomInfo } from '@/services/go/ermcp/customInfo/index';
+    import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
+    import { message } from 'ant-design-vue';
+    import { initData } from '@/setup/methods/index';
 
-// 查询客户资料列表
-function getCustomList() {
-    // const filteredInfo = ref();
-    // const sortedInfo = ref();
-    // const columns = computed(() => {
-    //     const filtered = filteredInfo.value || {};
-    //     const sorted = sortedInfo.value || {};
-    //     return [
-    //         {
-    //             title: '序号',
-    //             dataIndex: 'index',
-    //             key: 'index',
-    //             align: 'center',
-    //             width: 50,
-    //             customRender: (param: any) => `${param.index + 1}`,
-    //         },
-    //         {
-    //             title: 'Age',
-    //             dataIndex: 'age',
-    //             key: 'age',
-    //             sorter: (a: DataItem, b: DataItem) => a.age - b.age,
-    //             sortOrder: sorted.columnKey === 'age' && sorted.order,
-    //         },
-    //         {
-    //             title: 'Address',
-    //             dataIndex: 'address',
-    //             key: 'address',
-    //             filters: [
-    //                 { text: 'London', value: 'London' },
-    //                 { text: 'New York', value: 'New York' },
-    //             ],
-    //             filteredValue: filtered.address || null,
-    //             onFilter: (value: string, record: DataItem) => record.address.includes(value),
-    //             sorter: (a: DataItem, b: DataItem) => a.address.length - b.address.length,
-    //             sortOrder: sorted.columnKey === 'address' && sorted.order,
-    //             ellipsis: true,
-    //         },
-    //     ];
-    // });
-    const customList = ref<QueryCustomInfoType[]>([]);
-    function actionQuery() {
-        QueryCustomInfo(4)
-            .then((res) => {
-                console.log('L', res);
-            })
-            .catch((err) => message.error(err));
-    }
+    // 查询客户资料列表
+    function getCustomList() {
+        // const filteredInfo = ref();
+        // const sortedInfo = ref();
+        // const columns = computed(() => {
+        //     const filtered = filteredInfo.value || {};
+        //     const sorted = sortedInfo.value || {};
+        //     return [
+        //         {
+        //             title: '序号',
+        //             dataIndex: 'index',
+        //             key: 'index',
+        //             align: 'center',
+        //             width: 50,
+        //             customRender: (param: any) => `${param.index + 1}`,
+        //         },
+        //         {
+        //             title: 'Age',
+        //             dataIndex: 'age',
+        //             key: 'age',
+        //             sorter: (a: DataItem, b: DataItem) => a.age - b.age,
+        //             sortOrder: sorted.columnKey === 'age' && sorted.order,
+        //         },
+        //         {
+        //             title: 'Address',
+        //             dataIndex: 'address',
+        //             key: 'address',
+        //             filters: [
+        //                 { text: 'London', value: 'London' },
+        //                 { text: 'New York', value: 'New York' },
+        //             ],
+        //             filteredValue: filtered.address || null,
+        //             onFilter: (value: string, record: DataItem) => record.address.includes(value),
+        //             sorter: (a: DataItem, b: DataItem) => a.address.length - b.address.length,
+        //             sortOrder: sorted.columnKey === 'address' && sorted.order,
+        //             ellipsis: true,
+        //         },
+        //     ];
+        // });
+        const customList = ref<QueryCustomInfoType[]>([]);
+        function actionQuery() {
+            QueryCustomInfo(4)
+                .then((res) => {
+                    console.log('L', res);
+                })
+                .catch((err) => message.error(err));
+        }
 
-    return { customList, actionQuery };
-}
+        return { customList, actionQuery };
+    }
 
-export default defineComponent({
-    name: 'spot-contract-peddding',
-    components: {},
-    setup() {
-        const { customList, actionQuery } = getCustomList();
-        initData(() => {
-            actionQuery();
-            // 加载数据在这里
-        });
-        return { customList };
-    },
-});
+    export default defineComponent({
+        name: 'spot-contract-peddding',
+        components: {},
+        setup() {
+            const { customList, actionQuery } = getCustomList();
+            initData(() => {
+                actionQuery();
+                // 加载数据在这里
+            });
+            return { customList };
+        },
+    });
 </script>
 
 <style lang="less">
-.spot-contract-peddding {
-}
-</style>;
+    .spot-contract-peddding {
+    }</style
+>;

src/views/business/purchase/list/history/index.vue

@@ -1,83 +1,83 @@
 <template>
-  <!-- 采购: 历史敞口-->
-  <div class="purchase-history">
-    采购:历史敞口
-  </div>
+    <!-- 采购: 历史敞口-->
+    <div class="purchase-history">
+        采购:历史敞口
+    </div>
 </template>
 
 <script lang="ts">
-import { defineComponent, ref } from 'vue';
-import { QueryCustomInfo } from '@/goServiceAPI/ermcp/customInfo/index';
-import { QueryCustomInfoType } from '@/goServiceAPI/ermcp/customInfo/interface';
-import { message } from 'ant-design-vue';
-import { initData } from '@/setup/methods/index';
+    import { defineComponent, ref } from 'vue';
+    import { QueryCustomInfo } from '@/services/go/ermcp/customInfo/index';
+    import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
+    import { message } from 'ant-design-vue';
+    import { initData } from '@/setup/methods/index';
 
-// 查询客户资料列表
-function getCustomList() {
-    // const filteredInfo = ref();
-    // const sortedInfo = ref();
-    // const columns = computed(() => {
-    //     const filtered = filteredInfo.value || {};
-    //     const sorted = sortedInfo.value || {};
-    //     return [
-    //         {
-    //             title: '序号',
-    //             dataIndex: 'index',
-    //             key: 'index',
-    //             align: 'center',
-    //             width: 50,
-    //             customRender: (param: any) => `${param.index + 1}`,
-    //         },
-    //         {
-    //             title: 'Age',
-    //             dataIndex: 'age',
-    //             key: 'age',
-    //             sorter: (a: DataItem, b: DataItem) => a.age - b.age,
-    //             sortOrder: sorted.columnKey === 'age' && sorted.order,
-    //         },
-    //         {
-    //             title: 'Address',
-    //             dataIndex: 'address',
-    //             key: 'address',
-    //             filters: [
-    //                 { text: 'London', value: 'London' },
-    //                 { text: 'New York', value: 'New York' },
-    //             ],
-    //             filteredValue: filtered.address || null,
-    //             onFilter: (value: string, record: DataItem) => record.address.includes(value),
-    //             sorter: (a: DataItem, b: DataItem) => a.address.length - b.address.length,
-    //             sortOrder: sorted.columnKey === 'address' && sorted.order,
-    //             ellipsis: true,
-    //         },
-    //     ];
-    // });
-    const customList = ref<QueryCustomInfoType[]>([]);
-    function actionQuery() {
-        QueryCustomInfo(4)
-            .then((res) => {
-                console.log('L', res);
-            })
-            .catch((err) => message.error(err));
-    }
+    // 查询客户资料列表
+    function getCustomList() {
+        // const filteredInfo = ref();
+        // const sortedInfo = ref();
+        // const columns = computed(() => {
+        //     const filtered = filteredInfo.value || {};
+        //     const sorted = sortedInfo.value || {};
+        //     return [
+        //         {
+        //             title: '序号',
+        //             dataIndex: 'index',
+        //             key: 'index',
+        //             align: 'center',
+        //             width: 50,
+        //             customRender: (param: any) => `${param.index + 1}`,
+        //         },
+        //         {
+        //             title: 'Age',
+        //             dataIndex: 'age',
+        //             key: 'age',
+        //             sorter: (a: DataItem, b: DataItem) => a.age - b.age,
+        //             sortOrder: sorted.columnKey === 'age' && sorted.order,
+        //         },
+        //         {
+        //             title: 'Address',
+        //             dataIndex: 'address',
+        //             key: 'address',
+        //             filters: [
+        //                 { text: 'London', value: 'London' },
+        //                 { text: 'New York', value: 'New York' },
+        //             ],
+        //             filteredValue: filtered.address || null,
+        //             onFilter: (value: string, record: DataItem) => record.address.includes(value),
+        //             sorter: (a: DataItem, b: DataItem) => a.address.length - b.address.length,
+        //             sortOrder: sorted.columnKey === 'address' && sorted.order,
+        //             ellipsis: true,
+        //         },
+        //     ];
+        // });
+        const customList = ref<QueryCustomInfoType[]>([]);
+        function actionQuery() {
+            QueryCustomInfo(4)
+                .then((res) => {
+                    console.log('L', res);
+                })
+                .catch((err) => message.error(err));
+        }
 
-    return { customList, actionQuery };
-}
+        return { customList, actionQuery };
+    }
 
-export default defineComponent({
-    name: 'purchase-history',
-    components: {},
-    setup() {
-        const { customList, actionQuery } = getCustomList();
-        initData(() => {
-            actionQuery();
-            // 加载数据在这里
-        });
-        return { customList };
-    },
-});
+    export default defineComponent({
+        name: 'purchase-history',
+        components: {},
+        setup() {
+            const { customList, actionQuery } = getCustomList();
+            initData(() => {
+                actionQuery();
+                // 加载数据在这里
+            });
+            return { customList };
+        },
+    });
 </script>
 
 <style lang="less">
-.purchase-history {
-}
-</style>;
+    .purchase-history {
+    }</style
+>;

src/views/business/purchase/list/real-time/index.vue

@@ -1,83 +1,83 @@
 <template>
-  <!-- 采购: 实时敞口-->
-  <div class="purchase-real-time">
-    采购: 实时敞口
-  </div>
+    <!-- 采购: 实时敞口-->
+    <div class="purchase-real-time">
+        采购: 实时敞口
+    </div>
 </template>
 
 <script lang="ts">
-import { defineComponent, ref } from 'vue';
-import { QueryCustomInfo } from '@/goServiceAPI/ermcp/customInfo/index';
-import { QueryCustomInfoType } from '@/goServiceAPI/ermcp/customInfo/interface';
-import { message } from 'ant-design-vue';
-import { initData } from '@/setup/methods/index';
+    import { defineComponent, ref } from 'vue';
+    import { QueryCustomInfo } from '@/services/go/ermcp/customInfo/index';
+    import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
+    import { message } from 'ant-design-vue';
+    import { initData } from '@/setup/methods/index';
 
-// 查询客户资料列表
-function getCustomList() {
-    // const filteredInfo = ref();
-    // const sortedInfo = ref();
-    // const columns = computed(() => {
-    //     const filtered = filteredInfo.value || {};
-    //     const sorted = sortedInfo.value || {};
-    //     return [
-    //         {
-    //             title: '序号',
-    //             dataIndex: 'index',
-    //             key: 'index',
-    //             align: 'center',
-    //             width: 50,
-    //             customRender: (param: any) => `${param.index + 1}`,
-    //         },
-    //         {
-    //             title: 'Age',
-    //             dataIndex: 'age',
-    //             key: 'age',
-    //             sorter: (a: DataItem, b: DataItem) => a.age - b.age,
-    //             sortOrder: sorted.columnKey === 'age' && sorted.order,
-    //         },
-    //         {
-    //             title: 'Address',
-    //             dataIndex: 'address',
-    //             key: 'address',
-    //             filters: [
-    //                 { text: 'London', value: 'London' },
-    //                 { text: 'New York', value: 'New York' },
-    //             ],
-    //             filteredValue: filtered.address || null,
-    //             onFilter: (value: string, record: DataItem) => record.address.includes(value),
-    //             sorter: (a: DataItem, b: DataItem) => a.address.length - b.address.length,
-    //             sortOrder: sorted.columnKey === 'address' && sorted.order,
-    //             ellipsis: true,
-    //         },
-    //     ];
-    // });
-    const customList = ref<QueryCustomInfoType[]>([]);
-    function actionQuery() {
-        QueryCustomInfo(4)
-            .then((res) => {
-                console.log('L', res);
-            })
-            .catch((err) => message.error(err));
-    }
+    // 查询客户资料列表
+    function getCustomList() {
+        // const filteredInfo = ref();
+        // const sortedInfo = ref();
+        // const columns = computed(() => {
+        //     const filtered = filteredInfo.value || {};
+        //     const sorted = sortedInfo.value || {};
+        //     return [
+        //         {
+        //             title: '序号',
+        //             dataIndex: 'index',
+        //             key: 'index',
+        //             align: 'center',
+        //             width: 50,
+        //             customRender: (param: any) => `${param.index + 1}`,
+        //         },
+        //         {
+        //             title: 'Age',
+        //             dataIndex: 'age',
+        //             key: 'age',
+        //             sorter: (a: DataItem, b: DataItem) => a.age - b.age,
+        //             sortOrder: sorted.columnKey === 'age' && sorted.order,
+        //         },
+        //         {
+        //             title: 'Address',
+        //             dataIndex: 'address',
+        //             key: 'address',
+        //             filters: [
+        //                 { text: 'London', value: 'London' },
+        //                 { text: 'New York', value: 'New York' },
+        //             ],
+        //             filteredValue: filtered.address || null,
+        //             onFilter: (value: string, record: DataItem) => record.address.includes(value),
+        //             sorter: (a: DataItem, b: DataItem) => a.address.length - b.address.length,
+        //             sortOrder: sorted.columnKey === 'address' && sorted.order,
+        //             ellipsis: true,
+        //         },
+        //     ];
+        // });
+        const customList = ref<QueryCustomInfoType[]>([]);
+        function actionQuery() {
+            QueryCustomInfo(4)
+                .then((res) => {
+                    console.log('L', res);
+                })
+                .catch((err) => message.error(err));
+        }
 
-    return { customList, actionQuery };
-}
+        return { customList, actionQuery };
+    }
 
-export default defineComponent({
-    name: 'purchase-real-time',
-    components: {},
-    setup() {
-        const { customList, actionQuery } = getCustomList();
-        initData(() => {
-            actionQuery();
-            // 加载数据在这里
-        });
-        return { customList };
-    },
-});
+    export default defineComponent({
+        name: 'purchase-real-time',
+        components: {},
+        setup() {
+            const { customList, actionQuery } = getCustomList();
+            initData(() => {
+                actionQuery();
+                // 加载数据在这里
+            });
+            return { customList };
+        },
+    });
 </script>
 
 <style lang="less">
-.purchase-real-time {
-}
-</style>;
+    .purchase-real-time {
+    }</style
+>;

src/views/business/purchase/list/spot/index.vue

@@ -1,83 +1,83 @@
 <template>
-  <!-- 采购: 现货头寸-->
-  <div class="purchase-spot-position">
-    采购: 现货头寸
-  </div>
+    <!-- 采购: 现货头寸-->
+    <div class="purchase-spot-position">
+        采购: 现货头寸
+    </div>
 </template>
 
 <script lang="ts">
-import { defineComponent, ref } from 'vue';
-import { QueryCustomInfo } from '@/goServiceAPI/ermcp/customInfo/index';
-import { QueryCustomInfoType } from '@/goServiceAPI/ermcp/customInfo/interface';
-import { message } from 'ant-design-vue';
-import { initData } from '@/setup/methods/index';
+    import { defineComponent, ref } from 'vue';
+    import { QueryCustomInfo } from '@/services/go/ermcp/customInfo/index';
+    import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
+    import { message } from 'ant-design-vue';
+    import { initData } from '@/setup/methods/index';
 
-// 查询客户资料列表
-function getCustomList() {
-    // const filteredInfo = ref();
-    // const sortedInfo = ref();
-    // const columns = computed(() => {
-    //     const filtered = filteredInfo.value || {};
-    //     const sorted = sortedInfo.value || {};
-    //     return [
-    //         {
-    //             title: '序号',
-    //             dataIndex: 'index',
-    //             key: 'index',
-    //             align: 'center',
-    //             width: 50,
-    //             customRender: (param: any) => `${param.index + 1}`,
-    //         },
-    //         {
-    //             title: 'Age',
-    //             dataIndex: 'age',
-    //             key: 'age',
-    //             sorter: (a: DataItem, b: DataItem) => a.age - b.age,
-    //             sortOrder: sorted.columnKey === 'age' && sorted.order,
-    //         },
-    //         {
-    //             title: 'Address',
-    //             dataIndex: 'address',
-    //             key: 'address',
-    //             filters: [
-    //                 { text: 'London', value: 'London' },
-    //                 { text: 'New York', value: 'New York' },
-    //             ],
-    //             filteredValue: filtered.address || null,
-    //             onFilter: (value: string, record: DataItem) => record.address.includes(value),
-    //             sorter: (a: DataItem, b: DataItem) => a.address.length - b.address.length,
-    //             sortOrder: sorted.columnKey === 'address' && sorted.order,
-    //             ellipsis: true,
-    //         },
-    //     ];
-    // });
-    const customList = ref<QueryCustomInfoType[]>([]);
-    function actionQuery() {
-        QueryCustomInfo(4)
-            .then((res) => {
-                console.log('L', res);
-            })
-            .catch((err) => message.error(err));
-    }
+    // 查询客户资料列表
+    function getCustomList() {
+        // const filteredInfo = ref();
+        // const sortedInfo = ref();
+        // const columns = computed(() => {
+        //     const filtered = filteredInfo.value || {};
+        //     const sorted = sortedInfo.value || {};
+        //     return [
+        //         {
+        //             title: '序号',
+        //             dataIndex: 'index',
+        //             key: 'index',
+        //             align: 'center',
+        //             width: 50,
+        //             customRender: (param: any) => `${param.index + 1}`,
+        //         },
+        //         {
+        //             title: 'Age',
+        //             dataIndex: 'age',
+        //             key: 'age',
+        //             sorter: (a: DataItem, b: DataItem) => a.age - b.age,
+        //             sortOrder: sorted.columnKey === 'age' && sorted.order,
+        //         },
+        //         {
+        //             title: 'Address',
+        //             dataIndex: 'address',
+        //             key: 'address',
+        //             filters: [
+        //                 { text: 'London', value: 'London' },
+        //                 { text: 'New York', value: 'New York' },
+        //             ],
+        //             filteredValue: filtered.address || null,
+        //             onFilter: (value: string, record: DataItem) => record.address.includes(value),
+        //             sorter: (a: DataItem, b: DataItem) => a.address.length - b.address.length,
+        //             sortOrder: sorted.columnKey === 'address' && sorted.order,
+        //             ellipsis: true,
+        //         },
+        //     ];
+        // });
+        const customList = ref<QueryCustomInfoType[]>([]);
+        function actionQuery() {
+            QueryCustomInfo(4)
+                .then((res) => {
+                    console.log('L', res);
+                })
+                .catch((err) => message.error(err));
+        }
 
-    return { customList, actionQuery };
-}
+        return { customList, actionQuery };
+    }
 
-export default defineComponent({
-    name: 'purchase-spot-position',
-    components: {},
-    setup() {
-        const { customList, actionQuery } = getCustomList();
-        initData(() => {
-            actionQuery();
-            // 加载数据在这里
-        });
-        return { customList };
-    },
-});
+    export default defineComponent({
+        name: 'purchase-spot-position',
+        components: {},
+        setup() {
+            const { customList, actionQuery } = getCustomList();
+            initData(() => {
+                actionQuery();
+                // 加载数据在这里
+            });
+            return { customList };
+        },
+    });
 </script>
 
 <style lang="less">
-.purchase-spot-position {
-}
-</style>;
+    .purchase-spot-position {
+    }</style
+>;

src/views/information/custom/list/setup.ts

@@ -1,7 +1,7 @@
-import { OperationTabMenu } from '@/goServiceAPI/commonService/interface';
-import { QueryCustomInfo } from '@/goServiceAPI/ermcp/customInfo';
-import { QueryCustomInfoType } from '@/goServiceAPI/ermcp/customInfo/interface';
-import { QueryCustomInfoEnum } from '@/goServiceAPI/ermcp/customInfo/type';
+import { OperationTabMenu } from '@/services/go/commonService/interface';
+import { QueryCustomInfo } from '@/services/go/ermcp/customInfo';
+import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
+import { QueryCustomInfoEnum } from '@/services/go/ermcp/customInfo/type';
 import { ColumnType, getTableHead } from '@/services/bus/table';
 import { message } from 'ant-design-vue';
 import { inject, Ref, ref } from 'vue';
@@ -15,7 +15,7 @@ export function getCustomList() {
     // 过滤项
     const filteredInfo = ref();
     const loading = ref<boolean>(false);
-    const permissionData = inject('thirdMenuList') as Ref<OperationTabMenu[]>
+    const permissionData = inject('thirdMenuList') as Ref<OperationTabMenu[]>;
     // 获取表头
     function getColumns() {
         const list = getTableHead('table_pcweb_userinfo');
@@ -73,10 +73,10 @@ export function getCustomList() {
     }
 
     // 处理按钮是否有权限
-    type customType = 'custom_info_normal' | 'custom_info_disabled' // 正常 | 停用
+    type customType = 'custom_info_normal' | 'custom_info_disabled'; // 正常 | 停用
     function handlePermission(menuType: customType) {
         // 添加 | 修改 | 停用 | "恢复" | "删除"
-        type codeType = 'custom_info_btn_add' | 'custom_info_btn_modify' | 'custom_info_btn_disable' | "custom_info_btn_recover" | "custom_info_btn_delete";
+        type codeType = 'custom_info_btn_add' | 'custom_info_btn_modify' | 'custom_info_btn_disable' | 'custom_info_btn_recover' | 'custom_info_btn_delete';
 
         // 判断按钮是否有权限
         function hasPermission(type: codeType): boolean {
@@ -92,4 +92,4 @@ export function getCustomList() {
         return { hasPermission };
     }
     return { customList, actionQuery, columns, filteredInfo, getColumns, search, loading, handlePermission };
-}
+}

src/views/information/spot-contract/list/done/index.vue

@@ -1,83 +1,83 @@
 <template>
-  <!-- 现货合同: 已完成-->
-  <div class="spot-contract-done">
-    客户信息: 已完成
-  </div>
+    <!-- 现货合同: 已完成-->
+    <div class="spot-contract-done">
+        客户信息: 已完成
+    </div>
 </template>
 
 <script lang="ts">
-import { defineComponent, ref } from 'vue';
-import { QueryCustomInfo } from '@/goServiceAPI/ermcp/customInfo/index';
-import { QueryCustomInfoType } from '@/goServiceAPI/ermcp/customInfo/interface';
-import { message } from 'ant-design-vue';
-import { initData } from '@/setup/methods/index';
+    import { defineComponent, ref } from 'vue';
+    import { QueryCustomInfo } from '@/services/go/ermcp/customInfo/index';
+    import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
+    import { message } from 'ant-design-vue';
+    import { initData } from '@/setup/methods/index';
 
-// 查询客户资料列表
-function getCustomList() {
-    // const filteredInfo = ref();
-    // const sortedInfo = ref();
-    // const columns = computed(() => {
-    //     const filtered = filteredInfo.value || {};
-    //     const sorted = sortedInfo.value || {};
-    //     return [
-    //         {
-    //             title: '序号',
-    //             dataIndex: 'index',
-    //             key: 'index',
-    //             align: 'center',
-    //             width: 50,
-    //             customRender: (param: any) => `${param.index + 1}`,
-    //         },
-    //         {
-    //             title: 'Age',
-    //             dataIndex: 'age',
-    //             key: 'age',
-    //             sorter: (a: DataItem, b: DataItem) => a.age - b.age,
-    //             sortOrder: sorted.columnKey === 'age' && sorted.order,
-    //         },
-    //         {
-    //             title: 'Address',
-    //             dataIndex: 'address',
-    //             key: 'address',
-    //             filters: [
-    //                 { text: 'London', value: 'London' },
-    //                 { text: 'New York', value: 'New York' },
-    //             ],
-    //             filteredValue: filtered.address || null,
-    //             onFilter: (value: string, record: DataItem) => record.address.includes(value),
-    //             sorter: (a: DataItem, b: DataItem) => a.address.length - b.address.length,
-    //             sortOrder: sorted.columnKey === 'address' && sorted.order,
-    //             ellipsis: true,
-    //         },
-    //     ];
-    // });
-    const customList = ref<QueryCustomInfoType[]>([]);
-    function actionQuery() {
-        QueryCustomInfo(4)
-            .then((res) => {
-                console.log('L', res);
-            })
-            .catch((err) => message.error(err));
-    }
+    // 查询客户资料列表
+    function getCustomList() {
+        // const filteredInfo = ref();
+        // const sortedInfo = ref();
+        // const columns = computed(() => {
+        //     const filtered = filteredInfo.value || {};
+        //     const sorted = sortedInfo.value || {};
+        //     return [
+        //         {
+        //             title: '序号',
+        //             dataIndex: 'index',
+        //             key: 'index',
+        //             align: 'center',
+        //             width: 50,
+        //             customRender: (param: any) => `${param.index + 1}`,
+        //         },
+        //         {
+        //             title: 'Age',
+        //             dataIndex: 'age',
+        //             key: 'age',
+        //             sorter: (a: DataItem, b: DataItem) => a.age - b.age,
+        //             sortOrder: sorted.columnKey === 'age' && sorted.order,
+        //         },
+        //         {
+        //             title: 'Address',
+        //             dataIndex: 'address',
+        //             key: 'address',
+        //             filters: [
+        //                 { text: 'London', value: 'London' },
+        //                 { text: 'New York', value: 'New York' },
+        //             ],
+        //             filteredValue: filtered.address || null,
+        //             onFilter: (value: string, record: DataItem) => record.address.includes(value),
+        //             sorter: (a: DataItem, b: DataItem) => a.address.length - b.address.length,
+        //             sortOrder: sorted.columnKey === 'address' && sorted.order,
+        //             ellipsis: true,
+        //         },
+        //     ];
+        // });
+        const customList = ref<QueryCustomInfoType[]>([]);
+        function actionQuery() {
+            QueryCustomInfo(4)
+                .then((res) => {
+                    console.log('L', res);
+                })
+                .catch((err) => message.error(err));
+        }
 
-    return { customList, actionQuery };
-}
+        return { customList, actionQuery };
+    }
 
-export default defineComponent({
-    name: 'spot-contract-done',
-    components: {},
-    setup() {
-        const { customList, actionQuery } = getCustomList();
-        initData(() => {
-            actionQuery();
-            // 加载数据在这里
-        });
-        return { customList };
-    },
-});
+    export default defineComponent({
+        name: 'spot-contract-done',
+        components: {},
+        setup() {
+            const { customList, actionQuery } = getCustomList();
+            initData(() => {
+                actionQuery();
+                // 加载数据在这里
+            });
+            return { customList };
+        },
+    });
 </script>
 
 <style lang="less">
-.spot-contract-done {
-}
-</style>;
+    .spot-contract-done {
+    }</style
+>;

src/views/information/spot-contract/list/peddding/index.vue

@@ -1,83 +1,83 @@
 <template>
-  <!-- 现货合同: 待审核-->
-  <div class="spot-contract-peddding">
-    现货合同: 待审核
-  </div>
+    <!-- 现货合同: 待审核-->
+    <div class="spot-contract-peddding">
+        现货合同: 待审核
+    </div>
 </template>
 
 <script lang="ts">
-import { defineComponent, ref } from 'vue';
-import { QueryCustomInfo } from '@/goServiceAPI/ermcp/customInfo/index';
-import { QueryCustomInfoType } from '@/goServiceAPI/ermcp/customInfo/interface';
-import { message } from 'ant-design-vue';
-import { initData } from '@/setup/methods/index';
+    import { defineComponent, ref } from 'vue';
+    import { QueryCustomInfo } from '@/services/go/ermcp/customInfo/index';
+    import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
+    import { message } from 'ant-design-vue';
+    import { initData } from '@/setup/methods/index';
 
-// 查询客户资料列表
-function getCustomList() {
-    // const filteredInfo = ref();
-    // const sortedInfo = ref();
-    // const columns = computed(() => {
-    //     const filtered = filteredInfo.value || {};
-    //     const sorted = sortedInfo.value || {};
-    //     return [
-    //         {
-    //             title: '序号',
-    //             dataIndex: 'index',
-    //             key: 'index',
-    //             align: 'center',
-    //             width: 50,
-    //             customRender: (param: any) => `${param.index + 1}`,
-    //         },
-    //         {
-    //             title: 'Age',
-    //             dataIndex: 'age',
-    //             key: 'age',
-    //             sorter: (a: DataItem, b: DataItem) => a.age - b.age,
-    //             sortOrder: sorted.columnKey === 'age' && sorted.order,
-    //         },
-    //         {
-    //             title: 'Address',
-    //             dataIndex: 'address',
-    //             key: 'address',
-    //             filters: [
-    //                 { text: 'London', value: 'London' },
-    //                 { text: 'New York', value: 'New York' },
-    //             ],
-    //             filteredValue: filtered.address || null,
-    //             onFilter: (value: string, record: DataItem) => record.address.includes(value),
-    //             sorter: (a: DataItem, b: DataItem) => a.address.length - b.address.length,
-    //             sortOrder: sorted.columnKey === 'address' && sorted.order,
-    //             ellipsis: true,
-    //         },
-    //     ];
-    // });
-    const customList = ref<QueryCustomInfoType[]>([]);
-    function actionQuery() {
-        QueryCustomInfo(4)
-            .then((res) => {
-                console.log('L', res);
-            })
-            .catch((err) => message.error(err));
-    }
+    // 查询客户资料列表
+    function getCustomList() {
+        // const filteredInfo = ref();
+        // const sortedInfo = ref();
+        // const columns = computed(() => {
+        //     const filtered = filteredInfo.value || {};
+        //     const sorted = sortedInfo.value || {};
+        //     return [
+        //         {
+        //             title: '序号',
+        //             dataIndex: 'index',
+        //             key: 'index',
+        //             align: 'center',
+        //             width: 50,
+        //             customRender: (param: any) => `${param.index + 1}`,
+        //         },
+        //         {
+        //             title: 'Age',
+        //             dataIndex: 'age',
+        //             key: 'age',
+        //             sorter: (a: DataItem, b: DataItem) => a.age - b.age,
+        //             sortOrder: sorted.columnKey === 'age' && sorted.order,
+        //         },
+        //         {
+        //             title: 'Address',
+        //             dataIndex: 'address',
+        //             key: 'address',
+        //             filters: [
+        //                 { text: 'London', value: 'London' },
+        //                 { text: 'New York', value: 'New York' },
+        //             ],
+        //             filteredValue: filtered.address || null,
+        //             onFilter: (value: string, record: DataItem) => record.address.includes(value),
+        //             sorter: (a: DataItem, b: DataItem) => a.address.length - b.address.length,
+        //             sortOrder: sorted.columnKey === 'address' && sorted.order,
+        //             ellipsis: true,
+        //         },
+        //     ];
+        // });
+        const customList = ref<QueryCustomInfoType[]>([]);
+        function actionQuery() {
+            QueryCustomInfo(4)
+                .then((res) => {
+                    console.log('L', res);
+                })
+                .catch((err) => message.error(err));
+        }
 
-    return { customList, actionQuery };
-}
+        return { customList, actionQuery };
+    }
 
-export default defineComponent({
-    name: 'spot-contract-peddding',
-    components: {},
-    setup() {
-        const { customList, actionQuery } = getCustomList();
-        initData(() => {
-            actionQuery();
-            // 加载数据在这里
-        });
-        return { customList };
-    },
-});
+    export default defineComponent({
+        name: 'spot-contract-peddding',
+        components: {},
+        setup() {
+            const { customList, actionQuery } = getCustomList();
+            initData(() => {
+                actionQuery();
+                // 加载数据在这里
+            });
+            return { customList };
+        },
+    });
 </script>
 
 <style lang="less">
-.spot-contract-peddding {
-}
-</style>;
+    .spot-contract-peddding {
+    }</style
+>;

src/views/information/spot-contract/list/performance/index.vue

@@ -1,83 +1,83 @@
 <template>
-  <!-- 现货合同: 履约中-->
-  <div class="spot-contract-performance">
-    客户信息: 履约中
-  </div>
+    <!-- 现货合同: 履约中-->
+    <div class="spot-contract-performance">
+        客户信息: 履约中
+    </div>
 </template>
 
 <script lang="ts">
-import { defineComponent, ref } from 'vue';
-import { QueryCustomInfo } from '@/goServiceAPI/ermcp/customInfo/index';
-import { QueryCustomInfoType } from '@/goServiceAPI/ermcp/customInfo/interface';
-import { message } from 'ant-design-vue';
-import { initData } from '@/setup/methods/index';
+    import { defineComponent, ref } from 'vue';
+    import { QueryCustomInfo } from '@/services/go/ermcp/customInfo/index';
+    import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
+    import { message } from 'ant-design-vue';
+    import { initData } from '@/setup/methods/index';
 
-// 查询客户资料列表
-function getCustomList() {
-    // const filteredInfo = ref();
-    // const sortedInfo = ref();
-    // const columns = computed(() => {
-    //     const filtered = filteredInfo.value || {};
-    //     const sorted = sortedInfo.value || {};
-    //     return [
-    //         {
-    //             title: '序号',
-    //             dataIndex: 'index',
-    //             key: 'index',
-    //             align: 'center',
-    //             width: 50,
-    //             customRender: (param: any) => `${param.index + 1}`,
-    //         },
-    //         {
-    //             title: 'Age',
-    //             dataIndex: 'age',
-    //             key: 'age',
-    //             sorter: (a: DataItem, b: DataItem) => a.age - b.age,
-    //             sortOrder: sorted.columnKey === 'age' && sorted.order,
-    //         },
-    //         {
-    //             title: 'Address',
-    //             dataIndex: 'address',
-    //             key: 'address',
-    //             filters: [
-    //                 { text: 'London', value: 'London' },
-    //                 { text: 'New York', value: 'New York' },
-    //             ],
-    //             filteredValue: filtered.address || null,
-    //             onFilter: (value: string, record: DataItem) => record.address.includes(value),
-    //             sorter: (a: DataItem, b: DataItem) => a.address.length - b.address.length,
-    //             sortOrder: sorted.columnKey === 'address' && sorted.order,
-    //             ellipsis: true,
-    //         },
-    //     ];
-    // });
-    const customList = ref<QueryCustomInfoType[]>([]);
-    function actionQuery() {
-        QueryCustomInfo(4)
-            .then((res) => {
-                console.log('L', res);
-            })
-            .catch((err) => message.error(err));
-    }
+    // 查询客户资料列表
+    function getCustomList() {
+        // const filteredInfo = ref();
+        // const sortedInfo = ref();
+        // const columns = computed(() => {
+        //     const filtered = filteredInfo.value || {};
+        //     const sorted = sortedInfo.value || {};
+        //     return [
+        //         {
+        //             title: '序号',
+        //             dataIndex: 'index',
+        //             key: 'index',
+        //             align: 'center',
+        //             width: 50,
+        //             customRender: (param: any) => `${param.index + 1}`,
+        //         },
+        //         {
+        //             title: 'Age',
+        //             dataIndex: 'age',
+        //             key: 'age',
+        //             sorter: (a: DataItem, b: DataItem) => a.age - b.age,
+        //             sortOrder: sorted.columnKey === 'age' && sorted.order,
+        //         },
+        //         {
+        //             title: 'Address',
+        //             dataIndex: 'address',
+        //             key: 'address',
+        //             filters: [
+        //                 { text: 'London', value: 'London' },
+        //                 { text: 'New York', value: 'New York' },
+        //             ],
+        //             filteredValue: filtered.address || null,
+        //             onFilter: (value: string, record: DataItem) => record.address.includes(value),
+        //             sorter: (a: DataItem, b: DataItem) => a.address.length - b.address.length,
+        //             sortOrder: sorted.columnKey === 'address' && sorted.order,
+        //             ellipsis: true,
+        //         },
+        //     ];
+        // });
+        const customList = ref<QueryCustomInfoType[]>([]);
+        function actionQuery() {
+            QueryCustomInfo(4)
+                .then((res) => {
+                    console.log('L', res);
+                })
+                .catch((err) => message.error(err));
+        }
 
-    return { customList, actionQuery };
-}
+        return { customList, actionQuery };
+    }
 
-export default defineComponent({
-    name: 'spot-contract-performance',
-    components: {},
-    setup() {
-        const { customList, actionQuery } = getCustomList();
-        initData(() => {
-            actionQuery();
-            // 加载数据在这里
-        });
-        return { customList };
-    },
-});
+    export default defineComponent({
+        name: 'spot-contract-performance',
+        components: {},
+        setup() {
+            const { customList, actionQuery } = getCustomList();
+            initData(() => {
+                actionQuery();
+                // 加载数据在这里
+            });
+            return { customList };
+        },
+    });
 </script>
 
 <style lang="less">
-.spot-contract-performance {
-}
-</style>;
+    .spot-contract-performance {
+    }</style
+>;

src/views/information/spot-contract/list/setup.ts

@@ -1,6 +1,6 @@
-import { OperationTabMenu } from '@/goServiceAPI/commonService/interface';
-import { QuerySpotContract } from '@/goServiceAPI/ermcp/spot-contract/index';
-import { Ermcp3ContractRsp } from '@/goServiceAPI/ermcp/spot-contract/interface';
+import { OperationTabMenu } from '@/services/go/commonService/interface';
+import { QuerySpotContract } from '@/services/go/ermcp/spot-contract/index';
+import { Ermcp3ContractRsp } from '@/services/go/ermcp/spot-contract/interface';
 import { ColumnType, getTableHead } from '@/services/bus/table';
 import { message } from 'ant-design-vue';
 import { inject, Ref, ref } from 'vue';
@@ -14,7 +14,7 @@ export function getCustomList() {
     // 过滤项
     const filteredInfo = ref();
     const loading = ref<boolean>(false);
-    const permissionData = inject('thirdMenuList') as Ref<OperationTabMenu[]>
+    const permissionData = inject('thirdMenuList') as Ref<OperationTabMenu[]>;
     // 获取表头
     function getColumns() {
         const list = getTableHead('table_pcweb_delivery');
@@ -31,11 +31,11 @@ export function getCustomList() {
             };
             // 以下添加过滤数据对应的方法
             if (e.columntitle === '类型') {
-                item.onFilter = (value: string, record: Ermcp3ContractRsp) => String(record.contracttype).includes(value)
+                item.onFilter = (value: string, record: Ermcp3ContractRsp) => String(record.contracttype).includes(value);
                 item.filteredValue = filtered.contracttype || null;
             }
             if (e.columntitle === '定价类型') {
-                item.onFilter = (value: string, record: Ermcp3ContractRsp) => String(record.pricetype).includes(value)
+                item.onFilter = (value: string, record: Ermcp3ContractRsp) => String(record.pricetype).includes(value);
                 item.filteredValue = filtered.pricetype || null;
             }
             if (e.columntitle === '合同编号') {
@@ -44,10 +44,12 @@ export function getCustomList() {
             }
             if (e.columntitle === '对手方') {
                 item.onFilter = (value: string, record: Ermcp3ContractRsp) => {
-                    if (record.contracttype === 1) { //采购方
-                        return record.sellusername.includes(value)
-                    } else { // 销售
-                        return record.buyusername.includes(value)
+                    if (record.contracttype === 1) {
+                        //采购方
+                        return record.sellusername.includes(value);
+                    } else {
+                        // 销售
+                        return record.buyusername.includes(value);
                     }
                 };
                 item.filteredValue = filtered.negative || null;
@@ -55,7 +57,6 @@ export function getCustomList() {
             columns.value.push(item);
         });
         console.log('columns', columns);
-
     }
     // 1-未提交 2-待审核 3-履约中 4-已完成
     type EnumType = 1 | 2 | 3 | 4;
@@ -82,11 +83,11 @@ export function getCustomList() {
     }
 
     // 处理按钮是否有权限
-    type customType = 'spot_contract_unsubmitted' | "spot_contract_checkpending" | "spot_contract_performance" | "spot_contract_finished"
+    type customType = 'spot_contract_unsubmitted' | 'spot_contract_checkpending' | 'spot_contract_performance' | 'spot_contract_finished';
     // 未提交 | "待审核" | "履约中" | "已完成"
     function handlePermission(menuType: customType) {
-        // "新增" | "重新提交" | "修改" | "删除" | 
-        type codeType = "spot_contract_btn_add" | "spot_contract_btn_resubmit" | "spot_contract_btn_modify" | "spot_contract_btn_delete";
+        // "新增" | "重新提交" | "修改" | "删除" |
+        type codeType = 'spot_contract_btn_add' | 'spot_contract_btn_resubmit' | 'spot_contract_btn_modify' | 'spot_contract_btn_delete';
 
         // 判断按钮是否有权限
         function hasPermission(type: codeType): boolean {
@@ -102,4 +103,4 @@ export function getCustomList() {
         return { hasPermission };
     }
     return { spotContractList, actionQuery, columns, filteredInfo, getColumns, search, loading, handlePermission };
-}
+}

src/views/information/warehouse-info/list/normal-use/index.vue

@@ -1,114 +1,109 @@
 <template>
-  <!-- 仓库信息: 正常 -->
-  <div class="warehouse-info-normal">
-    <filterCustomTable @search="search">
-        <a-button class="operBtn" @click="openAction">新增</a-button>
-    </filterCustomTable>
-    <a-table 
-             class="topTable"
-             :columns="columns"
-             :pagination="false"
-             rowKey="key"
-             :data-source="wareHouseInfos" />
-  </div>
+    <!-- 仓库信息: 正常 -->
+    <div class="warehouse-info-normal">
+        <filterCustomTable @search="search">
+            <a-button class="operBtn" @click="openAction">新增</a-button>
+        </filterCustomTable>
+        <a-table class="topTable" :columns="columns" :pagination="false" rowKey="key" :data-source="wareHouseInfos" />
+    </div>
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, ref } from 'vue';
+    import { computed, defineComponent, ref } from 'vue';
 
-import { initData } from '@/setup/methods/index';
-import filterCustomTable from '@/views/information/warehouse-info/compoments/filterTable/index.vue';
-import { QueryWareHouse } from '@/goServiceAPI/ermcp/warehouse-info/index';
-import { ErmcpWareHouseInfo } from '@/goServiceAPI/ermcp/warehouse-info/interface';
-import { message } from 'ant-design-vue';
-import { getTableHead } from '@/services/bus/table';
-import { getUserId } from '@/services/bus/account';
+    import { initData } from '@/setup/methods/index';
+    import filterCustomTable from '@/views/information/warehouse-info/compoments/filterTable/index.vue';
+    import { QueryWareHouse } from '@/services/go/ermcp/warehouse-info/index';
+    import { ErmcpWareHouseInfo } from '@/services/go/ermcp/warehouse-info/interface';
+    import { message } from 'ant-design-vue';
+    import { getTableHead } from '@/services/bus/table';
+    import { getUserId } from '@/services/bus/account';
 
-// 查询客户资料列表
-function getWarehouseInfoList() {
-    interface ColumnType {
-        key: string;
-        dataIndex: string;
-        title: string;
-        onFilter?: Function;
-        sorter?: Function;
-    }
-
-    // 仓库数据
-    const wareHouseInfos = ref<ErmcpWareHouseInfo[]>([]);
-    // 列头
-    const columns = ref<ColumnType[]>([]);
-    // 过滤
-    const filteredInfo = ref();
-
-    // 获取表头
-    function getColumns() {
+    // 查询客户资料列表
+    function getWarehouseInfoList() {
         interface ColumnType {
             key: string;
             dataIndex: string;
             title: string;
-            filteredValue?: string | null;
             onFilter?: Function;
             sorter?: Function;
         }
-        const list = getTableHead('table_pcweb_warehouse');
-        console.log('list', list);
 
-        const filtered = filteredInfo.value || {};
-        columns.value.length = 0;
-        list.forEach((e, i) => {
-            const { columnfield, columntitle } = e;
-            const item: ColumnType = {
-                key: String(i),
-                dataIndex: columnfield,
-                title: columntitle,
-            };
-            columns.value.push(item);
-        });
-        console.log('columns', columns);
-    }
+        // 仓库数据
+        const wareHouseInfos = ref<ErmcpWareHouseInfo[]>([]);
+        // 列头
+        const columns = ref<ColumnType[]>([]);
+        // 过滤
+        const filteredInfo = ref();
 
-    // 获取仓库信息
-    const wareHouseInfoList = ref<ErmcpWareHouseInfo[]>([]);
-    function actionQuery() {
-        const reqParam = { userid: getUserId(), status: '1' };
-        QueryWareHouse(reqParam)
-            .then((res) => {
-                wareHouseInfos.value = res.map((e, i) => {
-                    return { ...e, key: String(i) };
-                });
-                console.log('查询仓库列表', wareHouseInfos);
-            })
-            .catch((err) => message.error(err));
-    }
-    // 查询
-    function search(value: any) {}
+        // 获取表头
+        function getColumns() {
+            interface ColumnType {
+                key: string;
+                dataIndex: string;
+                title: string;
+                filteredValue?: string | null;
+                onFilter?: Function;
+                sorter?: Function;
+            }
+            const list = getTableHead('table_pcweb_warehouse');
+            console.log('list', list);
 
-    return { wareHouseInfos, actionQuery, columns, getColumns, search };
-}
+            const filtered = filteredInfo.value || {};
+            columns.value.length = 0;
+            list.forEach((e, i) => {
+                const { columnfield, columntitle } = e;
+                const item: ColumnType = {
+                    key: String(i),
+                    dataIndex: columnfield,
+                    title: columntitle,
+                };
+                columns.value.push(item);
+            });
+            console.log('columns', columns);
+        }
 
-// 新增
-function add() {
-    console.log('add');
-}
+        // 获取仓库信息
+        const wareHouseInfoList = ref<ErmcpWareHouseInfo[]>([]);
+        function actionQuery() {
+            const reqParam = { userid: getUserId(), status: '1' };
+            QueryWareHouse(reqParam)
+                .then((res) => {
+                    wareHouseInfos.value = res.map((e, i) => {
+                        return { ...e, key: String(i) };
+                    });
+                    console.log('查询仓库列表', wareHouseInfos);
+                })
+                .catch((err) => message.error(err));
+        }
+        // 查询
+        function search(value: any) {}
+
+        return { wareHouseInfos, actionQuery, columns, getColumns, search };
+    }
+
+    // 新增
+    function add() {
+        console.log('add');
+    }
 
-export default defineComponent({
-    name: 'warehouse-info-normal',
-    components: {
-        filterCustomTable
-    },
-    setup() {
-        const { wareHouseInfos, actionQuery, columns, getColumns, search } = getWarehouseInfoList();
-        initData(() => {
-            actionQuery();
-            getColumns();
-        });
-        return { wareHouseInfos, add, columns, search };
-    },
-});
+    export default defineComponent({
+        name: 'warehouse-info-normal',
+        components: {
+            filterCustomTable,
+        },
+        setup() {
+            const { wareHouseInfos, actionQuery, columns, getColumns, search } = getWarehouseInfoList();
+            initData(() => {
+                actionQuery();
+                getColumns();
+            });
+            return { wareHouseInfos, add, columns, search };
+        },
+    });
 </script>
 
 <style lang="less">
-.warehouse-info-normal {
-}
-</style>;
+    .warehouse-info-normal {
+    }</style
+>;

src/views/information/warehouse-info/list/stop-use/index.vue

@@ -1,83 +1,83 @@
 <template>
-  <!-- 仓库信息: 停用 -->
-  <div class="warehouse-info-stop">
-    仓库信息: 停用
-  </div>
+    <!-- 仓库信息: 停用 -->
+    <div class="warehouse-info-stop">
+        仓库信息: 停用
+    </div>
 </template>
 
 <script lang="ts">
-import { defineComponent, ref } from 'vue';
-import { QueryCustomInfo } from '@/goServiceAPI/ermcp/customInfo/index';
-import { QueryCustomInfoType } from '@/goServiceAPI/ermcp/customInfo/interface';
-import { message } from 'ant-design-vue';
-import { initData } from '@/setup/methods/index';
+    import { defineComponent, ref } from 'vue';
+    import { QueryCustomInfo } from '@/services/go/ermcp/customInfo/index';
+    import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
+    import { message } from 'ant-design-vue';
+    import { initData } from '@/setup/methods/index';
 
-// 查询客户资料列表
-function getCustomList() {
-    // const filteredInfo = ref();
-    // const sortedInfo = ref();
-    // const columns = computed(() => {
-    //     const filtered = filteredInfo.value || {};
-    //     const sorted = sortedInfo.value || {};
-    //     return [
-    //         {
-    //             title: '序号',
-    //             dataIndex: 'index',
-    //             key: 'index',
-    //             align: 'center',
-    //             width: 50,
-    //             customRender: (param: any) => `${param.index + 1}`,
-    //         },
-    //         {
-    //             title: 'Age',
-    //             dataIndex: 'age',
-    //             key: 'age',
-    //             sorter: (a: DataItem, b: DataItem) => a.age - b.age,
-    //             sortOrder: sorted.columnKey === 'age' && sorted.order,
-    //         },
-    //         {
-    //             title: 'Address',
-    //             dataIndex: 'address',
-    //             key: 'address',
-    //             filters: [
-    //                 { text: 'London', value: 'London' },
-    //                 { text: 'New York', value: 'New York' },
-    //             ],
-    //             filteredValue: filtered.address || null,
-    //             onFilter: (value: string, record: DataItem) => record.address.includes(value),
-    //             sorter: (a: DataItem, b: DataItem) => a.address.length - b.address.length,
-    //             sortOrder: sorted.columnKey === 'address' && sorted.order,
-    //             ellipsis: true,
-    //         },
-    //     ];
-    // });
-    const customList = ref<QueryCustomInfoType[]>([]);
-    function actionQuery() {
-        QueryCustomInfo(4)
-            .then((res) => {
-                console.log('L', res);
-            })
-            .catch((err) => message.error(err));
-    }
+    // 查询客户资料列表
+    function getCustomList() {
+        // const filteredInfo = ref();
+        // const sortedInfo = ref();
+        // const columns = computed(() => {
+        //     const filtered = filteredInfo.value || {};
+        //     const sorted = sortedInfo.value || {};
+        //     return [
+        //         {
+        //             title: '序号',
+        //             dataIndex: 'index',
+        //             key: 'index',
+        //             align: 'center',
+        //             width: 50,
+        //             customRender: (param: any) => `${param.index + 1}`,
+        //         },
+        //         {
+        //             title: 'Age',
+        //             dataIndex: 'age',
+        //             key: 'age',
+        //             sorter: (a: DataItem, b: DataItem) => a.age - b.age,
+        //             sortOrder: sorted.columnKey === 'age' && sorted.order,
+        //         },
+        //         {
+        //             title: 'Address',
+        //             dataIndex: 'address',
+        //             key: 'address',
+        //             filters: [
+        //                 { text: 'London', value: 'London' },
+        //                 { text: 'New York', value: 'New York' },
+        //             ],
+        //             filteredValue: filtered.address || null,
+        //             onFilter: (value: string, record: DataItem) => record.address.includes(value),
+        //             sorter: (a: DataItem, b: DataItem) => a.address.length - b.address.length,
+        //             sortOrder: sorted.columnKey === 'address' && sorted.order,
+        //             ellipsis: true,
+        //         },
+        //     ];
+        // });
+        const customList = ref<QueryCustomInfoType[]>([]);
+        function actionQuery() {
+            QueryCustomInfo(4)
+                .then((res) => {
+                    console.log('L', res);
+                })
+                .catch((err) => message.error(err));
+        }
 
-    return { customList, actionQuery };
-}
+        return { customList, actionQuery };
+    }
 
-export default defineComponent({
-    name: 'warehouse-info-stop',
-    components: {},
-    setup() {
-        const { customList, actionQuery } = getCustomList();
-        initData(() => {
-            actionQuery();
-            // 加载数据在这里
-        });
-        return { customList };
-    },
-});
+    export default defineComponent({
+        name: 'warehouse-info-stop',
+        components: {},
+        setup() {
+            const { customList, actionQuery } = getCustomList();
+            initData(() => {
+                actionQuery();
+                // 加载数据在这里
+            });
+            return { customList };
+        },
+    });
 </script>
 
 <style lang="less">
-.warehouse-info-stop {
-}
-</style>;
+    .warehouse-info-stop {
+    }</style
+>;

src/views/search/outaccount_status/index.vue

@@ -1,146 +1,140 @@
 <template>
-  <div class="account-status">
-    <firstMenu :list="menulist"
-               :value="'value'"
-               @selectMenu="selectMenu" />
-    <div class="tip">最新更新时间：{{updatedTime}}</div>
-    <a-table :columns="columns"
-             :data-source="list"
-             :pagination="false"
-             :locale="{emptyText: '暂无数据'}"
-             bordered>
-      <template #handlestatus="{ text }">
-        <span :class="[text === 1 ? 'success-satus' : 'error-status']">{{ text === 1 ? '正常' : '断开' }}</span>
-      </template>
-    </a-table>
-  </div>
+    <div class="account-status">
+        <firstMenu :list="menulist" :value="'value'" @selectMenu="selectMenu" />
+        <div class="tip">最新更新时间：{{ updatedTime }}</div>
+        <a-table :columns="columns" :data-source="list" :pagination="false" :locale="{ emptyText: '暂无数据' }" bordered>
+            <template #handlestatus="{ text }">
+                <span :class="[text === 1 ? 'success-satus' : 'error-status']">{{ text === 1 ? '正常' : '断开' }}</span>
+            </template>
+        </a-table>
+    </div>
 </template>
 
 <script lang="ts">
-import { defineComponent, ref, onUnmounted } from 'vue';
-import { initData } from '@/setup/methods/index';
-import { message } from 'ant-design-vue';
-import firstMenu from '@/components/firstMenu/index.vue';
-import { GetErmcpOutAccountStatus } from '@/goServiceAPI/ermcp/outaccount-status/index';
-import { GetErmcpOutAccountStatus as GetErmcpOutAccountStatusType } from '@/goServiceAPI/ermcp/outaccount-status/interface';
-import TimerUtils from '@/utils/tool/timerUtil';
-import moment from 'moment';
+    import { defineComponent, ref, onUnmounted } from 'vue';
+    import { initData } from '@/setup/methods/index';
+    import { message } from 'ant-design-vue';
+    import firstMenu from '@/components/firstMenu/index.vue';
+    import { GetErmcpOutAccountStatus } from '@/services/go/ermcp/outaccount-status/index';
+    import { GetErmcpOutAccountStatus as GetErmcpOutAccountStatusType } from '@/services/go/ermcp/outaccount-status/interface';
+    import TimerUtils from '@/utils/timer/timerUtil';
+    import moment from 'moment';
 
-function getAccountList() {
-    interface ListType extends GetErmcpOutAccountStatusType {
-        index: number;
-        key: string;
-    }
-    const columns = [
-        {
-            title: '序号',
-            dataIndex: 'index',
-            align: 'center',
-            width: 200,
-        },
-        {
-            title: '资金账号',
-            align: 'center',
-            dataIndex: 'accountid',
-            width: 400,
-        },
-        {
-            title: '期货公司',
-            align: 'center',
-            dataIndex: 'fcname',
-            width: 500,
-        },
-        {
-            title: '连接状态',
-            align: 'center',
-            dataIndex: 'handlestatus',
-            width: 340,
-            slots: { customRender: 'handlestatus' },
-        },
-    ];
-    const list = ref<ListType[]>([]);
-    // 更新时间
-    function getTime(): string {
-        return moment().format('YYYY-MM-DD HH:mm:ss');
-    }
-    const updatedTime = ref<string>(getTime());
-    // 获取列表
-    function getAccountStatusList() {
-        return GetErmcpOutAccountStatus()
-            .then((res) => {
-                list.value = res.map((e: GetErmcpOutAccountStatusType, index: number) => {
-                    return { ...e, index: index + 1, key: String(index) };
+    function getAccountList() {
+        interface ListType extends GetErmcpOutAccountStatusType {
+            index: number;
+            key: string;
+        }
+        const columns = [
+            {
+                title: '序号',
+                dataIndex: 'index',
+                align: 'center',
+                width: 200,
+            },
+            {
+                title: '资金账号',
+                align: 'center',
+                dataIndex: 'accountid',
+                width: 400,
+            },
+            {
+                title: '期货公司',
+                align: 'center',
+                dataIndex: 'fcname',
+                width: 500,
+            },
+            {
+                title: '连接状态',
+                align: 'center',
+                dataIndex: 'handlestatus',
+                width: 340,
+                slots: { customRender: 'handlestatus' },
+            },
+        ];
+        const list = ref<ListType[]>([]);
+        // 更新时间
+        function getTime(): string {
+            return moment().format('YYYY-MM-DD HH:mm:ss');
+        }
+        const updatedTime = ref<string>(getTime());
+        // 获取列表
+        function getAccountStatusList() {
+            return GetErmcpOutAccountStatus()
+                .then((res) => {
+                    list.value = res.map((e: GetErmcpOutAccountStatusType, index: number) => {
+                        return { ...e, index: index + 1, key: String(index) };
+                    });
+                    updatedTime.value = getTime();
+                    return 'ok';
+                })
+                .catch((e) => {
+                    message.error(e.message);
                 });
-                updatedTime.value = getTime();
-                return 'ok';
-            })
-            .catch((e) => {
-                message.error(e.message);
-            });
-    }
-    // 定时轮询
-    function setLoop() {
-        TimerUtils.setInterval(getAccountStatusList, 10000, 'accountStauts');
+        }
+        // 定时轮询
+        function setLoop() {
+            TimerUtils.setInterval(getAccountStatusList, 10000, 'accountStauts');
+        }
+        return { columns, list, getAccountStatusList, setLoop, updatedTime };
     }
-    return { columns, list, getAccountStatusList, setLoop, updatedTime };
-}
 
-function handleMenu() {
-    const menulist = [{ key: '1', value: '账号状态' }];
-    function selectMenu(item: any) {
-        console.log(item);
+    function handleMenu() {
+        const menulist = [{ key: '1', value: '账号状态' }];
+        function selectMenu(item: any) {
+            console.log(item);
+        }
+        return { menulist, selectMenu };
     }
-    return { menulist, selectMenu };
-}
 
-export default defineComponent({
-    name: 'account-status',
-    components: {
-        firstMenu,
-    },
-    setup() {
-        const { columns, list, getAccountStatusList, setLoop, updatedTime } = getAccountList();
-        const { menulist, selectMenu } = handleMenu();
-        initData(async () => {
-            await getAccountStatusList();
-            setLoop();
-        });
-        onUnmounted(() => {
-            TimerUtils.clearInterval('accountStauts');
-        });
-        return { columns, list, menulist, selectMenu, updatedTime };
-    },
-});
+    export default defineComponent({
+        name: 'account-status',
+        components: {
+            firstMenu,
+        },
+        setup() {
+            const { columns, list, getAccountStatusList, setLoop, updatedTime } = getAccountList();
+            const { menulist, selectMenu } = handleMenu();
+            initData(async () => {
+                await getAccountStatusList();
+                setLoop();
+            });
+            onUnmounted(() => {
+                TimerUtils.clearInterval('accountStauts');
+            });
+            return { columns, list, menulist, selectMenu, updatedTime };
+        },
+    });
 </script>
 
 <style lang="less">
-.account-status {
-    height: 100%;
-    .ant-table-wrapper {
-        margin-left: 1px;
-        .ant-table-body > table {
-            border: none;
+    .account-status {
+        height: 100%;
+        .ant-table-wrapper {
+            margin-left: 1px;
+            .ant-table-body > table {
+                border: none;
+            }
+            .ant-table {
+                width: 100%;
+            }
         }
-        .ant-table {
-            width: 100%;
+        .success-satus {
+            color: #1ff195;
         }
-    }
-    .success-satus {
-        color: #1ff195;
-    }
-    .error-status {
-        color: #ff2b2b;
-    }
-    .tip {
-        padding: 10px 0;
-        color: #364048;
-    }
-    .ant-table-placeholder {
-        height: 100px;
-        line-height: 70px;
-        background: @m-grey9;
-        border: none;
-        border-radius: 0px;
-    }
-}
-</style>;
+        .error-status {
+            color: #ff2b2b;
+        }
+        .tip {
+            padding: 10px 0;
+            color: #364048;
+        }
+        .ant-table-placeholder {
+            height: 100px;
+            line-height: 70px;
+            background: @m-grey9;
+            border: none;
+            border-radius: 0px;
+        }
+    }</style
+>;

src/views/setting/notice/components/noticeContent.vue

@@ -1,123 +1,121 @@
 <template>
-  <div class="notice-content">
-    <aside>
-      <a-list item-layout="horizontal"
-              :data-source="noticeList">
-        <template #renderItem="{ item }">
-          <a-list-item @click="choose(item)">
-            <a-list-item-meta :description="item.createtime">
-              <template #title>
-                <a :style="{color: item.readed ? '#88A0AE' : '#E5E5E5'}"
-                   href="javascript:;">{{ item.title }}</a>
-              </template>
-              <template #avatar>
-                <a-badge :color="item.readed ? '#88A0AE' : 'orange'" />
-              </template>
-            </a-list-item-meta>
-          </a-list-item>
-        </template>
-      </a-list>
-    </aside>
-    <main>
-      <h4>{{chooseItemNotice.title}}</h4>
-      <p>{{chooseItemNotice.createtime}}</p>
-      <div>
-        {{chooseItemNotice.content}}
-      </div>
-    </main>
-  </div>
+    <div class="notice-content">
+        <aside>
+            <a-list item-layout="horizontal" :data-source="noticeList">
+                <template #renderItem="{ item }">
+                    <a-list-item @click="choose(item)">
+                        <a-list-item-meta :description="item.createtime">
+                            <template #title>
+                                <a :style="{ color: item.readed ? '#88A0AE' : '#E5E5E5' }" href="javascript:;">{{ item.title }}</a>
+                            </template>
+                            <template #avatar>
+                                <a-badge :color="item.readed ? '#88A0AE' : 'orange'" />
+                            </template>
+                        </a-list-item-meta>
+                    </a-list-item>
+                </template>
+            </a-list>
+        </aside>
+        <main>
+            <h4>{{ chooseItemNotice.title }}</h4>
+            <p>{{ chooseItemNotice.createtime }}</p>
+            <div>
+                {{ chooseItemNotice.content }}
+            </div>
+        </main>
+    </div>
 </template>
 
 <script lang="ts">
-import { defineComponent, PropType, reactive, computed } from 'vue';
-import { QueryNoticeRsp } from '@/goServiceAPI/commonService/interface';
-import { mergeObjSameProperty } from '@/utils/tool/set';
+    import { defineComponent, PropType, reactive, computed } from 'vue';
+    import { QueryNoticeRsp } from '@/services/go/commonService/interface';
+    import { mergeObjSameProperty } from '@/utils/tool/set';
 
-function chooseNotice() {
-    interface ItemNotice {
-        title: string;
-        content: string; //内容
-        createtime: string; //创建时间
-    }
-    const chooseItemNotice = reactive<ItemNotice>({
-        title: '',
-        content: '',
-        createtime: '',
-    });
-    function choose(item: QueryNoticeRsp) {
-        mergeObjSameProperty(chooseItemNotice, item);
+    function chooseNotice() {
+        interface ItemNotice {
+            title: string;
+            content: string; //内容
+            createtime: string; //创建时间
+        }
+        const chooseItemNotice = reactive<ItemNotice>({
+            title: '',
+            content: '',
+            createtime: '',
+        });
+        function choose(item: QueryNoticeRsp) {
+            mergeObjSameProperty(chooseItemNotice, item);
+        }
+        return { chooseItemNotice, choose };
     }
-    return { chooseItemNotice, choose };
-}
 
-export default defineComponent({
-    name: 'notice',
-    props: {
-        noticeList: {
-            type: Object as PropType<QueryNoticeRsp[]>,
-            default: [],
+    export default defineComponent({
+        name: 'notice',
+        props: {
+            noticeList: {
+                type: Object as PropType<QueryNoticeRsp[]>,
+                default: [],
+            },
         },
-    },
-    setup(props) {
-        const { chooseItemNotice, choose } = chooseNotice();
-        computed(() => {
-            props.noticeList.length && mergeObjSameProperty(chooseItemNotice, props.noticeList[0]);
-        });
-        return {
-            choose,
-            chooseItemNotice,
-        };
-    },
-});
+        setup(props) {
+            const { chooseItemNotice, choose } = chooseNotice();
+            computed(() => {
+                props.noticeList.length && mergeObjSameProperty(chooseItemNotice, props.noticeList[0]);
+            });
+            return {
+                choose,
+                chooseItemNotice,
+            };
+        },
+    });
 </script>
 
 <style lang="less">
-.notice-content {
-    .flex;
-    aside {
-        cursor: pointer;
-        padding: 10px;
-        width: 202px;
-        height: 619px;
-        .ant-list-split {
-            .ant-list-item-meta-description {
-                text-align: right;
+    .notice-content {
+        .flex;
+        aside {
+            cursor: pointer;
+            padding: 10px;
+            width: 202px;
+            height: 619px;
+            .ant-list-split {
+                .ant-list-item-meta-description {
+                    text-align: right;
+                    font-size: 13px;
+                    color: #3b444a;
+                }
+                .ant-list-item-meta-avatar {
+                    margin-right: 0;
+                }
+                .ant-list-item {
+                    padding: 5px 0;
+                    border-bottom: none;
+                    a {
+                        width: 160px;
+                        // color: #88A0AE;
+                        font-size: 15px;
+                        display: inline-block;
+                        .ellipse;
+                    }
+                }
+            }
+        }
+        main {
+            flex: 1;
+            background: #1d2327;
+            padding: 20px;
+            h4 {
+                font-size: 17px;
+                color: #e5e5e5;
+            }
+            p {
                 font-size: 13px;
                 color: #3b444a;
             }
-            .ant-list-item-meta-avatar {
-                margin-right: 0;
-            }
-            .ant-list-item {
-                padding: 5px 0;
-                border-bottom: none;
-                a {
-                    width: 160px;
-                    // color: #88A0AE;
-                    font-size: 15px;
-                    display: inline-block;
-                    .ellipse;
-                }
+            div {
+                font-size: 15px;
+                color: #88a0ae;
+                text-indent: 2em;
             }
         }
-    }
-    main {
-        flex: 1;
-        background: #1d2327;
-        padding: 20px;
-        h4 {
-            font-size: 17px;
-            color: #e5e5e5;
-        }
-        p {
-            font-size: 13px;
-            color: #3b444a;
-        }
-        div {
-            font-size: 15px;
-            color: #88a0ae;
-            text-indent: 2em;
-        }
-    }
-}
-</style>;
+    }</style
+>;

src/views/setting/notice/index.vue

@@ -1,107 +1,100 @@
 <template>
-  <a-modal class="notice"
-           v-model:visible="visible"
-           @cancel="cancel"
-           width="890px"
-           :footer="null">
-    <a-tabs v-model:activeKey="activeKey">
-      <a-tab-pane key="1">
-        <template #tab>
-          <span>
-            公告
-            <a-badge count="25"
-                     :number-style="{ backgroundColor: '#FF9000' }" />
-          </span>
-        </template>
-        <NoticeContent :noticeList="noticeList" />
-      </a-tab-pane>
-      <a-tab-pane key="2">
-        <template #tab>
-          <span>
-            系统消息
-            <a-badge count="25"
-                     :number-style="{ backgroundColor: '#FF9000' }" />
-          </span>
-        </template>
-        <NoticeContent />
-      </a-tab-pane>
-    </a-tabs>
-  </a-modal>
+    <a-modal class="notice" v-model:visible="visible" @cancel="cancel" width="890px" :footer="null">
+        <a-tabs v-model:activeKey="activeKey">
+            <a-tab-pane key="1">
+                <template #tab>
+                    <span>
+                        公告
+                        <a-badge count="25" :number-style="{ backgroundColor: '#FF9000' }" />
+                    </span>
+                </template>
+                <NoticeContent :noticeList="noticeList" />
+            </a-tab-pane>
+            <a-tab-pane key="2">
+                <template #tab>
+                    <span>
+                        系统消息
+                        <a-badge count="25" :number-style="{ backgroundColor: '#FF9000' }" />
+                    </span>
+                </template>
+                <NoticeContent />
+            </a-tab-pane>
+        </a-tabs>
+    </a-modal>
 </template>
 
 <script lang="ts">
-import { defineComponent, ref } from 'vue';
-import { closeModal } from '@/setup/modal/index';
-import NoticeContent from './components/noticeContent.vue';
-import { initData } from '@/setup/methods/index';
-import { queryNotice } from '@/goServiceAPI/commonService/index';
-import { QueryNoticeRsp } from '@/goServiceAPI/commonService/interface';
+    import { defineComponent, ref } from 'vue';
+    import { closeModal } from '@/setup/modal/index';
+    import NoticeContent from './components/noticeContent.vue';
+    import { initData } from '@/setup/methods/index';
+    import { queryNotice } from '@/services/go/commonService/index';
+    import { QueryNoticeRsp } from '@/services/go/commonService/interface';
 
-export default defineComponent({
-    name: 'notice',
-    components: {
-        NoticeContent,
-    },
-    setup() {
-        const { visible, cancel } = closeModal('notice');
-        // 公告消息
-        const noticeList = ref<QueryNoticeRsp[]>([]);
+    export default defineComponent({
+        name: 'notice',
+        components: {
+            NoticeContent,
+        },
+        setup() {
+            const { visible, cancel } = closeModal('notice');
+            // 公告消息
+            const noticeList = ref<QueryNoticeRsp[]>([]);
 
-        initData(() => {
-            queryNotice().then((res) => {
-                noticeList.value = res.filter((e) => e.msgtype === 1);
-                console.log('notice', res);
+            initData(() => {
+                queryNotice().then((res) => {
+                    noticeList.value = res.filter((e) => e.msgtype === 1);
+                    console.log('notice', res);
+                });
             });
-        });
-        return {
-            visible,
-            cancel,
-            noticeList,
-            activeKey: ref('1'),
-        };
-    },
-});
+            return {
+                visible,
+                cancel,
+                noticeList,
+                activeKey: ref('1'),
+            };
+        },
+    });
 </script>
 
 <style lang="less">
-.notice {
-    .ant-tabs {
-        width: 100%;
-        .ant-tabs-bar {
-            border-bottom-color: #192125;
-            margin-bottom: 0;
-        }
-        .ant-tabs-tab {
-            width: 140px;
-            text-align: center;
-            margin-right: 0;
+    .notice {
+        .ant-tabs {
+            width: 100%;
+            .ant-tabs-bar {
+                border-bottom-color: #192125;
+                margin-bottom: 0;
+            }
+            .ant-tabs-tab {
+                width: 140px;
+                text-align: center;
+                margin-right: 0;
+            }
+            .ant-tabs-nav {
+                height: 50px;
+                font-size: 16px;
+                color: #88a0ae;
+                font-family: Adobe Heiti Std;
+                font-weight: normal;
+                .ant-tabs-tab-active {
+                    color: #ffffff;
+                    background: linear-gradient(0deg, #3163ba 0%, #4179db 100%);
+                }
+            }
+            .ant-tabs-ink-bar {
+                display: none !important;
+            }
         }
-        .ant-tabs-nav {
+        .ant-modal-close-x {
             height: 50px;
-            font-size: 16px;
-            color: #88a0ae;
-            font-family: Adobe Heiti Std;
-            font-weight: normal;
-            .ant-tabs-tab-active {
-                color: #ffffff;
-                background: linear-gradient(0deg, #3163ba 0%, #4179db 100%);
+            line-height: 50px;
+            svg {
+                color: #7a8a94;
             }
         }
-        .ant-tabs-ink-bar {
-            display: none !important;
-        }
-    }
-    .ant-modal-close-x {
-        height: 50px;
-        line-height: 50px;
-        svg {
-            color: #7a8a94;
+        .ant-modal-body {
+            padding: 0;
+            background: #252d34;
         }
-    }
-    .ant-modal-body {
-        padding: 0;
-        background: #252d34;
-    }
-}
-</style
+    }</style
 >;