Sfoglia il codice sorgente

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

YaolongHan 4 anni fa
parent
commit
ba0f97fd73

+ 3 - 3
package.json

@@ -12,10 +12,10 @@
     "dependencies": {
         "@mapbox/geojson-merge": "^1.1.1",
         "@saga-web/base": "2.1.25",
-        "@saga-web/big": "1.0.105",
+        "@saga-web/big": "1.0.106",
         "@saga-web/draw": "2.1.106",
-        "@saga-web/feng-map": "1.0.35",
-        "@saga-web/graph": "2.1.121",
+        "@saga-web/feng-map": "1.0.36",
+        "@saga-web/graph": "2.1.122",
         "ant-design-vue": "^1.4.10",
         "axios": "^0.19.2",
         "core-js": "^3.4.4",

+ 45 - 9
src/components/floorMap/index.vue

@@ -81,7 +81,7 @@
     </div>
 </template>
 <script>
-import { SFengParser } from '@saga-web/feng-map'
+import { SFengParser, ProjectRf } from '@saga-web/feng-map'
 import { SFloorParser, ItemOrder, ItemColor, SPolygonItem } from '@saga-web/big'
 import { FloorView } from '@/lib/FloorView'
 import { FloorScene } from '@/lib/FloorScene'
@@ -128,7 +128,8 @@ export default {
                 pointData: []
             },
             activeItem: null,
-            showBtnWell: false
+            showBtnWell: false,
+            count: 0, // 顶楼为多张图时计数器
         }
     },
     props: {
@@ -281,14 +282,40 @@ export default {
             if (floor == 'g80') {
                 // 屋顶
                 if (window.fengmapData.frImg) {
-                    let imgItem = new SImageItem(null, `${this.mapServerURL}/webtheme/${this.fmapID}/${window.fengmapData.frImg}`)
-                    imgItem.showType = SImageShowType.AutoFit
-                    imgItem.connect('imgLoadOver', this, () => {
-                        this.readGraph()
-                    })
-                    this.scene.addItem(imgItem)
-                    this.view.scene = this.scene
+                    // const pj = this.urlMsg.fmapID.split('_')[0]
+                    // // 单张图片
+                    // if (!ProjectRf[pj]) {
+                        let imgItem = new SImageItem(null, `${this.mapServerURL}/webtheme/${this.fmapID}/${window.fengmapData.frImg}`)
+                        imgItem.showType = SImageShowType.AutoFit
+                        imgItem.connect('imgLoadOver', this, () => {
+                            this.readGraph()
+                        })
+                        this.scene.addItem(imgItem)
+                        this.view.scene = this.scene
                     // this.view.fitSceneToView()
+                    // } else {
+                    //   // 多张图
+                    //   try {
+                    //     // 初始化0
+                    //     this.count = 0;
+                    //     ProjectRf[pj].forEach(t => {
+                    //       const item = new SImageItem(
+                    //         null,
+                    //         `${this.mapServerURL}/webtheme/${this.urlMsg.fmapID}/${t.name}`
+                    //       );
+                    //       item.width = t.width
+                    //       item.height = t.width
+                    //       item.moveTo(t.x, t.y)
+                    //       item.connect("imgLoadOver", this, () => {
+                    //         this.countRf(ProjectRf[pj].length);
+                    //       });
+                    //       this.scene.addItem(item);
+                    //     })
+                    //     this.view.scene = this.scene;
+                    //   } catch(e) {
+                    //     console.log(e);
+                    //   }
+                    // }
                 } else {
                     // 屋顶图不为图片
                     this.readBaseMap(floor);
@@ -445,6 +472,15 @@ export default {
                     this.loading = false
                 })
         },
+        // 顶楼为多张图时计数器
+        countRf(len) {
+            this.count++
+            if (len == this.count) {
+                this.readGraph();
+            } else {
+                console.log('所有图片未加载完成');
+            }
+        },
         clearGraphy() {
             if (this.view) {
                 this.view.scene = null

+ 35 - 34
src/views/equipment/table/eqDetaileDialog.vue

@@ -60,13 +60,13 @@
         </div>
         <el-table @row-click='innerTable' :data='tableData' :border='true' style='width: 100%;amrgin-bottom:30px'>
             <el-table-column type='index' label='序号' width='60' :index='indexMethod'></el-table-column>
-            <el-table-column prop='sbjc' label='设备名称' show-overflow-tooltip resizable width='230'>
+            <el-table-column prop='sbjc' label='设备名称' show-overflow-tooltip resizable min-width='150'>
                 <template slot-scope='{row}'>{{row.sbjc || '--'}}</template>
             </el-table-column>
             <el-table-column prop='assetnum' label='设备内码' show-overflow-tooltip resizable width='80'>
                 <template slot-scope='{row}'>{{row.assetnum || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='sl' label='数量' width='80'>
+            <el-table-column prop='sl' label='数量' width='60'>
                 <template slot-scope='{row}'>{{row.sl>=0?row.sl:'--'}}</template>
             </el-table-column>
             <el-table-column prop='sbglgs' label='管理归属' show-overflow-tooltip resizable>
@@ -81,7 +81,7 @@
             <el-table-column prop='sbxh' label='型号' show-overflow-tooltip resizable width='80'>
                 <template slot-scope='{row}'>{{row.sbxh || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='floor' sortable label='楼层' width='80' show-overflow-tooltip resizable>
+            <el-table-column prop='floor' sortable label='楼层' width='70' show-overflow-tooltip resizable>
                 <template slot-scope='{row}'>{{row.floorcode || '--'}}</template>
             </el-table-column>
             <el-table-column prop='wzjc' label='安装位置' show-overflow-tooltip resizable min-width='150'>
@@ -90,10 +90,10 @@
             <el-table-column prop='manufacturer' label='生产厂商' show-overflow-tooltip resizable min-width='150'>
                 <template slot-scope='{row}'>{{row.manufacturer || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='fws' label='服务商' show-overflow-tooltip resizable width='200'>
+            <el-table-column prop='fws' label='服务商' show-overflow-tooltip resizable min-width='150'>
                 <template slot-scope='{row}'>{{row.fws || '--'}}</template>
             </el-table-column>
-            <el-table-column prop label='相关资料' show-overflow-tooltip resizable width='100'>
+            <el-table-column prop label='相关资料' show-overflow-tooltip resizable min-width='150'>
                 <template slot-scope='{row}'>{{'--'}}</template>
             </el-table-column>
         </el-table>
@@ -102,6 +102,7 @@
                 background
                 layout='prev, pager, next'
                 :total='total'
+                :current-page.sync="sonpage"
                 :page-size='size'
                 @prev-click='pageChanged'
                 @next-click='pageChanged'
@@ -124,9 +125,9 @@ export default {
                 { id: 'test1', name: '选择项' },
                 { id: 'test2', name: '单平米' },
                 { id: 'test3', name: '下级分项' },
-                { id: 'test4', name: '滑动平均滑动平均' }
+                { id: 'test4', name: '滑动平均滑动平均' },
             ],
-           // page: 1,
+            // page: 1,
             size: 10,
             total: 1,
             sbjc: '',
@@ -139,17 +140,17 @@ export default {
             sbglgs: '1',
             sbglgsOption: [],
             statusOption: [],
-            floorAllSelect: []
+            floorAllSelect: [],
         }
     },
     components: {
         Select,
-        inputDialog
+        inputDialog,
     },
     computed: {
-        ...mapGetters(['floorSelect'])
+        ...mapGetters(['floorSelect']),
     },
-    props: ['row', 'major','sonpage'],
+    props: ['row', 'major', 'sonpage'],
     mounted() {
         this.queryTableList()
         this.tabFind()
@@ -164,9 +165,9 @@ export default {
         },
         //序号的方法
         indexMethod(index) {
-            if(this.sonpage){
+            if (this.sonpage) {
                 return (this.sonpage - 1) * this.size + index + 1
-            }   
+            }
         },
         //多余输入框监听
         confirm(fws, manufacturer) {
@@ -181,10 +182,10 @@ export default {
                 {
                     columnName: { sbglgs: 'sbglgs', sb_status: 'sb_status' },
                     params: {
-                        type_code: this.row.type_code
+                        type_code: this.row.type_code,
                     },
-                    tableName: 'sms_asset' //视图名称
-                }
+                    tableName: 'sms_asset', //视图名称
+                },
             ]
             let major
             if (this.major.slice(0, 2) == 'GD') {
@@ -202,32 +203,32 @@ export default {
             }
             let data = {
                 major: major,
-                plazaId: this.$store.state.plazaId
+                plazaId: this.$store.state.plazaId,
             }
-            querySelect({ data, postParams }).then(res => {
+            querySelect({ data, postParams }).then((res) => {
                 //console.log(res)
                 let sb_status = res.data.data.sms_asset.sb_status
                 let sbglgs = res.data.data.sms_asset.sbglgs
                 this.sbglgsOption = []
                 this.sbglgsOption.push({
                     name: '全部',
-                    id: '1'
+                    id: '1',
                 })
                 this.statusOption = []
                 this.statusOption.push({
                     name: '全部',
-                    id: '1'
+                    id: '1',
                 })
-                sb_status.forEach(el => {
+                sb_status.forEach((el) => {
                     this.statusOption.push({
                         name: el.value,
-                        id: el.key
+                        id: el.key,
                     })
                 })
-                sbglgs.forEach(el => {
+                sbglgs.forEach((el) => {
                     this.sbglgsOption.push({
                         name: el.value,
-                        id: el.key
+                        id: el.key,
                     })
                 })
             })
@@ -255,7 +256,7 @@ export default {
                 major: major,
                 plazaId: this.$store.state.plazaId,
                 page: this.sonpage,
-                size: this.size
+                size: this.size,
             }
             //输入框搜索
             data.keyword = ''
@@ -282,7 +283,7 @@ export default {
                 type_code: this.row.type_code,
                 manufacturer: this.row.manufacturer || '--',
                 sbxh: this.row.sbxh || '--',
-                brand: this.row.brand || '--'
+                brand: this.row.brand || '--',
             }
             //下拉筛选
             if (this.floor && this.floor != 1) {
@@ -294,7 +295,7 @@ export default {
             if (this.status && this.status != 1) {
                 postParams.status = this.status
             }
-            queryAsset({ data, postParams }).then(res => {
+            queryAsset({ data, postParams }).then((res) => {
                 //console.log(res)
                 this.tableData = res.data.data
                 this.total = res.data.count
@@ -304,13 +305,13 @@ export default {
             this.floorAllSelect = []
             this.floorAllSelect.push({
                 id: '1',
-                name: '全部'
+                name: '全部',
             })
-            this.floorSelect.forEach(el => {
+            this.floorSelect.forEach((el) => {
                 this.floorAllSelect.push(el)
             })
             console.log(this.floorAllSelect)
-        }
+        },
     },
     watch: {
         row: {
@@ -319,7 +320,7 @@ export default {
                 this.getFloorAllSelect()
                 this.tabFind()
             },
-            deep: true
+            deep: true,
         },
         sbglgs() {
             this.queryTableList()
@@ -329,8 +330,8 @@ export default {
         },
         floor() {
             this.queryTableList()
-        }
-    }
+        },
+    },
 }
 </script>
 <style lang="less" scoped>
@@ -361,7 +362,7 @@ export default {
 </style>
 <style lang="less">
 .gdqd-dialog {
-    /deep/.el-table tr {
+    /deep/.el-table td {
         cursor: pointer;
     }
 }

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

@@ -46,19 +46,19 @@
         <div ref='tableBox' style='height: calc(100% - 115px);'>
             <el-table :data='tableData' :max-height='tableMaxHeight' style='width: 100%' :border='true' @row-click='rowHandle'>
                 <el-table-column type='index' label='序号' width='60' :index='indexMethod'></el-table-column>
-                <el-table-column prop='type_name' label='设备名称' show-overflow-tooltip resizable width='250'>
+                <el-table-column prop='type_name' label='设备名称' show-overflow-tooltip resizable min-width='300'>
                     <template slot-scope='{row}'>{{row.type_name || '--'}}</template>
                 </el-table-column>
-                <el-table-column prop='sl' label='数量' width='100'>
+                <el-table-column prop='sl' label='数量' width='60'>
                     <template slot-scope='{row}'>{{row.sl>=0?row.sl:'--'}}</template>
                 </el-table-column>
-                <el-table-column prop='brand' label='品牌' width='120'>
+                <el-table-column prop='brand' label='品牌' min-width='300'>
                     <template slot-scope='{row}'>{{row.brand || '--'}}</template>
                 </el-table-column>
-                <el-table-column prop='sbxh' label='型号' show-overflow-tooltip resizable width='150'>
+                <el-table-column prop='sbxh' label='型号' show-overflow-tooltip resizable min-width='300'>
                     <template slot-scope='{row}'>{{row.sbxh || '--'}}</template>
                 </el-table-column>
-                <el-table-column prop='floorcode' label='楼层' width='240' show-overflow-tooltip resizable>
+                <el-table-column prop='floorcode' label='楼层' width='60' show-overflow-tooltip resizable>
                     <template slot-scope='{row}'>{{row.floorcode || '--'}}</template>
                 </el-table-column>
                 <!-- <el-table-column prop='wzjc' label='安装位置' show-overflow-tooltip resizable>
@@ -106,7 +106,7 @@ export default {
             tableData: [],
             total: 0,
             currentPage: 1,
-            sonpage:1,
+            sonpage: 1,
             size: 10,
             innerVisible: false, //详情弹框
             keyword: '',
@@ -116,11 +116,11 @@ export default {
             floor: '1',
             tableMaxHeight: 0,
             type_name: '',
-            floorAllSelect: []
+            floorAllSelect: [],
         }
     },
     computed: {
-        ...mapGetters(['floorSelect'])
+        ...mapGetters(['floorSelect']),
     },
     props: ['param', 'major', 'systemName', 'InfoName'],
     methods: {
@@ -139,13 +139,13 @@ export default {
         },
         getList() {
             let postParams = {
-                tab_code: this.param
+                tab_code: this.param,
             }
             let data = {
                 page: this.currentPage,
                 size: this.size,
                 plazaId: this.$store.state.plazaId,
-                major: this.major
+                major: this.major,
             }
             //下拉
             if (this.floor && this.floor != 1) {
@@ -165,7 +165,7 @@ export default {
             if (data.keyword == '') {
                 delete data.keyword
             }
-            queryEquipmentList({ data, postParams }).then(res => {
+            queryEquipmentList({ data, postParams }).then((res) => {
                 //console.log(res)
                 this.tableData = res.data.data
                 this.total = res.data.count
@@ -175,12 +175,12 @@ export default {
             this.floorAllSelect = []
             this.floorAllSelect.push({
                 name: '全部',
-                id: '1'
+                id: '1',
             })
-            this.floorSelect.forEach(el => {
+            this.floorSelect.forEach((el) => {
                 this.floorAllSelect.push(el)
             })
-        }
+        },
     },
     watch: {
         param(newV, oldV) {
@@ -206,8 +206,8 @@ export default {
                     this.getList()
                 }
             },
-            deep: true
-        }
+            deep: true,
+        },
     },
     mounted() {
         // this.floor = this.$cookie.get('floorMapId')
@@ -217,7 +217,7 @@ export default {
             this.tableMaxHeight = this.$refs.tableBox.offsetHeight
         })
         this.getFloorAllSelect()
-    }
+    },
 }
 </script>
 <style lang="less" scoped>
@@ -252,7 +252,7 @@ export default {
 </style>
 <style lang="less">
 .eq-list {
-    /deep/.el-table tr {
+    /deep/.el-table td {
         cursor: pointer;
     }
 }

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

@@ -46,20 +46,20 @@
         <div ref='tableBox' style='height: calc(100% - 115px);'>
             <el-table :data='tableData' :max-height='tableMaxHeight' :border='true' style='width: 100%' @row-click='rowHandle'>
                 <el-table-column type='index' label='序号' width='60' :index='indexMethod'></el-table-column>
-                <el-table-column prop label='设备名称' show-overflow-tooltip resizable width='300'>
+                <el-table-column prop label='设备名称' show-overflow-tooltip resizable min-width='300'>
                     <template slot-scope='{row}'>{{row.type_name || '--'}}</template>
                 </el-table-column>
                 <!-- sbjc -->
-                <el-table-column prop='sl' label='数量' width='100'>
+                <el-table-column prop='sl' label='数量' width='60'>
                     <template slot-scope='{row}'>{{row.sl>=0?row.sl:'--'}}</template>
                 </el-table-column>
-                <el-table-column prop='brand' label='品牌' width='200'>
+                <el-table-column prop='brand' label='品牌' width='300'>
                     <template slot-scope='{row}'>{{row.brand || '--'}}</template>
                 </el-table-column>
-                <el-table-column prop='sbxh' label='型号' show-overflow-tooltip resizable width='150'>
+                <el-table-column prop='sbxh' label='型号' show-overflow-tooltip resizable min-width='300'>
                     <template slot-scope='{row}'>{{row.sbxh || '--'}}</template>
                 </el-table-column>
-                <el-table-column prop='floor' label='楼层' width='240' show-overflow-tooltip resizable>
+                <el-table-column prop='floor' label='楼层' width='60' show-overflow-tooltip resizable>
                     <template slot-scope='{row}'>{{row.floorcode || '--'}}</template>
                 </el-table-column>
                 <el-table-column prop='manufacturer' label='生产厂商' show-overflow-tooltip resizable min-width='300'>
@@ -99,7 +99,7 @@ export default {
             tableData: [],
             total: 0,
             currentPage: 1,
-            sonpage:1,
+            sonpage: 1,
             size: 10,
             keyword: '',
             floor: '1',
@@ -108,13 +108,13 @@ export default {
             manufacturer: '',
             type_name: '',
             tableMaxHeight: 0,
-            floorAllSelect: []
+            floorAllSelect: [],
         }
     },
     props: ['major', 'param', 'InfoName'],
     components: { EqDetail, Select },
     computed: {
-        ...mapGetters(['floorSelect'])
+        ...mapGetters(['floorSelect']),
     },
     methods: {
         indexMethod(index) {
@@ -132,7 +132,7 @@ export default {
         },
         getList() {
             let postParams = {
-                tab_code: this.param
+                tab_code: this.param,
             }
             let major
             if (this.major.slice(0, 2) == 'GD') {
@@ -150,7 +150,7 @@ export default {
                 page: this.currentPage,
                 size: this.size,
                 plazaId: this.$store.state.plazaId,
-                major: major
+                major: major,
                 // floor:this.floor
             }
             //下拉
@@ -171,7 +171,7 @@ export default {
             if (data.keyword == '') {
                 delete data.keyword
             }
-            queryEquipmentList({ data, postParams }).then(res => {
+            queryEquipmentList({ data, postParams }).then((res) => {
                 this.tableData = res.data.data
                 this.total = res.data.count
             })
@@ -180,13 +180,13 @@ export default {
             this.floorAllSelect = []
             this.floorAllSelect.push({
                 name: '全部',
-                id: '1'
+                id: '1',
             })
-            this.floorSelect.forEach(el => {
+            this.floorSelect.forEach((el) => {
                 this.floorAllSelect.push(el)
             })
             console.log(this.floorAllSelect)
-        }
+        },
     },
     watch: {
         param(newV, oldV) {
@@ -210,8 +210,8 @@ export default {
                     this.getList()
                 }
             },
-            deep: true
-        }
+            deep: true,
+        },
     },
     mounted() {
         // this.floor = this.$cookie.get('floorMapId')
@@ -221,7 +221,7 @@ export default {
             this.tableMaxHeight = this.$refs.tableBox.offsetHeight
         })
         this.getFloorAllSelect()
-    }
+    },
 }
 </script>
 <style lang="less" scoped>
@@ -257,7 +257,7 @@ export default {
 </style>
 <style lang="less">
 .stand-list {
-    /deep/.el-table tr {
+    /deep/.el-table td {
         cursor: pointer;
     }
 }

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

@@ -356,7 +356,7 @@ export default {
             color: rgb(31, 36, 41);
         }
     }
-    /deep/.el-table tr {
+    /deep/.el-table td {
         cursor: pointer;
     }
 }

+ 15 - 15
src/views/equipment/table/wxTable.vue

@@ -160,23 +160,23 @@ export default {
             changeOption: [
                 {
                     id: '2',
-                    name: '全部'
+                    name: '全部',
                 },
                 {
                     id: '1',
-                    name: '是'
+                    name: '是',
                 },
                 {
                     id: '0',
-                    name: '否'
-                }
+                    name: '否',
+                },
             ],
             keyword: '',
-            tableMaxHeight: 0
+            tableMaxHeight: 0,
         }
     },
     computed: {
-        ...mapGetters(['floorSelect'])
+        ...mapGetters(['floorSelect']),
     },
     props: ['smsxt', 'major', 'diff', 'tabLabel'],
     methods: {
@@ -211,8 +211,8 @@ export default {
                     diff: this.diff,
                     plazaId: this.$store.state.plazaId,
                     page: this.currentPage,
-                    size: this.size
-                }
+                    size: this.size,
+                },
             }
             //下拉
             if (this.ischange && this.ischange != 2) {
@@ -241,7 +241,7 @@ export default {
             if (getParams.data.keyword == '') {
                 delete getParams.data.keyword
             }
-            queryWx(getParams).then(res => {
+            queryWx(getParams).then((res) => {
                 this.tableData = res.data || []
                 this.total = res.count
             })
@@ -249,16 +249,16 @@ export default {
         clickPic(row) {
             this.imgUrl = []
             if (row) {
-                row.forEach(el => {
+                row.forEach((el) => {
                     let obj = {
                         name: el.description,
-                        url: el.url
+                        url: el.url,
                     }
                     this.imgUrl.push(obj)
                 })
             }
             this.$refs.picLargeOpen.open(this.imgUrl)
-        }
+        },
     },
     watch: {
         diff(newV, oldV) {
@@ -282,7 +282,7 @@ export default {
         },
         ischange() {
             this.getList()
-        }
+        },
     },
     mounted() {
         this.getList()
@@ -290,7 +290,7 @@ export default {
             // 页面渲染完成后的回调
             this.tableMaxHeight = this.$refs.tableBox.offsetHeight
         })
-    }
+    },
 }
 </script>
 <style lang="less" scoped>
@@ -349,7 +349,7 @@ export default {
             color: rgb(31, 36, 41);
         }
     }
-    /deep/.el-table tr {
+    /deep/.el-table td {
         cursor: pointer;
     }
 }

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

@@ -72,37 +72,37 @@
                 v-if='tableData.length>=0'
             >
                 <el-table-column type='index' label='序号' width='60' :index='indexMethod'></el-table-column>
-                <el-table-column prop='nd' label='年度' show-overflow-tooltip resizable width='80'>
+                <el-table-column prop='nd' label='年度' show-overflow-tooltip resizable width='60'>
                     <template slot-scope='{row}'>{{row.nd || '--'}}</template>
                 </el-table-column>
-                <el-table-column prop='qs' label='期数' show-overflow-tooltip resizable width='80'>
+                <el-table-column prop='qs' label='期数' show-overflow-tooltip resizable width='60'>
                     <template slot-scope='{row}'>{{row.qs || '--'}}</template>
                 </el-table-column>
-                <el-table-column prop='lb' label='类别' show-overflow-tooltip resizable min-width='210'>
+                <el-table-column prop='lb' label='类别' show-overflow-tooltip resizable min-width='250'>
                     <template slot-scope='{row}'>{{row.lb || '--'}}</template>
                 </el-table-column>
                 <el-table-column prop='xm' label='项目' show-overflow-tooltip resizable min-width='150'>
                     <template slot-scope='{row}'>{{row.xm || '--'}}</template>
                 </el-table-column>
-                <el-table-column prop='sl' label='数量' show-overflow-tooltip resizable width='80'>
+                <el-table-column prop='sl' label='数量' show-overflow-tooltip resizable width='60'>
                     <template slot-scope='{row}'>{{row.sl>=0?row.sl:'--'}}</template>
                 </el-table-column>
-                <el-table-column prop='ssfasm' label='实施方案说明' show-overflow-tooltip resizable min-width='320'>
+                <el-table-column prop='ssfasm' label='实施方案说明' show-overflow-tooltip resizable min-width='250'>
                     <template slot-scope='{row}'>{{row.ssfasm || '--'}}</template>
                 </el-table-column>
                 <el-table-column prop='sxjd' label='当前阶段' show-overflow-tooltip resizable width='80'>
                     <template slot-scope='{row}'>{{row.sxjd || '--'}}</template>
                 </el-table-column>
-                <el-table-column prop='lxsjwcsj' label='立项日期' show-overflow-tooltip resizable width='140'>
+                <el-table-column prop='lxsjwcsj' label='立项日期' show-overflow-tooltip resizable width='100'>
                     <template slot-scope='{row}'>{{row.lxsjwcsj?formatter(row.lxsjwcsj):'--'}}</template>
                 </el-table-column>
-                <el-table-column prop='yssjwcsj' label='验收日期' show-overflow-tooltip resizable width='140'>
+                <el-table-column prop='yssjwcsj' label='验收日期' show-overflow-tooltip resizable width='100'>
                     <template slot-scope='{row}'>{{row.yssjwcsj?formatter(row.yssjwcsj):'--'}}</template>
                 </el-table-column>
-                <el-table-column prop='status' label='验收结果' show-overflow-tooltip resizable width='90'>
+                <el-table-column prop='status' label='验收结果' show-overflow-tooltip resizable width='80'>
                     <template slot-scope='{row}'>{{row.status || '--'}}</template>
                 </el-table-column>
-                <el-table-column prop='zfje' label='结算金额' show-overflow-tooltip resizable width='80' align='right'>
+                <el-table-column prop='zfje' label='结算金额(元)' show-overflow-tooltip resizable width='105'>
                     <template slot-scope='{row}'>{{number_format(row.zfje,2)|| '--'}}</template>
                 </el-table-column>
                 <el-table-column prop='xlcfwz' label='资料存放位置' show-overflow-tooltip resizable width='100'>
@@ -153,11 +153,11 @@ export default {
             sxjdOption: [],
             xmOption: [],
             lbOption: [],
-            tableMaxHeight: 0
+            tableMaxHeight: 0,
         }
     },
     computed: {
-        ...mapGetters(['floorSelect'])
+        ...mapGetters(['floorSelect']),
     },
     props: ['smsxt', 'major', 'diff', 'tabLabel'],
     methods: {
@@ -188,10 +188,10 @@ export default {
                 {
                     columnName: { lb: 'lb', xm: 'xm', sxjd: 'sxjd', status: 'status' },
                     params: {
-                        smsxt: this.smsxt
+                        smsxt: this.smsxt,
                     },
-                    tableName: 'sms_zw' //视图名称
-                }
+                    tableName: 'sms_zw', //视图名称
+                },
             ]
             let major
             if (this.major.slice(0, 2) == 'GD') {
@@ -215,9 +215,9 @@ export default {
             }
             let data = {
                 major: major,
-                plazaId: this.$store.state.plazaId
+                plazaId: this.$store.state.plazaId,
             }
-            querySelect({ data, postParams }).then(res => {
+            querySelect({ data, postParams }).then((res) => {
                 //console.log(res)
                 let lb = res.data.data.sms_zw.lb
                 let xm = res.data.data.sms_zw.xm
@@ -226,45 +226,45 @@ export default {
                 this.lbOption = []
                 this.lbOption.push({
                     name: '全部',
-                    id: '1'
+                    id: '1',
                 })
                 this.xmOption = []
                 this.xmOption.push({
                     id: '1',
-                    name: '全部'
+                    name: '全部',
                 })
                 this.sxjdOption = []
                 this.sxjdOption.push({
                     id: '1',
-                    name: '全部'
+                    name: '全部',
                 })
                 this.statusOption = []
                 this.statusOption.push({
                     id: '1',
-                    name: '全部'
+                    name: '全部',
                 })
-                sxjd.forEach(el => {
+                sxjd.forEach((el) => {
                     this.sxjdOption.push({
                         name: el.value,
-                        id: el.key
+                        id: el.key,
                     })
                 })
-                xm.forEach(el => {
+                xm.forEach((el) => {
                     this.xmOption.push({
                         name: el.value,
-                        id: el.key
+                        id: el.key,
                     })
                 })
-                lb.forEach(el => {
+                lb.forEach((el) => {
                     this.lbOption.push({
                         name: el.value,
-                        id: el.key
+                        id: el.key,
                     })
                 })
-                status.forEach(el => {
+                status.forEach((el) => {
                     this.statusOption.push({
                         name: el.value,
-                        id: el.key
+                        id: el.key,
                     })
                 })
             })
@@ -276,8 +276,8 @@ export default {
                     plazaId: this.$store.state.plazaId,
                     page: this.currentPage,
                     diff: this.diff,
-                    size: this.size
-                }
+                    size: this.size,
+                },
             }
             //下拉
             if (this.nd) {
@@ -313,11 +313,11 @@ export default {
             if (getParams.data.keyword == '') {
                 delete getParams.data.keyword
             }
-            queryZw(getParams).then(res => {
+            queryZw(getParams).then((res) => {
                 this.tableData = res.data || []
                 this.total = res.count
             })
-        }
+        },
     },
     watch: {
         diff(newV, oldV) {
@@ -342,7 +342,7 @@ export default {
                     this.getList()
                 }
             },
-            deep: true
+            deep: true,
         },
         sxjd() {
             this.getList()
@@ -352,7 +352,7 @@ export default {
         },
         lb() {
             this.getList()
-        }
+        },
     },
     mounted() {
         this.tabFind()
@@ -361,7 +361,7 @@ export default {
             // 页面渲染完成后的回调
             this.tableMaxHeight = this.$refs.tableBox.offsetHeight
         })
-    }
+    },
 }
 </script>
 <style lang="less" scoped>
@@ -420,7 +420,7 @@ export default {
             color: rgb(31, 36, 41);
         }
     }
-    /deep/.el-table tr {
+    /deep/.el-table td {
         cursor: pointer;
     }
 }

+ 21 - 21
src/views/other/zhsxOtherTable2.vue

@@ -77,16 +77,16 @@
             @row-click='innerTable'
         >
             <el-table-column label='序号' type='index' width='60' :index='indexMethod'></el-table-column>
-            <el-table-column prop :show-overflow-tooltip='true' sortable label='任务名称' width='540'>
+            <el-table-column prop :show-overflow-tooltip='true' sortable label='任务名称' min-width='400'>
                 <template slot-scope='{row}'>{{row.description||'--'}}</template>
             </el-table-column>
-            <el-table-column prop label='状态' :show-overflow-tooltip='true' width='90'>
+            <el-table-column prop label='状态' :show-overflow-tooltip='true' width='80'>
                 <template slot-scope='{row}'>{{row.status||'--'}}</template>
             </el-table-column>
             <el-table-column prop label='部门' width='260' :show-overflow-tooltip='true'>
                 <template slot-scope='{row}'>{{row.zgbm||'--'}}</template>
             </el-table-column>
-            <el-table-column prop :show-overflow-tooltip='true' label='检测结论'>
+            <el-table-column prop :show-overflow-tooltip='true' label='检测结论' min-width='400'>
                 <template slot-scope='{row}'>{{row.conclusion||'--'}}</template>
             </el-table-column>
         </el-table>
@@ -127,9 +127,9 @@ export default {
             allArr: [
                 {
                     id: '全部',
-                    name: '全部'
-                }
-            ]
+                    name: '全部',
+                },
+            ],
         }
     },
     components: { Select },
@@ -142,7 +142,7 @@ export default {
             let getParams = {
                 plazaId: this.$store.state.plazaId,
                 page: this.page,
-                size: this.size
+                size: this.size,
             }
             if (this.searVal) {
                 getParams.keyword = `${this.searVal}:description`
@@ -156,7 +156,7 @@ export default {
             if (this.jcjldsf) {
                 getParams.keyword = `${this.jcjldsf}:conclusion`
             }
-            queryDsfrw({ getParams }).then(res => {
+            queryDsfrw({ getParams }).then((res) => {
                 if (res.result == 'success') {
                     this.loading = false
                     this.total = res.count
@@ -180,13 +180,13 @@ export default {
             let postParams = [
                 {
                     columnName: { status: 'status', zgbm: 'zgbm', conclusion: 'conclusion' },
-                    tableName: 'sms_dsfrw'
-                }
+                    tableName: 'sms_dsfrw',
+                },
             ]
             let data = {
-                plazaId: this.$store.state.plazaId
+                plazaId: this.$store.state.plazaId,
             }
-            querySelect({ data, postParams }).then(res => {
+            querySelect({ data, postParams }).then((res) => {
                 //console.log('下拉框', res)
                 let status2 = [],
                     zgbm = [],
@@ -195,39 +195,39 @@ export default {
                 zgbm = res.data.data.sms_dsfrw.zgbm ? res.data.data.sms_dsfrw.zgbm : []
                 conclusion = res.data.data.sms_dsfrw.conclusion ? res.data.data.sms_dsfrw.conclusion : []
                 if (status2.length > 0) {
-                    status2.forEach(el => {
+                    status2.forEach((el) => {
                         let obj = {
                             id: el.key,
-                            name: el.value
+                            name: el.value,
                         }
                         status2.push(obj)
                     })
                     this.status2 = this.allArr.concat(status2)
                 }
                 if (zgbm.length > 0) {
-                    zgbm.forEach(el => {
+                    zgbm.forEach((el) => {
                         let obj = {
                             id: el.key,
-                            name: el.value
+                            name: el.value,
                         }
                         this.zgbm.push(obj)
                     })
                 }
                 if (conclusion.length > 0) {
-                    conclusion.forEach(el => {
+                    conclusion.forEach((el) => {
                         let obj = {
                             id: el.key,
-                            name: el.value
+                            name: el.value,
                         }
                         this.conclusion.push(obj)
                     })
                 }
             })
-        }
+        },
     },
     mounted() {
         this.changeSelect()
-    }
+    },
 }
 </script>
 <style lang="less">
@@ -238,7 +238,7 @@ export default {
         justify-content: flex-end;
         margin-top: 28px;
     }
-    /deep/.el-table tr {
+    /deep/.el-table td {
         cursor: pointer;
     }
 }

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

@@ -449,7 +449,7 @@ export default {
     .el-table th {
         padding: 8px 0;
     }
-    /deep/.el-table tr {
+    /deep/.el-table td {
         cursor: pointer;
     }
 }

+ 10 - 10
src/views/room/room3.vue

@@ -11,22 +11,22 @@
                 :header-cell-style='{background:"rgba(245,246,247,1)",fontFamily:"MicrosoftYaHei",color:"rgba(100,108,115,1)",lineHeight:"16px",fontSize:"12px"}'
             >
                 <el-table-column type='index' label='序号' width='60' :index='indexMethod'></el-table-column>
-                <el-table-column prop :show-overflow-tooltip='true' label='设备简称' resizable min-width='150'>
+                <el-table-column prop :show-overflow-tooltip='true' label='设备简称' resizable min-width='300'>
                     <template slot-scope='{row}'>{{row.type_name||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop label='数量' :show-overflow-tooltip='true' width='80'>
+                <el-table-column prop label='数量' :show-overflow-tooltip='true' width='60'>
                     <template slot-scope='{row}'>{{row.sl||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop label='品牌' :show-overflow-tooltip='true' width='120'>
+                <el-table-column prop label='品牌' :show-overflow-tooltip='true' min-width='300'>
                     <template slot-scope='{row}'>{{row.brand||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop label='型号' :show-overflow-tooltip='true' width='174'>
+                <el-table-column prop label='型号' :show-overflow-tooltip='true' min-width='300'>
                     <template slot-scope='{row}'>{{row.sbxh||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop label='楼层' :show-overflow-tooltip='true' width='100'>
+                <el-table-column prop label='楼层' :show-overflow-tooltip='true' width='60'>
                     <template slot-scope='{row}'>{{row.floorcode||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop :show-overflow-tooltip='true' label='生产厂商' min-width='150'>
+                <el-table-column prop :show-overflow-tooltip='true' label='生产厂商' min-width='300'>
                     <template slot-scope='{row}'>{{row.manufacturer||'--'}}</template>
                 </el-table-column>
             </el-table>
@@ -59,7 +59,7 @@ export default {
         return {
             innerVisible: false,
             row: {},
-            tableMaxHeight: 0
+            tableMaxHeight: 0,
         }
     },
 
@@ -83,14 +83,14 @@ export default {
                 // 页面渲染完成后的回调
                 this.tableMaxHeight = this.$refs.tableBox3.offsetHeight
             })
-        }
+        },
     },
     updated() {
         this.$nextTick(() => {
             // 页面渲染完成后的回调
             this.tableMaxHeight = this.$refs.tableBox3.offsetHeight
         })
-    }
+    },
 }
 </script>
 <style lang="less" scoped>
@@ -107,7 +107,7 @@ export default {
         height: 95% !important;
         margin-top: 50px;
     }
-    /deep/.el-table tr {
+    /deep/.el-table td {
         cursor: pointer;
     }
 }

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

@@ -95,7 +95,7 @@ export default {
             searVal: '',
             number_format,
             tableMaxHeight: 0,
-            imgUrl: []
+            imgUrl: [],
         }
     },
     components: { Select },
@@ -118,10 +118,10 @@ export default {
         clickPic(row) {
             this.imgUrl = []
             if (row) {
-                row.forEach(el => {
+                row.forEach((el) => {
                     let obj = {
                         name: el.description,
-                        url: el.url
+                        url: el.url,
                     }
                     this.imgUrl.push(obj)
                 })
@@ -133,14 +133,14 @@ export default {
                 // 页面渲染完成后的回调
                 this.tableMaxHeight = this.$refs.tableBox4.offsetHeight
             })
-        }
+        },
     },
     updated() {
         this.$nextTick(() => {
             // 页面渲染完成后的回调
             this.tableMaxHeight = this.$refs.tableBox4.offsetHeight
         })
-    }
+    },
 }
 </script>
 <style lang="less" scoped>
@@ -158,7 +158,7 @@ export default {
         justify-content: flex-end;
         margin-top: 28px;
     }
-    /deep/.el-table tr {
+    /deep/.el-table td {
         cursor: pointer;
     }
 }

+ 6 - 6
src/views/room/room5.vue

@@ -100,7 +100,7 @@ export default {
             searVal: '',
             dateVal: '',
             imgUrl: [],
-            tableMaxHeight: 0
+            tableMaxHeight: 0,
         }
     },
     components: { Select },
@@ -144,10 +144,10 @@ export default {
         clickPic(row) {
             this.imgUrl = []
             if (row) {
-                row.forEach(el => {
+                row.forEach((el) => {
                     let obj = {
                         name: el.description,
-                        url: el.url
+                        url: el.url,
                     }
                     this.imgUrl.push(obj)
                 })
@@ -159,8 +159,8 @@ export default {
                 // 页面渲染完成后的回调
                 this.tableMaxHeight = this.$refs.tableBox5.offsetHeight
             })
-        }
-    }
+        },
+    },
 }
 </script>
 <style lang="less" scoped>
@@ -178,7 +178,7 @@ export default {
         justify-content: flex-end;
         margin-top: 28px;
     }
-    /deep/.el-table tr {
+    /deep/.el-table td {
         cursor: pointer;
     }
 }