修改资产盘点的功能。

src/common/Common.js

@@ -1,4 +1,5 @@
 import { Notify } from 'pc-component-v3';
+import { notification } from 'ant-design-vue';
 
 export default {
   pageSize: 20,
@@ -431,3 +432,63 @@ export default {
 
 };
 
+
+/**
+ * 请求错误
+ * @param {} err 
+ */
+export function requestFailed(err) {
+  console.error(err);
+  notification['error']({
+    message: '错误',
+    description: ((err.response || {}).data || {}).message || '请求出现错误，请稍后再试',
+    duration: 8,
+  });
+}
+
+/**
+ * 请求正常
+ * @param {} response 
+ */
+export function requestSuccess(response) {
+  if (response.errorCode !== 0) {
+    notification['error']({
+      message: '错误',
+      description: response.errorMessage,
+      duration: 8,
+    });
+  }
+}
+
+/**
+ * 错误提示
+ * @param {} response 
+ */
+export function notificationError(message, title) {
+  notification['error']({
+    message: title || '操作失败',
+    description: message,
+    duration: 8,
+  });
+}
+
+
+/**
+ * 错误提示
+ * @param {} response 
+ */
+export function notificationSuccess(message, title) {
+  notification['success']({
+    message: title || '操作成功',
+    description: message,
+    duration: 8,
+  });
+}
+
+// 获取IP
+export function getRootPath() {
+  var protocol = window.location.protocol;
+  var host = window.location.host;
+  var localhostPath = `${protocol}//${host}`;
+  return localhostPath;
+}

src/components/customer/AssetInventoryStep3.vue

@@ -1,20 +1,38 @@
 <template>
   <div class="grid-container">
     <div class="grid-item-1">
-      <div>
-        <a-form-item label="盘点单名称" extra="全公司范围内每个部门一个盘点单">
+      <a-form
+        :label-col="{ span: 4 }"
+        :wrapper-col="{ span: 16 }"
+      >
+        <a-form-item label="盘点单名称" extra="全公司范围内每个部门一个盘点单" class="m-form-item">
           <a-input v-model:value="inventorySheetName" size="default" />
         </a-form-item>
-        <a-form-item label="待盘点的部门" />
-        <a-tree
-          v-if="treeData.length > 0" :tree-data="treeData" :auto-expand-parent="autoExpandParent"
-          default-expand-all="true" :checked-keys="checkedKeys" @expand="onExpand" @check="onTreeItemCheck"
-        >
-          <template #title="{key: treeKey, title}">
-            <span>{{ title }}<small>{{ treeKey }}</small></span>
-          </template>
-        </a-tree>
-      </div>
+
+        <a-form-item label="会计期间" :rules="[{ required: true }]" class="m-form-item">
+          <VueMonthlyPicker v-model="accountDate" date-format="YYYY-MM" class="m-monthly-picker" />
+        </a-form-item>
+
+        <a-form-item label="计划开始时间" :rules="[{ required: true }]" class="m-form-item">
+          <Date v-model="plannedStartDate" />
+        </a-form-item>
+
+        <a-form-item label="计划结束时间" :rules="[{ required: true }]" class="m-form-item">
+          <Date v-model="plannedEndDate" />
+        </a-form-item>
+
+
+        <a-form-item label="待盘点的部门">
+          <a-tree
+            v-if="treeData.length > 0" :tree-data="treeData" :auto-expand-parent="autoExpandParent"
+            default-expand-all="true" :checked-keys="checkedKeys" @expand="onExpand" @check="onTreeItemCheck"
+          >
+            <template #title="{key: treeKey, title}">
+              <span>{{ title }}<small>{{ treeKey }}</small></span>
+            </template>
+          </a-tree>
+        </a-form-item>
+      </a-form>
       <a-divider />
       <a-button type="primary" @click="previous">上一步</a-button>
       <a-button style="float: right;" type="primary" @click="next">下一步</a-button>
@@ -31,6 +49,9 @@ import OrganizationResource from '../../api/base/OrganizationResource.js';
 import AssetInventoryResource from '../../api/asset/AssetInventoryResource.js';
 import { Notify } from 'pc-component-v3';
 
+import dayjs from 'dayjs';
+
+
 export default {
 
   components: {
@@ -61,6 +82,10 @@ export default {
       autoExpandParent: true,
       inventorySheetName: null,
       currentStepTempory: {},
+
+      accountDate: dayjs().format('YYYY-MM-DD'), //账面日期
+      plannedStartDate: null, //计划开始时间
+      plannedEndDate: null, //计划结束时间
     };
   },
 
@@ -97,10 +122,29 @@ export default {
         Notify.error('错误', '请填写盘点单名称', 1000);
         return;
       }
+
+      
+      if (_self.accountDate == null) {
+        Notify.error('错误', '请设置会计期间', 1000);
+        return;
+      }
+      if (_self.plannedStartDate == null) {
+        Notify.error('错误', '请设置计划开始时间', 1000);
+        return;
+      }
+      if (_self.plannedEndDate == null) {
+        Notify.error('错误', '请设置计划结束时间', 1000);
+        return;
+      }
       var param = {
         inventorySheetName: _self.inventorySheetName,
+        accountDate: _self.accountDate,
+        plannedStartDate: _self.plannedStartDate,
+        plannedEndDate: _self.plannedEndDate,
         assetInventoryDepartment: [],
       };
+
+
       _self.treeData.forEach(function(item) {
         var data = {
           id: item.id,
@@ -276,4 +320,15 @@ export default {
   .div-form {
     margin-bottom: 10px;
   }
+
+  .m-monthly-picker >>> .month-year-display{
+    height: 35px;
+    font-size: 1.5rem;
+    padding-left: 0.9rem;
+    font-weight: 400;
+  }
+
+  .m-form-item{
+    margin-bottom: 5px;
+  }
 </style>

src/components/customer/AssetInventoryStep4.vue

@@ -1,20 +1,37 @@
 <template>
   <div class="grid-container">
     <div class="grid-item-1">
-      <div>
-        <a-form-item label="盘点单名称">
+      <a-form
+        :label-col="{ span: 4 }"
+        :wrapper-col="{ span: 16 }"
+      >
+        <a-form-item label="盘点单名称" class="m-form-item">
           <a-input v-model:value="inventorySheetName" size="default" />
         </a-form-item>
-        <a-form-item label="选择单个部门生成盘点单" />
-        <a-tree
-          v-if="treeData.length > 0" checkable check-strictly :tree-data="treeData" default-expand-all="true"
-          :checked-keys="checkedKeys" :auto-expand-parent="autoExpandParent" @expand="onExpand" @check="onTreeItemCheck"
-        >
-          <template #title="{key: treeKey, title}">
-            <span>{{ title }}<small>{{ treeKey }}</small></span>
-          </template>
-        </a-tree>
-      </div>
+        
+        <a-form-item label="会计期间" :rules="[{ required: true }]" class="m-form-item">
+          <VueMonthlyPicker v-model="accountDate" date-format="YYYY-MM" class="m-monthly-picker" />
+        </a-form-item>
+
+        <a-form-item label="计划开始时间" :rules="[{ required: true }]" class="m-form-item">
+          <Date v-model="plannedStartDate" />
+        </a-form-item>
+
+        <a-form-item label="计划结束时间" :rules="[{ required: true }]" class="m-form-item">
+          <Date v-model="plannedEndDate" />
+        </a-form-item>
+
+        <a-form-item label="选择单个部门生成盘点单">
+          <a-tree
+            v-if="treeData.length > 0" checkable check-strictly :tree-data="treeData" default-expand-all="true"
+            :checked-keys="checkedKeys" :auto-expand-parent="autoExpandParent" @expand="onExpand" @check="onTreeItemCheck"
+          >
+            <template #title="{key: treeKey, title}">
+              <span>{{ title }}<small>{{ treeKey }}</small></span>
+            </template>
+          </a-tree>
+        </a-form-item>
+      </a-form>
       <a-divider />
       <a-button type="primary" @click="previous">上一步</a-button>
       <a-button style="float: right;" type="primary" @click="next">下一步</a-button>
@@ -30,6 +47,8 @@ import Common from '../../common/Common.js';
 import OrganizationResource from '../../api/base/OrganizationResource.js';
 import AssetInventoryResource from '../../api/asset/AssetInventoryResource.js';
 import { Notify } from 'pc-component-v3';
+import dayjs from 'dayjs';
+
 
 export default {
   
@@ -48,6 +67,10 @@ export default {
       checkedKeys: [],
       autoExpandParent: true,
       inventorySheetName: null,
+      
+      accountDate: dayjs().format('YYYY-MM-DD'), //账面日期
+      plannedStartDate: null, //计划开始时间
+      plannedEndDate: null, //计划结束时间
     };
   },
   mounted: function() {
@@ -61,8 +84,24 @@ export default {
         Notify.error('错误', '请填写盘点单名称！', 1000);
         return;
       }
+      
+      if (_self.accountDate == null) {
+        Notify.error('错误', '请设置会计期间', 1000);
+        return;
+      }
+      if (_self.plannedStartDate == null) {
+        Notify.error('错误', '请设置计划开始时间', 1000);
+        return;
+      }
+      if (_self.plannedEndDate == null) {
+        Notify.error('错误', '请设置计划结束时间', 1000);
+        return;
+      }
       var param = {
         inventorySheetName: _self.inventorySheetName,
+        accountDate: _self.accountDate,
+        plannedStartDate: _self.plannedStartDate,
+        plannedEndDate: _self.plannedEndDate,
         assetInventoryDepartment: [],
       };
       _self.treeData.forEach(function(item) {
@@ -267,4 +306,16 @@ export default {
   .div-form {
     margin-bottom: 10px;
   }
+
+  
+  .m-monthly-picker >>> .month-year-display{
+    height: 35px;
+    font-size: 1.5rem;
+    padding-left: 0.9rem;
+    font-weight: 400;
+  }
+
+  .m-form-item{
+    margin-bottom: 5px;
+  }
 </style>

src/components/customer/AssetInventoryStep5.vue

@@ -1,51 +1,45 @@
 <template>
   <div>
-    <div class="grid-container">
-      <div class="grid-item-row1-column1">
-        <div class="btn-group m-panel" role="group">
-          <button type="button" class="btn btn-success" @click="getAssetInstance(false)">
+    <div>
+      <a-form layout="inline">
+        <a-form-item label="盘点单名称" class="m-form-item">
+          <a-input v-model:value="inventorySheetName" size="default" />
+        </a-form-item>
+        
+        <a-form-item label="会计期间" :rules="[{ required: true }]" class="m-form-item">
+          <VueMonthlyPicker v-model="accountDate" date-format="YYYY-MM" class="m-monthly-picker" />
+        </a-form-item>
+
+        <a-form-item label="计划开始时间" :rules="[{ required: true }]" class="m-form-item">
+          <Date v-model="plannedStartDate" />
+        </a-form-item>
+
+        <a-form-item label="计划结束时间" :rules="[{ required: true }]" class="m-form-item">
+          <Date v-model="plannedEndDate" />
+        </a-form-item>
+
+        <a-space>
+          <a-button type="primary" @click="showModal">上传</a-button>
+
+          <a-button @click="getAssetInstance(false)">
             {{ $t('lang.AssetInventorySearch.query') }}
-          </button>
+          </a-button>
 
           <!-- <button type="button" class="btn btn-info" @click="generateAssetInventoryLine">
-            加入盘点清单(已选择:{{ checkedIds.length }})
-          </button> -->
-          <button type="button" class="btn btn-info" @click="openAssetInventoryLine">
-            查看盘点清单(已选择:{{ assetInstancesTempory.length }})
-          </button>
-          <button type="button" class="btn btn-danger" @click="clearFilter">
-            {{ $t('lang.AssetInventorySearch.empty') }}
-          </button>
-          <!--          <a-button style="height: 33.5px" type="primary" @click="downloadFile">-->
-          <!--            下载-->
-          <!--          </a-button>-->
-          <!--          <a-upload-->
-          <!--            v-model:file-list="fileList"-->
-          <!--            :show-upload-list="false"-->
-          <!--            :before-upload="beforeUpload"-->
-          <!--            @change="uploadFileChange"-->
-          <!--          >-->
-          <!--            <a-button type="dashed" style="height: 33.5px"> 上传</a-button>-->
-          <!--          </a-upload>-->
-        </div>
-      </div>
-      <!-- <div class="grid-item-row2-column1">
-        <div class="btn-group m-panel" role="group">
-          <button type="button" class="btn btn-danger" @click="clearFilter">
-            {{ $t("lang.AssetInventorySearch.empty") }}
-          </button>
-          <button type="button" class="btn btn-info" @click="openAssetInventoryLine">
-            查看盘点清单(已选择:{{ assetInstancesTempory.length }})
-          </button>
-        </div>
-      </div> -->
+    加入盘点清单(已选择:{{ checkedIds.length }})
+  </button> -->
+          <a-button @click="openAssetInventoryLine">
+            查看盘点清单({{ assetInstancesTempory.length }})
+          </a-button>
 
-      <div class="grid-item-row1-column2">
-        <a-form-item label="盘点单名称">
-          <a-input v-model:value="inventorySheetName" size="default" style="width: 70%" />
-          <a-button type="primary" style="height: 33.5px; margin-left: 30px" @click="showModal">上传</a-button>
-        </a-form-item>
-      </div>
+          <a-button @click="clearFilter">
+            {{ $t('lang.AssetInventorySearch.empty') }}
+          </a-button>
+        </a-space>
+      </a-form>
+    </div>
+      
+    <div class="grid-container">
       <a-modal v-model:open="visible" title="上传盘点资产数据" ok-text="确认" cancel-text="取消" @ok="handleOk">
         <p>1、请点击【下载】按钮，下载所有的资产数据。</p>
         <a-button style="height: 33.5px" type="primary" @click="downloadFile">
@@ -514,6 +508,10 @@ import {
 } from 'ant-design-vue';
 
 
+import dayjs from 'dayjs';
+
+import { Date } from 'pc-component-v3';
+
 export default {
 
   components: {
@@ -616,6 +614,11 @@ export default {
       checkedIds: [],
       loading: false,
       inventorySheetName: undefined, //盘点单名称
+      
+      accountDate: dayjs().format('YYYY-MM-DD'), //账面日期
+      plannedStartDate: null, //计划开始时间
+      plannedEndDate: null, //计划结束时间
+
       assetInstancesTempory: [], //盘点清单展示
       modal1: false,
       fileList: [],
@@ -834,6 +837,23 @@ export default {
         Notify.error('错误', '请填写盘点单名称', 1000);
         return;
       }
+
+      
+      
+      if (_self.accountDate == null) {
+        Notify.error('错误', '请设置会计期间', 1000);
+        return;
+      }
+      if (_self.plannedStartDate == null) {
+        Notify.error('错误', '请设置计划开始时间', 1000);
+        return;
+      }
+      if (_self.plannedEndDate == null) {
+        Notify.error('错误', '请设置计划结束时间', 1000);
+        return;
+      }
+
+
       if (
         _self.assetInstancesTempory == null ||
 					_self.assetInstancesTempory.length < 1
@@ -847,6 +867,9 @@ export default {
       });
       var param = {
         inventorySheetName: _self.inventorySheetName,
+        accountDate: _self.accountDate,
+        plannedStartDate: _self.plannedStartDate,
+        plannedEndDate: _self.plannedEndDate,
         assetInstanceIds: assetInventoryLineSaveDtos,
       };
 
@@ -855,6 +878,7 @@ export default {
         showPage: 6,
         assetInventoryStep3: param,
       };
+
       this.$emit('next', data);
     },
 
@@ -1189,7 +1213,7 @@ export default {
 		margin-top: 10px;
 		display: grid;
 		grid-template-columns: 300px auto;
-		grid-template-rows: 35px 30px 1fr 40px;
+		grid-template-rows: 0px 30px 1fr 40px;
 		gap: 10px;
 		justify-items: stretch;
 		align-items: stretch;
@@ -1285,4 +1309,17 @@ export default {
 	:deep(.ant-form-item-control-input-content) {
 		display: flex;
 	}
+
+  
+  
+  .m-monthly-picker >>> .month-year-display{
+    height: 35px;
+    font-size: 1.5rem;
+    padding-left: 0.9rem;
+    font-weight: 400;
+  }
+
+  .m-form-item{
+    margin-bottom: 5px;
+  }
 </style>

src/components/inventory1/InventoryGlobalView.vue

@@ -0,0 +1,32 @@
+<template>
+  <InventorySelect />
+  <a-tabs v-model:activeKey="activeKey">
+    <a-tab-pane key="1" tab="盘点动态">
+      <InventoryPage1 />
+    </a-tab-pane>
+    <a-tab-pane key="2" tab="未盘资产">
+      <InventoryPage2 />
+    </a-tab-pane>
+    <a-tab-pane key="3" tab="无盈亏资产">无盈亏资产</a-tab-pane>
+    <a-tab-pane key="3" tab="盘亏资产">盘亏资产</a-tab-pane>
+    <a-tab-pane key="3" tab="盘盈资产">盘盈资产</a-tab-pane>
+    <a-tab-pane key="3" tab="盘点结果">盘点结果</a-tab-pane>
+  </a-tabs>
+</template>
+
+<script setup>
+import InventorySelect from './InventorySelect.vue';
+import InventoryPage1 from './InventoryPage1.vue';
+import InventoryPage2 from './InventoryPage2.vue';
+
+import { ref } from 'vue';
+const activeKey = ref('1');
+
+</script>
+
+
+
+
+
+
+

src/components/inventory1/InventoryPage1.vue

@@ -0,0 +1,102 @@
+<template>
+  <a-table :columns="columns" :data-source="data">
+    <template #bodyCell="{ column, record }">
+      <template v-if="column.key === 'name'">
+        <a>
+          {{ record.name }}
+        </a>
+      </template>
+      <template v-else-if="column.key === 'tags'">
+        <span>
+          <a-tag
+            v-for="tag in record.tags" :key="tag"
+            :color="tag === 'loser' ? 'volcano' : tag.length > 5 ? 'geekblue' : 'green'"
+          >
+            {{ tag.toUpperCase() }}
+          </a-tag>
+        </span>
+      </template>
+      <template v-else-if="column.key === 'progress'">
+        <span>
+          <a-progress :percent="50" status="active" />
+        </span>
+      </template>
+      <template v-else-if="column.key === 'action'">
+        <span>
+          <a>Invite 一 {{ record.name }}</a>
+          <a-divider type="vertical" />
+          <a>Delete</a>
+          <a-divider type="vertical" />
+          <a class="ant-dropdown-link">
+            More actions
+            <down-outlined />
+          </a>
+        </span>
+      </template>
+    </template>
+  </a-table>
+</template>
+<script setup>
+const columns = [
+  {
+    title: '名称',
+    name: 'Name',
+    dataIndex: 'name',
+    key: 'name',
+    width: 200,
+  },
+  {
+    title: '账面数量(件)',
+    dataIndex: 'age',
+    key: 'age',
+    width: 200,
+  },
+  {
+    title: '盘点进度',
+    dataIndex: 'progress',
+    key: 'progress',
+    width: 400,
+  },
+  {
+    title: '无盈亏数量(件)',
+    key: 'tags',
+    dataIndex: 'tags',
+    width: 200,
+  },
+  {
+    title: '盘盈数量(件)',
+    key: 'tags',
+    dataIndex: 'tags',
+    width: 200,
+  },
+  {
+    title: '盘亏数量(件)',
+    key: 'tags',
+    dataIndex: 'tags',
+    width: 200,
+  },
+];
+const data = [
+  {
+    key: '1',
+    name: 'John Brown',
+    age: 32,
+    address: 'New York No. 1 Lake Park',
+    tags: ['nice', 'developer'],
+  },
+  {
+    key: '2',
+    name: 'Jim Green',
+    age: 42,
+    address: 'London No. 1 Lake Park',
+    tags: ['loser'],
+  },
+  {
+    key: '3',
+    name: 'Joe Black',
+    age: 32,
+    address: 'Sidney No. 1 Lake Park',
+    tags: ['cool', 'teacher'],
+  },
+];
+</script>

src/components/inventory1/InventoryPage2.vue

@@ -0,0 +1,37 @@
+<template>
+  <div>
+    <InfoWindow :info-window-no="infoWindowNo" :multiple="true" />
+  </div>
+</template>
+<script>
+
+import { InfoWindow } from 'pc-component-v3';
+
+export default {
+  components: {
+    InfoWindow,
+  },
+
+  props: {
+
+  },
+
+  data: function () {
+    return {
+      'infoWindowNo': '20220505_131425',
+      'whereClauseSource': {
+        customerDataDimensions: [{
+          fieldName: 'c.id',
+          dataDimensionTypeNo: '202201191757',
+          defaultDataDimensionTypeValueNo: '1',
+        }],
+      },
+    };
+  },
+
+  mounted: function () {
+  },
+
+};
+
+</script>

src/components/inventory1/InventorySelect.vue

@@ -0,0 +1,113 @@
+<template>
+  <a-space>
+    盘点基准日：
+    <a-select
+      :value="value"
+      show-search
+      placeholder="请选择盘点日期"
+      style="width: 100%"
+      :filter-option="false"
+      :not-found-content="fetching ? undefined : null"
+      :options="datas.map(item => ({ value: item, label: item}))"
+      :allow-clear="true"
+      :size="size"
+      @search="fetchDatas"
+      @change="selectedChanged"
+    >
+      <template
+        v-if="fetching"
+        #notFoundContent
+      >
+        <a-spin :size="size" />
+      </template>
+    </a-select>
+    {{ name }}
+    {{ accountDate }}
+    盘点工作完成时间： {{ plannedStartDate }}  至 {{ plannedEndDate }}   发起人： {{ createUserName }}
+  </a-space>
+</template>
+  
+<script>
+import { defineComponent, ref, reactive } from 'vue';
+// import { listPoJoClass as listPoJoClass } from '../api/ClassResource.js';
+import { Form } from 'ant-design-vue';
+import { requestFailed, requestSuccess } from '../../common/Common.js';
+  
+export default defineComponent({
+  props: {
+    value: {
+      type: String,
+      default: null,
+    },
+    size: {
+      type: String,
+      default: null,
+    },
+  },
+  
+  emits: ['update:value'],
+  
+  setup(props, { emit }) {
+    let fetching = ref(false);
+    let datas = reactive([]);
+    let formItemContext = Form.useInjectFormItemContext();
+    
+    let name = ref(null);
+    let accountDate = ref(null);
+    let plannedStartDate = ref(null);
+    let plannedEndDate = ref(null);
+    let createUserName = ref(null);
+
+    /**
+           * 获取查询窗口
+           * @param {*} value 
+           */
+    const fetchDatas = function (value) {
+      fetching.value = true;
+      console.log(value);
+      datas.splice(0, datas.length);
+      // listPoJoClass(value).then(res => {
+      //   if (res.errorCode === 0) {
+      //     if (res.datas == null) {
+      //       datas.splice(0, datas.length);
+      //     } else {
+      //       datas.push(...res.datas);
+      //     }
+      //   } else {
+      //     requestSuccess(res);
+      //   }
+      //   fetching.value = false;
+      // }).catch(err => {
+      //   requestFailed(err);
+      //   fetching.value = false;
+      // });
+    };
+  
+    /**
+           * 选择的值发生变化
+           * @param {*} newValue 
+           */
+    const selectedChanged = function (value, option) {
+      console.log(value, option);
+      emit('update:value', value);
+      formItemContext.onFieldChange();
+      fetchDatas(value);
+    };
+  
+    fetchDatas();
+  
+    return {
+      fetching,
+      datas,
+      fetchDatas,
+      selectedChanged,
+      name, 
+      accountDate, 
+      plannedStartDate, 
+      plannedEndDate, 
+      createUserName,
+    };
+  },
+});
+</script>
+  

src/router/index.js

@@ -38,7 +38,8 @@ const RunDataArchive = () => import(/* webpackChunkName: "component-35" */ '../c
 const AssetRfidRecord = () => import('../components/rfidRecord/AssetRfidRecord.vue');
 const BatchUploadImages = () => import('../components/sonicAlbumUpload/index.vue');
 const AssetInstanceFullCalendar = () => import('../customer/AssetInstanceFullCalendar.vue');
-const AddAssets = () => import('../asset-check-create/AddAssets.vue');
+
+const InventoryGlobalView = () => import('../components/inventory1/InventoryGlobalView.vue');
 
 const routes = [
 
@@ -313,7 +314,7 @@ const routes = [
     path: '/eam/AssetInstanceFullCalendar', component: AssetInstanceFullCalendar, 
   },
   { 
-    path: '/eam/AddAssets', component: AddAssets, 
+    path: '/eam/InventoryGlobalView', component: InventoryGlobalView, 
   },
 ];
 

webpack.dev.js

@@ -60,65 +60,65 @@ module.exports = WebpackMerge.merge(baseConfig, {
 
     proxy: {
       '/api': {
-        target: 'http://192.168.1.8:10023/',
+        target: 'http://192.168.1.5:10023/',
         ws: false,
         changeOrigin: true,
         secure: true,
       },
       '/static': {
-        target: 'http://192.168.1.8:10023/',
+        target: 'http://192.168.1.5:10023/',
         ws: false,
         changeOrigin: true,
         secure: true,
       },
       '/content': {
-        target: 'http://192.168.1.8:10023/',
+        target: 'http://192.168.1.5:10023/',
         ws: false,
         changeOrigin: true,
         secure: true,
       },
       '/dashboard': {
-        target: 'http://192.168.1.8:10023/',
+        target: 'http://192.168.1.5:10023/',
         ws: false,
         changeOrigin: true,
         secure: true,
       },
       '/mock': {
-        target: 'http://192.168.1.8:10023/',
+        target: 'http://192.168.1.5:10023/',
         ws: false,
         changeOrigin: true,
         secure: true,
       },
       '/authApi': {
-        target: 'http://192.168.1.8:10023/',
+        target: 'http://192.168.1.5:10023/',
         ws: false,
         changeOrigin: true,
         secure: true,
       },
       '/Dictionary': {
-        target: 'http://192.168.1.8:10023/',
+        target: 'http://192.168.1.5:10023/',
         ws: false,
         changeOrigin: true,
         secure: true,
       },
       '/Files': {
-        target: 'http://192.168.1.8:10023/',
+        target: 'http://192.168.1.5:10023/',
         ws: false,
         changeOrigin: true,
         secure: true,
       },
       '/WebSocket': {
-        target: 'http://192.168.1.8:10023/',
+        target: 'http://192.168.1.5:10023/',
         ws: true,
         changeOrigin: true,
       },
       '/TrainVideo': {
-        target: 'http://192.168.1.8:10023/',
+        target: 'http://192.168.1.5:10023/',
         ws: true,
         changeOrigin: true,
       },
       '/gateway-api': {
-        target: 'http://192.168.1.8:10023/',
+        target: 'http://192.168.1.5:10023/',
         ws: true,
         changeOrigin: true,
         secure: true,