From a6b2e9aae50b11b55f39064666644bc1a2a55cbe Mon Sep 17 00:00:00 2001 From: panyuyi Date: Mon, 10 Mar 2025 16:30:13 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=B7=A1=E6=9F=A5=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/dike/index.js | 53 ++ src/router/index.js | 42 +- src/store/getters.js | 1 + src/store/modules/user.js | 7 +- .../overviewAnalysis/index.vue | 72 +++ .../patrolItemsManage/details.vue | 519 +++++++++++++++++- .../patrolItemsManage/index.vue | 315 ++++++++++- vue.config.js | 3 +- 8 files changed, 974 insertions(+), 38 deletions(-) create mode 100644 src/views/dike/runManage/patrolMaintenance/overviewAnalysis/index.vue diff --git a/src/api/dike/index.js b/src/api/dike/index.js index d09ea1b..68f869e 100644 --- a/src/api/dike/index.js +++ b/src/api/dike/index.js @@ -930,3 +930,56 @@ export function postYhStatisticsHiddenDanger(data){ data }) } + + +/***********************新版巡查养护***********************/ +// 保存巡查项 /run/df/v2/checking +export function postV2PatrolChecking(data) { + return request({ + url: `/run/df/v2/checking/add`, + method: 'post', + data + }) +} + +// 更新巡查项 /run/df/v2/checking +export function putV2PatrolChecking(data) { + return request({ + url: `/run/df/v2/checking/edit`, + method: 'post', + data + }) +} + +// 获取巡查项详情 /run/df/v2/checking/{id} +export function getV2PatrolChecking(id) { + return request({ + url: `/run/df/v2/checking/${id}`, + method: 'get' + }) +} + +// 获取巡查项列表 /run/df/v2/checking/list +export function getV2PatrolCheckingList(data) { + return request({ + url: `/run/df/v2/checking/list`, + method: 'post', + data + }) +} +// 删除巡查项 /run/df/v2/checking/{ids} +export function delV2PatrolChecking(ids) { + return request({ + url: `/run/df/v2/checking/${ids}`, + method: 'delete' + }) +} + +// 获取巡查统计分析数据/run/statistic/chart +export function getV2PatrolStatisticChart(data) { + return request({ + url: `/run/statistic/chart`, + method: 'post', + data + }) +} diff --git a/src/router/index.js b/src/router/index.js index 87cce98..1103483 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -83,27 +83,27 @@ export const constantRoutes = [ }, //TODO 临时测试路径 - { - path: '/reservoir', - component: Layout, - redirect: '/reservoir/safeMonitorSetting', - children: [ - { - path: 'safeOperation', - component: () => import('@/views/reservoir/safeOperation/index'), - meta: { - title: '安全运行', - } - }, - { - path: 'safeMonitorSetting', - component: () => import('@/views/reservoir/safeMonitorSetting/index'), - meta: { - title: '安全运行监测', - } - } - ] - }, + // { + // path: '/reservoir', + // component: Layout, + // redirect: '/reservoir/safeMonitorSetting', + // children: [ + // { + // path: 'safeOperation', + // component: () => import('@/views/reservoir/safeOperation/index'), + // meta: { + // title: '安全运行', + // } + // }, + // { + // path: 'safeMonitorSetting', + // component: () => import('@/views/reservoir/safeMonitorSetting/index'), + // meta: { + // title: '安全运行监测', + // } + // } + // ] + // }, // { // path: '/user', // component: Layout, diff --git a/src/store/getters.js b/src/store/getters.js index 5db73ce..60b5327 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -8,6 +8,7 @@ const getters = { adcd: state => state.user.adcd, avatar: state => state.user.avatar, name: state => state.user.name, + uid: state => state.user.uid, logo: state => state.user.logo, introduction: state => state.user.introduction, roles: state => state.user.roles, diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 5c8de90..7d4c543 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -5,6 +5,7 @@ const user = { state: { token: getToken(), name: '', + uid: '', adcd: '', avatar: '', roles: [], @@ -22,6 +23,9 @@ const user = { SET_NAME: (state, name) => { state.name = name }, + SET_UID: (state, id) => { + state.uid = id + }, SET_AVATAR: (state, avatar) => { state.avatar = avatar }, @@ -72,8 +76,9 @@ const user = { } else { commit('SET_ROLES', ['ROLE_DEFAULT']) } - console.log(user) + console.log('user >>>>>>>>> ', user) commit('SET_NAME', user.userName) + commit('SET_UID', user.id) commit('SET_ADCD', res.adcd) commit('SET_AVATAR', avatar) // commit('SET_LOGO', res.user.dept.adminLogo) diff --git a/src/views/dike/runManage/patrolMaintenance/overviewAnalysis/index.vue b/src/views/dike/runManage/patrolMaintenance/overviewAnalysis/index.vue new file mode 100644 index 0000000..beec1ac --- /dev/null +++ b/src/views/dike/runManage/patrolMaintenance/overviewAnalysis/index.vue @@ -0,0 +1,72 @@ + + + diff --git a/src/views/dike/runManage/patrolMaintenance/patrolItemsManage/details.vue b/src/views/dike/runManage/patrolMaintenance/patrolItemsManage/details.vue index c107b85..f17a6f1 100644 --- a/src/views/dike/runManage/patrolMaintenance/patrolItemsManage/details.vue +++ b/src/views/dike/runManage/patrolMaintenance/patrolItemsManage/details.vue @@ -1,17 +1,524 @@ - + + diff --git a/src/views/dike/runManage/patrolMaintenance/patrolItemsManage/index.vue b/src/views/dike/runManage/patrolMaintenance/patrolItemsManage/index.vue index 1ab924a..5aa3e72 100644 --- a/src/views/dike/runManage/patrolMaintenance/patrolItemsManage/index.vue +++ b/src/views/dike/runManage/patrolMaintenance/patrolItemsManage/index.vue @@ -1,17 +1,314 @@ - - + - diff --git a/vue.config.js b/vue.config.js index f228b5d..0f289ea 100644 --- a/vue.config.js +++ b/vue.config.js @@ -81,7 +81,8 @@ module.exports = { }, [process.env.VUE_APP_BASE_API]: { // target: "http://shuili-admin.product.dev.com:30115", - target: "http://shuili.product.dev.com:30115/", + // target: "http://shuili.product.dev.com:30115/", + target: 'http://172.16.34.80:18082/', // target: 'http://172.16.32.62:18888/', // target: "http://172.16.34.27:18082", changeOrigin: true,