guoxiaohuan 4 years ago
parent
commit
8dc9d3ecd9

+ 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() {

+ 6 - 4
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() {
@@ -36,14 +37,15 @@ export default {
     methods: {
         emitFloor(item) {
             this.floorInfo = item
-            // this.$refs.floorMap.init(this.floorInfo.gname)
+            this.$refs.floorMap.init(this.floorInfo.gname)
         },
         additionalColl() {
             this.show = !this.show
         }
     },
     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'>

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

+ 2 - 2
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='110'>
-                                    <template slot-scope='{row}'>{{row.lxdh||'-'}}</template>
+                                    <template slot-scope='{row}'>{{row.lxdh||'--'}}</template>
                                 </el-table-column>
                             </el-table>
                         </div>

+ 80 - 18
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'>
@@ -159,17 +159,23 @@
                                 size='small'
                                 prefix-icon='el-icon-search'
                                 v-model='gdbhInput4'
-                                style='width:200px;'
+                                style='width:200px;margin-right:12px'
                             ></el-input>
-                        </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>
+                            <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
@@ -182,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
@@ -197,6 +211,7 @@
                                             end-placeholder
                                         ></el-date-picker>
                                     </p>
+
                                     <!-- <p class='input-dialog-p'>工单编号</p>
                                     <p class='input-dialog-p2'>
                                         <el-input
@@ -223,7 +238,7 @@
                             :page='page3'
                             :total='total3'
                             :size='size3'
-                            @Index3='Index3'
+                            @Index3Emit='Index3Emit'
                         ></room-table4>
                     </el-tab-pane>
                     <el-tab-pane label='维保记录' name='5'>
@@ -363,7 +378,7 @@
                             :page='page4'
                             :total='total4'
                             :size='size4'
-                            @Index4='Index4'
+                            @Index4Emit='Index4Emit'
                         ></room-table5>
                     </el-tab-pane>
                 </el-tabs>
@@ -509,7 +524,7 @@ export default {
         // 明细表
         Index1() {
             let getParams = {
-                location: '1198',
+                location: '1890',
                 plazaId: this.$store.state.plazaId,
                 page: this.page1,
                 size: this.size1
@@ -558,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
@@ -594,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,
@@ -664,7 +691,7 @@ export default {
         Index4() {
             let postParams = {}
             let data = {
-                location: '28160',
+                location: '1890',
                 plazaId: this.$store.state.plazaId,
                 page: this.page4,
                 size: this.size4,
@@ -823,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;
@@ -997,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>

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

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

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

@@ -85,7 +85,7 @@ export default {
         },
         pageChanged(page) {
             this.page = page
-            this.$emit('Index3')
+            this.$emit('Index3Emit', page)
         }
     }
 }

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

@@ -100,7 +100,7 @@ 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 HH:mm')

+ 1 - 2
vue.config.js

@@ -32,7 +32,6 @@ module.exports = {
             },
         },
         hot: true,
-        host: '192.168.200.100',
         // 关闭esline
         overlay: {
             warnings: false,
@@ -55,4 +54,4 @@ module.exports = {
     outputDir: 'wandaBmGuide',
     // 放置生成的静态资源 (js、css、img、fonts) 的 (相对于 outputDir 的) 目录
     assetsDir: 'static',
-}
+}