Browse Source

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

YaolongHan 4 years ago
parent
commit
700453c73e

+ 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.106",
+        "@saga-web/big": "1.0.105",
         "@saga-web/draw": "2.1.106",
-        "@saga-web/feng-map": "1.0.36",
-        "@saga-web/graph": "2.1.122",
+        "@saga-web/feng-map": "1.0.35",
+        "@saga-web/graph": "2.1.121",
         "ant-design-vue": "^1.4.10",
         "axios": "^0.19.2",
         "core-js": "^3.4.4",

+ 112 - 131
src/components/floorMap/index.vue

@@ -8,76 +8,82 @@
             <canvasFun @fit='fit' @savePng='savePng' @saveSvg='saveSvg' @saveJson='saveJson' @scale='scale' @showText='showText' ref='canvasFun'></canvasFun>
         </div>
         <room-box ref='boxRoom'></room-box>
-        <el-popover ref="popover" placement="right" trigger="manual" v-model="visible" width="380">
+        <el-popover ref='popover' placement='right' trigger='manual' v-model='visible' width='380'>
             <!-- <div style="text-align: right;margin-bottom: 10px;">
                 <span style="float: left;">对应的工程信息化信息</span>
                 <el-link icon="el-icon-close" :underline="false" @click="visible = false"></el-link>
-            </div> -->
+            </div>-->
 
-            <div v-if="equipIds.length && !tabData.pointData.length" style="margin-top: 10px;">
-                <el-table :data="tabData.tableData" max-height="235" style="width: 100%" @row-click='handleClickEquipDetail' v-loading="eqLoading">
-                    <el-table-column prop="sbjc" label="设备简称" width="164" :show-overflow-tooltip='true'></el-table-column>
-                    <el-table-column prop="sl" width="50" label="数量" :show-overflow-tooltip='true'></el-table-column>
-                    <el-table-column prop="sb_status" width="70" label="设备状态" :show-overflow-tooltip='true'></el-table-column>
-                    <el-table-column prop="sbglgs" width="70" label="管理归属" :show-overflow-tooltip='true'></el-table-column>
+            <div v-if='equipIds.length && !tabData.pointData.length' style='margin-top: 10px;'>
+                <el-table :data='tabData.tableData' max-height='235' style='width: 100%' @row-click='handleClickEquipDetail' v-loading='eqLoading'>
+                    <el-table-column prop='sbjc' label='设备简称' width='164' :show-overflow-tooltip='true'></el-table-column>
+                    <el-table-column prop='sl' width='50' label='数量' :show-overflow-tooltip='true'></el-table-column>
+                    <el-table-column prop='sb_status' width='70' label='设备状态' :show-overflow-tooltip='true'></el-table-column>
+                    <el-table-column prop='sbglgs' width='70' label='管理归属' :show-overflow-tooltip='true'></el-table-column>
                     <!-- <el-table-column prop="assetnum" width="80" label="设备内码" :show-overflow-tooltip='true'></el-table-column>
                     <el-table-column label="" width="80" :show-overflow-tooltip='true'>
                         <template slot-scope="scope">
                             <span class="equip-detail-btn">台账详情</span>
                         </template>
-                    </el-table-column> -->
+                    </el-table-column>-->
                 </el-table>
                 <!-- <div style="text-align: right; margin-top: 10px;">
                     <el-button size="mini" type="primary" @click="visible = false">关闭</el-button>
-                </div> -->
+                </div>-->
             </div>
 
-            <div v-else-if="!equipIds.length && tabData.pointData.length" style="margin-top: 10px;">
-                <ul class="pointList">
-                    <li v-for="point in tabData.pointData" :key="point.id" @click="handleClickPointDeatil(point)">
-                        <span :title="point.name">{{point.name}}</span>
+            <div v-else-if='!equipIds.length && tabData.pointData.length' style='margin-top: 10px;'>
+                <ul class='pointList'>
+                    <li v-for='point in tabData.pointData' :key='point.id' @click='handleClickPointDeatil(point)'>
+                        <span :title='point.name'>{{point.name}}</span>
                         <a>查看</a>
                     </li>
                 </ul>
