From 9c871490400b012a8df943fae085c16574cef759 Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Tue, 2 Jul 2024 17:39:45 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AF=B9=E6=9A=82=E5=AD=98=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E5=81=9A=E6=9D=A1=E4=BB=B6=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/index.ts                                   |  2 +-
 src/layouts/LayoutClassic/index.vue                | 14 +++++++-------
 .../components/ProjectSupervisionDiv/overview.vue  |  4 ++--
 .../components/ProjectSupervisionDiv/overview2.vue |  4 ++--
 .../components/ProjectSupervisionDiv/overview3.vue |  2 +-
 .../components/ProjectSupervisionDiv/overview4.vue |  2 +-
 .../components/ProjectSupervisionDiv/overview5.vue |  2 +-
 .../components/ProjectSupervisionDiv/overview6.vue |  2 +-
 .../components/ProjectSupervisionDiv/overview7.vue |  2 +-
 .../components/ProjectSupervisionDiv/overview8.vue |  2 +-
 .../huizhou/preProjectManagement/index.vue         |  2 +-
 .../components/ProjectSupervisionDiv/annex.vue     |  2 +-
 .../components/ProjectSupervisionDiv/duty.vue      |  2 +-
 .../components/ProjectSupervisionDiv/overview.vue  |  4 ++--
 src/views/goverment/huizhou/projectList/index.vue  |  2 +-
 15 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/api/index.ts b/src/api/index.ts
index 571b666..1c76aff 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -12,7 +12,7 @@ import router from "@/routers";
 
 const config = {
 	// 默认地址请求地址，可在 .env.*** 文件中修改
-	// baseURL: import.meta.env.VITE_API_URL as string,
+	baseURL: import.meta.env.VITE_API_URL as string,
 	// baseURL: import.meta.env.NODE_ENV=='development' ?'/api' : window.http,
 	// 设置超时时间（10s）
 	timeout: ResultEnum.TIMEOUT as number,
diff --git a/src/layouts/LayoutClassic/index.vue b/src/layouts/LayoutClassic/index.vue
index c5e2516..82252c4 100644
--- a/src/layouts/LayoutClassic/index.vue
+++ b/src/layouts/LayoutClassic/index.vue
@@ -1,10 +1,10 @@
 <!-- 经典布局 -->
 <template>
 	<el-container class="layout">
-		<el-container class="classic-main">
+		<!-- <el-container class="classic-main">
 			<Main />
-		</el-container>
-		<!-- <el-header>
+		</el-container> -->
+		<el-header>
 			<div class="header-lf">
 				<div @click="goHome" class="logo flx-center">
 					<img src="@/assets/images/login/china.png" style="margin: 0 15px" alt="logo" />
@@ -15,10 +15,10 @@
 				<ToolBarLeft />
 			</div>
 			<ToolBarRight />
-		</el-header> -->
-		<!-- <el-container class="classic-content">
+		</el-header>
+		<el-container class="classic-content">
 			<el-aside>
-				<div class="menu" :style="{ width: isCollapse ? '65px' : '210px' }">  根据屏幕自动收缩
+				<!-- <div class="menu" :style="{ width: isCollapse ? '65px' : '210px' }">  根据屏幕自动收缩 -->
 				<div class="menu">
 					<el-scrollbar>
 						<el-menu
@@ -39,7 +39,7 @@
 			<el-container class="classic-main">
 				<Main />
 			</el-container>
-		</el-container> -->
+		</el-container>
 		<!-- <el-dialog class="overview" :show-close="false" v-model="visible1" width="50%" @close="visible1 = false">
 			<template #title>
 				<div class="title-detail">
diff --git a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview.vue b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview.vue
index 64c6f16..6cb638d 100644
--- a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview.vue
+++ b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview.vue
@@ -132,7 +132,7 @@
 			<FileUpload v-model="showFilesUpload" @update:files="handlechange" :files="current.files" :reset="true" />
 		</div>
 		<footer class="footer">
-			<el-button type="primary" @click="next(ruleFormRef, true)">保存</el-button>
+			<el-button type="primary" @click="next(ruleFormRef, true)" v-if="!store.Message">保存</el-button>
 			<el-button type="primary" @click="next(ruleFormRef)">下一步</el-button>
 		</footer>
 	</div>
@@ -162,7 +162,7 @@ const showFilesUpload = ref(false);
 const current = ref<AnnexFilesOptions>({} as AnnexFilesOptions);
 
 const dictLabel = ref<undefined | number>(undefined);
-const store = GlobalStore();
+const store: any = GlobalStore();
 const addressList = ref({
 	province: "",
 	city: "",
diff --git a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview2.vue b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview2.vue
index 50e7b54..9993549 100644
--- a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview2.vue
+++ b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview2.vue
@@ -36,7 +36,7 @@
 				</el-form-item>
 			</div>
 			<div class="row">
-				<el-form-item label="项目编号:" prop="engineeringCode">
+				<el-form-item label="项目ID:" prop="engineeringCode">
 					<el-input placeholder="请输入" v-model="form.engineeringCode" />
 				</el-form-item>
 				<el-form-item label="项目总投资:" prop="engineeringCost">
@@ -116,7 +116,7 @@
 			<FileUpload v-model="showFilesUpload" @update:files="handlechange" :files="current.files" :reset="true" />
 		</div>
 		<footer class="footer">
-			<el-button type="primary" @click="next(ruleFormRef, true)">保存</el-button>
+			<el-button type="primary" @click="next(ruleFormRef, true)" v-if="!store.Message">保存</el-button>
 			<el-button type="primary" @click="prev">上一步</el-button>
 			<el-button type="primary" @click="next(ruleFormRef)">下一步</el-button>
 		</footer>
diff --git a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview3.vue b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview3.vue
index 777fef3..ea80d7d 100644
--- a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview3.vue
+++ b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview3.vue
@@ -154,7 +154,7 @@
 			<FileUpload v-model="showFilesUpload" @update:files="handlechange" :files="current.files" :reset="true" />
 		</div>
 		<footer class="footer">
-			<el-button type="primary" @click="next(ruleFormRef, true)">保存</el-button>
+			<el-button type="primary" @click="next(ruleFormRef, true)" v-if="!store.Message">保存</el-button>
 			<el-button type="primary" @click="prev">上一步</el-button>
 			<el-button type="primary" @click="next(ruleFormRef)">下一步</el-button>
 		</footer>
diff --git a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview4.vue b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview4.vue
index c3ecf19..9e1e5a2 100644
--- a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview4.vue
+++ b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview4.vue
@@ -78,7 +78,7 @@
 			<FileUpload v-model="showFilesUpload" @update:files="handlechange" :files="current.files" :reset="true" />
 		</div>
 		<footer class="footer">
-			<el-button type="primary" @click="next(ruleFormRef, true)">保存</el-button>
+			<el-button type="primary" @click="next(ruleFormRef, true)" v-if="!store.Message">保存</el-button>
 			<el-button type="primary" @click="prev">上一步</el-button>
 			<el-button type="primary" @click="next(ruleFormRef)">下一步</el-button>
 		</footer>
diff --git a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview5.vue b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview5.vue
index 014a3b2..0328153 100644
--- a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview5.vue
+++ b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview5.vue
@@ -105,7 +105,7 @@
 			<FileUpload v-model="showFilesUpload" @update:files="handlechange" :files="current.files" :reset="true" />
 		</div>
 		<footer class="footer">
-			<el-button type="primary" @click="next(ruleFormRef, true)">保存</el-button>
+			<el-button type="primary" @click="next(ruleFormRef, true)" v-if="!store.Message">保存</el-button>
 			<el-button type="primary" @click="prev">上一步</el-button>
 			<el-button type="primary" @click="next(ruleFormRef)">下一步</el-button>
 		</footer>
diff --git a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview6.vue b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview6.vue
index cc58e2a..ceaf051 100644
--- a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview6.vue
+++ b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview6.vue
@@ -102,7 +102,7 @@
 			<FileUpload v-model="showFilesUpload" @update:files="handlechange" :files="current.files" :reset="true" />
 		</div>
 		<footer class="footer">
-			<el-button type="primary" @click="next(ruleFormRef, true)">保存</el-button>
+			<el-button type="primary" @click="next(ruleFormRef, true)" v-if="!store.Message">保存</el-button>
 			<el-button type="primary" @click="prev">上一步</el-button>
 			<el-button type="primary" @click="next(ruleFormRef)">下一步</el-button>
 		</footer>
diff --git a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview7.vue b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview7.vue
index 2f51f90..51d37df 100644
--- a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview7.vue
+++ b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview7.vue
@@ -86,7 +86,7 @@
 			<FileUpload v-model="showFilesUpload" @update:files="handlechange" :files="current.files" :reset="true" />
 		</div>
 		<footer class="footer">
-			<el-button type="primary" @click="next(ruleFormRef, true)">保存</el-button>
+			<el-button type="primary" @click="next(ruleFormRef, true)" v-if="!store.Message">保存</el-button>
 			<el-button type="primary" @click="prev">上一步</el-button>
 			<el-button type="primary" @click="next(ruleFormRef)">下一步</el-button>
 		</footer>
diff --git a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview8.vue b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview8.vue
index e163433..428ec33 100644
--- a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview8.vue
+++ b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview8.vue
@@ -242,7 +242,7 @@
 			<FileUpload v-model="showFilesUpload" @update:files="handlechange" :files="current.files" :reset="true" />
 		</div>
 		<footer class="footer">
-			<el-button type="primary" @click="handleSubmit(ruleFormRef, true)">保存</el-button>
+			<el-button type="primary" @click="handleSubmit(ruleFormRef, true)" v-if="!store.Message">保存</el-button>
 			<el-button type="primary" @click="prev">上一步</el-button>
 			<el-button type="primary" @click="handleSubmit(ruleFormRef)">提交</el-button>
 		</footer>
diff --git a/src/views/goverment/huizhou/preProjectManagement/index.vue b/src/views/goverment/huizhou/preProjectManagement/index.vue
index d385a1f..bdcd59f 100644
--- a/src/views/goverment/huizhou/preProjectManagement/index.vue
+++ b/src/views/goverment/huizhou/preProjectManagement/index.vue
@@ -155,7 +155,7 @@ const columns: ColumnProps[] = [
 	},
 	{
 		prop: "engineeringCode",
-		label: "项目编号",
+		label: "项目ID",
 		search: { el: "input" }
 	},
 	{
diff --git a/src/views/goverment/huizhou/projectList/components/ProjectSupervisionDiv/annex.vue b/src/views/goverment/huizhou/projectList/components/ProjectSupervisionDiv/annex.vue
index b9de7e2..ffe3780 100644
--- a/src/views/goverment/huizhou/projectList/components/ProjectSupervisionDiv/annex.vue
+++ b/src/views/goverment/huizhou/projectList/components/ProjectSupervisionDiv/annex.vue
@@ -17,7 +17,7 @@
 		</el-table>
 
 		<footer class="footer">
-			<el-button type="primary" @click="handleSubmit(true)">保存</el-button>
+			<el-button type="primary" @click="handleSubmit(true)" v-if="!store.Message">保存</el-button>
 			<el-button class="btnStyle" @click="emit('prev')">上一步</el-button>
 			<el-button type="primary" @click="handleSubmit(false)">提交</el-button>
 		</footer>
diff --git a/src/views/goverment/huizhou/projectList/components/ProjectSupervisionDiv/duty.vue b/src/views/goverment/huizhou/projectList/components/ProjectSupervisionDiv/duty.vue
index ece48ee..72bcde0 100644
--- a/src/views/goverment/huizhou/projectList/components/ProjectSupervisionDiv/duty.vue
+++ b/src/views/goverment/huizhou/projectList/components/ProjectSupervisionDiv/duty.vue
@@ -16,7 +16,7 @@
 			<el-button class="btnStyle" type="primary" @click="deleteEnterpriseData">减少单位</el-button>
 		</div>
 		<footer class="footer">
-			<el-button type="primary" @click="handleToPrevOrNext(true)">保存</el-button>
+			<el-button type="primary" @click="handleToPrevOrNext(true)" v-if="!store.Message">保存</el-button>
 			<el-button class="btnStyle" :type="isAllowNext ? 'primary' : 'default'" @click="handleToPrevOrNext(false)">{{
 				isAllowNext ? "下一步" : "上一步"
 			}}</el-button>
diff --git a/src/views/goverment/huizhou/projectList/components/ProjectSupervisionDiv/overview.vue b/src/views/goverment/huizhou/projectList/components/ProjectSupervisionDiv/overview.vue
index e0e9659..550a833 100644
--- a/src/views/goverment/huizhou/projectList/components/ProjectSupervisionDiv/overview.vue
+++ b/src/views/goverment/huizhou/projectList/components/ProjectSupervisionDiv/overview.vue
@@ -18,7 +18,7 @@
 				</el-select>
 			</el-form-item>
 			<div class="row">
-				<el-form-item label="项目编码:" prop="engineeringCode">
+				<el-form-item label="项目ID:" prop="engineeringCode">
 					<el-input placeholder="请输入" v-model="form.engineeringCode" />
 				</el-form-item>
 				<el-form-item label="项目类别:" prop="engineeringType">
@@ -261,7 +261,7 @@
 			</el-table>
 		</div> -->
 		<footer class="footer">
-			<el-button type="primary" @click="next(ruleFormRef, true)">保存</el-button>
+			<el-button type="primary" @click="next(ruleFormRef, true)" v-if="!store.Message">保存</el-button>
 			<el-button type="primary" @click="next(ruleFormRef)">下一步</el-button>
 		</footer>
 		<AMap v-model="isOpen" @get-address="getAddress" />
diff --git a/src/views/goverment/huizhou/projectList/index.vue b/src/views/goverment/huizhou/projectList/index.vue
index 4bd06f2..9111c83 100644
--- a/src/views/goverment/huizhou/projectList/index.vue
+++ b/src/views/goverment/huizhou/projectList/index.vue
@@ -151,7 +151,7 @@ const columns: ColumnProps[] = [
 	},
 	{
 		prop: "engineeringCode",
-		label: "项目编号",
+		label: "项目ID",
 		search: { el: "input" }
 	},
 	// 多级 prop