瀏覽代碼

Merge branch 'dev' of http://39.106.8.246:3003/yunxing/wanda-bm-guide-h5 into dev

zhangyu 4 年之前
父節點
當前提交
00445f208e

+ 31 - 7
src/App.vue

@@ -12,10 +12,34 @@
         <!-- </div> -->
         <!-- 底部tabbar -->
         <van-tabbar v-show='$route.meta.showTabbar' class='tabber' v-model='active' :fixed='true' @change='changeTabbar'>
-            <van-tabbar-item icon='home-o'>项目概况</van-tabbar-item>
-            <van-tabbar-item icon='search'>楼层功能</van-tabbar-item>
-            <van-tabbar-item icon='friends-o'>设备设施</van-tabbar-item>
-            <van-tabbar-item icon='setting-o'>其他事项</van-tabbar-item>
+            <van-tabbar-item>
+                <span>项目概况</span>
+                <template #icon='props'>
+                    <i v-if='props.active' class='iconfont wanda-xiangmugaikuangactive1' style='color:#ffffff;background-color:#1989fa' />
+                    <i v-else class='iconfont wanda-xiangmugaikuang'></i>
+                </template>
+            </van-tabbar-item>
+            <van-tabbar-item>
+                <span>楼层功能</span>
+                <template #icon='props'>
+                    <i v-if='props.active' class='iconfont wanda-floor-func-active' />
+                    <i v-else class='iconfont wanda-louceng1'></i>
+                </template>
+            </van-tabbar-item>
+            <van-tabbar-item>
+                <span>设备设施</span>
+                <template #icon='props'>
+                    <i v-if='props.active' class='iconfont wanda-sbss-active' />
+                    <i v-else class='iconfont wanda-shebeisheshi1'></i>
+                </template>
+            </van-tabbar-item>
+            <van-tabbar-item>
+                <span>其他事项</span>
+                <template #icon='props'>
+                    <i v-if='props.active' class='iconfont wanda-other' />
+                    <i v-else class='iconfont wanda-qita1'></i>
+                </template>
+            </van-tabbar-item>
         </van-tabbar>
     </div>
 </template>
