Browse Source

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

YaolongHan 4 years ago
parent
commit
a383adcfba

+ 2 - 2
package.json

@@ -12,10 +12,10 @@
     "dependencies": {
         "@mapbox/geojson-merge": "^1.1.1",
         "@saga-web/base": "2.1.24",
-        "@saga-web/big": "1.0.90",
+        "@saga-web/big": "1.0.91",
         "@saga-web/draw": "2.1.104",
         "@saga-web/feng-map": "1.0.26",
-        "@saga-web/graph": "2.1.115",
+        "@saga-web/graph": "2.1.116",
         "ant-design-vue": "^1.4.10",
         "axios": "^0.19.2",
         "core-js": "^3.4.4",

+ 2 - 119
src/components/Legend/src/legend.vue

@@ -116,7 +116,6 @@ export default {
     name: 'Legend',
     data() {
         return {
-            // remarksText: '', //查询出来的备注
             text1: '主要设备房包括:冷源机房,热源机房,开闭站,配变电所(室),发电机房,消防水泵房,消防高位水箱间,生活水泵房,慧云机房,垃圾房',
             text2: '图例后×的数字,代表此位置的数量',
             loading: true,
@@ -134,8 +133,6 @@ export default {
             floorSelectAble: [],
             floor: '', //传的楼层
             floorName: '',
-            // planNum: '', //主要设备房
-            // typeNum: '',
             draftNum: null, //草稿箱数量, 编辑器修改icon右上角显示
             interval: 10 * 60 * 1000, //定时器时长,默认 10分钟
             timer: null, //保存定时器
@@ -218,10 +215,8 @@ export default {
          */
         async getDraftNum() {
             let res = null,
-                // floorId = this.$cookie.get('floorMapId'),
                 floorId = this.$store.state.currentFloor.gname || this.$cookie.get('floorMapId'),
                 categoryId = this.categoryId || this.$cookie.get('categoryId')
-            // console.log('getDraftNum', this.innerLeng, categoryId)
             // 增加校验 floorId,防止上传 undefined
             if (!floorId) {
                 return true
@@ -260,7 +255,6 @@ export default {
         },
         // 查询备注
         queryMarks() {
-            // this.remarksText = ''
             let postParams = {
                 categoryId: this.categoryId ? this.categoryId : this.$cookie.get('categoryId'),
                 projectId: this.$store.state.plazaId,
@@ -270,27 +264,10 @@ export default {
             }
             let data = {}
             queryRead({ data, postParams }).then(res => {
-                console.log(2222222222222222222222222222222222222222222)
                 if (res.data.Data && res.data.Data[0].Note) {
-                    console.log('bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb')
-
                     let Res = res.data ? res.data.Data[0].Note : ''
                     if (Res) {
                         this.$store.commit('SETREMARKSTEXT', Res)
-                        console.log(22222222222222222222)
-                        // 返回有备注
-                        // this.remarksText = Res
-                        // let defaultCom = ''
-                        // if (this.planNum && this.typeNum) {
-                        //     defaultCom = `${Res}<ol style="padding-left: 1.5em;"><li>${this.text1}</li><li>${this.text2}</li></ol>`
-                        // } else if (this.planNum) {
-                        //     defaultCom = `${Res}<ol  style="padding-left: 1.5em;"><li>${this.text1}</li></ol>`
-                        // } else if (this.typeNum) {
-                        //     defaultCom = `${Res}<ol   style="padding-left: 1.5em;" ><li>${this.text2}</li></ol>`
-                        // } else {
-                        //     defaultCom = Res
-                        // }
-                        // this.$store.commit('SETDEFAULTCOMMENT', defaultCom)
                     } else {
                         let marks = ''
                         if (this.planNum && this.typeNum) {
@@ -302,15 +279,9 @@ export default {
                         } else {
                             marks = ''
                         }
-                        console.log(marks)
                         this.$store.commit('SETREMARKSTEXT', marks)
-                        console.log(33333333333333333333)
                     }
-                    // this.$store.commit('SETREMARKSTEXT', this.remarksText)
                 }
-                // else {
-                // this.$store.commit('SETREMARKSTEXT', '')
-                // }
             })
         },
         // 点击展示图例框
@@ -325,9 +296,6 @@ export default {
             }
             this.queryView(false)
         },
-        cance() {
-            // this.show2 = false
-        },
         // 编辑图例
         editTl() {
             if (this.showView != 2) {
@@ -361,15 +329,6 @@ export default {
             let url = editerUrl + 'editer?' + encodeURIComponent(data)
             window.open(url, true)
         },
-        // 编辑状态取消
-        isShow2() {
-            // if (this.showView != 2) {
-            //     this.$store.commit('SETSHOWVIEW', 1)
-            // } else {
-            //     this.$store.commit('SETSHOWVIEW', 0)
-            // }
-            // this.show2 = !this.show2
-        },
         handleSwich(val) {
             this.queryView(!val)
         },
@@ -383,7 +342,6 @@ export default {
         queryView(flag) {
             let postParams = {}
             let categoryId = this.categoryId || this.$cookie.get('categoryId')
-            // console.log('queryView', this.innerLeng, categoryId)
             let data = {
                 categoryId,
                 graphId: this.$cookie.get('graphId'),
@@ -395,8 +353,6 @@ export default {
             queryStatis({ data, postParams }).then(res => {
                 this.loading = false
                 let viewTable = []
-                // this.planNum = ''
-                // this.typeNum = ''
                 viewTable = res.data.Data ? res.data.Data : []
                 this.$store.commit('SETLEGENDTABLE', viewTable)
                 if (viewTable.length > 0) {
@@ -410,20 +366,6 @@ export default {
                     })
                     if (this.remarksText) {
                         this.$store.commit('SETREMARKSTEXT', this.remarksText)
-                        console.log()
-                        // 返回有备注
-                        // this.remarksText = Res
-                        // let defaultCom = ''
-                        // if (this.planNum && this.typeNum) {
-                        //     defaultCom = `${Res}<ol style="padding-left: 1.5em;"><li>${this.text1}</li><li>${this.text2}</li></ol>`
-                        // } else if (this.planNum) {
-                        //     defaultCom = `${Res}<ol  style="padding-left: 1.5em;"><li>${this.text1}</li></ol>`
-                        // } else if (this.typeNum) {
-                        //     defaultCom = `${Res}<ol   style="padding-left: 1.5em;" ><li>${this.text2}</li></ol>`
-                        // } else {
-                        //     defaultCom = Res
-                        // }
-                        // this.$store.commit('SETDEFAULTCOMMENT', defaultCom)
                     } else {
                         let marks = ''
                         if (this.planNum && this.typeNum) {
@@ -438,23 +380,9 @@ export default {
                         this.$store.commit('SETREMARKSTEXT', marks)
                     }
                     setTimeout(() => {
-                      this.setLengedHeight()  
-                    },);
+                        this.setLengedHeight()
+                    })
                 }
-                // let remarksText = ''
-                // this.remarksText = ''
-                // this.$store.commit('SETREMARKSTEXT', '')
-
-                // if (this.planNum && this.typeNum) {
-                //     this.remarksText = `<ol style="padding-left: 1.5em;"><li>${this.text1}</li><li>${this.text2}</li></ol>`
-                // } else if (this.planNum) {
-                //     this.remarksText = `<ol  style="padding-left: 1.5em;"><li>${this.text1}</li></ol>`
-                // } else if (this.typeNum) {
-                //     this.remarksText = `<ol   style="padding-left: 1.5em;" ><li>${this.text2}</li></ol>`
-                // } else {
-                //     this.remarksText = ''
-                // }
-                // this.$store.commit('SETREMARKSTEXT', this.remarksText)
                 this.$nextTick(() => {
                     if (this.$refs.viewLengend) {
                         this.$refs.viewLengend.setSelected()
@@ -466,7 +394,6 @@ export default {
         queryEditNum(flag) {
             let postParams = {}
             let categoryId = this.categoryId || this.$cookie.get('categoryId')
-            // console.log('queryEditNum', categoryId)
             let data = {
                 categoryId,
                 graphId: this.$cookie.get('graphId'),
@@ -476,7 +403,6 @@ export default {
                 floorId: this.$store.state.currentFloor.gname
             }
             queryStatis({ data, postParams }).then(res => {
-                //console.log('编辑图例数', res)
                 this.loading1 = false
                 this.editTable = res.data.Data ? res.data.Data : []
             })
@@ -532,11 +458,7 @@ export default {
                 this.queryEdit(val)
                 this.$store.commit('SETSHOWVIEW', 1)
                 this.handleSwich(true)
-                // this.isShow2()
             } else {
-                // this.show2 = false
-                // this.isShow2()
-                // this.queryEditNum(true)
                 this.$store.commit('SETSHOWVIEW', 1)
                 this.handleSwich(true)
             }
@@ -556,7 +478,6 @@ export default {
         },
         queryRemarksMethods() {},
         init() {
-            // this.remarksText = ''
             // 图例
             bus.$off('queryViewMethods') //解决触发多次监听
             bus.$on('queryViewMethods', () => {
@@ -567,31 +488,7 @@ export default {
             bus.$on('queryRemarksMethods', res => {
                 if (res) {
                     this.$store.commit('SETREMARKSTEXT', res)
-                    // 返回有备注
-                    // this.remarksText = res
-                    // let defaultCom = ''
-                    // if (this.planNum && this.typeNum) {
-                    //     defaultCom = `${res}<ol style="padding-left: 1.5em;"><li>${this.text1}</li><li>${this.text2}</li></ol>`
-                    // } else if (this.planNum) {
-                    //     defaultCom = `${res}<ol  style="padding-left: 1.5em;"><li>${this.text1}</li></ol>`
-                    // } else if (this.typeNum) {
-                    //     defaultCom = `${res}<ol   style="padding-left: 1.5em;" ><li>${this.text2}</li></ol>`
-                    // } else {
-                    //     defaultCom = res
-                    // }
-                    // this.$store.commit('SETDEFAULTCOMMENT', defaultCom)
                 } else {
-                    //     if (this.planNum && this.typeNum) {
-                    //         this.remarksText = `<ol style="padding-left: 1.5em;"><li>${this.text1}</li><li>${this.text2}</li></ol>`
-                    //     } else if (this.planNum) {
-                    //         this.remarksText = `<ol  style="padding-left: 1.5em;"><li>${this.text1}</li></ol>`
-                    //     } else if (this.typeNum) {
-                    //         this.remarksText = `<ol   style="padding-left: 1.5em;" ><li>${this.text2}</li></ol>`
-                    //     } else {
-                    //         this.remarksText = ''
-                    //     }
-                    // }
-                    // this.$store.commit('SETREMARKSTEXT', this.remarksText)
                     let marks = ''
                     if (this.planNum && this.typeNum) {
                         marks = `<ol style="padding-left: 1.5em;"><li>${this.text1}</li><li>${this.text2}</li></ol>`
@@ -602,7 +499,6 @@ export default {
                     } else {
                         marks = ''
                     }
-                    console.log(marks)
                     this.$store.commit('SETREMARKSTEXT', marks)
                 }
             })
@@ -623,12 +519,8 @@ export default {
         }
     },
     mounted() {
-        // console.log('lengend mounted')
-        // console.log(this.categoryId)
-        // console.log('editTips', this.editTips)
         this.init()
         // 定时查询草稿箱数量
-        // TODO: 1
         this.getDraftNum() //首次查询
         this.timer = setInterval(() => {
             this.getDraftNum()
@@ -746,11 +638,6 @@ export default {
         position: relative;
         .corner {
             position: absolute;
-            // right: -8px;
-            // top: 0;
-            // display: inline-block;
-            // width: 18px;
-            // height: 18px;
             right: 3px;
             top: 3px;
             display: inline-block;
@@ -787,7 +674,6 @@ export default {
         margin-bottom: 10px;
         display: none;
         cursor: pointer;
-        // border: 1px solid #eee;
     }
     .tltk-1 {
         margin-bottom: 10px;
@@ -803,9 +689,6 @@ export default {
     }
 }
 .edit_map:hover .tltk {
-    // display: block;
-    // position: fixed;
-    // bottom: 70px;
     margin-left: -10px;
     right: 22px;
     z-index: 1;

+ 0 - 4
src/components/floorList.vue

@@ -92,7 +92,6 @@ export default {
          * @description 点击上箭头,marginTop<0时执行楼层滚动
          */
         increase() {
-            // console.log('increase')
             let marginTop = parseInt(this.marginTop)
             marginTop < 0 && this.changeFloor(1, this.currIndex)
         },
@@ -100,13 +99,11 @@ export default {
          * @description 点击下箭头,marginTop小于最大值marginTopMax时,执行楼层滚动
          */
         decrease() {
-            // console.log('decrease')
             let marginTop = Math.abs(parseInt(this.marginTop)),
                 marginTopMax = Math.abs(parseInt(this.marginTopMax))
             marginTop < marginTopMax && this.changeFloor(-1, this.currIndex)
         },
         init() {
-            // console.log('init')
             if (!this.floorsArr.length) {
                 return false
             }
@@ -135,7 +132,6 @@ export default {
          * @description 点击图例下方的,上下切换按钮
          */
         changeFloor(flag, index) {
-            // console.log('changeFloor')
             const len = this.floorIdArr.length
             // let index = this.floorIdArr.findIndex(item => item === this.currentFloorId)
             this.currIndex = index

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

@@ -386,7 +386,7 @@ export default {
         },
         getEvent() {
             bus.$on('changeShow', res => {
-                this.topologyParser.zoneLegendList.forEach(t => {
+                this.topologyParser && this.topologyParser.zoneLegendList.forEach(t => {
                     let id = t.data.GraphElementId
                     t.maskFlag = !(res.indexOf(id) > -1)
                 })
@@ -402,11 +402,11 @@ export default {
                 //     let id = t.data.GraphElementId
                 //     t.maskFlag = !(res.indexOf(id) > -1)
                 // })
-                this.topologyParser.imageLegendList.forEach(t => {
+                this.topologyParser && this.topologyParser.imageLegendList.forEach(t => {
                     let id = t.data.GraphElementId
                     t.maskFlag = !(res.indexOf(id) > -1)
                 })
-                this.topologyParser.relationList.forEach(t => {
+                this.topologyParser && this.topologyParser.relationList.forEach(t => {
                     let id = t.data.GraphElementId || t.data.GraphElementID
                     t.maskFlag = !(res.indexOf(id) > -1)
                 })

+ 0 - 72
src/components/legendremarks.vue

@@ -87,14 +87,6 @@ export default {
         query() {
             if (this.remarksText) {
                 if (this.planNum && this.typeNum) {
-                    if (this.remarksText.search(`${this.text1}`) != -1) {
-                        // console.log(5555555555555)
-                        // console.log(this.remarksText.search(this.text1) != -1)
-                    } else {
-                        console.log(333333333)
-
-                        console.log(this.remarksText.search(this.text1) != -1)
-                    }
                     this.remarksTexts = `<ol style="padding-left: 1.5em;"><li>${this.text1}</li><li>${this.text2}</li></ol>`
                 } else if (this.planNum) {
                     this.remarksTexts = `<ol style="padding-left: 1.5em;"><li>${this.text1}</li></ol>`
@@ -111,7 +103,6 @@ export default {
                     } else {
                         this.remarksTexts = this.remarksText
                     }
-                    console.log(333333333)
                 }
                 if (this.remarksText.search(`${this.text2}`) != -1) {
                     this.remarksTexts = this.remarksText
@@ -121,22 +112,7 @@ export default {
                     } else {
                         this.remarksTexts = this.remarksText
                     }
-                    console.log(333333333)
                 }
-
-                //     console.log(this.remarksText.search(this.text1) != -1)
-                // }
-                // if (this.remarksText.search(`${this.text2}`) != -1) {
-                //     console.log(5555555555555)
-
-                //     console.log(this.remarksText.search(this.text1) != -1)
-                // } else {
-                //     console.log(333333333)
-
-                //     console.log(this.remarksText.search(this.text1) != -1)
-                // }
-
-                // this.remarksTexts = this.remarksText
             } else {
                 if (this.planNum && this.typeNum) {
                     this.remarksTexts = `<ol style="padding-left: 1.5em;"><li>${this.text1}</li><li>${this.text2}</li></ol>`
@@ -148,50 +124,6 @@ export default {
                     this.remarksTexts = ''
                 }
             }
-            console.log(this.remarksTexts)
-            // let postParams = {
-            //     categoryId: this.$cookie.get('categoryId'),
-            //     projectId: this.$store.state.plazaId,
-            //     BuildingID: '1',
-            //     Pub: true,
-            //     FloorID: this.$cookie.get('floorNow')
-            // }
-            // let data = {}
-            // queryRead({ data, postParams }).then(res => {
-            //     if (res.data.Data && res.data.Data[0].Note) {
-            //         let Res = res.data ? res.data.Data[0].Note : ''
-            //         if (Res) {
-            //             // this.$store.commit('SETREMARKSTEXT', Res)
-            //             // console.log()
-            //             // 返回有备注
-            //             // this.remarksText = Res
-            //             // let defaultCom = ''
-            //             // if (this.planNum && this.typeNum) {
-            //             //     defaultCom = `${Res}<ol style="padding-left: 1.5em;"><li>${this.text1}</li><li>${this.text2}</li></ol>`
-            //             // } else if (this.planNum) {
-            //             //     defaultCom = `${Res}<ol  style="padding-left: 1.5em;"><li>${this.text1}</li></ol>`
-            //             // } else if (this.typeNum) {
-            //             //     defaultCom = `${Res}<ol   style="padding-left: 1.5em;" ><li>${this.text2}</li></ol>`
-            //             // } else {
-            //             //     defaultCom = Res
-            //             // }
-            //             // this.$store.commit('SETDEFAULTCOMMENT', defaultCom)
-            //         } else {
-            //             let marks = ''
-            //             if (this.planNum && this.typeNum) {
-            //                 marks = `<ol style="padding-left: 1.5em;"><li>${this.text1}</li><li>${this.text2}</li></ol>`
-            //             } else if (this.planNum) {
-            //                 marks = `<ol style="padding-left: 1.5em;"><li>${this.text1}</li></ol>`
-            //             } else if (this.typeNum) {
-            //                 marks = `<ol style="padding-left: 1.5em;" ><li>${this.text2}</li></ol>`
-            //             } else {
-            //                 marks = ''
-            //             }
-            //             this.$store.commit('SETREMARKSTEXT', marks)
-            //         }
-            //         // this.$store.commit('SETREMARKSTEXT', this.remarksText)
-            //     }
-            // })
         },
         // 更新底图备注
         markUpdate(val) {
@@ -203,7 +135,6 @@ export default {
                 }
             }
             updateRead(params).then(res => {
-                // console.log('更新备注', res)
                 this.$message({
                     showClose: true,
                     message: '更新成功',
@@ -221,7 +152,6 @@ export default {
         onEditorBlur(val) {},
         onEditorFocus(val) {},
         onEditorChange(val) {
-            console.log(val, 'val')
             val.quill.deleteText(200, 6)
             if (this.remarksTexts === '') {
                 this.valLen = 0
@@ -254,8 +184,6 @@ export default {
 }
 </style>
 <style lang="less" scoped>
-.editModel {
-}
 .edit-x {
     position: absolute;
     width: 9px;

+ 2 - 4
src/components/viewLengend.vue

@@ -116,10 +116,8 @@ export default {
         // }
         // }
     },
-    mounted() {
-        console.log(this.remarksText)
-    },
-    updated(){
+    mounted() {},
+    updated() {
         this.setSelected()
     },
     created() {}

+ 3 - 3
src/lib/items/SFHFQZoneLegendItem.ts

@@ -230,12 +230,12 @@ export class SFHFQZoneLegendItem extends SPolygonItem {
     onDraw(painter: SPainter) {
         if (this.maskFlag && this.status == SItemStatus.Normal) {
             let color = new SColor(this.strokeColor)
-            color.alpha = color.alpha / 2
+            color.alpha = color.alpha / 5
             let brushcolor = new SColor(this.fillColor)
-            brushcolor.alpha = brushcolor.alpha / 2
+            brushcolor.alpha = brushcolor.alpha / 5
             painter.pen.color = color
             painter.pen.lineCapStyle = SLineCapStyle.Square
-            painter.pen.lineWidth = painter.toPx(this._lineWidth)
+            painter.pen.lineWidth = painter.toPx(this.lineWidth)
             painter.brush.color = brushcolor
             if (this.selected) {
                 painter.pen.lineWidth = painter.toPx(this.lineWidth * 2);

+ 3 - 3
src/lib/items/SSCPZZoneLegendItem.ts

@@ -238,12 +238,12 @@ export class SSCPZZoneLegendItem extends SPolygonItem {
     onDraw(painter: SPainter) {
         if (this.maskFlag && this.status == SItemStatus.Normal) {
             let color = new SColor(this.strokeColor)
-            color.alpha = color.alpha / 2
+            color.alpha = color.alpha / 5
             let brushcolor = new SColor(this.fillColor)
-            brushcolor.alpha = brushcolor.alpha / 2
+            brushcolor.alpha = brushcolor.alpha / 5
             painter.pen.color = color
             painter.pen.lineCapStyle = SLineCapStyle.Square
-            painter.pen.lineWidth = painter.toPx(this._lineWidth)
+            painter.pen.lineWidth = painter.toPx(this.lineWidth)
             painter.brush.color = brushcolor
             if (this.selected) {
                 painter.pen.lineWidth = painter.toPx(this.lineWidth * 2);

+ 3 - 3
src/lib/items/SZoneLegendItem.ts

@@ -231,12 +231,12 @@ export class SZoneLegendItem extends SPolygonItem {
     onDraw(painter: SPainter) {
         if (this.maskFlag && this.status == SItemStatus.Normal) {
             let color = new SColor(this.strokeColor)
-            color.alpha = color.alpha / 2
+            color.alpha = color.alpha / 5
             let brushcolor = new SColor(this.fillColor)
-            brushcolor.alpha = brushcolor.alpha / 2
+            brushcolor.alpha = brushcolor.alpha / 5
             painter.pen.color = color
             painter.pen.lineCapStyle = SLineCapStyle.Square
-            painter.pen.lineWidth = painter.toPx(this._lineWidth)
+            painter.pen.lineWidth = painter.toPx(this.lineWidth)
             painter.brush.color = brushcolor
             if (this.selected) {
                 painter.pen.lineWidth = painter.toPx(this.lineWidth * 2);

+ 7 - 1
src/views/equipment/eqDialog.vue

@@ -54,7 +54,13 @@
                             ref='list1'
                             major='弱电'
                         ></tableList>
-                        <tableList v-else-if='value.id.slice(0,4)=="NTQD"' :param='param' ref='list2' major='暖通'></tableList>
+                        <tableList
+                            v-else-if='value.id.slice(0,4)=="NTQD"'
+                            :InfoName='`${systemName}-${dialogInfo.label}`'
+                            :param='param'
+                            ref='list2'
+                            major='暖通'
+                        ></tableList>
                         <!-- 维保表格 -->
                         <wb-table v-else-if='value.id.slice(2,4)=="WB"' :smsxt='smsxt' :tabLabel='tabLabel' :diff='diff' :major='dialogInfo.id'></wb-table>
                         <!-- 维修的表格 -->

+ 11 - 4
src/views/equipment/index.vue

@@ -14,7 +14,14 @@
                 <ul v-for='(eve,index) in everySystem' :key='"o"+index'>
                     <li class='li-style' :class='{"is-active": eve.id}' @click='dialogVisible(eve)'>
                         <span class='circle'></span>
-                        <el-button type='text' disabled class='hanzi2' v-if='eve.label=="查看图纸"' style='text-align:left'>{{eve.label}}</el-button>
+                        <el-button
+                            type='text'
+                            disabled
+                            class='hanzi2'
+                            title='数字化移交系统上线后可用'
+                            v-if='eve.label=="查看图纸"'
+                            style='text-align:left'
+                        >{{eve.label}}</el-button>
                         <span class='hanzi' v-else>{{eve.label}}</span>
                     </li>
                 </ul>
@@ -40,7 +47,7 @@
                             <!-- 楼层切换组件 -->
                             <floor-list :key='keyFL' v-if='floorsArr.length>0' :floorsArr='floorsArr' @emitFloor='emitFloor' id='system'></floor-list>
 
-                            <div class='additional-box' ref='additionalBox' v-if='fqPic.length>0'>
+                            <div class='additional-box' ref='additionalBox' v-if='fqPic.length>0 && (smsxt=="1003"||smsxt=="1004")'>
                                 <div class='additional2' @click='additionalColl' v-if='showView===3'>
                                     <img src='../../assets/imgs/bg2.png' alt />
                                 </div>
@@ -135,7 +142,7 @@ export default {
                 target: item.name,
                 parameter: item.categoryId
             }
-            getPvUv(data, postParams )
+            getPvUv(data, postParams)
                 .then(res => {
                     console.log('pvuv', res)
                 })
@@ -180,7 +187,7 @@ export default {
                     target: eve.id,
                     parameter: eve.label
                 }
-                getPvUv( data, postParams )
+                getPvUv(data, postParams)
                     .then(res => {
                         console.log('pvuv', res)
                     })

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

@@ -81,7 +81,7 @@
         <!-- 标准表格详情钻取表 -->
         <el-dialog
             width='1260px'
-            :title='`${InfoName}-${systemName}`'
+            :title='`${InfoName}-${type_name}`'
             style='height:900px!important;overflow: hidden;'
             :visible.sync='innerVisible'
             append-to-body
@@ -110,7 +110,8 @@ export default {
             manufacturer: '',
             sbjc: '',
             row: {},
-            floor: ''
+            floor: '',
+            type_name: ''
         }
     },
     computed: {
@@ -122,7 +123,7 @@ export default {
             return (this.currentPage - 1) * this.size + index + 1
         },
         rowHandle(row) {
-            //console.log(row)
+            this.type_name = row.type_name
             this.innerVisible = true
             this.row = row
         },
@@ -190,6 +191,7 @@ export default {
     mounted() {
         this.floor = this.$cookie.get('floorMapId')
         this.getList()
+        console.log(this.InfoName)
         console.log(this.param)
     }
 }

+ 20 - 6
src/views/overview/index.vue

@@ -104,7 +104,7 @@
                                 :header-cell-style='{background:"rgba(245,246,247,1)",fontFamily:"MicrosoftYaHei",color:"rgba(100,108,115,1)",lineHeight:"16px",fontSize:"12px"}'
                                 v-loading='loading'
                             >
-                                <el-table-column label='序号' width='50' type='index' align='left'></el-table-column>
+                                <el-table-column label='序号' width='50' type='index' align='center'></el-table-column>
                                 <el-table-column label='总包/分包' prop='type' width='80' align='center'>
                                     <template slot-scope='{row}'>{{row.type||'--'}}</template>
                                 </el-table-column>
@@ -115,10 +115,14 @@
                                     <template slot-scope='{row}'>{{row.unit ||'--'}}</template>
                                 </el-table-column>
                                 <el-table-column label='联系人' prop width='70' :show-overflow-tooltip='true'>
-                                    <template slot-scope='{row}'>{{row.lxr||'--'}}</template>
+                                    <template slot-scope='{row}'>
+                                        <div>{{row.lxr||'--'}}</div>
+                                    </template>
                                 </el-table-column>
-                                <el-table-column prop='phone' label='联系电话' width='110'>
-                                    <template slot-scope='{row}'>{{row.lxdh||'--'}}</template>
+                                <el-table-column prop label='联系电话' width='110' :show-overflow-tooltip='true'>
+                                    <template slot-scope='{row}'>
+                                        <div>{{row.lxdh||'--'}}</div>
+                                    </template>
                                 </el-table-column>
                             </el-table>
                         </div>
@@ -216,8 +220,11 @@ export default {
         }
     },
     methods: {
+        /**
+         *联系人,联系电话样式设置
+         */
         addClass({ columnIndex }) {
-            if (columnIndex === 4) {
+            if (columnIndex === 4 || columnIndex === 5) {
                 return 'contact'
             }
         },
@@ -267,6 +274,10 @@ export default {
                     let lxr = item.lxr.split(',').join('\n\r')
                     item.lxr = lxr
                 }
+                if (item.lxdh) {
+                    let lxdh = item.lxdh.split(',').join('\n\r')
+                    item.lxdh = lxdh
+                }
 
                 return item
             })
@@ -419,10 +430,13 @@ export default {
 }
 </script>
 <style lang="less" scoped>
+// 联系人,联系电话样式
 .contact {
     div {
-        word-break: break-all !important;
+        // word-break: break-all !important;
         white-space: pre !important;
+        overflow: hidden;
+        text-overflow: ellipsis;
     }
 }
 @import '../../assets/css/rotation.less';