首页标题

2023-08-03 14:51:36 +08:00
parent f798c64930
commit 192bd44c7a
28 changed files with 246 additions and 174 deletions
--- a/pages/index/comp/device.vue
+++ b/pages/index/comp/device.vue
@@ -1,18 +1,19 @@
 <template>
    <view class="device">
-        <view class="nav">
-            <view class="nav-menu" :class="{ 'nav-menu-active': select.engineeringName }" @click="openDrawer"
+        <view class="nav" :style="{ top: navHeight + 'px' }">
+            <!-- <view class="nav-menu" :class="{ 'nav-menu-active': select.engineeringName }" @click="openDrawer"
                >{{ select.engineeringName || '工程' }}
-            </view>
+            </view> -->
            <picker
                @change="projectNameChange"
                :value="select.projectNameIndex"
                :range="projectList"
                range-key="text"
-                v-if="engineeringList.length"
+                v-if="store.params.engineerId"
            >
-                <view class="nav-menu" :class="{ 'nav-menu-active': select.projectName }"
-                    >{{ select.projectName || '项目' }}
+                <view class="nav-menu" :class="{ 'nav-menu-active': select.projectName }">
+                    {{ select.projectName || '项目' }}
+                    <uni-icons type="bottom" size="14" color="#666"></uni-icons>
                </view>
            </picker>
            <!-- <picker @change="projectTypeChange" :value="select.projectTypeIndex" :range="projectType" range-key="text">
@@ -40,21 +41,11 @@
                :status="store.status"
            ></uni-load-more>
        </view>
-        <uni-drawer ref="showRight" mode="right" :mask-click="false" :width="375">
-            <uni-indexed-list
-                :options="engineeringListFilter"
-                :showSelect="false"
-                @click="closeDrawer"
-            ></uni-indexed-list>
-        </uni-drawer>
    </view>
 </template>
 <script>
 import { getProjectList } from '@/common/api/project'
 import { queryDictData } from '@/common/api/dictionary'
