فهرست منبع

Merge branch 'develop' of http://39.106.8.246:3003/web/wanda-bm-guide into develop

shaun-sheep 4 سال پیش
والد
کامیت
57158bfa92
34فایلهای تغییر یافته به همراه576 افزوده شده و 205 حذف شده
  1. 38 38
      src/api/httputils.js
  2. 5 5
      src/components/Legend/src/legend.vue
  3. 0 1
      src/components/Rotation/index.js
  4. 24 48
      src/components/floorList.vue
  5. 287 0
      src/components/floorListOther.vue
  6. 14 14
      src/components/floorMap/index.vue
  7. 5 5
      src/components/mapClass/EditScence.js
  8. 3 3
      src/components/menuList.vue
  9. 6 6
      src/views/equipment/eqDialog.vue
  10. 9 5
      src/views/equipment/index.vue
  11. 4 4
      src/views/equipment/legendBox.vue
  12. 3 3
      src/views/equipment/table/eqDetaileDialog.vue
  13. 2 2
      src/views/equipment/table/eqListTable.vue
  14. 1 1
      src/views/equipment/table/lookPageTable.vue
  15. 3 3
      src/views/equipment/table/otherTable.vue
  16. 1 1
      src/views/equipment/table/recordDialog.vue
  17. 1 1
      src/views/equipment/table/standTable.vue
  18. 1 1
      src/views/equipment/table/wbTable.vue
  19. 1 1
      src/views/equipment/table/zwTable.vue
  20. 5 1
      src/views/floorFunc/index.vue
  21. 0 1
      src/views/index.vue
  22. 5 5
      src/views/legendLibrary/addForm.vue
  23. 1 1
      src/views/legendLibrary/addLegend.vue
  24. 1 1
      src/views/legendRules/addList.vue
  25. 3 3
      src/views/other/gcfzDialog.vue
  26. 85 18
      src/views/other/index.vue
  27. 2 2
      src/views/other/otherDialog.vue
  28. 31 1
      src/views/other/zhsxDialog.vue
  29. 12 2
      src/views/other/zhsxOther.vue
  30. 4 4
      src/views/other/zhsxOtherTable1.vue
  31. 7 12
      src/views/other/zhsxOtherTable2.vue
  32. 4 4
      src/views/room/detail.vue
  33. 7 7
      src/views/room/index.vue
  34. 1 1
      src/views/room/inputDialog.vue

+ 38 - 38
src/api/httputils.js

@@ -1,6 +1,6 @@
-import axios from "axios"
-import store from "@/store"
-import { MessageBox } from "element-ui"
+import axios from 'axios'
+import store from '@/store'
+import { MessageBox } from 'element-ui'
 
 var CancelToken = axios.CancelToken
 var cancel
