+
+ 防汛队伍:{{this.makerObj.teams.length}}
+ 在册人员:{{totalPerson}}
+
-
抢险队伍
+
抢险队伍
-
-
-
- 防汛仓库
-
-
- {{item.value}}
-
-
+
+
+
+ 防汛仓库
+
+
+ {{item.value}}
+
+
@@ -72,13 +76,14 @@
import {
index,
destroy
- } from "@/api/system/baseForm.js"
- import {
- getparameteritem
+ } from "@/api/system/baseForm.js"
+ import {
+ getparameteritem
} from "@/api/system/dictionary.js"
export default {
data() {
return {
+ totalPerson: 0,
zoom: 10,
center: [120.585294, 31.299758],
mapHeight: 0,
@@ -87,16 +92,16 @@
makerObj: {
teams: [],
storages: []
- },
- areaList:[],
+ },
+ areaList: [],
infoWindow: null,
openData: [],
- materList: [],
- quyu_id:'',
+ materList: [],
+ quyu_id: '',
loading: true,
total: 0,
- addCur: false,
- loadingFull:null,
+ addCur: false,
+ loadingFull: null,
table: [{
label: '序号',
type: 'index',
@@ -220,18 +225,18 @@
]
}
},
- created() {
+ created() {
this.getArea()
this.initHeight()
this.$nextTick(function() {
this.mapInit()
})
},
- methods: {
- getArea(){
- getparameteritem("area").then(res=>{
- this.areaList = res.detail
- })
+ methods: {
+ getArea() {
+ getparameteritem("area").then(res => {
+ this.areaList = res.detail
+ })
},
initHeight() {
let winHeight = document.body.clientHeight
@@ -268,8 +273,8 @@
this.addCur = false
this.setMapMarker("teams", this.makerObj.teams)
} else if (type == 2) {
- this.addCur = true
- this.quyu_id = ''
+ this.addCur = true
+ this.quyu_id = ''
this.getStorages()
// this.setMapMarker("storages", this.makerObj.storages)
}
@@ -284,38 +289,41 @@
if (res.data.length < 1) {
return
}
+ let _total = 0
res.data.map(item => {
+ _total += parseInt(item.renshu)
this.makerObj.teams.push({
type: 'teams',
name: item.mingcheng,
...item
})
})
- this.setMapMarker("teams", this.makerObj.teams)
+ this.totalPerson = _total
+ this.setMapMarker("teams", this.makerObj.teams)
this.loadingFull.close();
})
- },
- clickQuyu(e){
- console.log("e",e)
- this.quyu_id = e
- this.getStorages()
},
- async getStorages() {
- this.loadingFull = this.$loading({
- lock: true,
- text: '',
- spinner: 'el-icon-loading',
- background: 'rgba(0, 0, 0, 0.7)'
- });
+ clickQuyu(e) {
+ console.log("e", e)
+ this.quyu_id = e
+ this.getStorages()
+ },
+ async getStorages() {
+ this.loadingFull = this.$loading({
+ lock: true,
+ text: '',
+ spinner: 'el-icon-loading',
+ background: 'rgba(0, 0, 0, 0.7)'
+ });
this.makerObj.storages = []
await index({
page: 1,
page_size: 9999,
- table_name: 'flood_storages',
- filter: [{
- key:'quyu_id',
- op:'eq',
- value:this.quyu_id
+ table_name: 'flood_storages',
+ filter: [{
+ key: 'quyu_id',
+ op: 'eq',
+ value: this.quyu_id
}],
}).then(res => {
let markers = []
@@ -328,8 +336,8 @@
name: item.cangkumingcheng,
...item
})
- })
- this.setMapMarker("storages", this.makerObj.storages)
+ })
+ this.setMapMarker("storages", this.makerObj.storages)
this.loadingFull.close();
})
},
@@ -406,6 +414,26 @@
diff --git a/src/views/shelf/index.vue b/src/views/shelf/index.vue
new file mode 100644
index 0000000..fd5c44f
--- /dev/null
+++ b/src/views/shelf/index.vue
@@ -0,0 +1,161 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/storages/components/addStorage.vue b/src/views/storages/components/addStorage.vue
index ca0bb3a..e841cc3 100644
--- a/src/views/storages/components/addStorage.vue
+++ b/src/views/storages/components/addStorage.vue
@@ -1,24 +1,20 @@
-
-
-
-
-
- *仓库类型:
-
-
-
-
-
-
-
-
+
+
+
+
+
+ *仓库类型:
+
+
+
+
+
+
+
+
@@ -47,14 +43,10 @@
所在区域:
-
-
-
-
+
+
+
+
@@ -64,7 +56,8 @@
建设年代: