From c2bbaf03e3c1f1084a397f3cc029cd5d150660de Mon Sep 17 00:00:00 2001
From: 陈泽平 <chenzeping>
Date: 星期三, 26 五月 2021 10:23:47 +0800
Subject: [PATCH] 事件上报功能修改
---
src/components/base-page/enterprise-emergency/PositionChange.vue | 3 -
src/components/base-page/enterprise-emergency/ReportIncident.vue | 69 +++++++++++++++-------------------
2 files changed, 32 insertions(+), 40 deletions(-)
diff --git a/src/components/base-page/enterprise-emergency/PositionChange.vue b/src/components/base-page/enterprise-emergency/PositionChange.vue
index 36af28a..0a48008 100644
--- a/src/components/base-page/enterprise-emergency/PositionChange.vue
+++ b/src/components/base-page/enterprise-emergency/PositionChange.vue
@@ -104,8 +104,7 @@
},
methods: {
// tab 鍒囨崲鐢ㄤ簬鍒ゆ柇
- handleClick (tab) {
- },
+ handleClick (tab) {},
// 鐐瑰嚮鏂囦欢閫夋嫨 鏄剧ず绗笁绾ч〉闈� 杩涜绠＄嚎/娈甸�夋嫨
fileChoose () {
this.fileChoChange = !this.fileChoChange
diff --git a/src/components/base-page/enterprise-emergency/ReportIncident.vue b/src/components/base-page/enterprise-emergency/ReportIncident.vue
index 85e6e8f..2e558db 100644
--- a/src/components/base-page/enterprise-emergency/ReportIncident.vue
+++ b/src/components/base-page/enterprise-emergency/ReportIncident.vue
@@ -17,9 +17,12 @@
<!-- 浜嬩欢绫诲瀷-->
<el-form-item label="浜嬩欢绫诲瀷" prop="eventOfType">
<el-radio-group v-model="ruleForm.eventOfType">
- <el-radio v-for="(item,index) in ruleForm.eventOfTypeList" :label="item.value" :key="index">
- <span>{{ item.name }}</span>
- </el-radio>
+ <el-col :span="8" v-for="(item,index) in ruleForm.eventOfTypeList" :key="index"
+ :style="{margin:'5px 0'}">
+ <el-radio :label="item.value">
+ <span>{{ item.name }}</span>
+ </el-radio>
+ </el-col>
</el-radio-group>
</el-form-item>
<!-- 浜嬩欢绛夌骇-->
@@ -99,19 +102,15 @@
<el-upload
class="upload-demo"
action="uploadAction"
- :on-preview="handlePreview"
- :on-remove="handleRemove"
- :before-remove="beforeRemove"
multiple
:limit="3"
- :on-exceed="handleExceed"
:file-list="fileList">
<el-button size="small" type="primary">鐐瑰嚮涓婁紶</el-button>
</el-upload>
</el-form-item>
<!-- 娑堟伅鎺ㄩ��-->
<el-form-item label="娑堟伅鎺ㄩ��" prop="beingPush">
- <el-checkbox-group v-model="ruleForm.beingPushed" @change="infotsChange">
+ <el-checkbox-group v-model="ruleForm.beingPushed" @change="infoChange">
<el-checkbox v-for="item in ruleForm.beingPushList"
:key="item.name"
:label="item.name"
@@ -141,7 +140,7 @@
</div>
</div>
<div class="local-box">
- <PositionChange :location="location" @localCation="getlocalCation"></PositionChange>
+ <PositionChange :location="location" @localCation="getLocalCation"></PositionChange>
</div>
<div class="file-box">
<PipelineFile></PipelineFile>
@@ -151,6 +150,7 @@
<script>
import '../../../utils/dragBoxes'
import eventBus from '../../../eventBus'
+// 寮曞叆缁勪欢
import PositionChange from './PositionChange'
import PipelineFile from './PipelineFile'
@@ -164,8 +164,6 @@
return {
// 鍒ゆ柇寮规鏄惁鑳藉睍绀� temp=>涓存椂true 寮�鍙�
eventsReported: false,
- // eventsReported: true,
- saveSuccess: false,
// 琛ㄥ崟缁戝畾鏁版嵁
ruleForm: {
// 浜嬩欢鍚嶇О 缁戝畾鏁版嵁
@@ -175,16 +173,24 @@
// 浜嬩欢绫诲瀷鍙�夋嫨鏁版嵁radio 缁戝畾鏁版嵁
eventOfTypeList: [
{
- name: '寰呰ˉ鍏�',
+ name: '娴�(姘�)涓婃孩娌规薄鏌�',
value: 1
},
{
- name: '寰呰ˉ鍏�',
+ name: '娌规皵绠￠亾娉勬紡姹℃煋',
value: 2
},
{
- name: '寰呰ˉ鍏�',
+ name: '杈愬皠姹℃煋',
value: 3
+ },
+ {
+ name: '鐢熸�佺幆澧冪牬鍧�',
+ value: 4
+ },
+ {
+ name: '鍏朵粬',
+ value: 5
}
],
// 浜嬩欢绛夌骇
@@ -256,6 +262,10 @@
// 鎺ユ敹浜哄憳
receiveOne: ''
},
+ // 涓婁紶鍒楄〃
+ fileList: [],
+ // 涓婁紶鍦板潃
+ uploadAction: '',
// 琛ㄥ崟楠岃瘉
rules: {
// 浜嬩欢鍚嶇О鏍￠獙
@@ -321,12 +331,8 @@
},
// 鎻忚堪 鎺ユ敹 => 灞曠ず/闅愯棌
wayTo: false,
- location: false,
- // 涓婁紶鍒楄〃
- fileList: [],
- // 涓婁紶鍦板潃
- uploadAction: '',
- getLocalInfo: ''
+ // 鎺у埗鏄剧ず瀹氫綅浜岀骇椤甸潰灞曠ず/闅愯棌
+ location: false
}
},
mounted () {
@@ -340,7 +346,7 @@
},
methods: {
// 娑堟伅鎺ㄩ�� 閫夋嫨鎺ㄩ�佺殑瀵硅薄
- infotsChange () {
+ infoChange () {
if (this.ruleForm.beingPushed.indexOf('鐭俊鎺ㄩ��') > -1 || this.ruleForm.beingPushed.indexOf('鎵嬫満搴旂敤鎺ㄩ��') > -1) {
this.wayTo = true
} else {
@@ -357,7 +363,7 @@
eventBus.$emit('tab-change', 'first')
},
// 鎺ユ敹瀛愮粍浠� 浼犻�� 鏁版嵁 杩涜 浜岀骇 闄勫睘妗嗙殑鏄剧ず/闅愯棌
- getlocalCation (value) {
+ getLocalCation (value) {
// console.log(value)
this.location = value
},
@@ -371,7 +377,8 @@
return false
}
})
- this.eventsReported = false
+ this.circlePopup()
+ this.ruleForm.nameOfEvent = this.ruleForm.eventOfType = ''
},
// 鐐瑰嚮鍏抽棴 浜嬩欢涓婃姤
circlePopup () {
@@ -380,21 +387,7 @@
// form琛ㄥ崟鐨勫彇娑堟寜閽偣鍑讳簨浠� 閲嶇疆淇℃伅
resetForm (formName) {
this.$refs[formName].resetFields()
- this.eventsReported = false
- },
- // 鐐瑰嚮涓婁紶 鐨勫彇娑堜笂浼犱簨浠�
- handleRemove (file, fileList) {
- console.log(file, fileList)
- },
- // 鐐瑰嚮涓婁紶 鐨勪笂浼犱簨浠�
- handlePreview (file) {
- console.log(file)
- },
- handleExceed (files, fileList) {
- this.$message.warning(`褰撳墠闄愬埗閫夋嫨 3 涓枃浠讹紝鏈閫夋嫨浜� ${files.length} 涓枃浠讹紝鍏遍�夋嫨浜� ${files.length + fileList.length} 涓枃浠禶)
- },
- beforeRemove (file, fileList) {
- return this.$confirm(`纭畾绉婚櫎 ${file.name}锛焋)
+ this.circlePopup()
}
}
}
--
Gitblit v1.8.0