diff --git a/.env.production b/.env.production index 7036efd..3cdcbb9 100644 --- a/.env.production +++ b/.env.production @@ -5,6 +5,6 @@ VUE_APP_TITLE = 苏州工业园区工业上楼管理系统 ENV = 'production' # 苏州工业园区工业上楼管理系统/生产环境 -# VUE_APP_BASE_API = '' -VUE_APP_BASE_API = 'http://39.101.188.84:7071' +VUE_APP_BASE_API = '' +# VUE_APP_BASE_API = 'http://39.101.188.84:7071' # VUE_APP_BASE_API = '/api' diff --git a/src/api/manageApitwo/index.js b/src/api/manageApitwo/index.js index 9a129ef..e4bf10c 100644 --- a/src/api/manageApitwo/index.js +++ b/src/api/manageApitwo/index.js @@ -37,6 +37,14 @@ export function deletespan(idList) { }); } +//月度信息新增 +export function addmonth(data) { + return request({ + url: "/gysl/projectProgress/add", + method: "post", + data, + }) +} // 月度进展信息修改 export function updateProjectProgress(data) { diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 895daa4..babdcf6 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -8,7 +8,7 @@
-
+
{{ name }} @@ -16,10 +16,31 @@
{{ name }}
- +
+ + +
+
+
@@ -78,7 +99,7 @@ export default { this.$store.dispatch('LogOut').then(() => { this.$router.replace('/login') }) - }).catch(() => {}) + }).catch(() => { }) }, handleCommand(command) { this.$message('点击了: ' + command) @@ -110,7 +131,7 @@ export default { .logoimg span { width: auto; height: 2.06rem; - font-family: AlibabaPuHuiTi, AlibabaPuHuiTi; + font-family: AlibabaPuHuiTi; font-weight: 500; font-size: 1.5rem; color: #292C33; @@ -118,7 +139,6 @@ export default { text-align: left; font-style: normal; text-transform: none; - } .navbarleft { @@ -189,17 +209,20 @@ export default { position: relative; display: flex; align-items: center; + .user-avatar { width: 40px; height: 40px; border-radius: 10px; } - img{ + + img { width: 1rem; height: 1rem; margin-left: 1rem; cursor: pointer; } + .el-icon-caret-bottom { position: absolute; right: -20px; diff --git a/src/views/compilation/handbook/index.vue b/src/views/compilation/handbook/index.vue index 3552992..5cf5443 100644 --- a/src/views/compilation/handbook/index.vue +++ b/src/views/compilation/handbook/index.vue @@ -24,8 +24,8 @@ - 查询 - 重置 + 查询 + 重置 diff --git a/src/views/compilation/knowledge/index.vue b/src/views/compilation/knowledge/index.vue index 12aaf01..8ee590d 100644 --- a/src/views/compilation/knowledge/index.vue +++ b/src/views/compilation/knowledge/index.vue @@ -388,12 +388,12 @@ export default { this.reset(); const catalogId = row.id; this.form = { ...row }; - this.setProtocolType(this.form.wz); // 设置协议类型 + this.setProtocolType(this.form.wz); this.$nextTick(() => { this.handleTypeChange(); // 确保在 DOM 更新后调用 }); this.open = true; - this.title = "修改项目知识库"; + this.title = "编辑项目知识库"; }, /** 提交按钮 */ submitForm: function () { @@ -404,9 +404,7 @@ export default { this.$modal.msgSuccess("修改成功"); this.open = false; this.getList(); - }).catch(error => { - console.error('API Request Error:', error); - }); + }).catch(); } else { addXmzsk(this.form).then(response => { this.$modal.msgSuccess("新增成功"); diff --git a/src/views/components/ProjectDetails/Buildings.vue b/src/views/components/ProjectDetails/Buildings.vue index 7bd6566..635bba1 100644 --- a/src/views/components/ProjectDetails/Buildings.vue +++ b/src/views/components/ProjectDetails/Buildings.vue @@ -119,8 +119,8 @@
- - + + diff --git a/src/views/components/ProjectDetails/Companyenter.vue b/src/views/components/ProjectDetails/Companyenter.vue index 44844f7..516bbf4 100644 --- a/src/views/components/ProjectDetails/Companyenter.vue +++ b/src/views/components/ProjectDetails/Companyenter.vue @@ -101,7 +101,7 @@ @@ -145,9 +145,9 @@ 保存 编辑 + @click="editRow(scope.row)"> 删除 + @click="deleteRow(scope.$index)"> diff --git a/src/views/components/ProjectDetails/Months.vue b/src/views/components/ProjectDetails/Months.vue index 5dcffae..1376f45 100644 --- a/src/views/components/ProjectDetails/Months.vue +++ b/src/views/components/ProjectDetails/Months.vue @@ -7,11 +7,17 @@ 月度进展信息
- 导出 导出 + --> + + 新增 + 新增
@@ -71,14 +77,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 取 消 + 确 定 + + diff --git a/src/views/components/ProjectDetails/Projectgift.vue b/src/views/components/ProjectDetails/Projectgift.vue index 6d6a32c..76d3d91 100644 --- a/src/views/components/ProjectDetails/Projectgift.vue +++ b/src/views/components/ProjectDetails/Projectgift.vue @@ -49,7 +49,7 @@ + @change="handleYearChange" style="width: 100%;" /> @@ -69,7 +69,7 @@ - + @@ -497,6 +497,7 @@ export default { display: flex; flex-wrap: wrap; gap: 0.5rem; + padding: .5rem 1rem; } .image-box { diff --git a/src/views/components/analysis/all.vue b/src/views/components/analysis/all.vue index c8d7671..2151597 100644 --- a/src/views/components/analysis/all.vue +++ b/src/views/components/analysis/all.vue @@ -42,8 +42,6 @@
{{ projectData.allBuilding2 }}
- -
@@ -51,6 +49,15 @@
{{ projectData.allBuilding3 }}
+ +
+ + +
+ +
+
+
@@ -72,6 +79,26 @@
{{ projectData.allInvest3 }}
+ + + +
+ + +
+
@@ -105,8 +132,6 @@
{{ currentYearData.currentBuilding2 }}
- -
@@ -114,6 +139,15 @@
{{ currentYearData.currentBuilding3 }}
+ +
+ + +
+ +
+
+
@@ -135,6 +169,24 @@
{{ currentYearData.currentAllInvest3 }}
+ + +
+ + +
@@ -146,16 +198,18 @@ import { allinformation } from '@/api/ManageApi'; export default { data() { return { - selectedYear: new Date().getFullYear().toString(), + showSection1: false, // 控制第一个区域是否显示 + showSection2: false, // 控制第二个区域是否显示 + selectedYear: new Date().getFullYear().toString(), projectData: { allProject: 0, // 项目总数 allGrossArea: 0, //建筑面积 allBuilding1: 0, // 已建 allBuilding2: 0, // 在建 allBuilding3: 0, // 拟建 - allInvest1:0, //投资额 - allInvest2:0, //投资额 - allInvest3:0, //投资额 + allInvest1: 0, //投资额 + allInvest2: 0, //投资额 + allInvest3: 0, //投资额 }, currentYearData: { currentYearProject: 0, //总数 @@ -163,9 +217,9 @@ export default { currentYearBuilding1: 0, // 已建 currentBuilding2: 0, // 在建 currentBuilding3: 0, - currentAllInvest1:0, //投资额 - currentAllInvest2:0, - currentAllInvest3:0 + currentAllInvest1: 0, //投资额 + currentAllInvest2: 0, + currentAllInvest3: 0 }, loading: false, error: null @@ -175,6 +229,13 @@ export default { this.fetchProjectData(); }, methods: { + toggleSection(section) { + if (section === 'section1') { + this.showSection1 = !this.showSection1; + } else if (section === 'section2') { + this.showSection2 = !this.showSection2; + } + }, /** 导出按钮操作 */ handleExport() { this.download( @@ -197,7 +258,7 @@ export default { this.loading = true; try { // 调用 API 时传入 years 参数 - const response = await allinformation({ + const response = await allinformation({ years: this.selectedYear, _t: Date.now() // 添加时间戳防止缓存 }); @@ -215,7 +276,7 @@ export default { currentYearProject: response.data.currentYearProject || 0, currentYearGrossArea: response.data.currentYearGrossArea || 0, currentYearBuilding1: response.data.currentYearBuilding1 || 0, - currentBuilding2: response.data.currentBuilding2 || 0 , + currentBuilding2: response.data.currentBuilding2 || 0, currentBuilding3: response.data.currentBuilding3 || 0, currentAllInvest1: response.data.currentAllInvest1 || 0, currentAllInvest2: response.data.currentAllInvest2 || 0, @@ -242,6 +303,7 @@ export default { display: flex; flex-direction: column; gap: 1rem; + padding: .5rem 0; } table { @@ -277,6 +339,7 @@ th { font-family: aliregular; font-weight: 400; font-size: 0.9rem; + padding-left: .3rem; color: #7B8599; line-height: 1.19rem; text-align: left; @@ -297,7 +360,17 @@ th { } .mainarea { - padding: .5rem 0rem; + padding: .5rem 0rem; + height: auto; + width: 100%; + display: flex; + justify-content: space-between; + align-items: center; + margin-top: 1rem; +} + +.mainareatwo { + padding: .5rem 0rem; height: auto; width: 100%; display: flex; diff --git a/src/views/components/analysis/allcompany.vue b/src/views/components/analysis/allcompany.vue index 0105248..c27d7b3 100644 --- a/src/views/components/analysis/allcompany.vue +++ b/src/views/components/analysis/allcompany.vue @@ -3,8 +3,15 @@
整体项目情况
-
-
+
@@ -42,6 +49,56 @@
{{ projectData.allBuilding3 }}
+ +
+ + +
+ +
+
+ +
+ +
+
总投资额
+
{{ projectData.allInvest1 }}
+
+
+
+ +
+
计划投资额
+
{{ projectData.allInvest2 }}
+
+
+
+ +
+
占地面积
+
{{ projectData.allInvest3 }}
+
+
+ + + +
+ + +
+
@@ -82,6 +139,54 @@
{{ currentYearData.currentBuilding3 }}
+ +
+ + +
+ + +
+ +
+ +
+
总投资额
+
{{ currentYearData.currentAllInvest1 }}
+
+
+
+ +
+
计划投资额
+
{{ currentYearData.currentAllInvest2 }}
+
+
+
+ +
+
占地面积
+
{{ currentYearData.currentAllInvest3 }}
+
+
+ + +
+ + +
@@ -93,20 +198,28 @@ import { allinformationtwo } from '@/api/ManageApi'; export default { data() { return { - selectedYear: new Date().getFullYear().toString(), + showSection1: false, // 控制第一个区域是否显示 + showSection2: false, // 控制第二个区域是否显示 + selectedYear: new Date().getFullYear().toString(), projectData: { allProject: 0, // 项目总数 allGrossArea: 0, //建筑面积 allBuilding1: 0, // 已建 allBuilding2: 0, // 在建 - allBuilding3: 0 // 拟建 + allBuilding3: 0, // 拟建 + allInvest1: 0, //投资额 + allInvest2: 0, //投资额 + allInvest3: 0, //投资额 }, currentYearData: { - currentYearProject: 0, //总数 - currentYearGrossArea: 0, //面积 + currentYearProject: 0, //总数 + currentYearGrossArea: 0, //面积 currentYearBuilding1: 0, // 已建 - currentBuilding2: 0 , // 在建 - currentBuilding3: 0 // 在建 + currentBuilding2: 0, // 在建 + currentBuilding3: 0, + currentAllInvest1: 0, //投资额 + currentAllInvest2: 0, + currentAllInvest3: 0 }, loading: false, error: null @@ -116,6 +229,13 @@ export default { this.fetchProjectData(); }, methods: { + toggleSection(section) { + if (section === 'section1') { + this.showSection1 = !this.showSection1; + } else if (section === 'section2') { + this.showSection2 = !this.showSection2; + } + }, /** 导出按钮操作 */ handleExport() { this.download( @@ -126,12 +246,11 @@ export default { `项目整体情况${this.selectedYear}.docx` ); }, - - // Handle year change handleYearChange(year) { if (year) { this.selectedYear = year; this.fetchProjectData(); + this.$emit('year-change', this.selectedYear); //传值 } }, @@ -139,16 +258,19 @@ export default { this.loading = true; try { // 调用 API 时传入 years 参数 - const response = await allinformationtwo({ + const response = await allinformationtwo({ years: this.selectedYear, - _t: Date.now() // 添加时间戳防止缓存 + // _t: Date.now() }); this.projectData = { allProject: response.data.allProject || 0, allGrossArea: response.data.allGrossArea || 0, allBuilding1: response.data.allBuilding1 || 0, allBuilding2: response.data.allBuilding2 || 0, - allBuilding3: response.data.allBuilding3 || 0 + allBuilding3: response.data.allBuilding3 || 0, + allInvest1: response.data.allInvest1 || 0, + allInvest2: response.data.allInvest2 || 0, + allInvest3: response.data.allInvest3 || 0, }; this.currentYearData = { currentYearProject: response.data.currentYearProject || 0, @@ -156,6 +278,9 @@ export default { currentYearBuilding1: response.data.currentYearBuilding1 || 0, currentBuilding2: response.data.currentBuilding2 || 0, currentBuilding3: response.data.currentBuilding3 || 0, + currentAllInvest1: response.data.currentAllInvest1 || 0, + currentAllInvest2: response.data.currentAllInvest2 || 0, + currentAllInvest3: response.data.currentAllInvest3 || 0 }; } catch (error) { console.error("获取数据失败:", error); @@ -174,11 +299,11 @@ export default { gap: .5rem; } -/* Your existing styles remain unchanged */ .container { display: flex; flex-direction: column; - gap: 2rem; + gap: 1rem; + padding: .5rem 0; } table { @@ -213,7 +338,7 @@ th { .lefttitle { font-family: aliregular; font-weight: 400; - font-size: 0.88rem; + font-size: 0.9rem; color: #7B8599; line-height: 1.19rem; text-align: left; @@ -234,7 +359,17 @@ th { } .mainarea { - padding: .5rem; + padding: .5rem 0rem; + height: auto; + width: 100%; + display: flex; + justify-content: space-between; + align-items: center; + margin-top: 1rem; +} + +.mainareatwo { + padding: .5rem 0rem; height: auto; width: 100%; display: flex; @@ -248,7 +383,6 @@ th { height: 3rem; /* background-color: lightblue; */ display: flex; - gap: .3rem; } .itemleft { diff --git a/src/views/components/analysis/map.vue b/src/views/components/analysis/map.vue index 97a56f4..e6b29d2 100644 --- a/src/views/components/analysis/map.vue +++ b/src/views/components/analysis/map.vue @@ -39,7 +39,7 @@ -
+
diff --git a/src/views/evalute/configtable/index.vue b/src/views/evalute/configtable/index.vue index a0c53b3..678cb37 100644 --- a/src/views/evalute/configtable/index.vue +++ b/src/views/evalute/configtable/index.vue @@ -152,7 +152,7 @@ export default { const postId = row.id || this.ids; // 使用 id 字段 this.form = { ...row }; this.open = true; - this.title = '修改规则'; + this.title = '编辑规则'; }, // 取消按钮 cancel() { diff --git a/src/views/evalute/supervision/index.vue b/src/views/evalute/supervision/index.vue index b937dc9..77ac5bd 100644 --- a/src/views/evalute/supervision/index.vue +++ b/src/views/evalute/supervision/index.vue @@ -389,7 +389,7 @@ export default { this.isView = true; this.dialogVisible = true; - this.dialogTitle = "查看智能提醒规则"; + this.dialogTitle = "查看流程提醒规则"; // 清除验证 this.$nextTick(() => { this.$refs.ruleForm.clearValidate(); @@ -401,7 +401,7 @@ export default { handleAdd() { this.isView = false; this.dialogVisible = true; - this.dialogTitle = "新增智能提醒规则"; + this.dialogTitle = "新增流程提醒规则"; this.isReminder = 1; // 明确设置默认值 // 完整重置表单数据 @@ -428,7 +428,7 @@ export default { }, handleEdit(row) { this.dialogVisible = true; - this.dialogTitle = "修改智能提醒规则"; + this.dialogTitle = "编辑流程提醒规则"; this.isView = false; this.ruleForm = { @@ -503,7 +503,7 @@ export default { this.$refs[formName].validate((valid) => { if (valid) { let param = {}; - if (this.dialogTitle == "新增智能提醒规则") { + if (this.dialogTitle == "新增流程提醒规则") { param = { rulesName: this.ruleForm.rulesName, alertRecipients: Number(this.ruleForm.alertRecipients), @@ -520,7 +520,7 @@ export default { this.initData(); } }); - } else if (this.dialogTitle == "修改智能提醒规则") { + } else if (this.dialogTitle == "修改流程提醒规则") { param = { ...this.editData, }; diff --git a/src/views/login.vue b/src/views/login.vue index 321f933..e7f361d 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -46,7 +46,9 @@ style="width:100%;background: #2B62F1;" @click.native.prevent="handleEnterpriseLogin"> 企业统一身份认证登录 + +
主办单位：苏州工业园区经济发展委员会
- +
diff --git a/src/views/orientedtwo/content/index.vue b/src/views/orientedtwo/content/index.vue index ad40294..ddc47de 100644 --- a/src/views/orientedtwo/content/index.vue +++ b/src/views/orientedtwo/content/index.vue @@ -286,7 +286,7 @@ export default { handleAdd() { this.reset(); this.open = true; - this.title = "新增项目知识库"; + this.title = "新增目录"; }, /** 修改按钮操作 */ handleUpdate(row) { @@ -294,7 +294,7 @@ export default { const catalogId = row.id; this.form = { ...row }; this.open = true; - this.title = "修改项目知识库"; + this.title = "编辑目录"; }, /** 提交按钮 */ submitForm: function () { diff --git a/src/views/orientedtwo/subdivide/index.vue b/src/views/orientedtwo/subdivide/index.vue index ebf479c..e4da2dd 100644 --- a/src/views/orientedtwo/subdivide/index.vue +++ b/src/views/orientedtwo/subdivide/index.vue @@ -318,7 +318,7 @@ export default { const catalogId = row.id; this.form = { ...row }; this.open = true; - this.title = "修改细分产业"; + this.title = "编辑细分产业"; }, /** 提交按钮 */ submitForm: function () { diff --git a/vue.config.js b/vue.config.js index c354206..c993f8b 100644 --- a/vue.config.js +++ b/vue.config.js @@ -46,7 +46,7 @@ module.exports = { proxy: { // detail: https://cli.vuejs.org/config/#devserver-proxy [process.env.VUE_APP_BASE_API]: { - target: `http://192.168.0.111:7071/`, + target: `http://192.168.0.105:7071/`, // target: `http://39.101.188.84:7071/`, changeOrigin: true, pathRewrite: {