From e4745f891fc56c951b1b8b7a7f09a939255a6b12 Mon Sep 17 00:00:00 2001 From: GGJ <357021191@qq.com> Date: Wed, 6 Mar 2024 16:14:09 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=87=E7=A8=8B=E7=9B=91=E7=9D=A3=20?= =?UTF-8?q?=E8=BF=81=E7=A7=BB=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/common.ts | 7 ++++ src/utils/request.ts | 9 +++- .../bearingCapacity/userManagement/index.vue | 24 ++++++++++- .../harmonicSurvey/components/occupancy.vue | 11 +++++ .../harmonicSurvey/components/outcome.vue | 11 +++++ .../harmonicSurvey/components/planAudits.vue | 11 +++++ .../harmonicSurvey/components/planManage.vue | 11 +++++ .../pqs/supervise/harmonicSurvey/index.vue | 42 +++++++++++++++++++ src/views/pqs/supervise/technology/index.vue | 15 +++++++ vite.config.ts | 5 +++ 10 files changed, 144 insertions(+), 2 deletions(-) create mode 100644 src/views/pqs/supervise/harmonicSurvey/components/occupancy.vue create mode 100644 src/views/pqs/supervise/harmonicSurvey/components/outcome.vue create mode 100644 src/views/pqs/supervise/harmonicSurvey/components/planAudits.vue create mode 100644 src/views/pqs/supervise/harmonicSurvey/components/planManage.vue create mode 100644 src/views/pqs/supervise/harmonicSurvey/index.vue create mode 100644 src/views/pqs/supervise/technology/index.vue diff --git a/src/api/common.ts b/src/api/common.ts index df0d4904..7b8a3a8d 100644 --- a/src/api/common.ts +++ b/src/api/common.ts @@ -30,3 +30,10 @@ export function analyseWave(params:string) { method: 'get' }) } +// // 123 +// export function queyDetailUser(params:string) { +// return createAxios({ +// url: '/cs-harmonic-boot/event/analyseWave?eventId=' + params, +// method: 'get' +// }) +// } diff --git a/src/utils/request.ts b/src/utils/request.ts index e0bf974d..48dea649 100644 --- a/src/utils/request.ts +++ b/src/utils/request.ts @@ -55,6 +55,10 @@ function createAxios>( // 请求拦截 Axios.interceptors.request.use( config => { + + + + // 取消重复请求 removePending(config) options.CancelDuplicateRequest && addPending(config) // 创建loading实例 @@ -73,7 +77,10 @@ function createAxios>( config.headers.Authorization = 'Basic bmpjbnRlc3Q6bmpjbnBxcw==' } } - + if(config.url?.substring(0, 4)=='/hzj'){ + config.url=config.url?.slice(4) + config.baseURL='/hzj' + } return config }, error => { diff --git a/src/views/pqs/bearingCapacity/userManagement/index.vue b/src/views/pqs/bearingCapacity/userManagement/index.vue index 3eaf13ad..353794e3 100644 --- a/src/views/pqs/bearingCapacity/userManagement/index.vue +++ b/src/views/pqs/bearingCapacity/userManagement/index.vue @@ -115,7 +115,7 @@ const rules = { } const ruleFormRef = ref() const tableStore = new TableStore({ - url: '/advance-boot/process/querySagEventsPage', + url: '/hzj/carrycapacityuser/queyDetailUser', method: 'POST', column: [ { width: '60', type: 'checkbox' }, @@ -209,7 +209,29 @@ const tableStore = new TableStore({ ] } }) +// "area": "", +// "city": "", +// "endTime": "", +// "pageNum": {}, +// "pageSize": {}, +// "protocolCapacity": 0, +// "province": "", +// "region": "", +// "startTime": "", +// "userId": "", +// "userName": "", +// "userType": "", +// "voltage": "" tableStore.table.params.searchValue = '' +tableStore.table.params.area = '' +tableStore.table.params.city = '' +tableStore.table.params.protocolCapacity = 0 +tableStore.table.params.province = '' +tableStore.table.params.region = '' +tableStore.table.params.userId = '' +tableStore.table.params.userName = '' +tableStore.table.params.userType = '' +tableStore.table.params.voltage = '' provide('tableStore', tableStore) onMounted(() => { diff --git a/src/views/pqs/supervise/harmonicSurvey/components/occupancy.vue b/src/views/pqs/supervise/harmonicSurvey/components/occupancy.vue new file mode 100644 index 00000000..c95a4910 --- /dev/null +++ b/src/views/pqs/supervise/harmonicSurvey/components/occupancy.vue @@ -0,0 +1,11 @@ + + + diff --git a/src/views/pqs/supervise/harmonicSurvey/components/outcome.vue b/src/views/pqs/supervise/harmonicSurvey/components/outcome.vue new file mode 100644 index 00000000..a3cd27c8 --- /dev/null +++ b/src/views/pqs/supervise/harmonicSurvey/components/outcome.vue @@ -0,0 +1,11 @@ + + + diff --git a/src/views/pqs/supervise/harmonicSurvey/components/planAudits.vue b/src/views/pqs/supervise/harmonicSurvey/components/planAudits.vue new file mode 100644 index 00000000..c79f4b49 --- /dev/null +++ b/src/views/pqs/supervise/harmonicSurvey/components/planAudits.vue @@ -0,0 +1,11 @@ + + + diff --git a/src/views/pqs/supervise/harmonicSurvey/components/planManage.vue b/src/views/pqs/supervise/harmonicSurvey/components/planManage.vue new file mode 100644 index 00000000..f3b77c64 --- /dev/null +++ b/src/views/pqs/supervise/harmonicSurvey/components/planManage.vue @@ -0,0 +1,11 @@ + + + diff --git a/src/views/pqs/supervise/harmonicSurvey/index.vue b/src/views/pqs/supervise/harmonicSurvey/index.vue new file mode 100644 index 00000000..ab86396f --- /dev/null +++ b/src/views/pqs/supervise/harmonicSurvey/index.vue @@ -0,0 +1,42 @@ + + + + + diff --git a/src/views/pqs/supervise/technology/index.vue b/src/views/pqs/supervise/technology/index.vue new file mode 100644 index 00000000..94df8951 --- /dev/null +++ b/src/views/pqs/supervise/technology/index.vue @@ -0,0 +1,15 @@ + + + diff --git a/vite.config.ts b/vite.config.ts index 41a9f42f..17f6b4f4 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -18,6 +18,11 @@ export default defineConfig({ '/map': { target: 'http://192.168.1.81:8088', //数据中心 changeOrigin: true, + }, + '/hzj': { + target: 'http://550fa81d.nat123.fun', //黄正剑 + changeOrigin: true, + rewrite: path => path.replace(/^\/hzj/, '') } } },