695593266@qq.com пре 8 месеци
родитељ
комит
b0f8777cb0

+ 1 - 0
src/views/InTheSystem/components/tgDetails.vue

@@ -9,6 +9,7 @@
         :columns="columns"
         :datasource="datasource"
         cache-key="workOrderTable"
+        :pageSize="20"
       >
         <template v-slot:feedStatus="{ row }">
           {{

+ 1 - 0
src/views/InTheSystem/index.vue

@@ -9,6 +9,7 @@
         :columns="columns"
         :datasource="datasource"
         cache-key="workOrderTable"
+        :pageSize="20"
       >
         <template v-slot:feedStatus="{ row }">
           {{

+ 21 - 10
src/views/emiFinished/index.vue

@@ -8,6 +8,7 @@
         :datasource="datasource"
         :selection.sync="selection"
         cache-key="emiFinished"
+        :pageSize="20"
       >
         <template v-slot:action="{ row }">
           <el-popconfirm
@@ -62,44 +63,52 @@
             prop: 'categoryCode',
             width: 160,
             label: '编码',
-            align: 'center'
+            align: 'center',
+            showOverflowTooltip: true
           },
           {
             prop: 'categoryName',
             label: '物品名称',
-            align: 'center'
+            align: 'center',
+            showOverflowTooltip: true
           },
           {
             prop: 'categoryLevelName',
             label: '分类名称',
-            align: 'center'
+            align: 'center',
+            showOverflowTooltip: true
           },
           {
             prop: 'feedQuantity',
             label: '物品数量',
-            align: 'center'
+            align: 'center',
+            showOverflowTooltip: true
           },
           {
             prop: 'modelType',
             label: '型号',
-            align: 'center'
+            align: 'center',
+            showOverflowTooltip: true
           },
 
           {
             prop: 'packingUnit',
             label: '包装单位',
-            align: 'center'
+            align: 'center',
+            showOverflowTooltip: true
           },
           {
             prop: 'produceRoutingName',
             label: '工艺路线名称',
             align: 'center',
-            width: 160
+            width: 160,
+            showOverflowTooltip: true
           },
           {
             prop: 'rootCategoryLevelName',
             label: '物品根级分类名称',
-            align: 'center'
+            align: 'center',
+            showOverflowTooltip: true
           },
           {
             prop: 'specification',
@@ -111,14 +120,16 @@
           {
             prop: 'unit',
             label: '计量单位',
-            align: 'center'
+            align: 'center',
+            showOverflowTooltip: true
           },
 
           {
             prop: 'createTime',
             label: '创建时间',
             align: 'center',
-            width: 160
+            width: 160,
+            showOverflowTooltip: true
           },
 
           {

+ 21 - 10
src/views/exceptionManagement/exceptionList/index.vue

@@ -9,6 +9,7 @@
         :selection.sync="selection"
         row-key="id"
         cache-key="eceptionList"
+        :pageSize="20"
       >
         <template v-slot:type="{ row }">
           <span> {{ getDictValue('异常类型', row.type + '') }}</span>
@@ -242,23 +243,27 @@
             prop: 'type',
             label: '类型',
             align: 'center',
-            slot: 'type'
+            slot: 'type',
+            showOverflowTooltip: true
           },
           {
             prop: 'code',
             label: '编码',
             align: 'center',
-            slot: 'code'
+            slot: 'code',
+            showOverflowTooltip: true
           },
           {
             prop: 'name',
             label: '名称',
-            align: 'center'
+            align: 'center',
+            showOverflowTooltip: true
           },
           {
             prop: 'describes',
             label: '异常描述',
-            align: 'center'
+            align: 'center',
+            showOverflowTooltip: true
           },
           {
             prop: 'disposalStatus',
@@ -266,7 +271,8 @@
             align: 'center',
             formatter: (row, column, cellValue) => {
               return btnList.find((item) => item.type == cellValue)?.name;
-            }
+            },
+            showOverflowTooltip: true
           },
           {
             prop: 'relationType',
@@ -278,12 +284,14 @@
                 : cellValue == 2
                 ? '生产订单'
                 : '生产工单';
-            }
+            },
+            showOverflowTooltip: true
           },
           {
             prop: 'relationCode',
             label: '关联编码',
-            align: 'center'
+            align: 'center',
+            showOverflowTooltip: true
           },
           // {
           //   prop: 'a',
@@ -294,20 +302,23 @@
           {
             prop: 'createUserName',
             label: '创建人',
-            align: 'center'
+            align: 'center',
+            showOverflowTooltip: true
           },
 
           {
             prop: 'createTime',
             label: '创建时间',
-            align: 'center'
+            align: 'center',
+            showOverflowTooltip: true
           },
 
           {
             prop: 'approvalStatus',
             label: '状态',
             align: 'center',
-            slot: 'approvalStatus'
+            slot: 'approvalStatus',
+            showOverflowTooltip: true
           },
 
           {

+ 23 - 6
src/views/outsourcing/components/details.vue

@@ -12,24 +12,36 @@
       <headerTitle title="基本信息" style="margin-top: 15px"></headerTitle>
 
       <el-row :gutter="15">
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item label="委外单编码:" prop="code">
             <el-input v-model="row.code" disabled />
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item label="委外单名称:" prop="name">
             <el-input v-model="row.name" disabled />
           </el-form-item>
         </el-col>
 
-        <el-col :span="8">
+        <el-col :span="6">
+          <el-form-item label="委外发起工序:" prop="taskName">
+            <el-input v-model="row.taskName" disabled />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="6">
+          <el-form-item label="委外工序:" prop="taskNames">
+            <el-input v-model="row.taskNames" disabled />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="6">
           <el-form-item label="工单编码:" prop="factoriesName">
             <el-input v-model="row.workOrderCode" style="width: 100%" disabled>
             </el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item label="预计到货日期:" prop="factoriesName">
             <el-input
               v-model="row.requireDeliveryTime"
@@ -39,13 +51,13 @@
             </el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item label="创建时间:" prop="factoriesName">
             <el-input v-model="row.createTime" style="width: 100%" disabled>
             </el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item label="状态:" prop="status">
             <el-tag>{{
               row.status == 0 ? '未提交' : row.status == 1 ? '已提交' : '已发布'
@@ -93,6 +105,10 @@
         {{ row.totalCount }}{{ row.measuringUnit }}
       </template>
 
+      <template v-slot:totalWeight="{ row }">
+        {{ row.totalWeight }}{{ row.weightUnit }}
+      </template>
+
       <template v-slot:sourceType="{ row }">
         <el-tag v-if="row.sourceType == 1" size="mini" type="success"
           >物品清单</el-tag
@@ -260,6 +276,7 @@
           {
             label: '重量',
             prop: 'totalWeight',
+            slot: 'totalWeight',
             align: 'center',
             showOverflowTooltip: true
           },

+ 17 - 5
src/views/outsourcing/index.vue

@@ -9,6 +9,7 @@
         :columns="columns"
         :datasource="datasource"
         cache-key="outsourcingListDatas"
+        :pageSize="20"
       >
         <template v-slot:code="{ row }">
           <el-link
@@ -19,8 +20,16 @@
           >
         </template>
 
+        <template v-slot:totalCount="{ row }">
+          <div v-if="row.totalCount"
+            >{{ row.totalCount }}{{ row.measuringUnit }}</div
+          >
+        </template>
+
         <template v-slot:totalWeight="{ row }">
-          <div v-if="row.totalWeight">{{ row.totalWeight }}</div>
+          <div v-if="row.totalWeight"
+            >{{ row.totalWeight }}{{ row.weightUnit }}</div
+          >
           <div v-else>无</div>
         </template>
 
@@ -241,6 +250,7 @@
           },
           {
             prop: 'totalCount',
+            slot: 'totalCount',
             label: '委外数量',
             align: 'center',
             showOverflowTooltip: true
@@ -314,20 +324,22 @@
             slot: 'status',
             label: '状态',
             align: 'center',
-            showOverflowTooltip: true
+            showOverflowTooltip: true,
+            width: 100
           },
           {
             slot: 'purchaseStatus',
-            label: '采购状态',
+            label: '委外状态',
             align: 'center',
-            showOverflowTooltip: true
+            showOverflowTooltip: true,
+            width: 100
           },
           {
             slot: 'approvalStatus',
             label: '审核状态',
             align: 'center',
             showOverflowTooltip: true,
-            width: 120
+            width: 110
           },
 
           {

+ 3 - 1
src/views/pick/pickApply/index.vue

@@ -14,6 +14,7 @@
         autoAmendPage
         :parse-data="parseData"
         @update:selection="handleSelectionChange"
+        :pageSize="20"
       >
         <template v-slot:toolbar>
           <el-button
@@ -167,7 +168,8 @@
             prop: 'status',
             slot: 'status',
             label: '状态',
-            align: 'center'
+            align: 'center',
+            showOverflowTooltip: true
           },
 
           {

+ 4 - 4
src/views/produce/components/jobBooking/components/jobDdBom.vue

@@ -8,15 +8,15 @@
 
     <div class="material">
       <div class="content_table">
-        <div class="item rx-sc">
-          <!-- <div class="rx ww33"
+        <!-- <div class="item rx-sc"> -->
+        <!-- <div class="rx ww33"
                         v-if="Object.prototype.hasOwnProperty.call(item, 'product') && clientEnvironmentId != 3">
                         <div class="lable rx-cc">投料数量</div>
                         <div class="content">
                             {{ item.product[0] && item.product[0].feedQuantity }}
                         </div>
                     </div> -->
-
+        <!--
           <div class="rx ww33">
             <div class="lable lable100 rx-cc">要求生产数量</div>
             <div class="content">{{ item.formingNum }} {{ item.unit }}</div>
@@ -28,7 +28,7 @@
               >{{ item.formingWeight }}{{ item.weightUnit }}</div
             >
           </div>
-        </div>
+        </div> -->
 
         <!-- v-if="(clientEnvironmentId == 3 && item.singleReport == 0) ||  taskObj.type == 4 || clientEnvironmentId == 2" -->
         <div class="item rx-sc">

+ 9 - 9
src/views/produce/components/jobBooking/components/oneJobQualityBomPL.vue

@@ -267,11 +267,11 @@
                 size="mini"
                 class="content_num"
                 filterable
-                v-model="row.extInfo.appearance"
+                v-model="row.extInfo.isQualified"
                 placeholder="请选择"
                 style="width: 160px"
                 :disabled="isDetails"
-                @change="changeQuality(row.extInfo.appearance, row, $index)"
+                @change="changeQuality(row.extInfo.isQualified, row, $index)"
               >
                 <el-option
                   v-for="item in qualityList"
@@ -301,7 +301,7 @@
                 v-model="row.extInfo.notType"
                 placeholder="请选择"
                 style="width: 160px"
-                :disabled="isDetails || row.extInfo.appearance != 2"
+                :disabled="isDetails || row.extInfo.isQualified != 2"
                 @change="qualityChange"
               >
                 <el-option
@@ -318,7 +318,7 @@
               </span>
               <div
                 v-if="
-                  row.extInfo.appearance != 1 &&
+                  row.extInfo.isQualified != 1 &&
                   row.extInfo.notType &&
                   row.extInfo.notType != 5 &&
                   row.extInfo.notType != 8
@@ -594,7 +594,7 @@
       },
 
       changeQuality(type, item, index) {
-        this.$set(this.item.sampleQuality[index].extInfo, 'isQualified', type);
+        // this.$set(this.item.sampleQuality[index].extInfo, 'isQualified', type);
         if (type == 1) {
           item.extInfo.notType = '';
           item.extInfo.notReason = '';
@@ -613,15 +613,15 @@
             if (item.extInfo.batchReportInfo.length == 0) {
               const data = item.extInfo;
               if (
-                data.appearance == 1 ||
-                data.appearance == 3 ||
-                !data.appearance
+                data.isQualified == 1 ||
+                data.isQualified == 3 ||
+                !data.isQualified
               ) {
                 formedNum++;
                 formedWeightCount += Number(data.reportWeight);
               }
 
-              if (data.appearance == 2) {
+              if (data.isQualified == 2) {
                 notFormedNum++;
                 notFormedWeightCount += Number(data.reportWeight);
               }

+ 37 - 3
src/views/produce/components/picking/detailed.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-dialog
+    <!-- <el-dialog
       title="领料列表"
       :visible.sync="visible"
       :before-close="handleClose"
@@ -8,6 +8,21 @@
       :close-on-press-escape="false"
       append-to-body
       width="80%"
+    > -->
+    <ele-modal
+      title="领料列表"
+      :visible.sync="visible"
+      v-if="visible"
+      :before-close="handleClose"
+      :close-on-click-modal="false"
+      :maxable="true"
+      :close-on-press-escape="false"
+      id="formId"
+      append-to-body
+      width="80%"
+      @update:fullscreen="fullscreen"
+      :fullscreen="isFullscreen"
+      :height="dialogDynamicHeight"
     >
       <div class="tableZ_box">
         <div class="row">
@@ -110,8 +125,9 @@
           </template> -->
         </ele-pro-table>
       </div>
-    </el-dialog>
 
+      <!-- </el-dialog> -->
+    </ele-modal>
     <outboundDetail ref="outboundDetailRef" />
   </div>
 </template>
@@ -128,7 +144,9 @@
       return {
         visible: true,
         dataObj: null,
-        outboundDetailList: []
+        outboundDetailList: [],
+        isFullscreen: false,
+        tabalHeight: 300
       };
     },
 
@@ -320,6 +338,18 @@
             }
           ]
         ];
+      },
+
+      dialogDynamicHeight() {
+        if (this.isFullscreen) {
+          // 全屏时,高度为窗口高度
+          console.log(window.innerHeight + 'px', '全屏高度');
+          this.tabalHeight = window.innerHeight - 200;
+          return window.innerHeight + 'px';
+        } else {
+          this.tabalHeight = 300;
+          return '500px';
+        }
       }
     },
 
@@ -339,6 +369,10 @@
         }).then((res) => {
           this.outboundDetailList = res;
         });
