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;
+ }
+);