1.首页修改业务提醒页面

2.决策分析 默认合并amend 并控制amend数量的显示隐藏 新加字段
3.海运箱量利润统计 新加检索条件 默认合并amend 并控制amend数量的显示隐藏

src/views/iosBasicData/decisionAnalysis/index.vue

@@ -22,6 +22,10 @@
                             {{ row.corpCnName }}
                         </span>
                     </template>
+                    <template slot="mergeAmendFeeSearch">
+                        <el-checkbox v-model="query.mergeAmendFee" :true-label="1"
+                            :false-label="0">合并amend费用</el-checkbox>
+                    </template>
                 </avue-crud>
             </el-tab-pane>
             <el-tab-pane label="图表" name="second">
@@ -34,13 +38,18 @@
                     <template slot="typeSearch">
                         <avue-radio v-model="search.type" :dic="typeDic" @change="typeChange"></avue-radio>
                     </template>
+                    <template slot="mergeAmendFeeSearch">
+                        <el-checkbox v-model="search.mergeAmendFee" :true-label="1"
+                            :false-label="0">合并amend费用</el-checkbox>
+                    </template>
                 </avue-crud>
-                <div v-loading="loading" ref="echartsContainer" style="width: 90vw; height: 56vh;margin-top: 10px;"></div>
+                <div v-loading="loading" ref="echartsContainer" style="width: 90vw; height: 56vh;margin-top: 10px;">
+                </div>
             </el-tab-pane>
         </el-tabs>
     </basic-container>
 </template>
-  
+
 <script>
 import { getList, boxNumberProfitStatisticsSum } from "@/api/iosBasicData/decisionAnalysis";
 import { getToken } from "@/util/auth";