+      },
+
+      fullscreen() {
+        this.isFullscreen = !this.isFullscreen;
       }
     },
 

+ 18 - 7
src/views/produce/components/picking/outboundDetail.vue

@@ -21,18 +21,19 @@
           {{ outboundData.batchNo }}
         </el-descriptions-item>
 
+        <el-descriptions-item>
+          <template slot="label"> 名称 </template>
+          {{ outboundData.name }}
+        </el-descriptions-item>
+
         <el-descriptions-item>
           <template slot="label"> 牌号 </template>
-          {{ outboundData.brandNo }}
+          {{ outboundData.brandNum }}
         </el-descriptions-item>
         <el-descriptions-item>
           <template slot="label"> 编码 </template>
           {{ outboundData.categoryCode }}
         </el-descriptions-item>
-        <el-descriptions-item>
-          <template slot="label"> 名称 </template>
-          {{ outboundData.name }}
-        </el-descriptions-item>
         <el-descriptions-item>
           <template slot="label"> 类型</template>
           {{ typeName[Number(outboundData.rootCategoryLevelId)] }}
@@ -78,6 +79,11 @@
           {{ outboundData.unit }}
         </el-descriptions-item>
 
+        <!-- <el-descriptions-item>
+            <template slot="label"> 订单重量 </template>
+            {{ outboundData.weight }}{{ outboundData.weightUnit }}
+          </el-descriptions-item> -->
+
         <el-descriptions-item>
           <template slot="label"> 仓库名称 </template>
           {{ outboundData.warehouseName }}
