Przeglądaj źródła

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

YaolongHan 4 lat temu
rodzic
commit
43cc0cb84b

+ 2 - 2
src/api/other.js

@@ -8,8 +8,8 @@ export function queryDsfrw({ getParams }) {
     return httputils.getJson(`/data/data/v_glsms_dsfrw/query`, getParams)
 }
 //综合事项管理-综合记录事项弹框
-export function xx({ getParams }) {
-    return httputils.getJson(`/data/xx`, getParams)
+export function queryZhsxjl({ getParams }) {
+    return httputils.getJson(`/data/data/v_glsms_zhsxjl/queryWindown`, getParams)
 }
 
 // 辅助用房管理-广场辅助用房汇总统计报

+ 4 - 0
src/api/room.js

@@ -29,3 +29,7 @@ export function queryWxjf({ getParams }) {
 export function queryWb({ data, postParams }) {
     return httputils.fetchJson(`/data/data/v_glsms_wbzy/query`, data, postParams)
 }
+// 查询位置属于哪个系统
+export function querySystem({ getParams }) {
+    return httputils.getJson(`/data/data/t_system_wzfl/querySystem`, getParams)
+}

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

@@ -17,6 +17,7 @@
                             @changeSwitch='handleSwich'
                             :remarksText='remarksText'
                             ref='viewLengend'
+                            :systemName='systemName'
                         ></lengend-view>
                     </div>
                 </div>
@@ -93,7 +94,7 @@ export default {
         }
     },
     computed: {
-        ...mapGetters(['plazaId','fmapID'])
+        ...mapGetters(['plazaId', 'fmapID'])
     },
     props: ['systemName'],
     components: { lengendView, legendRemarks, lengendEdit },

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

@@ -35,19 +35,19 @@ export default {
             loading: false,
             view: null,
             isQuerying: false, // 限制重复查询
-            urlMsg: {},
+            urlMsg: {}
             // fmapID:'1001012_42'
         }
     },
     components: { RoomBox, canvasFun },
     computed: {
-        ...mapGetters(['plazaId','fmapID']),
+        ...mapGetters(['plazaId', 'fmapID'])
     },
     methods: {
         ...mapActions(['getfmapID']),
         init(floorid) {
-            if(!this.fmapID){
-                this.getfmapID().then(()=>{
+            if (!this.fmapID) {
+                this.getfmapID().then(() => {
                     this.urlMsg.fmapID = this.fmapID
                     this.getMap(floorid)
                 })
@@ -55,7 +55,7 @@ export default {
             }
             this.getMap(floorid)
         },
-        getMap(floorid){
+        getMap(floorid) {
             if (this.isQuerying) {
                 console.log('正在查询...')
                 return
@@ -119,7 +119,7 @@ export default {
             if (floor == 'g80') {
                 // 屋顶
                 if (fengmap.frImg) {
-                    let imgItem = new SImageItem(null,`${this.mapServerURL}/webtheme/${this.fmapID}/${fengmap.frImg}`)
+                    let imgItem = new SImageItem(null, `${this.mapServerURL}/webtheme/${this.fmapID}/${fengmap.frImg}`)
                     this.scene.addItem(imgItem)
                     this.view.scene = this.scene
                     this.view.fitSceneToView()
@@ -201,7 +201,7 @@ export default {
             return readGroup(data)
         }
     },
-    watch: { },
+    watch: {},
     mounted() {
         if (window.screen.height == '768') {
             this.canvasWidth = this.$refs.graphy.offsetWidth

+ 45 - 4
src/components/menuList.vue

@@ -1,7 +1,13 @@
 <template>
     <!-- 顶部路由 -->
     <div class='menu'>
-        <div class='home' @click='$emit("update:modelNum", 0)'>{{plazas.length>0?formatter(plazaId,plazas):'--'}}</div>
+        <div class='home' @click='$emit("update:modelNum", 0)'>
+            <div class='downright'></div>
+            <div class='home-box'>
+                <img src='@/assets/imgs/logo.png' alt />
+                <span>{{plazas.length>0?formatter(plazaId,plazas):'--'}}</span>
+            </div>
+        </div>
         <div>
             <div
                 v-for='(item, index) in list'
@@ -121,17 +127,52 @@ export default {
     font-size: 16px;
     background: rgba(255, 255, 255, 1);
     box-shadow: 0px 2px 10px 0px rgba(31, 35, 41, 0.1);
+    overflow: hidden;
     .home {
-        width: 430px;
+        width: 265px;
         height: 48px;
-        font-size: 20px;
-        line-height: 48px;
+        // line-height: 48px;
         text-align: center;
         cursor: pointer;
         color: #ffffff;
         float: left;
         margin-right: 83px;
+        // background: linear-gradient(180deg, rgba(54, 156, 247, 1) 0%, rgba(2, 91, 170, 1) 100%);
         background: linear-gradient(180deg, rgba(54, 156, 247, 1) 0%, rgba(2, 91, 170, 1) 100%);
+        position: relative;
+        .downright {
+            position: absolute;
+            width: 0;
+            height: 0;
+            border-left: 20px solid transparent;
+            border-bottom: 48px solid #fff;
+            right: 0px;
+            top: 0;
+        }
+        .home-box {
+            height: 100%;
+            display: flex;
+            align-items: center;
+            img {
+                width: 28px;
+                height: 28px;
+                margin-left: 20px;
+                margin-right: 24px;
+                margin-top: -3px;
+            }
+            span {
+                font-size: 20px;
+                font-family: MicrosoftYaHei;
+                height: 27px;
+                line-height: 27px;
+                margin-top: -4px;
+                &:after {
+                    content: '|';
+                    position: absolute;
+                    left: 60px;
+                }
+            }
+        }
     }
     & > div:nth-of-type(2) {
         & > div {

+ 64 - 38
src/components/viewLengend.vue

@@ -5,50 +5,76 @@
 */
 <template>
     <div class='view'>
-        <el-table
-            v-loading='loading'
-            ref='dataTable'
-            :data='viewTable'
-            tooltip-effect='dark'
-            style='width:100%;'
-            @selection-change='handleSelectionChange'
-            :header-cell-style='{background:"rgba(2,91,170,0.1)",fontFamily:"PingFangSC-Medium,PingFang SC;",color:"rgba(0,0,0,0.85);",fontSize:"12px"}'
-        >
-            <el-table-column type='selection' width='45'></el-table-column>
-            <el-table-column prop='Name' :show-overflow-tooltip='true' label='项目' width='100'>
-                <template slot-scope='{row}'>{{row.Name||'--'}}</template>
-            </el-table-column>
-            <el-table-column prop='Num' label='数量'>
-                <template slot-scope='{row}'>
-                    <span v-if='row.Num || row.Num==0'>{{row.Num}}</span>
-                    <span v-else>--</span>
-                </template>
-            </el-table-column>
-            <el-table-column prop='Unit' label='单位' width='70'>
-                <template slot-scope='{row}'>{{row.Unit||'--'}}</template>
-            </el-table-column>
-            <el-table-column prop='Url' label='图例'>
-                <template slot-scope='{row}'>
-                    <div v-if='row.Url' class='Url-img'>
-                        <img :src='`/serve/topology-wanda/Picture/query/${row.Url}`' alt />
-                    </div>
-                    <div v-else>{{'--'}}</div>
-                </template>
-            </el-table-column>
-        </el-table>
-        <div class='swich'>
-            <el-switch v-model='swich' @change='handleSwich(swich)'></el-switch>
-            <span>隐藏数量为0的项目</span>
+        <div v-if='systemName=="土建系统"'>
+            <el-table
+                v-loading='loading'
+                ref='dataTable'
+                :data='viewTable'
+                tooltip-effect='dark'
+                style='width:100%;'
+                :header-cell-style='{background:"rgba(2,91,170,0.1)",fontFamily:"PingFangSC-Medium,PingFang SC;",color:"rgba(0,0,0,0.85);",fontSize:"12px"}'
+            >
+                <el-table-column prop label='说明'>
+                    <template slot-scope='{row}'>
+                        <span>{{'--'}}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column prop label='图例' width='60'>
+                    <template slot-scope='{row}'>
+                        <div v-if='row.Url' class='Url-img'>
+                            <img :src='`/serve/topology-wanda/Picture/query/${row.Url}`' alt />
+                        </div>
+                        <div v-else>{{'--'}}</div>
+                    </template>
+                </el-table-column>
+            </el-table>
         </div>
-        <div class='remark' v-if='remarksText'>
-            <span class='remark-title'>注:</span>
-            <div v-html='remarksText' class='remark-text'></div>
+        <div v-else>
+            <el-table
+                v-loading='loading'
+                ref='dataTable'
+                :data='viewTable'
+                tooltip-effect='dark'
+                style='width:100%;'
+                @selection-change='handleSelectionChange'
+                :header-cell-style='{background:"rgba(2,91,170,0.1)",fontFamily:"PingFangSC-Medium,PingFang SC;",color:"rgba(0,0,0,0.85);",fontSize:"12px"}'
+            >
+                <el-table-column type='selection' width='45'></el-table-column>
+                <el-table-column prop='Name' :show-overflow-tooltip='true' label='项目' width='100'>
+                    <template slot-scope='{row}'>{{row.Name||'--'}}</template>
+                </el-table-column>
+                <el-table-column prop='Num' label='数量'>
+                    <template slot-scope='{row}'>
+                        <span v-if='row.Num || row.Num==0'>{{row.Num}}</span>
+                        <span v-else>--</span>
+                    </template>
+                </el-table-column>
+                <el-table-column prop='Unit' label='单位' width='70'>
+                    <template slot-scope='{row}'>{{row.Unit||'--'}}</template>
+                </el-table-column>
+                <el-table-column prop='Url' label='图例'>
+                    <template slot-scope='{row}'>
+                        <div v-if='row.Url' class='Url-img'>
+                            <img :src='`/serve/topology-wanda/Picture/query/${row.Url}`' alt />
+                        </div>
+                        <div v-else>{{'--'}}</div>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <div class='swich'>
+                <el-switch v-model='swich' @change='handleSwich(swich)'></el-switch>
+                <span>隐藏数量为0的项目</span>
+            </div>
+            <div class='remark' v-if='remarksText'>
+                <span class='remark-title'>注:</span>
+                <div v-html='remarksText' class='remark-text'></div>
+            </div>
         </div>
     </div>
 </template>
 <script>
 export default {
-    props: ['viewTable', 'loading', 'remarksText'],
+    props: ['viewTable', 'loading', 'remarksText', 'systemName'],
     data() {
         return {
             swich: true,

+ 33 - 4
src/views/equipment/eqDialog.vue

@@ -139,6 +139,7 @@ export default {
         //点击tab函数
         handleClick(tab) {
             console.log(tab)
+            // console.log('============================================')
             if (this.param) {
                 this.param = tab.name
             } else if (this.smsxt) {
@@ -155,9 +156,9 @@ export default {
             }
             this.tabLabel = tab.label
         },
-        tabClick(value) {
-            console.log(value, '-----.')
-        },
+        // tabClick(e) {
+        //     console.log(e.label, e.name, '-----.')
+        // },
         visibalBox() {
             this.$refs.Dialog.open(this.dialogInfo.id)
         },
@@ -165,8 +166,36 @@ export default {
         initImage(typecode) {
             let getParams = {
                 plazaId: this.$store.state.plazaId,
-                system: this.systemName.slice(0, 2)
+                // system: this.systemName.slice(0, 2),
+                system: this.systemName,
+                siteid: '1000423',
+                module: '1002',
+                neTypename: '位置布置图'
+            }
+            switch (this.systemName) {
+                case '暖通系统':
+                    getParams.system = '1002'
+                    break
+                case '消防系统':
+                    getParams.system = '1003'
+                    break
+                case '弱点系统':
+                    getParams.system = '1004'
+                    break
+                case '电梯系统':
+                    getParams.system = '1006'
+                    break
+                case '燃气系统':
+                    getParams.system = '1007'
+                    break
+            }
+            if (this.systemName == '给排水系统') {
+                getParams.system = '1005'
             }
+            if (this.systemName == '供电系统') {
+                getParams.system = '1001'
+            }
+
             queryPic({ getParams }).then(res => {
                 this.rotationImg = res.data || []
             })

+ 24 - 3
src/views/equipment/index.vue

@@ -35,12 +35,12 @@
                             <Legend :systemName='systemName'></Legend>
                         </div>
                         <floorMap ref='floorMap'></floorMap>
-                        <div class='additional-box'>
+                        <div class='additional-box' v-if='fqPic.length>0'>
                             <div class='additional' @click='additionalColl'>
                                 <img src='../../assets/imgs/bg.png' alt />
                             </div>
                             <el-collapse-transition>
-                                <div v-if='show' class='add-img'>我是放附加数据片哒。。。</div>
+                                <div v-if='show' class='add-img'>图</div>
                             </el-collapse-transition>
                         </div>
                     </div>
@@ -59,6 +59,8 @@ import floorMap from '@/components/floorMap/index.vue'
 import eqDialog from './eqDialog'
 import editList from '@/components/edit.vue'
 import { system } from '@/utils/plugins/components.js'
+import { queryPic } from '@/api/public.js'
+
 export default {
     data() {
         return {
@@ -75,7 +77,8 @@ export default {
             dialogInfo: {},
             brand: [], //品牌
             manufacturer: [],
-            show: false
+            show: false,
+            fqPic: []
         }
     },
     components: { floorList, eqDialog, floorMap, editList },
@@ -88,6 +91,9 @@ export default {
             this.systemName = item.name
             this.smsxt = item.smsxt
             this.$cookie.set('categoryId', item.categoryId, 3)
+            if (this.smsxt == '1003' || this.smsxt == '1004') {
+                this.Index()
+            }
         },
         emitFloor(item) {
             console.log('item', item)
@@ -100,6 +106,21 @@ export default {
         },
         additionalColl() {
             this.show = !this.show
+        },
+        Index() {
+            let picFloor = this.$cookie.get('floorNow')
+            let getParams = {
+                module: '1003',
+                floor: picFloor,
+                plazaId: this.$store.state.plazaId
+            }
+            if (this.smsxt) {
+                getParams.system = this.smsxt
+            }
+            queryPic({ getParams }).then(res => {
+                console.log('分区图', res)
+                this.fqPic = res.data
+            })
         }
     },
     mounted() {

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

@@ -33,8 +33,8 @@
         </div>
         <el-table :data='tableData' style='width: 100%' :border='true' @row-click='rowHandle'>
             <el-table-column type='index' label='序号' width='80'></el-table-column>
-            <el-table-column prop='sbjc' label='设备名称' width='160'>
-                <template slot-scope='{row}'>{{row.sbjc || '--'}}</template>
+            <el-table-column prop='classqc' label='设备名称' width='160'>
+                <template slot-scope='{row}'>{{row.classqc || '--'}}</template>
             </el-table-column>
             <el-table-column prop='sl' label='数量' width='100'>
                 <template slot-scope='{row}'>{{row.sl || '--'}}</template>
@@ -45,7 +45,7 @@
             <el-table-column prop='sbxh' label='型号' show-overflow-tooltip resizable>
                 <template slot-scope='{row}'>{{row.sbxh || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='floor' label='楼层' width='100'>
+            <el-table-column prop='floorcode' label='楼层' width='100'>
                 <template slot-scope='{row}'>{{row.floor || '--'}}</template>
             </el-table-column>
             <el-table-column prop='wzjc' label='安装位置' show-overflow-tooltip resizable>

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

@@ -91,7 +91,6 @@ export default {
             this.dialogFormVisible = !this.dialogFormVisible
         },
         confirm() {
-            this.dialogFormVisible = false
             if (this.type == 1) {
                 this.$emit('confirm', this.inputForm.fws, this.inputForm.manufacturer)
             } else if (this.type == 2) {
@@ -101,6 +100,9 @@ export default {
             } else if (this.type == 4) {
                 this.$emit('confirm', this.inputForm.status, this.inputForm.yssjwcsj)
             }
+            this.dialogFormVisible = false
+            this.inputForm.status = ''
+            this.inputForm.yssjwcsj = ''
         }
     },
     mounted() {}

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

@@ -33,8 +33,8 @@
         </div>
         <el-table :data='tableData' :border='true' style='width: 100%' @row-click='rowHandle'>
             <el-table-column type='index' label='序号' width='80'></el-table-column>
-            <el-table-column prop='sbjc' label='设备名称' show-overflow-tooltip resizable>
-                <template slot-scope='{row}'>{{row.sbjc || '--'}}</template>
+            <el-table-column prop='classqc' label='设备名称' show-overflow-tooltip resizable>
+                <template slot-scope='{row}'>{{row.classqc || '--'}}</template>
             </el-table-column>
             <!-- sbjc -->
             <el-table-column prop='sl' label='数量' width='100'>

+ 3 - 3
src/views/equipment/table/tjTable.vue

@@ -15,8 +15,8 @@
         </div>
         <el-table :data='tableData' style='width: 100%'>
             <el-table-column type='index' label='序号' width='80'></el-table-column>
-            <el-table-column prop='lb' label='类别' width='160'>
-                <template slot-scope='{row}'>{{row.lb || '--'}}</template>
+            <el-table-column prop='category' label='类别' width='160'>
+                <template slot-scope='{row}'>{{row.category || '--'}}</template>
             </el-table-column>
             <el-table-column prop='sl' label='数量' width='100'>
                 <template slot-scope='{row}'>{{row.sl || '--'}}</template>
@@ -74,7 +74,7 @@ export default {
             }
             getParams.keyword = ''
             if (this.lb) {
-                getParams.keyword += `${this.lb}:lb;`
+                getParams.keyword += `${this.lb}:category;`
             }
             if (this.brand) {
                 getParams.keyword += `${this.brand}:brand;`

+ 9 - 8
src/views/equipment/table/wbTable.vue

@@ -64,11 +64,11 @@
         </div>
         <el-table :data='tableData' style='width: 100%'>
             <el-table-column type='index' label='序号' width='80'></el-table-column>
-            <el-table-column prop='sbjc' label='设备名称' show-overflow-tooltip resizable>
-                <template slot-scope='{row}'>{{row.sbjc || '--'}}</template>
+            <el-table-column prop='sbmc' label='设备名称' show-overflow-tooltip resizable>
+                <template slot-scope='{row}'>{{row.sbmc || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='sbjbm' label='设备编码' show-overflow-tooltip resizable>
-                <template slot-scope='{row}'>{{row.sbjbm || '--'}}</template>
+            <el-table-column prop='assetnum' label='设备编码' show-overflow-tooltip resizable>
+                <template slot-scope='{row}'>{{row.assetnum || '--'}}</template>
             </el-table-column>
             <el-table-column prop='matters' label='重要事项记录' show-overflow-tooltip resizable>
                 <template slot-scope='{row}'>{{row.matters || '--'}}</template>
@@ -144,11 +144,11 @@ export default {
             number_format,
             changeOption: [
                 {
-                    id: '',
+                    id: '1',
                     name: '是'
                 },
                 {
-                    id: ' ',
+                    id: ' 0',
                     name: '否'
                 }
             ],
@@ -185,7 +185,8 @@ export default {
             }
             //下拉
             if (this.ischange) {
-                getParams.data.ischangepj = this.ischange
+                // getParams.data.ischangepj = this.ischange
+                getParams.data.ismodel = this.ischange
             }
             if (this.sjjssj) {
                 getParams.data.sjjssjStartDate = this.sjjssj[0] + '000000'
@@ -237,7 +238,7 @@ export default {
         },
         tabLabel(newV, oldV) {
             if (newV !== oldV) {
-                this.tabFind()
+                // this.tabFind()
                 this.getList()
             }
         }

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

@@ -72,11 +72,11 @@
         </div>
         <el-table :data='tableData' :border='true' style='width: 100%'>
             <el-table-column type='index' label='序号' width='80'></el-table-column>
-            <el-table-column prop='sbjc' label='设备名称' show-overflow-tooltip resizable>
-                <template slot-scope='{row}'>{{row.sbjc || '--'}}</template>
+            <el-table-column prop='sbmc' label='设备名称' show-overflow-tooltip resizable>
+                <template slot-scope='{row}'>{{row.sbmc || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='sbjbm' label='设备编码' show-overflow-tooltip resizable>
-                <template slot-scope='{row}'>{{row.sbjbm || '--'}}</template>
+            <el-table-column prop='assetnum' label='设备编码' show-overflow-tooltip resizable>
+                <template slot-scope='{row}'>{{row.assetnum || '--'}}</template>
             </el-table-column>
             <el-table-column prop='matters' label='重要事项记录' show-overflow-tooltip resizable>
                 <template slot-scope='{row}'>{{row.matters || '--'}}</template>
@@ -155,11 +155,11 @@ export default {
             imgUrl: [],
             changeOption: [
                 {
-                    id: '',
+                    id: '1',
                     name: '是'
                 },
                 {
-                    id: '',
+                    id: '0',
                     name: '否'
                 }
             ],
@@ -193,7 +193,8 @@ export default {
             }
             //下拉
             if (this.ischange) {
-                getParams.data.ischangepj = this.ischange
+                getParams.data.ismodel = this.ischange
+                // getParams.data.ischangepj = this.ischange
             }
             if (this.sjjssj) {
                 getParams.data.sjjssjStartDate = this.sjjssj[0] + '000000'
@@ -244,7 +245,7 @@ export default {
         },
         tabLabel(newV, oldV) {
             if (newV !== oldV) {
-                this.tabFind()
+                // this.tabFind()
                 this.getList()
             }
         }

+ 4 - 0
src/views/equipment/table/zwTable.vue

@@ -152,6 +152,7 @@ export default {
         confirm(status, yssjwcsj) {
             this.yssjwcsj = yssjwcsj
             this.status = status
+
             this.getList()
         },
         pageChanged(page) {
@@ -258,6 +259,9 @@ export default {
                 getParams.data.lxsjwcsjStartDate = this.lxsjwcsj[0] + '000000'
                 getParams.data.lxsjwcsjEndDate = this.reportdate[1] + '000000'
             }
+            if (this.status) {
+                getParams.data.status = this.status
+            }
 
             //input
             getParams.data.keyword = ''

+ 5 - 3
src/views/floorFunc/index.vue

@@ -8,20 +8,21 @@
             <Legend></Legend>
         </div>
         <floor-list @emitFloor='emitFloor'></floor-list>
-        <div class='additional-box'>
+        <!-- <div class='additional-box'>
             <div class='additional' @click='additionalColl'>
                 <img src='../../assets/imgs/bg.png' alt />
             </div>
             <el-collapse-transition>
                 <div v-if='show' class='add-img'>我是放附加数据图片哒。。。</div>
             </el-collapse-transition>
-        </div>
+        </div>-->
         <floorMap ref='floorMap'></floorMap>
     </div>
 </template>
 <script>
 import floorMap from '@/components/floorMap/index.vue'
 import floorList from '@/components/floorList.vue'
+
 export default {
     components: { floorMap, floorList },
     data() {
@@ -43,7 +44,8 @@ export default {
         }
     },
     mounted() {
-        // this.$refs.floorMap.init(this.floorInfo.gname)
+        this.$refs.floorMap.init(this.floorInfo.gname)
+        this.Index()
     }
 }
 </script>

+ 2 - 2
src/views/other/gcfz1.vue

@@ -13,10 +13,10 @@
         <el-table-column prop label='楼层' :show-overflow-tooltip='true' resizable>
             <template slot-scope='{row}'>{{row.floor||'--'}}</template>
         </el-table-column>
-        <el-table-column prop label='总间数'>
+        <el-table-column prop='roomsl' label='总间数'>
             <template slot-scope='{row}'>{{row.roomsl||'--'}}</template>
         </el-table-column>
-        <el-table-column prop label='面积(㎡)'>
+        <el-table-column prop='area' label='面积(㎡)'>
             <template slot-scope='{row}'>{{row.area||'--'}}</template>
         </el-table-column>
         <el-table-column prop label='记录日期' width='100'>

+ 8 - 2
src/views/other/index.vue

@@ -16,7 +16,7 @@
                 </ul>
             </div>
             <!-- 楼层 -->
-            <div class='other-right' v-if='matterId!=1 && picFloorImg'>
+            <div class='other-right' v-if='matterId!=1 && picFloorImg.length>0'>
                 <floor-list @emitFloor='emitFloor'></floor-list>
             </div>
             <!-- 图例 -->
@@ -56,7 +56,7 @@ export default {
                 floorId: 'f1'
             },
             picFloor: '',
-            picFloorImg: '',
+            picFloorImg: [],
             dialogInfo: {}
         }
     },
@@ -86,6 +86,12 @@ export default {
             queryPic({ getParams }).then(res => {
                 console.log('库房管理图', res)
                 this.picFloorImg = res.data
+                console.log(this.picFloorImg)
+                if (this.picFloorImg) {
+                    console.log(1111)
+                } else {
+                    console.log(222222)
+                }
             })
         }
     },

+ 7 - 0
src/views/other/zhsxOther.vue

@@ -29,6 +29,7 @@ import Select from '@/components/Select/Select.vue'
 import ZhsxDialog from './zhsxDialog'
 import zhsxOtherTable1 from './zhsxOtherTable1'
 import zhsxOtherTable2 from './zhsxOtherTable2'
+import { queryZhsxjl } from '@/api/other.js'
 export default {
     data() {
         return {
@@ -39,6 +40,12 @@ export default {
     components: { ZhsxDialog, Select, zhsxOtherTable1, zhsxOtherTable2 },
     methods: {
         zhsxLog() {
+            let params = {
+                getParams: {}
+            }
+            queryZhsxjl(params).then(res => {
+                console.log('综合事项弹框', res)
+            })
             this.$refs.Dialog.open()
         },
         handleClick(tab) {

+ 15 - 9
src/views/other/zhsxOtherTable1.vue

@@ -55,12 +55,22 @@
             </el-table-column>
             <el-table-column prop label='附件' width='80'>
                 <template slot-scope='{row}'>
-                    <el-popover placement='right' trigger='hover'>
+                    <el-popover placement='right' trigger='hover' v-if='row.glsmsZhsxfj&&row.glsmsZhsxfj.length>0'>
                         <div>
-                            <p style='color: rgba(0, 145, 255, 1);cursor: pointer;'>南区防雷检测报告. pdf</p>
+                            <p
+                                style='color: rgba(0, 145, 255, 1);cursor: pointer;'
+                                v-for='(item,index) in row.glsmsZhsxfj'
+                                :key='index'
+                            >{{item.description}}</p>
                         </div>
-                        <div class='fileOpen' slot='reference'>预览({{row.file}})</div>
+                        <div class='fileOpen' slot='reference'>{{row.glsmsZhsxfj.length}}</div>
                     </el-popover>
+                    <div v-else>
+                        <div>
+                            <p style='color: rgba(0, 145, 255, 1);' v-for='(item,index) in row.glsmsZhsxfj' :key='index'>{{item.description}}</p>
+                        </div>
+                        <div class='fileOpen' slot='reference'>{{'--'}}</div>
+                    </div>
                 </template>
             </el-table-column>
         </el-table>
@@ -104,11 +114,7 @@ export default {
         formatter(date) {
             return moment.unix(date / 1000).format('YYYY.MM.DD')
         },
-        rowClick() {
-            console.log('window.location.href', window.location.href)
-            console.log('document.location.href', document.location.href)
-            console.log('document.URL', document.URL)
-        },
+        rowClick() {},
         changeData(val) {
             console.log(val)
         },
@@ -172,7 +178,7 @@ export default {
         },
         handdle() {
             if (this.isOpen) {
-                window.open('http://bing.com', true)
+                // window.open('http://bing.com', true)
             }
         }
     },

+ 10 - 2
src/views/other/zhsxOtherTable2.vue

@@ -1,7 +1,15 @@
 <template>
     <div class='tableZh'>
         <div class='tab-top'>
-            <el-input clearable @change='dsfjc' placeholder='搜索任务名称' size='small' prefix-icon='el-icon-search' v-model='searVal' style='width:200px'></el-input>
+            <el-input
+                clearable
+                @change='dsfjc'
+                placeholder='搜索任务名称'
+                size='small'
+                prefix-icon='el-icon-search'
+                v-model='searVal'
+                style='width:200px;margin-right:12px'
+            ></el-input>
             <Select
                 width='200'
                 tipPlace='top'
@@ -33,7 +41,7 @@
                 caption='检测结论'
                 size='small'
                 style='margin-right:12px'
-                v-if='conclusion.length>=0'
+                v-if='conclusion.length>0'
                 :selectdata='conclusion'
                 :placeholder='"请选择"'
                 v-model='jcjldsf'

+ 3 - 3
src/views/overview/index.vue

@@ -99,10 +99,10 @@
                                     <template slot-scope='{row}'>{{row.unit ||'--'}}</template>
                                 </el-table-column>
                                 <el-table-column label='联系人' prop width='65'>
-                                    <template slot-scope='{row}'>{{row.lxr||'-'}}</template>
+                                    <template slot-scope='{row}'>{{row.lxr||'--'}}</template>
                                 </el-table-column>
-                                <el-table-column prop='phone' label='联系电话' width='100'>
-                                    <template slot-scope='{row}'>{{row.lxdh||'-'}}</template>
+                                <el-table-column prop='phone' label='联系电话' width='110'>
+                                    <template slot-scope='{row}'>{{row.lxdh||'--'}}</template>
                                 </el-table-column>
                             </el-table>
                         </div>

+ 130 - 50
src/views/room/index.vue

@@ -69,7 +69,7 @@
                             :page='page1'
                             :total='total1'
                             :size='size1'
-                            @Index1='Index1'
+                            @Index1Emit='Index1Emit'
                         ></room-table2>
                     </el-tab-pane>
                     <el-tab-pane label='机房内核心设备' name='3'>
@@ -142,7 +142,6 @@
                                 v-model='zysxInput4'
                                 style='width:200px;margin-right:12px'
                             ></el-input>
-
                             <Select
                                 @change='Index3'
                                 width='200'
@@ -153,15 +152,30 @@
                                 :placeholder='"请选择"'
                                 style='margin-right:12px'
                             ></Select>
-                        </div>
-                        <div class='dialog-none'>
-                            <div class='input-dialog'>
-                                <div class='input-dialog-top' @click='show'>
-                                    <img src='@/assets/imgs/select.png' />
-                                    筛选
-                                </div>
-                                <div class='input-dialog-form' v-if='dialogFormVisible'>
-                                    <p class='input-dialog-p'>填报日期</p>
+                            <el-input
+                                clearable
+                                @change='Index3'
+                                placeholder='搜索工单编号'
+                                size='small'
+                                prefix-icon='el-icon-search'
+                                v-model='gdbhInput4'
+                                style='width:200px;margin-right:12px'
+                            ></el-input>
+                            <div class='picker-box'>
+                                <span class='picker-span'>填报日期:</span>
+                                <el-date-picker
+                                    style='width:190px'
+                                    v-model='tbsjDate'
+                                    value-format='yyyyMMdd'
+                                    type='daterange'
+                                    @change='Index3'
+                                    size='mini'
+                                    range-separator='-'
+                                    start-placeholder
+                                    end-placeholder
+                                ></el-date-picker>
+                            </div>
+                            <!-- <p class='input-dialog-p'>填报日期</p>
                                     <p class='input-dialog-p2'>
                                         <el-date-picker
                                             clearable
@@ -174,7 +188,15 @@
                                             start-placeholder
                                             end-placeholder
                                         ></el-date-picker>
-                                    </p>
+                            </p>-->
+                        </div>
+                        <div class='dialog-none'>
+                            <div class='input-dialog'>
+                                <div class='input-dialog-top' @click='show'>
+                                    <img src='@/assets/imgs/select.png' />
+                                    筛选
+                                </div>
+                                <div class='input-dialog-form' v-if='dialogFormVisible'>
                                     <p class='input-dialog-p'>验收日期</p>
                                     <p class='input-dialog-p2'>
                                         <el-date-picker
@@ -189,7 +211,8 @@
                                             end-placeholder
                                         ></el-date-picker>
                                     </p>
-                                    <p class='input-dialog-p'>工单编号</p>
+
+                                    <!-- <p class='input-dialog-p'>工单编号</p>
                                     <p class='input-dialog-p2'>
                                         <el-input
                                             clearable
@@ -199,7 +222,7 @@
                                             prefix-icon='el-icon-search'
                                             v-model='gdbhInput4'
                                         ></el-input>
-                                    </p>
+                                    </p>-->
                                     <p class='input-dialog-foot'>
                                         <el-button @click='dialogFormVisible = false' size='mini'>取 消</el-button>
                                         <el-button type='primary' @click='confirm
@@ -215,7 +238,7 @@
                             :page='page3'
                             :total='total3'
                             :size='size3'
-                            @Index3='Index3'
+                            @Index3Emit='Index3Emit'
                         ></room-table4>
                     </el-tab-pane>
                     <el-tab-pane label='维保记录' name='5'>
@@ -257,6 +280,25 @@
                                 :placeholder='"请选择"'
                                 style='margin-right:12px'
                             ></Select>
+                            <Select
+                                width='220'
+                                tipPlace='top'
+                                v-model='iszcSelect5'
+                                caption='是否正常:'
+                                v-if='zt.length>0'
+                                :selectdata='zt'
+                                :placeholder='"请选择"'
+                                style='margin-right:12px'
+                            ></Select>
+                            <el-input
+                                @change='Index4'
+                                clearable
+                                placeholder='异常工单编号'
+                                size='small'
+                                prefix-icon='el-icon-search'
+                                v-model='ycgdbhInput5'
+                                style='margin-right:12px;width:220px;'
+                            ></el-input>
                         </div>
                         <div class='dialog-none'>
                             <div class='input-dialog'>
@@ -294,31 +336,6 @@
                                             end-placeholder
                                         ></el-date-picker>
                                     </p>
-
-                                    <p class='input-dialog-p'>维保结果</p>
-                                    <p class='input-dialog-p2'>
-                                        <Select
-                                            width='200'
-                                            tipPlace='top'
-                                            caption='是否正常:'
-                                            v-if='zt.length>0'
-                                            :selectdata='zt'
-                                            v-model='iszcSelect5'
-                                            :placeholder='"请选择"'
-                                            style='margin-right:12px'
-                                        ></Select>
-                                    </p>
-                                    <p class='input-dialog-p'>异常工单编号</p>
-                                    <p class='input-dialog-p2'>
-                                        <el-input
-                                            clearable
-                                            placeholder
-                                            style='width:200px;'
-                                            size='mini'
-                                            prefix-icon='el-icon-search'
-                                            v-model='ycgdbhInput5'
-                                        ></el-input>
-                                    </p>
                                     <p class='input-dialog-p'>异常工单填报日期</p>
                                     <p class='input-dialog-p2'>
                                         <el-date-picker
@@ -361,7 +378,7 @@
                             :page='page4'
                             :total='total4'
                             :size='size4'
-                            @Index4='Index4'
+                            @Index4Emit='Index4Emit'
                         ></room-table5>
                     </el-tab-pane>
                 </el-tabs>
@@ -371,7 +388,7 @@
 </template>
 <script>
 import { queryEquipmentList } from '@/api/equipmentList.js'
-import { queryDygjcxline, queryHxsb, queryWxjf, queryWb } from '@/api/room.js'
+import { queryDygjcxline, queryHxsb, queryWxjf, queryWb, querySystem } from '@/api/room.js'
 import roomTable1 from './room1'
 import roomTable2 from './room2'
 import roomTable3 from './room3'
@@ -493,10 +510,10 @@ export default {
             this.picFloor = this.$cookie.get('floorNow')
             let getParams = {
                 typename: '位置布置图',
-                location: '1198',
+                location: '1809',
                 module: '1002',
-                system: '1001',
-                floor: this.picFloor,
+                system: '1002',
+                // floor: this.picFloor,
                 plazaId: this.$store.state.plazaId
             }
             queryPic({ getParams }).then(res => {
@@ -507,7 +524,7 @@ export default {
         // 明细表
         Index1() {
             let getParams = {
-                location: '1198',
+                location: '1890',
                 plazaId: this.$store.state.plazaId,
                 page: this.page1,
                 size: this.size1
@@ -556,7 +573,7 @@ export default {
         Index2() {
             let postParams = {}
             let data = {
-                location: '1198',
+                location: '1890',
                 plazaId: this.$store.state.plazaId,
                 page: this.page2,
                 size: this.size2
@@ -592,14 +609,26 @@ export default {
                 this.table3 = res.data.data ? res.data.data : []
             })
         },
+        Index1Emit(val) {
+            this.page1 = val
+            this.Index1()
+        },
         Index2Emit(val) {
             this.page2 = val
             this.Index2()
         },
+        Index3Emit(val) {
+            this.page3 = val
+            this.Index3()
+        },
+        Index4Emit(val) {
+            this.page4 = val
+            this.Index4()
+        },
         // 维修
         Index3() {
             let getParams = {
-                location: '1015',
+                location: '1890',
                 // plazaId: '1001145',
                 plazaId: this.$store.state.plazaId,
                 page: this.page3,
@@ -662,7 +691,7 @@ export default {
         Index4() {
             let postParams = {}
             let data = {
-                location: '1175',
+                location: '1890',
                 plazaId: this.$store.state.plazaId,
                 page: this.page4,
                 size: this.size4,
@@ -777,12 +806,24 @@ export default {
                 }
             })
         },
+        init() {
+            let params = {
+                getParams: {
+                    locationid: '5209',
+                    plazaId: this.$store.state.plazaId
+                }
+            }
+            querySystem(params).then(res => {
+                console.log('系统', res)
+            })
+        },
         open(name) {
             this.visible = true
             this.systemName = name
         }
     },
     mounted() {
+        this.init()
         this.Index()
     },
     watch: {}
@@ -809,6 +850,21 @@ export default {
             background: rgba(216, 216, 216, 1);
         }
     }
+    .picker-box {
+        display: flex;
+        align-items: center;
+        background: #fff;
+        padding: 0 6px;
+        border: 1px solid #dcdfe6;
+        border-radius: 4px;
+        height: 32px;
+        box-sizing: border-box;
+        margin-right: 12px;
+        .picker-span {
+            margin-right: 6px;
+            color: rgba(0, 0, 0, 0.65);
+        }
+    }
     .compute-span {
         width: 100%;
         height: 1px;
@@ -838,7 +894,7 @@ export default {
                 background: rgba(255, 255, 255, 1);
                 border-radius: 4px;
                 border: 1px solid rgba(195, 199, 203, 1);
-                z-index: 9999;
+                z-index: 99999;
                 position: absolute;
                 top: -20px;
                 right: 0px;
@@ -915,6 +971,10 @@ export default {
             color: rgba(31, 36, 41, 1);
             border: 1px solid rgba(195, 199, 203, 1);
         }
+        .el-tabs,
+        .el-tabs__content {
+            height: 800px;
+        }
         .el-tabs__active-bar {
             background-color: transparent !important;
         }
@@ -979,5 +1039,25 @@ export default {
             transform: scale3d(0.5, 0.5, 1);
         }
     }
+    .picker-box {
+        .el-input__inner {
+            border: none;
+        }
+        .el-range-editor.el-input__inner {
+            padding: 3px 0px;
+        }
+        .el-icon-date {
+            display: none;
+        }
+        .el-range__close-icon {
+            position: absolute;
+            right: 0px;
+            top: 2px;
+        }
+        .el-range-editor--mini .el-range-input {
+            font-size: 14px;
+            color: rgb(31, 36, 41);
+        }
+    }
 }
 </style>

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

@@ -67,7 +67,10 @@ export default {
     },
     components: { Select },
     methods: {
-        pageChanged(page) {}
+        pageChanged(page) {
+            console.log(page)
+            this.$emit('Index1Emit', page)
+        }
     },
     mounted() {}
 }

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

@@ -41,10 +41,10 @@
                 <el-table-column prop label='现场照片' show-overflow-tooltip resizable>
                     <template slot-scope='{row}'>{{row.pics || '--'}}</template>
                 </el-table-column>
-                <el-table-column prop label='填报时间' show-overflow-tooltip resizable>
+                <el-table-column prop label='填报时间' show-overflow-tooltip resizable width='130'>
                     <template slot-scope='{row}'>{{row.reportedby?formatter(row.reportedby):'--'}}</template>
                 </el-table-column>
-                <el-table-column prop label='验收时间' show-overflow-tooltip resizable>
+                <el-table-column prop label='验收时间' show-overflow-tooltip width='130' resizable>
                     <template slot-scope='{row}'>{{row.sjjssj?formatter(row.sjjssj):'--'}}</template>
                 </el-table-column>
                 <el-table-column prop label='工单编号' show-overflow-tooltip resizable>
@@ -81,11 +81,11 @@ export default {
     components: { Select },
     methods: {
         formatter(date) {
-            return moment.unix(date / 1000).format('YYYY.MM.DD')
+            return moment.unix(date / 1000).format('YYYY.MM.DD HH:mm')
         },
         pageChanged(page) {
             this.page = page
-            this.$emit('Index3')
+            this.$emit('Index3Emit', page)
         }
     }
 }

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

@@ -38,17 +38,17 @@
                     <el-table-column prop label='任务状态' :show-overflow-tooltip='true'>
                         <template slot-scope='{row}'>{{row.status||'--'}}</template>
                     </el-table-column>
-                    <el-table-column prop label='开始时间' :show-overflow-tooltip='true' width='90'>
+                    <el-table-column prop label='开始时间' :show-overflow-tooltip='true' width='130'>
                         <template slot-scope='{row}'>{{row.sjkssj?formatter(row.sjkssj):'--'}}</template>
                     </el-table-column>
-                    <el-table-column prop label='完成时间' :show-overflow-tooltip='true' width='90'>
+                    <el-table-column prop label='完成时间' :show-overflow-tooltip='true' width='130'>
                         <template slot-scope='{row}'>{{row.sjwcsj?formatter(row.sjwcsj):'--'}}</template>
                     </el-table-column>
                     <el-table-column prop label='执行耗时(天)' :show-overflow-tooltip='true' min-width='130' :sortable='true'>
                         <template slot-scope='{row}'>{{row.sjcxsjt||'--'}}</template>
                     </el-table-column>
                 </el-table-column>
-                <el-table-column prop label='是否正常' :show-overflow-tooltip='true'>
+                <el-table-column prop label='是否正常' :show-overflow-tooltip='true' width='80'>
                     <template slot-scope='{row}'>{{row.zt||'--'}}</template>
                 </el-table-column>
                 <el-table-column prop label='异常工单' align='center'>
@@ -58,10 +58,10 @@
                     <el-table-column prop label='描述' :show-overflow-tooltip='true'>
                         <template slot-scope='{row}'>{{row.description||'--'}}</template>
                     </el-table-column>
-                    <el-table-column prop label='填报时间' :show-overflow-tooltip='true' width='90'>
+                    <el-table-column prop label='填报时间' :show-overflow-tooltip='true' width='130'>
                         <template slot-scope='{row}'>{{row.reportdate?formatter(row.reportdate):'--'}}</template>
                     </el-table-column>
-                    <el-table-column prop label='验收时间' :show-overflow-tooltip='true' width='90'>
+                    <el-table-column prop label='验收时间' :show-overflow-tooltip='true' width='130'>
                         <template slot-scope='{row}'>{{row.sjjssj?formatter(row.sjjssj):'--'}}</template>
                     </el-table-column>
                 </el-table-column>
@@ -100,10 +100,10 @@ export default {
     methods: {
         pageChanged(page) {
             this.page = page
-            this.$emit('Index4')
+            this.$emit('Index4Emit', page)
         },
         formatter(date) {
-            return moment.unix(date / 1000).format('YYYY.MM.DD')
+            return moment.unix(date / 1000).format('YYYY.MM.DD HH:mm')
         },
         clickPic(row) {
             this.imgUrl = []