guoxiaohuan 4 years ago
parent
commit
ebdc348fc1

+ 0 - 19
src/components/legendremarks.vue

@@ -92,7 +92,6 @@ export default {
                         // 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>`
@@ -111,7 +110,6 @@ export default {
                     } else {
                         this.remarksTexts = this.remarksText
                     }
-                    console.log(333333333)
                 }
                 if (this.remarksText.search(`${this.text2}`) != -1) {
                     this.remarksTexts = this.remarksText
@@ -121,22 +119,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,7 +131,6 @@ export default {
                     this.remarksTexts = ''
                 }
             }
-            console.log(this.remarksTexts)
             // let postParams = {
             //     categoryId: this.$cookie.get('categoryId'),
             //     projectId: this.$store.state.plazaId,
@@ -221,7 +203,6 @@ export default {
         onEditorBlur(val) {},
         onEditorFocus(val) {},
         onEditorChange(val) {
-            console.log(val, 'val')
             val.quill.deleteText(200, 6)
             if (this.remarksTexts === '') {
                 this.valLen = 0

+ 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>
                         <!-- 维修的表格 -->

+ 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';