@@ -152,8 +158,13 @@
 
       async getOutboundDetailData(pickOrderId, categoryCode) {
         await getOutboundDetail({ pickOrderId, categoryCode }).then((res) => {
-          this.outboundData = res[0];
-          console.log(this.outboundData, 'this.outboundData');
+          if (res.length != 0) {
+            const totalNumber = res.reduce((acc, cur) => {
+              return cur.feedQuantity ? Number(cur.feedQuantity) + acc : acc;
+            }, 0);
+            res[0].feedQuantity = totalNumber;
+            this.outboundData = res[0];
+          }
         });
       }
     }

+ 40 - 9
src/views/produce/components/workPlan/components/inspectionTemplateDialog.vue

@@ -17,9 +17,16 @@
       tool-class="ele-toolbar-form"
       row-key="qualityLevelId"
       v-if="equipmentdialog"
-      :selection.sync="selection"
+      :current.sync="current"
       :initLoad="false"
+      @current-change="handleCurrentChange"
     >
+      <template v-slot:current="{ row, _index }">
+        <el-radio class="radio" v-model="radio" :label="row.id"
+          ><i></i
+        ></el-radio>
+      </template>
+
       <template v-slot:status="{ row }">
         {{ row.status ? '启用' : '停用' }}
       </template>
