-
{{ $t("cancel") }}
+
{{ $t("cancel") }}
{{
$t("confirm")
}}
@@ -253,10 +253,12 @@ export default {
},
},
mounted() {
- this.getFormInfo();
this.initMap();
},
methods: {
+ closeSubmit(){
+ this.$emit('closeDialog')
+ },
// 地图初始化函数，本例取名为init，开发者可根据实际情况定义
initMap() {
// 定义地图中心点坐标
From 52acf7bbeb285c62b0b3b2cb463d1dd8eff5bb04 Mon Sep 17 00:00:00 2001
From: 123456 <17862666717>
Date: Thu, 23 Jun 2022 14:49:22 +0800
Subject: [PATCH 15/59] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E9=83=A8=E5=88=86?=
=?UTF-8?q?=E4=BA=8B=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../plugins/point/icpointnucleicmonitoring-add-or-update.vue | 4 +---
.../point/icpointvaccinesinoculation-add-or-update.vue | 1 +
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue b/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue
index e4c30016..8fd4d1c8 100644
--- a/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue
+++ b/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue
@@ -113,7 +113,6 @@ var infoWindowList;
export default {
data() {
return {
- visible: false,
dataForm: {
id: "",
customerId: "",
@@ -336,7 +335,6 @@ export default {
.catch(() => {});
},
init() {
- this.visible = true;
this.$nextTick(() => {
this.$refs["dataForm"].resetFields();
if (this.dataForm.id) {
@@ -380,8 +378,8 @@ export default {
type: "success",
duration: 500,
onClose: () => {
- this.visible = false;
this.$emit("refreshDataList");
+ this.closeSubmit()
},
});
})
diff --git a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
index cc6babf2..ede57617 100644
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
@@ -420,6 +420,7 @@ export default {
// onClose: () => {
// this.visible = false
// this.$emit('refreshDataList')
+ // this.closeSubmit()
// }
// })
// }).catch(() => {})
From b96eff559c6c7726feb25ad39861723694e9b355 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 23 Jun 2022 15:51:33 +0800
Subject: [PATCH 16/59] =?UTF-8?q?=E6=A0=B8=E9=85=B8=E6=A3=80=E6=B5=8B?=
=?UTF-8?q?=E7=82=B9=E3=80=81=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E7=82=B9?=
=?UTF-8?q?=20PC=20=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
...pointvaccinesinoculation-add-or-update.vue | 41 +++++++++----------
1 file changed, 20 insertions(+), 21 deletions(-)
diff --git a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
index ede57617..789647ca 100644
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
@@ -404,27 +404,26 @@ export default {
// 表单提交
dataFormSubmitHandle: debounce(
function () {
- console.log(this.dataForm);
- // this.$refs['dataForm'].validate((valid) => {
- // if (!valid) {
- // return false
- // }
- // this.$http[!this.dataForm.id ? 'post' : 'put']('/epmetuser/icPointVaccinesInoculation/', this.dataForm).then(({ data: res }) => {
- // if (res.code !== 0) {
- // return this.$message.error(res.msg)
- // }
- // this.$message({
- // message: this.$t('prompt.success'),
- // type: 'success',
- // duration: 500,
- // onClose: () => {
- // this.visible = false
- // this.$emit('refreshDataList')
- // this.closeSubmit()
- // }
- // })
- // }).catch(() => {})
- // })
+ this.$refs['dataForm'].validate((valid) => {
+ if (!valid) {
+ return false
+ }
+ this.$http[!this.dataForm.id ? 'post' : 'put']('/epmetuser/icPointVaccinesInoculation/', this.dataForm).then(({ data: res }) => {
+ if (res.code !== 0) {
+ return this.$message.error(res.msg)
+ }
+ this.$message({
+ message: this.$t('prompt.success'),
+ type: 'success',
+ duration: 500,
+ onClose: () => {
+ this.visible = false
+ this.$emit('refreshDataList')
+ this.closeSubmit()
+ }
+ })
+ }).catch(() => {})
+ })
},
1000,
{ leading: true, trailing: false }
From 52756db4121d18a174e6dadb450e243349bf8cc8 Mon Sep 17 00:00:00 2001
From: 123456 <17862666717>
Date: Thu, 23 Jun 2022 18:06:36 +0800
Subject: [PATCH 17/59] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=9C=B0=E5=9D=80?=
=?UTF-8?q?=E8=81=94=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../modules/plugins/point/icpointNoice.vue | 172 +++++++++++-------
...icpointnucleicmonitoring-add-or-update.vue | 11 +-
.../point/icpointnucleicmonitoring.vue | 35 +++-
...pointvaccinesinoculation-add-or-update.vue | 11 +-
.../point/icpointvaccinesinoculation.vue | 35 +++-
5 files changed, 189 insertions(+), 75 deletions(-)
diff --git a/src/views/modules/plugins/point/icpointNoice.vue b/src/views/modules/plugins/point/icpointNoice.vue
index d425f8ee..b75a9e63 100644
--- a/src/views/modules/plugins/point/icpointNoice.vue
+++ b/src/views/modules/plugins/point/icpointNoice.vue
@@ -1,17 +1,19 @@
diff --git a/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue b/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue
index 8fd4d1c8..4365131b 100644
--- a/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue
+++ b/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue
@@ -200,9 +200,8 @@ export default {
};
},
},
- mounted() {
+ mounted() {
this.getFormInfo();
- this.initMap();
},
methods: {
closeSubmit(){
@@ -219,7 +218,8 @@ export default {
// 地图初始化函数，本例取名为init，开发者可根据实际情况定义
initMap() {
// 定义地图中心点坐标
- var center = new window.TMap.LatLng(36.0722275, 120.38945519);
+ let _this = this
+ var center = new window.TMap.LatLng(_this.dataForm.latitude, _this.dataForm.longitude);
// 定义map变量，调用 TMap.Map() 构造函数创建地图
map = new window.TMap.Map(document.getElementById("map_add"), {
center: center, // 设置地图中心点坐标
@@ -339,6 +339,10 @@ export default {
this.$refs["dataForm"].resetFields();
if (this.dataForm.id) {
this.getInfo();
+ }else{
+ this.dataForm.ongitude = "120.38945519"
+ this.dataForm.latitude = "36.0722275"
+ this.initMap();
}
});
},
@@ -355,6 +359,7 @@ export default {
...this.dataForm,
...res.data,
};
+ this.initMap();
})
.catch(() => {});
},
diff --git a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
index 85bb8543..dc4f1605 100644
--- a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
+++ b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
@@ -100,6 +100,13 @@
>导入核酸监测点数据
+
发送通知