Browse Source

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

fujunwen 4 years ago
parent
commit
06f4bea91c

+ 1 - 1
src/components/Rotation/src/rotation.vue

@@ -39,7 +39,7 @@
             @change='changePic'
         >
             <el-carousel-item v-for='(item,index) in rotationImg' :key='index'>
-                <img :src='item.url' alt style='  width: 100%; height: 100%;object-fit:inherit' />
+                <img :src='item.url' alt style='  width: 100%; height: 100%;object-fit:contain' />
             </el-carousel-item>
         </el-carousel>
     </div>

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

@@ -7,7 +7,7 @@
         <div class='strip-bottom'>
             <canvasFun @fit='fit' @savePng='savePng' @saveSvg='saveSvg' @saveJson='saveJson' @scale='scale' @showText='showText' ref='canvasFun'></canvasFun>
         </div>
-        <room-box ref='boxRoom'></room-box>
+        <room-box :key='`rommBox${roomKey}`' ref='boxRoom'></room-box>
         <equip-detail ref='equipDetail' :key='equipKey'></equip-detail>
         <el-popover ref='popover' placement='right' trigger='manual' v-model='visible' width='380'>
             <!-- <div style="text-align: right;margin-bottom: 10px;">
@@ -158,6 +158,7 @@ export default {
             count: 0, // 顶楼为多张图时计数器
             equipKey: 1, //设备弹窗使用key值,解决打开弹窗数据为上次弹窗的数据
             statusDisabled: ['已拆除'], //禁止跳转的设备状态
+            roomKey: 1,
         }
     },
     props: {
@@ -234,7 +235,7 @@ export default {
                 })
             }
         },