-import { queryEngineering } from '@/common/api/engineering.js'
-import { pinyin } from 'pinyin-pro'
-
 export default {
    props: {
        store: {
@@ -70,35 +61,15 @@ export default {
                projectNameIndex: 0,
                projectType: '',
                projectTypeIndex: 0,
-                engineeringName: '',
-                engineeringId: '',
            },
-            navHeight: 0,
            minHeight: '',
            engineeringList: [],
            projectList: [],
            projectType: [],
+            navHeight: 0,
        }
    },
    computed: {
-        engineeringListFilter() {
-            let result = []
-            this.engineeringList.forEach((item) => {
-                let arr = pinyin(item.name[0], { toneType: 'none', type: 'array' })
-                let letter = arr[0][0].toUpperCase()
-                console.log(letter)
-                let index = result.findIndex((item) => item.letter === letter)
-                if (index === -1) {
-                    result.push({
-                        letter,
-                        data: [item.name],
-                    })
-                } else {
-                    result[index].data.push(item.name)
-                }
-            })
-            return result
-        },
        deviceListFilter() {
            return this.store.data.filter((item) => {
                if (this.select.projectName && this.select.projectType) {
@@ -113,61 +84,46 @@ export default {
            })
        },
    },
-    created() {
-        this.init()
-    },
    mounted() {
        setTimeout(() => {
            // 获取nav高度
            uni.createSelectorQuery()
-                .select('.nav')
-                .boundingClientRect((rect) => {
-                    this.navHeight = rect.height
-                    // #ifdef H5
-                    this.minHeight = 'calc(100vh - env(safe-area-inset-bottom) - ' + (50 + this.navHeight) + 'px)'
-                    // #endif
-                    // #ifdef APP-PLUS
-                    this.minHeight = 'calc(100vh - ' + this.navHeight + 'px)'
-                    // #endif
+                .select('.uni-navbar')
+                .boundingClientRect((rect1) => {
+                    this.navHeight = rect1.height
+                    // 获取nav高度
+                    uni.createSelectorQuery()
+                        .select('.nav')
+                        .boundingClientRect((rect2) => {
+                            // #ifdef H5
+                            this.minHeight =
+                                'calc(100vh - env(safe-area-inset-bottom) - ' +
+                                (50 + (rect2.height + rect1.height)) +
+                                'px)'
+                            // #endif
+                            // #ifdef APP-PLUS
+                            this.minHeight = 'calc(100vh - ' + (rect2.height + rect1.height) + 'px)'
+                            // #endif
+                        })
+                        .exec()
                })
                .exec()
        }, 1000)
    },
    methods: {
        async init() {
-            let engineering = uni.getStorageSync('engineering')
-            let res = await queryEngineering()
-            this.engineeringList = res.data
-            if (this.engineeringList.length === 0) {
-                return
-            }
-            if (!engineering) {
-                uni.setStorageSync('engineering', res.data[0])
-                this.select.engineeringName = res.data[0].name
-                this.select.engineeringId = res.data[0].id
-            } else {
-                if (this.engineeringList.findIndex((item) => item.id === engineering.id) === -1) {
-                    uni.setStorageSync('engineering', res.data[0])
-                    this.select.engineeringName = res.data[0].name
-                    this.select.engineeringId = res.data[0].id
-                }else{
-                    this.select.engineeringName = engineering.name
-                    this.select.engineeringId = engineering.id
-                }
-            }
            this.getProjectList()
            this.getDeviceList()
        },
        getDeviceList() {
            this.store.params.pageSize = 999
-            this.store.params.engineerId = this.select.engineeringId
            this.store.reload()
        },
        getProjectList() {
            getProjectList({
                pageNum: 1,
                pageSize: 9999,
-                engineeringId: this.select.engineeringId,
+                engineeringId: this.store.params.engineerId,
            }).then((res) => {
                console.log(res)
                let arr = [
@@ -202,37 +158,6 @@ export default {
                ]
            })
        },
-        closeDrawer(e) {
-            console.log(e)
-            this.engineeringList.forEach((item) => {
-                if (item.name === e.item.name) {
-                    uni.setStorageSync('engineering', item)
-                    this.select.engineeringName = item.name
-                    this.select.engineeringId = item.id
-                }
-            })
-            this.getDeviceList()
-            this.getProjectList()
-            this.select.projectName = ''
-            this.select.projectNameIndex = 0
-            this.$refs.showRight.close()
-        },
-        openDrawer(item) {
-            if (this.engineeringList.length === 0) {
-                uni.showToast({
-                    title: '暂无工程',
-                    icon: 'none',
-                })
-                return
-            } else if (this.engineeringList.length === 1) {
-                uni.showToast({
-                    title: '暂无其他工程',
-                    icon: 'none',
-                })
-                return
-            }
-            this.$refs.showRight.open()
-        },
        submitFeedBack() {
            uni.navigateTo({ url: '/pages/home/feedback' })
        },
--- a/pages/index/comp/indexZhuanZhi.vue
+++ b/pages/index/comp/indexZhuanZhi.vue
@@ -1,5 +1,6 @@
 <template>
    <view class="index-zhuanzhi">
+        <view class="canneng-index-title mb20">所有工程统计信息</view>
        <div class="header">
            <div class="header-item">
                <div class="header-item-value">{{ devCount.allDevCount || 0 }}</div>
@@ -13,7 +14,38 @@
                <div class="header-item-value">{{ devCount.alarmLineCount || 0 }}</div>
                <div class="header-item-label">报警设备</div>
            </div>
-            <div class="header-item"  @click="jump('offLineDevs')">
+            <div class="header-item" @click="jump('offLineDevs')">
+                <div class="header-item-value">{{ devCount.offLineCount || 0 }}</div>
+                <div class="header-item-label">离线设备</div>
+            </div>
+            <div class="header-item">
+                <div class="header-item-value">{{ devCount.alarmEventCount || 0 }}</div>
+                <div class="header-item-label">告警数量</div>
+            </div>
+            <div class="header-item">
+                <div class="header-item-value">{{ devCount.eventCount || 0 }}</div>
+                <div class="header-item-label">事件数量</div>
+            </div>
+            <div class="header-item" @click="projectNum">
+                <div class="header-item-value">{{ devCount.projectCount || 0 }}</div>
+                <div class="header-item-label">项目个数</div>
+            </div>
+        </div>
+        <view class="canneng-index-title mb20 mt20">当前工程统计信息</view>
+        <div class="header">
+            <div class="header-item">
+                <div class="header-item-value">{{ devCount.allDevCount || 0 }}</div>
+                <div class="header-item-label">设备总数</div>
+            </div>
+            <div class="header-item">
+                <div class="header-item-value">{{ devCount.onLineCount || 0 }}</div>
+                <div class="header-item-label">正常设备</div>
+            </div>
+            <div class="header-item" @click="jump('alarmLineDevs')">
+                <div class="header-item-value">{{ devCount.alarmLineCount || 0 }}</div>
+                <div class="header-item-label">报警设备</div>
+            </div>
+            <div class="header-item" @click="jump('offLineDevs')">
                <div class="header-item-value">{{ devCount.offLineCount || 0 }}</div>
                <div class="header-item-label">离线设备</div>
            </div>
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,6 +1,24 @@
 <template>
    <Cn-page :loading="loading" noPadding>
-        <view slot="body">
+        <view slot="body" class="canneng-index">
+            <uni-nav-bar
+                rightWidth="300rpx"
+                leftWidth="300rpx"
+                dark
+                :fixed="true"
+                status-bar
+                background-color="#376cf3"
+                color="#fff"
+                @clickRight="openDrawer"
+            >
+                <template slot="left">
+                    <text style="font-size: 32rpx; font-weight: 500">灿能物联</text>
+                </template>
+                <template slot="right">
+                    <text class="hide-txt mr5" style="font-size: 28rpx">{{ select.engineeringName }}</text>
+                    <uni-icons type="bottom" size="16" color="#fff"></uni-icons>
+                </template>
+            </uni-nav-bar>
            <view class="index">
                <!-- 运维 -->
                <YunWei :devCount="devCount" v-if="userInfo.authorities === 'operation_manager'" />
@@ -11,8 +29,20 @@
                <!-- 主用户 -->
                <ZhuYongHu :devCount="devCount" v-if="userInfo.authorities === 'app_vip_user'" />
                <YouKe :devCount="devCount" v-if="userInfo.authorities === 'tourist'"> </YouKe>
+                <view class="canneng-index-title mt20">设备列表</view>
                <Device ref="device" :store="store" />
            </view>
+            <uni-drawer ref="showRight" mode="right" :mask-click="false">
+                <uni-nav-bar :fixed="true" status-bar title="选择工程" color="#111"> </uni-nav-bar>
+                <view style="height: 200px"></view>
+                <view>
+                    <uni-indexed-list
+                        :options="engineeringListFilter"
+                        :showSelect="false"
+                        @click="closeDrawer"
+                    ></uni-indexed-list>
+                </view>
+            </uni-drawer>
        </view>
    </Cn-page>
 </template>
@@ -25,6 +55,9 @@ import YouKe from './comp/indexYouKe.vue'
 import Device from './comp/device.vue'
 import list from '../../common/js/list'
 import { getDevCount } from '../../common/api/device.js'
+import { queryEngineering } from '@/common/api/engineering.js'
+import { pinyin } from 'pinyin-pro'
+
 export default {
    mixins: [list],
    components: {
@@ -40,9 +73,76 @@ export default {
            loading: false,
            userInfo: {},
            devCount: {},
+            select: {
+                engineeringName: '',
+                engineeringId: '',
+            },
+            engineeringList: [],
        }
    },
+    computed: {
+        engineeringListFilter() {
+            let result = []
+            this.engineeringList.forEach((item) => {
+                let arr = pinyin(item.name[0], { toneType: 'none', type: 'array' })
+                let letter = arr[0][0].toUpperCase()
+                console.log(letter)
+                let index = result.findIndex((item) => item.letter === letter)
+                if (index === -1) {
+                    result.push({
+                        letter,
+                        data: [item.name],
+                    })
+                } else {
+                    result[index].data.push(item.name)
+                }
+            })
+            return result
+        },
+    },
    methods: {
+        async init() {
+            let engineering = uni.getStorageSync('engineering')
+            let res = await queryEngineering()
+            this.engineeringList = res.data
+            if (this.engineeringList.length === 0) {
+                return
+            }
+            if (!engineering) {
+                uni.setStorageSync('engineering', res.data[0])
+                this.select.engineeringName = res.data[0].name
+                this.select.engineeringId = res.data[0].id
+            } else {
+                if (this.engineeringList.findIndex((item) => item.id === engineering.id) === -1) {
+                    uni.setStorageSync('engineering', res.data[0])
+                    this.select.engineeringName = res.data[0].name
+                    this.select.engineeringId = res.data[0].id
+                } else {
+                    this.select.engineeringName = engineering.name
+                    this.select.engineeringId = engineering.id
+                }
+            }
+            this.store.params.engineerId = this.select.engineeringId
+            getDevCount(this.select.engineeringId).then((res) => {
+                this.devCount = res.data
+            })
+            this.$refs.device && this.$refs.device.init()
+        },
+        closeDrawer(e) {
+            console.log(e)
+            this.engineeringList.forEach((item) => {
+                if (item.name === e.item.name) {
+                    uni.setStorageSync('engineering', item)
+                    this.select.engineeringName = item.name
+                    this.select.engineeringId = item.id
+                    this.store.params.engineerId = item.id
+                }
+            })
+            this.$refs.device.select.projectName = ''
+            this.$refs.device.select.projectNameIndex = 0
+            this.$refs.device.init()
+            this.$refs.showRight.close()
+        },
        send() {
            uni.createPushMessage({
                title: '灿能',
@@ -58,14 +158,25 @@ export default {
        loadingChange(e) {
            this.loading = e
        },
+        openDrawer(item) {
+            if (this.engineeringList.length === 0) {
+                uni.showToast({
+                    title: '暂无工程',
+                    icon: 'none',
+                })
+                return
+            } else if (this.engineeringList.length === 1) {
+                uni.showToast({
+                    title: '暂无其他工程',
+                    icon: 'none',
+                })
+                return
+            }
+            this.$refs.showRight.open()
+        },
    },
    onLoad() {
        this.store = this.DataSource('/cs-device-boot/EquipmentDelivery/queryEquipmentByProject')
-        this.store.firstCallBack = () => {
-            getDevCount(this.store.params.engineerId).then((res) => {
-                this.devCount = res.data
-            })
-        }
    },
    onShow() {
        this.userInfo = uni.getStorageSync(this.$cacheKey.userInfo)
@@ -79,16 +190,24 @@ export default {
                text: '6',
            })
        }
-        this.$refs.device && this.$refs.device.init()
+        this.init()
    },
 }
 </script>
 <style lang="scss">
 .index {
-    padding: 34rpx 0 0;
+    padding: 20rpx 0 0;
+}
+.canneng-index-title {
+    padding: 0 20rpx;
+    font-size: 28rpx;
+    font-weight: 500;
 }
-
 /deep/ .uni-card {
    background: $uni-theme-white;
 }
+
+/deep/ .uni-drawer__content {
+    width: 100vw !important;
+}
 </style>
--- a/pages/index/mine.vue
+++ b/pages/index/mine.vue
@@ -240,7 +240,7 @@ export default {
                    color: #fff;
                    font-weight: 400;
                    border-radius: 16rpx;
-                    background: $uni-theme-blue;
+                    background: $uni-theme-color;
                }
            }
        }