guoxiaohuan 4 rokov pred
rodič
commit
6a368e37aa

+ 5 - 55
src/components/floorList.vue

@@ -6,22 +6,20 @@
 <template>
     <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-if='showT' @click='removeTop(num)'></i>
             <i class='el-icon-caret-top icon-top' v-else style='color:#ccc'></i>
             <div class='floor-out'>
                 <div class='floor-center'>
                     <div
                         class='floor-item'
-                        :class='item.seq == currentFloorId?"isActive":""'
+                        :class='item.code==floorId?"isActive":""'
                         @click='tabFloor(item,index)'
                         v-for='(item,index) in floorsArr'
                         :key='index'
                     >{{item.code}}</div>
                 </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-if='showB' @click='removeBottom(num)'></i>
             <i class='el-icon-caret-bottom icon-bottom' v-else style='color:#ccc'></i>
         </div>
     </div>
@@ -43,14 +41,10 @@ export default {
                 gname: 'f1',
                 name: '第1层',
                 seq: 100
-            },
-            currentFloorId: 100,
-            floorIdArr: []
+            }
         }
     },
     mounted() {
-        console.log(this.floorsArr)
-        this.init()
         this.removeBottom(-1)
         this.tabFloor()
     },
@@ -58,51 +52,12 @@ export default {
         ...mapGetters(['floorsArr'])
     },
     methods: {
-        init() {
-            // if (this.floorsArr) {
-            this.floorIdArr = []
-            this.floorsArr.map(item => {
-                this.floorIdArr.push(item.seq)
-            })
-            this.currentFloorId = 100
-            // }
-        },
-        /**
-         * @name changeFloor
-         * @param {Number} flag 1:向上滚动楼层, -1向下滚动
-         * @description 点击图例下方的,上下切换按钮
-         */
-        changeFloor(flag) {
-            console.log(this.floorIdArr)
-            const len = this.floorIdArr.length
-            let index = this.floorIdArr.findIndex(item => item === this.currentFloorId)
-            console.log('---------------index:', index, '--------------')
-            if (flag === 1) {
-                index--
-                this.currentFloorId = this.floorIdArr[index]
-            } else if (flag === -1) {
-                index++
-                this.currentFloorId = this.floorIdArr[index]
-            }
-            // 最上最下处理
-            if (index === 0) {
-                this.currentFloorId = this.floorIdArr[0]
-                console.log('currentFloorId', this.currentFloorId)
-                this.showT = false
-                this.showB = true
-            } else if (index === len - 1) {
-                this.currentFloorId = this.floorIdArr[len - 1]
-                console.log('currentFloorId', this.currentFloorId)
-                this.showT = true
-                this.showB = false
-            }
-        },
         tabFloor(item = this.floor, index) {
             console.log(this.num)
             if (this.num <= -1) {
                 this.showT = true
             }
-            if (this.num > -1) {
+            if (this.num >= -1) {
                 this.showB = true
             }
             this.$cookie.set('floorNow', item.code, 3)
@@ -162,7 +117,6 @@ export default {
     .floor-list {
         width: 44px;
         height: 212px;
-        height: 312px;
         background: rgba(255, 255, 255, 1);
         box-shadow: 0px 2px 15px 0px rgba(31, 36, 41, 0.08);
         border-radius: 2px;
@@ -171,8 +125,6 @@ export default {
         text-align: center;
         .floor-out {
             height: 160px;
-            height: 312px;
-            //TODO:
             overflow: hidden;
             // overflow-y: auto;
             position: relative;
@@ -181,8 +133,6 @@ export default {
             // }
 
             .floor-center {
-                // TODO:
-                margin-top: 0 !important;
                 .floor-item {
                     width: 36px;
                     height: 32px;

+ 8 - 2
src/views/other/zhsxDialog.vue

@@ -1,6 +1,6 @@
 <template>
-    <div>
-        <el-dialog title='综合记录事项' :visible.sync='visible'>
+    <div class='zhsx-log'>
+        <el-dialog title='综合记录事项' width='70%' :visible.sync='visible'>
             <div class='top'></div>
             <div class='bottom'>
                 <p>1.各级政府部门在广场检查中口头及书面提出的工作要求,整改事项</p>
@@ -50,6 +50,8 @@ export default {
                         colspan: 1
                     }
                 }
+            } else if (columnIndex == 3) {
+                console.log(row, column)
             }
         }
     }
@@ -75,4 +77,8 @@ export default {
         margin-top: 12px;
     }
 }
+</style>
+<style lang="less">
+.zhsx-log {
+}
 </style>

+ 1 - 1
src/views/room/index.vue

@@ -773,7 +773,7 @@ export default {
             this.department = []
             let postParams = [
                 {
-                    columnName: { status2: 'status2', zt: 'zt' },
+                    columnName: { status: 'status', zt: 'zt' },
                     tableName: 'v_glsms_wbzy'
                 }
             ]