diff --git a/.env.development b/.env.development index bb7eb8e..9d9677f 100644 --- a/.env.development +++ b/.env.development @@ -6,8 +6,8 @@ ENV = 'development' # VUE_APP_BASE_API = 'http://192.168.99.84:7070' # VUE_APP_WS_API = 'ws://192.168.99.84:7070' -VUE_APP_BASE_API = 'http://192.168.99.67:11100' -VUE_APP_WS_API = 'ws://192.168.99.67:11100' +VUE_APP_BASE_API = 'http://192.168.99.72:11100' +VUE_APP_WS_API = 'ws://192.168.99.72:11100' # 是否启用 babel-plugin-dynamic-import-node插件 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/.env.production b/.env.production index e0c5f43..cf76d1d 100644 --- a/.env.production +++ b/.env.production @@ -5,7 +5,8 @@ ENV = 'production' # VUE_APP_BASE_API = 'https://openapitest.aiyxlib.com' # VUE_APP_BASE_API = 'http://192.168.99.107:11100' # VUE_APP_BASE_API = 'http://27.19.215.77:11100' -VUE_APP_BASE_API = 'http://27.16.212.58:11100' +# VUE_APP_BASE_API = 'http://27.16.212.58:11100' +VUE_APP_BASE_API = 'http://192.168.99.71:11110' # 如果接口是 http 形式, wss 需要改为 ws -VUE_APP_WS_API = 'ws://27.16.212.58:11100' +VUE_APP_WS_API = 'ws://27.16.212.58:11110' VUE_APP_CAMERA_API = '192.168.99.107:3000' diff --git a/README.md b/README.md index 4e1f7c7..60e3781 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ │ │ ├── features # 错误页面 │ │ ├── storeManage # 库房管理 │ │ ├── system # 权限管理 -│ │ │ ├── archiveStatistics # 档案统计 +│ │ │ ├── statisticsEchart # 档案统计 │ │ │ ├── dept # 部门管理 │ │ │ ├── job # 岗位管理 │ │ │ ├── menu # 菜单管理 diff --git a/public/static/config.js b/public/static/config.js index 7efc6c8..5a9b1fd 100644 --- a/public/static/config.js +++ b/public/static/config.js @@ -1,6 +1,7 @@ window.g = { AXIOS_TIMEOUT: 10000, - ApiUrl: 'http://27.16.212.58:11100', // 配置服务器地址, + // ApiUrl: 'http://27.16.212.58:11100', // 配置服务器地址, + ApiUrl: 'http://192.168.99.71:11110', // ParentPage: { // 后续看需求配置 // CrossDomainProxyUrl: '/Home/CrossDomainProxy', // BtnsApi: '/api/services/app/Authorization/GetBtns', diff --git a/src/views/environmentalScreen/index.vue b/src/views/environmentalScreen/index.vue index 92ea827..fd5c4f6 100644 --- a/src/views/environmentalScreen/index.vue +++ b/src/views/environmentalScreen/index.vue @@ -314,7 +314,7 @@ import WarehouseWarning from '@/views/components/WarehouseWarning' import SecurityDoor from '@/views/components/SecurityDoor' import displayConfigApi from '@/api/storeManage/displayConfig' import thirdApi from '@/api/thirdApi' -import { statisticsCrud } from '@/views/system/archiveStatistics/mixins/statistics' +import { statisticsCrud } from '@/views/system/statisticsEchart/mixins/statistics' import NumFlip from './module/numFlip.vue' import CountTo from 'vue-count-to' import { getDayYearBorrowNum } from '@/api/archivesManage/lendManage' diff --git a/src/views/system/archiveStatistics/index.vue b/src/views/system/statisticsEchart/index.vue similarity index 100% rename from src/views/system/archiveStatistics/index.vue rename to src/views/system/statisticsEchart/index.vue diff --git a/src/views/system/archiveStatistics/mixins/statistics.js b/src/views/system/statisticsEchart/mixins/statistics.js similarity index 100% rename from src/views/system/archiveStatistics/mixins/statistics.js rename to src/views/system/statisticsEchart/mixins/statistics.js diff --git a/src/views/system/archiveStatistics/module/acrossBar.vue b/src/views/system/statisticsEchart/module/acrossBar.vue similarity index 100% rename from src/views/system/archiveStatistics/module/acrossBar.vue rename to src/views/system/statisticsEchart/module/acrossBar.vue diff --git a/src/views/system/archiveStatistics/module/barEcharts.vue b/src/views/system/statisticsEchart/module/barEcharts.vue similarity index 100% rename from src/views/system/archiveStatistics/module/barEcharts.vue rename to src/views/system/statisticsEchart/module/barEcharts.vue diff --git a/src/views/system/archiveStatistics/module/lineEchart.vue b/src/views/system/statisticsEchart/module/lineEchart.vue similarity index 100% rename from src/views/system/archiveStatistics/module/lineEchart.vue rename to src/views/system/statisticsEchart/module/lineEchart.vue