@@ -20,10 +20,10 @@ const axiosservice = axios.create({
 axiosservice.interceptors.request.use(
     (config) => {
         config.withCredentials = true // 允许携带token ,这个是解决跨域产生的相关问题
-        let token = store.getters["token"]
+        let token = store.getters['token']
         if (token) {
             config.headers = {
-                "sso-token": token,
+                'sso-token': token,
             }
         }
         return config
@@ -36,33 +36,33 @@ axiosservice.interceptors.request.use(
 axiosservice.interceptors.response.use(
     function(res) {
         //在这里对返回的数据进行处理
-        //console.log('axios interceptors res = ', res.status, res)
+        //// //console.log('axios interceptors res = ', res.status, res)
         let resp = res.data
-        if (resp.result === "unauthc") {
-            store.commit("logined", false)
-            MessageBox.confirm("未登陆或登陆信息已失效, 是否重新登陆?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "error",
+        if (resp.result === 'unauthc') {
+            store.commit('logined', false)
+            MessageBox.confirm('未登陆或登陆信息已失效, 是否重新登陆?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'error',
             })
                 .then((resp) => {
-                    //console.log('--------------------------- confirm', resp)
+                    //// //console.log('--------------------------- confirm', resp)
                     //router.push('/login')
                     window.location.reload()
                 })
                 .catch((error) => {
-                    //console.log('--------------------------- cancel', error)
-                    console.log("")
+                    //// //console.log('--------------------------- cancel', error)
+                    // //console.log("")
                 })
-        } else if (resp.result == "unauthorization") {
-            MessageBox.alert("无权操作", { title: "警告", type: "error" })
+        } else if (resp.result == 'unauthorization') {
+            MessageBox.alert('无权操作', { title: '警告', type: 'error' })
         }
-        //console.log('axios interceptors resp2 = ', resp.success, resp.errorCode, resp.errorMessage, res)
+        //// //console.log('axios interceptors resp2 = ', resp.success, resp.errorCode, resp.errorMessage, res)
         return res
     },
     function(err) {
         //Do something with response error
-        console.log("axios interceptors err = ", err)
+        // //console.log("axios interceptors err = ", err)
         return Promise.reject(err)
     }
 )
@@ -70,11 +70,11 @@ axiosservice.interceptors.response.use(
 /* 下载方法 */
 function downFile(blob, fileName) {
     // 非IE下载
-    if ("download" in document.createElement("a")) {
-        let link = document.createElement("a")
+    if ('download' in document.createElement('a')) {
+        let link = document.createElement('a')
         link.href = window.URL.createObjectURL(blob) // 创建下载的链接
         link.download = fileName // 下载后文件名
-        link.style.display = "none"
+        link.style.display = 'none'
         document.body.appendChild(link)
         link.click() // 点击下载
         window.URL.revokeObjectURL(link.href) // 释放掉blob对象
@@ -89,7 +89,7 @@ export default {
     //获取cookie
     getCookie(name) {
         var arr,
-            reg = new RegExp("(^| )" + name + "=([^;]*)(;|$)")
+            reg = new RegExp('(^| )' + name + '=([^;]*)(;|$)')
         if ((arr = document.cookie.match(reg))) {
             return unescape(arr[2])
         } else {
@@ -103,7 +103,7 @@ export default {
             let response = await axiosservice({
                 url,
                 params,
-                method: "get",
+                method: 'get',
             })
             return response.data
         } catch (err) {
@@ -115,7 +115,7 @@ export default {
             let response = await axiosservice({
                 url,
                 data,
-                method: "post",
+                method: 'post',
             })
             return response.data
         } catch (err) {
@@ -128,7 +128,7 @@ export default {
                 url,
                 params,
                 data,
-                method: "post",
+                method: 'post',
             })
             return response
         } catch (err) {
@@ -140,9 +140,9 @@ export default {
             let response = await axiosservice({
                 url,
                 data,
-                method: "post",
+                method: 'post',
                 headers: {
-                    "Content-Type": "multipart/form-data",
+                    'Content-Type': 'multipart/form-data',
                 },
             })
             return response.data
@@ -153,30 +153,30 @@ export default {
     download(url, requestData) {
         // 响应类型:arraybuffer, blob
         axiosservice
-            .post(url, requestData, { responseType: "blob" })
+            .post(url, requestData, { responseType: 'blob' })
             .then((resp) => {
                 let headers = resp.headers
-                let contentType = headers["content-type"]
+                let contentType = headers['content-type']
 
-                console.log("响应头信息", headers)
+                // //console.log("响应头信息", headers)
                 if (!resp.data) {
-                    console.error("响应异常:", resp)
+                    console.error('响应异常:', resp)
                     return false
                 } else {
-                    console.log("下载文件:", resp)
+                    // //console.log("下载文件:", resp)
                     const blob = new Blob([resp.data], { type: contentType })
 
-                    const contentDisposition = resp.headers["content-disposition"]
-                    let fileName = "unknown"
+                    const contentDisposition = resp.headers['content-disposition']
+                    let fileName = 'unknown'
                     if (contentDisposition) {
-                        fileName = window.decodeURI(resp.headers["content-disposition"].split("=")[1])
+                        fileName = window.decodeURI(resp.headers['content-disposition'].split('=')[1])
                     }
-                    console.log("文件名称:", fileName)
+                    // //console.log("文件名称:", fileName)
                     downFile(blob, fileName)
                 }
             })
             .catch(function(error) {
-                console.log(error)
+                // //console.log(error)
             })
     },
     axios: axiosservice,

+ 5 - 5
src/components/Legend/src/legend.vue

@@ -111,7 +111,7 @@ export default {
                 }
             }
             queryRead(params).then(res => {
-                console.log('备注', res.data.Data[0].Note)
+                //console.log('备注', res.data.Data[0].Note)
                 if (res.data.Data[0].Note) {
                     let note = res.data.Data[0].Note
                     if (note.search(this.text1) != -1 && note.search(this.text2) != -1) {
@@ -159,7 +159,7 @@ export default {
             window.open(url, true)
         },
         isShow2() {
-            console.log(this.isShow2)
+            //console.log(this.isShow2)
             this.show2 = !this.show2
         },
         handleSwich(val) {
@@ -179,7 +179,7 @@ export default {
             }
             queryStatis({ data, postParams }).then(res => {
                 this.loading = false
-                console.log('图例', res)
+                //console.log('图例', res)
                 this.viewTable = res.data.Data ? res.data.Data : []
                 this.$nextTick(() => {
                     if (this.$refs.viewLengend) {
@@ -198,7 +198,7 @@ export default {
                 flag: flag
             }
             queryStatis({ data, postParams }).then(res => {
-                console.log('编辑图例数', res)
+                //console.log('编辑图例数', res)
                 this.loading1 = false
                 this.editTable = res.data.Data ? res.data.Data : []
             })
@@ -212,7 +212,7 @@ export default {
             }
             updateStatis(params).then(res => {
                 if (res.Result == 'success') {
-                    console.log('更新图例', res)
+                    //console.log('更新图例', res)
                     this.$message({
                         message: '编辑图例成功',
                         type: 'success'

+ 0 - 1
src/components/Rotation/index.js

@@ -2,5 +2,4 @@ import Rotation from './src/rotation.vue'
 Rotation.install = function(Vue) {
     Vue.component(Rotation.name, Rotation)
 }
-console.log(Rotation)
 export default Rotation

+ 24 - 48
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,37 +48,31 @@ export default {
                 name: '第1层',
                 seq: 100
             },
-            currentFloorId: null,
-            floorIdArr: []
+            currentFloorId: null
         }
     },
+    props: ['floorsArr'],
     mounted() {
-        // this.removeBottom(-1)
-        // this.tabFloor()
-        console.log(`floorsArr---------------:\n`, this.floorsArr)
         this.init()
     },
     watch: {
         // 监听floorsArr的变化
-        /* floorsArr: {
-            handler(newVal, oldVal) {
-                this.init()
-            },
-            deep: true,
-            immediate: true
-        } */
-    },
-    computed: {
-        ...mapGetters(['floorsArr'])
+        // '$store.state.floorsArr': {
+        //     handler(newV, oldV) {
+        //         newV && this.init()
+        //     },
+        //     deep: true
+        // }
     },
     methods: {
         init() {
-            window.vm = this
+            if (!this.floorsArr.length) {
+                return false
+            }
             this.floorIdArr = []
             this.floorsArr.map(item => {
                 this.floorIdArr.push(item.seq)
             })
-            console.log('cookie:', this.$cookie.get('currentFloorId'))
             this.currentFloorId = Number(this.$cookie.get('currentFloorId') || 100)
             this.changeFloor(0)
         },
@@ -84,7 +82,6 @@ export default {
          * @description 点击图例下方的,上下切换按钮
          */
         changeFloor(flag) {
-            console.log(this.floorIdArr)
             const len = this.floorIdArr.length
             let index = this.floorIdArr.findIndex(item => item === this.currentFloorId)
             // 点击上箭头
@@ -98,9 +95,6 @@ export default {
             }
             // 数据处理
             this.handleCookie()
-            // debugger
-            console.log('---------------index:', index, '--------------')
-            console.log('---------------floorIdArr:', this.floorIdArr, '--------------')
             //楼层位置处理,
             const inner = document.querySelectorAll('.floor-item')
             const innerbox = document.querySelector('.floor-center')
@@ -113,7 +107,8 @@ export default {
             // flag 为0时,timer设置为0
             flag === 0 && (timer = 0)
             if (index >= showNumber - 1) {
-                index < len - 1 && animate(innerbox, { marginTop: -height * (index - (showNumber - 2)) }, timer)
+                animate(innerbox, { marginTop: -height * (index - (showNumber - 2)) }, timer)
+                // index < len - 1 && animate(innerbox, { marginTop: -height * (index - (showNumber - 2)) }, timer)
             } else {
                 // 前 showNumber 条的margin-top设置为0
                 animate(innerbox, { marginTop: 0 }, 500)
@@ -138,7 +133,6 @@ export default {
                 //  最后一条的 下箭头设置为禁用
                 case len - 1:
                     this.currentFloorId = this.floorIdArr[len - 1]
-                    console.log('currentFloorId', this.currentFloorId)
                     this.showT = true
                     this.showB = false
                     break
@@ -155,9 +149,6 @@ export default {
          */
         handleCookie() {
             let currentFloor = this.floorsArr.filter(item => item.seq == this.currentFloorId)[0]
-            console.log('------------------------')
-            console.log('currentFloor', currentFloor)
-            console.log('------------------------')
             this.$cookie.set('floorNow', currentFloor.code, 3)
             this.$cookie.set('floorMapId', currentFloor.gname, 3)
             this.$cookie.set('currentFloorId', currentFloor.seq, 3)
@@ -175,23 +166,8 @@ export default {
             this.handleCookie()
             this.handleUpDownStatus(index, this.floorIdArr.length)
         },
-        /* tabFloor(item = this.floor, index) {
-            console.log(this.num)
-            if (this.num <= -1) {
-                this.showT = true
-            }
-            if (this.num > -1) {
-                this.showB = true
-            }
-            this.$cookie.set('floorNow', item.code, 3)
-            this.$cookie.set('floorMapId', item.gname, 3)
-            this.floorId = this.$cookie.get('floorNow') || item.code
-            this.floorMapIdName = this.$cookie.get('floorMapId') || item.gname
-            this.$emit('emitFloor', item)
-        }, */
-
         removeTop(num) {
-            console.log(num)
+            //console.log(num)
             if (num == -1) {
                 this.num = num
                 this.showT = false
@@ -210,7 +186,7 @@ export default {
             }
         },
         removeBottom(num) {
-            console.log(num)
+            //console.log(num)
             // let num = 0
             if (num == -2) {
                 this.num = num

+ 287 - 0
src/components/floorListOther.vue

@@ -0,0 +1,287 @@
+/**
+*@author:Guoxiaohuan
+*@date:2020.06.02
+*@info:楼层列表
+*/
+<template>
+    <div class='floor-box'>
+        <div class='floor-list'>
+            <!-- <i class='el-icon-caret-top icon-top' v-if='showT' @click='removeTop(num)'></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
+                        class='floor-item'
+                        :class='item.seq == currentFloorId?"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> -->
+            <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'
+export default {
+    data() {
+        return {
+            floorId: 'F1',
+            showT: true,
+            showB: true,
+            num: 0,
+            floorMapIdName: '',
+            floor: {
+                code: 'F1',
+                gcode: '1F',
+                gname: 'f1',
+                name: '第1层',
+                seq: 100
+            },
+            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
+        // }
+    },
+    methods: {
+        init() {
+            if (!this.floorsArr.length) {
+                return false
+            }
+            this.floorIdArr = []
+            this.floorsArr.map(item => {
+                this.floorIdArr.push(item.seq)
+            })
+            // this.currentFloorId = Number(this.$cookie.get('currentFloorId') || 100)
+            this.currentFloorId = this.floorsArr[0].seq
+            this.changeFloor(0)
+        },
+        /**
+         * @name changeFloor
+         * @param {Number} flag 1:向上滚动楼层, -1向下滚动 , 0:进入页面初始化时,执行位置处理
+         * @description 点击图例下方的,上下切换按钮
+         */
+        changeFloor(flag) {
+            const len = this.floorIdArr.length
+            let index = this.floorIdArr.findIndex(item => item === this.currentFloorId)
+            // 点击上箭头
+            if (flag === 1) {
+                index--
+                this.currentFloorId = this.floorIdArr[index]
+            } else if (flag === -1) {
+                //点击下箭头
+                index++
+                this.currentFloorId = this.floorIdArr[index]
+            }
+            // 数据处理
+            this.handleCookie()
+            //楼层位置处理,
+            const inner = document.querySelectorAll('.floor-item')
+            const innerbox = document.querySelector('.floor-center')
+            // 页面显示5条,当第五条以上,进行marginTop修改
+            // index从0开始
+            // TODO: 需要修改可以修改这里,配置页面样式,修改showNumber和height
+            let showNumber = 5, //页面中展示的楼层条数
+                height = 32, //一个楼层的div标签高度
+                timer = 500 //动画时长
+            // flag 为0时,timer设置为0
+            flag === 0 && (timer = 0)
+            if (index >= showNumber - 1) {
+                animate(innerbox, { marginTop: -height * (index - (showNumber - 2)) }, timer)
+                // index < len - 1 && animate(innerbox, { marginTop: -height * (index - (showNumber - 2)) }, timer)
+            } else {
+                // 前 showNumber 条的margin-top设置为0
+                animate(innerbox, { marginTop: 0 }, 500)
+            }
+            // 处理上下按钮禁用逻辑
+            this.handleUpDownStatus(index, len)
+        },
+        /**
+         * @name handleUpDownStatus
+         * @param { Number } index 当前楼层在floorIdArr中的下标
+         * @param { Number } len    floorIdArr的长度
+         * @description 处理上下按钮禁用逻辑
+         */
+        handleUpDownStatus(index, len) {
+            switch (index) {
+                // 第一条的上箭头禁用
+                case 0:
+                    this.currentFloorId = this.floorIdArr[0]
+                    this.showT = false
+                    this.showB = true
+                    break
+                //  最后一条的 下箭头设置为禁用
+                case len - 1:
+                    this.currentFloorId = this.floorIdArr[len - 1]
+                    this.showT = true
+                    this.showB = false
+                    break
+                // 默认都可以点击
+                default:
+                    this.showT = true
+                    this.showB = true
+                    break
+            }
+        },
+        /**
+         * @name handleCookie
+         * @description cookie数据处理
+         */
+        handleCookie() {
+            let currentFloor = this.floorsArr.filter(item => item.seq == this.currentFloorId)[0]
+            // this.$cookie.set('floorNow', currentFloor.code, 3)
+            // this.$cookie.set('floorMapId', currentFloor.gname, 3)
+            // this.$cookie.set('currentFloorId', currentFloor.seq, 3)
+            // this.floorId = this.$cookie.get('floorNow') || currentFloor.code
+            // this.floorMapIdName = this.$cookie.get('floorMapId') || currentFloor.gname
+            this.$emit('emitFloor', currentFloor)
+        },
+        /**
+         * @name tabFloor
+         * @param {Object} 选中的楼层信息
+         * @param {Number} 楼层信息在floorsArr数组中的位置
+         */
+        tabFloor(item, index) {
+            this.currentFloorId = this.floorIdArr[index]
+            this.handleCookie()
+            this.handleUpDownStatus(index, this.floorIdArr.length)
+        },
+        removeTop(num) {
+            //console.log(num)
+            if (num == -1) {
+                this.num = num
+                this.showT = false
+                this.showB = true
+            }
+            var inner = document.querySelectorAll('.floor-item')
+            var innerbox = document.querySelector('.floor-center')
+            if (this.num < 0) {
+                this.num++
+            } else {
+                this.num = 0
+                this.showT = false
+            }
+            if (this.num <= 0) {
+                animate(innerbox, { marginTop: 32 * this.num }, 500, function() {})
+            }
+        },
+        removeBottom(num) {
+            //console.log(num)
+            // let num = 0
+            if (num == -2) {
+                this.num = num
+                this.showB = false
+                this.showT = true
+            }
+            var inner = document.querySelectorAll('.floor-item')
+            var innerbox = document.querySelector('.floor-center')
+            if (this.num > -(inner.length - 4)) {
+                this.num--
+            } else {
+                this.num = -(inner.length - 4)
+                this.showB = false
+            }
+            if (this.num > -(inner.length - 4)) {
+                animate(innerbox, { marginTop: 32 * this.num }, 500, function() {})
+            }
+        }
+    }
+}
+</script>
+<style lang="less" scoped>
+.floor-box {
+    position: fixed;
+    right: 32px;
+    top: 196px;
+    z-index: 2;
+    .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;
+        position: relative;
+        padding: 28px 4px;
+        text-align: center;
+        .floor-out {
+            // height: 160px;
+            // height: 312px;
+            //TODO:
+            overflow: hidden;
+            // overflow-y: auto;
+            position: relative;
+            // &::-webkit-scrollbar {
+            //     display: none;
+            // }
+
+            .floor-center {
+                // TODO:
+                // margin-top: 0 !important;
+                .floor-item {
+                    width: 36px;
+                    height: 32px;
+                    cursor: pointer;
+                }
+            }
+        }
+
+        .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;
+        }
+        .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;
+        }
+        .isActive {
+            border-radius: 4px;
+            color: #025baa;
+            background: #e1f2ff;
+            line-height: 32px;
+        }
+    }
+}
+</style>

+ 14 - 14
src/components/floorMap/index.vue

@@ -44,7 +44,7 @@ export default {
             default: '1',
             type: String
         },
-        loadName:null
+        loadName: null
     },
     components: { RoomBox, canvasFun },
     computed: {
@@ -54,7 +54,7 @@ export default {
         ...mapActions(['getfmapID']),
         init(floorid) {
             if (this.loading) {
-                console.log('正在查询...')
+                //console.log('正在查询...')
                 return
             }
             this.loading = true
@@ -79,11 +79,11 @@ export default {
                 })
                 // 获取主题数据
                 fengmap.loadTheme(`${this.mapServerURL}/webtheme/${this.fmapID}/${this.fmapID}.theme`).then(res => {
-                    console.log('获取rf成功', res)
+                    //console.log('获取rf成功', res)
                 })
                 this.readGroup().then(data => {
                     if (data.data.Data.length > 0) {
-                        console.log(data.data.Data[0].ID)
+                        //console.log(data.data.Data[0].ID)
                         this.$cookie.set('graphId', data.data.Data[0].ID, 3)
                     }
                     const parserData = new STopologyParser(null)
@@ -133,7 +133,7 @@ export default {
                 if (fengmap.gnameToGid[floor]) {
                     fengmap.parseData(fengmap.gnameToGid[floor], res => {
                         if (res.err) {
-                            console.log(res.err)
+                            //console.log(res.err)
                             return
                         }
                         const fParser = new SFloorParser(null)
@@ -150,10 +150,10 @@ export default {
                         this.view.scene = this.scene
                         this.view.fitSceneToView()
                         this.loading = false
-                        console.log('success')
+                        //console.log('success')
                     })
                 } else {
-                    console.log('楼层不正确')
+                    //console.log('楼层不正确')
                 }
             }
         },
@@ -177,7 +177,7 @@ export default {
         // 保存为png
         savePng() {
             this.view.saveImage(`${this.loadName}.png`, 'png')
-            console.log(`${this.loadName}.png`)
+            //console.log(`${this.loadName}.png`)
         },
         // 保存为svg
         saveSvg() {
@@ -207,17 +207,17 @@ export default {
     },
     watch: {},
     mounted() {
-        console.log(window.screen.height)
+        //console.log(window.screen.height)
         if (window.screen.height == '768') {
             this.canvasWidth = this.$refs.graphy.offsetWidth
             this.canvasHeight = this.$refs.graphy.offsetHeight - 100
-            console.log(this.canvasWidth)
-            console.log(this.canvasHeight)
+            //console.log(this.canvasWidth)
+            //console.log(this.canvasHeight)
         } else {
             this.canvasWidth = this.$refs.graphy.offsetWidth
             this.canvasHeight = 900 + 'px'
-            console.log(this.canvasWidth)
-            console.log(this.canvasHeight)
+            //console.log(this.canvasWidth)
+            //console.log(this.canvasHeight)
         }
     },
     created() {
@@ -229,7 +229,7 @@ export default {
             FloorID: this.$cookie.get('floorMapId') || 'f1',
             fmapID: this.fmapID
         }
-        console.log('this.urlMsg', this.urlMsg)
+        //console.log('this.urlMsg', this.urlMsg)
     }
 }
 </script>

+ 5 - 5
src/components/mapClass/EditScence.js

@@ -61,7 +61,7 @@ export class EditScence extends SGraphScene {
     ;
     set setlegend(obj) {
         this._legend = obj;
-        console.log('aaaaaa', obj);
+        //console.log('aaaaaa', obj);
     }
     /**
      * 监听变化
@@ -71,7 +71,7 @@ export class EditScence extends SGraphScene {
         let itemType = 'equipment';
         if (obj.itemList[0] instanceof STextMarkerItem) {
             itemType = 'baseText';
-            console.log('obj.itemList[0]', itemType, obj.itemList[0]);
+            //console.log('obj.itemList[0]', itemType, obj.itemList[0]);
         }
         else if (obj.itemList[0] instanceof SImageMarkerItem) {
             itemType = 'baseImage';
@@ -281,7 +281,7 @@ export class EditScence extends SGraphScene {
      * 增加图标lenged图标
      */
     addIconItem(event) {
-        console.log('this._legend.url', this._legend);
+        //console.log('this._legend.url', this._legend);
         const LegendData = {
             ID: uuid(),
             Name: this._legend.Name,
@@ -449,7 +449,7 @@ export class EditScence extends SGraphScene {
      * @param val string border类型
      */
     upadataLengedName(val) {
-        console.log('xxxxxxx', val, this.focusItem);
+        //console.log('xxxxxxx', val, this.focusItem);
         if (this.focusItem && this.focusItem.data) {
             this.focusItem.text = val;
         }
@@ -498,7 +498,7 @@ export class EditScence extends SGraphScene {
      * 提取item
      */
     extractItem() {
-        console.log(this);
+        //console.log(this);
     }
     /**
      * 保存数据

+ 3 - 3
src/components/menuList.vue

@@ -76,7 +76,7 @@ export default {
         } else if (location.pathname.split('/')[3] == 'analysis') {
             this.modelNum(6)
         }
-        console.log(this.plazas)
+        //console.log(this.plazas)
     },
     methods: {
         formatter(str, arrv) {
@@ -88,7 +88,7 @@ export default {
             }
         },
         modelNum(val) {
-            console.log(val)
+            //console.log(val)
             this.list = this.list.map((item, index) => {
                 if (val == index + 1) {
                     item.state = true
@@ -99,7 +99,7 @@ export default {
             })
         },
         clickEventAcitve(item) {
-            console.log(item)
+            //console.log(item)
             if (item.name == '楼层功能') {
                 this.$cookie.set('categoryId', 'LCGN', 3)
             } else {

+ 6 - 6
src/views/equipment/eqDialog.vue

@@ -111,7 +111,7 @@ export default {
             this.visible = false
         },
         modalConfirm() {
-            console.log('alertConfirm')
+            //console.log('alertConfirm')
         },
         //打开弹窗
         showModal(item) {
@@ -133,13 +133,13 @@ export default {
                     this.initImage(this.typecode)
                 }
             }
-            console.log(this.dialogInfo)
+            //console.log(this.dialogInfo)
             this.param = this.activeName
         },
         //点击tab函数
         handleClick(tab) {
-            console.log(tab)
-            // console.log('============================================')
+            //console.log(tab)
+            // //console.log('============================================')
             if (this.param) {
                 this.param = tab.name
             } else if (this.smsxt) {
@@ -157,7 +157,7 @@ export default {
             this.tabLabel = tab.label
         },
         // tabClick(e) {
-        //     console.log(e.label, e.name, '-----.')
+        //     //console.log(e.label, e.name, '-----.')
         // },
         visibalBox() {
             this.$refs.Dialog.open(this.dialogInfo.id)
@@ -229,7 +229,7 @@ export default {
             }
 
             queryTab({ data, postParams }).then(res => {
-                console.log(res)
+                //console.log(res)
             })
         }
     }

+ 9 - 5
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() {
@@ -86,7 +87,7 @@ export default {
     methods: {
         // 查询tab页
         tabSyatem(item) {
-            console.log(item)
+            //console.log(item)
             this.systemId = item.id
             this.everySystem = item.children
             this.systemName = item.name
@@ -98,13 +99,13 @@ export default {
             this.init()
         },
         emitFloor(item) {
-            console.log('item', item)
+            //console.log('item', item)
             this.floorInfo = item
             // this.$refs.floorMap.init(this.floorInfo.gname)
             this.init()
         },
         dialogVisible(eve) {
-            console.log(eve)
+            //console.log(eve)
             this.$refs.dialog.showModal(eve)
         },
         additionalColl() {
@@ -121,7 +122,7 @@ export default {
                 getParams.system = this.smsxt
             }
             queryPic({ getParams }).then(res => {
-                console.log('分区图', res)
+                //console.log('分区图', res)
                 this.fqPic = res.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>

+ 4 - 4
src/views/equipment/legendBox.vue

@@ -110,13 +110,13 @@ export default {
             ],
             rowSelection: {
                 onChange: (selectedRowKeys, selectedRows) => {
-                    console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows)
+                    //console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows)
                 },
                 onSelect: (record, selected, selectedRows) => {
-                    console.log(record, selected, selectedRows)
+                    //console.log(record, selected, selectedRows)
                 },
                 onSelectAll: (selected, selectedRows, changeRows) => {
-                    console.log(selected, selectedRows, changeRows)
+                    //console.log(selected, selectedRows, changeRows)
                 }
             }
         }
@@ -124,7 +124,7 @@ export default {
     computed: {},
     methods: {
         changeSwitch(checked) {
-            console.log(`a-switch to ${checked}`)
+            //console.log(`a-switch to ${checked}`)
         },
         open() {
             this.isShow = !this.isShow

+ 3 - 3
src/views/equipment/table/eqDetaileDialog.vue

@@ -142,7 +142,7 @@ export default {
     methods: {
         //多余输入框监听
         confirm(fws, manufacturer) {
-            console.log(fws, manufacturer, '------')
+            //console.log(fws, manufacturer, '------')
             this.fws = fws
             this.manufacturer = manufacturer
             this.queryTableList()
@@ -177,7 +177,7 @@ export default {
                 plazaId: this.$store.state.plazaId
             }
             querySelect({ data, postParams }).then(res => {
-                console.log(res)
+                //console.log(res)
                 let sb_status = res.data.data.glsms_asset.sb_status
                 let sbglgs = res.data.data.glsms_asset.sbglgs
                 this.sbglgsOption = []
@@ -259,7 +259,7 @@ export default {
                 postParams.status = this.status
             }
             queryAsset({ data, postParams }).then(res => {
-                console.log(res)
+                //console.log(res)
                 this.tableData = res.data.data
                 this.total = res.data.count
             })

+ 2 - 2
src/views/equipment/table/eqListTable.vue

@@ -106,7 +106,7 @@ export default {
     props: ['param', 'major'],
     methods: {
         rowHandle(row) {
-            console.log(row)
+            //console.log(row)
             this.innerVisible = true
             this.row = row
         },
@@ -144,7 +144,7 @@ export default {
             }
 
             queryEquipmentList({ data, postParams }).then(res => {
-                console.log(res)
+                //console.log(res)
                 this.tableData = res.data.data
                 this.total = res.data.count
             })

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

@@ -81,7 +81,7 @@ export default {
                 major: this.major
             }
             queryEquipmentList({ data, postParams }).then(res => {
-                console.log(res)
+                //console.log(res)
                 this.tableData = res.data.data
                 this.total = res.data.count
             })

+ 3 - 3
src/views/equipment/table/otherTable.vue

@@ -139,7 +139,7 @@ export default {
                 getParams.data.handleresults = this.handleresults
             }
             queryQtsx(getParams).then(res => {
-                console.log(res)
+                //console.log(res)
                 this.tableData = res.data ? res.data : []
                 this.total = res.count
             })
@@ -177,7 +177,7 @@ export default {
                 plazaId: this.$store.state.plazaId
             }
             querySelect({ data, postParams }).then(res => {
-                console.log(res)
+                //console.log(res)
                 let handleresults = res.data.data.glsms_qtsx.handleresults
                 this.handleOption = []
                 handleresults.forEach(el => {
@@ -205,7 +205,7 @@ export default {
     },
     mounted() {
         this.tabFind()
-        console.log(this.smsxt)
+        //console.log(this.smsxt)
         this.getList()
     }
 }

+ 1 - 1
src/views/equipment/table/recordDialog.vue

@@ -94,7 +94,7 @@ export default {
                     })
                 })
             })
-            console.log(this.tabName)
+            //console.log(this.tabName)
         }
     },
     mounted() {}

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

@@ -99,7 +99,7 @@ export default {
     },
     methods: {
         rowHandle(row) {
-            console.log(row)
+            //console.log(row)
             this.innerVisible = true
             this.row = row
         },

+ 1 - 1
src/views/equipment/table/wbTable.vue

@@ -212,7 +212,7 @@ export default {
             }
             queryWbsms(getParams).then(res => {
                 this.tableData = res.data || []
-                console.log(this.tableData)
+                //console.log(this.tableData)
                 this.total = res.count
             })
         },

+ 1 - 1
src/views/equipment/table/zwTable.vue

@@ -192,7 +192,7 @@ export default {
                 plazaId: this.$store.state.plazaId
             }
             querySelect({ data, postParams }).then(res => {
-                console.log(res)
+                //console.log(res)
                 let lb = res.data.data.v_glsms_zw.lb
                 let xm = res.data.data.v_glsms_zw.xm
                 let sxjd = res.data.data.v_glsms_zw.sxjd

+ 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' :type='1' @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

+ 0 - 1
src/views/index.vue

@@ -34,7 +34,6 @@ export default {
     },
     methods: {
         handlerouterName(val) {
-            console.log(val)
             this.routerName = val
             if (val == 'de') {
                 this.modelNum = 3

+ 5 - 5
src/views/legendLibrary/addForm.vue

@@ -228,7 +228,7 @@ export default {
             })
         },
         handleRemove(file, fileList) {
-            // console.log(file, fileList, 'file')
+            // //console.log(file, fileList, 'file')
         },
         getFile(file) {
             this.file = file.file
@@ -346,7 +346,7 @@ export default {
             }
         },
         base64ToFile(dataurl, filename) {
-            console.log(dataurl, 'url')
+            //console.log(dataurl, 'url')
             let arr = dataurl.split(',')
             let mime = arr[0].match(/:(.*?);/)[1]
             if (!filename) {
@@ -387,7 +387,7 @@ export default {
         },
         // 铺位可视化
         treeConfirm(data) {
-            console.log(data, 'data')
+            //console.log(data, 'data')
             this.$set(this.ruleForm, 'InfoTypeId', data)
         },
         //专业
@@ -411,7 +411,7 @@ export default {
             }
         },
         focusChange(status) {
-            // console.log('focusChange', status)
+            // //console.log('focusChange', status)
         },
         visualization() {
             getVisualization({}).then(res => {
@@ -441,7 +441,7 @@ export default {
             }
         },
         focusChange(status) {
-            console.log('focusChange', status)
+            //console.log('focusChange', status)
         }
     },
     mounted() {

+ 1 - 1
src/views/legendLibrary/addLegend.vue

@@ -56,7 +56,7 @@ export default {
         open(row, title, GraphCategoryId) {
             this.title = title
             this.GraphCategoryId = GraphCategoryId
-            console.log(title)
+            //console.log(title)
             if (GraphCategoryId) {
                 groupByCategory({}).then(res => {
                     this.treeData = []

+ 1 - 1
src/views/legendRules/addList.vue

@@ -36,7 +36,7 @@ export default {
             }
             this.data = []
             getTransfer({ getParams }).then(res => {
-                console.log(res)
+                //console.log(res)
                 let content = res.Content
                 content.forEach(el => {
                     this.data.push({

+ 3 - 3
src/views/other/gcfzDialog.vue

@@ -58,14 +58,14 @@ export default {
 
             querygcfzyfhz({ getParams }).then(res => {
                 if (res.result == 'success') {
-                    console.log('汇总统计报', res)
+                    //console.log('汇总统计报', res)
                     this.loading = false
                     this.hztjTable = res.data ? res.data : []
                 }
             })
         },
         changeEmit(val) {
-            console.log(val)
+            //console.log(val)
             if (val.floors) {
                 this.floors = val.floors
             }
@@ -96,7 +96,7 @@ export default {
             }
             queryfzyfchange({ getParams }).then(res => {
                 if (res.result == 'success') {
-                    console.log('变更记录', res)
+                    //console.log('变更记录', res)
                     this.total = res.count
                     this.loading = false
                     this.bgjlTable = res.data ? res.data : []

+ 85 - 18
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-other v-if='floorData.length>0' :floorsArr='floorData' @emitFloor='emitFloor' :type='2'></floor-list-other>
             </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 floorList from '@/components/floorList.vue'
+import { queryPic, queryTab } from '@/api/public.js'
+import floorListOther from '@/components/floorListOther.vue'
 import { matter } from '@/utils/plugins/components.js'
+import { mapGetters } from 'vuex'
 export default {
     data() {
         return {
@@ -57,10 +58,11 @@ export default {
             },
             picFloor: '',
             picFloorImg: [],
-            dialogInfo: {}
+            dialogInfo: {},
+            floorData: []
         }
     },
-    components: { floorList, OtherDialog, ZhsxOther, GcfzDialog },
+    components: { floorListOther, OtherDialog, ZhsxOther, GcfzDialog },
     methods: {
         tabSyatem(item) {
             this.matterId = item.id
@@ -68,36 +70,101 @@ export default {
             this.systemName = item.name
         },
         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)
+                //console.log('库房管理图', res)
+                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>

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

@@ -34,11 +34,11 @@ export default {
             this.dialogInfo = item
             if (Object.keys(this.dialogInfo).length > 0) {
                 this.activeName = this.dialogInfo.children[0].id
-                console.log(this.activeName)
+                //console.log(this.activeName)
             }
         },
         handleClick(tab, event) {
-            console.log(tab, event)
+            //console.log(tab, event)
         }
     }
 }

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

@@ -31,8 +31,22 @@ export default {
         open() {
             this.visible = true
         },
+        /**
+         * @name objectSpanMethod
+         * @param { Object } row        当前行
+         * @param { Object } column     当前列
+         * @param {  Number } rowIndex   当前行号
+         * @param { Number } columnIndex    当前列号
+         * @return { Array,Object }
+         * @description 通过给table传入span-method方法可以实现合并行或列,方法的参数是一个对象,
+         * 里面包含当前行row、当前列column、当前行号rowIndex、当前列号columnIndex四个属性。
+         * 该函数可以返回一个包含两个元素的数组,第一个元素代表rowspan,
+         * 第二个元素代表colspan。 也可以返回一个键名为rowspan和colspan的对象。
+         */
         objectSpanMethod({ row, column, rowIndex, columnIndex }) {
-            if (columnIndex === 2 || columnIndex === 3) {
+            // 取出 tableData的长度, 合并记录事项 表格 使用
+            let { length } = this.tableData || 1
+            if (columnIndex === 2) {
                 if (rowIndex > 0 && row[column.property] === this.tableData[rowIndex - 1][column.property]) {
                     return {
                         rowspan: 0,
@@ -50,6 +64,9 @@ export default {
                         colspan: 1
                     }
                 }
+            } else if (columnIndex === 3) {
+                // 记录事项表格合并
+                return { rowspan: length, colspan: 1 }
             }
         }
     }
@@ -73,6 +90,19 @@ export default {
     }
     .bottom-table {
         margin-top: 12px;
+        // element-ui table 组件 记录事项样式修改, 换行,fixed到页面中部
+        /deep/ .el-table__row:first-child {
+            td:last-child {
+                div {
+                    white-space: pre-wrap;
+                    word-wrap: break-word;
+                    word-break: break-all;
+                    position: fixed;
+                    top: 50%;
+                    transform: translateY(-50%);
+                }
+            }
+        }
     }
 }
 </style>

+ 12 - 2
src/views/other/zhsxOther.vue

@@ -45,8 +45,18 @@ export default {
                 getParams: {}
             }
             queryZhsxjl(params).then(res => {
-                console.log('综合事项弹框', res)
-                this.tableData = res.data
+                let arr = []
+                //console.log('综合事项弹框', res)
+                this.tableData = res.data || []
+
+                // 将tableData中的第三项都设置为相同的数据
+                this.tableData.map(item => {
+                    arr.push(item.jlsx)
+                })
+                arr = [...new Set(arr)]
+                this.tableData.map(item => {
+                    item.jlsx = arr.join('\n\r')
+                })
             })
             this.$refs.Dialog.open()
         },

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

@@ -116,7 +116,7 @@ export default {
         },
         rowClick() {},
         changeData(val) {
-            console.log(val)
+            //console.log(val)
         },
         // 综合记录
         getZhjl() {
@@ -142,7 +142,7 @@ export default {
                     this.total = res.count
                     this.zhjlTable = res.data ? res.data : []
                 }
-                console.log('综合记录', res)
+                //console.log('综合记录', res)
             })
         },
         pageChanged(page) {
@@ -161,7 +161,7 @@ export default {
                 plazaId: this.$store.state.plazaId
             }
             querySelect({ data, postParams }).then(res => {
-                console.log('政府部门', res)
+                //console.log('政府部门', res)
                 let department = []
                 department = res.data.data.v_glsms_zhsxjl.department ? res.data.data.v_glsms_zhsxjl.department : []
                 if (department.length > 0) {
@@ -172,7 +172,7 @@ export default {
                         }
                         this.department.push(obj)
                     })
-                    console.log(this.department)
+                    //console.log(this.department)
                 }
             })
         },

+ 7 - 12
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,
@@ -137,7 +131,7 @@ export default {
                     this.total = res.count
                     this.dsfTable = res.data ? res.data : []
                 }
-                console.log('第三方', res)
+                //console.log('第三方', res)
             })
         },
         pageChanged(page) {
@@ -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'
                 }
             ]
@@ -156,11 +150,11 @@ export default {
                 plazaId: this.$store.state.plazaId
             }
             querySelect({ data, postParams }).then(res => {
-                console.log('下拉框', res)
+                //console.log('下拉框', res)
                 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 = {

+ 4 - 4
src/views/room/detail.vue

@@ -15,7 +15,7 @@
                 width='146'
                 v-model='sbglgsStr'
                 style='margin-right:12px'
-                v-if='sbglgs.length>0'
+                v-if='sbglgs.length>=0'
                 tipPlace='top'
                 caption='管理归属'
                 @change='changeSbglgsStr'
@@ -25,7 +25,7 @@
             <Select
                 width='146'
                 style='margin-right:12px'
-                v-if='sb_status.length>0'
+                v-if='sb_status.length>=0'
                 tipPlace='top'
                 caption='设备状态'
                 size='small'
@@ -291,7 +291,7 @@ export default {
             }
 
             queryHxsbDetail({ data, postParams }).then(res => {
-                console.log('钻取表', res)
+                //console.log('钻取表', res)
                 this.loadingDetail = false
                 this.detailData = res.data.data ? res.data.data : []
                 this.totalDetail = res.data.count
@@ -312,7 +312,7 @@ export default {
                 plazaId: this.$store.state.plazaId
             }
             querySelect({ data, postParams }).then(res => {
-                console.log('管理归属', res)
+                //console.log('管理归属', res)
                 if (res.data.data) {
                     let sb_status = [],
                         sbglgs = []

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

@@ -529,7 +529,7 @@ export default {
                 plazaId: this.$store.state.plazaId
             }
             queryPic({ getParams }).then(res => {
-                console.log('机房布置图', res)
+                //console.log('机房布置图', res)
                 this.tableImg = res.data ? res.data : []
             })
         },
@@ -577,7 +577,7 @@ export default {
                     this.loading1 = false
                     this.total1 = res.count
                     this.table2 = res.data ? res.data : []
-                    console.log('明细表', res)
+                    //console.log('明细表', res)
                 }
             })
         },
@@ -615,7 +615,7 @@ export default {
                 data.floor = this.floorChange
             }
             queryHxsb({ data, postParams }).then(res => {
-                console.log('核心设备', res)
+                //console.log('核心设备', res)
                 this.loading2 = false
                 this.total2 = res.data.count
                 this.table3 = res.data.data ? res.data.data : []
@@ -677,7 +677,7 @@ export default {
                 getParams.sjjssjEndDate = this.yssjDate[1] + '000000'
             }
             queryWxjf({ getParams }).then(res => {
-                console.log('维修', res)
+                //console.log('维修', res)
                 if (res.result == 'success') {
                     this.loading3 = false
                     this.total3 = res.count
@@ -768,7 +768,7 @@ export default {
                 }
             }
             queryWb({ data, postParams }).then(res => {
-                console.log('维保', res)
+                //console.log('维保', res)
                 this.loading4 = false
                 this.total4 = res.data.count
                 this.table5 = res.data.data ? res.data.data : []
@@ -792,7 +792,7 @@ export default {
                 plazaId: this.$store.state.plazaId
             }
             querySelect({ data, postParams }).then(res => {
-                console.log('下拉框', res)
+                //console.log('下拉框', res)
                 let status = [],
                     zt = []
 
@@ -827,7 +827,7 @@ export default {
                 }
             }
             querySystem(params).then(res => {
-                console.log('系统', res.data[0])
+                //console.log('系统', res.data[0])
                 this.smsxtArr = res.data[0]
             })
         },

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

@@ -51,7 +51,7 @@ export default {
         },
         confirm() {
             this.dialogFormVisible = false
-            console.log(this.type)
+            //console.log(this.type)
             if (this.type == 'wx') {
                 this.$emit('changeIndex3', this.search)
             }