696 走不了流程了 救援后数据没有变
695 生成专报后 查看里面没有任何数据 692 能删除吗 690 选择人员弹窗 重置按钮不好使 680 有两个搜索按钮 把其中一个更换为重置按钮 676 选择人员后还让输入 提示语也不对 674 新增人员没有成功 658 输入框内文字不正确 657 重置按钮不好使 588 1、不是接报人不应该看不到数据吗 2、提示语的样式修改liujun0703-新项目开发
parent
d5274f5202
commit
1aabe41ecb
|
@ -199,6 +199,7 @@ export default {
|
|||
GROUP_TYPE: '',
|
||||
GROUP_TYPE_NAME: ''
|
||||
}
|
||||
this.$message.success('保存成功')
|
||||
this.getList()
|
||||
}).catch((e) => {
|
||||
this.listLoading = false
|
||||
|
@ -218,8 +219,9 @@ export default {
|
|||
id: id
|
||||
}
|
||||
).then((data) => {
|
||||
if (data.result == 'success') {
|
||||
if (data.result === 'success') {
|
||||
this.listLoading = false
|
||||
this.$message.success('删除成功')
|
||||
this.getList()
|
||||
}
|
||||
}).catch((e) => {
|
||||
|
|
|
@ -587,6 +587,7 @@ export default {
|
|||
this.dialogFormEdit = false
|
||||
this.varList = []
|
||||
this.listQuery.page = 1
|
||||
this.$message.success('保存成功')
|
||||
this.getList()
|
||||
}).catch((e) => {
|
||||
this.listLoading = false
|
||||
|
@ -606,8 +607,9 @@ export default {
|
|||
id: id
|
||||
}
|
||||
).then((data) => {
|
||||
if (data.result == 'success') {
|
||||
if (data.result === 'success') {
|
||||
this.listLoading = false
|
||||
this.$message.success('删除成功')
|
||||
this.getList()
|
||||
}
|
||||
}).catch((e) => {
|
||||
|
@ -645,6 +647,7 @@ export default {
|
|||
this.varList = []
|
||||
this.listQuery.page = 1
|
||||
this.$refs.multipleTable.clearSelection()
|
||||
this.$message.success('删除成功')
|
||||
this.getList()
|
||||
}).catch((e) => {
|
||||
this.listLoading = false
|
||||
|
|
|
@ -203,7 +203,7 @@ export default {
|
|||
},
|
||||
rules: {
|
||||
ORG_ID: [{ required: true, message: '请选择机构', trigger: 'blur' }],
|
||||
USER_NAME: [{ required: true, message: '请输入姓名', trigger: 'blur' }],
|
||||
USER_NAME: [{ required: true, message: '请选择用户', trigger: 'blur' }],
|
||||
GENDER: [{ required: true, message: '请输入性别', trigger: 'blur' }],
|
||||
ADMINISTRATIVE_POSITION: [{ required: true, message: '请输入行政职务', trigger: 'blur' }],
|
||||
ADMINISTRATIVE_LEVEL: [{ required: true, message: '请输入行政级别', trigger: 'blur' }],
|
||||
|
@ -343,6 +343,7 @@ export default {
|
|||
requestFN('/major/personnel/save', payload).then((data) => {
|
||||
this.listLoading = false
|
||||
this.dialogFormEdit = false
|
||||
this.$message.success('保存成功')
|
||||
this.getList()
|
||||
}).catch((e) => {
|
||||
this.listLoading = false
|
||||
|
@ -358,6 +359,7 @@ export default {
|
|||
requestFN('/major/personnel/delete', { id }).then((data) => {
|
||||
if (data.result === 'success') {
|
||||
this.listLoading = false
|
||||
this.$message.success('删除成功')
|
||||
this.getList()
|
||||
}
|
||||
}).catch((e) => {
|
||||
|
@ -384,6 +386,7 @@ export default {
|
|||
this.listLoading = true
|
||||
requestFN('/major/personnel/deleteAll', { ids }).then(() => {
|
||||
this.listLoading = false
|
||||
this.$message.success('删除成功')
|
||||
this.getList()
|
||||
}).catch((e) => {
|
||||
this.listLoading = false
|
||||
|
|
|
@ -765,6 +765,7 @@ export default {
|
|||
this.dialogFormEdit = false
|
||||
this.varList = []
|
||||
this.listQuery.page = 1
|
||||
this.$message.success('保存成功')
|
||||
this.getList()
|
||||
}).catch((e) => {
|
||||
this.listLoading = false
|
||||
|
@ -784,8 +785,9 @@ export default {
|
|||
id: id
|
||||
}
|
||||
).then((data) => {
|
||||
if (data.result == 'success') {
|
||||
if (data.result === 'success') {
|
||||
this.listLoading = false
|
||||
this.$message.success('删除成功')
|
||||
this.getList()
|
||||
}
|
||||
}).catch((e) => {
|
||||
|
@ -825,6 +827,7 @@ export default {
|
|||
this.varList = []
|
||||
this.listQuery.page = 1
|
||||
this.$refs.multipleTable.clearSelection()
|
||||
this.$message.success('删除成功')
|
||||
this.getList()
|
||||
}).catch((e) => {
|
||||
this.listLoading = false
|
||||
|
|
|
@ -828,6 +828,7 @@ export default {
|
|||
this.dialogFormEdit = false
|
||||
this.varList = []
|
||||
this.listQuery.page = 1
|
||||
this.$message.success('保存成功')
|
||||
this.getList()
|
||||
}).catch((e) => {
|
||||
this.listLoading = false
|
||||
|
@ -847,8 +848,9 @@ export default {
|
|||
id: id
|
||||
}
|
||||
).then((data) => {
|
||||
if (data.result == 'success') {
|
||||
if (data.result === 'success') {
|
||||
this.listLoading = false
|
||||
this.$message.success('删除成功')
|
||||
this.getList()
|
||||
}
|
||||
}).catch((e) => {
|
||||
|
@ -888,6 +890,7 @@ export default {
|
|||
this.varList = []
|
||||
this.listQuery.page = 1
|
||||
this.$refs.multipleTable.clearSelection()
|
||||
this.$message.success('删除成功')
|
||||
this.getList()
|
||||
}).catch((e) => {
|
||||
this.listLoading = false
|
||||
|
|
|
@ -548,8 +548,9 @@ export default {
|
|||
id: id
|
||||
}
|
||||
).then((data) => {
|
||||
if (data.result == 'success') {
|
||||
if (data.result === 'success') {
|
||||
this.listISLOADing = false
|
||||
this.$message.success('删除成功')
|
||||
this.getList()
|
||||
}
|
||||
}).catch((e) => {
|
||||
|
@ -589,6 +590,7 @@ export default {
|
|||
this.varList = []
|
||||
this.listQuery.page = 1
|
||||
this.$refs.multipleTable.clearSelection()
|
||||
this.$message.success('删除成功')
|
||||
this.getList()
|
||||
}).catch((e) => {
|
||||
this.listISLOADing = false
|
||||
|
|
|
@ -718,6 +718,7 @@ export default {
|
|||
this.dialogFormEdit = false
|
||||
this.varList = []
|
||||
this.listQuery.page = 1
|
||||
this.$message.success('保存成功')
|
||||
this.getList()
|
||||
}).catch((e) => {
|
||||
this.listLoading = false
|
||||
|
@ -737,8 +738,9 @@ export default {
|
|||
ID: id
|
||||
}
|
||||
).then((data) => {
|
||||
if (data.result == 'success') {
|
||||
if (data.result === 'success') {
|
||||
this.listLoading = false
|
||||
this.$message.success('删除成功')
|
||||
this.getList()
|
||||
}
|
||||
}).catch((e) => {
|
||||
|
@ -778,6 +780,7 @@ export default {
|
|||
this.varList = []
|
||||
this.listQuery.page = 1
|
||||
this.$refs.multipleTable.clearSelection()
|
||||
this.$message.success('删除成功')
|
||||
this.getList()
|
||||
}).catch((e) => {
|
||||
this.listLoading = false
|
||||
|
|
|
@ -483,8 +483,8 @@ export default {
|
|||
// 二级坐标点位点击事件
|
||||
subToggleCheck(sos, ind) {
|
||||
mapInstance.clearOverlays()
|
||||
var point = new window.BMapGL.Point(this.firstPoint.y, this.firstPoint.x) // 设置中心点坐标(例如北京天安门)
|
||||
mapInstance.centerAndZoom(point, 10) // 设置中心点和缩放级别
|
||||
var point = new window.BMapGL.Point(this.firstPoint.y, this.firstPoint.x) // 设置中心点坐标
|
||||
mapInstance.centerAndZoom(point, 15) // 设置中心点和缩放级别
|
||||
mapInstance.enableScrollWheelZoom(true)
|
||||
var circle = new window.BMapGL.Circle(point, this.range, { // 2000米半径
|
||||
strokeColor: 'blue',
|
||||
|
|
|
@ -1,10 +1,19 @@
|
|||
<template>
|
||||
<div class="app-container">
|
||||
<div class="filter-container">
|
||||
<el-input v-model="KEYWORDS" placeholder="搜索" class="filter-item" style="width: 200px;margin-right: 10px;" />
|
||||
<el-button class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
|
||||
搜索
|
||||
</el-button>
|
||||
<el-form inline>
|
||||
<el-form-item label="预案名称:">
|
||||
<el-input v-model="KEYWORDS" placeholder="搜索" class="filter-item" style="width: 200px;margin-right: 10px;" />
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
|
||||
搜索
|
||||
</el-button>
|
||||
<el-button class="filter-item" type="info" icon="el-icon-search" @click="resetting">
|
||||
重置
|
||||
</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</div>
|
||||
<el-table ref="multipleTable" :data="varList" :header-cell-style="{'font-weight': 'bold','color': '#000'}" tooltip-effect="dark" border fit highlight-current-row>
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
|
@ -134,7 +143,8 @@ export default {
|
|||
requestFN(
|
||||
'/major/emergencyplan/list?showCount=' + this.listQuery.limit + '¤tPage=' + this.listQuery.page,
|
||||
{
|
||||
AUDIT_STATUS: '1'
|
||||
AUDIT_STATUS: '1',
|
||||
PLANNAME: this.KEYWORDS
|
||||
}
|
||||
).then((data) => {
|
||||
this.listISLOADing = false
|
||||
|
@ -221,8 +231,11 @@ export default {
|
|||
getQuery() {
|
||||
this.$refs.multipleTable.clearSelection()
|
||||
this.getList()
|
||||
},
|
||||
resetting() {
|
||||
this.KEYWORDS = ''
|
||||
this.getList()
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
|
|
@ -38,7 +38,16 @@
|
|||
</el-row>
|
||||
</el-form>
|
||||
</div>
|
||||
<el-table ref="multipleTable" :data="varList" :header-cell-style="{'font-weight': 'bold','color': '#000'}" style="height:350px" tooltip-effect="dark" border fit highlight-current-row>
|
||||
<el-table
|
||||
ref="multipleTable"
|
||||
:data="varList"
|
||||
:header-cell-style="{'font-weight': 'bold','color': '#000'}"
|
||||
height="250"
|
||||
style="height:350px"
|
||||
tooltip-effect="dark"
|
||||
border
|
||||
fit
|
||||
highlight-current-row>
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<el-table-column prop="NAME" label="姓名" />
|
||||
<el-table-column prop="USERNAME" width="180" align="center" label="电话号码" />
|
||||
|
@ -128,6 +137,7 @@ export default {
|
|||
this.addressName = ''
|
||||
this.addressgroupId = ''
|
||||
this.addressSex = ''
|
||||
this.KEYWORDS = ''
|
||||
this.getAddressList()
|
||||
},
|
||||
savePeople() {
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<template>
|
||||
<el-dialog v-loading="listLoading" :visible.sync="visible" title="选择人员" width="850px">
|
||||
<el-dialog v-loading="listLoading" :visible.sync="visible" :before-close="closeDia" title="选择人员" width="850px" destroy-on-close>
|
||||
<el-container>
|
||||
<el-aside width="240px" style="background-color:#fff">
|
||||
<el-input
|
||||
|
@ -50,7 +50,7 @@
|
|||
</el-main>
|
||||
</el-container>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button @click="visible = false">取 消</el-button>
|
||||
<el-button @click="closeDia">取 消</el-button>
|
||||
<el-button type="primary" @click="savePeople">确 定</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
@ -184,6 +184,12 @@ export default {
|
|||
}).catch((e) => {
|
||||
this.treeLoading = false
|
||||
})
|
||||
},
|
||||
closeDia() {
|
||||
console.log('????')
|
||||
this.KEYWORDS = ''
|
||||
this.varList = []
|
||||
this.visible = false
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -61,7 +61,7 @@
|
|||
<div>
|
||||
<template>
|
||||
<el-button type="primary" icon="el-icon-plus" @click="handleAdd">新增</el-button>
|
||||
<el-button type="danger" icon="el-icon-delete" plain @click="makeAll('0')">删除</el-button>
|
||||
<el-button v-if="false" type="danger" icon="el-icon-delete" plain @click="makeAll('0')">删除</el-button>
|
||||
</template>
|
||||
</div>
|
||||
<pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList"/>
|
||||
|
@ -726,20 +726,21 @@ export default {
|
|||
rescueSituation: e.RESCUE_SITUATION
|
||||
})
|
||||
.then((data) => {
|
||||
// 如果发起救援则跳转到指挥页面
|
||||
if (this.rescueForm.RESCUE_SITUATION === '1') {
|
||||
this.$router.push({ path: '/emergen_cyrescue/incident_management', query: { a: '' }})
|
||||
if (data.code === 200) {
|
||||
// 如果发起救援则跳转到指挥页面
|
||||
if (this.rescueForm.RESCUE_SITUATION === '1') {
|
||||
this.$router.push({ path: '/emergen_cyrescue/incident_management', query: { a: '' }})
|
||||
}
|
||||
} else {
|
||||
this.$message.error(data.msg)
|
||||
}
|
||||
}).catch((e) => {
|
||||
console.error('获取树形数据失败', e)
|
||||
})
|
||||
},
|
||||
handleRegionChange(value) {
|
||||
// eslint-disable-next-line no-unused-vars
|
||||
const selectedRegion = this.regionData.find(region => region.DICTIONARIES_ID === value)
|
||||
if (selectedRegion) {
|
||||
// this.form.REGION_NAME = selectedRegion.name
|
||||
// this.reportForm.REGION = selectedRegion.name
|
||||
}
|
||||
},
|
||||
getQuery() {
|
||||
const date = this.OCCURRENCE_TIME.length === 2 ? this.OCCURRENCE_TIME.join(',') : ''
|
||||
|
@ -999,7 +1000,7 @@ export default {
|
|||
},
|
||||
dataSave(formType, id) {
|
||||
const data = formType === 'report' ? this.reportForm : this.form
|
||||
data.Id = id
|
||||
data.ID = id
|
||||
|
||||
this.listLoading = true
|
||||
requestFN('/major/registration/save', data).then((response) => {
|
||||
|
|
|
@ -49,7 +49,7 @@
|
|||
<el-row :gutter="20">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="专家名称" prop="EXPERT_NAME">
|
||||
<el-input v-model="form.EXPERT_NAME" placeholder="请输入场区名称..." />
|
||||
<el-input v-model="form.EXPERT_NAME" placeholder="请输入专家名称..." />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
|
|
|
@ -1,19 +1,15 @@
|
|||
<template>
|
||||
<div class="app-container">
|
||||
<div class="filter-container">
|
||||
<el-form>
|
||||
<el-row>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="名称:">
|
||||
<el-input v-model="KEYWORDS" placeholder="搜索" class="filter-item" style="width: 200px;margin-right: 10px;" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-button class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
|
||||
搜索
|
||||
</el-button>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-form inline>
|
||||
<el-form-item label="名称:">
|
||||
<el-input v-model="KEYWORDS" placeholder="搜索" class="filter-item" style="width: 200px;margin-right: 10px;" />
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">搜索</el-button>
|
||||
<el-button class="filter-item" type="info" icon="el-icon-search" @click="resetting">重置</el-button>
|
||||
</el-form-item>
|
||||
|
||||
</el-form>
|
||||
|
||||
</div>
|
||||
|
@ -633,6 +629,10 @@ export default {
|
|||
getQuery() {
|
||||
this.$refs.multipleTable.clearSelection()
|
||||
this.getList()
|
||||
},
|
||||
resetting() {
|
||||
this.KEYWORDS = ''
|
||||
this.getList()
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -248,6 +248,7 @@ export default {
|
|||
).then((data) => {
|
||||
this.listLoading = false
|
||||
this.dialogFormEdit = false
|
||||
this.$message.success('保存成功')
|
||||
this.getList()
|
||||
}).catch((e) => {
|
||||
this.listLoading = false
|
||||
|
|
Loading…
Reference in New Issue