Parcourir la source

楼层、cookie、钻取表

guoxiaohuan il y a 4 ans
Parent
commit
6bb7dce69b

+ 1 - 0
package.json

@@ -19,6 +19,7 @@
         "element-ui": "^2.13.2",
         "quill": "^1.3.7",
         "vue": "^2.6.10",
+        "vue-cookie": "^1.1.4",
         "vue-quill-editor": "^3.0.6",
         "vue-router": "^3.1.3",
         "vuex": "^3.4.0"

+ 43 - 6
src/api/equipmentList.js

@@ -1,13 +1,50 @@
-import httputils from "@/api/httputils"
-// 设备设施设备-设备清单接口
+import httputils from '@/api/httputils'
+
+// 设备设施-主要设备清单
 export function queryEquipmentList({ data, postParams }) {
+    return httputils.fetchJson(`/api/data/glsms_asset/queryStatistics`, data, postParams)
+}
+
+// 设备设施-主要设备清单详情
+export function queryAsset({ data, postParams }) {
     return httputils.fetchJson(`/api/data/glsms_asset/query`, data, postParams)
 }
-// 设备设施设备-材料清单接口
+// 设备设施-主要材料清单
 export function queryMaterialList({ getParams }) {
     return httputils.getJson(`/api/data/gcglsms_material/query`, getParams)
 }