@@ -177,7 +201,7 @@ export default {
 //     height: calc(100% - 105px);
 //     background-color: #aaa;
 // }
-// .tabber {
-//     height: 55px;
-// }
+.tabber {
+    height: 50px;
+}
 </style>

文件差異過大導致無法顯示
+ 18 - 6
src/assets/fonts/iconfont.css


二進制
src/assets/fonts/iconfont.eot


文件差異過大導致無法顯示
+ 11 - 2
src/assets/fonts/iconfont.svg


二進制
src/assets/fonts/iconfont.ttf


二進制
src/assets/fonts/iconfont.woff


二進制
src/assets/fonts/iconfont.woff2


+ 71 - 0
src/views/iconfont.vue

@@ -0,0 +1,71 @@
+<template>
+    <div class='equipment-facilities'>
+        <!-- <p>EquipmentFacilities</p> -->
+        <div v-for='(item,index) in classArr' :key='index'>
+            <span>{{item.name}}</span>
+            <i class='iconfont' :style='{color:item.color,backgroundColor:item.backgroundColor}' :class='item.class'></i>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    name: 'EquipmentFacilities',
+    props: {},
+    data() {
+        return {
+            classArr: [
+                { name: '项目概况', class: 'wanda-xiangmugaikuang',},
+                { name: '项目概况激活', class: 'wanda-xiangmugaikuangactive1', color: '#fff',backgroundColor:'#1989fa' },
+                { name: '楼层功能', class: 'wanda-louceng1' },
+                { name: '楼层功能激活', class: 'wanda-floor-func-active', color: '#025BAA' },
+                { name: '设备设施', class: 'wanda-shebeisheshi1' },
+                { name: '设备设施激活', class: 'wanda-sbss-active', color: '#025BAA' },
+                { name: '其他事项', class: 'wanda-qita1' },
+                { name: '其他事项激活', class: 'wanda-other', color: '#025BAA' },
+                { name: '供电', class: 'wanda-gongdian1' },
+                { name: '供电激活', class: 'wanda-gongdian2', color: '#025BAA' },
+                { name: '暖通', class: 'wanda-nuantong1' },
+                { name: '暖通激活', class: 'wanda-nuantong2', color: '#025BAA' },
+                { name: '消防', class: 'wanda-xiaofang1' },
+                { name: '消防激活', class: 'wanda-xiaofang2', color: '#025BAA' },
+                { name: '弱电', class: 'wanda-ruodian1' },
+                { name: '弱电激活', class: 'wanda-ruodian2', color: '#025BAA' },
+                { name: '给排水', class: 'wanda-geipaishui1' },
+                { name: '给排水激活', class: 'wanda-geipaishui2', color: '#025BAA' },
+                { name: '电梯', class: 'wanda-dianti1' },
+                { name: '电梯激活', class: 'wanda-dianti2', color: '#025BAA' },
+                { name: '燃气', class: 'wanda-ranqi1' },
+                { name: '燃气激活', class: 'wanda-ranqi2', color: '#025BAA' },
+                { name: '', class: 'wanda-yincang' },
+                { name: '激活', class: 'wanda-yincang', color: '#025BAA' },
+
+                { name: '', class: 'wanda-scan' },
+                { name: '', class: 'wanda-scan', color: '#025BAA' },
+                { name: '', class: 'wanda-otherData' },
+                { name: '', class: 'wanda-otherData', color: '#025BAA' },
+                { name: '', class: 'wanda-suofang' },
+                { name: '', class: 'wanda-suofang', color: '#025BAA' },
+                { name: '', class: 'wanda-hengshuping',  },
+            ],
+        }
+    },
+    components: {},
+    beforeMount() {},
+    mounted() {},
+    methods: {},
+}
+</script>
+<style lang='less' scoped>
+.equipment-facilities {
+    width: 100%;
+    height: calc(100% - 50px);
+
+    div {
+        display: inline-block;
+        width: 50%;
+        height: 40px;
+        text-align: center;
+    }
+    // background-color: #f08080;
+}
+</style>

+ 116 - 4
src/views/otherMatter/AuxiliaryRoom.vue

@@ -1,10 +1,40 @@
 <template>
-    <div>
-        <van-button @click='roateX' type='primary'>横屏</van-button>
-        <van-button @click='roateY' type='primary'>竖屏</van-button>
+    <div class='auxiliary-room'>
+        <div class='title'>辅助用房统计表</div>
+        <div class='count'>
+            <div class='left'>
+                总间数(间)
+                <i>{{roomCount || '--'}}</i>
+            </div>
+            <div class='right'>
+                总面积(㎡)
+                <i>{{area || '--'}}</i>
+            </div>
+        </div>
+        <div class='table'>
+            <div class='header'>
+                <div class='floor'>楼层</div>
+                <div class='rooms'>总间数(间)</div>
+                <div class='area'>面积(㎡)</div>
+                <div class='operate'>操作</div>
+            </div>
+            <div class='content' v-for='i in 5' :key='i'>
+                <div class='floor'>F6</div>
+                <div class='rooms'>8</div>
+                <div class='area'>36</div>
+                <div class='operate'>查看分布图</div>
+            </div>
+        </div>
+        <div style='margin-top:10px'>
+            <van-button @click='roateX' type='primary'>横屏</van-button>
+            <van-button @click='roateY' type='primary'>竖屏</van-button>
+        </div>
     </div>
 </template>
 <script>
+/**
+ * 辅助用房
+ */
 import Vue from 'vue'
 import { Button } from 'vant'
 Vue.use(Button)