@@ -54,10 +63,12 @@ export default {
             search: {
                 chart: 1,
                 type: 1,
+                mergeAmendFee: 1
             },
             query: {
                 chart: 1,
                 type: 1,
+                mergeAmendFee: 1,
             },
             loading: false,
             itemLoading: false,
@@ -72,7 +83,7 @@ export default {
                 height: 'auto',
                 calcHeight: 30,
                 searchShow: true,
-                searchMenuSpan: 24,
+                searchMenuSpan: 18,
                 border: true,
                 index: true,
                 addBtn: false,
@@ -81,7 +92,7 @@ export default {
                 searchIndex: 3,
                 searchLabelWidth: "80",
                 dialogClickModal: false,
-                emptyBtnText:'清空所有条件',
+                emptyBtnText: '清空所有条件',
                 column: [
                     {
                         label: "业务来源",
@@ -149,6 +160,14 @@ export default {
                         overHidden: true,
                     },
                     {
+                        label: "amend数量",
+                        prop: "whetherExist",
+                        width: 100,
+                        hide: false,
+                        showColumn: true,
+                        overHidden: true,
+                    },
+                    {
                         label: "件数",
                         prop: "quantity",
                         width: '100',
@@ -372,7 +391,15 @@ export default {
                         prop: "amountProfitLoc",
                         width: '100',
                         overHidden: true,
-                    }
+                    },
+                    {
+                        label: "",
+                        prop: "mergeAmendFee",
+                        hide: true,
+                        showColumn: false,
+                        search: true,
+                        searchslot: true,
+                    },
                 ]
             },
             data: [],
@@ -384,7 +411,7 @@ export default {
                 menu: false,
                 height: '90',
                 column: [
-                {
+                    {
                         label: "件数",
                         prop: "quantity",
                         width: '100',
@@ -498,14 +525,14 @@ export default {
                 height: '130px',
                 calcHeight: 30,
                 searchShow: true,
-                searchMenuSpan: 12,
+                searchMenuSpan: 6,
                 border: true,
                 addBtn: false,
                 menu: false,
                 header: false,
                 searchLabelWidth: "80",
                 align: 'center',
-                emptyBtnText:'清空所有条件',
+                emptyBtnText: '清空所有条件',
                 column: [
                     {
                         label: "业务来源",
@@ -655,7 +682,16 @@ export default {
                         search: true,
                         hide: true,
                         showColumn: false,
-                    }],
+                    },
+                    {
+                        label: "",
+                        prop: "mergeAmendFee",
+                        hide: true,
+                        showColumn: false,
+                        search: true,
+                        searchslot: true,
+                    }
+                ],
             },
             chartDic: [{
                 label: '箱量图',
@@ -683,6 +719,8 @@ export default {
     },
     async created() {
         this.option = await this.getColumnData(this.getColumnName(372), this.optionBack)
+        this.findObject(this.option.column, "whetherExist").hide = false;
+        this.findObject(this.option.column, "whetherExist").showColumn = true;
         // this.option.height = window.innerHeight - 370;
     },
     methods: {
@@ -769,16 +807,17 @@ export default {
             this.query = {
                 chart: 1,
                 type: 1,
+                mergeAmendFee: 1
             };
             this.onLoad(this.page);
         },
         searchCriteriaSwitch(type) {
-            if (type) {
-                this.option.height = this.option.height - 73;
-            } else {
-                this.option.height = this.option.height + 73;
-            }
-            this.$refs.crud.getTableHeight();
+            // if (type) {
+            //     this.option.height = this.option.height - 73;
+            // } else {
+            //     this.option.height = this.option.height + 73;
+            // }
+            // this.$refs.crud.getTableHeight();
         },
         // 搜索点击回调
         searchChange(params, done) {
@@ -995,7 +1034,16 @@ export default {
                     search: true,
                     hide: true,
                     showColumn: false,
-                }]
+                },
+                {
+                    label: "",
+                    prop: "mergeAmendFee",
+                    hide: true,
+                    showColumn: false,
+                    search: true,
+                    searchslot: true,
+                }
+            ]
         },
         chartOnLoad() {
             this.loading = true;
@@ -1124,6 +1172,7 @@ export default {
             this.search = {
                 chart: 1,
                 type: 1,
+                mergeAmendFee: 1
             };
             this.chartOnLoad();
         },
@@ -1164,10 +1213,26 @@ export default {
             }
             return back;
         },
-    }
+    },
+    watch: {
+        "query.mergeAmendFee": {
+            handler(newVla, oldVal) {
+                console.log(newVla, oldVal)
+                if (newVla == 1) {
+                    this.findObject(this.option.column, "whetherExist").hide = false;
+                    this.findObject(this.option.column, "whetherExist").showColumn = true;
+                } else {
+                    this.findObject(this.option.column, "whetherExist").hide = true;
+                    this.findObject(this.option.column, "whetherExist").showColumn = false;
+                }
+            },
+            deep: false, // 深度监听
+            immediate: false  // 第一次改变就执行
+        },
+    },
 };
 </script>
-  
+
 <style scoped>
 ::v-deep#out-table .back-one {
     background: #ecf5ff !important;
@@ -1186,5 +1251,4 @@ export default {
 ::v-deep.el-form-item {
     margin-bottom: 0;
 }
-</style>
-  
+</style>

src/views/iosBasicData/financeProfit/index.vue

@@ -113,6 +113,7 @@ export default {
             query: {
                 billType: 'SE,SI',
                 costMerge: 1,
+                mergeAmendFee: 1,
                 statisticsDateStart: defaultDate3()[0],
                 statisticsDateEnd: defaultDate3()[1],
             },
@@ -139,6 +140,10 @@ export default {
                 summaryText: "合计",
                 sumColumnList: [
                     {
+                        name: 'whetherExist',
+                        type: 'sum',
+                    },
+                    {
                         name: 'amountDrUsd',
                         type: 'sum',
                         decimals: 2
@@ -187,6 +192,14 @@ export default {
                         type: 'sum',
                         decimals: 2
                     }, {
+                        name: 'amountProfit',
+                        type: 'sum',
+                        decimals: 2
+                    }, {
+                        name: 'amountProfitUsd',
+                        type: 'sum',
+                        decimals: 2
+                    }, {
                         name: 'amountProfitLoc',
                         type: 'sum',
                         decimals: 2
@@ -335,6 +348,14 @@ export default {
                         overHidden: true,
                     },
                     {
+                        label: "amend数量",
+                        prop: "whetherExist",
+                        width: 100,
+                        hide: true,
+                        showColumn: false,
+                        overHidden: true,
+                    },
+                    {
                         label: "应收美元",
                         prop: "amountDrUsd",
                         overHidden: true,
@@ -347,11 +368,13 @@ export default {
                     {
                         label: "应收人民币",
                         prop: "amountDr",
+                        width: 100,
                         overHidden: true,
                     },
                     {
                         label: "实收人民币",
                         prop: "realAmountDr",
+                        width: 100,
                         overHidden: true,
                     },
                     {
@@ -362,6 +385,7 @@ export default {
                     {
                         label: "实际合计应收",
                         prop: "realAmountDrLoc",
+                        width: 110,
                         overHidden: true,
                     },
                     {
@@ -372,6 +396,7 @@ export default {
                     {
                         label: "未收人民币",
                         prop: "notReceivedDr",
+                        width: 100,
                         overHidden: true,
                     },
                     {
@@ -392,11 +417,13 @@ export default {
                     {
                         label: "应付人民币",
                         prop: "amountCr",
+                        width: 100,
                         overHidden: true,
                     },
                     {
                         label: "实付人民币",
                         prop: "realAmountCr",
+                        width: 100,
                         overHidden: true,
                     },
                     {
@@ -407,16 +434,29 @@ export default {
                     {
                         label: "实际合计应付",
                         prop: "realAmountCrLoc",
+                        width: 110,
+                        overHidden: true,
+                    },
+                    {
+                        label: "人民币利润",
+                        prop: "amountProfit",
+                        width: 100,
                         overHidden: true,
                     },
                     {
-                        label: "单票利润",
+                        label: "美元利润",
+                        prop: "amountProfitUsd",
+                        overHidden: true,
+                    },
+                    {
+                        label: "合计利润",
                         prop: "amountProfitLoc",
                         overHidden: true,
                     },
                     {
-                        label: "实际单票利润",
+                        label: "合计实际利润",
                         prop: "realAmountProfitLoc",
+                        width: 110,
                         overHidden: true,
                     },
                     // {
@@ -441,6 +481,7 @@ export default {
                         label: "",
                         prop: "costMerge",
                         hide: true,
+                        showColumn: false,
                         search: true,
                         searchslot: true,
                         searchLabelWidth: '0',
@@ -529,13 +570,23 @@ export default {
                     prop: 'realAmountCrLoc'
                 },
                 {
+                    id: 10,
+                    label: "人民币利润",
+                    prop: "amountProfit",
+                },
+                {
+                    id: 11,
+                    label: "美元利润",
+                    prop: "amountProfitUsd",
+                },
+                {
                     id: 13,
-                    label: '单票利润',
+                    label: '合计利润',
                     prop: 'amountProfitLoc'
                 },
                 {
                     id: 14,
-                    label: '实际单票利润',
+                    label: '合计实际利润',
                     prop: 'realAmountProfitLoc'
                 },
             ],
@@ -543,9 +594,13 @@ export default {
     },
     async created() {
         this.option = await this.getColumnData(this.getColumnName(336), this.optionBack);
+
+        this.findObject(this.option.column, "whetherExist").hide = false;
+        this.findObject(this.option.column, "whetherExist").showColumn = true;
         this.query = {
             billType: 'SE,SI',
             costMerge: 1,
+            mergeAmendFee: 1,
             statisticsDateStart: defaultDate3()[0],
             statisticsDateEnd: defaultDate3()[1],
         }
@@ -591,15 +646,16 @@ export default {
         },
         // 业务员下拉
         srcCorpFocus(value, name) {
+
             if (this.query.srcType == 'SALES') {
                 // 业务员
                 this.srcforParameter = { key: 'id', label: 'name', value: 'id' }
                 this.salesUserGetListfun(value, '业务员')
-            } else if (this.form.srcType == 'AGENT') {
+            } else if (this.query.srcType == 'AGENT') {
                 // 代理
                 this.srcforParameter = { key: 'id', label: 'cnName', value: 'id' }
                 this.agentBcorpsListfun(value)
-            } else if (this.form.srcType == 'OWN') {
+            } else if (this.query.srcType == 'OWN') {
                 // 公司
                 this.srcforParameter = { key: 'id', label: 'title', value: 'id' }
                 this.ownDeptLazyTreefun()
@@ -704,7 +760,7 @@ export default {
                 costMerge: 1,
                 statisticsDateStart: null,
                 statisticsDateEnd: null,
-                mergeAmendFee: 0,
+                mergeAmendFee: 1,
                 examine: 0,
                 examineDate: 0
             };
@@ -712,6 +768,7 @@ export default {
         },
         // 搜索
         searchChange(params, done) {
+            console.log(params)
             this.query = params;
             this.page.currentPage = 1;
             this.onLoad(this.page, params);
@@ -787,7 +844,23 @@ export default {
             }
             return back;
         },
-    }
+    },
+    watch: {
+        "query.mergeAmendFee": {
+            handler(newVla, oldVal) {
+                console.log(newVla, oldVal)
+                if (newVla == 1) {
+                    this.findObject(this.option.column, "whetherExist").hide = false;
+                    this.findObject(this.option.column, "whetherExist").showColumn = true;
+                } else {
+                    this.findObject(this.option.column, "whetherExist").hide = true;
+                    this.findObject(this.option.column, "whetherExist").showColumn = false;
+                }
+            },
+            deep: false, // 深度监听
+            immediate: false  // 第一次改变就执行
+        },
+    },
 }
 </script>
 

src/views/wel/components/losAssembly/losrealtime.vue

@@ -1,133 +1,167 @@
 <template>
-  <div class="home-container">
-    <el-card class="home-container__card">
-      <div class="title">
-        <span>
-          实时数据
-        </span>
-        <span class="right">
-          <div class="right_but">
-            <div class="right_but_left" :class="{ right_but_active: isActive == 1 }" @click="inDay">
-              本日
-            </div>
-            <div class="right_but_right" :class="{ right_but_active: isActive == 2 }" @click="inMoon">
-              本月
-            </div>
-          </div>
-          <el-date-picker v-model="realDate" type="daterange" size="mini" start-placeholder="开始日期"
-            end-placeholder="结束日期" value-format="yyyy-MM-dd" style="margin-right:10px;width:240px" :clearable="false">
-          </el-date-picker>
-          <el-button type="primary" size="mini" icon="el-icon-search" style="margin-right:10px;" @click="search"
-            circle></el-button>
-          <i class="el-icon-refresh-right" style="cursor: pointer;font-size:20px;line-height: 15px;"
-            @click="refresh"></i>
-        </span>
-      </div>
-      <div style="display: flex;justify-content: center;">
-        <div class="content" v-loading="loading">
-          <div class="content-item">
-            <div class="card" @click.stop="dialogVisible = true">
-              <div class="card-title card-title3">
-                <span>
-                  港
-                </span>
+  <div class="container-losrealtime">
+    <div class="home-container" style="padding: 0px 5px 5px 5px;">
+      <el-card class="home-container__card">
+        <div class="title">
+          <span>
+            业务提醒
+          </span>
+          <span class="right">
+            <!-- <div class="right_but">
+              <div class="right_but_left" :class="{ right_but_active: isActive == 1 }" @click="inDay">
+                本日
               </div>
-              <div class="card-content">
-                <span class="card-content-num">{{ DGTX.arrivalReminder }}</span>
-                <span class="card-content-text">到港提醒</span>
+              <div class="right_but_right" :class="{ right_but_active: isActive == 2 }" @click="inMoon">
+                本月
               </div>
             </div>
-          </div>
-          <div class="divider" />
-          <div class="content-item">
-            <div class="card">
-              <div class="card-title card-title1">
-                <span>
-                  海
-                </span>
-              </div>
-              <div class="card-content">
-                <span class="card-content-num">{{ data.HYCK }}</span>
-                <span class="card-content-text">海运出口</span>
+            <el-date-picker v-model="realDate" type="daterange" size="mini" start-placeholder="开始日期"
+              end-placeholder="结束日期" value-format="yyyy-MM-dd" style="margin-right:10px;width:240px" :clearable="false">
+            </el-date-picker>
+            <el-button type="primary" size="mini" icon="el-icon-search" style="margin-right:10px;" @click="search"
+              circle></el-button> -->
+            <i class="el-icon-refresh-right" style="cursor: pointer;font-size:20px;line-height: 15px;"
+              @click="refresh"></i>
+          </span>
+        </div>
+        <div style="display: flex;">
+          <div class="content" v-loading="loading">
+            <div class="content-item">
+              <div class="card" @click.stop="dialogVisible = true">
+                <div class="card-title card-title1">
+                  <span>
+                    港
+                  </span>
+                </div>
+                <div class="card-content">
+                  <span class="card-content-num">{{ DGTX.arrivalReminder }}</span>
+                  <span class="card-content-text">到港提醒</span>
+                </div>
               </div>
             </div>
           </div>
-          <div class="divider" />
-          <div class="content-item">
-            <div class="card">
-              <div class="card-title card-title2">
-                <span>
-                  海
-                </span>
+        </div>
+
+      </el-card>
+      <el-dialog title="到港提醒" :visible.sync="dialogVisible" width="50%" append-to-body>
+        <span v-if="dialogVisible">
+          <avue-crud :table-loading="loading" :option="option" :data="dataList" @on-load="onLoad" :page.sync="page"
+            @current-change="currentChange" @size-change="sizeChange">
+            <template slot="shortName" slot-scope="{ row }">
+              <span style="color: #1e9fff;cursor: pointer;" @click="rowEdit(row)">{{ row.shortName }}</span>
+            </template>
+            <template slot="mblno" slot-scope="{ row }">
+              <span style="color: #1e9fff;cursor: pointer;" @click="rowEdit(row)">{{ row.mblno }}</span>
+            </template>
+          </avue-crud>
+        </span>
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="dialogVisible = false" size="mini">关 闭</el-button>
+        </span>
+      </el-dialog>
+    </div>
+    <div class="home-container" style="padding: 0px 5px 5px 0px;">
+      <el-card class="home-container__card">
+        <div class="title">
+          <span>
+            实时数据
+          </span>
+          <span class="right">
+            <div class="right_but">
+              <div class="right_but_left" :class="{ right_but_active: isActive == 1 }" @click="inDay">
+                本日
               </div>
-              <div class="card-content">
-                <span class="card-content-num">{{ data.HYJK }}</span>
-                <span class="card-content-text">海运进口</span>
+              <div class="right_but_right" :class="{ right_but_active: isActive == 2 }" @click="inMoon">
+                本月
               </div>
             </div>
-          </div>
-          <div class="divider" v-if="saberTenantId != '263057'" />
-          <div class="content-item" v-if="saberTenantId != '263057'">
-            <div class="card">
-              <div class="card-title card-title3">
-                <span>
-                  空
-                </span>
-              </div>
-              <div class="card-content">
-                <span class="card-content-num">{{ data.KYCK }}</span>
-                <span class="card-content-text">空运出口</span>
+            <el-date-picker v-model="realDate" type="daterange" size="mini" start-placeholder="开始日期"
+              end-placeholder="结束日期" value-format="yyyy-MM-dd" style="margin-right:10px;width:240px" :clearable="false">
+            </el-date-picker>
+            <el-button type="primary" size="mini" icon="el-icon-search" style="margin-right:10px;" @click="search"
+              circle></el-button>
+            <i class="el-icon-refresh-right" style="cursor: pointer;font-size:20px;line-height: 15px;"
+              @click="refresh"></i>
+          </span>
+        </div>
+        <div style="display: flex;">
+          <div class="content" v-loading="loading">
+            <div class="content-item">
+              <div class="card">
+                <div class="card-title card-title1">
+                  <span>
+                    海
+                  </span>
+                </div>
+                <div class="card-content">
+                  <span class="card-content-num">{{ data.HYCK }}</span>
+                  <span class="card-content-text">海运出口</span>
+                </div>
               </div>
             </div>
-          </div>
-          <div class="divider" v-if="saberTenantId != '263057'" />
-          <div class="content-item" v-if="saberTenantId != '263057'">
-            <div class="card">
-              <div class="card-title card-title4">
-                <span>
-                  空
-                </span>
+            <div class="divider" />
+            <div class="content-item">
+              <div class="card">
+                <div class="card-title card-title2">
+                  <span>
+                    海
+                  </span>
+                </div>
+                <div class="card-content">
+                  <span class="card-content-num">{{ data.HYJK }}</span>
+                  <span class="card-content-text">海运进口</span>
+                </div>
               </div>
-              <div class="card-content">
-                <span class="card-content-num">{{ data.KYJK }}</span>
-                <span class="card-content-text">空运进口</span>
+            </div>
+            <div class="divider" v-if="saberTenantId != '263057'" />
+            <div class="content-item" v-if="saberTenantId != '263057'">
+              <div class="card">
+                <div class="card-title card-title3">
+                  <span>
+                    空
+                  </span>
+                </div>
+                <div class="card-content">
+                  <span class="card-content-num">{{ data.KYCK }}</span>
+                  <span class="card-content-text">空运出口</span>
+                </div>
               </div>
             </div>
-          </div>
-          <div class="divider" v-if="saberTenantId == '263057'" />
-          <div class="content-item" v-if="saberTenantId == '263057'">
-            <div class="card">
-              <div class="card-title card-title3">
-                <span>
-                  贸
-                </span>
+            <div class="divider" v-if="saberTenantId != '263057'" />
+            <div class="content-item" v-if="saberTenantId != '263057'">
+              <div class="card">
+                <div class="card-title card-title4">
+                  <span>
+                    空
+                  </span>
+                </div>
+                <div class="card-content">
+                  <span class="card-content-num">{{ data.KYJK }}</span>
+                  <span class="card-content-text">空运进口</span>
+                </div>
               </div>
-              <div class="card-content">
-                <span class="card-content-num">{{ data.MYDL }}</span>
-                <span class="card-content-text">贸易代理</span>
+            </div>
+            <div class="divider" v-if="saberTenantId == '263057'" />
+            <div class="content-item" v-if="saberTenantId == '263057'">
+              <div class="card">
+                <div class="card-title card-title3">
+                  <span>
+                    贸
+                  </span>
+                </div>
+                <div class="card-content">
+                  <span class="card-content-num">{{ data.MYDL }}</span>
+                  <span class="card-content-text">贸易代理</span>
+                </div>
               </div>
             </div>
           </div>
         </div>
-      </div>
-    </el-card>
-    <el-dialog title="到港提醒" :visible.sync="dialogVisible" width="50%" append-to-body>
-      <span v-if="dialogVisible">
-        <avue-crud :table-loading="loading" :option="option" :data="dataList" @on-load="onLoad" :page.sync="page"
-          @current-change="currentChange" @size-change="sizeChange">
-          <template slot="shortName" slot-scope="{ row }">
-            <span style="color: #1e9fff;cursor: pointer;" @click="rowEdit(row)">{{ row.shortName }}</span>
-          </template>
-          <template slot="mblno" slot-scope="{ row }">
-            <span style="color: #1e9fff;cursor: pointer;" @click="rowEdit(row)">{{ row.mblno }}</span>
-          </template>
-        </avue-crud>
-      </span>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisible = false" size="mini">关 闭</el-button>
-      </span>
-    </el-dialog>
+
+      </el-card>
+    </div>
   </div>
+
 </template>
 
 <script>
@@ -216,7 +250,7 @@ export default {
               id: row.id
             }
           })
-          this.dialogVisible=false
+          this.dialogVisible = false
         }
       }
       if (row.businessType == 'SI') {
@@ -234,7 +268,7 @@ export default {
               id: row.id
             }
           })
-          this.dialogVisible=false
+          this.dialogVisible = false
         }
       }
     },
@@ -297,9 +331,10 @@ export default {
 
 <style lang="scss" scoped>
 .home-container {
-  padding: 0px 5px 5px 5px;
+
   box-sizing: border-box;
   height: 100%;
+  width: 100%;
 
   ::v-deep .el-card__body {
     padding: 10px 15px;
@@ -352,10 +387,10 @@ export default {
 
 .content {
   display: flex;
-  justify-content: center;
+  //justify-content: center;
   align-items: center;
   height: 15vh;
-  width: 80vw;
+  width: 100%;
 
   .divider {
     display: block;
@@ -425,4 +460,8 @@ export default {
     }
   }
 }
+
+.container-losrealtime {
+  display: flex;
+}
 </style>

vue.config.js

@@ -50,12 +50,12 @@ module.exports = {
       '/api': {
         //本地服务接口地址
         // target: 'http://192.168.3.64:1080',
-        // target: 'http://192.168.8.105:1080',
+        // target: 'http://192.168.8.104:1080',
         // target: 'http://127.0.0.1:1080',
         // 打包地址
-        // target: 'http://121.37.83.47:10004',//服务器ip
+        target: 'http://121.37.83.47:10004',//服务器ip
         // target: 'http://192.168.161.11:10004',//服务器ip
-         target: 'http://127.0.0.1:10004',
+        //  target: 'http://127.0.0.1:10004',
         // target: 'http://trade.tubaosoft.com:10004',//服务器域名
         ws: true,
         pathRewrite: {