From d643188f67976442ed51caa06a1007b21e9492e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=90=AA?= <727393967@qq.com> Date: Wed, 23 Apr 2025 13:48:08 +0800 Subject: [PATCH] =?UTF-8?q?2025/4/23=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/dev.env.js | 3 +- config/index.js | 3 +- src/api/dicManage.js | 42 +++++ src/components/public/Footer.vue | 52 +++--- src/components/public/Header.vue | 88 ++++++----- src/router/index.js | 20 +++ src/views/aboutUs.vue | 61 ++++++++ src/views/analyse.vue | 8 + src/views/dataDetail.vue | 6 +- src/views/dataSearch.vue | 111 ++++++++----- src/views/dataTransfer/voyageReg.vue | 47 +++--- src/views/dicManage/fundingAgencies.vue | 199 +++++++++++++++++++++++ src/views/home.vue | 200 +++++++++++++----------- 13 files changed, 622 insertions(+), 218 deletions(-) create mode 100644 src/views/aboutUs.vue create mode 100644 src/views/dicManage/fundingAgencies.vue diff --git a/config/dev.env.js b/config/dev.env.js index b78b201..57c3f9a 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -17,7 +17,8 @@ module.exports = merge(prodEnv, { // VUE_APP_API_URL: '"http://10.10.150.237/"' VUE_APP_BASE_API: '"/api"', - VUE_APP_BASE_APIURL: '"http://ds2.hzzxq.com/api2"', + // VUE_APP_BASE_APIURL: '"http://ds2.hzzxq.com/api2"', + VUE_APP_BASE_APIURL: '"http://crm.hzzxq.com/ds"', VUE_APP_FULL_API: '"http://10.10.151.5:5555"', VUE_APP_BASE_API_FRONT: '"http://10.10.150.128:8080/satellitePub/pub/index.html"', VUE_APP_FILE_API: '"http://10.10.151.5:5555/archives"', diff --git a/config/index.js b/config/index.js index 5888ee3..e7a8606 100644 --- a/config/index.js +++ b/config/index.js @@ -15,7 +15,8 @@ module.exports = { // target: 'http://120.48.105.88', // 线上 // target: 'http://10.0.90.70', // 测试环境 // target: 'http://1.95.42.191:8080', // 测试环境 - target: 'http://ds2.hzzxq.com/api2', // 测试环境 + // target: 'http://ds2.hzzxq.com/api2', // 测试环境 + target: 'http://crm.hzzxq.com/ds', // 测试环境 changeOrigin: true, // 是否跨域 secure: false, // 是否使用https pathRewrite: { diff --git a/src/api/dicManage.js b/src/api/dicManage.js index 4207082..0fc970d 100644 --- a/src/api/dicManage.js +++ b/src/api/dicManage.js @@ -159,3 +159,45 @@ export function dictShareDelete(data) { data }) } + +/* ********************************* 资助机构字典接口 **************************************/ + +// 资助机构字典列表 +export function fundingList(data) { + return request({ + url: '/dict/funding/page.htm', + method: 'post', + type: 'application/x-www-form-urlencoded', + data + }) +} + +// 资助机构所有数据 +export function fundingAll(data) { + return request({ + url: '/dict/funding/all.htm', + method: 'post', + type: 'application/x-www-form-urlencoded', + data + }) +} + +// 资助机构字典新增编辑 +export function fundingEdit(data) { + return request({ + url: '/dict/funding/edit.htm', + method: 'post', + type: 'application/x-www-form-urlencoded', + data + }) +} + +// 资助机构字典删除 +export function fundingDelete(data) { + return request({ + url: '/dict/funding/delete.htm', + method: 'post', + type: 'application/x-www-form-urlencoded', + data + }) +} diff --git a/src/components/public/Footer.vue b/src/components/public/Footer.vue index c3d6ae6..475a68e 100644 --- a/src/components/public/Footer.vue +++ b/src/components/public/Footer.vue @@ -1,25 +1,26 @@ @@ -253,17 +255,20 @@ export default { { pic: require('../../static/images/shuju2_bg2.png'), title: '专业数据分析', - des: '载人深潜温盐深数据' + des: '载人深潜温盐深数据', + routerName: '' }, { pic: require('../../static/images/shuju2_bg.png'), title: '服务资助航次', - des: '深海技术创新中心共享航次' + des: '深海技术创新中心共享航次', + routerName: '' }, { pic: require('../../static/images/shuju2_bg3.png'), title: '支撑大科学计划', - des: '应急搜捞应用' + des: '应急搜捞应用', + routerName: 'SalvageHome' } ], swiperOptions: { @@ -538,6 +543,13 @@ export default { console.log(res) this.sampleDataUpdateList = res.page.records }) + }, + // 跳转到子系统 + toSubsystem(name) { + alert(name) + if (name) { + this.$router.push({ name }) + } } } } @@ -1084,6 +1096,13 @@ export default { } } + .bg-box { + margin-top: -450px; + background: url(../../static/images/secBg.jpg) center no-repeat; + background-size: 100% 100%; + height: 700px; + } + .dongtai { margin-top: -180px; width: 100%; @@ -1091,6 +1110,7 @@ export default { display: flex; flex-direction: column; align-items: center; + //background-color: #ccc; .el-row { width: 92%;