-        // 查看浮层设备详情
+        // 查看浮层设备详情 
         handleClickEquipDetail: debounce(function (row, column, event) {
             // 设备状态为停用或已拆除时,弹出消息
             if (this.statusDisabled.includes(row?.sb_status)) {
@@ -272,7 +273,12 @@ 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.roomKey++
+                this.$nextTick(() => {
+                    this.$refs.boxRoom.open({ name: this.activeItem.name, type: this.type, location: point.id })
+                })
+            }
         },
         handleClickHightLight(pointData) {
             this.clearHightLight()

File diff suppressed because it is too large
+ 428 - 417
src/utils/plugins/components.js


+ 298 - 17
src/views/equipment/eqDialog.vue

@@ -7,13 +7,8 @@
                 <span class='title-name'>{{systemName}}-{{dialogInfo.label}}</span>
                 <!-- 2020-7-12 查看图纸时 隐藏图标(查看入口) -->
                 <!-- v-if='dialogInfo.id.slice(2,4)!="QD" && dialogInfo.id.slice(2,4)!="YL" && dialogInfo.id.slice(0,4)!="GJSP"' -->
-                <img
-                    v-if='dialogInfo.id.slice(2,4)!="QD" && dialogInfo.id.slice(2,4)!="YL" && dialogInfo.id.slice(0,4)!="GJSP" && dialogInfo.label !== "查看图纸"'
-                    src='../../assets/imgs/zy2.png'
-                    @click='visibalBox'
-                    style='margin-top:-4px;'
-                    alt
-                />
+                <!-- v-if='dialogInfo.id.slice(2,4)!="QD" && dialogInfo.id.slice(2,4)!="YL" && dialogInfo.id.slice(0,4)!="GJSP" && dialogInfo.label !== "查看图纸"' -->
+                <img v-if='showImg' src='../../assets/imgs/zy2.png' @click='visibalBox' style='margin-top:-4px;' alt />
             </div>
             <!-- 没有tab的页面 -->
             <div v-if='Object.keys(dialogInfo).length>0 && dialogInfo.children.length==0' style='padding-top:16px;height:100%'>
@@ -68,17 +63,63 @@
                             major='暖通'
                         ></tableList>
                         <!-- 重要维保表格 -->
-                        <wb-table v-else-if='value.id.slice(2,4)=="WB"' :smsxt='smsxt' :tabLabel='tabLabel' :assetnum='""' :diff='diff' :size='10'></wb-table>
+                        <wb-table
+                            :key='`wb${key}`'
+                            v-else-if='value.id.slice(2,4)=="WB"'
+                            :smsxt='smsxt'
+                            :tabLabel='tabLabel'
+                            :assetnum='""'
+                            :diff='diff'
+                            :size='10'
+                        ></wb-table>
                         <!-- 日常维保表格 -->
-                        <rcwb-table v-else-if='value.id=="RB"' :smsxt='smsxt' :tabLabel='tabLabel' :diff='diff' :assetnum='""' :size='10'></rcwb-table>
+                        <rcwb-table
+                            :key='`rcwb${key}`'
+                            v-else-if='value.id=="RB"'
+                            :smsxt='smsxt'
+                            :tabLabel='tabLabel'
+                            :diff='diff'
+                            :assetnum='""'
+                            :size='10'
+                        ></rcwb-table>
                         <!-- 重要维修的表格 -->
-                        <wx-table v-else-if='value.id.slice(2,4)=="WX"' :smsxt='smsxt' :tabLabel='tabLabel' :assetnum='""' :diff='diff' :size='10'></wx-table>
+                        <wx-table
+                            :key='`wx${key}`'
+                            v-else-if='value.id.slice(2,4)=="WX"'
+                            :smsxt='smsxt'
+                            :tabLabel='tabLabel'
+                            :assetnum='""'
+                            :diff='diff'
+                            :size='10'
+                        ></wx-table>
                         <!-- 日常维修的表格 -->
-                        <rcwx-table v-else-if='value.id=="RX"' :smsxt='smsxt' :tabLabel='tabLabel' :diff='diff' :assetnum='""' :size='10'></rcwx-table>
+                        <rcwx-table
+                            :key='`rcwx${key}`'
+                            v-else-if='value.id=="RX"'
+                            :smsxt='smsxt'
+                            :tabLabel='tabLabel'
+                            :diff='diff'
+                            :assetnum='""'
+                            :size='10'
+                        ></rcwx-table>
                         <!-- 专维 -->
-                        <zw-table v-else-if='value.id.slice(2,4)=="ZW"' :smsxt='smsxt' :tabLabel='tabLabel' :diff='difference' :major='dialogInfo.id'></zw-table>
+                        <zw-table
+                            :key='`zw${key}`'
+                            v-else-if='value.id.slice(2,4)=="ZW"'
+                            :smsxt='smsxt'
+                            :tabLabel='tabLabel'
+                            :diff='difference'
+                            :major='dialogInfo.id'
+                        ></zw-table>
                         <!-- 其他 -->
-                        <other-table v-else-if='value.id.slice(2,4)=="QT"' ref='qtList' :tabLabel='tabLabel' :smsxt='smsxt' :major='dialogInfo.id'></other-table>
+                        <other-table
+                            :key='`other${key}`'
+                            v-else-if='value.id.slice(2,4)=="QT"'
+                            ref='qtList'
+                            :tabLabel='tabLabel'
+                            :smsxt='smsxt'
+                            :major='dialogInfo.id'
+                        ></other-table>
                     </el-tab-pane>
                     <template v-for='(value,index) in dialogInfo.children'>
                         <template v-for='(eve,index1) in tabCount'>
@@ -110,7 +151,7 @@
                 </el-tabs>
             </div>
         </el-dialog>
-        <!--记录表格 -->
+        <!--记录表格,点击弹窗title右侧小图标,展示的表格 -->
         <record-dialog ref='Dialog'></record-dialog>
     </div>
 </template>
@@ -129,6 +170,7 @@ import recordDialog from './table/recordDialog'
 import djspTable from './table/djspTable'
 import { queryPic, queryTab } from '@/api/public.js'
 import fenbuPic from './fenbuPic'
+import { system as systemData } from '@/utils/plugins/components.js'
 export default {
     props: ['systemName', 'smsxt', 'info'],
     data() {
@@ -146,8 +188,223 @@ export default {
             sizePic: '',
             imgInfo: {},
             showFenbuPic: false, //显示楼层分布组件
+            key: 1, //弹窗key值,重新渲染table组件
+            //  code字典,打开主要设备维保/维修事项;专维及其他事项 三个tab 中, title右侧小图标使用
+            /** 最后取值 -1:不显示右侧图标; 1:   2:   ...  */
+            codeDict: [
+                {
+                    /** 供电系统 */
+                    1001: [
+                        {
+                            主要设备维保事项: {
+                                配电室内重要维保: 1,
+                                配电室外重要维保: 2,
+                                日常维保事项: -1,
+                            },
+                        },
+                        {
+                            主要设备维修事项: {
+                                配电室内重要维修: 1,
+                                配电室外重要维修: 2,
+                                日常维修事项: -1,
+                            },
+                        },
+                        {
+                            专维及其他事项: {
+                                专项维修: 1,
+                                其他事项: 1,
+                            },
+                        },
+                    ],
+                },
+                {
+                    /** 暖通系统 */
+                    1002: [
+                        {
+                            主要设备维保事项: {
+                                冷源机房内重要维保: 1,
+                                冷源机房外重要维保: 2,
+                                日常维保事项: -1,
+                            },
+                        },
+                        {
+                            主要设备维修事项: {
+                                冷源机房内重要维修: 1,
+                                冷源机房外重要维修: 2,
+                                日常维修事项: -1,
+                            },
+                        },
+                        {
+                            专维及其他事项: {
+                                专项维修: 1,
+                                其他事项: 1,
+                            },
+                        },
+                    ],
+                },
+                {
+                    /** 消防系统 */
+                    1003: [
+                        {
+                            主要设备维保事项: {
+                                '中控室/消防泵房内重要维保': 1,
+                                '中控室/消防泵房外重要维保': 2,
+                                日常维保事项: -1,
+                            },
+                        },
+                        {
+                            主要设备维修事项: {
+                                '中控室/消防泵房内重要维修': 1,
+                                '中控室/消防泵房外重要维修': 2,
+                                日常维修事项: -1,
+                            },
+                        },
+                        {
+                            专维及其他事项: {
+                                专项维修: 1,
+                                其他事项: 1,
+                            },
+                        },
+                    ],
+                },
+                {
+                    /** 弱电系统 */
+                    1004: [
+                        {
+                            主要设备维保事项: {
+                                慧云机房内重要维保: 1,
+                                慧云机房外重要维保: 2,
+                                日常维保事项: -1,
+                            },
+                        },
+                        {
+                            主要设备维修事项: {
+                                慧云机房内重要维修: 1,
+                                慧云机房外重要维修: 2,
+                                日常维修事项: -1,
+                            },
+                        },
+                        {
+                            专维及其他事项: {
+                                专项维修: 1,
+                                其他事项: 1,
+                            },
+                        },
+                    ],
+                },
+                {
+                    /** 给排水 */
+                    1005: [
+                        {
+                            主要设备维保事项: {
+                                给水系统重要维保: 1,
+                                排水系统重要维保: 2,
+                                日常维保事项: -1,
+                            },
+                        },
+                        {
+                            主要设备维修事项: {
+                                给水系统重要维修: 1,
+                                排水系统重要维修: 2,
+                                日常维修事项: -1,
+                            },
+                        },
+                        {
+                            专维及其他事项: {
+                                给水系统专项维修: 1,
+                                排水系统专项维修: 1,
+                                其他事项: 1,
+                            },
+                        },
+                    ],
+                },
+                {
+                    /** 电梯系统 */
+                    1006: [
+                        {
+                            主要设备维保事项: {
+                                重要维保事项: 1,
+                                日常维保事项: 2,
+                            },
+                        },
+                        {
+                            主要设备维修事项: {
+                                重要维修事项: 1,
+                                日常维修事项: 2,
+                            },
+                        },
+                        {
+                            专维及其他事项: {
+                                专项维修: 1,
+                                其他事项: 1,
+                            },
+                        },
+                    ],
+                },
+                {
+                    /** 燃气系统 */
+                    1007: [
+                        {
+                            主要设备维保事项: {
+                                重要维保事项: 1,
+                                日常维保事项: 1,
+                            },
+                        },
+                        {
+                            主要设备维修事项: {
+                                重要维修事项: 1,
+                                日常维修事项: 1,
+                            },
+                        },
+                        {
+                            专维及其他事项: {
+                                专项维修: 1,
+                                其他事项: 1,
+                            },
+                        },
+                    ],
+                },
+                {
+                    /** 土建装饰 */
+                    1008: [
+                        {
+                            维保事项: {
+                                重要维保事项: 1,
+                                日常维保事项: 1,
+                            },
+                        },
+                        {
+                            维修事项: {
+                                重要维修事项: 1,
+                                日常维修事项: 1,
+                            },
+                        },
+                        {
+                            专维及其他事项: {
+                                专项维修: 1,
+                                其他事项: 1,
+                            },
+                        },
+                    ],
+                },
+            ],
         }
     },
+    computed: {
+        showImg: function () {
+            let arr = ['QD', 'YL', 'GJSP']
+            //  日常维保/维修事项 tab页,  不显示icon
+            let flag = true
+            let labelArr = ['日常维保事项', '日常维修事项']
+            if (labelArr.indexOf(this.tabLabel) !== -1) {
+                flag = false
+            } else {
+                flag = true
+            }
+            // title右侧 icon入口
+            return arr.indexOf(this.dialogInfo.id.slice(2, 4)) === -1 && this.dialogInfo.label !== '查看图纸' && flag
+        },
+    },
     mounted() {},
     components: {
         tableList,
@@ -197,6 +454,7 @@ export default {
         //点击tab函数
         handleClick(tab) {
             console.log(tab)
+            this.key++
             if (this.param) {
                 this.param = tab.name
             }
@@ -233,9 +491,32 @@ export default {
             }
             this.tabLabel = tab.label
         },
-
+        /**
+         * @description 点击title右侧小图标,显示记录表格,
+         *
+         */
         visibalBox() {
-            this.$refs.Dialog.open(this.smsxt)
+            // 进入记录表格弹窗,没有tabLable时,默认使用第一个table的label
+            if (!this.tabLabel && this?.dialogInfo?.children) {
+                this.tabLabel = this.dialogInfo.children[0].label
+            }
+            const system_code = this.smsxt
+            // 子系统
+            let system = systemData.filter((v) => v.smsxt === this.smsxt)[0]
+            // 子系统tab --> 维修 维保,专维
+            let tabData = system.children.filter((v) => v.label === this.dialogInfo.label)[0]
+            // 获取到子系统的param
+            let param = tabData.children.filter((v) => v.label === this.tabLabel)[0].param
+            console.log(`%c${JSON.stringify(param, null, 2)}`, 'color:blue')
+            // 获取到 wznw,apply
+            const { wznw, apply, difference } = param
+            // 打开记录表格
+            /**
+             * @param { string } system_code 八大系统code
+             * @param { string } wznw   区分各系统内外(如: 慧云机房内,慧云机房外)
+             * @param { string } apply  事项类型, 含: 维修维保,专维及其他
+             */
+            this.$refs.Dialog.open({ system_code, wznw, apply, difference })
         },
         //系统原理图接口
         initImage(typecode) {
@@ -319,7 +600,7 @@ export default {
                     })
                 })
             }
-            if(this.smsxt != '1008'){
+            if (this.smsxt != '1008') {
                 data.onlyMainAsset = true
             }
             queryTab({ data, postParams }).then((res) => {

+ 9 - 2
src/views/equipment/table/eqDetaileDialog.vue

@@ -127,6 +127,11 @@
     </div>
 </template>
 <script>
+/**
+ * @author yunxing
+ * @date 2020年08月27日
+ * @description queryTableList方法中 queryAsset接口添加page :1,size 字段
+ */
 import { Select } from 'meri-design'
 import { mapGetters } from 'vuex'
 import { queryAsset } from '@/api/equipmentList.js'
@@ -266,7 +271,6 @@ export default {
             })
         },
         queryTableList() {
-            console.log('queryTableList')
             let major
             if (this.major.slice(0, 2) == 'GD') {
                 major = '供电'
@@ -284,6 +288,8 @@ export default {
             let data = {
                 major: major,
                 plazaId: this.$store.state.plazaId,
+                page: 1,
+                size: this.row.sl,
             }
             //区分主要设备
             if (this.major != '土建') {
@@ -309,6 +315,7 @@ export default {
             if (data.keyword == '') {
                 delete data.keyword
             }
+            // TODO: 添加条数?
             let postParams = {
                 classstructureid: this.row.classstructureid,
                 type_code: this.row.type_code,
@@ -330,7 +337,7 @@ export default {
                 this.tableData = res.data.data
                 this.total = res.data.count
                 this.key++
-                if (this.tableData.length > 0) {
+                if (this.tableData && this.tableData.length) {
                     this.assetnum = this.tableData[0].assetnum
                     this.changeTab(0)
                 }

+ 29 - 4
src/views/equipment/table/equipDetail.vue

@@ -56,20 +56,36 @@
                 <div v-if='activeId==1'>
                     <el-tabs v-model='activeName1' @tab-click='handleClickWb'>
                         <el-tab-pane label='重要维保' name='wb1' v-if='Object.keys(this.row).length>0'>
-                            <wbTable ref='wb1' :smsxt='smsxt' tabLabel='重要维保' :diff='diff' :assetnum='row.assetnum' :size='size'></wbTable>
+                            <wbTable :key='`wb${key}`' ref='wb1' :smsxt='smsxt' tabLabel='重要维保' :diff='diff' :assetnum='row.assetnum' :size='size'></wbTable>
                         </el-tab-pane>
                         <el-tab-pane label='日常维保' name='wb2' v-if='Object.keys(this.row).length>0'>
-                            <rcwbTable ref='wb2' :smsxt='smsxt' tabLabel='日常维保' :diff='diff' :assetnum='row.assetnum' :size='size'></rcwbTable>
+                            <rcwbTable
+                                :key='`rcwb${key}`'
+                                ref='wb2'
+                                :smsxt='smsxt'
+                                tabLabel='日常维保'
+                                :diff='diff'
+                                :assetnum='row.assetnum'
+                                :size='size'
+                            ></rcwbTable>
                         </el-tab-pane>
                     </el-tabs>
                 </div>
                 <div v-if='activeId==2'>
                     <el-tabs v-model='activeName2' @tab-click='handleClickWx'>
                         <el-tab-pane label='重要维修' name='wx1' v-if='Object.keys(this.row).length>0'>
-                            <wxTable ref='wx1' :smsxt='smsxt' tabLabel='重要维修' :diff='diff' :assetnum='row.assetnum' :size='size'></wxTable>
+                            <wxTable :key='`wx${key}`' ref='wx1' :smsxt='smsxt' tabLabel='重要维修' :diff='diff' :assetnum='row.assetnum' :size='size'></wxTable>
                         </el-tab-pane>
                         <el-tab-pane label='日常维修' name='wx2' v-if='Object.keys(this.row).length>0'>
-                            <rcwxTable ref='wx2' :smsxt='smsxt' tabLabel='日常维修' :diff='diff' :assetnum='row.assetnum' :size='size'></rcwxTable>
+                            <rcwxTable
+                                :key='`rcwx${key}`'
+                                ref='wx2'
+                                :smsxt='smsxt'
+                                tabLabel='日常维修'
+                                :diff='diff'
+                                :assetnum='row.assetnum'
+                                :size='size'
+                            ></rcwxTable>
                         </el-tab-pane>
                     </el-tabs>
                 </div>
@@ -119,6 +135,7 @@ export default {
             smsxt: '',
             diff: '',
             size: 5, //下部表格使用
+            key: 1, //表格使用key值,重新渲染table组件
         }
     },
     components: {
@@ -153,12 +170,20 @@ export default {
         tabClick(item) {
             this.activeId = item
         },
+        /**
+         * @description 点击维保,切换维保table
+         */
         handleClickWb(label) {
+            this.key++
             if (this.$refs[`${label.name}`]) {
                 this.$refs[`${label.name}`].startMethods()
             }
         },
+        /**
+         * @description 点击维修,切换维修table
+         */
         handleClickWx(label) {
+            this.key++
             if (this.$refs[`${label.name}`]) {
                 this.$refs[`${label.name}`].startMethods()
             }

+ 10 - 9
src/views/equipment/table/inputDIalog.vue

@@ -205,15 +205,16 @@ export default {
                 this.$emit('confirm', this.inputForm.reportdate, this.inputForm.real, this.inputForm.locationName, this.inputForm.people)
             }
             this.dialogFormVisible = false
-            this.inputForm.status = ''
-            this.inputForm.yssjwcsj = ''
-            this.inputForm.complete = ''
-            this.inputForm.bill = ''
-            this.inputForm.ycgdtbsj = ''
-            this.inputForm.ycgdyssj = ''
-            this.inputForm.reportdate = ''
-            this.inputForm.real = ''
-            this.inputForm.locationName = ''
+            // TODO: 删除清空栏位值
+            // this.inputForm.status = ''
+            // this.inputForm.yssjwcsj = ''
+            // this.inputForm.complete = ''
+            // this.inputForm.bill = ''
+            // this.inputForm.ycgdtbsj = ''
+            // this.inputForm.ycgdyssj = ''
+            // this.inputForm.reportdate = ''
+            // this.inputForm.real = ''
+            // this.inputForm.locationName = ''
         },
     },
     mounted() {},

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

@@ -87,6 +87,7 @@
     </div>
 </template>
 <script>
+import moment from 'moment'
 import { queryQtsx } from '@/api/equipmentList.js'
 import { mapGetters } from 'vuex'
 import { formatter, number_format } from '@/utils/format.js'
@@ -141,7 +142,8 @@ export default {
             //时间
             if (this.handledate) {
                 getParams.data.handledateStartDate = this.handledate[0] + '000000'
-                getParams.data.handledateEndDate = this.handledate[1] + '000000'
+                // getParams.data.handledateEndDate = this.handledate[1] + '000000'
+                getParams.data.handledateEndDate = moment(this.handledate[1]).add(1, 'day').format('YYYYMMDD000000')
             }
             //下拉
             if (this.handleresults && this.handleresults != 1) {

+ 10 - 5
src/views/equipment/table/rcwbTable.vue

@@ -70,7 +70,7 @@
         </div>
         <div ref='tableBox'>
             <el-table :data='tableData' :border='true' style='width: 100%' @row-click='innerTable'>
-                <el-table-column type='index' label='序号' width='60' :index='indexMethod'></el-table-column>
+                <el-table-column type='index' label='序号' width='70' :index='indexMethod'></el-table-column>
                 <el-table-column prop label='设备名称' show-overflow-tooltip resizable min-width='434'>
                     <template slot-scope='{row}'>{{row.sbmc||'--'}}</template>
                 </el-table-column>
@@ -152,6 +152,7 @@
 import { queryWb } from '@/api/room.js'
 import { mapGetters } from 'vuex'
 import { Select } from 'meri-design'
+import moment from 'moment'
 import inputDialog from './inputDIalog'
 import { formatterTime, number_format } from '@/utils/format.js'
 import { querySelect } from '@/api/public.js'
@@ -302,22 +303,26 @@ export default {
             //工单填报时间
             if (this.ycgdtbsj) {
                 data.reportdateStartDate = this.ycgdtbsj[0] + '000000'
-                data.reportdateEndDate = this.ycgdtbsj[1] + '000000'
+                // data.reportdateEndDate = this.ycgdtbsj[1] + '000000'
+                data.reportdateEndDate = moment(this.ycgdtbsj[1]).add(1, 'day').format('YYYYMMDD000000')
             }
             //工单验收时间
             if (this.ycgdyssj) {
                 data.sjjssjStartDate = this.ycgdyssj[0] + '000000'
-                data.sjjssjEndDate = this.ycgdyssj[1] + '000000'
+                // data.sjjssjEndDate = this.ycgdyssj[1] + '000000'
+                data.sjjssjEndDate = moment(this.ycgdyssj[1]).add(1, 'day').format('YYYYMMDD000000')
             }
             //任务开始时间
             if (this.reportdate) {
                 data.sjkssjStartDate = this.reportdate[0] + '000000'
-                data.sjkssjEndDate = this.reportdate[1] + '000000'
+                // data.sjkssjEndDate = this.reportdate[1] + '000000'
+                data.sjkssjEndDate = moment(this.reportdate[1]).add(1, 'day').format('YYYYMMDD000000')
             }
             //任务完成时间
             if (this.complete) {
                 data.sjwcsjStartDate = this.complete[0] + '000000'
-                data.sjwcsjEndDate = this.complete[1] + '000000'
+                // data.sjwcsjEndDate = this.complete[1] + '000000'
+                data.sjwcsjEndDate = moment(this.complete[1]).add(1, 'day').format('YYYYMMDD000000')
             }
             //输入框
             data.keyword = ''

+ 13 - 9
src/views/equipment/table/rcwxTable.vue

@@ -191,6 +191,7 @@
   </div>
 </template>
 <script>
+import moment from 'moment'
 import { queryWxzy, queryWxzyImg } from "@/api/equipmentList.js";
 import { mapGetters } from "vuex";
 import inputDialog from "./inputDIalog";
@@ -230,7 +231,7 @@ export default {
         "工单执行退回",
         "问题待解决",
         "执行中"
-      ] //默认选项如果statusOption存在则写入status中
+      ], //默认选项如果statusOption存在则写入status中
     };
   },
   computed: {
@@ -251,10 +252,10 @@ export default {
     },
     //跳转工单编号
     staff(row) {
-      console.log(row);
-      if (row.wonum) {
+    //   console.log(row);
+      if (row.workorderid) {
         window.open(
-          `http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=JXWO&uniqueid=${row.wonum}`
+          `http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=JXWO&uniqueid=${row.workorderid}`
         );
       }
     },
@@ -287,14 +288,17 @@ export default {
       if (this.assetnum) {
         getParams.data.assetnum = this.assetnum;
       }
-      //下拉
+      //下拉 要求完成日期
       if (this.reportdate) {
         getParams.data.schedfinishStartDate = this.reportdate[0] + "000000";
-        getParams.data.schedfinishEndDate = this.reportdate[1] + "000000";
+        // getParams.data.schedfinishEndDate = this.reportdate[1] + "000000";
+        getParams.data.schedfinishEndDate = moment(this.reportdate[1]).add(1, 'day').format('YYYYMMDD000000')
       }
-      if (this.real) {
-        getParams.data.wotjyssjStartDate = this.real[0] + "000000";
-        getParams.data.wotjyssjEndDate = this.real[1] + "000000";
+      //   实际完工日期
+      if (this.sjjssj) {
+        getParams.data.wotjyssjStartDate = this.sjjssj[0] + "000000";
+        // getParams.data.wotjyssjEndDate = this.sjjssj[1] + "000000";
+        getParams.data.wotjyssjEndDate = moment(this.sjjssj[1]).add(1, 'day').format('YYYYMMDD000000')
       }
       if (this.source && this.source != "全部") {
         getParams.data.bxfwlymc = this.source;

+ 27 - 41
src/views/equipment/table/recordDialog.vue

@@ -36,7 +36,7 @@ export default {
             visible: false,
             major: '',
             tabName: '',
-            tableData: []
+            tableData: [],
         }
     },
     computed: {
@@ -53,75 +53,61 @@ export default {
             } else {
                 return 600
             }
-        }
+        },
     },
     methods: {
-        open(smsxt) {
-            // console.log(major)
-            // if (major.slice(2, 4) == 'WX') {
-            //     this.tabName = '维修'
-            // } else if (major.slice(2, 4) == 'WB') {
-            //     this.tabName = '维保'
-            // } else if (major.slice(2, 4) == 'ZW') {
-            //     this.tabName = '专维'
-            // } else if (major.slice(2, 4) == 'QT') {
-            //     this.tabName = '其他'
-            // }
-            // if (major.slice(0, 2) == 'GD') {
-            //     this.major = '供电系统'
-            // } else if (major.slice(0, 2) == 'XF') {
-            //     this.major = '消防系统'
-            // } else if (major.slice(0, 2) == 'GPS') {
-            //     this.major = '给排水系统'
-            // } else if (major.slice(0, 2) == 'DT') {
-            //     this.major = '电梯系统'
-            // } else if (major.slice(0, 2) == 'RQ') {
-            //     this.major = '燃气系统'
-            // } else if (major.slice(0, 2) == 'RD') {
-            //     this.major = '弱电系统'
-            // } else if (major.slice(0, 2) == 'NT') {
-            //     this.major = '暖通系统'
-            // } else if (major.slice(0, 2) == 'TJ') {
-            //     this.major = '土建装饰'
-            // }
+        open({ system_code, wznw, apply, difference }) {
             this.visible = true
-            this.getRecordList(smsxt)
+            this.getRecordList({ system_code, wznw, apply, difference })
         },
         objectSpanMethod({ row, column, rowIndex, columnIndex }) {
             if (columnIndex === 0) {
                 if (row.col0Count > 0) {
                     return {
                         rowspan: row.col0Count,
-                        colspan: 1
+                        colspan: 1,
                     }
                 }
                 return {
                     rowspan: 0,
-                    colspan: 0
+                    colspan: 0,
                 }
             }
         },
-        getRecordList(smsxt) {
+        /**
+         * @param { string } system_code 八大系统code
+         * @param { string } wznw   区分各系统内外(如: 慧云机房内,慧云机房外)
+         * @param { string } apply  事项类型, 含: 维修维保,专维及其它
+         * @param { string } difference 区分给排水 取值范围:给水;排水
+         */
+        getRecordList({ system_code, wznw, apply, difference }) {
             let getParams = {
-                system_code: smsxt,
-                plazaId: this.$store.state.plazaId
+                system_code,
+                apply,
+                plazaId: this.$store.state.plazaId,
+            }
+            wznw !== '0' && wznw !== '-1' && wznw && (getParams.wznw = wznw) //专维及其它,不上传该字段
+            // 处理给排水
+            if (difference) {
+                getParams.difference = difference
+                delete getParams.wznw //不上传内外
             }
-            queryRecord({ getParams }).then(res => {
+            queryRecord({ getParams }).then((res) => {
                 this.tableData = []
-                res.data.forEach(i => {
+                res.data.forEach((i) => {
                     i.children.forEach((j, index) => {
                         this.tableData.push({
                             smswz: i.smswz,
                             smsasset: j.smsasset,
                             col0Count: index === 0 ? i.children.length : 0,
-                            children: j.children
+                            children: j.children,
                         })
                     })
                 })
             })
-        }
+        },
     },
-    mounted() {}
+    mounted() {},
 }
 </script>
 <style lang="less" scoped>

+ 6 - 2
src/views/equipment/table/standTable.vue

@@ -85,7 +85,7 @@
         </el-dialog>-->
         <!-- 标准表格详情钻取表,使用全屏弹窗 -->
         <el-dialog width='100%' :title='`${type_name}设备清单`' :visible.sync='innerVisible' append-to-body :fullscreen='true'>
-            <eq-detail ref='qdDialog' :row='row' :major='major' :smsxt='smsxt' :diff='diff' :sign='sign'></eq-detail>
+            <eq-detail :key='`eqDetail${key}`' ref='qdDialog' :row='row' :major='major' :smsxt='smsxt' :diff='diff' :sign='sign'></eq-detail>
         </el-dialog>
     </div>
 </template>
@@ -112,6 +112,7 @@ export default {
             type_name: '',
             floorAllSelect: [],
             sign: 1,
+            key: 1,
         }
     },
     props: ['major', 'param', 'InfoName', 'smsxt', 'diff'],
@@ -125,9 +126,12 @@ export default {
         },
         rowHandle(row) {
             this.type_name = row.type_name
-            this.innerVisible = true
             this.row = row
             this.sign = 1
+            this.$nextTick(() => {
+                this.key++
+                this.innerVisible = true
+            })
         },
         pageChanged(page) {
             this.currentPage = page

+ 7 - 2
src/views/equipment/table/wbTable.vue

@@ -136,6 +136,7 @@
     </div>
 </template>
 <script>
+import moment from 'moment'
 import { queryWbsms } from '@/api/equipmentList.js'
 import { mapGetters } from 'vuex'
 import { Select } from 'meri-design'
@@ -237,13 +238,17 @@ export default {
                 // getParams.data.ischangepj = this.ischange
                 getParams.data.ismodel = this.ischange
             }
+            // 验收日期
             if (this.sjjssj) {
                 getParams.data.sjjssjStartDate = this.sjjssj[0] + '000000'
-                getParams.data.sjjssjEndDate = this.sjjssj[1] + '000000'
+                // getParams.data.sjjssjEndDate = this.sjjssj[1] + '000000'
+                getParams.data.sjjssjEndDate = moment(this.sjjssj[1]).add(1, 'day').format('YYYYMMDD000000')
             }
+            // 填报时间
             if (this.reportdate) {
                 getParams.data.reportdateStartDate = this.reportdate[0] + '000000'
-                getParams.data.reportdateEndDate = this.reportdate[1] + '000000'
+                // getParams.data.reportdateEndDate = this.reportdate[1] + '000000'
+                getParams.data.reportdateEndDate = moment(this.reportdate[1]).add(1, 'day').format('YYYYMMDD000000')
             }
             //输入框
             getParams.data.keyword = ''

+ 9 - 4
src/views/equipment/table/wxTable.vue

@@ -136,6 +136,7 @@
     </div>
 </template>
 <script>
+import moment from 'moment'
 import { queryWx } from '@/api/equipmentList.js'
 import { mapGetters } from 'vuex'
 import inputDialog from './inputDIalog'
@@ -190,8 +191,8 @@ export default {
         },
         //跳转工单编号
         staff(row) {
-            if (row.wonum) {
-                window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=JXWO&uniqueid=${row.wonum}`)
+            if (row.workorderid) {
+                window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=JXWO&uniqueid=${row.workorderid}`)
             }
         },
         //多余输入框监听
@@ -227,13 +228,17 @@ export default {
                 getParams.data.ismodel = this.ischange
                 // getParams.data.ischangepj = this.ischange
             }
+            // 验收日期
             if (this.sjjssj) {
                 getParams.data.sjjssjStartDate = this.sjjssj[0] + '000000'
-                getParams.data.sjjssjEndDate = this.sjjssj[1] + '000000'
+                // getParams.data.sjjssjEndDate = this.sjjssj[1] + '000000'
+                getParams.data.sjjssjEndDate = moment(this.sjjssj[1]).add(1, 'day').format('YYYYMMDD000000')
             }
+            // 填报日期
             if (this.reportdate) {
                 getParams.data.reportdateStartDate = this.reportdate[0] + '000000'
-                getParams.data.reportdateEndDate = this.reportdate[1] + '000000'
+                // getParams.data.reportdateEndDate = this.reportdate[1] + '000000'
+                getParams.data.reportdateEndDate = moment(this.reportdate[1]).add(1, 'day').format('YYYYMMDD000000')
             }
             //输入框搜索
             getParams.data.keyword = ''

+ 7 - 3
src/views/equipment/table/zwTable.vue

@@ -42,7 +42,7 @@
                 :placeholder='"请选择"'
                 :selectdata='sxjdOption'
                 style='margin:0 12px'
-                @change='getLpageChanged(1)'
+                @change='pageChanged(1)'
             ></Select>
             <!-- placeholder='选择立项时间' -->
             <div class='picker-box'>
@@ -118,6 +118,7 @@
     </div>
 </template>
 <script>
+import moment from 'moment'
 import Select from '@/components/Select/Select.vue'
 import { queryZw } from '@/api/equipmentList.js'
 import { querySelect } from '@/api/public.js'
@@ -291,11 +292,14 @@ export default {
             //验收
             if (this.yssjwcsj) {
                 getParams.data.yssjwcsjStartDate = this.yssjwcsj[0] + '000000'
-                getParams.data.yssjwcsjEndDate = this.yssjwcsj[1] + '000000'
+                // getParams.data.yssjwcsjEndDate = this.yssjwcsj[1] + '000000'
+                getParams.data.yssjwcsjEndDate = moment(this.yssjwcsj[1]).add(1, 'day').format('YYYYMMDD000000')
             }
+            // 立项日期
             if (this.lxsjwcsj) {
                 getParams.data.lxsjwcsjStartDate = this.lxsjwcsj[0] + '000000'
-                getParams.data.lxsjwcsjEndDate = this.reportdate[1] + '000000'
+                // getParams.data.lxsjwcsjEndDate = this.lxsjwcsj[1] + '000000'
+                getParams.data.lxsjwcsjEndDate = moment(this.lxsjwcsj[1]).add(1, 'day').format('YYYYMMDD000000')
             }
             if (this.status && this.status != 1) {
                 getParams.data.status = this.status

+ 2 - 2
src/views/homepage/index.vue

@@ -254,7 +254,7 @@ export default {
                         if (item.objtype === 0) {
                             item.type = '专维'
                         } else if (item.objtype === 1) {
-                            item.type = '重要维保'
+                            item.type = '维保'
                         } else if (item.objtype === 2) {
                             item.type = '第三方检测'
                         } else if (item.objtype === 3) {
@@ -262,7 +262,7 @@ export default {
                         } else if (item.objtype === 4) {
                             item.type = '重要维修'
                         } else {
-                            item.type = '其他事项'
+                            item.type = '重点关注'
                         }
                     })
 

+ 1 - 1
src/views/other/gcfz2.vue

@@ -58,7 +58,7 @@
                         <template slot-scope='{row}'>{{row.jskf||row.jskf=='0'?row.jskf:'--'}}</template>
                     </el-table-column>
                 </el-table-column>
-                <el-table-column prop label='区域(㎡)'>
+                <el-table-column prop label='区域'>
                     <template slot-scope='{row}'>{{row.region||'--'}}</template>
                 </el-table-column>
                 <el-table-column prop label='面积(㎡)'>

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

@@ -21,6 +21,7 @@
     </div>
 </template>
 <script>
+import moment from 'moment'
 // import Select from '@/components/Select/Select.vue'
 import { Select } from 'meri-design'
 import gcfzTable1 from './gcfz1'
@@ -95,7 +96,8 @@ export default {
             }
             if (this.dateVal.length > 0) {
                 getParams.recordtimeStartDate = this.dateVal[0] + '000000'
-                getParams.recordtimeEndDate = this.dateVal[1] + '000000'
+                // getParams.recordtimeEndDate = this.dateVal[1] + '000000'
+                getParams.recordtimeStartDate = moment(this.dateVal[1]).add(1, 'day').format('YYYYMMDD000000')
             }
             queryfzyfchange({ getParams }).then((res) => {
                 if (res.result == 'success') {

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

@@ -52,9 +52,9 @@
                 <template slot-scope='{row}'>{{formatter(row.createdate)||'--'}}</template>
             </el-table-column>
             <el-table-column prop label='政府部门' :show-overflow-tooltip='true' width='200'>
-                <template slot-scope='{row}'>
-                    {{row.department?row.department == '其他部门'?`${row.department} - ${row.otherdescription}`:row.department:'--'}}
-                </template>
+                <template
+                    slot-scope='{row}'
+                >{{row.department?row.department == '其他部门'?`${row.department} - ${row.otherdescription}`:row.department:'--'}}</template>
             </el-table-column>
             <el-table-column prop label='记录事项' :show-overflow-tooltip='true' min-width='660'>
                 <template slot-scope='{row}'>{{row.recordsx||'--'}}</template>
@@ -208,7 +208,8 @@ export default {
             }
             if (this.dateVal) {
                 getParams.createdateStartDate = this.dateVal[0] + '000000'
-                getParams.createdateEndDate = this.dateVal[1] + '000000'
+                // getParams.createdateEndDate = this.dateVal[1] + '000000'
+                getParams.createdateEndDate = moment(this.dateVal[1]).add(1, 'day').format('YYYYMMDD000000')
             }
             queryGlams({ getParams }).then((res) => {
                 if (res.result == 'success') {

+ 31 - 21
src/views/room/index.vue

@@ -438,6 +438,7 @@
   </div>
 </template>
 <script>
+import moment from "moment";
 import { queryEquipmentList, queryWxzy } from "@/api/equipmentList.js";
 import {
   queryDygjcxline,
@@ -614,6 +615,8 @@ export default {
         }
     },
     handleClick(tab) {
+        // 关闭右侧筛选弹窗
+        this.dialogFormVisible = false
         const tabDict = {
             '机房布置图': 1,
             '配电室低压柜及出线明细表': 2,
@@ -621,22 +624,23 @@ export default {
             '核心设备日常维修': 4,
             '核心设备日常维保' :5
         }
+        // 清空筛选条件
         this.clearQuery(tabDict[tab.label])
-      if (tab.label == "机房布置图") {
-        this.Index(this.smsxtArr.smsxt);
-      } else if (tab.label == "配电室低压柜及出线明细表") {
-        this.Index1Emit(1);
-        this.$refs.roomTable2.computedHeight();
-      } else if (tab.label == "机房内核心设备") {
-        this.Index2();
-        this.$refs.roomTable3.computedHeight();
-      } else if (tab.label == "核心设备日常维修") {
-        this.changeSelect("核心设备日常维修");
-        // this.$refs.roomTable4.computedHeight();
-      } else if (tab.label == "核心设备日常维保") {
-        this.changeSelect("核心设备日常维保");
-        this.$refs.roomTable5.computedHeight();
-      }
+        if (tab.label == "机房布置图") {
+            this.Index(this.smsxtArr.smsxt);
+        } else if (tab.label == "配电室低压柜及出线明细表") {
+            this.Index1Emit(1);
+            this.$refs.roomTable2.computedHeight();
+        } else if (tab.label == "机房内核心设备") {
+            this.Index2();
+            this.$refs.roomTable3.computedHeight();
+        } else if (tab.label == "核心设备日常维修") {
+            this.changeSelect("核心设备日常维修");
+            // this.$refs.roomTable4.computedHeight();
+        } else if (tab.label == "核心设备日常维保") {
+            this.changeSelect("核心设备日常维保");
+            this.$refs.roomTable5.computedHeight();
+        }
     },
     // 右上角的筛选点击按钮
     show() {
@@ -814,11 +818,13 @@ export default {
       // 监听下拉框
       if (this.reportdate) {
         getParams.data.schedfinishStartDate = this.reportdate[0] + "000000";
-        getParams.data.schedfinishEndDate = this.reportdate[1] + "000000";
+        // getParams.data.schedfinishEndDate = this.reportdate[1] + "000000";
+        getParams.data.schedfinishEndDate = moment(this.reportdate[1]).add(1, 'day').format('YYYYMMDD000000')
       }
       if (this.real) {
         getParams.data.wotjyssjStartDate = this.real[0] + "000000";
-        getParams.data.wotjyssjEndDate = this.real[1] + "000000";
+        // getParams.data.wotjyssjEndDate = this.real[1] + "000000";
+        getParams.data.wotjyssjEndDate = moment(this.real[1]).add(1, 'day').format('YYYYMMDD000000')
       }
       if (this.source && this.source != "全部") {
         // getParams.data.bxfwlymc = this.source;
@@ -881,22 +887,26 @@ export default {
       // 任务开始日期
       if (this.rwksrq) {
         data.sjkssjStartDate = this.rwksrq[0] + "000000";
-        data.sjkssjEndDate = this.rwksrq[1] + "000000";
+        // data.sjkssjEndDate = this.rwksrq[1] + "000000";
+        data.sjkssjEndDate = moment(this.rwksrq[1]).add(1, 'day').format('YYYYMMDD000000')
       }
       // 任务完成日期
       if (this.rwwcrq) {
         data.sjwcsjStartDate = this.rwwcrq[0] + "000000";
-        data.sjwcsjEndDate = this.rwwcrq[1] + "000000";
+        // data.sjwcsjEndDate = this.rwwcrq[1] + "000000";
+        data.sjwcsjEndDate = moment(this.rwwcrq[1]).add(1, 'day').format('YYYYMMDD000000')
       }
       // 异常工单填报时间
       if (this.ycgdtbsj) {
         data.reportdateStartDate = this.ycgdtbsj[0] + "000000";
-        data.reportdateEndDate = this.ycgdtbsj[1] + "000000";
+        // data.reportdateEndDate = this.ycgdtbsj[1] + "000000";
+        data.reportdateEndDate = moment(this.ycgdtbsj[1]).add(1, 'day').format('YYYYMMDD000000')
       }
       // 异常工单验收时间
       if (this.ycgdyssj) {
         data.sjjssjStartDate = this.ycgdyssj[0] + "000000";
-        data.sjjssjEndDate = this.ycgdyssj[1] + "000000";
+        // data.sjjssjEndDate = this.ycgdyssj[1] + "000000";
+        data.sjjssjEndDate = moment(this.ycgdyssj[1]).add(1, 'day').format('YYYYMMDD000000')
       }
       //
       // 是否正常

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

@@ -158,9 +158,9 @@ export default {
     },
     //跳转工单编号
     staff(row) {
-      if (row.wonum) {
+      if (row.workorderid) {
         window.open(
-          `http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=JXWO&uniqueid=${row.wonum}`
+          `http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=JXWO&uniqueid=${row.workorderid}`
         );
       }
     },

+ 39 - 40
src/views/statistics/index.vue

@@ -190,7 +190,7 @@ export default {
                 "东南": 'dongnan',
                 "其他": 'Other'
             },
-            provinceCities: {  // 各个区域的的中心坐标 缩放级别 
+            provinceCities: {  // 各个区域的的中心坐标 缩放级别
                 "青岛": {  center: [36.06667, 120.33333], zoom: 8 },
                 "北京": {  center: [39.604882122321174, 116.43660987308282], zoom: 8 },
                 "天津": {  center: [39.130593, 117.260892], zoom: 7 },
@@ -263,7 +263,7 @@ export default {
         ...mapGetters(['plazas', 'plazaId', 'accessLevel'])
     },
     watch: {
-         
+
     },
     created() {
         this.currentTime()
@@ -340,7 +340,7 @@ export default {
             }
         },
         /**
-         * @Description 通过导航进行导航 
+         * @Description 通过导航进行导航
          * @Param id 所选区域的id
          * @Param index 点击项的序号
          */
@@ -354,8 +354,8 @@ export default {
             this.currentLevel = level
             this.currentZoneData = data
             this.getEventStatusData(level, data.ccode)
-            this.queryPlazaInfoCount(data.ccode, data.level, data.cid) 
-            this.getSystemList(data.ccode, data.level) 
+            this.queryPlazaInfoCount(data.ccode, data.level, data.cid)
+            this.getSystemList(data.ccode, data.level)
             if (level === 1) {
                 this.pantGroupMap(data, this.currentSysId)
             } else if (level === 2) {
@@ -404,7 +404,7 @@ export default {
             } else {   // 点击项为广场时 直接跳转到详情页  地图不用响应
              
                 let pathData = {fromGroup: 'true'}
-                let routeData = this.$router.resolve({  
+                let routeData = this.$router.resolve({
                     name:'/home/homePage',
                 })
                 window.open(routeData.href, '_blank');
@@ -413,11 +413,11 @@ export default {
                     plazaName: data.cname,
                     plazaId: data.ccode
                 }
-                this.$store.commit('SETPLAZENAME', data.cname) 
+                this.$store.commit('SETPLAZENAME', data.cname)
                 localStorage.setItem('PLAZAID', data.ccode)
             }
         },
-   
+
         /**
          * @Description  查询项目信息统计数量
          * @Param  ccode  管理分区编码 必填
@@ -504,7 +504,7 @@ export default {
             })
         },
          /**
-        * @Description 展开 维保 第三方检测 专维 
+        * @Description 展开 维保 第三方检测 专维
         * @Param  item 展开的某一项
         */
         toggerPanel(item) {
@@ -539,7 +539,7 @@ export default {
         /**
         *@Description 根据数据计算维保/第三方检测/专维各自颜色条的长度  维保、第三方检测是用即将逾期数据判断;专维是如果有逾期未完成直接标红,如果没有,按照即将逾期的数量显示颜色
         *@Param item 某一项的数据
-        *@Param title 标题 
+        *@Param title 标题
         */
         barStyle(item, title) {
             let bg = ''
@@ -567,11 +567,11 @@ export default {
             }
         },
         /**
-         * @Description 根据数据来返 维保/第三方检测/专维 三个模块中显示条的颜色 
+         * @Description 根据数据来返 维保/第三方检测/专维 三个模块中显示条的颜色
          * @Param num 即将逾期数 / 逾期未完成数
          * @Param total 总数
          */
-        selectColorByNum (num, total) {    
+        selectColorByNum (num, total) {
             let devide =  num / total
             if ( (num > 1 && num <=24  ) || (  devide > 0.1 && devide <=0.2 ) ) {
                 return 0
@@ -581,7 +581,7 @@ export default {
                 return 2
             }
         },
-  
+
         /**
         * @Description 根据数据 判定地图上图标的显示显示颜色
         * @Param data 作为判断的数据
@@ -608,7 +608,7 @@ export default {
             this.times = moment().format('YYYY.MM.DD HH:mm')
             setTimeout(this.currentTime, 1000)
         },
- 
+
          /**
         * @Description 格式化时间
         * @method param empty
@@ -628,7 +628,7 @@ export default {
         * @method param plazaId 广场id  如果是广场则此参数必填 其他情况下非必填
         */
         getSystemList(ccode, level) {
-            let params = null 
+            let params = null
             if (level === 0) {
                 params = {getParams:{plazaId: ccode, level}}
             } else {
@@ -674,7 +674,7 @@ export default {
          * @Param ccode 管理分区编码 必填
          * @Param level 1集团 2中心 3区域 0广场 必填
          */
-        getEventStatusData(level, ccode) {  
+        getEventStatusData(level, ccode) {
             let params = {
                 getParams: {
                     level,
@@ -751,13 +751,13 @@ export default {
                     }
                 }
             }).addTo(myMaps)
-            if (this.currentLevel === 1) {//1集团 
+            if (this.currentLevel === 1) {//1集团
                 this.pantGroupMap(this.currentZoneData, this.currentSysId)
             } else if (this.currentLevel === 2) {  // 2中心
                 this.pantZonesMap(this.currentZoneData, this.currentSysId)
-            } else if (this.currentLevel === 3) {  // 3区域 
+            } else if (this.currentLevel === 3) {  // 3区域
                 this.pantProjectsMap(this.currentZoneData, this.currentSysId)
-            }  
+            }
         },
         /**
          * @Description 清空地图 并添加全国底图
@@ -820,7 +820,7 @@ export default {
                 let promise = new Promise((resolve, reject) => {
                     let params = {
                         getParams: {
-                            smsxt: this.currentSysId,  
+                            smsxt: this.currentSysId,
                             level: 2,    // 中心
                             ccode: item.ccode
                         }
@@ -893,7 +893,7 @@ export default {
                 let promise = new Promise((resolve, reject) => {
                     let params = {
                         getParams: {
-                            smsxt: this.currentSysId, 
+                            smsxt: this.currentSysId,
                             level: 3,   // 区域
                             ccode: item.ccode
                         }
@@ -901,7 +901,7 @@ export default {
                     querySystemCard(params).then(res => {
                         if (res.result === 'success') {
                             let name = item.cname.split('区域')[0]
-                            
+
                             let num = 0
                             if (res.data) {
                                 let equip = res.data[0]
@@ -961,7 +961,7 @@ export default {
                     let params = {
                         getParams: {
                             plazaId: item.cid,   // 所查对象是广场的时候plazaId必传
-                            smsxt: this.currentSysId,  
+                            smsxt: this.currentSysId,
                             level: 0,   // 广场
                             ccode: item.ccode
                         }
@@ -1027,14 +1027,14 @@ export default {
                 html: type =='group' ? name :`<div>${name}</div>`,
                 className: 'my-leaflet-div-icon',
                 iconSize: 30
-            }) 
+            })
             let circleIcon = L.icon({
                 iconUrl: require(`../../assets/images/icons/${color}.png`),
                 iconSize: [24, 24],
                 iconAnchor: [16, 38],
             });
- 
-            if (color  && center) { 
+
+            if (color  && center) {
                 let popup = L.popup({closeOnClick:true,offset: [-3,-20]}).setLatLng(center).setContent(contentHtml)
                 let marker = L.marker(center, { icon: textIcon }).addTo(groupLayer)
                 let marker2 = L.marker(center,{ icon: circleIcon} ).addTo(groupLayer)
@@ -1059,10 +1059,10 @@ export default {
                     this.createNavpathByData(data)
                     if (type === 'group') {
                         this.pantZonesMap(data, this.currentSysId)
-                    } 
+                    }
                     if (type === 'zone') {
                         this.pantProjectsMap(data, this.currentSysId)
-                    } 
+                    }
                     if (type === 'project') {
                         let routeData = this.$router.resolve({
                             name:'/home/homePage',
@@ -1073,9 +1073,9 @@ export default {
                             plazaName: data.cname,
                             plazaId: data.ccode
                         }
-                        this.$store.commit('SETPLAZENAME', data.cname) 
+                        this.$store.commit('SETPLAZENAME', data.cname)
                         localStorage.setItem('PLAZAID', data.ccode)
-                    }   
+                    }
                 })
             }
         },
@@ -1109,7 +1109,7 @@ export default {
                 return ''
             }
         },
-        
+
     },
     beforeDestroy() {
         window.removeEventListener('resize', this.reinitalMap)
@@ -1149,7 +1149,7 @@ export default {
         box-shadow: 0px 2px 10px 0px rgba(31, 35, 41, 0.1);
         overflow: hidden;
         .home {
-            width: 265px;
+            width: 285px;
             height: 48px;
             // line-height: 48px;
             text-align: center;
@@ -1300,9 +1300,9 @@ export default {
                 margin-left: 1.2rem;
             }
         }
-        
+
         .system-general {
-            width: 25.4%;
+            width: 29.4%;
             box-sizing: border-box;
             background: white;
             .system-main-title {
@@ -1328,7 +1328,7 @@ export default {
                             display: flex;
                             align-items: center;
                             width: 25%;
-                            padding: 1.2rem 0 1.2rem 1rem ;  
+                            padding: 1.2rem 0 1.2rem 1rem ;
                             border-right: 1px solid #EFF0F1;
                             .img {
                                 height: 2.8rem;
@@ -1435,7 +1435,7 @@ export default {
             }
         }
         .map-box {
-            width: calc(56.6% - 2.4rem);
+            width: calc(52.6% - 2.4rem);
             margin: 0 12px;
             .cards-list {
                 display: flex;
@@ -1484,9 +1484,9 @@ export default {
                 #map {
                     height: 70vh;
                     overflow: hidden;
-                    
+
                     svg {
-                        pointer-events: none; 
+                        pointer-events: none;
                     }
                 }
                 .legend {
@@ -1596,5 +1596,4 @@ export default {
         }
     }
 }
-</style> 
- 
+</style>