guoxiaohuan 4 years ago
parent
commit
fb85a0e689

+ 18 - 16
src/components/floorList.vue

@@ -7,8 +7,11 @@
     <div class='floor-box'>
         <div class='floor-list'>
             <!-- <i class='el-icon-caret-top icon-top' v-if='showT' @click='removeTop(num)'></i> -->
-            <i class='el-icon-caret-top icon-top' v-if='showT' @click='changeFloor(1)'></i>
-            <i class='el-icon-caret-top icon-top' v-else style='color:#ccc'></i>
+            <div v-if='floorsArr.length>5'>
+                <i class='el-icon-caret-top icon-top' v-if='showT' @click='changeFloor(1)'></i>
+                <i class='el-icon-caret-top icon-top' v-else style='color:#ccc'></i>
+            </div>
+
             <div class='floor-out'>
                 <div class='floor-center'>
                     <div
@@ -21,14 +24,15 @@
                 </div>
             </div>
             <!-- <i class='el-icon-caret-bottom icon-bottom' v-if='showB' @click='removeBottom(num)'></i> -->
-            <i class='el-icon-caret-bottom icon-bottom' v-if='showB' @click='changeFloor(-1)'></i>
-            <i class='el-icon-caret-bottom icon-bottom' v-else style='color:#ccc'></i>
+            <div v-if='floorsArr.length>5'>
+                <i class='el-icon-caret-bottom icon-bottom' v-if='showB' @click='changeFloor(-1)'></i>
+                <i class='el-icon-caret-bottom icon-bottom' v-else style='color:#ccc'></i>
+            </div>
         </div>
     </div>
 </template>
 <script>
 import { animate } from '@/utils/animate.js'
