From dbcc96fb2aa79db9eca0dfc4d0d3223a63d31346 Mon Sep 17 00:00:00 2001 From: TiaStars Date: Wed, 21 Aug 2024 08:54:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BA=91=E5=9B=BE=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E8=BF=BD=E8=B8=AA=E6=83=85=E5=86=B5=E6=94=B9=E6=88=90?= =?UTF-8?q?=E6=8C=81=E7=BB=AD=E5=85=B3=E6=B3=A8=E9=A1=B9=E7=9B=AE=E3=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 6 +++--- package.json | 2 +- src/assets/styles/public.scss | 22 +++++++++++++++------- src/views/dataCloudMap/index.vue | 29 ++++++++++++++++++----------- src/views/home/index.vue | 2 +- src/views/system/user/index.vue | 10 ++++++---- 6 files changed, 44 insertions(+), 27 deletions(-) diff --git a/.env.development b/.env.development index fa6f4dc..710cf5d 100644 --- a/.env.development +++ b/.env.development @@ -5,11 +5,11 @@ VUE_APP_TITLE = 金鸡湖现代服务业品牌管理系统 ENV = 'development' # 金鸡湖现代服务业品牌管理系统/开发环境 -# VUE_APP_BASE_API = 'http://192.168.0.117:9031' +# VUE_APP_BASE_API = 'http://192.168.0.110:9040' # 测试环境数据库 -# 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 f68f4c7..0f3089c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ruoyi", - "version": "1.0.202408161428", + "version": "1.0.202408201041", "description": "金鸡湖现代服务业品牌管理系统", "author": "若依", "license": "MIT", diff --git a/src/assets/styles/public.scss b/src/assets/styles/public.scss index 4fdd935..a8c0ba0 100644 --- a/src/assets/styles/public.scss +++ b/src/assets/styles/public.scss @@ -3170,7 +3170,7 @@ } .card-type { - font-size: 12px; + font-size: 15px; // font-size: 1.5vh; font-family: PingFang-SC, PingFang-SC; font-weight: 500; @@ -3482,7 +3482,7 @@ } } - // 项目追踪情况 + // 持续关注项目 .dataCloudMap-right-bottom { height: 29%; background-color: #fff; @@ -3570,11 +3570,19 @@ background-color: #F6F9FD; } - .project-trace-table-number { - font-family: DINCondensed, DINCondensed; - // font-weight: bold; - font-size: 20px; - color: #FF844D; + // .project-trace-table-number { + // font-family: DINCondensed, DINCondensed; + // // font-weight: bold; + // font-size: 20px; + // color: #FF844D; + // } + .remind-info { + width: 11em; + overflow: hidden; + /* 显示省略符号来代表被修剪的文本。 */ + text-overflow:ellipsis; + /* 文本不换行 */ + white-space:nowrap; } } } diff --git a/src/views/dataCloudMap/index.vue b/src/views/dataCloudMap/index.vue index d3a7d70..dcbf98a 100644 --- a/src/views/dataCloudMap/index.vue +++ b/src/views/dataCloudMap/index.vue @@ -121,7 +121,7 @@
亿
-
+
@@ -256,13 +256,13 @@
- +
- 项目追踪情况 + 持续关注项目
【统计数据截至：{{ time }}】
@@ -270,16 +270,22 @@
- - + + + + - + @@ -302,6 +308,7 @@ import echartData from './components/echartData.vue' import { honor, projectTracking, getIndustryDepth, selectCount } from "@/api/jin_ji_hu/dataCloudMap" export default { components:{honorDialogVue,headqEnterprise,serviceIndustry,collectDialog,echartData}, + dicts: ["project_small_type"], data() { return { activeIndex:1, @@ -426,7 +433,7 @@ export default { }, projectBtn(){ this.$router.push({ - name: 'EnterpriseDirectory', + name: 'Project', }) }, active(e) { diff --git a/src/views/home/index.vue b/src/views/home/index.vue index b200785..599c6df 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -31,7 +31,7 @@ {{ parseTime(item.appropriationTime, '{y}-{m}-{d}') }}
- 拨付金额(亿元): + 拨付金额(元): {{item.fundAmount}}
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index aedf9c4..a80f097 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -608,6 +608,7 @@ export default { nickName: undefined, password: undefined, phonenumber: undefined, + enterpriseId: undefined, email: undefined, sex: undefined, status: "0", @@ -665,7 +666,9 @@ export default { this.reset(); const userId = row.userId || this.ids; getUser(userId).then(response => { - this.form = response.data; + this.form = {...response.data}; + this.form.enterpriseId = response.data.nickName; + this.enterpriseId = response.data.enterpriseId; this.postOptions = response.posts; this.roleOptions = response.roles; this.$set(this.form, "postIds", response.postIds); @@ -703,15 +706,14 @@ 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 => { + updateUser({...this.form,enterpriseId:this.enterpriseId}).then(response => { this.$modal.msgSuccess("修改成功"); this.open = false; this.getList(); }); } else { - addUser(this.form).then(response => { + addUser({...this.form,enterpriseId:this.enterpriseId}).then(response => { this.$modal.msgSuccess("新增成功"); this.open = false; this.getList();