diff --git a/.env.production b/.env.production index 5294d66..3cdcbb9 100644 --- a/.env.production +++ b/.env.production @@ -5,5 +5,6 @@ VUE_APP_TITLE = 苏州工业园区工业上楼管理系统 ENV = 'production' # 苏州工业园区工业上楼管理系统/生产环境 -# 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/assets/images/信息.png b/src/assets/images/信息.png index e0d0c44..3ce27e7 100644 Binary files a/src/assets/images/信息.png and b/src/assets/images/信息.png differ diff --git a/src/views/components/ProjectDetails/Buildings.vue b/src/views/components/ProjectDetails/Buildings.vue index 39a76d5..9dc6843 100644 --- a/src/views/components/ProjectDetails/Buildings.vue +++ b/src/views/components/ProjectDetails/Buildings.vue @@ -513,14 +513,13 @@ export default { height: auto; display: flex; justify-content: space-between; - /* padding: .7rem 0; */ padding: .5rem; border-bottom: 1px solid #E5E5E5; } .topleft { - width: 8rem; height: 2rem; + width: 8rem; display: flex; gap: 0.4rem; align-items: center; diff --git a/src/views/components/ProjectDetails/Companyenter.vue b/src/views/components/ProjectDetails/Companyenter.vue index c728c3c..a21991b 100644 --- a/src/views/components/ProjectDetails/Companyenter.vue +++ b/src/views/components/ProjectDetails/Companyenter.vue @@ -359,20 +359,19 @@ export default { } .containertop { - height: auto; - display: flex; - justify-content: space-between; - padding: .7rem 0; - padding: .5rem; - border-bottom: 1px solid #E5E5E5; + height: auto; + display: flex; + justify-content: space-between; + padding: .5rem; + border-bottom: 1px solid #E5E5E5; } .topleft { - height: 2rem; - width: 8rem; - display: flex; - gap: 0.4rem; - align-items: center; + height: 2rem; + width: 8rem; + display: flex; + gap: 0.4rem; + align-items: center; } .topleft img { diff --git a/src/views/components/ProjectDetails/Liver.vue b/src/views/components/ProjectDetails/Liver.vue index 8eb51a6..1c4bc9a 100644 --- a/src/views/components/ProjectDetails/Liver.vue +++ b/src/views/components/ProjectDetails/Liver.vue @@ -94,6 +94,7 @@ export default { } .topleft { + height: 2rem; width: 8rem; display: flex; gap: 0.4rem; diff --git a/src/views/components/ProjectDetails/Memo.vue b/src/views/components/ProjectDetails/Memo.vue index 357ebce..6956968 100644 --- a/src/views/components/ProjectDetails/Memo.vue +++ b/src/views/components/ProjectDetails/Memo.vue @@ -7,7 +7,7 @@ 项目备忘录
- 新增 @@ -76,6 +76,10 @@ export default { xmId: { type: Number, required: true + }, + action:{ + type: String, + required: true } }, data() { @@ -278,12 +282,12 @@ export default { height: auto; display: flex; justify-content: space-between; - padding: .7rem 0; - border-bottom: 1px solid #E5E5E5; padding: .5rem; + border-bottom: 1px solid #E5E5E5; } .topleft { + height: 2rem; width: 8rem; display: flex; gap: 0.4rem; diff --git a/src/views/components/ProjectDetails/Models.vue b/src/views/components/ProjectDetails/Models.vue index 3e4397d..c1fb598 100644 --- a/src/views/components/ProjectDetails/Models.vue +++ b/src/views/components/ProjectDetails/Models.vue @@ -163,14 +163,13 @@ export default { height: auto; display: flex; justify-content: space-between; - padding: .7rem 0; padding: .5rem; border-bottom: 1px solid #E5E5E5; } .topleft { - width: 10rem; height: 2rem; + width: auto; display: flex; gap: 0.4rem; align-items: center; diff --git a/src/views/components/ProjectDetails/Months.vue b/src/views/components/ProjectDetails/Months.vue index 2a56af6..0101644 100644 --- a/src/views/components/ProjectDetails/Months.vue +++ b/src/views/components/ProjectDetails/Months.vue @@ -87,7 +87,7 @@ export default { type: String, required: true, }, - xmId: { + zwId: { type: Number, required: true, }, @@ -108,7 +108,7 @@ export default { this.download( "/gysl/projectProgress/export", { - xmId: this.xmId + zwId: this.zwId }, `月度信息${new Date().getTime()}.xlsx` ); @@ -206,7 +206,7 @@ export default { }, async getMonthInformationPage() { try { - const response = await getMonthInformationPage({ xmId: this.xmId }); + const response = await getMonthInformationPage({ zwId: this.zwId }); if (Array.isArray(response.data.records) && response.data.records.length > 0) { this.tableData = response.data.records; diff --git a/src/views/components/ProjectDetails/Others.vue b/src/views/components/ProjectDetails/Others.vue index 57c7db0..36ee4f1 100644 --- a/src/views/components/ProjectDetails/Others.vue +++ b/src/views/components/ProjectDetails/Others.vue @@ -278,20 +278,19 @@ export default { } .containertop { - height: auto; - display: flex; - justify-content: space-between; - padding: .7rem 0; - padding: .5rem; - border-bottom: 1px solid #E5E5E5; + height: auto; + display: flex; + justify-content: space-between; + padding: .5rem; + border-bottom: 1px solid #E5E5E5; } .topleft { - width: 8rem; - height: 2rem; - display: flex; - gap: 0.4rem; - align-items: center; + height: 2rem; + width: 8rem; + display: flex; + gap: 0.4rem; + align-items: center; } .topleft img { diff --git a/src/views/components/ProjectDetails/Programme.vue b/src/views/components/ProjectDetails/Programme.vue index 2a7b00c..3fa9b46 100644 --- a/src/views/components/ProjectDetails/Programme.vue +++ b/src/views/components/ProjectDetails/Programme.vue @@ -270,7 +270,7 @@ export default { }, // 处理文件上传结果 handleFileUploaded(fileName) { - this.form.ghwj = `${this.baseUrl}/${fileName}`; // 添加 baseURL 前缀 + this.form.ghwj = `${this.baseUrl}/${fileName}`; }, handleClickOutside(event) { const saveButton = this.$el.querySelector('.el-button:contains("保存")'); diff --git a/src/views/manage-add/index.vue b/src/views/manage-add/index.vue index f8bfd33..31e317a 100644 --- a/src/views/manage-add/index.vue +++ b/src/views/manage-add/index.vue @@ -5,10 +5,16 @@
- - 返回 - +
+
+ 保存 +
+ + 返回 + +
+
@@ -47,7 +53,7 @@
- +
@@ -84,12 +90,12 @@ - +
- +
diff --git a/vue.config.js b/vue.config.js index 7664020..46fa8a2 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.110:7071/`, + target: `http://192.168.0.110:7071/`, // target: `http://39.101.188.84:7071/`, changeOrigin: true, pathRewrite: {