Forráskód Böngészése

Merge branch 'develop' of git.sagacloud.cn:web/wanda-bm-guide into develop

guoxiaohuan 4 éve
szülő
commit
d2123ee7e1

+ 32 - 0
src/components/Legend/src/legend.vue

@@ -173,6 +173,13 @@ export default {
         innerLeng: {
             type: Number,
             default: 0
+        },
+        // 弹窗组件内部传入的楼层信息
+        floorInfo: {
+            type: Object,
+            default() {
+                return {}
+            }
         }
     },
     components: { lengendView, legendRemarks, lengendEdit },
@@ -201,6 +208,19 @@ export default {
                 }
             },
             deep: true
+        },
+        // 弹窗组件内传入floorInfo,查询 getDraftNum
+        floorInfo: {
+            handler(newV,oldV) {
+                 if (newV !== oldV) {
+                    clearInterval(this.timer)
+                    this.getDraftNum()
+                    this.timer = setInterval(() => {
+                        this.getDraftNum()
+                    }, this.interval)
+                }
+            },
+            deep: true
         }
     },
     '$refs.viewLengend': {
@@ -217,6 +237,8 @@ export default {
             let res = null,
                 floorId = this.$store.state.currentFloor.gname || this.$cookie.get('floorMapId'),
                 categoryId = this.categoryId || this.$cookie.get('categoryId')
+            // 弹窗组件内传入floorInfo,使用其楼层id
+            this.floorInfo.gname && (floorId = this.floorInfo.gname)
             // 增加校验 floorId,防止上传 undefined
             if (!floorId) {
                 return true
@@ -325,6 +347,12 @@ export default {
             const editerUrl = conf[process.env.NODE_ENV + '_editerUrl']
             let floorName = this.floorName ? this.floorName : this.$cookie.get('floorNow')
             let seq = this.$cookie.get('currentFloorId')
+            // 弹窗组件内传入floorInfo,使用其楼层id
+            if (this.floorInfo.gname) {
+                FloorID = this.floorInfo.gname
+                floorName = this.floorInfo.code
+                seq = this.floorInfo.seq
+            }
             let data = `categoryId=${categoryId}&projectId=${this.plazaId}&BuildingID=1&FloorID=${FloorID}&FloorName=${floorName}&fmapID=${this.fmapID}&seq=${seq}&token=${this.ssoToken}`
             let url = editerUrl + 'editer?' + encodeURIComponent(data)
             window.open(url, true)
@@ -350,6 +378,8 @@ export default {
                 buildingId: '1',
                 floorId: this.$store.state.currentFloor.gname
             }
+            // 弹窗组件内传入floorInfo,使用其楼层id
+            this.floorInfo.gname && (data.floorId = this.floorInfo.gname)
             queryStatis({ data, postParams }).then(res => {
                 this.loading = false
                 let viewTable = []
@@ -402,6 +432,8 @@ export default {
                 buildingId: '1',
                 floorId: this.$store.state.currentFloor.gname
             }
+            // 弹窗组件内传入floorInfo,使用其楼层id
+            this.floorInfo.gname && (data.floorId = this.floorInfo.gname)
             queryStatis({ data, postParams }).then(res => {
                 this.loading1 = false
                 this.editTable = res.data.Data ? res.data.Data : []

+ 3 - 3
src/components/floorList.vue

@@ -6,12 +6,12 @@
 <template>
     <div class='floor-box'>
         <div class='floor-list'>
-            <div class='icon-top' v-if='floorsArr.length>showNumber'>
+            <div class='icon-top' v-if='floorsArr.length>8'>
                 <!-- @click='changeFloor(1,currIndex)' -->
                 <img v-show='parseInt(marginTop) !== 0' v-repeat-click='increase' src='@/assets/imgs/iconBlackTop.png' alt />
                 <img class='disabled' v-show='parseInt(marginTop) === 0' src='@/assets/imgs/iconLightTop.png' alt />
             </div>
-            <div class='floor-out' :style='{ maxHeight:conHeight + "px;" }'>
+            <div class='floor-out' :style='{ height:conHeight + "px" }'>
                 <!--  放开marginTop样式  -->
                 <div class='floor-center' :style='{ marginTop : marginTop }'>
                     <div
@@ -23,7 +23,7 @@
                     >{{item.code}}</div>
                 </div>
             </div>
-            <div class='icon-bottom' v-if='floorsArr.length>showNumber'>
+            <div class='icon-bottom' v-if='floorsArr.length>8'>
                 <!-- v-repeat-click='decrease' -->
                 <img v-show='parseInt(marginTop) !== marginTopMax' v-repeat-click='decrease' src='@/assets/imgs/iconBlackBottom.png' alt />
                 <img class='disabled' v-show='parseInt(marginTop) === marginTopMax' src='@/assets/imgs/iconLightBottom.png' alt />

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 366 - 366
src/utils/plugins/components.js


+ 1 - 1
src/views/equipment/fenbuPic.vue

@@ -2,7 +2,7 @@
     <div class='fenbu-box'>
         <!-- 图例 -->
         <div class='legend-boxs'>
-            <Legend :innerLeng='1' :floors='floors' type='0' :categoryId='`${typecode=="FBT1"?"FZQZL":"XFBFYCFL"}`'></Legend>
+            <Legend :innerLeng='1' :floorInfo="floorInfo"  :floors='floors' type='0' :categoryId='`${typecode=="FBT1"?"FZQZL":"XFBFYCFL"}`'></Legend>
             <floor-list v-if='floors.length>0' :changeDataFlag='false' :floorsArr='floors' @emitFloor='emitFloor' :id='"floor"'></floor-list>
         </div>
         <div v-show='floors.length>0' class='canvas-box'>

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

@@ -151,8 +151,7 @@ export default {
         }
     },
     mounted() {
-        console.log('商铺电表数 mounted')
-        this.floor = this.$cookie.get('floorMapId')
+        // this.floor = this.$cookie.get('floorMapId')
         console.log(this.floor)
         this.getList()
     }

+ 10 - 3
src/views/equipment/table/eqListTable.vue

@@ -61,9 +61,9 @@
                 <el-table-column prop='floorcode' label='楼层' width='240' show-overflow-tooltip resizable>
                     <template slot-scope='{row}'>{{row.floorcode || '--'}}</template>
                 </el-table-column>
-                <el-table-column prop='wzjc' label='安装位置' show-overflow-tooltip resizable>
+                <!-- <el-table-column prop='wzjc' label='安装位置' show-overflow-tooltip resizable>
                     <template slot-scope='{row}'>{{row.wzjc || '--'}}</template>
-                </el-table-column>
+                </el-table-column>-->
                 <el-table-column prop='manufacturer' label='生产厂商' show-overflow-tooltip resizable min-width='300'>
                     <template slot-scope='{row}'>{{row.manufacturer || '--'}}</template>
                 </el-table-column>
@@ -196,7 +196,7 @@ export default {
         }
     },
     mounted() {
-        this.floor = this.$cookie.get('floorMapId')
+        // this.floor = this.$cookie.get('floorMapId')
         this.getList()
         this.$nextTick(() => {
             // 页面渲染完成后的回调
@@ -234,4 +234,11 @@ export default {
         margin-top: 5vh !important;
     }
 }
+</style>
+<style lang="less">
+.eq-list {
+    /deep/.el-table tr {
+        cursor: pointer;
+    }
+}
 </style>

+ 18 - 2
src/views/equipment/table/recordDialog.vue

@@ -2,10 +2,10 @@
     <!-- 记录事项 -->
     <div class='detail-dialog'>
         <el-dialog :title='`${major}${tabName}记录事项`' width='80%' :visible.sync='visible' style='height:900px;overflow-y:scroll;'>
-            <div class='bottom-table' style='height:600px'>
+            <div class='bottom-table' :style='`height:${height}`'>
                 <el-table
                     :data='tableData'
-                    height='560'
+                    :height='tableHeight'
                     :border='true'
                     style='width: 100%;margin-bottom:12px;'
                     :span-method='objectSpanMethod'
@@ -39,6 +39,22 @@ export default {
             tableData: []
         }
     },
+    computed: {
+        tableHeight() {
+            if (window.screen.height <= 768) {
+                return 450
+            } else {
+                return 560
+            }
+        },
+        height() {
+            if (window.screen.height <= 768) {
+                return 500
+            } else {
+                return 600
+            }
+        }
+    },
     methods: {
         open(smsxt) {
             // console.log(major)

+ 8 - 1
src/views/equipment/table/standTable.vue

@@ -199,7 +199,7 @@ export default {
         }
     },
     mounted() {
-        this.floor = this.$cookie.get('floorMapId')
+        // this.floor = this.$cookie.get('floorMapId')
         this.getList()
         this.$nextTick(() => {
             // 页面渲染完成后的回调
@@ -238,4 +238,11 @@ export default {
         margin-top: 5vh !important;
     }
 }
+</style>
+<style lang="less">
+.stand-list {
+    /deep/.el-table tr {
+        cursor: pointer;
+    }
+}
 </style>

+ 7 - 4
src/views/equipment/table/wbTable.vue

@@ -13,7 +13,7 @@
                 style='width:192px;margin-right:12px'
             ></el-input>
             <el-input
-                placeholder='搜索重要事项记录描述'
+                placeholder='搜索事项类型事项描述'
                 size='small'
                 @keyup.enter.native='getList'
                 @blur='getList'
@@ -70,13 +70,13 @@
                 <el-table-column prop='sbmc' label='设备名称' show-overflow-tooltip resizable width='460'>
                     <template slot-scope='{row}'>{{row.sbmc || '--'}}</template>
                 </el-table-column>
-                <el-table-column prop='assetnum' label='设备码' show-overflow-tooltip resizable width='80'>
+                <el-table-column prop='assetnum' label='设备码' show-overflow-tooltip resizable width='80'>
                     <template slot-scope='{row}'>{{row.assetnum || '--'}}</template>
                 </el-table-column>
-                <el-table-column prop='matters' label='重要事项记录' width='180' show-overflow-tooltip resizable>
+                <el-table-column prop='matters' label='事项类型' width='180' show-overflow-tooltip resizable>
                     <template slot-scope='{row}'>{{row.matters || '--'}}</template>
                 </el-table-column>
-                <el-table-column prop='description' label='描述' show-overflow-tooltip resizable min-width='340'>
+                <el-table-column prop='description' label='事项描述' show-overflow-tooltip resizable min-width='340'>
                     <template slot-scope='{row}'>{{row.description || '--'}}</template>
                 </el-table-column>
                 <el-table-column label='更换配件信息' align='center'>
@@ -352,5 +352,8 @@ export default {
             color: rgb(31, 36, 41);
         }
     }
+    /deep/.el-table tr {
+        cursor: pointer;
+    }
 }
 </style>

+ 11 - 4
src/views/equipment/table/wxTable.vue

@@ -13,7 +13,7 @@
                 style='width:192px;margin-right:12px'
             ></el-input>
             <el-input
-                placeholder='搜索重要事项记录描述'
+                placeholder='搜索事项类型事项描述'
                 size='small'
                 clearable
                 @keyup.enter.native='getList'
@@ -70,13 +70,13 @@
                 <el-table-column prop='sbmc' label='设备名称' show-overflow-tooltip resizable min-width='460'>
                     <template slot-scope='{row}'>{{row.sbmc || '--'}}</template>
                 </el-table-column>
-                <el-table-column prop='assetnum' label='设备码' show-overflow-tooltip resizable width='80'>
+                <el-table-column prop='assetnum' label='设备码' show-overflow-tooltip resizable width='80'>
                     <template slot-scope='{row}'>{{row.assetnum || '--'}}</template>
                 </el-table-column>
-                <el-table-column prop='matters' label='重要事项记录' width='180' show-overflow-tooltip resizable>
+                <el-table-column prop='matters' label='事项类型' width='180' show-overflow-tooltip resizable>
                     <template slot-scope='{row}'>{{row.matters || '--'}}</template>
                 </el-table-column>
-                <el-table-column prop='description' label='描述' show-overflow-tooltip resizable min-width='340'>
+                <el-table-column prop='description' label='事项描述' show-overflow-tooltip resizable min-width='340'>
                     <template slot-scope='{row}'>{{row.description || '--'}}</template>
                 </el-table-column>
                 <el-table-column label='更换配件信息' align='center'>
@@ -268,6 +268,10 @@ export default {
             if (newV !== oldV) {
                 // this.tabFind()
                 this.getList()
+                this.$nextTick(() => {
+                    // 页面渲染完成后的回调
+                    this.tableMaxHeight = this.$refs.tableBox.offsetHeight
+                })
             }
         },
         ischange() {
@@ -339,5 +343,8 @@ export default {
             color: rgb(31, 36, 41);
         }
     }
+    /deep/.el-table tr {
+        cursor: pointer;
+    }
 }
 </style>

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

@@ -7,8 +7,15 @@
                 <p>2.广场消防安全培训、消防演习</p>
                 <p>3.相关政府强制性检测的按时完成情况及检测中提出的问题</p>
                 <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'>
+                <div class='bottom-table' :style='`height:${height}`'>
+                    <el-table
+                        :data='tableData'
+                        :height='tableHeight'
+                        style='width:100%;'
+                        :span-method='objectSpanMethod'
+                        border
+                        v-if='tableData.length>0'
+                    >
                         <el-table-column label='序号' type='index' width='60'></el-table-column>
                         <el-table-column prop='jcsx' label='检测事项' :show-overflow-tooltip='true' width='400'></el-table-column>
                         <el-table-column prop='zgbm' label='主管部门' :show-overflow-tooltip='true'></el-table-column>
@@ -27,6 +34,22 @@ export default {
             visible: false
         }
     },
+    computed: {
+        tableHeight() {
+            if (window.screen.height <= 768) {
+                return 350
+            } else {
+                return 440
+            }
+        },
+        height() {
+            if (window.screen.height <= 768) {
+                return 300
+            } else {
+                return 400
+            }
+        }
+    },
     methods: {
         open() {
             this.visible = true

+ 5 - 0
src/views/other/zhsxOther.vue

@@ -179,5 +179,10 @@ export default {
     .el-input--suffix .el-input__inner {
         padding-right: 20px;
     }
+    @media screen and (max-width: 1366px) {
+        /deep/ .el-table td {
+            padding: 3px 0;
+        }
+    }
 }
 </style>

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

@@ -157,7 +157,7 @@
                                 clearable
                                 @keyup.enter.native='Index3'
                                 @blur='Index3'
-                                placeholder='搜索重要事项记录、描述'
+                                placeholder='搜索事项类型、事项描述'
                                 size='small'
                                 prefix-icon='el-icon-search'
                                 v-model='zysxInput4'

+ 2 - 2
src/views/room/room4.vue

@@ -17,10 +17,10 @@
                 <el-table-column prop label='设备编号' show-overflow-tooltip resizable width='80'>
                     <template slot-scope='{row}'>{{row.location||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop label='重要事项记录' show-overflow-tooltip resizable min-width='120'>
+                <el-table-column prop label='事项类型' show-overflow-tooltip resizable min-width='120'>
                     <template slot-scope='{row}'>{{row.matters||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop label='描述' show-overflow-tooltip resizable min-width='310'>
+                <el-table-column prop label='事项描述' show-overflow-tooltip resizable min-width='310'>
                     <template slot-scope='{row}'>{{row.description||'--'}}</template>
                 </el-table-column>
                 <el-table-column prop label='更换配件信息' align='center' show-overflow-tooltip resizable>