|
|
@@ -240,10 +240,15 @@
|
|
|
<div class="z-info-btm-input-btn"
|
|
|
v-else-if="eventStatusValue=='forest_event_status_5'&&statusFlag=='1'">
|
|
|
<el-button size="small"
|
|
|
- icon="el-icon-success" style="text-align:left"
|
|
|
+ icon="el-icon-success" style="text-align:left" v-if="eventType == 1"
|
|
|
@click="updateCentereventTEventcatalogueStatus('gd',false)">
|
|
|
填报
|
|
|
</el-button>
|
|
|
+ <el-button size="small"
|
|
|
+ icon="el-icon-success" style="text-align:left" v-if="eventType != 1"
|
|
|
+ @click="updateCentereventTEventcatalogueStatus('gd',true)">
|
|
|
+ 归档
|
|
|
+ </el-button>
|
|
|
<el-button size="small" icon="el-icon-chat-dot-square" @click="sendEventLog()">发送
|
|
|
</el-button>
|
|
|
</div>
|
|
|
@@ -272,7 +277,7 @@
|
|
|
class="top-dialog"
|
|
|
@close="cancelEventConfirm()">
|
|
|
<el-form label-width="80px">
|
|
|
- <el-form-item label="火灾半径" v-if="eventStatusButton=='qs'&&eventTypeXl==null">
|
|
|
+ <el-form-item label="火灾半径" v-if="eventStatusButton=='qs' && eventTypeXl==null">
|
|
|
<el-input type="number" v-model="sendHuoZaiBanJing" placeholder="请输入火灾半径"/>
|
|
|
</el-form-item>
|
|
|
<el-form-item :label="deptNameitem">
|
|
|
@@ -288,7 +293,7 @@
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="事件类型" v-if="eventStatusButton=='qs'&& eventTypeXl == null">
|
|
|
+ <el-form-item label="事件类型" v-if="eventStatusButton=='qs' && eventTypeXl == null">
|
|
|
<el-select v-model="sendEventType" placeholder="请选择事件类型！" clearable>
|
|
|
<el-option
|
|
|
v-for="item in eventTypeList"
|
|
|
@@ -1777,30 +1782,33 @@ export default {
|
|
|
})
|
|
|
|
|
|
} else if (eventStatus == 'gd') {
|
|
|
- let double = /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/; //数字和两位小数
|
|
|
- let number = /^[+]{0,1}(\d+)$/g; //正整数
|
|
|
+ if(that.eventType == 1){
|
|
|
+ let double = /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/; //数字和两位小数
|
|
|
+ let number = /^[+]{0,1}(\d+)$/g; //正整数
|
|
|
|
|
|
- if(!double.test(that.table2.areaTotal)){
|
|
|
- that.$message.error(`面积只能填写到小数后两位!`)
|
|
|
- return
|
|
|
- }
|
|
|
- if(!number.test(that.table2.peopleTotal)){
|
|
|
- that.$message.error(`人员请填写正整数!`)
|
|
|
- return
|
|
|
- }
|
|
|
- if(that.table2.forestComposition == '' || that.table2.forestComposition==null){
|
|
|
- that.$message.error(`林木组成不能为空!`)
|
|
|
- return
|
|
|
- }
|
|
|
- if(that.table2.forestToken == '' || that.table2.forestToken==null){
|
|
|
- that.$message.error(`林令不能为空!`)
|
|
|
- return
|
|
|
- }
|
|
|
+ if(!double.test(that.table2.areaTotal)){
|
|
|
+ that.$message.error(`面积只能填写到小数后两位!`)
|
|
|
+ return
|
|
|
+ }
|
|
|
+ if(!number.test(that.table2.peopleTotal)){
|
|
|
+ that.$message.error(`人员请填写正整数!`)
|
|
|
+ return
|
|
|
+ }
|
|
|
+ if(that.table2.forestComposition == '' || that.table2.forestComposition==null){
|
|
|
+ that.$message.error(`林木组成不能为空!`)
|
|
|
+ return
|
|
|
+ }
|
|
|
+ if(that.table2.forestToken == '' || that.table2.forestToken==null){
|
|
|
+ that.$message.error(`林令不能为空!`)
|
|
|
+ return
|
|
|
+ }
|
|
|
if(that.table2.porosities == '' || that.table2.porosities==null){
|
|
|
- that.$message.error(`疏密度不能为空!`)
|
|
|
- return
|
|
|
+ that.$message.error(`疏密度不能为空!`)
|
|
|
+ return
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
+
|
|
|
//事件处理流程--归档
|
|
|
let param = {
|
|
|
deptId: that.deptId,
|
