diff --git a/.env.development b/.env.development
index db91e13..fa6f4dc 100644
--- a/.env.development
+++ b/.env.development
@@ -5,11 +5,11 @@ VUE_APP_TITLE = 金鸡湖现代服务业品牌管理系统
ENV = 'development'
# 金鸡湖现代服务业品牌管理系统/开发环境
-VUE_APP_BASE_API = 'http://192.168.0.110:9031'
+# 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: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 8aaa9cf..14ce592 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "ruoyi",
- "version": "1.0.202408121626",
+ "version": "1.0.202408131732",
"description": "金鸡湖现代服务业品牌管理系统",
"author": "若依",
"license": "MIT",
diff --git a/src/assets/styles/public.scss b/src/assets/styles/public.scss
index 5818c82..929c4b9 100644
--- a/src/assets/styles/public.scss
+++ b/src/assets/styles/public.scss
@@ -2444,6 +2444,17 @@
word-break: break-all;
white-space: nowrap;
}
+ .project-type-box {
+ width: 65%;
+ .right-value {
+ font-family: AlibabaPuHuiTiM;
+ width: 100%;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ word-break: break-all;
+ white-space: nowrap;
+ }
+ }
.right-number {
font-family: ArialB;
}
diff --git a/src/views/enterpriselibrary/index.vue b/src/views/enterpriselibrary/index.vue
index 9d556b7..0c5163a 100644
--- a/src/views/enterpriselibrary/index.vue
+++ b/src/views/enterpriselibrary/index.vue
@@ -338,9 +338,9 @@ export default {
frontDownload() {
var a = document.createElement("a"); //创建一个标签
// 测试环境下载地址
- // a.href = "/demo/JinJiHu/static/企业库数据模板.xlsx";
+ a.href = "/demo/JinJiHu/static/企业库数据模板.xlsx";
// 脱敏三方测试用下载地址
- a.href = "/demo/JinJiHuTest/static/企业库数据模板.xlsx";
+ // a.href = "/demo/JinJiHuTest/static/企业库数据模板.xlsx";
// 正式环境下载地址
// a.href = "./static/企业库数据模板.xlsx";
//给a标签的href属性值加上地址,注意,这里是绝对路径,不用加 点.
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index c3c8d7c..caa8f93 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -21,7 +21,10 @@
【{{item.projectName}}】
项目类别:
-
自主品牌先进技术研究院
+
+
+
+
其他
拨付时间:
@@ -63,12 +66,15 @@
-
+
+
+
+ 其他
- {{ scope.row.projectName }}
+ {{ scope.row.projectName }}
@@ -305,11 +311,14 @@ export default {
},
// 往年专项资金申报
goProjectInfoLeft(item){
+ console.log(item,"item");
if(item.projectName == "区级总部" || item.projectName == "市级服务业领军") {
- this.$router.push({
- name: 'projectInfo',
- query: { userId: Number(item.id) }
- })
+ if(item.projectId) {
+ this.$router.push({
+ name: 'projectInfo',
+ query: { userId: Number(item.projectId) }
+ })
+ }
}
},
// 智能提醒跳转
diff --git a/src/views/onlineDeclaration/enterpriseDirectory/index.vue b/src/views/onlineDeclaration/enterpriseDirectory/index.vue
index b18b2bf..a919ad9 100644
--- a/src/views/onlineDeclaration/enterpriseDirectory/index.vue
+++ b/src/views/onlineDeclaration/enterpriseDirectory/index.vue
@@ -847,9 +847,9 @@ export default {
frontDownload() {
var a = document.createElement("a"); //创建一个标签
// 测试环境下载地址
- // a.href = "/demo/JinJiHu/static/企业名录模板.xlsx";
+ a.href = "/demo/JinJiHu/static/企业名录模板.xlsx";
// 脱敏三方测试用下载地址
- a.href = "/demo/JinJiHuTest/static/企业名录模板.xlsx";
+ // a.href = "/demo/JinJiHuTest/static/企业名录模板.xlsx";
// 正式环境下载地址
// a.href = "./static/企业名录模板.xlsx";
//给a标签的href属性值加上地址,注意,这里是绝对路径,不用加 点.
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index bebfd5b..aedf9c4 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -319,14 +319,24 @@
-
+
+
+
+
@@ -497,6 +507,7 @@ export default {
// 企业数组
enterpriseList: [],
tabHeader: undefined,
+ enterpriseId:null,
};
},
watch: {
@@ -518,11 +529,24 @@ export default {
this.getConfigKey("sys.user.initPassword").then(response => {
this.initPassword = response.msg;
});
- listEnterpriseBasicInfo({}).then((response) => {
- this.enterpriseList = response.rows
- })
+
},
methods: {
+ handleSelect(item) {
+ this.enterpriseId = item.id;
+ },
+ querySearch(queryString, cb) {
+ let results = []
+ listEnterpriseBasicInfo({qymc:queryString}).then((response) => {
+ response.data.records.map((item)=>{
+ results.push({
+ id: item.id,
+ value: item.qymc,
+ })
+ })
+ })
+ cb(results);
+ },
// 屏幕尺寸变化
cancalDebounce(){
const element = document.getElementById('app-container'); // 通过元素的 ID 获取元素
@@ -679,6 +703,7 @@ export default {
submitForm: function() {
this.$refs["form"].validate(valid => {
if (valid) {
+ this.form.enterpriseId = this.enterpriseId
if (this.form.userId != undefined) {
updateUser(this.form).then(response => {
this.$modal.msgSuccess("修改成功");