diff --git a/src/assets/scss/modules/management/detail-main.scss b/src/assets/scss/modules/management/detail-main.scss index 6cde8e84d..e89af1e6e 100644 --- a/src/assets/scss/modules/management/detail-main.scss +++ b/src/assets/scss/modules/management/detail-main.scss @@ -141,6 +141,9 @@ .info-title-3{ flex: 0 0 150px; } + .info-title-4{ + flex: 0 0 110px; + } > span, > div { diff --git a/src/views/modules/base/epidemic/antiInfo.vue b/src/views/modules/base/epidemic/antiInfo.vue index e2c29e66e..e6c904eba 100644 --- a/src/views/modules/base/epidemic/antiInfo.vue +++ b/src/views/modules/base/epidemic/antiInfo.vue @@ -5,7 +5,7 @@ + :label-width="'110px'">
@@ -261,104 +261,52 @@ :close-on-click-modal="false" :close-on-press-escape="false" :title="formTitle" - width="50%" + width="1150px" top="5vh" class="dialog-h" @closed="handleCnalceForm">
- -
- - - - - - - - - - - - - - - +
+
+ +
+ 姓名： + {{ formDetail.name||'--' }} +
+ +
+ 所属网格： + {{ formDetail.gridName||'--' }} +
+ +
+ 所属房屋： + {{ formDetail.houseName||'--' }} +
-
- - - - - - - - - - - - - - - - - - - - +
+
+ 手机号： + {{ formDetail.mobile||'--' }} +
+
+ 证件号： + {{ formDetail.idCard||'--' }} +
+
+ 疫苗接种针次： + {{ formDetail.vaccineCount||'--' }} +
-
- - - - - +
+
+ 核酸检测次数： + {{ formDetail.natCount||'--' }} +
+
- +
+
取消 + @click="handleCnalceForm">关 闭
@@ -939,4 +887,7 @@ export default { } + diff --git a/src/views/modules/base/epidemic/natFocus/natFocusEdit.vue b/src/views/modules/base/epidemic/natFocus/natFocusEdit.vue index 1b454dab2..c225c8e5e 100644 --- a/src/views/modules/base/epidemic/natFocus/natFocusEdit.vue +++ b/src/views/modules/base/epidemic/natFocus/natFocusEdit.vue @@ -1,20 +1,16 @@ @@ -167,7 +170,7 @@ import { requestPost } from "@/js/dai/request"; import { mapGetters } from "vuex"; let loading; // 加载动画 -function iniGetFmData() { +function iniGetFmData () { return { attentionType: 2, name: "", @@ -184,7 +187,7 @@ function iniGetFmData() { } export default { - data() { + data () { return { formType: "edit", @@ -202,20 +205,20 @@ export default { components: {}, - async mounted() { - this.getFmOptions("isolatedState", "/sys/dict/data/dictlist", { + async mounted () { + await this.getFmOptions("isolatedState", "/sys/dict/data/dictlist", { dictType: "isolatedState", }); }, - destroyed() {}, + destroyed () { }, methods: { - handleChannelChange(val) { + handleChannelChange (val) { this.formData.content = ""; }, - async initForm(formType, row) { + async initForm (formType, row) { this.formType = formType; this.$refs["ref_form1"].resetFields(); row.channel = []; @@ -223,9 +226,18 @@ export default { row.attentionType = 2; row.isSelChannel = false; this.formData = JSON.parse(JSON.stringify(row)); + + this.options.isolatedState.forEach(element => { + if (this.formData.isolatedState === element.value) { + this.formData.isolatedStateShow = element.label + } + }); + }, - handleComfirm() { + + + handleComfirm () { this.$refs["ref_form1"].validate((valid, messageObj) => { if (!valid) { app.util.validateRule(messageObj); @@ -235,7 +247,7 @@ export default { }); }, - async submit() { + async submit () { if (this.formData.isSelChannel) { if (!this.formData.content) { this.$message({ @@ -274,12 +286,12 @@ export default { } }, - handleCancle() { + handleCancle () { this.resetData(); this.$emit("dialogCancle"); }, - async getFmOptions(field, url, params, cookFn) { + async getFmOptions (field, url, params, cookFn) { const { data, code, msg } = await requestPost(url, { ...params, }); @@ -292,24 +304,24 @@ export default { } }, - resetData() { + resetData () { this.veroId = ""; this.formData = iniGetFmData(); }, - handleSizeChange(val) { + handleSizeChange (val) { this.pageSize = val; this.pageNo = 1; this.loadTable(); }, - handleCurrentChange(val) { + handleCurrentChange (val) { this.pageNo = val; this.loadTable(); }, // 开启加载动画 - startLoading() { + startLoading () { loading = Loading.service({ lock: true, // 是否锁定 text: "正在加载……", // 加载中需要显示的文字 @@ -317,7 +329,7 @@ export default { }); }, // 结束加载动画 - endLoading() { + endLoading () { // clearTimeout(timer); if (loading) { loading.close(); @@ -325,12 +337,12 @@ export default { }, }, computed: { - tableHeight() { + tableHeight () { return 200; }, ...mapGetters(["clientHeight", "iframeHeight"]), - dataRule() { + dataRule () { return { isolatedState: [ { required: true, message: "隔离状态必填", trigger: "blur" }, @@ -349,7 +361,11 @@ export default { }, }; - + + + diff --git a/src/views/modules/base/epidemic/natInfo/natDetail.vue b/src/views/modules/base/epidemic/natInfo/natDetail.vue new file mode 100644 index 000000000..65498f1ff --- /dev/null +++ b/src/views/modules/base/epidemic/natInfo/natDetail.vue @@ -0,0 +1,197 @@ + + + + + + + + + + + diff --git a/src/views/modules/base/epidemic/natInfo/natList.vue b/src/views/modules/base/epidemic/natInfo/natList.vue index 869f9b7c5..6783553fd 100644 --- a/src/views/modules/base/epidemic/natInfo/natList.vue +++ b/src/views/modules/base/epidemic/natInfo/natList.vue @@ -104,7 +104,8 @@ class="diy-button--export" size="small" @click="handleExportModule">下载模板 - + + + +
@@ -257,6 +270,7 @@ + + + + + diff --git a/src/views/modules/base/epidemic/veroFocus/veroFocusEdit.vue b/src/views/modules/base/epidemic/veroFocus/veroFocusEdit.vue index 6f2b079f9..84560a1a0 100644 --- a/src/views/modules/base/epidemic/veroFocus/veroFocusEdit.vue +++ b/src/views/modules/base/epidemic/veroFocus/veroFocusEdit.vue @@ -2,7 +2,8 @@
- -
+
+
+
+
+ 姓名： + {{ formData.name||'--' }} +
+ +
+ 手机号： + {{ formData.mobile||'--' }} +
+ +
+ 证件号： + {{ formData.idCard||'--' }} +
+ +
+ 关注原因： + {{ formData.reason||'--' }} +
+ +
+ 备注： + {{ formData.remark||'--' }} +
+ +
+
+
-
+
取 消 + @click="handleCancle">{{formType==='detail'?'关 闭':'取 消'}} - + diff --git a/src/views/modules/communityService/ninePlaces/places/places.vue b/src/views/modules/communityService/ninePlaces/places/places.vue index 88bb6db95..36c6af69f 100644 --- a/src/views/modules/communityService/ninePlaces/places/places.vue +++ b/src/views/modules/communityService/ninePlaces/places/places.vue @@ -194,6 +194,7 @@ @dialogCancle="addFormCancle" @dialogOk="addFormOk"> + { - this.$refs.ref_form.initForm('detail', row.id) - }) + // handleDetail (row) { + // // this.formTitle = '详情' + // this.detailShow = true + // this.$nextTick(() => { + // this.$refs.ref_detail.initForm( row.id) + // }) + // }, + + diaDetailClose () { + + this.detailShow = false }, handleAdd () { @@ -392,9 +398,9 @@ export default { }, handleDetail (row) { this.formTitle = '详情' - this.formShow = true + this.detailShow = true this.$nextTick(() => { - this.$refs.ref_form.initForm('detail', row.placeOrgId) + this.$refs.ref_detail.initForm(row.placeOrgId) }) }, diff --git a/src/views/modules/communityService/ninePlaces/places/placesDetail.vue b/src/views/modules/communityService/ninePlaces/places/placesDetail.vue index ae7bb8e0c..dbac5af92 100644 --- a/src/views/modules/communityService/ninePlaces/places/placesDetail.vue +++ b/src/views/modules/communityService/ninePlaces/places/placesDetail.vue @@ -1,107 +1,46 @@ @@ -125,8 +64,10 @@ export default { formType: 'add', //表单操作类型 add新增，edit编辑，detail详情 btnDisable: false, + initLoading: false, placeOrgId: '', + gridList: [], formData: { gridId: '', ninePlaceVal: '', @@ -146,25 +87,26 @@ export default { methods: { - async initForm (type, placeOrgId) { - this.$refs.ref_form.resetFields(); + async initForm (placeOrgId) { + this.loadGrid() - this.formType = type - if (placeOrgId) { - this.placeOrgId = placeOrgId - this.formData.placeOrgId = placeOrgId - await this.loadFormData() - } + + this.placeOrgId = placeOrgId + this.formData.placeOrgId = placeOrgId + await this.loadFormData() + + this.initLoading = true + }, - async loadGrid () { + async loadGrid () { const url = "/gov/org/customergrid/gridoption" let params = { agencyId: this.agencyId, - purpose:"addorupdate" + purpose: "addorupdate" } const { data, code, msg } = await requestPost(url, params) @@ -198,63 +140,6 @@ export default { - async handleComfirm () { - - this.btnDisable = true - setTimeout(() => { - this.btnDisable = false - }, 10000) - this.$refs['ref_form'].validate((valid, messageObj) => { - if (!valid) { - app.util.validateRule(messageObj) - this.btnDisable = false - } else { - this.addPlace() - } - - }) - - - }, - async addPlace () { - // const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码 - // if (regPhone.test(this.formData.mobile) === false) { - // this.btnDisable = false - // this.$message({ - // type: 'warning', - // message: '请输入正确的手机号码' - // }) - // return false; - // } - - let url = '' - - if (this.formType === 'edit') { - url = '/gov/org/placeorg/edit' - // url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placeorg/edit' - - } else { - url = "/gov/org/placeorg/add" - // url = "http://yapi.elinkservice.cn/mock/245/gov/org/placeorg/add" - } - - const { data, code, msg } = await requestPost(url, this.formData) - - if (code === 0) { - this.$message({ - type: 'success', - message: '操作成功' - }) - this.resetData() - this.$emit('dialogOk') - this.btnDisable = false - } else { - this.btnDisable = false - this.$message.error(msg) - } - - }, - handleCancle () { this.resetData() @@ -336,15 +221,6 @@ export default { } } - - - diff --git a/src/views/modules/communityService/ninePlaces/team/team.vue b/src/views/modules/communityService/ninePlaces/team/team.vue index cab0c4601..37791495d 100644 --- a/src/views/modules/communityService/ninePlaces/team/team.vue +++ b/src/views/modules/communityService/ninePlaces/team/team.vue @@ -341,13 +341,18 @@ export default { }, handleDetail (row) { - this.formTitle = '详情' - this.formShow = true + // this.formTitle = '详情' + this.detailShow = true this.$nextTick(() => { - this.$refs.ref_form.initForm('detail', row.teamId, this.agencyId) + this.$refs.ref_detail.initForm( row.teamId, this.agencyId) }) }, + diaDetailClose () { + + this.detailShow = false + }, + handleAdd () { this.formTitle = '新增' this.formShow = true diff --git a/src/views/modules/communityService/ninePlaces/team/teamDetail.vue b/src/views/modules/communityService/ninePlaces/team/teamDetail.vue index 66732ebe0..3ddad9351 100644 --- a/src/views/modules/communityService/ninePlaces/team/teamDetail.vue +++ b/src/views/modules/communityService/ninePlaces/team/teamDetail.vue @@ -1,146 +1,57 @@ @@ -162,9 +73,9 @@ let loading // 加载动画 export default { data () { return { - formType: 'add', //表单操作类型 add新增，edit编辑，detail详情 btnDisable: false, + initLoading: false, teamId: '', formData: { @@ -193,15 +104,15 @@ export default { methods: { - async initForm (type, teamId, agencyId) { - this.$refs.ref_form.resetFields(); + async initForm (teamId, agencyId) { + this.formData.agencyId = agencyId - this.formType = type - if (teamId) { - this.teamId = teamId - this.formData.teamId = teamId - await this.loadFormData() - } + + this.teamId = teamId + this.formData.teamId = teamId + await this.loadFormData() + + this.initLoading = true }, @@ -384,32 +295,7 @@ export default { } }, computed: { - dataRule () { - return { - teamName: [ - { required: true, message: '分队名称不能为空', trigger: 'blur' } - ], - gridIdArray: [ - { required: true, message: '负责区域不能为空', trigger: 'blur' }, - ], - ninePlaceArray: [ - { required: true, message: '场所类型不能为空', trigger: 'blur' } - ], - - plan: [ - { required: true, message: '巡查计划 不能为空', trigger: 'blur' } - ], - personInCharge: [ - { required: true, message: '负责人不能为空', trigger: 'blur' } - ], - mobile: [ - { required: true, message: '联系电话不能为空', trigger: 'blur' } - ], - member: [ - { required: true, message: '成员不能为空', trigger: 'blur' } - ] - } - }, + }, props: { @@ -426,55 +312,6 @@ export default { } - - - - - + \ No newline at end of file diff --git a/src/views/modules/workSys/mapConfig.vue b/src/views/modules/workSys/mapConfig.vue index 9a1097cd7..fad0427a1 100644 --- a/src/views/modules/workSys/mapConfig.vue +++ b/src/views/modules/workSys/mapConfig.vue @@ -634,12 +634,24 @@ const vueGis = { gaodeMapLayer = new TileLayer({ title: "地图", source: new XYZ({ - //指定url瓦片 - url: 'http://wprd0{1-4}.is.autonavi.com/appmaptile?lang=zh_cn&size=1&style=7&x={x}&y={y}&z={z}', - wrapX: true//x方向平铺，也可以选择false + url: "http://t4.tianditu.com/DataServer?T=vec_w&tk=8a08c117ab9ee45d508686b01cc8d397&x={x}&y={y}&l={z}" }), - zIndex: 20 + // source: new XYZ({ + // //指定url瓦片 + // url: 'http://wprd0{1-4}.is.autonavi.com/appmaptile?lang=zh_cn&size=1&style=7&x={x}&y={y}&z={z}', + // wrapX: true//x方向平铺，也可以选择false + // }), + // zIndex: 20 }); + var sourceMark = new XYZ({ + url: 'http://t4.tianditu.com/DataServer?T=cva_w&tk=8a08c117ab9ee45d508686b01cc8d397&x={x}&y={y}&l={z}', + // zIndex: 22 + }) + var tileMark = new TileLayer({ + title: '标注图层', + source: sourceMark + }) + mapView = new View({ //中心点坐标 @@ -652,7 +664,7 @@ const vueGis = { //初始化map和地图底图 //创建地图容器 map = new Map({ - layers: [gaodeMapLayer], + layers: [gaodeMapLayer, tileMark], //加载瓦片图层数据 view: mapView, target: 'map'