dai 3 years ago
parent
commit
4402b25fe0
  1. 3
      src/assets/scss/modules/management/detail-main.scss
  2. 129
      src/views/modules/base/epidemic/antiInfo.vue
  3. 164
      src/views/modules/base/epidemic/natFocus/natFocusEdit.vue
  4. 197
      src/views/modules/base/epidemic/natInfo/natDetail.vue
  5. 28
      src/views/modules/base/epidemic/natInfo/natList.vue
  6. 25
      src/views/modules/base/epidemic/travel.vue
  7. 247
      src/views/modules/base/epidemic/travelDetail.vue
  8. 45
      src/views/modules/base/epidemic/veroFocus/veroFocusEdit.vue
  9. 2
      src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
  10. 3
      src/views/modules/communityParty/members/cpts/record.vue
  11. 19
      src/views/modules/communityService/ninePlaces/inspect/inspect.vue
  12. 340
      src/views/modules/communityService/ninePlaces/inspect/inspectDetail.vue
  13. 22
      src/views/modules/communityService/ninePlaces/places/places.vue
  14. 218
      src/views/modules/communityService/ninePlaces/places/placesDetail.vue
  15. 11
      src/views/modules/communityService/ninePlaces/team/team.vue
  16. 273
      src/views/modules/communityService/ninePlaces/team/teamDetail.vue
  17. 22
      src/views/modules/workSys/mapConfig.vue

