-
+
-
-
-
-
-
-
+
@@ -349,7 +380,7 @@ export default {
_form = { ...obj }
// return _form
}
- const itemTypes = ['daterange', 'timerange']
+ const itemTypes = ['cascader', 'daterange', 'timerange']
arr.forEach(item => {
if (item.multiSelect || itemTypes.includes(item.itemType)) {
if (item.columnValue && item.columnValue.indexOf(',') > -1) _form[item.columnName] = item.columnValue.split(',')
@@ -382,7 +413,7 @@ export default {
}
let form = initForm(this.formInfo, this.formList)
let rules = initRules(this.formList)
- let tempFormList = [ ...this.formList ]
+ let tempFormList = [...this.formList]
let constForm = {
...form
}
@@ -526,13 +557,13 @@ export default {
}
})
},
- getTreeData(data){
+ getTreeData (data) {
if (!Array.isArray(data)) return []
let arr = data.map(item => {
let _item = {}
if (item.children) {
if (item.children.length === 0) _item = { ...item, children: undefined }
- else _item = { ...item, children: this.getTreeData(item.children)}
+ else _item = { ...item, children: this.getTreeData(item.children) }
} else {
_item = { ...item }
}
@@ -614,9 +645,9 @@ export default {
this.getHouseList()
},
// 为了实现根据房屋类型改版是否租户的需求
- handleChangeH(val){
+ handleChangeH (val) {
let item = this.optionsH.find(item => item.value === val);
- if(item && item.type == '1'){
+ if (item && item.type == '1') {
this.form.IS_TENANT = '1'
console.log('item-----', item)
} else this.form.IS_TENANT = '0'
@@ -625,7 +656,7 @@ export default {
let arr = []
this.addList.forEach(item => {
// console.log('handlerMuscForm----000', this.$refs['baseForms' + item.row || item][0].handleForm())
- arr.push([ ...this.$refs['baseForms' + item.row][0].handleForm() ])
+ arr.push([...this.$refs['baseForms' + item.row][0].handleForm()])
})
if (arr.length === 0) return arr
let arr2 = arr.reduce(function (a, b) { return a.concat(b) })
@@ -808,17 +839,16 @@ export default {
From eb26c21882c7140bf715319f2bc643e1e3748500 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 23 Jun 2022 13:33:59 +0800
Subject: [PATCH 12/90] =?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
---
...icpointnucleicmonitoring-add-or-update.vue | 2 +-
.../point/icpointnucleicmonitoring.vue | 73 ++++++++++++++++++-
...pointvaccinesinoculation-add-or-update.vue | 70 +++++++-----------
.../point/icpointvaccinesinoculation.vue | 40 ++++------
4 files changed, 112 insertions(+), 73 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 98ae2884b..b18b80e7c 100644
--- a/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue
+++ b/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue
@@ -202,7 +202,7 @@ export default {
};
},
},
- created() {
+ mounted() {
this.getFormInfo();
this.initMap();
},
diff --git a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
index eb39591a5..6d29c40ff 100644
--- a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
+++ b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
@@ -6,8 +6,35 @@
:model="dataForm"
@keyup.enter.native="getDataList()"
>
-
-
+
+
+
+
+
+
+
{{ $t("query") }}
@@ -169,14 +196,52 @@ export default {
deleteIsBatch: true,
},
dataForm: {
- id: "",
+ name: "",
+ mobile: "",
+ orgId: ""
},
+ organizationList: [],
+ orgIds:[]
};
},
components: {
AddOrUpdate,
},
+ created(){
+ this.getFormInfo()
+ },
methods: {
+ // 获取所属组织列表
+ getFormInfo() {
+ this.$http
+ .post(`/gov/org/agency/getOrgTreeListByCustomerId`)
+ .then(({ data: res }) => {
+ if (res.code !== 0) {
+ return this.$message.error(res.msg);
+ }
+ this.organizationList = res.data;
+ this.deleteChildren(this.organizationList)
+ })
+ .catch(() => {});
+ },
+ deleteChildren(arr) {
+ let childs = arr
+ for (let i = childs.length; i--; i > 0) {
+ if (childs[i].children) {
+ if (childs[i].children.length) {
+ this.deleteChildren(childs[i].children)
+ } else {
+ delete childs[i].children
+ }
+ }
+ }
+ return arr
+ },
+ orgChangeHandle () {
+ this.dataForm.orgId = this.orgIds[this.orgIds.length-1]
+ console.log(this.dataForm)
+
+ },
handleExportModule() {
let title = "核酸检测点模板";
let url = "/epmetuser/icPointNucleicMonitoring/exporttemplate";
@@ -257,7 +322,7 @@ export default {
let fileFormData = new FormData();
fileFormData.append("file", this.files); //filename是键，file是值，就是要传的文件，test.zip是要传的文件名
- url = "/epmetuser/icPointNucleicMonitoring/pointNucleicMonitoringImport";
+ url = "/epmetuser/icPointNucleicMonitoring/pointImport";
window.app.ajax.post2(url,fileFormData,(data, rspMsg) => {
if (data.code === 0 && data.msg == "success") {
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 f5a950b13..3df9077e6 100644
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
@@ -7,21 +7,17 @@
@keyup.enter.native="dataFormSubmitHandle()"
label-width="120px"
>
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
暂无疫苗
@@ -162,7 +158,7 @@ export default {
latitude: "36.0722275",
},
keyWords: null,
- organizationList: [],
+ // organizationList: [],
};
},
computed: {
@@ -175,20 +171,6 @@ export default {
trigger: "blur",
},
],
- orgId: [
- {
- required: true,
- message: this.$t("validate.required"),
- trigger: "blur",
- },
- ],
- orgName: [
- {
- required: true,
- message: this.$t("validate.required"),
- trigger: "blur",
- },
- ],
name: [
{
required: true,
@@ -270,7 +252,7 @@ export default {
},
},
mounted() {
- this.getFormInfo();
+ // this.getFormInfo();
this.initMap();
},
methods: {
@@ -381,17 +363,17 @@ export default {
]);
},
// 获取所属组织列表
- getFormInfo() {
- this.$http
- .post(`/gov/org/agency/community-list`)
- .then(({ data: res }) => {
- if (res.code !== 0) {
- return this.$message.error(res.msg);
- }
- this.organizationList = res.data;
- })
- .catch(() => {});
- },
+ // getFormInfo() {
+ // this.$http
+ // .post(`/gov/org/agency/community-list`)
+ // .then(({ data: res }) => {
+ // if (res.code !== 0) {
+ // return this.$message.error(res.msg);
+ // }
+ // this.organizationList = res.data;
+ // })
+ // .catch(() => {});
+ // },
init() {
this.visible = true;
this.$nextTick(() => {
diff --git a/src/views/modules/plugins/point/icpointvaccinesinoculation.vue b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
index 9668e34f0..a62fe0ee1 100644
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
@@ -6,8 +6,11 @@
:model="dataForm"
@keyup.enter.native="getDataList()"
>
-
-
+
+
+
{{ $t("query") }}
@@ -36,7 +39,7 @@
- {
if (data.code === 0 && data.msg == "success") {
From cf7fa066fd5032493040ff3f8c743d27313ccbbd Mon Sep 17 00:00:00 2001
From: 123456 <17862666717>
Date: Thu, 23 Jun 2022 13:57:46 +0800
Subject: [PATCH 13/90] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=8C=89=E9=92=AE?=
=?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../icpointnucleicmonitoring-add-or-update.vue | 13 +++++++++----
.../plugins/point/icpointnucleicmonitoring.vue | 1 +
.../icpointvaccinesinoculation-add-or-update.vue | 10 ++++++++--
.../plugins/point/icpointvaccinesinoculation.vue | 9 +++++++++
4 files changed, 27 insertions(+), 6 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 98ae2884b..c9c9308fb 100644
--- a/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue
+++ b/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue
@@ -66,7 +66,7 @@
>查询
@@ -95,12 +95,12 @@
-
+
+
-
-
+
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
+
+
+
+
+ {{ ns.label }}
+
+
+
+
+
+ {{ns.label}}
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ ns.label }}
-
-
-
-
-
- {{ns.label}}
-
-
-
-
-
-
+ 
+ 事件处理分析
+
+
+
+ 事件处理分析
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+ {{item.name}}
+
+ 加载中
+
+
+
+
+ 月度新增事件统计
+
+ 加载中
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- {{ $t("cancel") }}
+ {{ $t("cancel") }}
{{
$t("confirm")
}}
@@ -207,6 +207,9 @@ export default {
this.initMap();
},
methods: {
+ closeSubmit(){
+ this.$emit('closeDialog')
+ },
// 地图初始化函数，本例取名为init，开发者可根据实际情况定义
initMap() {
// 定义地图中心点坐标
diff --git a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
index 18e7b7850..85bb8543a 100644
--- a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
+++ b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
@@ -6,48 +6,61 @@
:model="dataForm"
@keyup.enter.native="getDataList()"
>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
- {{ $t("query") }}
+ {{
+ $t("query")
+ }}
- {{
- $t("add")
- }}
+ {{ $t("add") }}
-
-
-
+
+
+
@@ -168,7 +181,7 @@
- {{ $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 19/90] =?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 e4c30016c..8fd4d1c87 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 cc6babf2a..ede576178 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 20/90] =?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 ede576178..789647ca2 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 33b8479b1cdeb40fae1c3500cb2a3997ab3d29c2 Mon Sep 17 00:00:00 2001
From: jiangyy
Date: Thu, 23 Jun 2022 17:16:44 +0800
Subject: [PATCH 21/90] echart3d
---
package.json | 1 +
src/assets/img/shuju/3d-pid-bg.png | Bin 0 -> 19139 bytes
src/assets/scss/modules/visual/search_1.scss | 1 +
.../communityGovern/shijianchuli/chart.js | 275 ++++++++++++++
.../shijianchuli/shijianchulifenxi copy 2.vue | 328 ++++++++++++++++
.../shijianchuli/shijianchulifenxi.vue | 352 ++++++++++++++++--
6 files changed, 931 insertions(+), 26 deletions(-)
create mode 100644 src/assets/img/shuju/3d-pid-bg.png
create mode 100644 src/views/modules/visual/communityGovern/shijianchuli/chart.js
create mode 100644 src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi copy 2.vue
diff --git a/package.json b/package.json
index 3def21d39..9fcede3be 100644
--- a/package.json
+++ b/package.json
@@ -22,6 +22,7 @@
"babel-eslint": "^8.0.1",
"babel-plugin-component": "^1.1.1",
"echarts": "^5.2.2",
+ "echarts-gl": "^2.0.9",
"element-theme": "^2.0.1",
"element-ui": "^2.13.0",
"file-saver": "^2.0.5",
diff --git a/src/assets/img/shuju/3d-pid-bg.png b/src/assets/img/shuju/3d-pid-bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..4519b38e8527cfdb031a82cbfe87870d9cd4d495
GIT binary patch
literal 19139
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%0AJ*L;1C@Bk59=L)iUv^(L0d3Fh<>;wIqAMV;jTaA
zem~xG$a;3Znpl6G?jLvbXULSB_*b||vCsX;g9h*ExyUo1Q*13t6zD{dbZL%4;t64;
zJ;D*H5&iP1MYzP-u!IpJ5CBtnkXsFj0aKr_^pYO!a-R)^BD@g%
z!qNKSOZ6PoOAOe65iYT5ThuOP37u*r0ZvF4Q5!4~B&W2;7POF%VaZI9u-6emJBUntnJ%Ml;
zURe4$0+vdhRpu|&Ky4~w0D(rjz6jI{>u3EJYK+22+X;)%P%X){5hX4v2p|+2O`LVt
zakck8+JX}wM;z8bH50-ow0_j)rpPg#%?jP1S8oS5XEu$U=SwD8z?WX9GU
zs$|3M-VkTP?N}s`*_p+mz;tVm>R^F`YShsHfdvLpOlcc3!fKVCvs4fSWI0!G(mms}
zqY-Xw=u{!P2pmCighP=>0GoEZ`&0q2=EMZ{U@{uGF^dOm
zMzK5$1|gDwgvZig_zTN7G9&_qZ--*V{gH!+bMBrzWAz1hZoz$@E6yoqi>T7T!us@C
zClu?i-V&PYA5~Y56>&%NP=YGCJLCqp!180<5s7ifQRHC-^JAj;6gS42f7jgbYO+sY
z#(Eq~30#~k2httx`1!Zxz$AOQ|EtwES8ls|+C3*Haf?4E0QoNOzKgb8opSJS(cQOL
leD?lZTo((TKCk~TzyJy&Ab$uE&i?=a002ovPDHLkV1lJ?Mk)XR
literal 0
HcmV?d00001
diff --git a/src/assets/scss/modules/visual/search_1.scss b/src/assets/scss/modules/visual/search_1.scss
index 55aaef76f..ffb46b67f 100644
--- a/src/assets/scss/modules/visual/search_1.scss
+++ b/src/assets/scss/modules/visual/search_1.scss
@@ -24,6 +24,7 @@
display: flex;
align-items: center;
margin-left:40px;
+ z-index: 10;
.second-select {
diff --git a/src/views/modules/visual/communityGovern/shijianchuli/chart.js b/src/views/modules/visual/communityGovern/shijianchuli/chart.js
new file mode 100644
index 000000000..8d19ca2d2
--- /dev/null
+++ b/src/views/modules/visual/communityGovern/shijianchuli/chart.js
@@ -0,0 +1,275 @@
+/**
+ * 绘制3d图
+ * @param pieData 总数据
+ * @param internalDiameterRatio:透明的空心占比
+ * @param distance 视角到主体的距离
+ * @param alpha 旋转角度
+ * @param pieHeight 立体的高度
+ * @param opacity 饼或者环的透明度
+ */
+ const getPie3D = (pieData, internalDiameterRatio, distance, alpha, pieHeight, opacity = 1) => {
+ const series = []
+ let sumValue = 0
+ let startValue = 0
+ let endValue = 0
+ let legendData = []
+ let legendBfb = []
+ const k = 1 - internalDiameterRatio
+ pieData.sort((a, b) => {
+ return b.value - a.value
+ })
+ // 为每一个饼图数据，生成一个 series-surface 配置
+ for (let i = 0; i < pieData.length; i++) {
+ sumValue += pieData[i].value
+ const seriesItem = {
+ name:
+ typeof pieData[i].name === 'undefined'
+ ? `series${i}`
+ : pieData[i].name,
+ type: 'surface',
+ parametric: true,
+ wireframe: {
+ show: false
+ },
+ pieData: pieData[i],
+ pieStatus: {
+ selected: false,
+ hovered: false,
+ k: k
+ },
+ center: ['10%', '50%']
+ }
+ if (typeof pieData[i].itemStyle !== 'undefined') {
+ const itemStyle = {}
+ itemStyle.color =
+ typeof pieData[i].itemStyle.color !== 'undefined'
+ ? pieData[i].itemStyle.color
+ : opacity
+ itemStyle.opacity =
+ typeof pieData[i].itemStyle.opacity !== 'undefined'
+ ? pieData[i].itemStyle.opacity
+ : opacity
+ seriesItem.itemStyle = itemStyle
+ }
+ series.push(seriesItem)
+ }
+
+ // 使用上一次遍历时，计算出的数据和 sumValue，调用 getParametricEquation 函数，
+ // 向每个 series-surface 传入不同的参数方程 series-surface.parametricEquation，也就是实现每一个扇形。
+ legendData = []
+ legendBfb = []
+ for (let i = 0; i < series.length; i++) {
+ endValue = startValue + series[i].pieData.value
+ series[i].pieData.startRatio = startValue / sumValue
+ series[i].pieData.endRatio = endValue / sumValue
+ series[i].parametricEquation = getParametricEquation(
+ series[i].pieData.startRatio,
+ series[i].pieData.endRatio,
+ false,
+ false,
+ k,
+ series[i].pieData.value
+ )
+ startValue = endValue
+ const bfb = fomatFloat(series[i].pieData.value / sumValue, 4)
+ legendData.push({
+ name: series[i].name,
+ value: bfb
+ })
+ legendBfb.push({
+ name: series[i].name,
+ value: bfb
+ })
+ }
+ const boxHeight = getHeight3D(series, pieHeight) // 通过pieHeight设定3d饼/环的高度，单位是px
+ // 准备待返回的配置项，把准备好的 legendData、series 传入。
+ const option = {
+ legend: {
+ show: false,
+ data: legendData,
+ orient: 'vertical',
+ left: 10,
+ top: 10,
+ itemGap: 10,
+ textStyle: {
+ color: '#A1E2FF'
+ },
+ icon: 'circle',
+ formatter: function (param) {
+ const item = legendBfb.filter(item => item.name === param)[0]
+ const bfs = fomatFloat(item.value * 100, 2) + '%'
+ return `${item.name} ${bfs}`
+ }
+ },
+ labelLine: {
+ show: true,
+ lineStyle: {
+ color: '#fff'
+ }
+ },
+ label: {
+ show: true,
+ position: 'outside',
+ formatter: '{b} \n{c} {d}%'
+ },
+ tooltip: {
+ backgroundColor: '#033b77',
+ borderColor: '#21f2c4',
+ textStyle: {
+ color: '#fff',
+ fontSize: 13
+ },
+ formatter: params => {
+ if (
+ params.seriesName !== 'mouseoutSeries' &&
+ params.seriesName !== 'pie2d'
+ ) {
+ const bfb = (
+ (option.series[params.seriesIndex].pieData.endRatio -
+ option.series[params.seriesIndex].pieData.startRatio) *
+ 100
+ ).toFixed(2)
+ return (
+ `${params.seriesName}
` + + `` + + `${bfb}%` + ) + } + } + }, + xAxis3D: { + min: -1, + max: 1 + }, + yAxis3D: { + min: -1, + max: 1 + }, + zAxis3D: { + min: -1, + max: 1 + }, + grid3D: { + show: false, + boxHeight: boxHeight, // 圆环的高度 + viewControl: { + // 3d效果可以放大、旋转等，请自己去查看官方配置 + alpha, // 角度 + beta: -40, + distance, // 调整视角到主体的距离，类似调整zoom + rotateSensitivity: 0, // 设置为0无法旋转 + zoomSensitivity: 0, // 设置为0无法缩放 + panSensitivity: 0, // 设置为0无法平移 + autoRotate: false // 自动旋转 + } + }, + series: series + } + return option +} + +/** + * 生成扇形的曲面参数方程，用于 series-surface.parametricEquation + */ +const getParametricEquation = (startRatio, endRatio, isSelected, isHovered, k, h) => { + // 计算 + const midRatio = (startRatio + endRatio) / 2 + const startRadian = startRatio * Math.PI * 2 + const endRadian = endRatio * Math.PI * 2 + const midRadian = midRatio * Math.PI * 2 + // 如果只有一个扇形，则不实现选中效果。 + if (startRatio === 0 && endRatio === 1) { + isSelected = false + } + // 通过扇形内径/外径的值，换算出辅助参数 k（默认值 1/3） + k = typeof k !== 'undefined' ? k : 1 / 3 + // 计算选中效果分别在 x 轴、y 轴方向上的位移（未选中，则位移均为 0） + const offsetX = isSelected ? Math.cos(midRadian) * 0.1 : 0 + const offsetY = isSelected ? Math.sin(midRadian) * 0.1 : 0 + // 计算高亮效果的放大比例（未高亮，则比例为 1） + const hoverRate = isHovered ? 1.05 : 1 + // 返回曲面参数方程 + return { + u: { + min: -Math.PI, + max: Math.PI * 3, + step: Math.PI / 32 + }, + v: { + min: 0, + max: Math.PI * 2, + step: Math.PI / 20 + }, + x: function (u, v) { + if (u < startRadian) { + return ( + offsetX + + Math.cos(startRadian) * (1 + Math.cos(v) * k) * hoverRate + ) + } + if (u > endRadian) { + return ( + offsetX + Math.cos(endRadian) * (1 + Math.cos(v) * k) * hoverRate + ) + } + return offsetX + Math.cos(u) * (1 + Math.cos(v) * k) * hoverRate + }, + y: function (u, v) { + if (u < startRadian) { + return ( + offsetY + + Math.sin(startRadian) * (1 + Math.cos(v) * k) * hoverRate + ) + } + if (u > endRadian) { + return ( + offsetY + Math.sin(endRadian) * (1 + Math.cos(v) * k) * hoverRate + ) + } + return offsetY + Math.sin(u) * (1 + Math.cos(v) * k) * hoverRate + }, + z: function (u, v) { + if (u < -Math.PI * 0.5) { + return Math.sin(u) + } + if (u > Math.PI * 2.5) { + return Math.sin(u) * h * 0.1 + } + return Math.sin(v) > 0 ? 1 * h * 0.1 : -1 + } + } +} + +/** + * 获取3d丙图的最高扇区的高度 + */ +const getHeight3D = (series, height) => { + series.sort((a, b) => { + return b.pieData.value - a.pieData.value + }) + return (height * 25) / series[0].pieData.value +} + +/** + * 格式化浮点数 + */ +const fomatFloat = (num, n) => { + let f = parseFloat(num) + if (isNaN(f)) { + return false + } + f = Math.round(num * Math.pow(10, n)) / Math.pow(10, n) // n 幂 + let s = f.toString() + let rs = s.indexOf('.') + // 判定如果是整数，增加小数点再补0 + if (rs < 0) { + rs = s.length + s += '.' + } + while (s.length <= rs + n) { + s += '0' + } + return s +} + +export { getPie3D, getParametricEquation } \ No newline at end of file diff --git a/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi copy 2.vue b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi copy 2.vue new file mode 100644 index 000000000..8ec4d06f2 --- /dev/null +++ b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi copy 2.vue @@ -0,0 +1,328 @@ + +
@@ -51,22 +51,26 @@
` + + `` + + `${bfb}%` + ) + } + } + }, + xAxis3D: { + min: -1, + max: 1 + }, + yAxis3D: { + min: -1, + max: 1 + }, + zAxis3D: { + min: -1, + max: 1 + }, + grid3D: { + show: false, + boxHeight: boxHeight, // 圆环的高度 + viewControl: { + // 3d效果可以放大、旋转等，请自己去查看官方配置 + alpha, // 角度 + beta: -40, + distance, // 调整视角到主体的距离，类似调整zoom + rotateSensitivity: 0, // 设置为0无法旋转 + zoomSensitivity: 0, // 设置为0无法缩放 + panSensitivity: 0, // 设置为0无法平移 + autoRotate: false // 自动旋转 + } + }, + series: series + } + return option +} + +/** + * 生成扇形的曲面参数方程，用于 series-surface.parametricEquation + */ +const getParametricEquation = (startRatio, endRatio, isSelected, isHovered, k, h) => { + // 计算 + const midRatio = (startRatio + endRatio) / 2 + const startRadian = startRatio * Math.PI * 2 + const endRadian = endRatio * Math.PI * 2 + const midRadian = midRatio * Math.PI * 2 + // 如果只有一个扇形，则不实现选中效果。 + if (startRatio === 0 && endRatio === 1) { + isSelected = false + } + // 通过扇形内径/外径的值，换算出辅助参数 k（默认值 1/3） + k = typeof k !== 'undefined' ? k : 1 / 3 + // 计算选中效果分别在 x 轴、y 轴方向上的位移（未选中，则位移均为 0） + const offsetX = isSelected ? Math.cos(midRadian) * 0.1 : 0 + const offsetY = isSelected ? Math.sin(midRadian) * 0.1 : 0 + // 计算高亮效果的放大比例（未高亮，则比例为 1） + const hoverRate = isHovered ? 1.05 : 1 + // 返回曲面参数方程 + return { + u: { + min: -Math.PI, + max: Math.PI * 3, + step: Math.PI / 32 + }, + v: { + min: 0, + max: Math.PI * 2, + step: Math.PI / 20 + }, + x: function (u, v) { + if (u < startRadian) { + return ( + offsetX + + Math.cos(startRadian) * (1 + Math.cos(v) * k) * hoverRate + ) + } + if (u > endRadian) { + return ( + offsetX + Math.cos(endRadian) * (1 + Math.cos(v) * k) * hoverRate + ) + } + return offsetX + Math.cos(u) * (1 + Math.cos(v) * k) * hoverRate + }, + y: function (u, v) { + if (u < startRadian) { + return ( + offsetY + + Math.sin(startRadian) * (1 + Math.cos(v) * k) * hoverRate + ) + } + if (u > endRadian) { + return ( + offsetY + Math.sin(endRadian) * (1 + Math.cos(v) * k) * hoverRate + ) + } + return offsetY + Math.sin(u) * (1 + Math.cos(v) * k) * hoverRate + }, + z: function (u, v) { + if (u < -Math.PI * 0.5) { + return Math.sin(u) + } + if (u > Math.PI * 2.5) { + return Math.sin(u) * h * 0.1 + } + return Math.sin(v) > 0 ? 1 * h * 0.1 : -1 + } + } +} + +/** + * 获取3d丙图的最高扇区的高度 + */ +const getHeight3D = (series, height) => { + series.sort((a, b) => { + return b.pieData.value - a.pieData.value + }) + return (height * 25) / series[0].pieData.value +} + +/** + * 格式化浮点数 + */ +const fomatFloat = (num, n) => { + let f = parseFloat(num) + if (isNaN(f)) { + return false + } + f = Math.round(num * Math.pow(10, n)) / Math.pow(10, n) // n 幂 + let s = f.toString() + let rs = s.indexOf('.') + // 判定如果是整数，增加小数点再补0 + if (rs < 0) { + rs = s.length + s += '.' + } + while (s.length <= rs + n) { + s += '0' + } + return s +} + +export { getPie3D, getParametricEquation } \ No newline at end of file diff --git a/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi copy 2.vue b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi copy 2.vue new file mode 100644 index 000000000..8ec4d06f2 --- /dev/null +++ b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi copy 2.vue @@ -0,0 +1,328 @@ + +
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue
index 301a60a96..a6baa08f1 100644
--- a/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue
+++ b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue
@@ -23,7 +23,7 @@
:key="item.value"
:label="item.label"
:value="item.value"
- @click.native="handleChangeDate(item.value)">
+ @click.native="handleChangeDate(item.value,true)">
-
+
+
+
+
+
-
+
+
-
+ -->
-
-
-
-
+
+
小程序通知
-
-
+
-
-
- 取 消
- 确 定
+ 取 消
+ 确 定
-
+ {{ $t("add") }}
+ {{ '查看' }}
{{ $t("update") }}
{
this.$refs.addOrUpdate.dataForm.id = id;
this.$refs.addOrUpdate.init();
@@ -274,7 +277,7 @@ export default {
// 关闭弹窗
closeDialog() {
this.addOrUpdateVisible = false;
- this.updateId = null;
+ this.dialogTitle = '';
},
// 获取所属组织列表
getFormInfo() {
diff --git a/src/views/modules/plugins/point/icpointvaccinesinoculation.vue b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
index 2fac69f94..8827f4a92 100644
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
@@ -21,17 +21,15 @@
>
- {{
+ {{
$t("query")
}}
{{ $t("add") }}
+ size="small"
+ class="diy-button--reset"
+ @click="resetSearch">重置
@@ -42,6 +40,12 @@
+ {{ $t("add") }}
Date: Fri, 24 Jun 2022 15:40:09 +0800
Subject: [PATCH 28/90] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4?=
=?UTF-8?q?=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
...pointvaccinesinoculation-add-or-update.vue | 157 +++++++++++++-----
1 file changed, 117 insertions(+), 40 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 ff61c4751..f71ec2882 100644
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
@@ -8,15 +8,15 @@
label-width="120px"
>
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
+
-
+
+
+
+
+
+
+
+
+
-
+
0) {
+ let hour_0 = Number(this.startTime[0].substring(0, 2));
+ let hour_1 = Number(this.startTime[1].substring(0, 2));
+ if (hour_0 >= 12 || hour_1 >= 12) {
+ this.$message.error("请选择00:00:00-11:59:59时间段的时间");
+ this.startTime = null;
+ return false;
+ }
+ this.dataForm.moStartTime = this.startTime[0];
+ this.dataForm.moEndTime = this.startTime[1];
+ }
+ },
+ endTimeChange() {
+ if (Array.isArray(this.endTime) && this.endTime.length > 0) {
+ let hour_0 = Number(this.endTime[0].substring(0, 2));
+ let hour_1 = Number(this.endTime[1].substring(0, 2));
+ if (hour_0 < 12 || hour_1 < 12) {
+ this.$message.error("请选择12:00:00-23:59:59时间段的时间");
+ this.endTime = null;
+ return false;
+ }
+ this.dataForm.afStartTime = this.endTime[0];
+ this.dataForm.afEndTime = this.endTime[1];
+ }
+ },
+ closeSubmit() {
+ this.$emit("closeDialog");
},
// 地图初始化函数，本例取名为init，开发者可根据实际情况定义
initMap() {
// 定义地图中心点坐标
- let _this = this
- var center = new window.TMap.LatLng(_this.dataForm.latitude, _this.dataForm.longitude);
+ 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_app"), {
center: center, // 设置地图中心点坐标
@@ -381,9 +453,9 @@ export default {
this.$refs["dataForm"].resetFields();
if (this.dataForm.id) {
this.getInfo();
- }else{
- this.dataForm.ongitude = "120.38945519"
- this.dataForm.latitude = "36.0722275"
+ } else {
+ this.dataForm.ongitude = "120.38945519";
+ this.dataForm.latitude = "36.0722275";
this.initMap();
}
});
@@ -407,26 +479,31 @@ export default {
// 表单提交
dataFormSubmitHandle: debounce(
function () {
- this.$refs['dataForm'].validate((valid) => {
+ this.$refs["dataForm"].validate((valid) => {
if (!valid) {
- return false
+ 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()
+ 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(() => {})
- })
+ .catch(() => {});
+ });
},
1000,
{ leading: true, trailing: false }
@@ -435,10 +512,10 @@ export default {
};
-
-
From 9a38d9fe0879ad24075cda340616143b92a83580 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Fri, 24 Jun 2022 16:15:14 +0800
Subject: [PATCH 30/90] =?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
---
.../point/icpointnucleicmonitoring.vue | 26 +++++++++++++++++++
.../point/icpointvaccinesinoculation.vue | 23 ++++++++++++++++
2 files changed, 49 insertions(+)
diff --git a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
index 6ce82ba59..34768d2fb 100644
--- a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
+++ b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
@@ -87,6 +87,12 @@
>导入核酸监测点数据
+ 导出
+
+
{
+
+ this.download(data, title + '.xlsx')
+ },
+ (rspMsg, data) => {
+ this.$message.error(rspMsg);
+ }
+ );
+
+ },
//重置搜索条件
resetSearch () {
this.dataForm = {
diff --git a/src/views/modules/plugins/point/icpointvaccinesinoculation.vue b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
index 8827f4a92..4acee8b93 100644
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
@@ -79,6 +79,10 @@
>导入疫苗接种点数据
+ 导出
{
+
+ this.download(data, title + '.xlsx')
+ },
+ (rspMsg, data) => {
+ this.$message.error(rspMsg);
+ }
+ );
+
+ },
//重置搜索条件
resetSearch () {
this.dataForm = {
From f620f8b1f1a81dd1b533e71e9f2cbdfdb20efe1d Mon Sep 17 00:00:00 2001
From: 123456 <17862666717>
Date: Fri, 24 Jun 2022 16:15:41 +0800
Subject: [PATCH 31/90] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E6=9F=A5=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
...icpointnucleicmonitoring-add-or-update.vue | 14 ++-
.../point/icpointnucleicmonitoring.vue | 114 ++++++++++--------
...pointvaccinesinoculation-add-or-update.vue | 27 +++--
.../point/icpointvaccinesinoculation.vue | 112 +++++++++--------
4 files changed, 157 insertions(+), 110 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 4365131be..56afb75a1 100644
--- a/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue
+++ b/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue
@@ -8,7 +8,7 @@
label-width="120px"
>
-
+
@@ -31,6 +32,7 @@
type="textarea"
:rows="2"
placeholder="请输入服务时间，如：每日开放 上午：8:00-11:30 ；下午：13:00-17:00"
+ :disabled='dialogTitle == "查看"'
>
@@ -38,6 +40,7 @@
v-model="dataForm.mobile"
placeholder="咨询电话"
:change="check_num()"
+ :disabled='dialogTitle == "查看"'
>
@@ -55,6 +58,7 @@
placeholder="例:青岛市时代国际广场"
v-model="keyWords"
style="width: 200px"
+ :disabled='dialogTitle == "查看"'
>
{{ $t("cancel") }}
- {{
+ {{
$t("confirm")
}}
@@ -203,6 +207,12 @@ export default {
mounted() {
this.getFormInfo();
},
+ props:{
+ dialogTitle:{
+ type:String,
+ default:''
+ }
+ },
methods: {
closeSubmit(){
this.$emit('closeDialog')
diff --git a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
index 6ce82ba59..d69ba9f64 100644
--- a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
+++ b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
@@ -33,15 +33,17 @@
>
- {{
- $t("query")
- }}
+ {{ $t("query") }}
- 重置
+ 重置
@@ -49,10 +51,11 @@
{{ $t("add") }} {{ $t("add") }}
{{ '查看' }} {{ "查看" }}
{{ $t("update") }}
-
+
@@ -213,7 +221,7 @@
From 69062dc5e24b91f8817379966a66e90f029d5866 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 30 Jun 2022 09:40:01 +0800
Subject: [PATCH 59/90] =?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=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/modules/plugins/point/icpointnucleicmonitoring.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
index 7d9204b7d..9638faf1e 100644
--- a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
+++ b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
@@ -11,7 +11,7 @@
ref="org"
v-model="orgIds"
:options="organizationList"
- :props="{ checkStrictly: false, multiple: false, emitPath: true }"
+ :props="{ checkStrictly: true, multiple: false, emitPath: true }"
style="width: 200px"
clearable
@change="orgChangeHandle"
From 4e3f7db0887ccaabef95daaaa478dc78222ade57 Mon Sep 17 00:00:00 2001
From: 123456 <17862666717>
Date: Thu, 30 Jun 2022 10:13:39 +0800
Subject: [PATCH 60/90] =?UTF-8?q?=E2=80=9Cfix:=E4=BF=AE=E6=94=B9=E6=A0=B7?=
=?UTF-8?q?=E5=BC=8F=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/modules/plugins/point/icpointnucleicmonitoring.vue | 4 +++-
.../modules/plugins/point/icpointvaccinesinoculation.vue | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
index 7d9204b7d..010bd3dff 100644
--- a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
+++ b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
@@ -113,7 +113,7 @@
:data="dataList"
border
@selection-change="dataListSelectionChangeHandle"
- style="width: 100%"
+ style="width: 100%;height:564px;"
>
Date: Thu, 30 Jun 2022 13:49:50 +0800
Subject: [PATCH 61/90] =?UTF-8?q?=E2=80=9Cfix:=E4=BF=AE=E6=94=B9=E6=A0=B7?=
=?UTF-8?q?=E5=BC=8F=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
...icpointnucleicmonitoring-add-or-update.vue | 113 ++++++++++--------
...pointvaccinesinoculation-add-or-update.vue | 1 +
2 files changed, 67 insertions(+), 47 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 fcf09c4b9..5af3d475e 100644
--- a/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue
+++ b/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue
@@ -1,5 +1,5 @@
-
+
-
+
@@ -32,7 +37,7 @@
type="textarea"
:rows="2"
placeholder="请输入服务时间，如：每日开放 上午：8:00-11:30 ；下午：13:00-17:00"
- :disabled='dialogTitle == "查看"'
+ :disabled="dialogTitle == '查看'"
>
@@ -40,23 +45,29 @@
v-model="dataForm.mobile"
placeholder="咨询电话"
:change="check_num()"
- :disabled='dialogTitle == "查看"'
+ :disabled="dialogTitle == '查看'"
>
查询
+ 查询
-
+
>> .el-dialog__body{
+.dialog-h >>> .el-dialog__body {
overflow: scroll;
}
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 4d5dd0d45..c0709d643 100644
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
@@ -123,7 +123,7 @@
>查询 -->
@@ -188,8 +188,8 @@ export default {
noAvailableVaccines: "1",
mobile: "",
address: "",
- longitude: "120.38945519",
- latitude: "36.0722275",
+ longitude: "",
+ latitude: "",
},
keyWords: null,
// organizationList: [],
@@ -333,14 +333,16 @@ export default {
},
// 地图初始化函数，本例取名为init，开发者可根据实际情况定义
initMap() {
+ let { latitude, longitude } = this.dataForm;
// 定义地图中心点坐标
- let _this = this;
- var center = new window.TMap.LatLng(
- _this.dataForm.latitude,
- _this.dataForm.longitude
- );
+ if (!latitude || latitude == "" || latitude == "0") {
+ latitude = 39.9088810666821;
+ longitude = 116.39743841556731;
+ }
+ console.log(latitude,longitude);
+ var center = new window.TMap.LatLng(latitude, longitude);
// 定义map变量，调用 TMap.Map() 构造函数创建地图
- map = new window.TMap.Map(document.getElementById("map_app"), {
+ map = new window.TMap.Map(document.getElementById("map_add"), {
center: center, // 设置地图中心点坐标
zoom: 17.2, // 设置地图缩放级别
pitch: 43.5, // 设置俯仰角
@@ -353,12 +355,14 @@ export default {
geometries: [],
});
infoWindowList = Array(10);
+
geocoder = new TMap.service.Geocoder(); // 新建一个正逆地址解析类
+
// 监听地图平移结束
map.on("panend", () => {
this.handleMoveCenter();
});
- this.handleMoveCenter();
+ // this.handleMoveCenter()
this.convert();
},
handleMoveCenter() {
@@ -381,7 +385,6 @@ export default {
// 在地图显示范围内以给定的关键字搜索地点
search
.searchRectangle({
- // keyword: this.keyWords,
keyword: this.dataForm.address,
bounds: map.getBounds(),
})
@@ -391,6 +394,7 @@ export default {
const {
location: { lat, lng },
} = data[0];
+
map.setCenter(new TMap.LatLng(lat, lng));
this.setMarker(lat, lng);
this.dataForm.latitude = lat;
@@ -424,8 +428,14 @@ export default {
geocoder
.getAddress({ location: location }) // 将给定的坐标位置转换为地址
.then((result) => {
- this.dataForm.address = result.result.address;
+ this.dataForm.address =
+ this.dataForm.address !== "" &&
+ this.dataForm.address !== null &&
+ (this.dataForm.longitude === "" || this.dataForm.longitude === null)
+ ? this.dataForm.address
+ : result.result.address;
// 显示搜索到的地址
+ console.log(this.dataForm.address);
});
},
@@ -461,8 +471,6 @@ export default {
if (this.dataForm.id) {
this.getInfo();
} else {
- this.dataForm.longitude = "120.38945519";
- this.dataForm.latitude = "36.0722275";
this.initMap();
}
});
@@ -481,10 +489,6 @@ export default {
};
this.morningTime = [res.data.moStartTime,res.data.moEndTime]
this.afterTime = [res.data.afStartTime,res.data.afEndTime]
- if(!this.dataForm.longitude && !this.dataForm.latitude){
- this.dataForm.longitude = "120.38945519"
- this.dataForm.latitude = "36.0722275"
- }
this.initMap();
})
.catch(() => {});
diff --git a/src/views/modules/plugins/point/icpointvaccinesinoculation.vue b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
index 2ef3f5d15..697c44da8 100644
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
@@ -102,13 +102,13 @@
v-loading="dataListLoading"
:data="dataList"
border
- @selection-change="dataListSelectionChangeHandle"
- style="width: 100%;height:564px;"
+ style="width: 100%; height: 564px"
>
-
-
+
+
From 1369d6a202497b89ce0e3e23e8d08d2936c5feb7 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 30 Jun 2022 15:28:03 +0800
Subject: [PATCH 67/90] =?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=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../icpointvaccinesinoculation-add-or-update.vue | 14 ++++++++------
1 file changed, 8 insertions(+), 6 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 763ad21f6..935730152 100644
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
@@ -185,7 +185,7 @@ export default {
moEndTime: "",
afStartTime: "",
afEndTime: "",
- noAvailableVaccines: "1",
+ noAvailableVaccines: '1',
mobile: "",
address: "",
longitude: "120.38945519",
@@ -216,7 +216,7 @@ export default {
],
inoculationDate: [
{
- required: true,
+ required: this.dataForm.noAvailableVaccines === '2',
message: this.$t("validate.required"),
trigger: "blur",
},
@@ -479,8 +479,10 @@ export default {
...this.dataForm,
...res.data,
};
- this.morningTime = [res.data.moStartTime,res.data.moEndTime]
- this.afterTime = [res.data.afStartTime,res.data.afEndTime]
+ if(res.data.moStartTime !== ''){
+ this.morningTime = [res.data.moStartTime,res.data.moEndTime]
+ this.afterTime = [res.data.afStartTime,res.data.afEndTime]
+ }
if(!this.dataForm.longitude && !this.dataForm.latitude){
this.dataForm.longitude = "120.38945519"
this.dataForm.latitude = "36.0722275"
@@ -496,11 +498,11 @@ export default {
if (!valid) {
return false;
}
- if(this.morningTime === null && this.dataForm.noAvailableVaccines !== '1'){
+ if(this.morningTime === null && this.dataForm.noAvailableVaccines === '2'){
this.$message.error('请填写上午接种时间');
return false
}
- if(this.afterTime === null && this.dataForm.noAvailableVaccines !== '1'){
+ if(this.afterTime === null && this.dataForm.noAvailableVaccines === '2'){
this.$message.error('请填写下午接种时间');
return false
}
From 33c90ee0a9caa07da8f4b50c7d849d3170f5e3d7 Mon Sep 17 00:00:00 2001
From: HAHA
Date: Thu, 30 Jun 2022 15:35:16 +0800
Subject: [PATCH 68/90] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9F=A5=E7=9C=8B?=
=?UTF-8?q?=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/modules/cabaseinfo/wghSjxxb.vue | 158 +++++++++++++++++-----
1 file changed, 126 insertions(+), 32 deletions(-)
diff --git a/src/views/modules/cabaseinfo/wghSjxxb.vue b/src/views/modules/cabaseinfo/wghSjxxb.vue
index e931efe97..328ca57e7 100644
--- a/src/views/modules/cabaseinfo/wghSjxxb.vue
+++ b/src/views/modules/cabaseinfo/wghSjxxb.vue
@@ -50,60 +50,67 @@
width="50"
>
-
-
-
+ :show-overflow-tooltip="true"
+ >
+ :show-overflow-tooltip="true">
+
+
-
+
去处置
+ @click="getDetailById(row)"
+ >查看
+ 去处置
@@ -119,6 +126,66 @@
>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取 消
+
+
+
@@ -140,14 +207,41 @@ export default {
communityname:"",
statusname:""
},
- optionsG:[]
+ detailForm:{
+ infosourcename: "",
+ infotypename: "",
+ communityname:"",
+ description:"",
+ address:"",
+ statusname:"",
+ streetname:"",
+ },
+ optionsG:[],
+ dialogVisible: false
};
},
methods:{
-
- },
-created(){
- this.getGridList('query')
+ getDetailById(row){
+ this.dialogVisible = true
+ this.$http.post(`/opendata/wghSjxxb/sjxx/getDetailById`,{
+ taskid:row.row.taskid
+ }).then(resp => {
+ this.detailForm = resp.data.data
+ }).catch(error => {
+ this.$message.error(error)
+ })
+ },
+ handleClose(done) {
+ this.$confirm('确认关闭？')
+ .then(_ => {
+ done();
+ dialogVisible = false
+ })
+ .catch(_ => {});
+ },
+ jumplink(){
+ window.open('http://120.221.72.15:8089/sbwgh/bizsys/login.htm','_blank')
+ }
},
};
From 18c5d1a732f62831780c9b8e9e9d3b95c8001a49 Mon Sep 17 00:00:00 2001
From: 123456 <17862666717>
Date: Thu, 30 Jun 2022 15:58:28 +0800
Subject: [PATCH 69/90] =?UTF-8?q?=E2=80=9Cfix:=E4=BF=AE=E6=94=B9=E6=97=B6?=
=?UTF-8?q?=E9=97=B4=E6=A0=B7=E5=BC=8F=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
...pointvaccinesinoculation-add-or-update.vue | 230 ++++++++++--------
1 file changed, 131 insertions(+), 99 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 f203ef84c..15dce74f1 100644
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
@@ -1,5 +1,5 @@
-
{{ scope.row.moStartTime }} - {{ scope.row.moEndTime }}
+
+
{{ scope.row.afStartTime }} - {{ scope.row.afEndTime }}
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
暂无疫苗
-
查询
+ style="margin-left: 10px"
+ type="primary"
+ size="small"
+ @click="handleSearchMap"
+ >查询
{{ $t("cancel") }}
- {{
- $t("confirm")
- }}
+ {{ $t("confirm") }}
@@ -185,7 +196,7 @@ export default {
moEndTime: "",
afStartTime: "",
afEndTime: "",
- noAvailableVaccines: '1',
+ noAvailableVaccines: "1",
mobile: "",
address: "",
longitude: "",
@@ -216,7 +227,7 @@ export default {
],
inoculationDate: [
{
- required: this.dataForm.noAvailableVaccines === '2',
+ required: this.dataForm.noAvailableVaccines === "2",
message: this.$t("validate.required"),
trigger: "blur",
},
@@ -259,11 +270,11 @@ export default {
};
},
},
- props:{
- dialogTitle:{
- type:String,
- default:''
- }
+ props: {
+ dialogTitle: {
+ type: String,
+ default: "",
+ },
},
methods: {
startTimeChange() {
@@ -280,14 +291,14 @@ export default {
return false;
}
if (hour_0 == 12) {
- if(minute_0 > 0 || second_0 > 0){
+ if (minute_0 > 0 || second_0 > 0) {
this.$message.error("请选择00:00-12:00时间段的时间");
this.morningTime = null;
return false;
}
}
if (hour_1 == 12) {
- if(minute_1 > 0 || second_1 > 0){
+ if (minute_1 > 0 || second_1 > 0) {
this.$message.error("请选择00:00-12:00时间段的时间");
this.morningTime = null;
return false;
@@ -311,14 +322,14 @@ export default {
return false;
}
if (hour_0 == 12) {
- if(minute_0 == 0 && second_0 == 0){
+ if (minute_0 == 0 && second_0 == 0) {
this.$message.error("请选择12:01-23:59时间段的时间");
this.afterTime = null;
return false;
}
}
if (hour_1 == 12) {
- if(minute_1 == 0 && second_1 == 0){
+ if (minute_1 == 0 && second_1 == 0) {
this.$message.error("请选择12:01-23:59时间段的时间");
this.afterTime = null;
return false;
@@ -339,7 +350,7 @@ export default {
latitude = 39.9088810666821;
longitude = 116.39743841556731;
}
- console.log(latitude,longitude);
+ console.log(latitude, longitude);
var center = new window.TMap.LatLng(latitude, longitude);
// 定义map变量，调用 TMap.Map() 构造函数创建地图
map = new window.TMap.Map(document.getElementById("map_add"), {
@@ -487,15 +498,15 @@ export default {
...this.dataForm,
...res.data,
};
- this.morningTime = [res.data.moStartTime,res.data.moEndTime]
- this.afterTime = [res.data.afStartTime,res.data.afEndTime]
- if(res.data.moStartTime !== ''){
- this.morningTime = [res.data.moStartTime,res.data.moEndTime]
- this.afterTime = [res.data.afStartTime,res.data.afEndTime]
+ this.morningTime = [res.data.moStartTime, res.data.moEndTime];
+ this.afterTime = [res.data.afStartTime, res.data.afEndTime];
+ if (res.data.moStartTime !== "") {
+ this.morningTime = [res.data.moStartTime, res.data.moEndTime];
+ this.afterTime = [res.data.afStartTime, res.data.afEndTime];
}
- if(!this.dataForm.longitude && !this.dataForm.latitude){
- this.dataForm.longitude = "120.38945519"
- this.dataForm.latitude = "36.0722275"
+ if (!this.dataForm.longitude && !this.dataForm.latitude) {
+ this.dataForm.longitude = "120.38945519";
+ this.dataForm.latitude = "36.0722275";
}
this.initMap();
})
@@ -508,13 +519,24 @@ export default {
if (!valid) {
return false;
}
- if(this.morningTime === null && this.dataForm.noAvailableVaccines === '2'){
- this.$message.error('请填写上午接种时间');
- return false
+ if(!this.dataForm.inoculationDate &&
+ this.dataForm.noAvailableVaccines === "2"){
+ this.$message.error("请选择接种日期");
+ return false;
}
- if(this.afterTime === null && this.dataForm.noAvailableVaccines === '2'){
- this.$message.error('请填写下午接种时间');
- return false
+ if (
+ this.morningTime === null &&
+ this.dataForm.noAvailableVaccines === "2"
+ ) {
+ this.$message.error("请填写上午接种时间");
+ return false;
+ }
+ if (
+ this.afterTime === null &&
+ this.dataForm.noAvailableVaccines === "2"
+ ) {
+ this.$message.error("请填写下午接种时间");
+ return false;
}
this.$http[!this.dataForm.id ? "post" : "put"](
"/epmetuser/icPointVaccinesInoculation/",
@@ -522,7 +544,9 @@ export default {
)
.then(({ data: res }) => {
if (res.code !== 0) {
- return this.$message.error(res.internalMsg ? res.internalMsg : res.msg);
+ return this.$message.error(
+ res.internalMsg ? res.internalMsg : res.msg
+ );
}
this.$message({
message: this.$t("prompt.success"),
@@ -545,6 +569,15 @@ export default {
};
From a1411f52ed38fc7734250549b73ab99911b9558e Mon Sep 17 00:00:00 2001
From: 123456 <17862666717>
Date: Thu, 30 Jun 2022 16:19:13 +0800
Subject: [PATCH 70/90] =?UTF-8?q?=E2=80=9Cfix=EF=BC=9A=E4=BF=AE=E6=94=B9?=
=?UTF-8?q?=E6=97=B6=E9=97=B4=E7=BB=84=E4=BB=B6=E6=A0=B7=E5=BC=8F=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/modules/plugins/point/icpointnucleicmonitoring.vue | 1 -
.../point/icpointvaccinesinoculation-add-or-update.vue | 4 +++-
.../modules/plugins/point/icpointvaccinesinoculation.vue | 1 -
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
index ecf6cf110..00202d023 100644
--- a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
+++ b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
@@ -182,7 +182,6 @@
Date: Mon, 4 Jul 2022 10:48:26 +0800
Subject: [PATCH 87/90] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=9C=B0=E5=9B=BE?=
=?UTF-8?q?=E7=BB=8F=E7=BA=AC=E5=BA=A6=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/modules/base/organization/organization.vue | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index d3cd78337..8860180f7 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -2188,7 +2188,12 @@ export default {
document.getElementById("con").innerHTML = '当前点击坐标为：'
var position = document.getElementById("pos");
- var center = new window.TMap.LatLng(this.latitude, this.longitude);//设置中心点坐标
+ if(this.latitude === null || this.latitude === "" || this.longitude === null || this.longitude === ""){
+ var center = new window.TMap.LatLng(36.116796, 120.339959);
+ }else {
+ var center = new window.TMap.LatLng(this.latitude, this.longitude);//设置中心点坐标
+ }
+
//初始化地图
var map = new window.TMap.Map("con", {
center: center
From 39e6708f5a071125c6e9d68cb817a9c4bf183541 Mon Sep 17 00:00:00 2001
From: zhaoyongnian <541231643@qq.com>
Date: Tue, 5 Jul 2022 13:35:46 +0800
Subject: [PATCH 88/90] bug
---
.../modules/visual/communityParty/gridParty.vue | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/src/views/modules/visual/communityParty/gridParty.vue b/src/views/modules/visual/communityParty/gridParty.vue
index 65d0919c6..4ea08dbe4 100644
--- a/src/views/modules/visual/communityParty/gridParty.vue
+++ b/src/views/modules/visual/communityParty/gridParty.vue
@@ -166,7 +166,7 @@ export default {
await this.loadOrgData()
// this.loadMap()
this.getMapData()
- await this.getWorkUserInfo()
+ // await this.getWorkUserInfo()
// this.isfirstInit = false
// 地图相关end
},
@@ -458,6 +458,16 @@ export default {
if (code === 0) {
this.orgData = data
+ this.agencyInfo = data //之前获取用户信息的接口不用了。。。
+ if (!this.agencyInfo.latitude) {
+ this.agencyInfo.latitude = 36.072227
+ }
+ if (!this.agencyInfo.longitude) {
+ this.agencyInfo.longitude = 120.389455
+ }
+ if (!this.agencyInfo.level) {
+ this.agencyInfo.level = 'street'
+ }
this.orgId = this.orgData.id
this.orgType = this.orgData.level
this.parentPolygon = []
From b20ce235ee4faa2506d94d41102a261a85700099 Mon Sep 17 00:00:00 2001
From: YUJT
Date: Tue, 5 Jul 2022 15:59:03 +0800
Subject: [PATCH 89/90] append
---
src/views/modules/visual/components/screen-map/index.vue | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/src/views/modules/visual/components/screen-map/index.vue b/src/views/modules/visual/components/screen-map/index.vue
index f13b09158..21c95ff9e 100644
--- a/src/views/modules/visual/components/screen-map/index.vue
+++ b/src/views/modules/visual/components/screen-map/index.vue
@@ -189,13 +189,8 @@ const vueGis = {
],
//icon图标样式
iconUrlArray: [],
-<<<<<<< HEAD
- iconTextColor: "#ffffff",
- distanceMax: null, //显示的坐标距离中心点的范围
-=======
iconTextColor: '#ffffff',
distanceMax: null,//显示的坐标距离中心点的范围
->>>>>>> feature/dev_party_mange
input_lat: null,
input_lon: null,
@@ -925,8 +920,4 @@ export default vueGis;
// color: rgba(1, 17, 104, 1);
color: #fff;
}
-<<<<<<< HEAD
-=======
-
->>>>>>> feature/dev_party_mange
From 6c8a9422a562fee656304d3a0c13e3527e0c0781 Mon Sep 17 00:00:00 2001
From: HAHA
Date: Tue, 5 Jul 2022 16:41:54 +0800
Subject: [PATCH 90/90] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/modules/cabaseinfo/wghSjxxb.vue | 131 ++++++++++------------
1 file changed, 58 insertions(+), 73 deletions(-)
diff --git a/src/views/modules/cabaseinfo/wghSjxxb.vue b/src/views/modules/cabaseinfo/wghSjxxb.vue
index d9721d9bb..d3a9c1030 100644
--- a/src/views/modules/cabaseinfo/wghSjxxb.vue
+++ b/src/views/modules/cabaseinfo/wghSjxxb.vue
@@ -2,31 +2,31 @@
-
+
-
+
-
+
-
+
@@ -50,54 +50,47 @@
width="50"
>
-
-
-
-
+
+
-
+
-
+
-
+
-
-
-
-
-
+
-
+
- 取 消
+ 取 消
@@ -197,25 +183,24 @@ export default {
data() {
return {
mixinViewModuleOptions: {
- getDataListURL: "/opendata/wghSjxxb/todo/page",
+ getDataListURL: "/opendata/wghSjxx/todo/wghSjxxPage",
getDataListIsPage: true,
deleteURL: "",
deleteIsBatch: true,
},
dataForm: {
- infosourcename: "",
- infotypename: "",
- communityname:"",
- statusname:""
+ wgymc: "",
+ ssjdbq: "",
+ sssqbq:"",
+ hcyj:""
},
detailForm:{
- infosourcename: "",
- infotypename: "",
- communityname:"",
- description:"",
- address:"",
- statusname:"",
- streetname:"",
+ wgymc: "",
+ ssjdbq: "",
+ sssqbq:"",
+ hcyj:"",
+ hcsj:"",
+ sjms:"",
},
optionsG:[],
dialogVisible: false
@@ -224,8 +209,8 @@ export default {
methods:{
getDetailById(row){
this.dialogVisible = true
- this.$http.post(`/opendata/wghSjxxb/sjxx/getDetailById`,{
- taskid:row.row.taskid
+ this.$http.post(`/opendata/wghSjxx/getWghSjxxDetail`,{
+ recid:row.row.recid
}).then(resp => {
this.detailForm = resp.data.data
}).catch(error => {
+
+
+
+
+
+
+
+ 上午
+
+
+
+
+ 下午
+
+
+
+
-
Date: Thu, 30 Jun 2022 16:19:55 +0800
Subject: [PATCH 71/90] =?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=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../point/icpointvaccinesinoculation-add-or-update.vue | 8 +-------
1 file changed, 1 insertion(+), 7 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 15dce74f1..4e9ed7dec 100644
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
@@ -32,6 +32,7 @@
v-model="dataForm.inoculationDate"
value-format="yyyy-MM-dd"
type="date"
+ :clearable="false"
placeholder="选择日期"
:disabled="dialogTitle == '查看'"
>
@@ -225,13 +226,6 @@ export default {
trigger: "blur",
},
],
- inoculationDate: [
- {
- required: this.dataForm.noAvailableVaccines === "2",
- message: this.$t("validate.required"),
- trigger: "blur",
- },
- ],
noAvailableVaccines: [
{
required: true,
From 20b86edfa9c8881e66661b59fc8257435fdd98c0 Mon Sep 17 00:00:00 2001
From: HAHA
Date: Thu, 30 Jun 2022 16:21:26 +0800
Subject: [PATCH 72/90] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E9=95=BF?=
=?UTF-8?q?=E8=BE=93=E5=85=A5=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/modules/cabaseinfo/wghSjxxb.vue | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/views/modules/cabaseinfo/wghSjxxb.vue b/src/views/modules/cabaseinfo/wghSjxxb.vue
index 328ca57e7..d9721d9bb 100644
--- a/src/views/modules/cabaseinfo/wghSjxxb.vue
+++ b/src/views/modules/cabaseinfo/wghSjxxb.vue
@@ -155,6 +155,7 @@
From 3b4bcbe2e5e60c919c856dc09f9760362d0e9ec6 Mon Sep 17 00:00:00 2001
From: 123456 <17862666717>
Date: Thu, 30 Jun 2022 16:28:50 +0800
Subject: [PATCH 73/90] =?UTF-8?q?=E2=80=9Cfix=EF=BC=9A=E4=BF=AE=E6=94=B9?=
=?UTF-8?q?=E6=97=B6=E9=97=B4=E7=BB=84=E4=BB=B6=E6=A0=B7=E5=BC=8F=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../point/icpointvaccinesinoculation-add-or-update.vue | 6 +++---
1 file changed, 3 insertions(+), 3 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 6090ce2b8..81112138f 100644
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
@@ -27,7 +27,7 @@
+
+
+
+
+ 生成
+
添加物业
+
+
{
- this.$refs.ref_form.initForm('detail', row, this.agencyObj)
+ this.$refs.ref_form.initForm('detail', _data, this.agencyObj)
})
},
@@ -371,7 +372,18 @@ export default {
this.$refs.ref_form.initForm('add', null, this.agencyObj)
})
},
+ async detail (row) {
+ const url = "/gov/org/houseInformation/neighborhoodDetail/" + row.neighborHoodId
+
+ const { data, code, msg } = await requestPost(url)
+
+ if (code === 0) {
+ return data
+ } else {
+ this.$message.error(msg)
+ }
+ },
// 补全一房一码点击事件
async handleYhymInfo () {
this.yhymLoading = true
@@ -400,11 +412,12 @@ export default {
}
},
- handleEdit (row) {
+ async handleEdit (row) {
this.formTitle = '修改小区'
this.formShow = true
+ const _data = await this.detail(row)
this.$nextTick(() => {
- this.$refs.ref_form.initForm('edit', row, this.agencyObj)
+ this.$refs.ref_form.initForm('edit', _data, this.agencyObj)
})
},
diff --git a/src/views/modules/base/community/roomForm.vue b/src/views/modules/base/community/roomForm.vue
index 8f564f371..3733735cf 100644
--- a/src/views/modules/base/community/roomForm.vue
+++ b/src/views/modules/base/community/roomForm.vue
@@ -11,7 +11,7 @@
- {{ dataForm.neighborHoodName }}{{dataForm.buildingName}}
+ {{ agencyObj.neighborHoodName }}-{{agencyObj.label}}
-
+
+
+
+
+ 生成
+
下载
+
+
@@ -71,6 +72,7 @@
:disabled="dialogTitle == '查看'"
:clearable="false"
:editable="false"
+ style="width: 63%"
>
diff --git a/src/views/modules/plugins/point/icpointvaccinesinoculation.vue b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
index 697c44da8..803d35558 100644
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
@@ -197,7 +197,6 @@
-
+
div{
+.time-block > div {
margin-bottom: 10px;
}
.time-block span {
From 33374f849ddac432bcbaf0833c945d8716f009d2 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 30 Jun 2022 17:09:37 +0800
Subject: [PATCH 79/90] =?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=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../modules/plugins/point/icpointvaccinesinoculation.vue | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/views/modules/plugins/point/icpointvaccinesinoculation.vue b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
index 803d35558..a6f06965a 100644
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
@@ -130,7 +130,7 @@
align="center"
>
@@ -139,7 +139,7 @@
@@ -151,6 +151,7 @@
prop="noAvailableVaccines"
label="暂无疫苗"
header-align="center"
+ width="80"
align="center"
>
Date: Thu, 30 Jun 2022 17:15:28 +0800
Subject: [PATCH 80/90] =?UTF-8?q?=E2=80=9Cfix:=E4=BF=AE=E6=94=B9=E8=A1=A8?=
=?UTF-8?q?=E6=A0=BC=E6=A0=B7=E5=BC=8F=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/modules/plugins/point/icpointnucleicmonitoring.vue | 4 ++++
.../modules/plugins/point/icpointvaccinesinoculation.vue | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
index 00202d023..dc9a9d1a0 100644
--- a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
+++ b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
@@ -112,6 +112,7 @@
v-loading="dataListLoading"
:data="dataList"
border
+ :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
style="width: 100%; height: 564px"
>{{ "查看" }}
{{ scope.row.longitude === null ? "待完善" : "修改" }}
{{ $t("delete") }}
diff --git a/src/views/modules/plugins/point/icpointvaccinesinoculation.vue b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
index 803d35558..939f06e73 100644
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
@@ -102,6 +102,7 @@
v-loading="dataListLoading"
:data="dataList"
border
+ :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
style="width: 100%; height: 564px"
>
{{ "查看" }}
{{ scope.row.longitude === null ? "待完善" : "修改" }}
{{ $t("delete") }}
From ca07490eda657d9280d9a4afdac01edaff3bf89c Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 30 Jun 2022 17:22:32 +0800
Subject: [PATCH 81/90] =?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=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../modules/plugins/point/icpointvaccinesinoculation.vue | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/views/modules/plugins/point/icpointvaccinesinoculation.vue b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
index 1e543d118..639d2bd32 100644
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
@@ -152,13 +152,14 @@
prop="noAvailableVaccines"
label="暂无疫苗"
header-align="center"
- width="80"
+ width="100"
align="center"
>
Date: Thu, 30 Jun 2022 18:52:58 +0800
Subject: [PATCH 82/90] =?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=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../point/icpointnucleicmonitoring-add-or-update.vue | 6 +++---
1 file changed, 3 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 c75823246..d9cd4d37b 100644
--- a/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue
+++ b/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue
@@ -224,7 +224,7 @@ export default {
};
},
},
- mounted() {
+ created() {
this.getFormInfo();
},
props: {
@@ -371,7 +371,7 @@ export default {
this.$http
.post(`/gov/org/agency/communityListByCustomerId`)
.then(({ data: res }) => {
- if (tMapres.code !== 0) {
+ if (res.code !== 0) {
return this.$message.error(res.msg);
}
this.organizationList = res.data;
@@ -384,7 +384,7 @@ export default {
if (this.dataForm.id) {
this.getInfo();
} else {
-
+
this.initMap();
}
});
From e36ededcba423897fa404794624a0edf541c8085 Mon Sep 17 00:00:00 2001
From: 123456 <17862666717>
Date: Thu, 30 Jun 2022 19:37:33 +0800
Subject: [PATCH 83/90] =?UTF-8?q?=E2=80=9Cfix:=E7=A7=80=E9=98=BF=E8=B4=B5?=
=?UTF-8?q?=E5=88=86=E9=A1=B5=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../point/icpointnucleicmonitoring.vue | 56 ++++++++++++-----
.../point/icpointvaccinesinoculation.vue | 60 ++++++++++++++-----
2 files changed, 85 insertions(+), 31 deletions(-)
diff --git a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
index dc9a9d1a0..e9bf84f90 100644
--- a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
+++ b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
@@ -112,7 +112,7 @@
v-loading="dataListLoading"
:data="dataList"
border
- :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+ :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
style="width: 100%; height: 564px"
>
-
-
+
+
-
-
+
+
Date: Fri, 1 Jul 2022 09:12:17 +0800
Subject: [PATCH 84/90] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E8=A1=A8=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../modules/plugins/point/icpointnucleicmonitoring.vue | 1 +
.../modules/plugins/point/icpointvaccinesinoculation.vue | 8 ++------
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
index e9bf84f90..2be802a0e 100644
--- a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
+++ b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
@@ -257,6 +257,7 @@ export default {
pageSize: 20,
pageNo: 0,
total: 0,
+ dataListLoading:false
};
},
components: {
diff --git a/src/views/modules/plugins/point/icpointvaccinesinoculation.vue b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
index f63a83e96..d80eff424 100644
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
@@ -102,6 +102,7 @@
v-loading="dataListLoading"
:data="dataList"
border
+ :row-key="row => { return row.id.toString() }"
:header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
style="width: 100%; height: 564px;overflow: auto;"
>
@@ -112,12 +113,6 @@
type="index"
width="50"
>
-
-
-
-
-
-
Date: Fri, 1 Jul 2022 09:21:44 +0800
Subject: [PATCH 85/90] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E8=A1=A8=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/modules/plugins/point/icpointnucleicmonitoring.vue | 4 ++--
.../modules/plugins/point/icpointvaccinesinoculation.vue | 3 +--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
index 2be802a0e..e84251927 100644
--- a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
+++ b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
@@ -112,6 +112,7 @@
v-loading="dataListLoading"
:data="dataList"
border
+ :row-key="row => { return row.id.toString() }"
:header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
style="width: 100%; height: 564px"
>
Date: Fri, 1 Jul 2022 10:43:28 +0800
Subject: [PATCH 86/90] =?UTF-8?q?=E5=B0=8F=E5=8C=BA=EF=BC=8C=E6=A5=BC?=
=?UTF-8?q?=E6=A0=8B=E7=BC=96=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../modules/base/community/buildForm.vue | 61 ++++++++++++++++++-
.../modules/base/community/buildTable.vue | 22 +++++--
.../modules/base/community/communityForm.vue | 45 +++++++++++++-
.../modules/base/community/communityTable.vue | 21 +++++--
src/views/modules/base/community/roomForm.vue | 49 +++++++++++++--
5 files changed, 182 insertions(+), 16 deletions(-)
diff --git a/src/views/modules/base/community/buildForm.vue b/src/views/modules/base/community/buildForm.vue
index 5a9c703f2..ffaf80203 100644
--- a/src/views/modules/base/community/buildForm.vue
+++ b/src/views/modules/base/community/buildForm.vue
@@ -24,6 +24,21 @@
v-model="dataForm.buildingName">
+
+
+
+
+ 生成
+
+
+
+
+
+
@@ -169,9 +204,13 @@ export default {
totalUnitNum: 1,//单元数
totalFloorNum: 0,//层数
totalHouseNum: 0,//总户数
+ realPerson: 0,
buildingLeaderName: '',//楼长姓名
buildingLeaderMobile: '',//楼长电话
type: '',//房屋类型
+ coordinatePosition: '',
+ sysCoding: '',
+ coding: '',
location: '', //坐标位置
longitude: '', //经度
latitude: '' //纬度
@@ -199,7 +238,8 @@ export default {
if (row) {
this.dataForm = JSON.parse(JSON.stringify(row))
this.buildingId = this.dataForm.buildingId
- this.buildType = this.dataForm.buildingTypeKey
+ // this.buildType = this.dataForm.buildingTypeKey
+ this.buildType = this.dataForm.type
map.setCenter(new TMap.LatLng(this.dataForm.latitude, this.dataForm.longitude))
this.setMarker(this.dataForm.latitude, this.dataForm.longitude)
@@ -226,6 +266,18 @@ export default {
})
},
+ async handleCode() {
+ const { data, code, msg } = await requestPost(
+ "/gov/org/houseInformation/getBuildingCoding/" + this.dataForm.neighborHoodId);
+ console.log('data----', data)
+ console.log('code----', code)
+ console.log('msg----', msg)
+ if (msg == "success" && code == 0) {
+ this.dataForm.coding = data.coding
+ this.dataForm.sysCoding = data.sysCoding
+
+ }
+ },
async addBuild () {
if (this.dataForm.buildingLeaderMobile) {
const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
@@ -328,12 +380,14 @@ export default {
let { data } = result
if (Array.isArray(data) && data.length > 0) {
const {
- location: { lat, lng }
+ location: { lat, lng },
+ address
} = data[0]
map.setCenter(new TMap.LatLng(lat, lng))
this.setMarker(lat, lng)
this.dataForm.latitude = lat
this.dataForm.longitude = lng
+ this.dataForm.coordinatePosition = address
} else {
this.$message.error('未检索到相关位置坐标')
}
@@ -405,6 +459,9 @@ export default {
totalUnitNum: [
{ required: true, message: '单元数不能为空', trigger: 'blur' }
],
+ coding: [
+ { required: true, message: '楼栋编码不能为空', trigger: 'blur' }
+ ]
// totalFloorNum: [
// { required: true, message: '层数不能为空', trigger: 'blur' }
// ],
diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue
index 68466e237..486dc9ec7 100644
--- a/src/views/modules/base/community/buildTable.vue
+++ b/src/views/modules/base/community/buildTable.vue
@@ -360,11 +360,12 @@ export default {
this.formShow = false
},
- handleDetail (row) {
+ async handleDetail (row) {
this.formTitle = '楼栋详情'
this.formShow = true
+ const _data = await this.detail(row)
this.$nextTick(() => {
- this.$refs.ref_form.initForm('detail', row, this.agencyObj)
+ this.$refs.ref_form.initForm('detail', _data, this.agencyObj)
})
},
@@ -376,11 +377,12 @@ export default {
})
},
- handleEdit (row) {
+ async handleEdit (row) {
this.formTitle = '修改楼栋'
this.formShow = true
+ const _data = await this.detail(row)
this.$nextTick(() => {
- this.$refs.ref_form.initForm('edit', row, this.agencyObj)
+ this.$refs.ref_form.initForm('edit', _data, this.agencyObj)
})
},
@@ -508,6 +510,18 @@ export default {
this.$message.error(msg)
}
},
+ async detail (row) {
+ const url = "/gov/org/houseInformation/getBuildingDetail/" + row.buildingId
+
+
+ const { data, code, msg } = await requestPost(url)
+
+ if (code === 0) {
+ return data
+ } else {
+ this.$message.error(msg)
+ }
+ },
//导出表格
async handleExport () {
diff --git a/src/views/modules/base/community/communityForm.vue b/src/views/modules/base/community/communityForm.vue
index 9dd8aef98..bf588d58c 100644
--- a/src/views/modules/base/community/communityForm.vue
+++ b/src/views/modules/base/community/communityForm.vue
@@ -41,6 +41,21 @@
v-model="dataForm.neighborHoodName">
+
@@ -72,7 +72,7 @@
:disabled="dialogTitle == '查看'"
:clearable="false"
:editable="false"
- style="width: 63%"
+ style="width: 56%"
>
From 057a116ddb35a9a65a3ab0fb7b6f1217fe07510e Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 30 Jun 2022 16:31:35 +0800
Subject: [PATCH 74/90] =?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=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../plugins/point/icpointvaccinesinoculation-add-or-update.vue | 2 --
1 file changed, 2 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 3c8f663de..2d1c3c763 100644
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
@@ -494,8 +494,6 @@ export default {
...this.dataForm,
...res.data,
};
- this.morningTime = [res.data.moStartTime, res.data.moEndTime];
- this.afterTime = [res.data.afStartTime, res.data.afEndTime];
if (res.data.moStartTime !== "") {
this.morningTime = [res.data.moStartTime, res.data.moEndTime];
this.afterTime = [res.data.afStartTime, res.data.afEndTime];
From cfdbb1d8cc3b99e3e4302c0679c762f281738d54 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 30 Jun 2022 16:41:05 +0800
Subject: [PATCH 75/90] =?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=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../plugins/point/icpointvaccinesinoculation-add-or-update.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 4f6a5c183..a60e71d64 100644
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
@@ -494,7 +494,7 @@ export default {
...this.dataForm,
...res.data,
};
- if (res.data.moStartTime !== "") {
+ if (res.data.moStartTime !== "" && res.data.afStartTime !== "") {
this.morningTime = [res.data.moStartTime, res.data.moEndTime];
this.afterTime = [res.data.afStartTime, res.data.afEndTime];
}
From e63d0f50440034141c2267e498dbadb357dd10fb Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 30 Jun 2022 16:47:08 +0800
Subject: [PATCH 76/90] =?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=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../point/icpointvaccinesinoculation-add-or-update.vue | 6 ++++--
1 file changed, 4 insertions(+), 2 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 a60e71d64..050adabb8 100644
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
@@ -494,10 +494,12 @@ export default {
...this.dataForm,
...res.data,
};
- if (res.data.moStartTime !== "" && res.data.afStartTime !== "") {
+ if (res.data.moStartTime !== "") {
this.morningTime = [res.data.moStartTime, res.data.moEndTime];
- this.afterTime = [res.data.afStartTime, res.data.afEndTime];
}
+ if (res.data.afStartTime !== "") {
+ this.afterTime = [res.data.afStartTime, res.data.afEndTime];
+ }
if (!this.dataForm.longitude && !this.dataForm.latitude) {
this.dataForm.longitude = "120.38945519";
this.dataForm.latitude = "36.0722275";
From 39d5fe2a318295fafe20264648b937f5a23555cb Mon Sep 17 00:00:00 2001
From: 123456 <17862666717>
Date: Thu, 30 Jun 2022 17:03:22 +0800
Subject: [PATCH 77/90] =?UTF-8?q?=E2=80=9Cfix=EF=BC=9A=E4=BF=AE=E6=94=B9?=
=?UTF-8?q?=E5=9C=B0=E5=9B=BE=E4=B8=AD=E5=BF=83=E7=82=B9=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../plugins/point/icpointnucleicmonitoring-add-or-update.vue | 2 +-
.../plugins/point/icpointvaccinesinoculation-add-or-update.vue | 2 +-
2 files changed, 2 insertions(+), 2 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 5529f3bde..c75823246 100644
--- a/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue
+++ b/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue
@@ -247,7 +247,7 @@ export default {
},
// 地图初始化函数，本例取名为init，开发者可根据实际情况定义
initMap() {
- let { latitude, longitude } = this.dataForm;
+ let { latitude, longitude } = this.$store.state.user;
// 定义地图中心点坐标
if (!latitude || latitude == "" || latitude == "0") {
latitude = 39.9088810666821;
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 75d212754..771ce1cc2 100644
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
@@ -340,7 +340,7 @@ export default {
},
// 地图初始化函数，本例取名为init，开发者可根据实际情况定义
initMap() {
- let { latitude, longitude } = this.dataForm;
+ let { latitude, longitude } = this.$store.state.user;
// 定义地图中心点坐标
if (!latitude || latitude == "" || latitude == "0") {
latitude = 39.9088810666821;
From 752c605bc68c483e483eab79e2fad1c991fffc13 Mon Sep 17 00:00:00 2001
From: 123456 <17862666717>
Date: Thu, 30 Jun 2022 17:07:11 +0800
Subject: [PATCH 78/90] =?UTF-8?q?=E2=80=9Cfix=EF=BC=9A=E4=BF=AE=E6=94=B9?=
=?UTF-8?q?=E5=9C=B0=E5=9B=BE=E4=B8=AD=E5=BF=83=E7=82=B9=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
...pointvaccinesinoculation-add-or-update.vue | 25 ++++++++++---------
1 file changed, 13 insertions(+), 12 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 de94f7872..a8a513143 100644
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
@@ -25,7 +25,10 @@
:disabled="dialogTitle == '查看'"
>
-