-import { mapGetters } from 'vuex'
 export default {
     data() {
         return {
@@ -44,26 +48,24 @@ export default {
                 name: '第1层',
                 seq: 100
             },
-            currentFloorId: null,
-            floorIdArr: []
+            currentFloorId: null
         }
     },
+    props: ['floorsArr'],
     mounted() {
+        console.log('this.floorsArrthis.floorsArrthis.floorsArrthis.floorsArr', this.floorsArr)
         // this.removeBottom(-1)
         // this.tabFloor()
         this.init()
     },
     watch: {
         // 监听floorsArr的变化
-        '$store.state.floorsArr': {
-            handler(newV, oldV) {
-                newV && this.init()
-            },
-            deep: true
-        }
-    },
-    computed: {
-        ...mapGetters(['floorsArr'])
+        // '$store.state.floorsArr': {
+        //     handler(newV, oldV) {
+        //         newV && this.init()
+        //     },
+        //     deep: true
+        // }
     },
     methods: {
         init() {

+ 5 - 1
src/views/equipment/index.vue

@@ -44,7 +44,7 @@
                             </el-collapse-transition>
                         </div>
                     </div>
-                    <floor-list @emitFloor='emitFloor'></floor-list>
+                    <floor-list v-if='floorsArr.length>0' :floorsArr='floorsArr' @emitFloor='emitFloor'></floor-list>
                 </div>
             </div>
             <!-- <editList></editList> -->
@@ -60,6 +60,7 @@ import eqDialog from './eqDialog'
 import editList from '@/components/edit.vue'
 import { system } from '@/utils/plugins/components.js'
 import { queryPic } from '@/api/public.js'
+import { mapGetters } from 'vuex'
 
 export default {
     data() {
@@ -133,6 +134,9 @@ export default {
         this.everySystem = this.system[0].children
         this.init()
         // this.$refs.floorMap.init(this.floorInfo.gname)
+    },
+    computed: {
+        ...mapGetters(['floorsArr'])
     }
 }
 </script>

+ 5 - 1
src/views/floorFunc/index.vue

@@ -7,7 +7,7 @@
         <div class='legend-boxs'>
             <Legend></Legend>
         </div>
-        <floor-list @emitFloor='emitFloor' :id='"floor"'></floor-list>
+        <floor-list v-if='floorsArr.length>0' :floorsArr='floorsArr' @emitFloor='emitFloor' :id='"floor"'></floor-list>
         <!-- <div class='additional-box'>
             <div class='additional' @click='additionalColl'>
                 <img src='../../assets/imgs/bg.png' alt />
@@ -22,6 +22,7 @@
 <script>
 import floorMap from '@/components/floorMap/index.vue'
 import floorList from '@/components/floorList.vue'
+import { mapGetters } from 'vuex'
 
 export default {
     components: { floorMap, floorList },
@@ -35,6 +36,9 @@ export default {
             loadName: ''
         }
     },
+    computed: {
+        ...mapGetters(['floorsArr'])
+    },
     methods: {
         emitFloor(item) {
             this.floorInfo = item

+ 82 - 14
src/views/other/index.vue

@@ -16,8 +16,8 @@
                 </ul>
             </div>
             <!-- 楼层 -->
-            <div class='other-right' v-if='matterId!=1 && picFloorImg.length>0'>
-                <floor-list @emitFloor='emitFloor'></floor-list>
+            <div class='other-right' v-if='matterId!=1'>
+                <floor-list v-if='floorData.length>0' :floorsArr='floorData' @emitFloor='emitFloor'></floor-list>
             </div>
             <!-- 图例 -->
             <!-- <div class='legend-boxs' v-if='matterId!=1'>
@@ -41,9 +41,10 @@
 import ZhsxOther from './zhsxOther'
 import GcfzDialog from './gcfzDialog'
 import OtherDialog from './otherDialog'
-import { queryPic } from '@/api/public.js'
+import { queryPic, queryTab } from '@/api/public.js'
 import floorList from '@/components/floorList.vue'
 import { matter } from '@/utils/plugins/components.js'
+import { mapGetters } from 'vuex'
 export default {
     data() {
         return {
@@ -57,7 +58,8 @@ export default {
             },
             picFloor: '',
             picFloorImg: [],
-            dialogInfo: {}
+            dialogInfo: {},
+            floorData: []
         }
     },
     components: { floorList, OtherDialog, ZhsxOther, GcfzDialog },
@@ -69,35 +71,101 @@ export default {
         },
         emitFloor(item) {
             console.log(item)
-            this.queryPicter()
+            this.queryPicter(item.gname)
             this.floorInfo = item
             this.picFloor = this.floorInfo.gname
         },
         dialogVisible(item) {
             this.$refs.gcfzDialog.showModal(item)
         },
-        queryPicter() {
+        queryPicter(floor) {
             this.picFloor = this.$cookie.get('floorNow')
             let getParams = {
                 module: '1004',
-                floor: this.picFloor,
+                floor: floor,
                 plazaId: this.$store.state.plazaId
             }
             queryPic({ getParams }).then(res => {
                 console.log('库房管理图', res)
-                this.picFloorImg = res.data
-                console.log(this.picFloorImg)
-                if (this.picFloorImg) {
-                    console.log(1111)
-                } else {
-                    console.log(222222)
+                this.picFloorImg = res.data[0].url ? res.data[0].url : ''
+                console.log('this.picFloorImg', this.picFloorImg)
+            })
+        },
+        // 查询哪几个楼层有库房图
+        tabSize() {
+            let data = { plazaId: this.$store.state.plazaId }
+            let postParams = [
+                {
+                    tableName: 'glsms_proimgup',
+                    params: { module: '1004', floor: 'f1' }
+                },
+                {
+                    tableName: 'glsms_proimgup',
+                    params: { module: '1004', floor: 'f2' }
+                },
+                {
+                    tableName: 'glsms_proimgup',
+                    params: { module: '1004', floor: 'f3' }
+                },
+                {
+                    tableName: 'glsms_proimgup',
+                    params: { module: '1004', floor: 'f4' }
+                },
+                {
+                    tableName: 'glsms_proimgup',
+                    params: { module: '1004', floor: 'f5' }
+                },
+                {
+                    tableName: 'glsms_proimgup',
+                    params: { module: '1004', floor: 'f6' }
+                },
+                {
+                    tableName: 'glsms_proimgup',
+                    params: { module: '1004', floor: 'b1' }
+                },
+                {
+                    tableName: 'glsms_proimgup',
+                    params: { module: '1004', floor: 'b2' }
                 }
+            ]
+            queryTab({ data, postParams }).then(res => {
+                console.log('查询哪几层楼有图', res)
+                this.floorData = []
+                let data = res.data.data
+                data.forEach(el => {
+                    console.log(el)
+                    // gcode: "4F"
+                    // name: "第4层"
+                    // seq: 400
+                    if (el.count > 0) {
+                        let obj = {
+                            gname: el.params.floor,
+                            code: el.params.floor.toUpperCase(),
+                            gcode: el.params.floor
+                                .toUpperCase()
+                                .split('')
+                                .reverse()
+                                .join(''),
+                            seq:
+                                el.params.floor.substring(1, 2) == 'b'
+                                    ? el.params.floor.substring(1, 2) + '00'
+                                    : -el.params.floor.substring(1, 2) + '00'
+                        }
+                        console.log(obj)
+                        this.floorData.push(obj)
+                    }
+                })
+                console.log('查询哪几层楼有图', this.floorData)
             })
         }
     },
+    computed: {
+        ...mapGetters(['floorsArr'])
+    },
     mounted() {
         this.everySystem = this.matter[0].children
-        this.queryPicter()
+        // this.queryPicter()
+        this.tabSize()
     }
 }
 </script>

+ 5 - 10
src/views/other/zhsxOtherTable2.vue

@@ -17,7 +17,7 @@
                 size='small'
                 v-model='ztdsf'
                 style='margin-right:12px'
-                v-if='status2.length>=0'
+                v-if='status2.length>0'
                 :selectdata='status2'
                 :placeholder='"请选择"'
                 @change='dsfjc'
@@ -27,7 +27,7 @@
                 width='200'
                 tipPlace='top'
                 caption='部门'
-                v-if='zgbm.length>=0'
+                v-if='zgbm.length>0'
                 size='small'
                 v-model='bmdsf'
                 style='margin-right:12px'
@@ -91,12 +91,6 @@ export default {
     data() {
         return {
             loading: true,
-            dataSelect2: [
-                { id: 'test1', name: '选择项' },
-                { id: 'test2', name: '单平米' },
-                { id: 'test3', name: '下级分项' },
-                { id: 'test4', name: '滑动平均滑动平均' }
-            ],
             searVal: '',
             dsfTable: [],
             total: 0,
@@ -148,7 +142,7 @@ export default {
             this.department = []
             let postParams = [
                 {
-                    columnName: { status2: 'status2', zgbm: 'zgbm', conclusion: 'conclusion' },
+                    columnName: { status: 'status', zgbm: 'zgbm', conclusion: 'conclusion' },
                     tableName: 'v_glsms_dsfrw'
                 }
             ]
@@ -160,7 +154,7 @@ export default {
                 let status2 = [],
                     zgbm = [],
                     conclusion = []
-                status2 = res.data.data.v_glsms_dsfrw.status2 ? res.data.data.v_glsms_dsfrw.status2 : []
+                status2 = res.data.data.v_glsms_dsfrw.status ? res.data.data.v_glsms_dsfrw.status : []
                 zgbm = res.data.data.v_glsms_dsfrw.zgbm ? res.data.data.v_glsms_dsfrw.zgbm : []
                 conclusion = res.data.data.v_glsms_dsfrw.conclusion ? res.data.data.v_glsms_dsfrw.conclusion : []
                 if (status2.length > 0) {
@@ -172,6 +166,7 @@ export default {
                         this.status2.push(obj)
                     })
                 }
+                console.log(this.status2)
                 if (zgbm.length > 0) {
                     zgbm.forEach(el => {
                         let obj = {