diff --git a/src/views/document/dataClassify/index.vue b/src/views/document/dataClassify/index.vue
index e677ed9..049532e 100644
--- a/src/views/document/dataClassify/index.vue
+++ b/src/views/document/dataClassify/index.vue
@@ -20,7 +20,7 @@
-
+
diff --git a/src/views/document/dataClassify/index.vue b/src/views/document/dataClassify/index.vue
index e677ed9..049532e 100644
--- a/src/views/document/dataClassify/index.vue
+++ b/src/views/document/dataClassify/index.vue
@@ -20,7 +20,7 @@
-
+
diff --git a/src/views/project/projectJinDu/monthReport.vue b/src/views/project/projectJinDu/monthReport.vue
index 8b26acc..cdfc1ce 100644
--- a/src/views/project/projectJinDu/monthReport.vue
+++ b/src/views/project/projectJinDu/monthReport.vue
@@ -181,11 +181,11 @@
-
+
@@ -235,9 +235,8 @@
title: [{ required: true, message: '请输入', trigger: 'blur' }],
},
formDataTZ: {
- userName: '',
fileList: [],
- userPhone: '',
+ msgState: '1',
},
rulesFormTZ: {
userIdArray: [{ required: true, message: '请选择被通知人', trigger: 'blur' }],
diff --git a/src/views/document/dataClassify/index.vue b/src/views/document/dataClassify/index.vue
index e677ed9..049532e 100644
--- a/src/views/document/dataClassify/index.vue
+++ b/src/views/document/dataClassify/index.vue
@@ -20,7 +20,7 @@
-
+
diff --git a/src/views/project/projectJinDu/monthReport.vue b/src/views/project/projectJinDu/monthReport.vue
index 8b26acc..cdfc1ce 100644
--- a/src/views/project/projectJinDu/monthReport.vue
+++ b/src/views/project/projectJinDu/monthReport.vue
@@ -181,11 +181,11 @@
-
+
@@ -235,9 +235,8 @@
title: [{ required: true, message: '请输入', trigger: 'blur' }],
},
formDataTZ: {
- userName: '',
fileList: [],
- userPhone: '',
+ msgState: '1',
},
rulesFormTZ: {
userIdArray: [{ required: true, message: '请选择被通知人', trigger: 'blur' }],
diff --git a/src/views/project/projectManage/projectDesign.vue b/src/views/project/projectManage/projectDesign.vue
index de7d968..7bbcd3f 100644
--- a/src/views/project/projectManage/projectDesign.vue
+++ b/src/views/project/projectManage/projectDesign.vue
@@ -89,13 +89,22 @@
-
-
-
+
+
+
+
+
+
+
+
-
+
@@ -131,7 +140,8 @@
getProjectInfoNewList,
} from '@/api/document/projectTransfer';
import { listUser } from '@/api/system/user';
-
+import bus from '@/utils/mitt';
+import { projectNoticeAdd } from '@/api/publicService/index';
const { proxy } = getCurrentInstance();
const projectList = ref([]);
const dialogShow = ref(false);
@@ -158,11 +168,20 @@
reviewStatus: [{ required: true, message: '请输入', trigger: 'blur' }],
},
formDataGH: {
- noticeUserId: '',
- noticeMsg: '',
+ msgState: '1',
},
rulesFormGH: {
- noticeUserId: [{ required: true, message: '请输入', trigger: 'change' }],
+ userIdArray: [{ required: true, message: '请选择被通知人', trigger: 'blur' }],
+ msgState: [{ required: true, message: '请选择通知状态', trigger: 'blur' }],
+ noticeMsg: [{ required: true, message: '请输入通知消息', trigger: 'blur' }],
+ phone: [
+ {
+ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+ message: '请输入正确的手机号码',
+ trigger: 'blur',
+ required: true,
+ },
+ ],
},
});
const { queryParams, formData, rulesForm, formDataGH, rulesFormGH } = toRefs(allData);
@@ -210,6 +229,7 @@
// 提交市规划局
function handleSubmit(row) {
+ proxy.resetForm('formRefGH'); //清空表单
dialogShowGH.value = true;
formData.value = { ...row };
}
@@ -217,19 +237,20 @@
proxy.$refs['formRefGH'].validate(valid => {
if (valid) {
formDataGH.value.fileType = 'hmchzp';
- projectFileReviewGH(formDataGH.value).then(response => {
+ projectNoticeAdd(formDataGH.value).then(response => {
proxy.$modal.msgSuccess('提交市规划局成功');
dialogShowGH.value = false;
getTableList();
+ bus.emit('Refresh');
});
// 修改状态
- formData.value.reviewStatus = '2';
- formData.value.fileType = 'hmchzp';
- projectFileReviewEdit(formData.value).then(response => {
- proxy.$modal.msgSuccess('审核成功');
- dialogShow.value = false;
- getTableList();
- });
+ // formData.value.reviewStatus = '2';
+ // formData.value.fileType = 'hmchzp';
+ // projectFileReviewEdit(formData.value).then(response => {
+ // proxy.$modal.msgSuccess('审核成功');
+ // dialogShow.value = false;
+ // getTableList();
+ // });
}
});
}
diff --git a/src/views/document/dataClassify/index.vue b/src/views/document/dataClassify/index.vue
index e677ed9..049532e 100644
--- a/src/views/document/dataClassify/index.vue
+++ b/src/views/document/dataClassify/index.vue
@@ -20,7 +20,7 @@
-
+
diff --git a/src/views/project/projectJinDu/monthReport.vue b/src/views/project/projectJinDu/monthReport.vue
index 8b26acc..cdfc1ce 100644
--- a/src/views/project/projectJinDu/monthReport.vue
+++ b/src/views/project/projectJinDu/monthReport.vue
@@ -181,11 +181,11 @@
-
+
@@ -235,9 +235,8 @@
title: [{ required: true, message: '请输入', trigger: 'blur' }],
},
formDataTZ: {
- userName: '',
fileList: [],
- userPhone: '',
+ msgState: '1',
},
rulesFormTZ: {
userIdArray: [{ required: true, message: '请选择被通知人', trigger: 'blur' }],
diff --git a/src/views/project/projectManage/projectDesign.vue b/src/views/project/projectManage/projectDesign.vue
index de7d968..7bbcd3f 100644
--- a/src/views/project/projectManage/projectDesign.vue
+++ b/src/views/project/projectManage/projectDesign.vue
@@ -89,13 +89,22 @@
-
-
-
+
+
+
+
+
+
+
+
-
+
@@ -131,7 +140,8 @@
getProjectInfoNewList,
} from '@/api/document/projectTransfer';
import { listUser } from '@/api/system/user';
-
+import bus from '@/utils/mitt';
+import { projectNoticeAdd } from '@/api/publicService/index';
const { proxy } = getCurrentInstance();
const projectList = ref([]);
const dialogShow = ref(false);
@@ -158,11 +168,20 @@
reviewStatus: [{ required: true, message: '请输入', trigger: 'blur' }],
},
formDataGH: {
- noticeUserId: '',
- noticeMsg: '',
+ msgState: '1',
},
rulesFormGH: {
- noticeUserId: [{ required: true, message: '请输入', trigger: 'change' }],
+ userIdArray: [{ required: true, message: '请选择被通知人', trigger: 'blur' }],
+ msgState: [{ required: true, message: '请选择通知状态', trigger: 'blur' }],
+ noticeMsg: [{ required: true, message: '请输入通知消息', trigger: 'blur' }],
+ phone: [
+ {
+ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+ message: '请输入正确的手机号码',
+ trigger: 'blur',
+ required: true,
+ },
+ ],
},
});
const { queryParams, formData, rulesForm, formDataGH, rulesFormGH } = toRefs(allData);
@@ -210,6 +229,7 @@
// 提交市规划局
function handleSubmit(row) {
+ proxy.resetForm('formRefGH'); //清空表单
dialogShowGH.value = true;
formData.value = { ...row };
}
@@ -217,19 +237,20 @@
proxy.$refs['formRefGH'].validate(valid => {
if (valid) {
formDataGH.value.fileType = 'hmchzp';
- projectFileReviewGH(formDataGH.value).then(response => {
+ projectNoticeAdd(formDataGH.value).then(response => {
proxy.$modal.msgSuccess('提交市规划局成功');
dialogShowGH.value = false;
getTableList();
+ bus.emit('Refresh');
});
// 修改状态
- formData.value.reviewStatus = '2';
- formData.value.fileType = 'hmchzp';
- projectFileReviewEdit(formData.value).then(response => {
- proxy.$modal.msgSuccess('审核成功');
- dialogShow.value = false;
- getTableList();
- });
+ // formData.value.reviewStatus = '2';
+ // formData.value.fileType = 'hmchzp';
+ // projectFileReviewEdit(formData.value).then(response => {
+ // proxy.$modal.msgSuccess('审核成功');
+ // dialogShow.value = false;
+ // getTableList();
+ // });
}
});
}
diff --git a/src/views/spongePerformance/waterUtilizationRate/odorousWaterBodies/todoDon.vue b/src/views/spongePerformance/waterUtilizationRate/odorousWaterBodies/todoDon.vue
index f1c9613..daf3252 100644
--- a/src/views/spongePerformance/waterUtilizationRate/odorousWaterBodies/todoDon.vue
+++ b/src/views/spongePerformance/waterUtilizationRate/odorousWaterBodies/todoDon.vue
@@ -3,7 +3,7 @@
-
+
diff --git a/src/views/document/dataClassify/index.vue b/src/views/document/dataClassify/index.vue
index e677ed9..049532e 100644
--- a/src/views/document/dataClassify/index.vue
+++ b/src/views/document/dataClassify/index.vue
@@ -20,7 +20,7 @@
-
+
diff --git a/src/views/project/projectJinDu/monthReport.vue b/src/views/project/projectJinDu/monthReport.vue
index 8b26acc..cdfc1ce 100644
--- a/src/views/project/projectJinDu/monthReport.vue
+++ b/src/views/project/projectJinDu/monthReport.vue
@@ -181,11 +181,11 @@
-
+
@@ -235,9 +235,8 @@
title: [{ required: true, message: '请输入', trigger: 'blur' }],
},
formDataTZ: {
- userName: '',
fileList: [],
- userPhone: '',
+ msgState: '1',
},
rulesFormTZ: {
userIdArray: [{ required: true, message: '请选择被通知人', trigger: 'blur' }],
diff --git a/src/views/project/projectManage/projectDesign.vue b/src/views/project/projectManage/projectDesign.vue
index de7d968..7bbcd3f 100644
--- a/src/views/project/projectManage/projectDesign.vue
+++ b/src/views/project/projectManage/projectDesign.vue
@@ -89,13 +89,22 @@
-
-
-
+
+
+
+
+
+
+
+
-
+
@@ -131,7 +140,8 @@
getProjectInfoNewList,
} from '@/api/document/projectTransfer';
import { listUser } from '@/api/system/user';
-
+import bus from '@/utils/mitt';
+import { projectNoticeAdd } from '@/api/publicService/index';
const { proxy } = getCurrentInstance();
const projectList = ref([]);
const dialogShow = ref(false);
@@ -158,11 +168,20 @@
reviewStatus: [{ required: true, message: '请输入', trigger: 'blur' }],
},
formDataGH: {
- noticeUserId: '',
- noticeMsg: '',
+ msgState: '1',
},
rulesFormGH: {
- noticeUserId: [{ required: true, message: '请输入', trigger: 'change' }],
+ userIdArray: [{ required: true, message: '请选择被通知人', trigger: 'blur' }],
+ msgState: [{ required: true, message: '请选择通知状态', trigger: 'blur' }],
+ noticeMsg: [{ required: true, message: '请输入通知消息', trigger: 'blur' }],
+ phone: [
+ {
+ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+ message: '请输入正确的手机号码',
+ trigger: 'blur',
+ required: true,
+ },
+ ],
},
});
const { queryParams, formData, rulesForm, formDataGH, rulesFormGH } = toRefs(allData);
@@ -210,6 +229,7 @@
// 提交市规划局
function handleSubmit(row) {
+ proxy.resetForm('formRefGH'); //清空表单
dialogShowGH.value = true;
formData.value = { ...row };
}
@@ -217,19 +237,20 @@
proxy.$refs['formRefGH'].validate(valid => {
if (valid) {
formDataGH.value.fileType = 'hmchzp';
- projectFileReviewGH(formDataGH.value).then(response => {
+ projectNoticeAdd(formDataGH.value).then(response => {
proxy.$modal.msgSuccess('提交市规划局成功');
dialogShowGH.value = false;
getTableList();
+ bus.emit('Refresh');
});
// 修改状态
- formData.value.reviewStatus = '2';
- formData.value.fileType = 'hmchzp';
- projectFileReviewEdit(formData.value).then(response => {
- proxy.$modal.msgSuccess('审核成功');
- dialogShow.value = false;
- getTableList();
- });
+ // formData.value.reviewStatus = '2';
+ // formData.value.fileType = 'hmchzp';
+ // projectFileReviewEdit(formData.value).then(response => {
+ // proxy.$modal.msgSuccess('审核成功');
+ // dialogShow.value = false;
+ // getTableList();
+ // });
}
});
}
diff --git a/src/views/spongePerformance/waterUtilizationRate/odorousWaterBodies/todoDon.vue b/src/views/spongePerformance/waterUtilizationRate/odorousWaterBodies/todoDon.vue
index f1c9613..daf3252 100644
--- a/src/views/spongePerformance/waterUtilizationRate/odorousWaterBodies/todoDon.vue
+++ b/src/views/spongePerformance/waterUtilizationRate/odorousWaterBodies/todoDon.vue
@@ -3,7 +3,7 @@
-
+
diff --git a/src/views/spongePerformance/waterlogging/permeableGroundArea/todoDon.vue b/src/views/spongePerformance/waterlogging/permeableGroundArea/todoDon.vue
index 2cca139..1e7e759 100644
--- a/src/views/spongePerformance/waterlogging/permeableGroundArea/todoDon.vue
+++ b/src/views/spongePerformance/waterlogging/permeableGroundArea/todoDon.vue
@@ -68,7 +68,7 @@
let isFlag = ref(1);
const cloums = ref([
{ value: '考核年度', key: 'year' },
- { value: '中心城区总面积(公顷)', key: 'allRealValue' },
+ { value: '建成区(公顷)', key: 'allRealValue' },
{ value: '现状可透水地面面积(公顷)', key: 'kstdmArea' },
{ value: '目标比例%', key: 'itemTarget' },
{ value: '可透水地面面积比%', key: 'kstdmAreaRate' },
diff --git a/src/views/document/dataClassify/index.vue b/src/views/document/dataClassify/index.vue
index e677ed9..049532e 100644
--- a/src/views/document/dataClassify/index.vue
+++ b/src/views/document/dataClassify/index.vue
@@ -20,7 +20,7 @@
-
+
diff --git a/src/views/project/projectJinDu/monthReport.vue b/src/views/project/projectJinDu/monthReport.vue
index 8b26acc..cdfc1ce 100644
--- a/src/views/project/projectJinDu/monthReport.vue
+++ b/src/views/project/projectJinDu/monthReport.vue
@@ -181,11 +181,11 @@
-
+
@@ -235,9 +235,8 @@
title: [{ required: true, message: '请输入', trigger: 'blur' }],
},
formDataTZ: {
- userName: '',
fileList: [],
- userPhone: '',
+ msgState: '1',
},
rulesFormTZ: {
userIdArray: [{ required: true, message: '请选择被通知人', trigger: 'blur' }],
diff --git a/src/views/project/projectManage/projectDesign.vue b/src/views/project/projectManage/projectDesign.vue
index de7d968..7bbcd3f 100644
--- a/src/views/project/projectManage/projectDesign.vue
+++ b/src/views/project/projectManage/projectDesign.vue
@@ -89,13 +89,22 @@
-
-
-
+
+
+
+
+
+
+
+
-
+
@@ -131,7 +140,8 @@
getProjectInfoNewList,
} from '@/api/document/projectTransfer';
import { listUser } from '@/api/system/user';
-
+import bus from '@/utils/mitt';
+import { projectNoticeAdd } from '@/api/publicService/index';
const { proxy } = getCurrentInstance();
const projectList = ref([]);
const dialogShow = ref(false);
@@ -158,11 +168,20 @@
reviewStatus: [{ required: true, message: '请输入', trigger: 'blur' }],
},
formDataGH: {
- noticeUserId: '',
- noticeMsg: '',
+ msgState: '1',
},
rulesFormGH: {
- noticeUserId: [{ required: true, message: '请输入', trigger: 'change' }],
+ userIdArray: [{ required: true, message: '请选择被通知人', trigger: 'blur' }],
+ msgState: [{ required: true, message: '请选择通知状态', trigger: 'blur' }],
+ noticeMsg: [{ required: true, message: '请输入通知消息', trigger: 'blur' }],
+ phone: [
+ {
+ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+ message: '请输入正确的手机号码',
+ trigger: 'blur',
+ required: true,
+ },
+ ],
},
});
const { queryParams, formData, rulesForm, formDataGH, rulesFormGH } = toRefs(allData);
@@ -210,6 +229,7 @@
// 提交市规划局
function handleSubmit(row) {
+ proxy.resetForm('formRefGH'); //清空表单
dialogShowGH.value = true;
formData.value = { ...row };
}
@@ -217,19 +237,20 @@
proxy.$refs['formRefGH'].validate(valid => {
if (valid) {
formDataGH.value.fileType = 'hmchzp';
- projectFileReviewGH(formDataGH.value).then(response => {
+ projectNoticeAdd(formDataGH.value).then(response => {
proxy.$modal.msgSuccess('提交市规划局成功');
dialogShowGH.value = false;
getTableList();
+ bus.emit('Refresh');
});
// 修改状态
- formData.value.reviewStatus = '2';
- formData.value.fileType = 'hmchzp';
- projectFileReviewEdit(formData.value).then(response => {
- proxy.$modal.msgSuccess('审核成功');
- dialogShow.value = false;
- getTableList();
- });
+ // formData.value.reviewStatus = '2';
+ // formData.value.fileType = 'hmchzp';
+ // projectFileReviewEdit(formData.value).then(response => {
+ // proxy.$modal.msgSuccess('审核成功');
+ // dialogShow.value = false;
+ // getTableList();
+ // });
}
});
}
diff --git a/src/views/spongePerformance/waterUtilizationRate/odorousWaterBodies/todoDon.vue b/src/views/spongePerformance/waterUtilizationRate/odorousWaterBodies/todoDon.vue
index f1c9613..daf3252 100644
--- a/src/views/spongePerformance/waterUtilizationRate/odorousWaterBodies/todoDon.vue
+++ b/src/views/spongePerformance/waterUtilizationRate/odorousWaterBodies/todoDon.vue
@@ -3,7 +3,7 @@
-
+
diff --git a/src/views/spongePerformance/waterlogging/permeableGroundArea/todoDon.vue b/src/views/spongePerformance/waterlogging/permeableGroundArea/todoDon.vue
index 2cca139..1e7e759 100644
--- a/src/views/spongePerformance/waterlogging/permeableGroundArea/todoDon.vue
+++ b/src/views/spongePerformance/waterlogging/permeableGroundArea/todoDon.vue
@@ -68,7 +68,7 @@
let isFlag = ref(1);
const cloums = ref([
{ value: '考核年度', key: 'year' },
- { value: '中心城区总面积(公顷)', key: 'allRealValue' },
+ { value: '建成区(公顷)', key: 'allRealValue' },
{ value: '现状可透水地面面积(公顷)', key: 'kstdmArea' },
{ value: '目标比例%', key: 'itemTarget' },
{ value: '可透水地面面积比%', key: 'kstdmAreaRate' },
diff --git a/vite.config.js b/vite.config.js
index ea36ec6..24dcf41 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -7,8 +7,8 @@
const Timestamp = new Date().getTime(); //随机时间戳
// const targetUrl = 'http://192.168.16.254:7200'; //孙逢时
-// const targetUrl = 'http://192.168.20.52:7300'; //杨辉
-const targetUrl = 'https://server2.wh-nf.cn:8082/prod-api'; //线上
+const targetUrl = 'http://192.168.20.52:7300'; //杨辉
+// const targetUrl = 'https://server2.wh-nf.cn:8082/prod-api'; //线上
// https://vitejs.dev/config/
export default defineConfig(({ mode, command }) => {