@@ -13,7 +43,11 @@ export default {
     props: {},
     components: {},
     data() {
-        return {}
+        return {
+            roomCount: 30,
+            area: 397,
+            list: [],
+        }
     },
     beforeMount() {},
     mounted() {},
@@ -40,4 +74,82 @@ export default {
 }
 </script>
 <style lang='less' scoped>
+.auxiliary-room {
+    width: 100%;
+    height: 100%;
+    // background-color: cyan;
+    padding: 16px;
+    .title {
+        width: 100%;
+        height: 20px;
+        font-size: 16px;
+        font-weight: 500;
+        color: #333333;
+        line-height: 22px;
+    }
+    .count {
+        margin-top: 15px;
+        height: 20px;
+        font-size: 14px;
+        font-weight: 400;
+        color: #666666;
+        line-height: 20px;
+        width: 100%;
+        display: flex;
+        justify-content: space-between;
+        i {
+            color: #333;
+            font-weight: 500;
+            margin-left: 8px;
+        }
+    }
+    // 表格内容
+    .table {
+        width: 100%;
+        margin-top: 10px;
+        .header {
+            width: 100%;
+            height: 40px;
+            font-size: 14px;
+            font-weight: 400;
+            color: #666666;
+            line-height: 40px;
+            display: flex;
+            justify-content: space-between;
+            background-color: #eff0f1;
+            padding: 0 15px;
+        }
+        .content {
+            width: 100%;
+            height: 40px;
+            line-height: 40px;
+            display: flex;
+            justify-content: space-between;
+            padding: 0 15px;
+            font-size: 14px;
+            font-weight: 400;
+            color: #333333;
+            border-bottom: 1px solid #eff0f1;
+        }
+        .header,
+        .content {
+            .floor {
+                flex: 2;
+            }
+            .rooms {
+                flex: 3;
+            }
+            .area {
+                flex: 3;
+            }
+            .operate {
+                flex: 3;
+                color: #025baa;
+            }
+        }
+        .header .operate {
+            color: #666;
+        }
+    }
+}
 </style>

+ 1 - 1
src/views/otherMatter/index.vue

@@ -33,7 +33,7 @@ export default {
 <style lang='less' scoped>
 .other-matter {
     width: 100%;
-    height: calc(100% - 50px);
+    height: calc(100% - 100px);
     // background-color: #d3d3d3;
     .other-tabs {
         height: 100%;

+ 16 - 4
src/views/overview/UpdateRecordDetail.vue

@@ -221,7 +221,10 @@ export default {
             }
             let res = await getUpdateDetail1({ getParams })
             console.log(res)
-            let data = res?.data[0] || {}
+            let data = {}
+            if (res.data) {
+                let data = res.data[0]
+            }
             data.reportdate && (data.tbDate = moment(data.reportdate).format('YYYY-MM-DD'))
             data.sjjssj && (data.ysDate = moment(data.sjjssj).format('YYYY-MM-DD'))
             this.data = data
@@ -243,7 +246,10 @@ export default {
             }
             let res = await getUpdateDetail4({ getParams })
             console.log(res)
-            let data = res?.data[0] || {}
+            let data = {}
+            if (res.data) {
+                let data = res.data[0]
+            }
             data.reportdate && (data.tbDate = moment(data.reportdate).format('YYYY-MM-DD'))
             data.sjjssj && (data.ysDate = moment(data.sjjssj).format('YYYY-MM-DD'))
             this.data = data
@@ -264,7 +270,10 @@ export default {
                 plazaId: this.plazaId,
             }
             let res = await getUpdateDetail5({ getParams })
-            let data = res?.data[0] || {}
+            let data = {}
+            if (res.data) {
+                let data = res.data[0]
+            }
             data.handledate && (data.handleDate = moment(data.handledate).format('YYYY-MM-DD'))
             this.data = data
         },
@@ -278,7 +287,10 @@ export default {
             }
             let res = await getUpdateDetail3({ getParams })
             console.log(res)
-            let data = res?.data[0] || {}
+            let data = {}
+            if (res.data) {
+                let data = res.data[0]
+            }
             data.createdate && (data.createDate = moment(data.createdate).format('YYYY-MM-DD'))
             this.data = data
         },