-                <div style="text-align: right; margin-top: 10px;">
-                    <el-button v-show="showBtnWell" size="mini" type="primary" @click="handleClickHightLight(tabData.pointData)">查看控制商铺范围</el-button>
+                <div style='text-align: right; margin-top: 10px;'>
+                    <el-button v-show='showBtnWell' size='mini' type='primary' @click='handleClickHightLight(tabData.pointData)'>查看控制商铺范围</el-button>
                     <!-- <el-button size="mini" type="primary" @click="visible = false">关闭</el-button> -->
                 </div>
             </div>
 
-            <el-tabs v-else-if="equipIds.length && tabData.pointData.length" v-model="activeName">
-                <el-tab-pane label="设备设施" name="equip">
-                    <el-table :data="tabData.tableData" max-height="235" style="width: 100%" @row-click='handleClickEquipDetail' v-loading="eqLoading">
-                        <el-table-column prop="sbjc" label="设备简称" width="164" :show-overflow-tooltip='true'></el-table-column>
-                        <el-table-column prop="sl" width="50" label="数量" :show-overflow-tooltip='true' align="right"></el-table-column>
-                        <el-table-column prop="sb_status" width="70" label="设备状态" :show-overflow-tooltip='true'></el-table-column>
-                        <el-table-column prop="sbglgs" width="70" label="管理归属" :show-overflow-tooltip='true'></el-table-column>
+            <el-tabs v-else-if='equipIds.length && tabData.pointData.length' v-model='activeName'>
+                <el-tab-pane label='设备设施' name='equip'>
+                    <el-table
+                        :data='tabData.tableData'
+                        max-height='235'
+                        style='width: 100%'
+                        @row-click='handleClickEquipDetail'
+                        v-loading='eqLoading'
+                    >
+                        <el-table-column prop='sbjc' label='设备简称' width='164' :show-overflow-tooltip='true'></el-table-column>
+                        <el-table-column prop='sl' width='50' label='数量' :show-overflow-tooltip='true' align='right'></el-table-column>
+                        <el-table-column prop='sb_status' width='70' label='设备状态' :show-overflow-tooltip='true'></el-table-column>
+                        <el-table-column prop='sbglgs' width='70' label='管理归属' :show-overflow-tooltip='true'></el-table-column>
                         <!-- <el-table-column prop="assetnum" width="80" label="设备内码" :show-overflow-tooltip='true'></el-table-column>
                         <el-table-column label="" width="80" :show-overflow-tooltip='true'>
                             <template slot-scope="scope">
                                 <span class="equip-detail-btn">台账详情</span>
                             </template>
-                        </el-table-column> -->
+                        </el-table-column>-->
                     </el-table>
-                    <div style="text-align: right; margin-top: 10px;">
+                    <div style='text-align: right; margin-top: 10px;'>
                         <!-- <el-button size="mini" type="primary" @click="visible = false">关闭</el-button> -->
                     </div>
                 </el-tab-pane>
-                <el-tab-pane label="位置" name="point">
-                    <ul class="pointList">
-                        <li v-for="point in tabData.pointData" :key="point.id" @click="handleClickPointDeatil(point)">
-                            <span :title="point.name">{{point.name}}</span>
+                <el-tab-pane label='位置' name='point'>
+                    <ul class='pointList'>
+                        <li v-for='point in tabData.pointData' :key='point.id' @click='handleClickPointDeatil(point)'>
+                            <span :title='point.name'>{{point.name}}</span>
                             <a>查看</a>
                         </li>
                     </ul>
-                    <div style="text-align: right; margin-top: 10px;">
-                        <el-button v-show="showBtnWell" size="mini" type="primary" @click="handleClickHightLight(tabData.pointData)">查看控制商铺范围</el-button>
+                    <div style='text-align: right; margin-top: 10px;'>
+                        <el-button v-show='showBtnWell' size='mini' type='primary' @click='handleClickHightLight(tabData.pointData)'>查看控制商铺范围</el-button>
                         <!-- <el-button size="mini" type="primary" @click="visible = false">关闭</el-button> -->
                     </div>
                 </el-tab-pane>
             </el-tabs>
         </el-popover>
-        <span class="popStyle" :style="popoverPosition" v-popover:popover></span>
+        <span class='popStyle' :style='popoverPosition' v-popover:popover></span>
     </div>
 </template>
 <script>
