diff --git a/src/assets/scss/modules/management/epidemic.scss b/src/assets/scss/modules/management/epidemic.scss index 3af7d2e99..7106aa787 100644 --- a/src/assets/scss/modules/management/epidemic.scss +++ b/src/assets/scss/modules/management/epidemic.scss @@ -17,7 +17,10 @@ width: 180px; } .item_width_4 { - width: 300px; + width: 350px; + } + .item_width_5 { + width: 450px; } .btn-selperson { diff --git a/src/views/modules/base/epidemic/antiInfo.vue b/src/views/modules/base/epidemic/antiInfo.vue index 85016b33a..f3da2d964 100644 --- a/src/views/modules/base/epidemic/antiInfo.vue +++ b/src/views/modules/base/epidemic/antiInfo.vue @@ -9,7 +9,14 @@
- + 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : ''; + this.searchForm.agencyId = '' + } else { + this.searchForm.agencyId = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : ''; + this.searchForm.gridId = '' + } + + } else { + this.searchForm.agencyId = '' + this.searchForm.gridId = '' + } + + this.searchForm.neighborId = '' + this.searchForm.buildingId = '' + this.searchForm.unitId = '' + this.searchForm.houseId = '' + this.getValiheList() + }, + handleChangeGrid (val) { console.log('val', val) this.searchForm.neighborId = '' @@ -686,6 +726,23 @@ export default { this.searchForm.houseId = '' this.getHouseList() }, + getOrgTreeList () { + const { user } = this.$store.state + this.$http + .post('/gov/org/customeragency/agencygridtree', {}) + .then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg) + } else { + console.log('获取组织树成功', res.data) + this.orgOptions = [] + this.orgOptions.push(res.data) + } + }) + .catch(() => { + return this.$message.error('网络错误') + }) + }, getGridList () { const { user } = this.$store.state this.$http @@ -705,9 +762,9 @@ export default { getValiheList () { const { user } = this.$store.state this.$http - .post('/gov/org/icneighborhood/neighborhoodoption', { + .post('/gov/org/icneighborhood/neighborhood-options', { gridId: this.searchForm.gridId, - agencyId: '' + agencyId: this.searchForm.agencyId // agencyId: user.agencyId }) .then(({ data: res }) => { @@ -903,6 +960,7 @@ export default { //重置搜索条件 resetSearch () { this.timeRange = [] + this.agencyIdArray = [] this.$refs.ref_searchform.resetFields() this.searchForm.buildingId = '' this.searchForm.unitId = '' diff --git a/src/views/modules/base/epidemic/epidRisk/risk.vue b/src/views/modules/base/epidemic/epidRisk/risk.vue new file mode 100644 index 000000000..967a06f93 --- /dev/null +++ b/src/views/modules/base/epidemic/epidRisk/risk.vue @@ -0,0 +1,680 @@ + + + + + + diff --git a/src/views/modules/base/epidemic/epidRisk/riskDetail.vue b/src/views/modules/base/epidemic/epidRisk/riskDetail.vue new file mode 100644 index 000000000..7ae53ee3d --- /dev/null +++ b/src/views/modules/base/epidemic/epidRisk/riskDetail.vue @@ -0,0 +1,216 @@ + + + + + + + + diff --git a/src/views/modules/base/epidemic/epidRisk/riskForm.vue b/src/views/modules/base/epidemic/epidRisk/riskForm.vue new file mode 100644 index 000000000..b62e1ee15 --- /dev/null +++ b/src/views/modules/base/epidemic/epidRisk/riskForm.vue @@ -0,0 +1,311 @@ + + + + + + + + + + diff --git a/src/views/modules/base/epidemic/natFocus/nfVisiteList.vue b/src/views/modules/base/epidemic/natFocus/nfVisiteList.vue index a0dd6da8e..a95eec6df 100644 --- a/src/views/modules/base/epidemic/natFocus/nfVisiteList.vue +++ b/src/views/modules/base/epidemic/natFocus/nfVisiteList.vue @@ -149,10 +149,10 @@ export default { methods: { async initTable (row, origin) { - + console.log('row', row) this.formData.idCard = row.realIdCard this.formData.name = row.name - this.formData.mobile = row.mobile + this.formData.mobile = row.realMobile this.formData.origin = origin await this.loadTable() diff --git a/src/views/modules/base/epidemic/travel.vue b/src/views/modules/base/epidemic/travel.vue index dc819a4d6..4cd3b4c15 100644 --- a/src/views/modules/base/epidemic/travel.vue +++ b/src/views/modules/base/epidemic/travel.vue @@ -182,6 +182,34 @@ show-overflow-tooltip min-width="180"> + + + + + + + + 详细地址: {{ formData.detailAddress||'--' }}
+
+ 返回方式: + {{ formData.trafficTypeName||'--' }} +
来自地区: {{ formData.sourceAddress||'--' }}
+
+ 详细地址: + {{ formData.sourceDetailAddress||'--' }} +
+
+ 疫苗接种针次: + {{ formData.vaccineNumName||'--' }} +
+
+ 48小时核酸: + {{ formData.isNatRecordName||'--' }} +
来到本地时间: {{ formData.arriveDate||'--' }} @@ -83,7 +99,7 @@ export default { initLoading: false, - icNatId: '', + selId: '', formData: {}, } @@ -109,7 +125,7 @@ export default { const url = "/data/aggregator/epmetuser/detailByType"; const { data, code, msg } = await requestPost(url, { - id: this.icNatId, + id: this.selId, type: "routeFollow", }); @@ -126,11 +142,11 @@ export default { console.log('row----', row) this.formData.agencyId = this.agencyId - this.icNatId = row.id + this.selId = row.id await this.loadFormData(row.id) this.initLoading = true - console.log('formtype', type) + }, diff --git a/src/views/modules/base/epidemic/travelForm.vue b/src/views/modules/base/epidemic/travelForm.vue index 30ca0369e..8242f3af6 100644 --- a/src/views/modules/base/epidemic/travelForm.vue +++ b/src/views/modules/base/epidemic/travelForm.vue @@ -5,7 +5,6 @@ :inline="true" :model="formData" :rules="dataRule" - :disabled="formType==='detail'" class="form"> - - - + v-model="formData.name" + style="margin-right:10px;"> 添加到核酸检测关注名单 @@ -76,10 +75,9 @@ prop="mobile" label-width="150px" style="display: block"> - @@ -87,62 +85,129 @@ prop="idCard" label-width="150px" style="display: block"> - - - - diff --git a/src/views/modules/partymember/icpartyorgtree.vue b/src/views/modules/partymember/icpartyorgtree.vue index 4dd705c94..7b5f5450d 100644 --- a/src/views/modules/partymember/icpartyorgtree.vue +++ b/src/views/modules/partymember/icpartyorgtree.vue @@ -45,7 +45,7 @@ size="small" class="div-table-button--add">新增下级 修改 diff --git a/src/views/modules/visual/communityGovern/zhongdianxingcheng/detail.vue b/src/views/modules/visual/communityGovern/zhongdianxingcheng/detail.vue new file mode 100644 index 000000000..5f33fa448 --- /dev/null +++ b/src/views/modules/visual/communityGovern/zhongdianxingcheng/detail.vue @@ -0,0 +1,195 @@ + + + + + + + + + diff --git a/src/views/modules/visual/communityGovern/zhongdianxingcheng/pieOption.js b/src/views/modules/visual/communityGovern/zhongdianxingcheng/pieOption.js new file mode 100644 index 000000000..ca2e35cd2 --- /dev/null +++ b/src/views/modules/visual/communityGovern/zhongdianxingcheng/pieOption.js @@ -0,0 +1,175 @@ + +export function pieOption (_charts) { + const center= ['50%', '240px'] + return { + title: { + text: '0', + top: 215, + left: 'center', + textStyle: { + width: '100%', + fontSize: 26, + color: '#FFFFFF', + fontWeight: 400 + }, + itemGap: 5, + subtext: '总数', + subtextStyle: { + fontSize: 18, + color: '#fff', + fontWeight: 400 + } + }, + tooltip: { + show: false + }, + legend: { + bottom: 150, + itemWidth: 20, + itemHeight: 10, + textStyle: { + color: '#D2E7FF', + fontSize: 14, + lineHeight: 20, + }, + + }, + series: [ + // 外侧圆环 + { + type: 'pie', + // 起始刻度的角度,默认为 90 度,即圆心的正上方。0 度为圆心的正右方。 + startAngle: 0, + hoverAnimation: false, + // tooltip: { + // }, + center: center, + radius: ['48%', '48.3%'], + label: { + show: false + }, + labelLine: { + show: false + }, + data: [{ + value: 360, + itemStyle: { + color: 'rgba(40, 101, 250, 0)', + width:0, + borderColor: 'rgba(40, 101, 250, 0.5)', + borderWidth: 1, + borderType: 'dotted' + } + } + ] + }, + + // 突出的 + { + hoverAnimation: false, + // name: 'Access From', + type: 'pie', + center: center, + radius: ['25%', '38%'], + avoidLabelOverlap: false, + // top: top + '%', + // height: '80%', + selectedMode: 'single', + left: 'center', + width: 480, + label: { + // show: false, + position: 'outside', + alignTo: 'edge', + // formatter: '{a|{c}}\n\n{name|{b}}', + formatter: '{a|{c}}\n{r|}\n{name|{b}}', + minMargin: 5, + edgeDistance: 1, + lineHeight: 15, + color: '#fff', + fontSize: 10, + // distanceToLabelLine: -60, + rich: { + name: { + padding: [0, 6, 0, 6] + }, + a: { + fontSize: 18, + color: '#fff', + padding: [0, 6, 6, 6] + }, + r: { + backgroundColor: 'auto', + borderRadius: 6, + width: 6, + height: 6, + // padding: [3, 3, 0, -12] + } + } + }, + labelLine: { + show: false, + smooth: 0.2, + length: 20, + length2: 0, + maxSurfaceAngle: 80 + }, + labelLayout: function (params) { + + const isLeft = params.labelRect.x < _charts.getWidth() / 2; + const points = params.labelLinePoints; + // Update the end point. + if (points) { + points[2][0] = isLeft + ? params.labelRect.x + : params.labelRect.x + params.labelRect.width; + } + + return { + labelLinePoints: points + }; + }, + itemStyle: { + color:function(params) { + return params.data.color + } + }, + data: [], + + }, + // 中间圆环 + { + type: 'pie', + // 起始刻度的角度,默认为 90 度,即圆心的正上方。0 度为圆心的正右方。 + startAngle: 0, + hoverAnimation: false, + center: center, + // tooltip: { + // }, + radius: ['0%', '20%'], + label: { + + show: false + + }, + labelLine: { + + show: false + + }, + data: [{ + value: 360, + itemStyle: { + normal: { + color: 'rgba(8, 37, 134, 1)', + + } + } + } + ] + }, + ] + + } + } + \ No newline at end of file diff --git a/src/views/modules/visual/communityGovern/zhongdianxingcheng/zhongdianxingcheng.vue b/src/views/modules/visual/communityGovern/zhongdianxingcheng/zhongdianxingcheng.vue new file mode 100644 index 000000000..c3084c377 --- /dev/null +++ b/src/views/modules/visual/communityGovern/zhongdianxingcheng/zhongdianxingcheng.vue @@ -0,0 +1,508 @@ + + + + + + + diff --git a/src/views/modules/visual/shundeju/controlCount.vue b/src/views/modules/visual/shundeju/controlCount.vue index ae3bb12ba..1c6a5928c 100644 --- a/src/views/modules/visual/shundeju/controlCount.vue +++ b/src/views/modules/visual/shundeju/controlCount.vue @@ -225,6 +225,7 @@ export default { } else { item.type = '未知' } + item.villageName = '顺德居小区' return { ...item, index: index + 1