guoxiaohuan il y a 4 ans
Parent
commit
a151416b74

+ 0 - 16
src/components/floorList.vue

@@ -76,15 +76,6 @@ export default {
     mounted() {
         this.init()
     },
-    watch: {
-        // 监听floorsArr的变化
-        // '$store.state.floorsArr': {
-        //     handler(newV, oldV) {
-        //         newV && this.init()
-        //     },
-        //     deep: true
-        // }
-    },
     methods: {
         mousedown() {
             this.startTime = new Date()
@@ -231,19 +222,12 @@ export default {
         padding: 6px 4px;
         text-align: center;
         .floor-out {
-            // max-height: 260px;
             overflow: hidden;
-            // overflow-y: auto;
             position: relative;
-            // &::-webkit-scrollbar {
-            //     display: none;
-            // }
 
             .floor-center {
                 transition: all linear 0.8s;
                 .floor-item {
-                    // border: 1px solid blue;
-                    // width: 36px;
                     line-height: 28px;
                     height: 28px;
                     cursor: pointer;

+ 44 - 71
src/components/floorListOther.vue

@@ -6,19 +6,21 @@
 <template>
     <div class='floor-box'>
         <div class='floor-list'>
-            <div v-if='floorsArr.length>5'>
-                <i
-                    class='el-icon-caret-top icon-top'
+            <div class='icon-top' v-if='floorsArr.length>8'>
+                <img
                     :class='{disabled:currentFloorId == floorsArr[0].seq }'
                     v-if='showT'
                     @click='changeFloor(1)'
                     @mousedown='mousedown'
                     @mouseup='mouseup'
-                ></i>
-                <i class='el-icon-caret-top icon-top' :class='{disabled:currentFloorId == floorsArr[0].seq }' v-else style='color:#ccc'></i>
+                    src='@/assets/imgs/iconBlackTop.png'
+                    alt
+                />
+                <img :class='{disabled:currentFloorId == floorsArr[0].seq }' v-else src='@/assets/imgs/iconLightTop.png' alt />
             </div>
             <div class='floor-out'>
-                <div class='floor-center' :style='{ marginTop : marginTop }'>
+                <!-- :style='{ marginTop : marginTop }' -->
+                <div class='floor-center'>
                     <div
                         class='floor-item'
                         :class='item.seq == currentFloorId?"isActive":""'
@@ -28,19 +30,15 @@
                     >{{item.code}}</div>
                 </div>
             </div>
-            <div v-if='floorsArr.length>5'>
-                <i
-                    class='el-icon-caret-bottom icon-bottom'
+            <div class='icon-bottom' v-if='floorsArr.length>8'>
+                <img
                     :class='{disabled:currentFloorId == floorsArr[floorsArr.length-1].seq }'
                     v-if='showB'
                     @click='changeFloor(-1)'
-                ></i>
-                <i
-                    class='el-icon-caret-bottom icon-bottom'
-                    :class='{disabled:currentFloorId == floorsArr[floorsArr.length-1].seq }'
-                    v-else
-                    style='color:#ccc'
-                ></i>
+                    src='@/assets/imgs/iconBlackBottom.png'
+                    alt
+                />
+                <img :class='{disabled:currentFloorId == floorsArr[floorsArr.length-1].seq }' v-else src='@/assets/imgs/iconLightBottom.png' alt />
             </div>
         </div>
     </div>
@@ -70,38 +68,14 @@ export default {
     props: {
         floorsArr: {
             type: Array
-            /*  default: () => {
-                return [
-                    { name: '第6层', code: 'F6', gname: 'f6', gcode: '6F', seq: 600 },
-                    { name: '第5层', code: 'F5', gname: 'f5', gcode: '5F', seq: 500 },
-                    { name: '第4层', code: 'F4', gname: 'f4', gcode: '4F', seq: 400 },
-                    { name: '第3层', code: 'F3', gname: 'f3', gcode: '3F', seq: 300 },
-                    { name: '第2层', code: 'F2', gname: 'f2', gcode: '2F', seq: 200 },
-                    { name: '第1层', code: 'F1', gname: 'f1', gcode: '1F', seq: 100 },
-                    { name: '地下1层', code: 'B1', gname: 'b1', gcode: 'B1', seq: -100 },
-                    { name: '地下2层', code: 'B2', gname: 'b2', gcode: 'B2', seq: -200 },
-                    { name: '地下3层', code: 'B3', gname: 'b3', gcode: 'B3', seq: -300 },
-                    { name: '地下4层', code: 'B4', gname: 'b4', gcode: 'B4', seq: -400 }
-                ]
-            } */
         }
     },
     mounted() {
         this.init()
     },
-    watch: {
-        // 监听floorsArr的变化
-        // '$store.state.floorsArr': {
-        //     handler(newV, oldV) {
-        //         newV && this.init()
-        //     },
-        //     deep: true
-        // }
-    },
     methods: {
         mousedown() {
             this.startTime = new Date()
-            console.log()
         },
         mouseup() {
             this.endTime = new Date()
@@ -239,57 +213,56 @@ export default {
         box-shadow: 0px 2px 15px 0px rgba(31, 36, 41, 0.08);
         border-radius: 2px;
         position: relative;
-        padding: 28px 4px;
+        padding: 6px 4px;
         text-align: center;
         .floor-out {
             overflow: hidden;
-            // overflow-y: auto;
             position: relative;
-            // &::-webkit-scrollbar {
-            //     display: none;
-            // }
-
             .floor-center {
                 transition: all linear 0.8s;
                 .floor-item {
-                    width: 36px;
-                    height: 32px;
+                    line-height: 28px;
+                    height: 28px;
                     cursor: pointer;
+                    position: relative;
+                    &::after {
+                        position: absolute;
+                        left: 50%;
+                        margin-left: -20%;
+                        bottom: -6px;
+                        content: '';
+                        width: 14px;
+                        height: 1px;
+                        background: rgba(195, 199, 203, 1);
+                        border: 0px solid rgba(228, 229, 231, 1);
+                    }
+                    & + .floor-item {
+                        margin-top: 10px;
+                    }
                 }
             }
         }
 
         .icon-top {
-            text-align: center;
-            font-size: 18px;
-            margin: 0 auto;
-            display: flex;
-            justify-content: center;
-            position: absolute;
-            top: 0;
-            right: 0;
-            width: 100%;
-            cursor: pointer;
-            line-height: 26px;
+            height: 18px;
+            img {
+                width: 18px;
+                height: 100%;
+                margin-top: -10px;
+            }
         }
         .icon-bottom {
-            text-align: center;
-            font-size: 18px;
-            margin: 0 auto;
-            display: flex;
-            justify-content: center;
-            position: absolute;
-            bottom: 0;
-            right: 0;
-            width: 100%;
-            cursor: pointer;
-            line-height: 26px;
+            height: 18px;
+            img {
+                width: 18px;
+                height: 100%;
+                margin-top: -10px;
+            }
         }
         .isActive {
             border-radius: 4px;
             color: #025baa;
             background: #e1f2ff;
-            line-height: 32px;
         }
     }
     .disabled {

+ 1 - 1
src/components/menuList.vue

@@ -188,7 +188,7 @@ export default {
     font-size: 16px;
     background: rgba(255, 255, 255, 1);
     box-shadow: 0px 2px 10px 0px rgba(31, 35, 41, 0.1);
-    overflow: hidden;
+    // overflow: hidden;
     .home {
         width: 265px;
         height: 48px;

+ 2 - 2
src/views/other/gcfz1.vue

@@ -9,8 +9,8 @@
         show-summary
         border
     >
-        <el-table-column label='序号' type='index' width="60"></el-table-column>
-        <el-table-column prop label='楼层' :show-overflow-tooltip='true' resizable >
+        <el-table-column label='序号' type='index' width='60'></el-table-column>
+        <el-table-column prop label='楼层' :show-overflow-tooltip='true' resizable>
             <template slot-scope='{row}'>{{row.floor||'--'}}</template>
         </el-table-column>
         <el-table-column prop='beforekf' label='总间数'>

+ 4 - 1
src/views/other/gcfz2.vue

@@ -43,7 +43,7 @@
                 style='width: 100%'
                 border
             >
-                <el-table-column label='序号' type='index' width='50'></el-table-column>
+                <el-table-column label='序号' type='index' width='60' :index='indexMethod'></el-table-column>
                 <el-table-column prop label='楼层' width='130'>
                     <template slot-scope='{row}'>{{row.floor||'--'}}</template>
                 </el-table-column>
@@ -116,6 +116,9 @@ export default {
         },
         changelc() {
             this.$emit('changeEmit', this.cg)
+        },
+        indexMethod(index) {
+            return (this.page - 1) * this.size + index + 1
         }
     }
 }

+ 36 - 16
src/views/other/index.vue

@@ -17,19 +17,19 @@
             </div>
             <!-- 楼层 -->
             <div class='other-right' v-if='matterId!=1'>
-                <floor-list v-if='floorData.length>0' :floorsArr='floorData' @emitFloor='emitFloor' :type='2'></floor-list>
+                <floor-list-other v-if='floorData.length>0' :floorsArr='floorData' @emitFloor='emitFloor' :type='2'></floor-list-other>
             </div>
-            <!-- 图例 -->
-            <!-- <div class='legend-boxs' v-if='matterId!=1'>
-                <Legend></Legend>
-            </div>-->
         </div>
         <other-dialog ref='dialog' :systemName='systemName'></other-dialog>
         <!-- 综合事项管理 -->
         <zhsx-other v-if='matterId==1&&everySystem.length>0' :everySystem='everySystem'></zhsx-other>
         <!-- 辅助用房管理 -->
         <div class='qtfugl' v-if='matterId==2'>
-            <div class='fzyfImg'>
+            <div v-if='floorData.length==0' class='fzyfwtp'>
+                <img src='@/assets/imgs/wtp.png' alt />
+                <p class='fjt'>暂无附加数据图片</p>
+            </div>
+            <div class='fzyfImg' v-else>
                 <img :src='picFloorImg' alt />
             </div>
         </div>
@@ -42,7 +42,7 @@ import ZhsxOther from './zhsxOther'
 import GcfzDialog from './gcfzDialog'
 import OtherDialog from './otherDialog'
 import { queryPic, queryTab } from '@/api/public.js'
-import floorList from '@/components/floorList.vue'
+import floorListOther from '@/components/floorListOther.vue'
 import { matter } from '@/utils/plugins/components.js'
 import { mapGetters } from 'vuex'
 export default {
@@ -62,7 +62,7 @@ export default {
             floorData: []
         }
     },
-    components: { floorList, OtherDialog, ZhsxOther, GcfzDialog },
+    components: { floorListOther, OtherDialog, ZhsxOther, GcfzDialog },
     methods: {
         tabSyatem(item) {
             this.matterId = item.id
@@ -87,7 +87,6 @@ export default {
             queryPic({ getParams }).then(res => {
                 //console.log('库房管理图', res)
                 this.picFloorImg = res.data[0].url ? res.data[0].url : ''
-                //console.log('this.picFloorImg', this.picFloorImg)
             })
         },
         // 查询哪几个楼层有库房图
@@ -132,10 +131,6 @@ export default {
                 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,
@@ -150,11 +145,9 @@ export default {
                                     ? 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)
             })
         }
     },
@@ -163,7 +156,6 @@ export default {
     },
     mounted() {
         this.everySystem = this.matter[0].children
-        // this.queryPicter()
         this.tabSize()
     }
 }
@@ -255,6 +247,34 @@ export default {
                 margin: 0 auto;
             }
         }
+        .fzyfwtp {
+            width: 1035px;
+            height: 544px;
+            margin: 0 auto;
+            margin-top: 93px;
+            position: relative;
+            img {
+                width: 126px;
+                height: 121px;
+                position: absolute;
+                top: 50%;
+                left: 50%;
+                margin-top: -60px;
+                margin-left: -63px;
+            }
+            .fjt {
+                margin-top: 7px;
+                font-size: 16px;
+                font-family: MicrosoftYaHei;
+                color: rgba(100, 108, 115, 1);
+                line-height: 21px;
+                position: absolute;
+                top: 50%;
+                left: 50%;
+                margin-top: 65px;
+                margin-left: -60px;
+            }
+        }
     }
 }
 </style> 

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

@@ -9,7 +9,7 @@
                 <p>4.广场安全质量第三方检测过程中列出的整改事项</p>
                 <div class='bottom-table'>
                     <el-table :data='tableData' height='480' style='width:100%;' :span-method='objectSpanMethod' border v-if='tableData.length>0'>
-                        <el-table-column label='序号' type='index' width='50'></el-table-column>
+                        <el-table-column label='序号' type='index' width='60'></el-table-column>
                         <el-table-column prop='jcsx' label='检测事项' :show-overflow-tooltip='true'></el-table-column>
                         <el-table-column prop='zgbm' label='主管部门' :show-overflow-tooltip='true'></el-table-column>
                         <el-table-column prop='jlsx' label='记录事项' :show-overflow-tooltip='true'></el-table-column>

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

@@ -37,7 +37,7 @@
             :data='zhjlTable'
             style='width: 100%;margin-top:12px'
         >
-            <el-table-column label='序号' type='index' width='60'></el-table-column>
+            <el-table-column label='序号' type='index' width='60' :index='indexMethod'></el-table-column>
             <el-table-column prop sortable label='日期' width='100' resizable>
                 <template slot-scope='{row}'>{{formatter(row.createdate)||'--'}}</template>
             </el-table-column>
@@ -119,6 +119,9 @@ export default {
         changeData(val) {
             //console.log(val)
         },
+        indexMethod(index) {
+            return (this.page - 1) * this.size + index + 1
+        },
         // 综合记录
         getZhjl() {
             let getParams = {

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

@@ -55,7 +55,7 @@
             :data='dsfTable'
             style='width: 100%;margin-top:12px'
         >
-            <el-table-column label='序号' type='index' width='60'></el-table-column>
+            <el-table-column label='序号' type='index' width='60' :index='indexMethod'></el-table-column>
             <el-table-column prop :show-overflow-tooltip='true' sortable label='任务名称' width='540'>
                 <template slot-scope='{row}'>{{row.description||'--'}}</template>
             </el-table-column>
@@ -107,6 +107,9 @@ export default {
     },
     components: { Select },
     methods: {
+        indexMethod(index) {
+            return (this.page - 1) * this.size + index + 1
+        },
         // 第三方
         dsfjc() {
             let getParams = {

+ 3 - 2
src/views/room/room5.vue

@@ -20,7 +20,8 @@
                 </el-table-column>
                 <el-table-column prop label='现场照片' :show-overflow-tooltip='true' width='80'>
                     <template slot-scope='{row}'>
-                        <div v-if="row.glsmsImage"
+                        <div
+                            v-if='row.glsmsImage'
                             style='cursor:pointer;color: #0091ff;'
                             @click='clickPic(row.glsmsImage)'
                         >{{row.glsmsImage.length+'张'}}</div>
@@ -56,7 +57,7 @@
                     <el-table-column prop label='异常工单编号' :show-overflow-tooltip='true' min-width='110'>
                         <template slot-scope='{row}'>{{row.wonum||'--'}}</template>
                     </el-table-column>
-                    <el-table-column prop label='描述' :show-overflow-tooltip='true' min-width='320'>
+                    <el-table-column prop label='描述' :show-overflow-tooltip='true' width='900'>
                         <template slot-scope='{row}'>{{row.description||'--'}}</template>
                     </el-table-column>
                     <el-table-column prop label='填报时间' :show-overflow-tooltip='true' width='130'>