-//楼层
-export function queryFloorList({ getParams }) {
-    return httputils.getJson(`/api/plaza/fact`, getParams)
+
+// 设备设施-维保事项
+export function queryWbsms({ getParams }) {
+    return httputils.getJson(`/api/data/glsms_wbsms/query`, getParams)
+}
+
+// 设备设施-维修事项
+export function queryWx({ getParams }) {
+    return httputils.getJson(`/api/data/glsms_wx/query`, getParams)
+}
+
+// 设备设施-专维
+export function queryZw({ getParams }) {
+    return httputils.getJson(`/api/data/glsms_zw/query`, getParams)
+}
+
+// 设备设施-其他事项
+export function queryQtsx({ getParams }) {
+    return httputils.getJson(`/api/data/glsms_qtsx/query`, getParams)
+}
+
+// 设备设施-记录事项
+export function queryxx({ getParams }) {
+    return httputils.getJson(`/api/xx`, getParams)
+}
+
+// 设备设施=查看图纸
+export function queryxxx({ getParams }) {
+    return httputils.getJson(`/api/xxX`, getParams)
+}
+
+// 设备设施-楼层电井口(间)控制商铺范围清单
+export function queryx({ getParams }) {
+    return httputils.getJson(`/api/X`, getParams)
 }

+ 1 - 1
src/api/login.js

@@ -4,7 +4,7 @@ import httputils from '@/api/httputils'
 export function login(params) {
     return httputils.getJson(`/api/auth/check`, params)
 }
-// 楼层
+// 查询楼层清单
 export function queryFloor(params) {
     return httputils.getJson(`/api/plaza/floor`, params)
 }

+ 19 - 0
src/api/other.js

@@ -1 +1,20 @@
 import httputils from '@/api/httputils'
+// 综合事项管理
+export function queryGlams({ getParams }) {
+    return httputils.getJson(`/api/data/v_glsms_zhsxjl/query`, getParams)
+}
+
+//综合事项管理-综合记录事项弹框
+export function xx({ getParams }) {
+    return httputils.getJson(`/api/xx`, getParams)
+}
+
+// 辅助用房管理-广场辅助用房汇总统计报
+export function querygcfzyfhz({ getParams }) {
+    return httputils.getJson(`/api/data/v_glsms_gcfzyfhz/query`, getParams)
+}
+
+// 辅助用房管理-广场辅助用房调改变更记录
+export function queryfzyfchange({ getParams }) {
+    return httputils.getJson(`/api/data/v_glsms_fzyfchange/query`, getParams)
+}

+ 5 - 5
src/api/public.js

@@ -1,5 +1,5 @@
-import httputils from "@/api/httputils"
-// 查询楼层清单
-export function getFloorList(getParams) {
-    return httputils.getJson(`/api/plaza/floor`, getParams)
-}
+import httputils from '@/api/httputils'
+// 查询图片
+export function queryPic({ data, getParams }) {
+    return httputils.getJson(`/api/data/glsms_proimgup/query`, data, getParams)
+}

+ 3 - 7
src/components/floorList.vue

@@ -30,17 +30,12 @@ import { mapGetters } from 'vuex'
 export default {
     data() {
         return {
-            floorId: '1F',
+            floorId: '',
             showT: true,
             showB: true,
             num: 0
         }
     },
-    props: {
-        floors: {
-            default: []
-        }
-    },
     mounted() {},
     computed: {
         ...mapGetters(['floorsArr'])
@@ -49,7 +44,8 @@ export default {
         tabFloor(item) {
             this.showT = true
             this.showB = true
-            this.floorId = item
+            this.$cookie.set('floorNow', item, 3)
+            this.floorId = this.$cookie.get('floorNow') || item
         },
         removeTop() {
             var inner = document.querySelectorAll('.floor-item')

+ 2 - 6
src/main.js

@@ -7,28 +7,24 @@ Vue.config.productionTip = false
 import design from 'ant-design-vue'
 import 'ant-design-vue/dist/antd.css'
 Vue.use(design)
-
 import ElementUI from 'element-ui'
 import 'element-ui/lib/theme-chalk/index.css'
 Vue.use(ElementUI)
-
 import VueQuillEditor from 'vue-quill-editor'
 import 'quill/dist/quill.core.css'
 import 'quill/dist/quill.snow.css'
 import 'quill/dist/quill.bubble.css'
 Vue.use(VueQuillEditor)
-
 import WdEditor from '@/components/Editor'
 Vue.use(WdEditor)
-
 import Rotation from '@/components/Rotation'
 Vue.use(Rotation)
-
 import PicLarge from '@/components/PicLarge'
 Vue.use(PicLarge)
-
 import Legend from '@/components/Legend'
 Vue.use(Legend)
+import cookies from 'vue-cookie'
+Vue.use(cookies)
 
 //////////模拟传入参数
 const username = 'aiyu6'

+ 0 - 1
src/store/index.js

@@ -59,7 +59,6 @@ export default new Vuex.Store({
             queryFloor({ plazaId: context.state.plazaId }).then((res) => {
                 if (res.result == 'success') {
                     context.commit('SETFLOORS', res.data)
-                    console.log(res.data)
                 }
             })
         },

+ 13 - 4
src/views/equipment/index.vue

@@ -9,7 +9,13 @@
         <div class='eq-bottom'>
             <div class='eq-left'>
                 <ul>
-                    <li class='li-style' v-for='(eve,index) in everySystem' :key='"o"+index' @click='dialogVisible(eve)'>
+                    <li
+                        class='li-style'
+                        :class='{"is-active": eve.id}'
+                        v-for='(eve,index) in everySystem'
+                        :key='"o"+index'
+                        @click='dialogVisible(eve)'
+                    >
                         <span class='circle'></span>
                         {{eve.label}}
                     </li>
@@ -122,7 +128,7 @@ export default {
             color: #646c73;
             font-size: 14px;
             height: 100%;
-            background: rgba(242, 245, 247, 1);
+            // background: rgba(242, 245, 247, 1);
         }
         .li-style {
             padding: 0 0 18px 35px;
@@ -130,12 +136,15 @@ export default {
             .circle {
                 width: 6px;
                 height: 6px;
-                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%);
                 border-radius: 50%;
                 display: inline-block;
                 margin-right: 10px;
             }
         }
+        .is-active {
+            // background: linear-gradient(270deg, rgba(199, 217, 234, 0) 0%, rgba(199, 217, 234, 1) 100%);
+        }
         .eq-right {
             flex: 1;
             .eq-right-bottom {
@@ -169,4 +178,4 @@ export default {
         }
     }
 }
-</style>
+</style>

+ 91 - 0
src/views/equipment/table/GDQDDrillingDialog.vue

@@ -0,0 +1,91 @@
+<template>
+    <div class='gdqd-dialog'>
+        <div class='top'></div>
+        <div class='gdqd-dialog-top'>
+            <Select width='224' tipPlace='top' caption='管理归属' size='small' style='margin-right:12px' :selectdata='dataSelect2' :placeholder='"请选择"'></Select>
+            <Select width='224' tipPlace='top' caption='设备状态' size='small' style='margin-right:12px' :selectdata='dataSelect2' :placeholder='"请选择"'></Select>
+            <Select width='224' tipPlace='top' caption='楼层:' size='small' style='margin-right:12px' :selectdata='floorSelect' :placeholder='"请选择"'></Select>
+            <el-input placeholder='请按照设备简称搜索' size='small' prefix-icon='el-icon-search' v-model='input'></el-input>
+            <el-input placeholder='请按照设备编号搜索' size='small' prefix-icon='el-icon-search' v-model='input'></el-input>
+            <el-input placeholder='请按品牌搜索' size='small' prefix-icon='el-icon-search' v-model='input'></el-input>
+            <el-input placeholder='请按照型号搜索' size='small' prefix-icon='el-icon-search' v-model='input'></el-input>
+            <el-input placeholder='请按照安装位置搜索' size='small' prefix-icon='el-icon-search' v-model='input'></el-input>
+            <el-input placeholder='请按照生产厂商搜索' size='small' prefix-icon='el-icon-search' v-model='input'></el-input>
+            <el-input placeholder='请按照服务商搜索' size='small' prefix-icon='el-icon-search' v-model='input'></el-input>
+        </div>
+        <el-table :data='tableData' style='width: 100%'>
+            <el-table-column type='index' label='序号' width='50'></el-table-column>
+            <el-table-column prop='lb' label='设备简称'></el-table-column>
+            <el-table-column prop='sl' label='设备编号'></el-table-column>
+            <el-table-column prop='unit' label='数量'></el-table-column>
+            <el-table-column prop='lb' label='管理归属'></el-table-column>
+            <el-table-column prop='sl' label='设备状态'></el-table-column>
+            <el-table-column prop='unit' label='品牌'></el-table-column>
+            <el-table-column prop='sl' label='型号'></el-table-column>
+            <el-table-column prop='unit' label='楼层'></el-table-column>
+            <el-table-column prop='lb' label='安装位置'></el-table-column>
+            <el-table-column prop='sl' label='生产厂商'></el-table-column>
+            <el-table-column prop='unit' label='服务商'></el-table-column>
+        </el-table>
+    </div>
+</template>
+<script>
+import Select from '@/components/Select/Select.vue'
+import { mapGetters } from 'vuex'
+export default {
+    data() {
+        return {
+            tableData: [],
+            dataSelect2: [
+                { id: 'test1', name: '选择项' },
+                { id: 'test2', name: '单平米' },
+                { id: 'test3', name: '下级分项' },
+                { id: 'test4', name: '滑动平均滑动平均' }
+            ],
+            input: '',
+            floorSelect: [] //楼层下拉框
+        }
+    },
+    components: {
+        Select
+    },
+    computed: {
+        ...mapGetters(['floorsArr'])
+    },
+    mounted() {
+        this.init()
+    },
+    methods: {
+        open() {
+            this.visible = true
+        },
+        init() {
+            this.floorSelect = []
+            if (this.floorsArr.length > 0) {
+                this.floorsArr.forEach(e => {
+                    let obj = {
+                        id: e,
+                        name: e
+                    }
+                    this.floorSelect.push(obj)
+                })
+            }
+        }
+    }
+}
+</script>
+<style lang="less" scoped>
+.gdqd-dialog {
+    .top {
+    }
+    .gdqd-dialog-top {
+        display: flex;
+    }
+}
+</style>
+<style lang="less">
+.gdqd-dialog {
+    border: 1px solid green;
+    padding: 16px 24px 24px;
+}
+</style>

+ 56 - 7
src/views/equipment/table/GDQDTable.vue

@@ -1,15 +1,23 @@
 <!-- 设备清单的有select的表格 -->
 <template>
+    <!-- 变配电室内部设备清单 标准设备表格 -->
     <div class='compute-list'>
         <div class='eq-list-top'>
-            <Select width='120' tipPlace='top' caption='楼层 :' :selectdata='dataSelect2' style='margin-right:12px' @change='getList'></Select>
+            <Select width='120' tipPlace='top' caption='楼层 :' :selectdata='floorSelect' style='margin-right:12px' @change='getList'></Select>
+            <el-input placeholder='请按照设备简称搜索' size='small' prefix-icon='el-icon-search' v-model='input'></el-input>
+            <el-input placeholder='请按照品牌搜索' size='small' prefix-icon='el-icon-search' v-model='input'></el-input>
+            <el-input placeholder='请按照型号搜索' size='small' prefix-icon='el-icon-search' v-model='input'></el-input>
+            <el-input placeholder='请按照生产厂商搜索' size='small' prefix-icon='el-icon-search' v-model='input'></el-input>
             <a-input-search placeholder='请按照电井或商铺编号搜索' style='width: 192px;margin-bottom:12px;height:32px;' @search='onSearch' />
         </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'></el-table-column>
-            <el-table-column prop='sl' label='商铺电表箱'></el-table-column>
-            <el-table-column prop='unit' label='商铺编号'></el-table-column>
+        <el-table :data='tableData' style='width: 100%' @row-click='innerVisible = true'>
+            <el-table-column type='index' label='序号' width='50'></el-table-column>
+            <el-table-column prop='lb' label='设备简称'></el-table-column>
+            <el-table-column prop='sl' label='数量'></el-table-column>
+            <el-table-column prop='unit' label='品牌'></el-table-column>
+            <el-table-column prop='lb' label='型号'></el-table-column>
+            <el-table-column prop='sl' label='楼层' :sortable='true'></el-table-column>
+            <el-table-column prop='unit' label='生产厂商'></el-table-column>
         </el-table>
         <div class='foot'>
             <el-pagination
@@ -22,10 +30,16 @@
                 @current-change='pageChanged'
             ></el-pagination>
         </div>
+        <el-dialog width='80%' style='height:80%' title='设备清单' :visible.sync='innerVisible' append-to-body>
+            <GDQD-dialog ref='qdDialog'></GDQD-dialog>
+        </el-dialog>
     </div>
 </template>
 <script>
 import { queryEquipmentList } from '@/api/equipmentList.js'
+import Select from '@/components/Select/Select.vue'
+import GDQDDialog from './GDQDDrillingDialog'
+import { mapGetters } from 'vuex'
 export default {
     data() {
         return {
@@ -33,10 +47,22 @@ export default {
             tableData: [],
             total: 0,
             currentPage: 1,
-            size: 10
+            size: 10,
+            dataSelect2: [
+                { id: 'test1', name: '选择项' },
+                { id: 'test2', name: '单平米' },
+                { id: 'test3', name: '下级分项' },
+                { id: 'test4', name: '滑动平均滑动平均' }
+            ],
+            innerVisible: true,
+            input: '',
+            floorSelect: []
         }
     },
     props: ['major'],
+    computed: {
+        ...mapGetters(['floorsArr'])
+    },
     methods: {
         onSearch() {},
         pageChanged(page, size) {
@@ -57,15 +83,38 @@ export default {
                 this.tableData = res.data.data
                 this.total = res.data.count
             })
+        },
+        init() {
+            this.floorSelect = []
+            if (this.floorsArr.length > 0) {
+                this.floorsArr.forEach(e => {
+                    let obj = {
+                        id: e,
+                        name: e
+                    }
+                    this.floorSelect.push(obj)
+                })
+            }
         }
     },
+    components: {
+        GDQDDialog,
+        Select
+    },
     mounted() {
+        this.init()
         this.getList()
     }
 }
 </script>
 <style lang="less" scoped>
 .compute-list {
+    .top {
+        width: 1366px;
+        height: 1px;
+        background: rgba(0, 0, 0, 0.06);
+        margin-bottom: 20px;
+    }
     .eq-list-top {
         display: flex;
     }

+ 19 - 1
src/views/equipment/table/eqListTable.vue

@@ -3,7 +3,7 @@
     <div class='eq-list'>
         <div class='eq-list-top'>
             <Select width='146' tipPlace='top' caption='品牌:' :selectdata='dataSelect2' :placeholder='"请选择"' @change='getList'></Select>
-            <Select width='120' tipPlace='top' caption='楼层:' :selectdata='dataSelect2' style='margin:0 12px' @change='getList'></Select>
+            <Select width='120' tipPlace='top' caption='楼层:' :selectdata='floorSelect' style='margin:0 12px' @change='getList'></Select>
             <Select width='224' tipPlace='top' caption='生产厂商:' :selectdata='dataSelect2' :placeholder='"请选择"' @change='getList'></Select>
             <a-input-search placeholder style='width: 192px;margin-left:12px;height:32px;' @search='getList' />
         </div>
@@ -33,6 +33,8 @@
 <script>
 import Select from '@/components/Select/Select.vue'
 import { queryEquipmentList } from '@/api/equipmentList.js'
+import { mapGetters } from 'vuex'
+
 export default {
     components: { Select },
     data() {
@@ -50,6 +52,9 @@ export default {
             size: 10
         }
     },
+    computed: {
+        ...mapGetters(['floorsArr'])
+    },
     props: ['param', 'major'],
     methods: {
         pageChanged(page, size) {
@@ -57,6 +62,18 @@ export default {
             this.size = size
             this.getList()
         },
+        init() {
+            this.floorSelect = []
+            if (this.floorsArr.length > 0) {
+                this.floorsArr.forEach(e => {
+                    let obj = {
+                        id: e,
+                        name: e
+                    }
+                    this.floorSelect.push(obj)
+                })
+            }
+        },
         getList() {
             let postParams = {
                 CLASSSTRUCTUREID: this.param
@@ -82,6 +99,7 @@ export default {
         }
     },
     mounted() {
+        this.init()
         this.getList()
     }
 }

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

@@ -3,7 +3,7 @@
     <div class='zw-list'>
         <div class='eq-list-top'>
             <Select width='146' tipPlace='top' caption='类别:' :selectdata='dataSelect2' :placeholder='"请选择"' @change='getList'></Select>
-            <Select width='120' tipPlace='top' caption='楼层 :' :selectdata='dataSelect2' style='margin:0 12px' @change='getList'></Select>
+            <Select width='120' tipPlace='top' caption='楼层 :' :selectdata='floorSelect' style='margin:0 12px' @change='getList'></Select>
             <Select width='224' tipPlace='top' caption='生产厂商:' :selectdata='dataSelect2' :placeholder='"请选择"' @change='getList'></Select>
             <a-input-search placeholder style='width: 192px;margin-left:12px;height:32px;' @search='getList' />
         </div>
@@ -34,6 +34,7 @@
 <script>
 import Select from '@/components/Select/Select.vue'
 import { queryEquipmentList } from '@/api/equipmentList.js'
+import { mapGetters } from 'vuex'
 export default {
     components: { Select },
     data() {
@@ -50,6 +51,9 @@ export default {
             size: 10
         }
     },
+    computed: {
+        ...mapGetters(['floorsArr'])
+    },
     props: ['param', 'major'],
     methods: {
         pageChanged(page, size) {
@@ -72,6 +76,18 @@ export default {
                 this.tableData = res.data.data
                 this.total = res.data.count
             })
+        },
+        init() {
+            this.floorSelect = []
+            if (this.floorsArr.length > 0) {
+                this.floorsArr.forEach(e => {
+                    let obj = {
+                        id: e,
+                        name: e
+                    }
+                    this.floorSelect.push(obj)
+                })
+            }
         }
     },
     watch: {
@@ -82,6 +98,7 @@ export default {
         }
     },
     mounted() {
+        this.init()
         this.getList()
     }
 }

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

@@ -1,7 +1,7 @@
 <template>
     <!-- 设备设施的三级路由的tabs -->
     <div class='dialog-container'>
-        <el-dialog :title='`${systemName}-${dialogInfo.label}`' :visible.sync='visible' :fullscreen='true'>
+        <el-dialog v-if='Object.keys(dialogInfo).length>0' :title='`${systemName}-${dialogInfo.label}`' :visible.sync='visible' :fullscreen='true'>
             <div class='top'></div>
             <div v-if='dialogInfo.type==1' class='table-1'>
                 <el-table :data='tableData' style='width: 100%'>
@@ -113,8 +113,8 @@ export default {
     methods: {
         showModal(item) {
             this.visible = true
-            console.log(item)
             this.dialogInfo = item
+            console.log(this.dialogInfo)
         }
     }
 }

+ 13 - 1
src/views/other/index.vue

@@ -39,6 +39,8 @@ import OtherDialog from './otherDialog'
 import { matter, floors } from '@/utils/plugins/components.js'
 import ZhsxOther from './zhsxOther'
 import GcfzDialog from './gcfzDialog'
+import { queryPic } from '@/api/public.js'
+import { queryGlams, querygcfzyfhz, queryfzyfchange } from '@/api/other.js'
 export default {
     data() {
         return {
@@ -68,10 +70,20 @@ export default {
         dialogVisible(item) {
             console.log(item)
             this.$refs.gcfzDialog.showModal(item)
+        },
+        queryPicter() {
+            let getParams = {
+                data: { tyepcode: 2, floor: '4F', plazaId: '1001145' },
+                params: {}
+            }
+            queryPic(getParams).then(res => {
+                console.log('resres', res)
+            })
         }
     },
     mounted() {
         this.everySystem = this.matter[0].children
+        this.queryPicter()
         console.log(this.everySystem)
     }
 }
@@ -121,7 +133,7 @@ export default {
             .circle {
                 width: 6px;
                 height: 6px;
-                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%);
                 border-radius: 50%;
                 display: inline-block;
                 margin-right: 10px;

+ 48 - 38
src/views/other/zhsxOther.vue

@@ -5,25 +5,27 @@
                 <el-tabs v-model='activeName' @tab-click='handleClick'>
                     <el-tab-pane v-for='(item,index) in everySystem' :key='index' :label='`${item.label}`' :name='`${item.type}`'>
                         <div v-if='item.type==1'>
-                            <el-date-picker
-                                v-model='value1'
-                                type='daterange'
-                                size='small'
-                                style='margin-right:12px'
-                                range-separator='至'
-                                start-placeholder='开始日期'
-                                end-placeholder='结束日期'
-                            ></el-date-picker>
-                            <Select
-                                width='224'
-                                tipPlace='top'
-                                caption='政府部门'
-                                size='small'
-                                style='margin-right:12px'
-                                :selectdata='dataSelect2'
-                                :placeholder='"请选择"'
-                            ></Select>
-                            <el-input placeholder='请按照记录事项搜索' size='small' prefix-icon='el-icon-search' v-model='input'></el-input>
+                            <div class='tab-top'>
+                                <el-date-picker
+                                    v-model='value1'
+                                    type='daterange'
+                                    size='small'
+                                    style='margin-right:12px;width:216px'
+                                    range-separator='-'
+                                    start-placeholder='开始日期'
+                                    end-placeholder='结束日期'
+                                ></el-date-picker>
+                                <Select
+                                    width='180'
+                                    tipPlace='top'
+                                    caption='政府部门'
+                                    size='small'
+                                    style='margin-right:12px'
+                                    :selectdata='dataSelect2'
+                                    :placeholder='"请选择"'
+                                ></Select>
+                                <el-input placeholder='请按照记录事项搜索' size='small' prefix-icon='el-icon-search' v-model='input'></el-input>
+                            </div>
                             <el-table :data='tableData' style='width: 100%;margin-top:12px'>
                                 <el-table-column label='序号' type='index' width='50'></el-table-column>
                                 <el-table-column prop='name' sortable label='日期'></el-table-column>
@@ -35,25 +37,27 @@
                             </el-table>
                         </div>
                         <div v-if='item.type==2'>
-                            <Select
-                                width='224'
-                                tipPlace='top'
-                                caption='状态'
-                                size='small'
-                                style='margin-right:12px'
-                                :selectdata='dataSelect2'
-                                :placeholder='"请选择"'
-                            ></Select>
-                            <Select
-                                width='224'
-                                tipPlace='top'
-                                caption='部门'
-                                size='small'
-                                style='margin-right:12px'
-                                :selectdata='dataSelect2'
-                                :placeholder='"请选择"'
-                            ></Select>
-                            <el-input placeholder='请按照任务名称搜索' size='small' prefix-icon='el-icon-search' v-model='input'></el-input>
+                            <div class='tab-top'>
+                                <Select
+                                    width='146'
+                                    tipPlace='top'
+                                    caption='状态'
+                                    size='small'
+                                    style='margin-right:12px'
+                                    :selectdata='dataSelect2'
+                                    :placeholder='"请选择"'
+                                ></Select>
+                                <Select
+                                    width='146'
+                                    tipPlace='top'
+                                    caption='部门'
+                                    size='small'
+                                    style='margin-right:12px'
+                                    :selectdata='dataSelect2'
+                                    :placeholder='"请选择"'
+                                ></Select>
+                                <el-input placeholder='请按照任务名称搜索' size='small' prefix-icon='el-icon-search' v-model='input'></el-input>
+                            </div>
                             <el-table :data='tableData' style='width: 100%;margin-top:12px'>
                                 <el-table-column label='序号' type='index' width='50'></el-table-column>
                                 <el-table-column prop='name' sortable label='任务名称'></el-table-column>
@@ -274,6 +278,10 @@ export default {
                 height: 100%;
             }
         }
+        .tab-top {
+            display: flex;
+            align-items: center;
+        }
     }
     .zhsx-bottom {
         margin-top: 12px;
@@ -328,6 +336,7 @@ export default {
         font-family: MicrosoftYaHei;
         color: rgba(31, 36, 41, 1);
         border: 1px solid rgba(195, 199, 203, 1);
+        border-radius: 4px;
     }
     .el-tabs,
     .el-tabs__content {
@@ -339,6 +348,7 @@ export default {
     .is-active {
         color: #025baa;
         border-color: #025baa;
+        border-radius: 4px;
     }
     .el-tabs__header {
         margin: 0 0 12px;

+ 34 - 10
src/views/overview/index.vue

@@ -40,10 +40,10 @@
                                 <span>车位信息</span>
                             </div>
                             <div class='place-right'>
-                                <span>13.07万㎡(地上9.90万㎡、地下3.55万㎡)</span>
-                                <span>裙房31.22m</span>
-                                <span>地上5层/地下2层</span>
-                                <span>地下832个/地上0个</span>
+                                <span>{{build.length>0?formatter('建筑面积',build):'--'}}</span>
+                                <span>{{build.length>0?formatter('建筑高度',build):'--'}}</span>
+                                <span>{{build.length>0?formatter('楼层分布',build):'--'}}</span>
+                                <span>{{build.length>0?formatter('车位信息',build):'--'}}</span>
                             </div>
                         </div>
                         <div class='place-box'>
@@ -54,10 +54,10 @@
                                 <span>移交日期</span>
                             </div>
                             <div class='place-right'>
-                                <span>6.45㎡(地上5.82万㎡、地下0.63万㎡)</span>
-                                <span>2016年11月21日</span>
-                                <span>2016年11月21日</span>
-                                <span>2016年11月21日</span>
+                                <span>{{build.length>0?formatter('租赁面积',build):'--'}}</span>
+                                <span>{{build.length>0?formatter('竣工日期',build):'--'}}</span>
+                                <span>{{build.length>0?formatter('开业日期',build):'--'}}</span>
+                                <span>{{build.length>0?formatter('移交日期',build):'--'}}</span>
                             </div>
                         </div>
                     </div>
@@ -165,6 +165,10 @@ import { queryFact } from '@/api/overview'
 export default {
     data() {
         return {
+            pic1: [],
+            pic2: [],
+            build: {},
+            constructions: [],
             msgData: [
                 { type: '总包', company: '中国建筑第一工程局有限公司', people: '李海涛', phone: 12546548854 },
                 { type: '弱电', company: '中国建筑第一工程局有限公司', people: '李海涛', phone: 12546548854 },
@@ -200,15 +204,35 @@ export default {
         query() {
             let params = {
                 getParams: {
-                    plazaId: 964
+                    plazaId: 1000772
                 }
             }
             queryFact(params).then(res => {
-                console.log(res)
+                console.log('res', res)
+                if (res.result == 'success') {
+                    this.pic1 = res.pic1
+                    this.pic2 = res.pic2
+                    this.build = res.build
+                    this.constructions = res.constructions
+                    // if (this.build.length > 0) {
+                    //     this.build.forEach(e => {
+                    //         console.log(e)
+                    //     })
+                    // }
+                }
             })
+        },
+        formatter(str, arrv) {
+            if (str && arrv) {
+                const Objs = arrv.find(e => e.project == str)
+                return Objs ? Objs.basic : ''
+            } else {
+                return ''
+            }
         }
     },
     mounted() {
+        console.log(this.$cookie.get('floorNow'))
         this.query()
     },
     components: {