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 @@
取 消
-
确 定
@@ -263,7 +326,7 @@ export default {
gridList: [],
personList: [],
pickerOptions: {
- disabledDate(time) {
+ disabledDate (time) {
return time.getTime() > Date.now();
}
},
@@ -287,42 +350,114 @@ export default {
presentAddressPathCode: '',
sourceAddress: '',
sourceAddressPathCode: '',
+ sourceDetailAddress: '',
arriveDate: '',
remark: '',
leaveDate: '',
userType: 'input',
content: '',
- channel: []
+ channel: [],
+
+ trafficType: '',
+ trafficTypeExplain: '',
+ isNatRecord: '',
+ vaccineNum: '',
},
dataRule: {
name: [
- { required: true, message: '姓名不能为空', trigger: 'blur' }
+ { required: true, message: '姓名不能为空', trigger: 'change' }
],
idCard: [
- { required: true, validator: checkIdCard, trigger: 'blur' }
+ { required: true, validator: checkIdCard, trigger: 'change' }
],
mobile: [
- { required: true, validator: checkMObile, trigger: 'blur' },
+ { required: true, validator: checkMObile, trigger: 'change' },
],
presentAddress: [
- { required: true, message: '现居地不能为空', trigger: 'blur' },
+ { required: true, message: '现居地不能为空', trigger: 'change' },
],
detailAddress: [
- { required: true, message: '详细地址不能为空', trigger: 'blur' },
+ { required: true, message: '详细地址不能为空', trigger: 'change' },
],
sourceAddress: [
- { required: true, message: '来自地区不能为空', trigger: 'blur' },
+ { required: true, message: '来自地区不能为空', trigger: 'change' },
+ ],
+ sourceDetailAddress: [
+ { required: true, message: '来自地区详细地址不能为空', trigger: 'change' },
],
arriveDate: [
- { required: true, message: '来到本地时间不能为空', trigger: 'blur' },
+ { required: true, message: '来到本地时间不能为空', trigger: 'change' },
+ ],
+ trafficType: [
+ { required: true, message: '交通方式不能为空', trigger: 'change' },
+ ],
+ trafficTypeExplain: [
+ { required: true, message: '其他交通方式不能为空', trigger: 'change' },
+ ],
+ isNatRecord: [
+ { required: true, message: '48小时核酸记录不能为空', trigger: 'change' },
+ ],
+ vaccineNum: [
+ { required: true, message: '疫苗接种针刺不能为空', trigger: 'change' },
]
},
areaProps: {
// checkStrictly: true,
lazy: true,
lazyLoad: this.lzayLoadArea
- }
+ },
+
+ trafficTypeList: [
+ {
+ value: '0',
+ label: '飞机'
+ },
+ {
+ value: '1',
+ label: '动车'
+ },
+ {
+ value: '2',
+ label: '火车'
+ },
+ {
+ value: '3',
+ label: '自驾'
+ },
+ {
+ value: '4',
+ label: '其他'
+ },
+ ],
+ ymList: [
+ {
+ value: '0',
+ label: '0针'
+ },
+ {
+ value: '1',
+ label: '1针'
+ },
+ {
+ value: '2',
+ label: '2针'
+ },
+ {
+ value: '3',
+ label: '3针'
+ }
+ ],
+ hsList: [
+ {
+ value: '1',
+ label: '是'
+ },
+ {
+ value: '2',
+ label: '否'
+ }
+ ]
}
},
@@ -332,12 +467,13 @@ export default {
this.agencyId = user.agencyId
//获取网格下拉框数据
await this.loadGrid()
+ this.getTrafficType()
},
- destroyed() {
+ destroyed () {
this.nowAllCode = []
},
methods: {
- computedWd(val) {
+ computedWd (val) {
const len = val.length
const wd = len * 18
let w = ''
@@ -345,7 +481,7 @@ export default {
else w = 220
return w + 'px'
},
- lzayLoadArea(node, resolve) {
+ lzayLoadArea (node, resolve) {
// this.getArea(node, resolve)
setTimeout(() => {
this.getArea(node, resolve)
@@ -362,7 +498,13 @@ export default {
} else {
const { user } = this.$store.state
- this.nowAllCode = user.areaCodePath
+
+ if (user.areaCodePath.length > 3) {
+ this.nowAllCode = [user.areaCodePath[0], user.areaCodePath[1], user.areaCodePath[2]]
+ } else {
+ this.nowAllCode = user.areaCodePath
+ }
+
}
// this.$refs['ref_form'].resetFields();
@@ -389,7 +531,7 @@ export default {
},
- handleSourceArea(val) {
+ handleSourceArea (val) {
console.log('val-----', val)
console.log('label-----', this.$refs.sourceArea.getCheckedNodes())
if (val.length > 0) {
@@ -405,7 +547,7 @@ export default {
}
},
- handleNowArea(val) {
+ handleNowArea (val) {
console.log('val-----', val)
console.log('label-----', this.$refs.nowArea.getCheckedNodes())
if (val.length > 0) {
@@ -437,6 +579,23 @@ export default {
this.$message.error(msg)
}
+ },
+ async getTrafficType () {
+ const url = "/sys/dict/data/dictlist"
+
+ let params = {
+ dictType: "traffic_type",
+ }
+
+ const { data, code, msg } = await requestPost(url, params)
+
+ if (code === 0) {
+ this.trafficTypeList = data
+
+ } else {
+ this.$message.error(msg)
+ }
+
},
async handleSelGrid (value) {
@@ -482,7 +641,7 @@ export default {
}
},
- async handleSelAddress(value) {
+ async handleSelAddress (value) {
const url = "/gov/org/house/gethouseinfo/" + value
@@ -613,7 +772,6 @@ export default {
min-width: 260px;
}
}
-
+
+
diff --git a/src/views/modules/base/epidemic/travelPanshi/travelPanshiDetail.vue b/src/views/modules/base/epidemic/travelPanshi/travelPanshiDetail.vue
new file mode 100644
index 000000000..41866e7f0
--- /dev/null
+++ b/src/views/modules/base/epidemic/travelPanshi/travelPanshiDetail.vue
@@ -0,0 +1,327 @@
+
+
+
+
+ 显示脱敏信息
+
+
+
+
+ 姓名:
+ {{ formData.name||'--' }}
+
+
+
+ 手机号:
+ {{ formData.showMobile||'--' }}
+
+
+
+ 证件号:
+ {{ formData.showIdCard||'--' }}
+
+
+ 户籍地:
+ {{ formData.registeredResidence||'--' }}
+
+
+ 来源地:
+ {{ formData.sourceAddress||'--' }}
+
+
+ 详细地址:
+ {{ formData.sourceDetailAddress||'--' }}
+
+
+ 来曹事由:
+ {{ formData.describeContent||'--' }}
+
+
+ 48小时核酸:
+ {{ formData.natOutcomeName||'--' }}
+
+
+
+ 来到本地时间:
+ {{ formData.arriveDate||'--' }}
+
+
+
+ 在曹居住地点:
+ {{ formData.presentAddress||'--' }}
+
+
+ 详细地址:
+ {{ formData.detailAddress||'--' }}
+
+
+ 返回方式:
+ {{ formData.trafficTypeName||'--' }}
+
+
+ 具体方式:
+ {{ formData.trafficTypeExplain||'--' }}
+
+
+ 7天内旅居史情况:
+ {{ formData.sojournHistoryName||'--' }}
+
+
+ 隔离状态:
+ {{ formData.isolateTypeName||'--' }}
+
+
+ 备注:
+ {{ formData.remark||'--' }}
+
+
+ 是否落实"落地检":
+ {{ formData.isArriveCheckName||'--' }}
+
+
+ 是否到达曹县:
+ {{ formData.isArriveName||'--' }}
+
+
+
+ 上报时间:
+ {{ formData.reportingTime||'--' }}
+
+
+ 类型:
+ {{ formData.tripDataTypeName||'--' }}
+
+
+
+
+
+
+
+ 关 闭
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/base/epidemic/travelPanshi/travelPanshiForm.vue b/src/views/modules/base/epidemic/travelPanshi/travelPanshiForm.vue
new file mode 100644
index 000000000..c136bce6a
--- /dev/null
+++ b/src/views/modules/base/epidemic/travelPanshi/travelPanshiForm.vue
@@ -0,0 +1,882 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/base/epidemic/veroFocus/vfVisiteList.vue b/src/views/modules/base/epidemic/veroFocus/vfVisiteList.vue
index fdef145e9..882deeffb 100644
--- a/src/views/modules/base/epidemic/veroFocus/vfVisiteList.vue
+++ b/src/views/modules/base/epidemic/veroFocus/vfVisiteList.vue
@@ -151,10 +151,10 @@ export default {
methods: {
async initTable (row) {
-
- this.formData.idCard = row.idCard
+ console.log(row)
+ this.formData.idCard = row.realIdCard
this.formData.name = row.name
- this.formData.mobile = row.mobile
+ this.formData.mobile = row.realMobile
await this.loadTable()
diff --git a/src/views/modules/communityParty/regionalParty/activitys.vue b/src/views/modules/communityParty/regionalParty/activitys.vue
index e9785bebb..2559274b9 100644
--- a/src/views/modules/communityParty/regionalParty/activitys.vue
+++ b/src/views/modules/communityParty/regionalParty/activitys.vue
@@ -193,13 +193,14 @@
style="color:#1C6AFD;text-decoration: underline;"
size="small"
@click="handleDetail(scope.row)">查看
-
修改
-
删除
diff --git a/src/views/modules/communityParty/regionalParty/units.vue b/src/views/modules/communityParty/regionalParty/units.vue
index fa3cfb952..bc61e38c6 100644
--- a/src/views/modules/communityParty/regionalParty/units.vue
+++ b/src/views/modules/communityParty/regionalParty/units.vue
@@ -128,6 +128,12 @@
label="单位名称"
min-width="100">
+
+
查看
- 修改
- 更多
+ 积分记录
+
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 @@
+
+
+
+
+
+

+
详情
+
+
+
+
+
+

+
+
+
+
+
+ 姓名:
+ {{ info.name||'--' }}
+
+
+ 手机:
+ {{ info.mobile||'--' }}
+
+
+
+ 证件号:
+ {{ info.idCard||'--' }}
+
+
+ 来源地:
+ {{ info.sourceAddress||'--' }}
+
+
+
+ 来曹事由:
+ {{ info.describeContent||'--' }}
+
+
+ 48小时核酸:
+ {{ info.natOutComeName||'--' }}
+
+
+ 7天旅居史:
+ {{ info.sojournHistoryName||'--' }}
+
+
+ 隔离状态:
+ {{ info.isolateTypeName||'--' }}
+
+
+ 来曹时间:
+ {{ info.arriveDate||'--' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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