@@ -43,13 +50,21 @@
         type: '',
         equipmentdialog: false,
         selection: [],
+        current: null,
+        radio: '',
         columns: [
+          // {
+          //   width: 45,
+          //   type: 'selection',
+          //   columnKey: 'selection',
+          //   align: 'center',
+          //   reserveSelection: true
+          // },
           {
-            width: 45,
-            type: 'selection',
-            columnKey: 'selection',
-            align: 'center',
-            reserveSelection: true
+            width: 55,
+            columnKey: 'current',
+            slot: 'current',
+            align: 'center'
           },
           {
             columnKey: 'index',
@@ -95,10 +110,15 @@
             slot: 'action',
             fixed: 'right'
           }
-        ]
+        ],
+        typeList: []
       };
     },
 
+    mounted() {
+      // this.getInspectionType();
+    },
+
     watch: {},
     methods: {
       datasource({ page, where, limit }) {
@@ -116,17 +136,28 @@
         });
       },
       handleClose() {
+        this.$nextTick(() => {
+          this.current = null;
+          this.radio = '';
+        });
         this.equipmentdialog = false;
       },
 
+      handleCurrentChange(row) {
+        this.radio = row.id;
+      },
+
       // 选择
       selected() {
-        if (!this.selection.length) {
+        if (!this.current) {
           this.$message.error('至少选择一条数据');
 
           return;
         }
-        this.$emit('choose', this.selection);
+        // console.log(this.current, 'this.current');
+        // if (!this.selection.length) {
+        // }
+        this.$emit('choose', this.current);
         this.handleClose();
       },
 

+ 9 - 1
src/views/produce/components/workPlan/components/newQualityContentTabs.vue

@@ -369,27 +369,32 @@
           <el-table-column
             label="质检方案编码"
             prop="qualitySchemeTemplateCode"
+            show-overflow-tooltip
             align="center"
           >
           </el-table-column>
           <el-table-column
             label="质检方案名称"
             prop="qualitySchemeTemplateName"
+            show-overflow-tooltip
             align="center"
           ></el-table-column>
           <el-table-column
             label="质检类型"
             prop="categoryLevelClassName"
+            show-overflow-tooltip
             align="center"
           ></el-table-column>
           <el-table-column
             label="质检项编码"
             prop="inspectionCode"
+            show-overflow-tooltip
             align="center"
           ></el-table-column>
           <el-table-column
             label="质检项名称"
             prop="inspectionName"
+            show-overflow-tooltip
             align="center"
           ></el-table-column>
           <el-table-column
@@ -1075,8 +1080,11 @@
         this.$refs.inspectionTemplateRef.open(type);
       },
       async inspectionTemplateSuccess(select) {
+        const ids = [];
+        ids.push(select.id);
         let data = await getQualityTemplateByIds({
-          templateIds: select.map((item) => item.id)
+          // templateIds: select.map((item) => item.id)
+          templateIds: ids
         });
 
         data.forEach((item) => {

+ 1 - 1
src/views/produce/index.vue

@@ -49,7 +49,7 @@
                 <span class="custom-tree-node" slot-scope="{ node, data }">
                   <span>{{ node.label }}</span>
                   <span
-                    style="color: red"
+                    style="color: red; font-weight: 700"
                     v-if="data.number != '0' && data.number"
                     >({{ data.number >= 100 ? '99+' : data.number }})</span
                   >

+ 8 - 3
src/views/produceOrder/index.vue

@@ -33,6 +33,7 @@
         :parse-data="parseData"
         @columns-change="handleColumnChange"
         :cache-key="cacheKeyUrl"
+        :pageSize="20"
       >
         <template v-slot:toolbar>
           <!-- <el-button type="success">新建</el-button> -->
@@ -512,6 +513,7 @@
             prop: 'bomType',
             label: '生产类型',
             align: 'center',
+            showOverflowTooltip: true,
             width: 120,
             formatter: (row) => {
               if (row.bomType == 1) {
@@ -609,18 +611,21 @@
           {
             prop: 'brandNo',
             label: '牌号',
-            align: 'center'
+            align: 'center',
+            showOverflowTooltip: true
           },
           {
             prop: 'taskName',
             label: '工序进度',
-            align: 'center'
+            align: 'center',
+            showOverflowTooltip: true
           },
           {
             prop: 'singleReport',
             slot: 'singleReport',
             label: '报工类型',
-            align: 'center'
+            align: 'center',
+            showOverflowTooltip: true
           },
           {
             prop: 'outsourceStatus',

+ 1 - 0
src/views/produceWord/index.vue

@@ -12,6 +12,7 @@ r++<template>
         height="calc(100vh - 365px)"
         @sort-change="onSortChange"
         @columns-change="handleColumnChange"
+        :pageSize="20"
       >
         <template v-slot:code="{ row }">
           <!-- <el-link type="primary" :underline="false" @click="goDetail(row)"> -->

+ 6 - 1
src/views/unacceptedProduct/index.vue

@@ -3,7 +3,12 @@
   <div class="ele-body">
     <el-card shadow="never" v-loading="loading">
       <order-search @search="reload" ref="searchRef"> </order-search>
-      <ele-pro-table ref="table" :columns="columns" :datasource="datasource">
+      <ele-pro-table
+        ref="table"
+        :columns="columns"
+        :datasource="datasource"
+        :pageSize="20"
+      >
         <!-- 操作列 -->
         <template v-slot:toolbar>
           <el-button type="primary" @click="open()">新建</el-button>

+ 12 - 5
src/views/unacceptedProduct/refuseManagement/index.vue

@@ -8,6 +8,7 @@
         :columns="columns"
         :datasource="datasource"
         :selection.sync="selection"
+        :pageSize="20"
       >
         <template v-slot:action="{ row }">
           <el-popconfirm
@@ -175,23 +176,27 @@
           {
             prop: 'produceRoutingName',
             label: '工艺路线',
-            align: 'center'
+            align: 'center',
+            showOverflowTooltip: true
           },
           {
             prop: 'produceTaskName',
             label: '工序',
-            align: 'center'
+            align: 'center',
+            showOverflowTooltip: true
           },
           {
             prop: 'unqualifiedReason',
             label: '原因',
-            align: 'center'
+            align: 'center',
+            showOverflowTooltip: true
           },
 
           {
             prop: 'createTime',
             label: '创建时间',
             align: 'center',
+            showOverflowTooltip: true,
             width: 160
           },
           // {
@@ -202,7 +207,8 @@
           {
             prop: 'depotName',
             label: '仓库名称',
-            align: 'center'
+            align: 'center',
+            showOverflowTooltip: true
           },
           {
             prop: 'status',
@@ -210,7 +216,8 @@
             align: 'center',
             formatter: (row, column, cellValue) => {
               return cellValue == 0 ? '未入库' : cellValue == 1 ? '已入库' : '';
-            }
+            },
+            showOverflowTooltip: true
           }
 
           // {

+ 1 - 0
src/views/warehousing/index.vue

@@ -9,6 +9,7 @@
         :columns="columns"
         :datasource="datasource"
         cache-key="warehouseIndex"
+        :pageSize="20"
       >
         <template v-slot:totalCount="{ row }">
           {{ row.totalCount }} {{ row.measuringUnit }}

+ 1 - 4
vue.config.js

@@ -33,18 +33,15 @@ module.exports = {
       // 当我们的本地的请求 有/api的时候,就会代理我们的请求地址向另外一个服务器发出请求
       '/api': {
         // target: 'http://124.71.68.31:50001',
-        // target: 'http://192.168.1.116:18086',
         // target: 'http://192.168.1.251:18086',
         // target: 'http://192.168.1.103:18086',192.168.1.116
-        // target: 'http://192.168.1.125:18086',
-        // target: 'http://192.168.1.116:18086',
+        target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.144:18086',
         // target: 'http://192.168.1.30:18086',
         // target: 'http://192.168.1.211:18086',
         // target: 'http://192.168.1.33:18086',
         // target: 'http://192.168.1.251:18186',
         // target: 'http://192.168.1.251:18087',
-        target: 'http://192.168.1.116:18086',
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {
           '^/api': ''