From 736b4df46f3a4d5a9a3d38fffa439ca1390a1c63 Mon Sep 17 00:00:00 2001 From: TiaStars Date: Fri, 16 Aug 2024 13:56:46 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E5=90=88=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 ++-- package.json | 2 +- src/views/intelligentReminder/index.vue | 1 + .../workbench/components/promoteProject/index.vue | 12 ++++++++---- .../workbench/components/zhinengtixing/index.vue | 4 ++-- 5 files changed, 14 insertions(+), 9 deletions(-) diff --git a/.env.development b/.env.development index 897c93a..fa6f4dc 100644 --- a/.env.development +++ b/.env.development @@ -7,9 +7,9 @@ ENV = 'development' # 金鸡湖现代服务业品牌管理系统/开发环境 # VUE_APP_BASE_API = 'http://192.168.0.117:9031' # 测试环境数据库 -VUE_APP_BASE_API = 'http://39.101.188.84:9040' +# VUE_APP_BASE_API = 'http://39.101.188.84:9040' # 脱敏三方测试用数据库 -# VUE_APP_BASE_API = 'http://39.101.188.84:9031' +VUE_APP_BASE_API = 'http://39.101.188.84:9031' # 正式环境数据库 # VUE_APP_BASE_API = 'https://idp.sipac.gov.cn/api' diff --git a/package.json b/package.json index dc1fa23..6e66006 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ruoyi", - "version": "1.0.202408160938", + "version": "1.0.202408161355", "description": "金鸡湖现代服务业品牌管理系统", "author": "若依", "license": "MIT", diff --git a/src/views/intelligentReminder/index.vue b/src/views/intelligentReminder/index.vue index 5976db6..c2a1755 100644 --- a/src/views/intelligentReminder/index.vue +++ b/src/views/intelligentReminder/index.vue @@ -352,6 +352,7 @@ export default { jSmartRemindersId(row.id).then((res)=>{ if(res.code == 200) { this.addFrom = res.data; + this.addFrom.function = 1; this.$refs.importProject.open(); } }) diff --git a/src/views/workbench/components/promoteProject/index.vue b/src/views/workbench/components/promoteProject/index.vue index 6e8ff94..25298a3 100644 --- a/src/views/workbench/components/promoteProject/index.vue +++ b/src/views/workbench/components/promoteProject/index.vue @@ -26,25 +26,29 @@ export default { tableData:[ { projectName:"自主品牌先进技术研究院", - enterprice:"博世********有限公司", + // enterprice:"博世********有限公司", + enterprice:'博世汽车部件（苏州）有限公司', time:"2024-07-08", id: 1505, type:2, },{ projectName:"自主品牌先进技术研究院", - enterprice:"博世********有限公司", + // enterprice:"博世********有限公司", + enterprice:'博世汽车部件（苏州）有限公司', time:"2024-07-08", id: 1505, type:2, },{ projectName:"自主品牌先进技术研究院", - enterprice:"博世********有限公司", + // enterprice:"博世********有限公司", + enterprice:'博世汽车部件（苏州）有限公司', time:"2024-07-08", id: 1505, type:2, },{ projectName:"自主品牌先进技术研究院", - enterprice:"苏州众汇聚合信息科技有限公司", + // enterprice:"博世********有限公司", + enterprice:'博世汽车部件（苏州）有限公司', time:"2024-07-08", id: 1505, type:2, diff --git a/src/views/workbench/components/zhinengtixing/index.vue b/src/views/workbench/components/zhinengtixing/index.vue index 742471e..ba45fcc 100644 --- a/src/views/workbench/components/zhinengtixing/index.vue +++ b/src/views/workbench/components/zhinengtixing/index.vue @@ -12,7 +12,7 @@ - + @@ -79,7 +79,7 @@ export default { loading: false, tableData:[], formInline:{ - alertContent:"", + content:"", tyshxydm:"", }, pagination: {