zhulizhen1111 4 éve
szülő
commit
8b11d339b6

+ 5 - 5
src/utils/plugins/components.js

@@ -313,16 +313,16 @@ var system = [
                     id: "RDQD",
                     children: [
                         {
-                            label: "BA楼宇智能化",
-                            id: "RDQD1",
-                            param: { tab_code: "rd02" },
-                        },
-                        {
                             label: "门禁管理",
                             id: "RDQD2",
                             param: { tab_code: "rd01" },
                         },
                         {
+                            label: "BA楼宇智能化",
+                            id: "RDQD1",
+                            param: { tab_code: "rd02" },
+                        },
+                        {
                             label: "视频监控",
                             id: "RDQD3",
                             param: { tab_code: "rd03" },

+ 1 - 2
src/views/equipment/eqDialog.vue

@@ -100,9 +100,9 @@ export default {
             } else if (this.smsxt) {
                 this.smsxt = tab.name
             }
-
             this.activeName = tab.name
         },
+
         visibalBox() {
             this.$refs.Dialog.open()
         },
@@ -128,7 +128,6 @@ export default {
         font-weight: bold;
     }
 }
-
 .top {
     width: 1366px;
     height: 1px;

+ 0 - 24
src/views/equipment/index.vue

@@ -45,11 +45,9 @@
 <script>
 import floorList from '@/components/floorList.vue'
 import floorMap from '@/components/floorMap/index.vue'
-
 import eqDialog from './eqDialog'
 import editList from '@/components/edit.vue'
 import { system, floors } from '@/utils/plugins/components.js'
-import { querySelect, queryTab } from '@/api/public.js'
 export default {
     data() {
         return {
@@ -70,26 +68,6 @@ export default {
     },
     components: { floorList, eqDialog, floorMap, editList },
     methods: {
-        // 查询下拉框
-        query() {
-            let postParams = [
-                {
-                    columnName: { brand: 'brand', manufacturer: 'manufacturer' }, //列名称
-                    params: {
-                        // tab_code: '1572'
-                    },
-                    tableName: 'glsms_asset' //视图名称
-                }
-            ]
-            let data = {
-                major: '弱电',
-                plazaId: '1001145'
-            }
-            querySelect({ data, postParams }).then(res => {
-                this.brand = res.data.data.glsms_asset ? res.data.data.glsms_asset.brand : []
-                this.manufacturer = res.data.data.glsms_asset ? res.data.data.glsms_asset.manufacturer : []
-            })
-        },
         // 查询tab页
         tabSyatem(item) {
             this.systemId = item.id
@@ -106,11 +84,9 @@ export default {
         dialogVisible(eve) {
             console.log(eve)
             this.$refs.dialog.showModal(eve)
-            // this.dialogInfo = eve
         }
     },
     mounted() {
-        this.query()
         this.everySystem = this.system[0].children
         this.$refs.floorMap.init(1)
     }

+ 4 - 1
src/views/equipment/table/lookPageTable.vue

@@ -10,6 +10,8 @@
                 v-model='keyword'
                 style='width:192px;margin-right:12px'
             ></el-input>
+            <Select @change='getList' v-model='floor' style='margin-right:12px;' width='120' tipPlace='top' caption='楼层 :' :selectdata='floorSelect'></Select>
+            <Select @change='getList' v-model='floor' width='120' tipPlace='top' caption='文件类型 :' :selectdata='floorSelect'></Select>
         </div>
         <el-table :data='tableData' style='width: 100%'>
             <el-table-column type='index' label='序号' width='80'></el-table-column>
@@ -55,7 +57,8 @@ export default {
             total: 0,
             currentPage: 1,
             size: 11,
-            keyword: ''
+            keyword: '',
+            floor: ''
         }
     },
     props: ['major'],

+ 2 - 1
src/views/equipment/table/otherTable.vue

@@ -4,7 +4,8 @@
         <div class='eq-list-top'>
             <el-date-picker size='small' v-model='yssjwcsj' type='date' placeholder='选择处理日期:' @change='getList' style='width:180px;margin-right:12px'></el-date-picker>
             <Select width='146' tipPlace='top' caption='处置结果:' :selectdata='dataSelect2' :placeholder='"请选择"' @change='getList'></Select>
-            <el-input placeholder='搜索位置和内容' style='width:192px;margin-right:12px' size='small' prefix-icon='el-icon-search' v-model='keyword'></el-input>
+            <el-input placeholder='搜索位置' style='width:192px;margin-left:12px' size='small' prefix-icon='el-icon-search' v-model='keyword'></el-input>
+            <el-input placeholder='搜索内容' style='width:192px;margin-left:12px' size='small' prefix-icon='el-icon-search' v-model='keyword'></el-input>
         </div>
         <el-table :data='tableData' :border='true' style='width: 100%'>
             <el-table-column type='index' label='序号' width='80'></el-table-column>