guoxiaohuan 4 年之前
父节点
当前提交
938eed34d1

+ 1 - 0
src/views/analysis/CoreDeviceReport.vue

@@ -517,6 +517,7 @@ export default {
          */
         getDetailData(val, type) {
             let param = {
+                assetnum: this.assetnum,
                 plazaId: this.plazaId,
                 file_type: type === 'equip' ? val.file_type : val.type,
                 // file_type: 0,

+ 15 - 3
src/views/other/gcfz2.vue

@@ -9,7 +9,7 @@
                 v-model='cg.floors'
                 size='small'
                 style='margin-right:12px'
-                :selectdata='floorSelect'
+                :selectdata='floorSelect2'
                 :placeholder='"选择楼层"'
             ></Select>
             <el-input
@@ -97,9 +97,16 @@ export default {
             searVal: '',
             cg: {
                 dateVal: '',
-                floors: '',
+                floors: '全部',
                 searVal: ''
-            }
+            },
+            allArr: [
+                {
+                    id: '全部',
+                    name: '全部'
+                }
+            ],
+            floorSelect2: []
         }
     },
     computed: {
@@ -121,6 +128,11 @@ export default {
         indexMethod(index) {
             return (this.page - 1) * this.size + index + 1
         }
+    },
+    mounted() {
+        if (this.floorSelect.length > 0) {
+            this.floorSelect2 = this.allArr.concat(this.floorSelect)
+        }
     }
 }
 </script>

+ 1 - 1
src/views/other/gcfzDialog.vue

@@ -67,7 +67,7 @@ export default {
         },
         changeEmit(val) {
             //console.log(val)
-            if (val.floors) {
+            if (val.floors && val.floors != '全部') {
                 this.floors = val.floors
             }
             if (val.searVal) {

+ 12 - 4
src/views/other/zhsxOtherTable1.vue

@@ -98,7 +98,7 @@ export default {
             dateVal: '',
             loading: false,
             zhjlTable: [],
-            searVal: '',
+            searVal: '全部',
             total: 0,
             page: 1,
             size: 10,
@@ -131,6 +131,12 @@ export default {
                     name: '供电系统原理图.png',
                     url: 'http://gcgl.wanda.cn/%E7%BB%B4%E4%BF%AE%E5%B7%A5%E5%8D%95%E4%B8%80/WORKORDER_846049_2019-11-19T15-37-42-716.jpg'
                 }
+            ],
+            allArr: [
+                {
+                    id: '全部',
+                    name: '全部'
+                }
             ]
         }
     },
@@ -179,7 +185,7 @@ export default {
                 size: this.size,
                 orderBy: 'createdate,0'
             }
-            if (this.searVal) {
+            if (this.searVal && this.searVal != '全部') {
                 getParams.department = this.searVal
             }
             if (this.ssjlsx) {
@@ -215,7 +221,8 @@ export default {
             }
             querySelect({ data, postParams }).then(res => {
                 //console.log('政府部门', res)
-                let department = []
+                let department = [],
+                    newArr = []
                 department = res.data.data.sms_zhsxjl.department ? res.data.data.sms_zhsxjl.department : []
                 if (department.length > 0) {
                     department.forEach(el => {
@@ -223,9 +230,10 @@ export default {
                             id: el.key,
                             name: el.value
                         }
-                        this.department.push(obj)
+                        newArr.push(obj)
                     })
                     //console.log(this.department)
+                    this.department = this.allArr.concat(newArr)
                 }
             })
         },

+ 11 - 4
src/views/other/zhsxOtherTable2.vue

@@ -121,9 +121,15 @@ export default {
             status2: [],
             zgbm: [],
             conclusion: [],
-            ztdsf: '',
+            ztdsf: '全部',
             bmdsf: '',
-            jcjldsf: ''
+            jcjldsf: '',
+            allArr: [
+                {
+                    id: '全部',
+                    name: '全部'
+                }
+            ]
         }
     },
     components: { Select },
@@ -141,7 +147,7 @@ export default {
             if (this.searVal) {
                 getParams.keyword = `${this.searVal}:description`
             }
-            if (this.ztdsf) {
+            if (this.ztdsf && this.ztdsf != '全部') {
                 getParams.status = this.ztdsf
             }
             if (this.bmdsf) {
@@ -194,8 +200,9 @@ export default {
                             id: el.key,
                             name: el.value
                         }
-                        this.status2.push(obj)
+                        status2.push(obj)
                     })
+                    this.status2 = this.allArr.concat(status2)
                 }
                 if (zgbm.length > 0) {
                     zgbm.forEach(el => {

+ 14 - 4
src/views/room/index.vue

@@ -29,7 +29,7 @@
                                 v-model='floor2'
                                 tipPlace='top'
                                 caption='楼层:'
-                                :selectdata='floorSelect'
+                                :selectdata='floorSelect2'
                                 :placeholder='"请选择"'
                                 style='margin-right:12px'
                             ></Select>
@@ -466,11 +466,17 @@ export default {
             total1: 0,
             page1: 1,
             size1: 10,
-            floor2: '',
+            floor2: '全部',
             ctbhInput: '',
             cxggInput: '',
             djbhInput: '',
             kzhlInput: '',
+            allArr: [
+                {
+                    id: '全部',
+                    name: '全部'
+                }
+            ],
             //
             total2: 0,
             page2: 1,
@@ -589,7 +595,7 @@ export default {
                 page: this.page1,
                 size: this.size1
             }
-            if (this.floor2) {
+            if (this.floor2 && this.floor2 != '全部') {
                 getParams.floor = this.floor2
             }
             if (this.ctbhInput) {
@@ -910,7 +916,11 @@ export default {
             // }
         }
     },
-    mounted() {}
+    mounted() {
+        if (this.floorSelect.length > 0) {
+            this.floorSelect2 = this.allArr.concat(this.floorSelect)
+        }
+    }
 }
 </script>
 <style lang="less" scoped>