From d4e55efd0ee893f86ba24ce91089924b2026ade3 Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Mon, 8 Jul 2024 17:23:59 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E3=80=81=E9=A1=B9=E7=9B=AE=E5=89=8D=E6=9C=9F=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=8C=E7=BA=A7=E7=B1=BB=E5=88=AB=E9=80=89?= =?UTF-8?q?=E9=A1=B9=E4=BB=A5=E5=8F=8A=E4=BF=AE=E6=94=B9=E4=BA=86=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=BF=85=E5=A1=AB=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 +- .../components/LeftcentView.vue | 16 +++--- .../ProjectSupervisionDiv/index.vue | 3 ++ .../ProjectSupervisionDiv/overview.ts | 12 ++++- .../ProjectSupervisionDiv/overview.vue | 27 ++++++++-- .../ProjectSupervisionDiv/overview2.ts | 6 ++- .../ProjectSupervisionDiv/overview3.ts | 6 ++- .../ProjectSupervisionDiv/overview4.ts | 6 ++- .../ProjectSupervisionDiv/overview5.ts | 6 ++- .../ProjectSupervisionDiv/overview6.ts | 6 ++- .../ProjectSupervisionDiv/overview7.ts | 6 ++- .../ProjectSupervisionDiv/overview8.ts | 6 ++- .../ProjectSupervisionDiv/overview8.vue | 2 +- .../contractManagement/index.vue | 42 ++++++++-------- .../ProjectSupervisionDiv/index.vue | 3 ++ .../ProjectSupervisionDiv/overview.scss | 2 +- .../ProjectSupervisionDiv/overview.ts | 8 ++- .../ProjectSupervisionDiv/overview.vue | 49 +++++++++++++------ 18 files changed, 143 insertions(+), 67 deletions(-) diff --git a/.env.development b/.env.development index b365030..e274eaa 100644 --- a/.env.development +++ b/.env.development @@ -2,11 +2,11 @@ NODE_ENV = 'development' # 本地环境接口地址(/api/index.ts文件中使用) -# VITE_API_URL = 'http://192.168.34.155:6688' +VITE_API_URL = 'http://192.168.34.155:6688' # VITE_API_URL = 'http://183.63.230.59:6090' # VITE_API_URL = 'http://2xliv7gs.shenzhuo.vip:55296' VITE_WPAPI_URL = "http://jxjzw.zhgdyun.com:8081" -VITE_API_URL = "http://jxjzw.zhgdyun.com:9013" +# VITE_API_URL = "http://jxjzw.zhgdyun.com:9013" # VITE_API_URL = 'https://xmglcs.hyjgxt.cn:6090' # 上传 diff --git a/src/views/goverment/huizhou/largeScreen/largeScreenTwo/components/LeftcentView.vue b/src/views/goverment/huizhou/largeScreen/largeScreenTwo/components/LeftcentView.vue index 06bdac9..96907b6 100644 --- a/src/views/goverment/huizhou/largeScreen/largeScreenTwo/components/LeftcentView.vue +++ b/src/views/goverment/huizhou/largeScreen/largeScreenTwo/components/LeftcentView.vue @@ -39,18 +39,18 @@
里程（km）
--> -
-
-
-
{{ projectInfo.bridge }}
-
桥梁工程
-
-
{{ projectInfo.tunnel }}
-
隧道工程
+
市政工程
+
+
+
+
+
+
{{ projectInfo.bridge }}
+
信息化工程
diff --git a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/index.vue b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/index.vue index 7bd57ac..ec54b52 100644 --- a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/index.vue +++ b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/index.vue @@ -108,6 +108,9 @@ const submit = async () => { ...addRepostData.value, isDraft: 0 // 0代表直接提交 }; + if (Array.isArray(requestData.projectSecondType)) { + requestData.projectSecondType = requestData.projectSecondType.join(","); + } if (!store.Message) { const data = await addPreEngineering(requestData); ElMessage.success(data.message); diff --git a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview.ts b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview.ts index d57ddb1..8046770 100644 --- a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview.ts +++ b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview.ts @@ -18,6 +18,7 @@ export enum Important { const data = { engineeringName: "", engineeringType: "", + projectSecondType: [], engineeringUse: Type["One"], engineeringCost: "", engineeringArea: "", @@ -40,7 +41,8 @@ const data = { { dictValue: "项目建议书", files: [] }, { dictValue: "各单位回复", files: [] }, { dictValue: "政投会PPT（定稿）", files: [] }, - { dictValue: "政投会会议纪要", files: [] } + { dictValue: "政投会会议纪要", files: [] }, + { dictValue: "其他文件", files: [] } ] }; @@ -52,6 +54,7 @@ export const reset = () => { form.value = { engineeringName: "", engineeringType: "", + projectSecondType: [], engineeringUse: Type["One"], engineeringCost: "", engineeringArea: "", @@ -74,7 +77,8 @@ export const reset = () => { { dictValue: "项目建议书", files: [] }, { dictValue: "各单位回复", files: [] }, { dictValue: "政投会PPT（定稿）", files: [] }, - { dictValue: "政投会会议纪要", files: [] } + { dictValue: "政投会会议纪要", files: [] }, + { dictValue: "其他文件", files: [] } ] }; }; @@ -89,6 +93,10 @@ export const rules = ref({ // required: true, // message: "请输入项目类别" // }, + // projectSecondType: { + // required: true, + // message: "请输入项目类别" + // }, // engineeringUse: { // type: "number", // required: true, diff --git a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview.vue b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview.vue index 6cb638d..807ded1 100644 --- a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview.vue +++ b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview.vue @@ -22,6 +22,21 @@
+
+ + + + + + + + +
@@ -69,9 +84,6 @@ - - -
(), oneEndTimeRef = ref(); const engineeringTypeOptions = ref([]), + engineeringTypeSecondOptions = ref([]), engineeringUseOptions = ref([]); const engineeringPurpose = ref([]); @@ -302,6 +315,7 @@ onMounted(async () => { item.files = files; }); } + form.value.projectSecondType = store.Message.projectSecondType.split(",").map((item: string) => Number(item)); } // if (store.Message) { // form.value = store.Message; @@ -320,6 +334,13 @@ onUnmounted(() => { ruleFormRef.value?.clearValidate(); reset(); }); +watch( + () => form.value.engineeringType, + async newVal => { + const res = await getDicList({ dictType: "engineering_type_" + newVal }); + engineeringTypeSecondOptions.value = res.result; + } +);