@@ -115,17 +121,17 @@ export default {
             topologyParser: null, // 解析器数据
             fParser: null, // 底图解析器
             wellMap: {}, // 电井控制商铺映射
-            activeName: "equip",
+            activeName: 'equip',
             popoverPosition: {
                 top: 0,
-                left: 0
+                left: 0,
             },
             visible: false,
             eqLoading: true,
             equipIds: [],
             tabData: {
                 tableData: [],
-                pointData: []
+                pointData: [],
             },
             activeItem: null,
             showBtnWell: false,
@@ -155,50 +161,53 @@ export default {
     },
     methods: {
         handleClickLegendItem(item, events) {
-            this.tabData = {tableData: [], pointData: []};
-            this.showBtnWell = false;
-            this.visible = false;
-            this.activeItem = null;
-            this.isLoading = true;
+            this.tabData = { tableData: [], pointData: [] }
+            this.showBtnWell = false
+            this.visible = false
+            this.activeItem = null
+            this.isLoading = true
             if (item.data.AttachObjectIds && item.data.AttachObjectIds.length) {
-                const e = events[0];
-                this.equipIds = [];
-                this.activeItem = item;
-                item.data.AttachObjectIds.forEach(v => {
-                    if (v.type == "Image") {
-                        if(v.id) { this.equipIds.push(v.id) }
+                const e = events[0]
+                this.equipIds = []
+                this.activeItem = item
+                item.data.AttachObjectIds.forEach((v) => {
+                    if (v.type == 'Image') {
+                        if (v.id) {
+                            this.equipIds.push(v.id)
+                        }
                         // this.tabData.tableData.push(v);
-                    } else if (v.type == "Zone") {
-                        this.tabData.pointData.push(v);
+                    } else if (v.type == 'Zone') {
+                        this.tabData.pointData.push(v)
                     }
                 })
                 if (this.equipIds.length) {
-                    this.eqLoading = true;
+                    this.eqLoading = true
                     let data = {
                         plazaId: this.$store.state.plazaId,
                         page: 1,
-                        size: this.equipIds.length
+                        size: this.equipIds.length,
                     }
                     let postParams = {
-                        assetnumList: this.equipIds
+                        assetnumList: this.equipIds,
                     }
-                    queryAsset({ data, postParams }).then(res => {
-                        this.tabData.tableData = res.data.data;
-                        this.eqLoading = false;
+                    queryAsset({ data, postParams }).then((res) => {
+                        this.tabData.tableData = res.data.data
+                        this.eqLoading = false
                     })
                 }
-                this.popoverPosition.top = `${e.clientY}px`;
-                this.popoverPosition.left = `${e.clientX}px`;
+                this.popoverPosition.top = `${e.clientY}px`
+                this.popoverPosition.left = `${e.clientX}px`
                 this.$nextTick(() => {
                     if (
                         item.data.GraphElementId == '100050' ||
                         item.data.GraphElementId == '100055' ||
                         item.data.GraphElementId == '100056' ||
                         item.data.GraphElementId == '100057'
-                    ) { //判断是否为电井
-                        this.showBtnWell = true;
+                    ) {
+                        //判断是否为电井
+                        this.showBtnWell = true
                     }
-                    this.visible = true;
+                    this.visible = true
                 })
             }
         },
@@ -210,39 +219,38 @@ export default {
         },
         // 查看浮层位置详情
         handleClickPointDeatil(point) {
-            if (point.id && this.activeItem)
-            this.$refs.boxRoom.open({ name: this.activeItem.name, type: this.type, location: point.id });
+            if (point.id && this.activeItem) this.$refs.boxRoom.open({ name: this.activeItem.name, type: this.type, location: point.id })
         },
         handleClickHightLight(pointData) {
-            this.clearHightLight();
-            pointData.forEach(point => {
-                let location = point.id ? point.id : '';
+            this.clearHightLight()
+            pointData.forEach((point) => {
+                let location = point.id ? point.id : ''
                 if (this.wellMap.hasOwnProperty(location)) {
-                    this.wellMap[location].forEach(item => {
-                        item.highLightFlag = true;
-                        item.zOrder = 30;
+                    this.wellMap[location].forEach((item) => {
+                        item.highLightFlag = true
+                        item.zOrder = 30
                     })
                 } else {
                     let getParams = {
                         plazaId: this.plazaId,
                         floor: this.floorid,
-                        keyword: `${location}:wellnum;`
+                        keyword: `${location}:wellnum;`,
                     }
-                    queryShops({ getParams }).then(res => {
+                    queryShops({ getParams }).then((res) => {
                         let shopsnumList = []
                         let shopsnumItemList = []
                         if (res.data && res.data.length) {
                             for (let floor in res.data[0]) {
                                 if (res.data[0][floor].length) {
-                                    res.data[0][floor].forEach(v => {
+                                    res.data[0][floor].forEach((v) => {
                                         shopsnumList = shopsnumList.concat(v.shopsnumList.split(','))
                                     })
                                 }
                             }
                         }
                         if (shopsnumList.length) {
-                            this.fParser.spaceList.forEach(item => {
-                                if (shopsnumList.findIndex(name => name == item.data.Name) != -1) {
+                            this.fParser.spaceList.forEach((item) => {
+                                if (shopsnumList.findIndex((name) => name == item.data.Name) != -1) {
                                     item.highLightFlag = true
                                     item.zOrder = 30
                                     shopsnumItemList.push(item)
@@ -252,8 +260,8 @@ export default {
                         }
                     })
                 }
-            });
-            this.visible = false;
+            })
+            this.visible = false
         },
         ...mapActions(['getfmapID']),
         init(floorid) {
@@ -282,9 +290,6 @@ export default {
             if (floor == 'g80') {
                 // 屋顶
                 if (window.fengmapData.frImg) {
-                    // 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, () => {
@@ -293,50 +298,27 @@ export default {
                         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);
+                    this.readBaseMap(floor)
                 }
             } else {
                 if (window.fengmapData.gnameToGid[floor]) {
-                    this.readBaseMap(floor);
+                    this.readBaseMap(floor)
                 } else {
                     console.log('楼层不正确')
                 }
             }
-        },// 解析底图
-        readBaseMap(floor){
-            window.fengmapData.parseData(window.fengmapData.gnameToGid[floor], res => {
+        }, // 解析底图
+        readBaseMap(floor) {
+            window.fengmapData.parseData(window.fengmapData.gnameToGid[floor], (res) => {
                 if (res.err) {
                     console.log('errr', res.err)
                     return
                 }
                 this.fParser = new SFloorParser(null)
                 this.fParser.parseData(res)
-                this.fParser.spaceList.forEach(t => {
+                this.fParser.spaceList.forEach((t) => {
                     this.scene.addItem(t)
                     t.nameSize = 12
                     t.nameColor = '#2a2a2a'
@@ -347,11 +329,11 @@ export default {
                         t.name = ''
                     }
                 })
-                this.fParser.wallList.forEach(t => this.scene.addItem(t))
-                this.fParser.virtualWallList.forEach(t => this.scene.addItem(t))
-                this.fParser.doorList.forEach(t => this.scene.addItem(t))
-                this.fParser.columnList.forEach(t => this.scene.addItem(t))
-                this.fParser.casementList.forEach(t => this.scene.addItem(t))
+                this.fParser.wallList.forEach((t) => this.scene.addItem(t))
+                this.fParser.virtualWallList.forEach((t) => this.scene.addItem(t))
+                this.fParser.doorList.forEach((t) => this.scene.addItem(t))
+                this.fParser.columnList.forEach((t) => this.scene.addItem(t))
+                this.fParser.casementList.forEach((t) => this.scene.addItem(t))
                 this.view.scene = this.scene
                 // this.view.fitSceneToView()
                 this.readGraph()
@@ -435,7 +417,7 @@ export default {
                     // 多边形
                     this.topologyParser.zoneLegendList.forEach((t) => {
                         this.scene.addItem(t)
-                        t.connect("legendItemClick", t, this.handleClickLegendItem);
+                        t.connect('legendItemClick', t, this.handleClickLegendItem)
                     })
                     // 增加文字
                     this.topologyParser.textMarkerList.forEach((t) => {
@@ -452,14 +434,14 @@ export default {
                     // 增加图标类图例
                     this.topologyParser.imageLegendList.forEach((t) => {
                         this.scene.addItem(t)
-                        t.connect("legendItemClick", t, this.handleClickLegendItem);
+                        t.connect('legendItemClick', t, this.handleClickLegendItem)
                     })
                     // 增加管线类
                     // 增加图标类图例
                     this.topologyParser.relationList.forEach((t) => {
                         t.selectable = true
                         this.scene.addItem(t)
-                        t.connect("legendItemClick", t, this.handleClickLegendItem);
+                        t.connect('legendItemClick', t, this.handleClickLegendItem)
                     })
                     this.view.fitSceneToView()
                     this.view.minScale = this.view.scale
@@ -506,16 +488,16 @@ export default {
             //     }
             //     // // 选中电井设置电井关联的商铺高亮
             //     // this.setHightLight(ev[0])
-            // } 
+            // }
             // else {
-                // this.clearHightLight()
+            // this.clearHightLight()
             // }
             if (ev[0].length) {
                 if (!(ev[0][0] instanceof SPolygonItem || ev[0][0] instanceof TipelineItem || ev[0][0] instanceof SImageLegendItem)) {
-                    this.visible = false;
+                    this.visible = false
                 }
             } else {
-                this.visible = false;
+                this.visible = false
             }
             this.clearHightLight()
         },
@@ -527,9 +509,9 @@ export default {
                 // 添加了位置类型并且选中的类型为电井类型
                 if (
                     (item.data.GraphElementId == '100050' ||
-                    item.data.GraphElementId == '100055' ||
-                    item.data.GraphElementId == '100056' ||
-                    item.data.GraphElementId == '100057') &&
+                        item.data.GraphElementId == '100055' ||
+                        item.data.GraphElementId == '100056' ||
+                        item.data.GraphElementId == '100057') &&
                     location
                 ) {
                     if (this.wellMap.hasOwnProperty(location)) {
@@ -739,7 +721,7 @@ a:hover {
             .equip-detail-btn {
                 cursor: pointer;
                 display: inline-block;
-                color: #025BAA;
+                color: #025baa;
             }
         }
     }
@@ -752,7 +734,7 @@ a:hover {
             line-height: 38px;
             padding: 0 12px;
             cursor: pointer;
-            border-bottom: 1px solid rgba(0,0,0,0.06);
+            border-bottom: 1px solid rgba(0, 0, 0, 0.06);
             span {
                 float: left;
                 width: 260px;
@@ -763,19 +745,19 @@ a:hover {
             }
             a {
                 display: none;
-                color: #025BAA;
+                color: #025baa;
                 font-size: 13px;
             }
         }
         li:hover {
-            background-color: #F5F6F7;
+            background-color: #f5f6f7;
             a {
                 display: inline-block;
             }
         }
     }
-    .el-button--primary{
-         background: linear-gradient(180deg, #369cf7 0%, #025baa 100%);
+    .el-button--primary {
+        background: linear-gradient(180deg, #369cf7 0%, #025baa 100%);
     }
     .el-tabs--bottom .el-tabs__item.is-bottom:nth-child(2),
     .el-tabs--bottom .el-tabs__item.is-top:nth-child(2),
@@ -793,9 +775,9 @@ a:hover {
         height: 0;
     }
     .is-active {
-        color: #025BAA !important;
-        border-color: #025BAA !important;
-        background: rgba(2,91,170,0.15);
+        color: #025baa !important;
+        border-color: #025baa !important;
+        background: rgba(2, 91, 170, 0.15);
     }
     .el-tabs__item {
         padding: 5px 16px;
@@ -816,5 +798,4 @@ a:hover {
         border-radius: 4px 0px 0px 4px;
     }
 }
-    
 </style>

File diff suppressed because it is too large
+ 730 - 666
src/views/Device/FilterModal.vue


+ 3 - 3
src/views/analysis/CoreDeviceReport.vue

@@ -52,9 +52,9 @@
         style="width: 100%;margin-bottom: 63px;"
         @row-click="showEquipmentStatus"
       >
-        <el-table-column label="序号" type="index" :index="indexMethod"></el-table-column>
-        <el-table-column prop="sbjc" label="设备简称"></el-table-column>
-        <el-table-column prop="assetnum" label="设备编号"></el-table-column>
+        <el-table-column label="序号" type="index" width="60" :index="indexMethod"></el-table-column>
+        <el-table-column prop="sbjc" label="设备名称" width="600"></el-table-column>
+        <el-table-column prop="assetnum" label="设备内码"></el-table-column>
         <el-table-column prop="is_exception" label="状态">
           <template slot-scope="scope">
             <span

+ 6 - 3
src/views/analysis/GanttChart.vue

@@ -51,14 +51,14 @@
               <PlanTime class="icon" />
               <div class="title">计划时间</div>
             </div>
-            <div class="info">{{this.ganttDetail.planTime}}</div>
+            <div class="info">{{ganttDetail.planTime}}</div>
           </div>
           <div class="row">
             <div>
               <RealTime class="icon" />
               <div class="title">实际执行时间</div>
             </div>
-            <div class="info">{{this.ganttDetail.realTime}}</div>
+            <div class="info">{{ganttDetail.realTime}}</div>
           </div>
           <div class="row picture">
             <div>
@@ -453,7 +453,10 @@ export default {
       queryGanttDetail("/data/base/queryGanttChartDetails", param).then(res => {
         const { result, data } = res;
         if (result === "success") {
-          if (!data) return
+          if (!data) {
+            this.ganttDetail = {}
+            return
+          }
           const {
             status,
             planStartDate,

+ 5 - 1
src/views/analysis/SpecificationUpdateRecord.vue

@@ -141,7 +141,11 @@ export default {
           _.map(data, (item) => {
             let text = _.find(this.incidentList, (o) => {return o.id === item.objtype}).name
             item.evenType = text;
-            item.time = moment.unix(item.changedate / 1000).format('YYYY.MM.DD')
+            if (item.objtype === 0 || item.objtype === 2) {
+              item.time = moment.unix(item.changedate / 1000).format('YYYY-MM-DD')
+            } else {
+              item.time = moment.unix(item.changedate / 1000).format('YYYY-MM-DD HH-mm')
+            }
             return
           })
           this.tableData = data;

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

@@ -60,7 +60,7 @@
         </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 min-width='300'>
+            <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'>
@@ -75,25 +75,25 @@
             <el-table-column prop='sb_status' label='设备状态' width='80' show-overflow-tooltip resizable>
                 <template slot-scope='{row}'>{{row.sb_status || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='brand' label='品牌' show-overflow-tooltip resizable width='250'>
+            <el-table-column prop='brand' label='品牌' show-overflow-tooltip resizable width='80'>
                 <template slot-scope='{row}'>{{row.brand || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='sbxh' label='型号' show-overflow-tooltip resizable width='160'>
+            <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='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='170'>
+            <el-table-column prop='wzjc' label='安装位置' show-overflow-tooltip resizable min-width='150'>
                 <template slot-scope='{row}'>{{row.wzjc || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='manufacturer' label='生产厂商' show-overflow-tooltip resizable min-width='250'>
+            <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 min-width='250'>
+            <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 min-width='250'>
+            <el-table-column prop label='相关资料' show-overflow-tooltip resizable min-width='150'>
                 <template slot-scope='{row}'>{{'--'}}</template>
             </el-table-column>
         </el-table>
@@ -102,7 +102,7 @@
                 background
                 layout='prev, pager, next'
                 :total='total'
-                :current-page.sync='sonpage'
+                :current-page.sync="sonpage"
                 :page-size='size'
                 @prev-click='pageChanged'
                 @next-click='pageChanged'

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

@@ -46,25 +46,25 @@
         <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 min-width='260'>
+                <el-table-column prop='type_name' label='设备名称' show-overflow-tooltip resizable width='250'>
                     <template slot-scope='{row}'>{{row.type_name || '--'}}</template>
                 </el-table-column>
-                <el-table-column prop='sl' label='数量' width='60'>
+                <el-table-column prop='sl' label='数量' width='100'>
                     <template slot-scope='{row}'>{{row.sl>=0?row.sl:'--'}}</template>
                 </el-table-column>
-                <el-table-column prop='brand' label='品牌' min-width='260'>
+                <el-table-column prop='brand' label='品牌' width='120'>
                     <template slot-scope='{row}'>{{row.brand || '--'}}</template>
                 </el-table-column>
-                <el-table-column prop='sbxh' label='型号' show-overflow-tooltip resizable min-width='260'>
+                <el-table-column prop='sbxh' label='型号' show-overflow-tooltip resizable width='150'>
                     <template slot-scope='{row}'>{{row.sbxh || '--'}}</template>
                 </el-table-column>
-                <el-table-column prop='floorcode' label='楼层' width='60' show-overflow-tooltip resizable>
+                <el-table-column prop='floorcode' label='楼层' width='240' show-overflow-tooltip resizable>
                     <template slot-scope='{row}'>{{row.floorcode || '--'}}</template>
                 </el-table-column>
                 <!-- <el-table-column prop='wzjc' label='安装位置' show-overflow-tooltip resizable>
                     <template slot-scope='{row}'>{{row.wzjc || '--'}}</template>
                 </el-table-column>-->
-                <el-table-column prop='manufacturer' label='生产厂商' show-overflow-tooltip resizable min-width='260'>
+                <el-table-column prop='manufacturer' label='生产厂商' show-overflow-tooltip resizable min-width='300'>
                     <template slot-scope='{row}'>{{row.manufacturer || '--'}}</template>
                 </el-table-column>
             </el-table>
@@ -106,7 +106,7 @@ export default {
             tableData: [],
             total: 0,
             currentPage: 1,
-            sonpage: 1,
+            sonpage:1,
             size: 10,
             innerVisible: false, //详情弹框
             keyword: '',

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

@@ -46,23 +46,23 @@
         <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 min-width='260'>
+                <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='60'>
                     <template slot-scope='{row}'>{{row.sl>=0?row.sl:'--'}}</template>
                 </el-table-column>
-                <el-table-column prop='brand' label='品牌' width='260'>
+                <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 min-width='260'>
+                <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='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='260'>
+                <el-table-column prop='manufacturer' label='生产厂商' show-overflow-tooltip resizable min-width='300'>
                     <template slot-scope='{row}'>{{row.manufacturer || '--'}}</template>
                 </el-table-column>
             </el-table>
@@ -99,7 +99,7 @@ export default {
             tableData: [],
             total: 0,
             currentPage: 1,
-            sonpage: 1,
+            sonpage:1,
             size: 10,
             keyword: '',
             floor: '1',

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

@@ -102,7 +102,7 @@
                 <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='105' 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'>

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

@@ -910,13 +910,16 @@ export default {
             } else if (name.type == 'system') {
                 let floor = this.$cookie.get('floorNow')
                 this.content = `查看${floor}层楼层功能图`
-                this.Index(null)
+                this.init()
+                // this.Index(null)
             }
         },
         // 机房右上角的跳转 如果是在楼层功能打开的机房则要跳转到设备设施对应的系统\楼层 反之亦然
         jumpFloor() {
             // if (this.smsxtArr.smsxt) {
             if (location.pathname.split('/')[3] == 'equipment') {
+                this.$cookie.set('categoryId', 'LCGN', 3)
+                this.$store.commit('SETCATEGORYID', 'LCGN')
                 this.$router.push({ path: '/home/floorFunc' })
             } else {
                 this.$router.push({ path: '/home/equipment', query: { smsxt: this.smsxtArr.smsxt } })

+ 6 - 6
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='260'>
+                <el-table-column prop :show-overflow-tooltip='true' label='设备简称' resizable min-width='150'>
                     <template slot-scope='{row}'>{{row.type_name||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop label='数量' :show-overflow-tooltip='true' width='60'>
+                <el-table-column prop label='数量' :show-overflow-tooltip='true' width='80'>
                     <template slot-scope='{row}'>{{row.sl||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop label='品牌' :show-overflow-tooltip='true' min-width='260'>
+                <el-table-column prop label='品牌' :show-overflow-tooltip='true' width='120'>
                     <template slot-scope='{row}'>{{row.brand||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop label='型号' :show-overflow-tooltip='true' min-width='260'>
+                <el-table-column prop label='型号' :show-overflow-tooltip='true' width='174'>
                     <template slot-scope='{row}'>{{row.sbxh||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop label='楼层' :show-overflow-tooltip='true' width='60'>
+                <el-table-column prop label='楼层' :show-overflow-tooltip='true' width='100'>
                     <template slot-scope='{row}'>{{row.floorcode||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop :show-overflow-tooltip='true' label='生产厂商' min-width='260'>
+                <el-table-column prop :show-overflow-tooltip='true' label='生产厂商' min-width='150'>
                     <template slot-scope='{row}'>{{row.manufacturer||'--'}}</template>
                 </el-table-column>
             </el-table>