From 9772a3c8a8e2eaaf4a736ef92580fd001c4018b0 Mon Sep 17 00:00:00 2001 From: yanfeiyong <2060201549@qq.com> Date: Mon, 10 Mar 2025 10:27:07 +0800 Subject: [PATCH] icon --- src/assets/icons/svg/icon-cydxgl.svg | 1 + src/assets/icons/svg/icon-cysxmxgl.svg | 1 + src/assets/icons/svg/icon-qxgl.svg | 1 + src/assets/icons/svg/icon-tjfx-1.svg | 1 + src/assets/icons/svg/icon-xmhbgl.svg | 1 + src/assets/icons/svg/icon-xmpjgl.svg | 2 +- src/assets/icons/svg/icon-xmxxgl.svg | 1 + src/assets/images/icon-cydxgl.svg | 1 + src/assets/images/icon-cysxmxgl.svg | 1 + src/assets/images/icon-qxgl.svg | 1 + src/assets/images/icon-tjfx-1.svg | 1 + src/assets/images/icon-xmhbgl.svg | 1 + src/assets/images/icon-xmpjgl.svg | 1 + src/router/index.js | 2 +- src/views/components/ProjectDetails/Basic.vue | 137 +++++++++++++----- .../ProjectDetails/Projectpicturetwo.vue | 77 ++++------ src/views/components/ProjectDetails/map.vue | 32 ++++ 17 files changed, 177 insertions(+), 85 deletions(-) create mode 100644 src/assets/icons/svg/icon-cydxgl.svg create mode 100644 src/assets/icons/svg/icon-cysxmxgl.svg create mode 100644 src/assets/icons/svg/icon-qxgl.svg create mode 100644 src/assets/icons/svg/icon-tjfx-1.svg create mode 100644 src/assets/icons/svg/icon-xmhbgl.svg create mode 100644 src/assets/icons/svg/icon-xmxxgl.svg create mode 100644 src/assets/images/icon-cydxgl.svg create mode 100644 src/assets/images/icon-cysxmxgl.svg create mode 100644 src/assets/images/icon-qxgl.svg create mode 100644 src/assets/images/icon-tjfx-1.svg create mode 100644 src/assets/images/icon-xmhbgl.svg create mode 100644 src/assets/images/icon-xmpjgl.svg diff --git a/src/assets/icons/svg/icon-cydxgl.svg b/src/assets/icons/svg/icon-cydxgl.svg new file mode 100644 index 0000000..ce4caa5 --- /dev/null +++ b/src/assets/icons/svg/icon-cydxgl.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/icon-cysxmxgl.svg b/src/assets/icons/svg/icon-cysxmxgl.svg new file mode 100644 index 0000000..d7d8a5d --- /dev/null +++ b/src/assets/icons/svg/icon-cysxmxgl.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/icon-qxgl.svg b/src/assets/icons/svg/icon-qxgl.svg new file mode 100644 index 0000000..1b237d8 --- /dev/null +++ b/src/assets/icons/svg/icon-qxgl.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/icon-tjfx-1.svg b/src/assets/icons/svg/icon-tjfx-1.svg new file mode 100644 index 0000000..0321dc2 --- /dev/null +++ b/src/assets/icons/svg/icon-tjfx-1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/icon-xmhbgl.svg b/src/assets/icons/svg/icon-xmhbgl.svg new file mode 100644 index 0000000..ebcde83 --- /dev/null +++ b/src/assets/icons/svg/icon-xmhbgl.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/icon-xmpjgl.svg b/src/assets/icons/svg/icon-xmpjgl.svg index 3a70642..fe770ff 100644 --- a/src/assets/icons/svg/icon-xmpjgl.svg +++ b/src/assets/icons/svg/icon-xmpjgl.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/svg/icon-xmxxgl.svg b/src/assets/icons/svg/icon-xmxxgl.svg new file mode 100644 index 0000000..5db79b2 --- /dev/null +++ b/src/assets/icons/svg/icon-xmxxgl.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/images/icon-cydxgl.svg b/src/assets/images/icon-cydxgl.svg new file mode 100644 index 0000000..4bbb32a --- /dev/null +++ b/src/assets/images/icon-cydxgl.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/images/icon-cysxmxgl.svg b/src/assets/images/icon-cysxmxgl.svg new file mode 100644 index 0000000..fd3e105 --- /dev/null +++ b/src/assets/images/icon-cysxmxgl.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/images/icon-qxgl.svg b/src/assets/images/icon-qxgl.svg new file mode 100644 index 0000000..731fa69 --- /dev/null +++ b/src/assets/images/icon-qxgl.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/images/icon-tjfx-1.svg b/src/assets/images/icon-tjfx-1.svg new file mode 100644 index 0000000..bcf49f9 --- /dev/null +++ b/src/assets/images/icon-tjfx-1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/images/icon-xmhbgl.svg b/src/assets/images/icon-xmhbgl.svg new file mode 100644 index 0000000..4367201 --- /dev/null +++ b/src/assets/images/icon-xmhbgl.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/images/icon-xmpjgl.svg b/src/assets/images/icon-xmpjgl.svg new file mode 100644 index 0000000..9905340 --- /dev/null +++ b/src/assets/images/icon-xmpjgl.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 93b21fb..8d256ed 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -75,7 +75,7 @@ export const constantRoutes = [ path: "index", component: () => import("@/views/index"), name: "Index", - meta: { title: "统计分析", icon: "dashboard", affix: true }, + meta: { title: "统计分析", icon: "icon-tjfx-1", affix: true }, }, ], }, diff --git a/src/views/components/ProjectDetails/Basic.vue b/src/views/components/ProjectDetails/Basic.vue index 1850f43..7c17a86 100644 --- a/src/views/components/ProjectDetails/Basic.vue +++ b/src/views/components/ProjectDetails/Basic.vue @@ -29,7 +29,7 @@ {{ item.value }} @@ -46,107 +46,128 @@ - - + + - - + + - - + + - - + + + + + - - + + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + + - - + + - - + + - - + + - - + + + + + + + + + + - + - + + + + @@ -208,6 +229,13 @@ export default { getBasicInformationById(this.id) .then(response => { const data = response.data; + + // 处理数据类型转换 + data.nature = String(data.nature); + data.jsms = String(data.jsms); + data.ssgnq = String(data.ssgnq); + data.xzfl = String(data.xzfl); + this.descriptions = [ { label: '项目名称', value: data.name }, { label: '项目法人单位', value: data.xmfrdwxz }, @@ -230,6 +258,7 @@ export default { { label: '项目法人单位简介', value: data.unitIntroduction }, { label: '项目简介', value: data.introduction } ]; + // 初始化表单数据 this.form = { ...data }; }) @@ -247,8 +276,36 @@ export default { this.dialogVisible = true; }, saveForm() { - // 确保 form 数据是一个有效的对象 - const formData = { ...this.form }; + const formData = { + id: this.id, + name: this.form.name, + xmfrdwxz: this.form.xmfrdwxz, + nature: parseInt(this.form.nature), + sgdw: this.form.sgdw, + sjdw: this.form.sjdw, + ztze: parseFloat(this.form.ztze), + ssgnq: parseInt(this.form.ssgnq), + begainTime: this.form.begainTime ? this.formatDateRange(this.form.begainTime) : '', + xzfl: parseInt(this.form.xzfl), + jsdd: this.form.jsdd, + prioritize: this.form.prioritize, + jsms: parseInt(this.form.jsms), + label: this.form.label, + projectLeader: this.form.projectLeader, + phone: this.form.phone, + issuingTime: this.form.issuingTime, + acceptanceTime: this.form.acceptanceTime, + unitIntroduction: this.form.unitIntroduction, + introduction: this.form.introduction, + createBy: '', + createId: 0, + createTime: '', + fj: '', + updateBy: '', + updateId: 0, + updateTime: '' + }; + console.log('Sending form data:', formData); updateBasicInformation(formData) .then(response => { @@ -262,6 +319,12 @@ export default { console.error('There was an error saving the data!', error); this.$message.error('数据保存失败，请重试！'); }); + }, + formatDateRange(dateRange) { + if (!dateRange || dateRange.length !== 2) return ''; + const startDate = dateRange[0].toISOString().split('T')[0]; + const endDate = dateRange[1].toISOString().split('T')[0]; + return `${startDate} 至 ${endDate}`; } } }; diff --git a/src/views/components/ProjectDetails/Projectpicturetwo.vue b/src/views/components/ProjectDetails/Projectpicturetwo.vue index f305c2d..a7061e7 100644 --- a/src/views/components/ProjectDetails/Projectpicturetwo.vue +++ b/src/views/components/ProjectDetails/Projectpicturetwo.vue @@ -50,20 +50,23 @@
- 内部 + 内部
-
-
+
+
+
+ +
- 内部 -
+ 内部 +
-
+ @@ -76,7 +79,7 @@ - + + + + \ No newline at end of file