3
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 {

129
src/views/modules/base/epidemic/antiInfo.vue

@ -5,7 +5,7 @@
<el-form :inline="true"
:model="searchForm"
ref="ref_searchform"
:label-width="'100px'">
:label-width="'110px'">
<div>
<el-form-item label="所属网格"
prop="gridId">
@ -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">
<div class="dialog-h-content scroll-h">
<el-form :inline="true"
:model="formDetail"
ref="detail_form"
:label-width="'100px'">
<div>
<el-form-item label="姓名:"
prop="name">
<el-input v-model="formDetail.name"
size="small"
disabled
class="list_item_width_1"
clearable
placeholder="请输入姓名">
</el-input>
<!-- <span>{{ formDetail.name }}</span> -->
</el-form-item>
<el-form-item label="所属网格"
prop="gridName">
<el-input v-model="formDetail.gridName"
size="small"
class="list_item_width_1"
clearable
disabled
placeholder="" />
<!-- <span>{{ formDetail.gridName }}</span> -->
</el-form-item>
<el-form-item label="所属房屋"
prop="houseName">
<el-input v-model="formDetail.houseName"
size="small"
class="list_item_width_1 min-w180"
clearable
disabled
placeholder="" />
<!-- <span>{{ formDetail.houseName }}</span> -->
</el-form-item>
<div class="m-row">
<div class="m-row-info">
<div class="info-prop">
<span class="info-title-2">姓名</span>
<span>{{ formDetail.name||'--' }}</span>
</div>
<div>
<el-form-item label="手机号"
prop="mobile">
<el-input v-model="formDetail.mobile"
size="small"
class="list_item_width_1"
clearable
disabled
placeholder="">
</el-input>
<!-- <span>{{ formDetail.mobile }}</span> -->
</el-form-item>
<el-form-item label="证件号"
prop="idCard">
<el-input v-model="formDetail.idCard"
size="small"
disabled
class="list_item_width_1"
clearable
placeholder="">
</el-input>
<!-- <span>{{ formDetail.idCard }}</span> -->
</el-form-item>
<el-form-item label="疫苗接种针次"
prop="vaccineCount">
<el-input v-model="formDetail.vaccineCount"
size="small"
class="list_item_width_1"
clearable
disabled
placeholder="">
</el-input>
<!-- <span>{{ formDetail.vaccineCount }}</span> -->
<div class="info-prop">
<span class="info-title-2">所属网格</span>
<span>{{ formDetail.gridName||'--' }}</span>
</div>
</el-form-item>
<div class="info-prop">
<span class="info-title-2">所属房屋</span>
<span>{{ formDetail.houseName||'--' }}</span>
</div>
</div>
<div class="m-row-info">
<div class="info-prop">
<span class="info-title-2">手机号</span>
<span>{{ formDetail.mobile||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-2">证件号</span>
<span>{{ formDetail.idCard||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-2">疫苗接种针次</span>
<span>{{ formDetail.vaccineCount||'--' }}</span>
</div>
</div>
<div class="m-row-info">
<div class="info-prop">
<span class="info-title-2">核酸检测次数</span>
<span>{{ formDetail.natCount||'--' }}</span>
</div>
</div>
<div>
<el-form-item label="核酸检测次数"
prop="natCount">
<el-input v-model="formDetail.natCount"
size="small"
class="list_item_width_1"
clearable
disabled
placeholder="">
</el-input>
<!-- <span>{{ formDetail.natCount }}</span> -->
</el-form-item>
</div>
</el-form>
<div style="padding: 0 20px;">
<el-tabs v-model="activeName">
<el-tab-pane label="疫苗接种信息"
@ -482,7 +430,7 @@
</div>
<div class="resi-btns">
<el-button size="small"
@click="handleCnalceForm">取消</el-button>
@click="handleCnalceForm"> </el-button>
</div>
</el-dialog>
@ -939,4 +887,7 @@ export default {
}
</style>
<style lang="scss" scoped>
@import "@/assets/scss/modules/management/detail-main.scss";
</style>

164
src/views/modules/base/epidemic/natFocus/natFocusEdit.vue

@ -1,20 +1,16 @@
<template>
<div class="epidemic-form">
<div>
<div class="dialog-h-content scroll-h">
<el-form
<el-form v-if="formType !== 'detail'"
ref="ref_form1"
:inline="true"
:model="formData"
:disabled="formType === 'detail'"
:rules="dataRule"
class="form"
>
<el-form-item
label="姓名"
class="form">
<el-form-item label="姓名"
prop="name"
label-width="150px"
style="display: block"
>
style="display: block">
<span>{{ formData.name }}</span>
<!-- <el-input class="item_width_2"
placeholder="请输入姓名"
@ -24,12 +20,10 @@
</el-input> -->
</el-form-item>
<el-form-item
label="手机号"
<el-form-item label="手机号"
prop="mobile"
label-width="150px"
style="display: block"
>
style="display: block">
<span>{{ formData.mobile }}</span>
<!-- <el-input class="item_width_2"
placeholder="请输入手机号"
@ -37,12 +31,10 @@
v-model="formData.mobile">
</el-input> -->
</el-form-item>
<el-form-item
label="证件号"
<el-form-item label="证件号"
prop="idCard"
label-width="150px"
style="display: block"
>
style="display: block">
<span>{{ formData.idCard }}</span>
<!-- <el-input class="item_width_2"
placeholder="请输入身份证号"
@ -50,72 +42,52 @@
v-model="formData.idCard">
</el-input> -->
</el-form-item>
<el-form-item
label="关注原因"
<el-form-item label="关注原因"
prop="reason"
label-width="150px"
style="display: block"
>
<el-input
class="item_width_1"
style="display: block">
<el-input class="item_width_1"
placeholder="请输入关注原因"
clearable
v-model="formData.reason"
>
v-model="formData.reason">
</el-input>
</el-form-item>
<el-form-item
label="隔离状态"
<el-form-item label="隔离状态"
prop="isolatedState"
label-width="150px"
style="display: block"
>
<el-select
v-model="formData.isolatedState"
style="display: block">
<el-select v-model="formData.isolatedState"
placeholder="请选择"
clearable
>
<el-option
v-for="item in options.isolatedState"
clearable>
<el-option v-for="item in options.isolatedState"
:key="item.value"
:label="item.label"
:value="item.value"
>
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item
label="备注"
<el-form-item label="备注"
prop="remark"
label-width="150px"
style="display: block"
>
<el-input
class="item_width_1"
style="display: block">
<el-input class="item_width_1"
type="textarea"
:disabled="formType === 'detail'"
maxlength="500"
show-word-limit
:autosize="{ minRows: 2, maxRows: 5 }"
clearable
placeholder="请输入通知备注"
v-model="formData.remark"
></el-input>
v-model="formData.remark"></el-input>
</el-form-item>
<div v-if="formType !== 'detail'">
<el-form-item
label="通知渠道"
<el-form-item label="通知渠道"
prop="channel"
label-width="150px"
style="display: block"
>
<el-checkbox
v-model="formData.isSelChannel"
style="display: block">
<el-checkbox v-model="formData.isSelChannel"
@change="handleChannelChange"
key="0"
label="0"
>小程序通知</el-checkbox
>
label="0">小程序通知</el-checkbox>
<!-- <el-checkbox-group v-model="formData.channel">
<el-checkbox key="0"
label="0">小程序通知</el-checkbox>
@ -125,38 +97,69 @@
</el-checkbox-group> -->
</el-form-item>
<el-form-item
v-if="formData.isSelChannel"
<el-form-item v-if="formData.isSelChannel"
label="通知内容"
prop="content"
label-width="150px"
style="display: block"
>
<el-input
class="item_width_1"
style="display: block">
<el-input class="item_width_1"
type="textarea"
maxlength="500"
show-word-limit
:autosize="{ minRows: 4, maxRows: 10 }"
clearable
placeholder="请输入通知内容"
v-model="formData.content"
></el-input>
v-model="formData.content"></el-input>
</el-form-item>
</div>
</el-form>
<div v-if="formType === 'detail'"
class="m-row">
<div class="m-info">
<div class="info-prop">
<span class="info-title-2">姓名</span>
<span>{{ formData.name||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-2">手机号</span>
<span>{{ formData.mobile||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-2">证件号</span>
<span>{{ formData.idCard||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-2">关注原因</span>
<span>{{ formData.reason||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-2">隔离状态</span>
<span>{{ formData.isolatedStateShow||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-2">备注</span>
<span>{{ formData.remark||'--' }}</span>
</div>
</div>
</div>
</div>
<div class="form_div_btn">
<el-button size="small" @click="handleCancle"> </el-button>
<el-button
v-if="formType !== 'detail'"
<div class="div-btn">
<el-button size="small"
@click="handleCancle">{{formType==='detail'?'关 闭':'取 消'}}</el-button>
<el-button v-if="formType!=='detail'"
size="small"
type="primary"
:disabled="btnDisable"
@click="handleComfirm"
> </el-button
>
@click="handleComfirm"> </el-button>
</div>
</div>
</template>
@ -203,7 +206,7 @@ export default {
components: {},
async mounted () {
this.getFmOptions("isolatedState", "/sys/dict/data/dictlist", {
await this.getFmOptions("isolatedState", "/sys/dict/data/dictlist", {
dictType: "isolatedState",
});
},
@ -223,8 +226,17 @@ 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 () {
this.$refs["ref_form1"].validate((valid, messageObj) => {
if (!valid) {
@ -349,7 +361,11 @@ export default {
},
};
</script>
<style lang="scss" scoped>
@import "@/assets/scss/modules/management/detail-main.scss";
</style>
<style lang="scss" scoped>
@import "@/assets/scss/modules/management/epidemic.scss";
</style>

197
src/views/modules/base/epidemic/natInfo/natDetail.vue

@ -0,0 +1,197 @@
<template>
<div class="epidemic-form">
<div class="dialog-h-content scroll-h">
<div v-if="initLoading"
class="m-row">
<div class="m-info">
<div class="info-prop">
<span class="info-title-2">姓名</span>
<span>{{ formData.name||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-2">手机号</span>
<span>{{ formData.mobile||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-2">证件号</span>
<span>{{ formData.idCard||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-2">检检测地点</span>
<span>{{ formData.natAddress||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-2">检测结果</span>
<span>{{ formData.natResult==='0'?'阴性':'阳性' }}</span>
</div>
<div class="info-prop"
v-if="fileList.length>0">
<span class="info-title-2">照片</span>
<div class="info-pics">
<img v-for="(item,index) in fileList"
style="width:80px;height:80px"
:key="index"
:src="item.url"
@click="watchImg(item)">
</div>
</div>
</div>
</div>
</div>
<div class="div-btn">
<el-button size="small"
@click="handleCancle"> </el-button>
<!-- <el-button v-if="formType != 'detail'"
size="small"
type="primary"
:disabled="btnDisable"
@click="handleComfirm"> </el-button> -->
</div>
</div>
</template>
<script>
import { Loading } from 'element-ui' // Loading
import { requestPost } from '@/js/dai/request'
import { dateFormats } from '@/utils/index'
let loading //
export default {
data () {
return {
initLoading: false,
icNatId: '',
formData: {},
fileList: [],
}
},
components: {},
async mounted () {
const { user } = this.$store.state
this.agencyId = user.agencyId
},
methods: {
async initForm (icNatId) {
this.startLoading()
this.formData.agencyId = this.agencyId
this.icNatId = icNatId
this.formData.icNatId = icNatId
await this.loadFormData()
this.initLoading = true
this.endLoading()
},
async loadFormData () {
// const url = 'http://yapi.elinkservice.cn/mock/245/epmetuser/icNat/detail'
const url = '/epmetuser/icNat/detail'
let params = {
icNatId: this.icNatId,
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.formData = data
console.log(this.formData.isSelChannel)
this.formData.icNatId = this.icNatId
this.fileList = []
if (data.fileName) {
let obj = {
name: data.fileName,
type: data.attachmentType,
url: data.attachmentUrl,
}
// data.attachmentList.forEach(element => {
// element.name = element.fileName
// element.type = element.attachmentType
// element.size = element.attachmentSize
// });
this.fileList.push(obj)
}
this.hideUploadEdit = this.fileList.length >= this.limitNum;
} else {
this.$message.error(msg)
}
},
handleCancle () {
// this.resetData()
this.$emit('dialogCancle')
},
watchImg (src) {
window.open(src);
},
resetData () {
this.formData = {}
},
//
startLoading () {
loading = Loading.service({
lock: true, //
text: '正在加载……', //
background: 'rgba(0,0,0,.7)' //
})
},
//
endLoading () {
// clearTimeout(timer);
if (loading) {
loading.close()
}
}
},
computed: {
},
props: {
// serviceList: {
// type: Array,
// default: []
// },
}
}
</script>
<style lang="scss" scoped>
@import "@/assets/scss/modules/management/detail-main.scss";
</style>

28
src/views/modules/base/epidemic/natInfo/natList.vue

@ -104,7 +104,8 @@
class="diy-button--export"
size="small"
@click="handleExportModule">下载模板</el-button>
<el-upload :headers="$getElUploadHeaders()" ref="upload"
<el-upload :headers="$getElUploadHeaders()"
ref="upload"
:multiple='false'
:show-file-list='false'
:before-upload="beforeUpload"
@ -250,6 +251,18 @@
@dialogCancle="diaClose"
@dialogOk="addFormOk"></nat-form>
</el-dialog>
<!-- 修改弹出框 -->
<el-dialog :visible.sync="detailShow"
:close-on-click-modal="false"
:close-on-press-escape="false"
:title="'详情'"
width="850px"
top="5vh"
class="dialog-h"
@closed="diaDetailClose">
<nat-detail ref="ref_detail"
@dialogCancle="diaDetailClose"></nat-detail>
</el-dialog>
</div>
</template>
@ -257,6 +270,7 @@
<script>
import natForm from './natForm'
import natDetail from './natDetail'
import { requestPost } from "@/js/dai/request";
import { mapGetters } from 'vuex'
@ -311,12 +325,13 @@ export default {
//form
formShow: false,
detailShow: false,
formTitle: '新增',
}
},
components: {
natForm
natForm, natDetail
},
async created () {
@ -405,13 +420,18 @@ export default {
this.$refs.ref_form.resetData()
this.formShow = false
},
diaDetailClose () {
this.detailShow = false
},
handleDetail (row) {
this.formTitle = '详情'
this.formShow = true
this.detailShow = true
this.$nextTick(() => {
this.$refs.ref_form.initForm('detail', row.icNatId)
this.$refs.ref_detail.initForm(row.icNatId)
})
},

25
src/views/modules/base/epidemic/travel.vue

@ -5,7 +5,7 @@
<el-form :inline="true"
:model="formData"
ref="ref_searchform"
:label-width="'100px'">
:label-width="'110px'">
<div>
<el-form-item label="姓名"
@ -317,6 +317,19 @@
@dialogCancle="addFormCancle"
@dialogOk="addFormOk"></travel-form>
</el-dialog>
<!-- 详情弹出框 -->
<el-dialog :visible.sync="detailShow"
:close-on-click-modal="false"
:close-on-press-escape="false"
:title="'详情'"
width="850px"
top="5vh"
class="dialog-h"
@closed="diaClose">
<travel-detail v-if="detailShow"
@dialogCancle="addFormCancle"
ref="ref_detail"></travel-detail>
</el-dialog>
<!-- 发送通知弹出框 -->
<el-dialog :visible.sync="sendNoticeFormShow"
:close-on-click-modal="false"
@ -360,6 +373,7 @@
<script>
import travelForm from './travelForm'
import travelDetail from './travelDetail'
import nfNoticeList from './natFocus/nfNoticeList'
import nfSendNotice from './natFocus/nfSendNotice'
import nfVisiteList from './natFocus/nfVisiteList'
@ -402,6 +416,7 @@ export default {
//form
formShow: false,
detailShow: false,
formTitle: '新增',
areaProps: {
lazy: true,
@ -413,6 +428,7 @@ export default {
},
components: {
travelForm,
travelDetail,
nfNoticeList,
nfSendNotice,
nfVisiteList
@ -666,10 +682,10 @@ export default {
},
handleDetail (row) {
this.formTitle = '行程详情'
this.formShow = true
// this.formTitle = ''
this.detailShow = true
this.$nextTick(() => {
this.$refs.ref_form.initForm('detail', row)
this.$refs.ref_detail.initForm(row)
})
},
@ -690,6 +706,7 @@ export default {
},
addFormCancle () {
this.detailShow = false
this.formShow = false
},
addFormOk () {

247
src/views/modules/base/epidemic/travelDetail.vue

@ -0,0 +1,247 @@
<template>
<div>
<div class="dialog-h-content scroll-h">
<div v-if="initLoading"
class="m-row">
<div class="m-info">
<div class="info-prop">
<span class="info-title-4">姓名</span>
<span>{{ formData.name||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-4">手机号</span>
<span>{{ formData.mobile||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-4">证件号</span>
<span>{{ formData.idCard||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-4">现居地</span>
<span>{{ formData.presentAddress||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-4">详细地址</span>
<span>{{ formData.detailAddress||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-4">来自地区</span>
<span>{{ formData.sourceAddress||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-4">来到本地时间</span>
<span>{{ formData.arriveDate||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-4">离开本地时间</span>
<span>{{ formData.leaveDate||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-4">备注</span>
<span>{{ formData.remark||'--' }}</span>
</div>
</div>
</div>
</div>
<div class="div-btn">
<el-button size="small"
@click="handleCancle"> </el-button>
<!-- <el-button v-if="formType != 'detail'"
size="small"
type="primary"
:disabled="btnDisable"
@click="handleComfirm('ref_form')"> </el-button> -->
</div>
</div>
</template>
<script>
import { Loading } from 'element-ui' // Loading
import { requestPost } from '@/js/dai/request'
import { dateFormats } from '@/utils/index'
import { isCard, isMobile } from '@/utils/validate'
let loading //
export default {
data () {
return {
initLoading: false,
icNatId: '',
formData: {},
}
},
components: {},
async mounted () {
const { user } = this.$store.state
this.agencyId = user.agencyId
//
// await this.loadGrid()
},
destroyed () {
this.nowAllCode = []
},
methods: {
async initForm (row) {
console.log('row----', row)
this.formData.agencyId = this.agencyId
await this.loadFormData(row.id)
this.initLoading = true
console.log('formtype', type)
},
async loadGrid () {
const url = "/gov/org/customergrid/gridoption"
let params = {
agencyId: this.agencyId
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.gridList = data
} else {
this.$message.error(msg)
}
},
async handleSelGrid (value) {
const url = "/epmetuser/icresiuser/demandusers"
let params = {
agencyId: this.agencyId,
gridId: value
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.personList = data
} else {
this.$message.error(msg)
}
},
async getArea (node, resolve) {
const url = "/commonservice/areacode/nextarea"
let params = {
parentLevel: node.data ? node.data.level : '',
parentAreaCode: node.data ? node.data.code : ''
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
const nodes = data.map(item => ({
value: item.areaCode, //
label: item.areaName,
code: item.areaCode,
level: item.level,
leaf: node.level >= 4 // 5
}))
resolve(nodes)
} else {
this.$message.error(msg)
}
},
async handleSelAddress (value) {
const url = "/gov/org/house/gethouseinfo/" + value
const { data, code, msg } = await requestPost(url)
if (code === 0) {
this.formData.presentAddress = data.agencyPathName
this.formData.presentAddressCode = data.areaCode
this.formData.detailAddress = data.allName
} else {
this.$message.error(msg)
}
},
async handleSelPerson (personItem) {
this.formData.userId = personItem.demandUserId
this.formData.name = personItem.demandUserName
this.formData.mobile = personItem.demandUserMobile
this.formData.idCard = personItem.idCard
this.handleSelAddress(personItem.houseId)
},
async loadFormData (id) {
const url = '/epmetuser/tripreport/detail'
let params = {
id,
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
console.log('deda-------', data)
this.formData = { ...data, channel: [], content: '' }
this.sourceAllCode = data.sourceAddressPathCode && data.sourceAddressPathCode.split(',')
if (data.userType == 'icresi') this.isFromResi = true
else this.nowAllCode = data.presentAddressPathCode && data.presentAddressPathCode.split(',')
} else {
this.$message.error(msg)
}
},
handleCancle () {
// this.resetData()
this.$emit('dialogCancle')
},
resetData () {
},
//
startLoading () {
loading = Loading.service({
lock: true, //
text: '正在加载……', //
background: 'rgba(0,0,0,.7)' //
})
},
//
endLoading () {
// clearTimeout(timer);
if (loading) {
loading.close()
}
}
}
}
</script>
<style lang="scss" scoped>
@import "@/assets/scss/modules/management/detail-main.scss";
</style>

45
src/views/modules/base/epidemic/veroFocus/veroFocusEdit.vue

@ -2,7 +2,8 @@
<div class="epidemic-form">
<div class="dialog-h-content scroll-h">
<el-form ref="ref_form1"
<el-form v-if="formType !== 'detail'"
ref="ref_form1"
:inline="true"
:model="formData"
:disabled="formType==='detail'"
@ -60,7 +61,6 @@
style="display: block">
<el-input class="item_width_1"
type="textarea"
:disabled="formType==='detail'"
maxlength="500"
show-word-limit
:autosize="{ minRows: 2, maxRows: 5 }"
@ -68,7 +68,7 @@
placeholder="请输入通知备注"
v-model="formData.remark"></el-input>
</el-form-item>
<div v-if=" formType!=='detail'">
<div>
<el-form-item label="通知渠道"
prop="channel"
label-width="150px"
@ -103,11 +103,42 @@
</div>
</el-form>
<div v-if="formType === 'detail'"
class="m-row">
<div class="m-info">
<div class="info-prop">
<span class="info-title-2">姓名</span>
<span>{{ formData.name||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-2">手机号</span>
<span>{{ formData.mobile||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-2">证件号</span>
<span>{{ formData.idCard||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-2">关注原因</span>
<span>{{ formData.reason||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-2">备注</span>
<span>{{ formData.remark||'--' }}</span>
</div>
<div class="form_div_btn">
</div>
</div>
</div>
<div class="div-btn">
<el-button size="small"
@click="handleCancle"> </el-button>
@click="handleCancle">{{formType==='detail'?'关 闭':'取 消'}}</el-button>
<el-button v-if="formType!=='detail'"
size="small"
type="primary"
@ -309,7 +340,9 @@ export default {
}
}
</script>
<style lang="scss" scoped>
@import "@/assets/scss/modules/management/detail-main.scss";
</style>
<style lang="scss" scoped >
@import "@/assets/scss/modules/management/epidemic.scss";

2
src/views/modules/base/epidemic/veroFocus/veroFocusList.vue

@ -318,7 +318,7 @@
:close-on-click-modal="false"
:close-on-press-escape="false"
:title="editFormTitle"
width="1050px"
width="850px"
top="5vh"
class="dialog-h"
@closed="diaClose">

3
src/views/modules/communityParty/members/cpts/record.vue

@ -1,8 +1,7 @@
<template>
<div style="padding-right: 20px;">
<div class="mt10">
<el-button v-if="btnDisabled"
size="small"
<el-button size="small"
class="diy-button--add"
:disabled="btnDisabled || disabled"
@click="handleAdd">新增</el-button>

19
src/views/modules/communityService/ninePlaces/inspect/inspect.vue

@ -4,8 +4,7 @@
<el-form :inline="true"
:model="formData"
ref="ref_searchform"
:label-width="'100px'">
<div>
:label-width="'120px'">
<el-form-item label="场所名称"
prop="placeOrgName">
@ -48,9 +47,6 @@
</el-form-item>
</div>
<div>
<el-form-item label="场所类型"
prop="ninePlaceVal">
<el-select class="item_width_1"
@ -90,7 +86,7 @@
size="small"
class="diy-button--reset"
@click="resetSearch">重置</el-button>
</div>
</el-form>
</div>
<div class="div_table">
@ -454,13 +450,18 @@ export default {
},
handleDetail (row) {
this.formTitle = '详情'
this.formShow = true
// this.formTitle = ''
this.detailShow = true
this.$nextTick(() => {
this.$refs.ref_form.initForm('detail', row.placePatrolRecordId)
this.$refs.ref_detail.initForm(row.placePatrolRecordId)
})
},
diaDetailClose () {
this.detailShow = false
},
handleAdd () {
this.formTitle = '新增'
this.formShow = true

340
src/views/modules/communityService/ninePlaces/inspect/inspectDetail.vue

@ -1,147 +1,53 @@
<template>
<div>
<div class="dialog-h-content scroll-h">
<div v-if="initLoading"
class="m-row">
<div class="m-info">
<div class="info-prop">
<span class="info-title-4">场所区域</span>
<span>{{ formData.gridName||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-4">场所类型</span>
<span>{{ formData.placeOrgName||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-4">场所名称</span>
<span>{{ formData.ninePlaceName||'--'}}</span>
</div>
<div class="info-prop">
<span class="info-title-4">分队名称</span>
<span>{{ formData.placePatrolTeamName||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-4">检查人员</span>
<span>{{ formData.inspectorsNames||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-4">首次巡查时间</span>
<span>{{ formData.firstTime||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-4">隐患明细</span>
<span>{{ formData.detailed||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-4">首次检查结论</span>
<span>{{ formData.firstResult==='0'?'合格':'不合格' }}</span>
</div>
<div class="info-prop">
<span class="info-title-4">拟复查时间</span>
<span>{{ formData.reviewTime||'--' }}</span>
</div>
<el-form ref="ref_form"
:inline="true"
:model="formData"
:rules="dataRule"
:disabled="formType === 'detail'"
class="form">
<el-form-item label="场所区域"
prop="gridId"
label-width="150px"
style="display: block">
<el-select class="item_width_1"
v-model="formData.gridId"
placeholder="全部"
clearable>
<el-option v-for="item in gridList"
@click.native="handleChangeGrid"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="场所类型"
label-width="150px"
prop="ninePlaceVal">
<el-select class="item_width_1"
v-model="formData.ninePlaceVal"
placeholder="请选择"
clearable>
<el-option v-for="item in placeTypeList"
@click.native="handleChangeType"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="场所名称"
label-width="150px"
prop="placeOrgId">
<el-select class="item_width_1"
v-model="formData.placeOrgId"
placeholder="请选择"
clearable>
<el-option v-for="item in placesList"
:key="item.placeOrgId"
:label="item.placeOrgName"
:value="item.placeOrgId">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="分队名称"
label-width="150px"
prop="placePatrolTeamId">
<el-select class="item_width_1"
v-model="formData.placePatrolTeamId"
placeholder="请选择"
clearable>
<el-option v-for="(item,index) in teamsList"
@click.native="hancleChangeTeam(index)"
:key="item.teamId"
:label="item.teamName"
:value="item.teamId">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="检查人员"
prop="inspectorArray"
label-width="150px"
style="display: block">
<el-checkbox-group class="item_width_1"
style="display:flex;flex-wrap:wrap"
v-model="formData.inspectorArray">
<el-checkbox v-for="item in inspectorsList"
:key="item.id"
:label="item.id">{{item.name}}</el-checkbox>
</el-checkbox-group>
</el-form-item>
<el-form-item label="首次巡查时间"
style="display: block"
prop="firstTime"
label-width="150px">
<el-date-picker v-model="formData.firstTime"
value-format="yyyy-MM-dd HH:mm:ss"
type="date"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item label="隐患明细"
prop="detailed"
label-width="150px"
style="display: block">
<el-input class="item_width_1"
type="textarea"
maxlength="500"
show-word-limit
:rows="3"
placeholder="请输入备注,不超过500字"
v-model="formData.detailed"></el-input>
</el-form-item>
<el-form-item label="首次检查结论"
prop="firstResult"
label-width="150px"
style="display: block">
<el-select class="item_width_1"
v-model="formData.firstResult"
placeholder="全部"
clearable>
<el-option v-for="item in resultList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="拟复查时间"
style="display: block"
prop="reviewTime"
label-width="150px">
<el-date-picker v-model="formData.reviewTime"
value-format="yyyy-MM-dd HH:mm:ss"
type="date"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-form>
</div>
</div>
<div class="div_btn">
<!-- <div class="div_btn">
<el-button size="small"
@click="handleCancle"> </el-button>
<el-button size="small"
@ -149,7 +55,7 @@
type="primary"
:disabled="btnDisable"
@click="handleComfirm"> </el-button>
</div>
</div> -->
</div>
</template>
@ -162,8 +68,9 @@ let loading // 加载动画
export default {
data () {
return {
formType: 'add', // addeditdetail
btnDisable: false,
initLoading: false,
placesList: [],//
teamsList: [],//
@ -192,104 +99,21 @@ export default {
methods: {
async initForm (type, placePatrolRecordId) {
this.$refs.ref_form.resetFields();
async initForm (placePatrolRecordId) {
this.startLoading()
await this.loadPlaces()
await this.loadTeams()
this.formType = type
if (placePatrolRecordId) {
this.placePatrolRecordId = placePatrolRecordId
this.formData.placePatrolRecordId = placePatrolRecordId
await this.loadFormData()
await this.loadInspectors()
}
this.endLoading()
},
//
handleChangeGrid () {
this.formData.placeOrgId = ''
this.loadPlaces()
},
//
handleChangeType () {
this.formData.placeOrgId = ''
this.loadPlaces()
},
//
async loadPlaces () {
const url = '/gov/org/placeorg/getlist'
let params = {
gridId: this.formData.gridId,//Id
ninePlaceVal: this.formData.ninePlaceVal,//Value
isPage: false
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.placesList = data.list
} else {
this.$message.error(msg)
}
},
//
async loadTeams () {
const url = '/gov/org/placepatrolteam/getlist'
// const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/getlist'
let params = {
isPage: false
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.teamsList = data.list
if (this.teamsList.length > 0) {
this.formData.placePatrolTeamId = this.teamsList[0].teamId
this.hancleChangeTeam(0)
}
} else {
this.$message.error(msg)
}
},
//
async hancleChangeTeam (index) {
let array = []
this.formData.inspectorArray = [...array]
// this.formData.placePatrolTeamId = this.teamsList[index].teamId
await this.loadInspectors()
this.initLoading = true
this.endLoading()
},
//
async loadInspectors () {
const url = '/gov/org/placepatrolteamstaff/getlist'
// const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteamstaff/getlist'
let params = {
teamId: this.formData.placePatrolTeamId
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.inspectorsList = data
} else {
this.$message.error(msg)
}
},
//form
async loadFormData () {
const url = '/gov/org/placepatrolrecord/detail'
@ -311,47 +135,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.addRecord()
}
})
},
async addRecord () {
let url = "/gov/org/placepatrolrecord/add"
// let url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolrecord/add"
this.formData.inspectors = this.formData.inspectorArray.join(',')
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()
@ -360,18 +143,7 @@ export default {
},
resetData () {
this.formData = {
gridId: '',//Id
ninePlaceVal: '',//value
placeOrgId: '',//Id-
placePatrolTeamId: '',//Id
inspectorArray: [],//
inspectors: '',//Id
firstTime: '',//
detailed: '',//
firstResult: '',//0: 1:
reviewTime: '',//
}
this.formData = {}
},
//
startLoading () {
@ -441,6 +213,6 @@ export default {
</script>
<style lang="scss" scoped>
@import "@/assets/scss/modules/visual/communityManageForm.scss";
@import "@/assets/scss/modules/management/detail-main.scss";
</style>

22
src/views/modules/communityService/ninePlaces/places/places.vue

@ -194,6 +194,7 @@
@dialogCancle="addFormCancle"
@dialogOk="addFormOk"></places-form>
</el-dialog>
<!-- 详情弹出框 -->
<el-dialog :visible.sync="detailShow"
:close-on-click-modal="false"
@ -367,12 +368,17 @@ export default {
this.formShow = false
},
handleDetail (row) {
this.formTitle = '详情'
this.formShow = true
this.$nextTick(() => {
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)
})
},

218
src/views/modules/communityService/ninePlaces/places/placesDetail.vue

@ -1,107 +1,46 @@
<template>
<div>
<div class="dialog-h-content scroll-h">
<div v-if="initLoading"
class="m-row">
<div class="m-info">
<div class="info-prop">
<span class="info-title-2">场所类型</span>
<span>{{ formData.ninePlaceName||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-2">场所区域</span>
<span>{{ formData.gridName||'--' }}</span>
</div>
<el-form ref="ref_form"
:inline="true"
:model="formData"
:rules="dataRule"
:disabled="formType === 'detail'"
class="form">
<el-form-item label="场所类型"
label-width="150px"
prop="ninePlaceVal">
<el-select class="item_width_1"
v-model="formData.ninePlaceVal"
placeholder="请选择"
clearable>
<el-option v-for="item in placeTypeList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="场所区域"
prop="gridId"
label-width="150px"
style="display: block">
<el-select class="item_width_1"
v-model="formData.gridId"
placeholder="全部"
clearable>
<el-option v-for="item in gridList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="场所名称"
label-width="150px"
prop="placeOrgName">
<el-input v-model="formData.placeOrgName"
class="item_width_1"
clearable
placeholder="请输入九小场所名称">
</el-input>
</el-form-item>
<el-form-item label="场所地址"
label-width="150px"
prop="address">
<el-input v-model="formData.address"
class="item_width_1"
clearable
placeholder="请输入场所地址">
</el-input>
</el-form-item>
<el-form-item label="规模"
label-width="150px"
prop="scale">
<el-select class="item_width_1"
v-model="formData.scale"
placeholder="请选择"
clearable>
<el-option v-for="item in scaleList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="负责人"
label-width="150px"
prop="personInCharge">
<el-input v-model="formData.personInCharge"
class="item_width_1"
clearable
placeholder="请输入负责人姓名">
</el-input>
</el-form-item>
<el-form-item label="联系电话"
label-width="150px"
prop="mobile">
<el-input v-model="formData.mobile"
class="item_width_1"
type='number'
clearable
placeholder="请输入电话">
</el-input>
</el-form-item>
</el-form>
<div class="info-prop">
<span class="info-title-2">场所名称</span>
<span>{{ formData.placeOrgName}}</span>
</div>
<div class="info-prop">
<span class="info-title-2">场所地址</span>
<span>{{ formData.address||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-2">规模</span>
<span>{{ formData.scaleName||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-2">负责人</span>
<span>{{ formData.personInCharge||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-2">联系电话</span>
<span>{{ formData.mobile||'--' }}</span>
</div>
</div>
</div>
</div>
<div class="div_btn">
<!-- <div class="div_btn">
<el-button size="small"
@click="handleCancle"> </el-button>
<el-button size="small"
@ -109,7 +48,7 @@
type="primary"
:disabled="btnDisable"
@click="handleComfirm"> </el-button>
</div>
</div> -->
</div>
</template>
@ -125,8 +64,10 @@ export default {
formType: 'add', // addeditdetail
btnDisable: false,
initLoading: false,
placeOrgId: '',
gridList: [],
formData: {
gridId: '',
ninePlaceVal: '',
@ -146,16 +87,17 @@ 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.initLoading = true
},
@ -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 {
}
}
</script>
<style scoped>
.div_searchmap {
z-index: 5000;
position: absolute;
top: 5px;
left: 5px;
}
</style>
<style lang="scss" scoped>
@import "@/assets/scss/modules/visual/communityManageForm.scss";
@import "@/assets/scss/modules/management/detail-main.scss";
</style>

11
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

273
src/views/modules/communityService/ninePlaces/team/teamDetail.vue

@ -1,146 +1,57 @@
<template>
<div>
<div class="dialog-h-content scroll-h">
<div v-if="initLoading"
class="m-row">
<div class="m-info">
<div class="info-prop">
<span class="info-title-4">分队名称</span>
<span>{{ formData.teamName||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-4">负责区域</span>
<span>{{ formData.gridNames||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-4">负责场所类型</span>
<span>{{ formData.ninePlaceNames }}</span>
</div>
<div class="info-prop">
<span class="info-title-4">巡查计划</span>
<span>{{ formData.plan||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-4">创建时间</span>
<span>{{ formData.time||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-4">负责人</span>
<span>{{ formData.personInCharge||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-4">联系电话</span>
<span>{{ formData.mobile||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-4">成员</span>
<div>
<div v-for="(item,index) in formData.memberList"
:key="index">
<span>{{ item.name||'--' }}</span>
<span style="margin-left:20px">{{ item.mobile||'--' }}</span>
</div>
</div>
<el-form ref="ref_form"
:inline="true"
:model="formData"
:rules="dataRule"
:disabled="formType === 'detail'"
class="form">
<el-form-item label="分队名称"
label-width="150px"
prop="teamName">
<el-input v-model="formData.teamName"
class="item_width_1"
clearable
placeholder="请输入分队名称">
</el-input>
</el-form-item>
<el-form-item label="负责区域"
prop="gridIdArray"
label-width="150px"
style="display: block">
<el-select class="item_width_1"
v-model="formData.gridIdArray"
placeholder="全部"
multiple
clearable>
<el-option v-for="item in gridList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="负责场所类型"
prop="ninePlaceArray"
label-width="150px"
style="display: block">
<el-checkbox-group class="item_width_1"
style="display:flex;flex-wrap:wrap"
v-model="formData.ninePlaceArray">
<el-checkbox v-for="item in placeTypeList"
:key="item.value"
:label="item.value">{{item.label}}</el-checkbox>
</el-checkbox-group>
</el-form-item>
<el-form-item label="巡查计划"
prop="plan"
label-width="150px"
style="display: block">
<el-input class="item_width_1"
type="textarea"
maxlength="500"
show-word-limit
:rows="3"
placeholder="请输入备注,不超过500字"
v-model="formData.plan"></el-input>
</el-form-item>
<el-form-item label="创建时间"
style="display: block"
prop="time"
label-width="150px">
<el-date-picker v-model="formData.time"
value-format="yyyy-MM-dd HH:mm:ss"
type="date"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item label="负责人"
label-width="150px"
prop="personInCharge">
<el-input v-model="formData.personInCharge"
class="item_width_1"
clearable
placeholder="请输入负责人姓名">
</el-input>
</el-form-item>
<el-form-item label="联系电话"
label-width="150px"
prop="mobile">
<el-input v-model="formData.mobile"
class="item_width_1"
type='number'
clearable
placeholder="请输入电话">
</el-input>
</el-form-item>
<el-form-item label="成员"
label-width="150px"
prop="member">
<el-button v-if="formType != 'detail'"
type="primary"
size="mini"
icon="el-icon-plus"
@click="handleAddPerson"></el-button>
<div v-for="(item,index) in memberList"
:key="index"
class="div_person_list"
:class="[{'margin10':formType !== 'detail'}]">
<span class="div_person_list_title">姓名</span>
<el-input v-if="item.isSet"
v-model="item.name"
class="item_width_3"
clearable
placeholder="请输入姓名">
</el-input>
<span class="item_width_span_3"
v-else>{{item.name}}</span>
<span class="div_person_list_title2">联系电话</span>
<el-input v-if="item.isSet"
v-model="item.mobile"
class="item_width_4"
clearable
placeholder="请输入电话">
</el-input>
<span class="item_width_span_4"
v-else>{{item.mobile}}</span>
<el-button v-if="formType !== 'detail'"
style="margin-left:30px"
type="red"
size="mini"
@click="handleDelPerson(index)">删除</el-button>
</div>
</el-form-item>
</el-form>
</div>
</div>
</div>
<div class="div_btn">
<!-- <div class="div_btn">
<el-button size="small"
@click="handleCancle"> </el-button>
<el-button size="small"
@ -148,7 +59,7 @@
type="primary"
:disabled="btnDisable"
@click="handleComfirm"> </el-button>
</div>
</div> -->
</div>
</template>
@ -162,9 +73,9 @@ let loading // 加载动画
export default {
data () {
return {
formType: 'add', // addeditdetail
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.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: {
@ -427,54 +313,5 @@ export default {
</script>
<style lang="scss" scoped>
@import "@/assets/scss/modules/visual/communityManageForm.scss";
</style>
<style lang="scss" scoped>
@import "@/assets/scss/buttonstyle.scss";
.item_width_1 {
width: 500px;
}
.item_width_2 {
width: 400px;
}
.item_width_3 {
margin-left: 10px;
width: 120px;
}
.item_width_4 {
margin-left: 10px;
width: 150px;
}
.item_width_span_3 {
margin-left: 10px;
width: 160px;
}
.item_width_span_4 {
margin-left: 10px;
width: 150px;
}
.margin10 {
margin-top: 10px;
}
.div_person_list {
width: 500px;
display: flex;
.div_person_list_title {
width: 40px;
font-weight: bold;
}
.div_person_list_title2 {
width: 90px;
font-weight: bold;
margin-left: 20px;
}
}
</style>
<style lang="scss" scoped >
@import "@/assets/scss/modules/visual/communityManageForm.scss";
@import "@/assets/scss/modules/management/detail-main.scss";
</style>

22
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//xfalse
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//xfalse
// }),
// 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'

Loading…
Cancel
Save