部分页面优化/登录日志模块完成/消息通知公告模块完成

src/api/common/applicationInfo.js

@@ -0,0 +1,10 @@
+import { request } from "@/utils/request";
+
+//消息列表-查询
+export function infoList(param) {
+    return request({
+        url: "/system/notice/list",
+        method: "GET",
+        data: param,
+    });
+}

src/api/common/loginLog.js

@@ -0,0 +1,10 @@
+import { request } from "@/utils/request";
+
+//消息列表-查询
+export function loginLogList(param) {
+    return request({
+        url: "/system/logininfor/list",
+        method: "GET",
+        data: param,
+    });
+}

src/pages.json

@@ -133,6 +133,20 @@
             "navigationStyle": "custom",
             "enablePullDownRefresh": false
           }
+        },
+        {
+          "path": "applicationInfo/index",
+          "style": {
+            "navigationBarTitleText": "应用消息",
+            "enablePullDownRefresh": false
+          }
+        },
+        {
+          "path": "loginLog/index",
+          "style": {
+            "navigationBarTitleText": "登录日志",
+            "enablePullDownRefresh": false
+          }
         }
       ]
     },
@@ -494,6 +508,13 @@
             "enablePullDownRefresh": false
           }
         },
+        {
+          "path": "facilitiesView/mapGatherView",
+          "style": {
+            "navigationBarTitleText": "设施查看",
+            "enablePullDownRefresh": false
+          }
+        },
         {
           "path": "facilitiesView/facilitiesDetailsList",
           "style": {

src/pages/business/fireIot/deviceSelect/components/deviceDetailsList.vue

@@ -1,5 +1,5 @@
 <template>
-  <scroll-view class="scroll-height" :scroll-y="true" :data-theme="'theme-' + proxy.$settingStore.themeColor.name">
+  <scroll-view class="scroll-height" :scroll-y="true" :data-theme="'theme-' + proxy.$settingStore.themeColor.name" @scrolltolower="scrolltolower">
     <u-sticky class="example-body" style="top: 0px">
       <view class="padding-sm padding-tb-10" :class="'bg-' + proxy.$settingStore.themeColor.name">
         <u--input
@@ -14,7 +14,8 @@
       </view>
     </u-sticky>
 
-    <view class="deviceDetailsList-container">
+    <u-empty v-show="dataList.length <= 0" text="暂无数据" mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png"> </u-empty>
+    <view v-if="dataList.length > 0" class="deviceDetailsList-container">
       <view class="menu-list margin-0">
         <view class="list-cell list-cell-arrow" v-for="(base, index) in dataList" :key="index" @click="handleToDevice(base)">
           <view class="menu-item-box">
@@ -22,8 +23,7 @@
           </view>
         </view>
       </view>
-
-      <uni-pagination class="block app-pagination bg-white" :current="current" :total="total" :pageSize="pageSize" prev-text="上一页" next-text="下一页" @change="paginationChange" />
+      <u-loadmore :status="status" @click="scrolltolower" />
     </view>
   </scroll-view>
 </template>
@@ -39,7 +39,7 @@ const { proxy } = getCurrentInstance();
 const publicStore = publicStores();
 
 const dataList = ref([]);
-
+const status = ref("loadmore");
 const deviceName = ref("");
 const productId = ref("");
 const productName = ref("");
@@ -51,6 +51,15 @@ const total = ref(0);
  * @页面初始化
  */
 function init() {
+  dmpDeviceInfoApi();
+}
+
+/**
+ * @列表查询
+ * @api接口查询
+ */
+
+function dmpDeviceInfoApi() {
   dmpDeviceInfo({ productId: productId.value, deviceName: deviceName.value, current: current.value, size: pageSize.value }).then((requset) => {
     if (requset.status === "SUCCESS") {
       dataList.value = requset.data.records;
@@ -59,18 +68,14 @@ function init() {
       uni.setNavigationBarTitle({
         title: `${productName.value}（${total.value}）`,
       });
+
+      if (total.value == dataList.value.length) {
+        status.value = "nomore";
+      }
     }
   });
 }
 
-/**
- * @分页chage事件
- */
-function paginationChange(e) {
-  current.value = e.current;
-  init();
-}
-
 /**
  * @设备详情跳转点击事件
  */
@@ -81,6 +86,22 @@ function handleToDevice(array) {
   publicStore.$state.deviceDetailsArray.productName = productName.value;
 }
 
+/**
+ * @scrollView触底事件
+ */
+function scrolltolower(e) {
+  if (total.value == dataList.value.length) {
+    status.value = "nomore";
+    return;
+  } else {
+    status.value = "loading";
+    pageSize.value += 10;
+    setTimeout(() => {
+      dmpDeviceInfoApi();
+    }, 1000);
+  }
+}
+
 onReady(() => {});
 
 onShow(() => {
@@ -97,7 +118,6 @@ onLoad((options) => {
     init();
   }
 });
-
 </script>
 
 <style lang="scss" scoped>

src/pages/business/fireIot/deviceSelect/index.vue

@@ -1,14 +1,15 @@
 <template>
   <scroll-view class="bg-white scroll-height" :scroll-y="true" :data-theme="'theme-' + proxy.$settingStore.themeColor.type">
-    <u-grid :border="true">
-      <u-grid-item v-for="(base, index) in dataList" :key="index" @click="handleToDevice(base.id, base.productName)">
-        <u-badge type="primary" max="9999" :value="base.deviceCount" :showZero="true" :absolute="true" :offset="[10, 10, 0, 0]"></u-badge>
-        <image class="margin-b-15" style="width: 40px; height: 40px; margin-top: 35px" :src="base.imagePath" mode="aspectFill"></image>
-        <text class="margin-b-15 grid-text">{{ base.productName }}</text>
-      </u-grid-item>
-    </u-grid>
-
-    <!-- <uni-pagination class="app-pagination bg-white" :current="current" :total="total" :pageSize="pageSize" prev-text="前一页" next-text="后一页" @change="paginationChange" /> -->
+    <u-empty v-if="dataList.length <= 0" text="暂无数据" mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png"> </u-empty>
+    <view v-else class="deviceSelect">
+      <u-grid :border="true">
+        <u-grid-item v-for="(base, index) in dataList" :key="index" @click="handleToDevice(base.id, base.productName)">
+          <u-badge type="primary" max="9999" :value="base.deviceCount" :showZero="true" :absolute="true" :offset="[10, 10, 0, 0]"></u-badge>
+          <image class="margin-b-15" style="width: 40px; height: 40px; margin-top: 35px" :src="base.typeImg" mode="aspectFill"></image>
+          <text class="margin-b-15 grid-text">{{ base.productName }}</text>
+        </u-grid-item>
+      </u-grid>
+    </view>
   </scroll-view>
 </template>
 
@@ -33,8 +34,8 @@ function init() {
   dmpProductInfo({ productName: "", current: current.value, size: pageSize.value }).then((requset) => {
     if (requset.status === "SUCCESS") {
       requset.data.records.forEach((el) => {
-        if ("imagePath" in el == false) {
-          el.imagePath = "/static/images/404.png";
+        if ("typeImg" in el == false) {
+          el.typeImg = "/static/images/404.png";
         }
 
         if (el.deviceCount == null) {

src/pages/business/fireIot/facilitiesView/facilitiesDetailsList.vue

@@ -1,5 +1,5 @@
 <template>
-  <scroll-view class="scroll-height" :scroll-y="true" :data-theme="'theme-' + proxy.$settingStore.themeColor.name">
+  <scroll-view class="scroll-height" :scroll-y="true" :data-theme="'theme-' + proxy.$settingStore.themeColor.name" @scrolltolower="scrolltolower">
     <u-sticky class="example-body" style="top: 0px">
       <view class="padding-sm padding-tb-10" :class="'bg-' + proxy.$settingStore.themeColor.name">
         <u--input
@@ -14,7 +14,8 @@
       </view>
     </u-sticky>
 
-    <view class="facilitiesDetailsList-container">
+    <u-empty v-show="dataList.length <= 0" text="暂无数据" mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png"> </u-empty>
+    <view v-if="dataList.length > 0" class="facilitiesDetailsList-container">
       <view class="menu-list margin-0">
         <view class="list-cell list-cell-arrow" v-for="(base, index) in dataList" :key="index" @click="handleToDevice(base.id)">
           <view class="menu-item-box">
@@ -23,7 +24,7 @@
         </view>
       </view>
 
-      <uni-pagination class="block app-pagination bg-white" :current="current" :total="total" :pageSize="pageSize" prev-text="上一页" next-text="下一页" @change="paginationChange" />
+      <u-loadmore :status="status" @click="scrolltolower" />
     </view>
   </scroll-view>
 </template>
@@ -38,7 +39,7 @@ import { baseGgpFacility } from "@/api/business/fireIot/facilitiesView/index";
 const { proxy } = getCurrentInstance();
 
 const dataList = ref([]);
-
+const status = ref("loadmore");
 const facilityType = ref(undefined);
 const facilityName = ref("");
 const facilityTypeName = ref("");
@@ -50,6 +51,14 @@ const total = ref(0);
  * @页面初始化
  */
 function init() {
+  selectListApi();
+}
+
+/**
+ * @列表查询
+ * @api接口查询
+ */
+function selectListApi() {
   baseGgpFacility({ facilityType: facilityType.value, facilityName: facilityName.value, current: current.value, size: pageSize.value }).then((requset) => {
     if (requset.status === "SUCCESS") {
       if (requset.data.records.length > 0) {
@@ -60,23 +69,35 @@ function init() {
 
       dataList.value = requset.data.records;
       total.value = requset.data.total;
+
+      if (total.value == dataList.value.length) {
+        status.value = "nomore";
+      }
     }
   });
 }
 
 /**
- * @分页chage事件
+ * @设备详情跳转点击事件
  */
-function paginationChange(e) {
-  current.value = e.current;
-  init();
+function handleToDevice(id) {
+  proxy.$tab.navigateTo(`/pages/business/fireIot/facilitiesView/facilitiesDetails?id=${id}&typeName=${facilityTypeName.value}`);
 }
 
 /**
- * @设备详情跳转点击事件
+ * @scrollView触底事件
  */
-function handleToDevice(id) {
-  proxy.$tab.navigateTo(`/pages/business/fireIot/facilitiesView/facilitiesDetails?id=${id}&typeName=${facilityTypeName.value}`);
+function scrolltolower(e) {
+  if (total.value == dataList.value.length) {
+    status.value = "nomore";
+    return;
+  } else {
+    status.value = "loading";
+    pageSize.value += 10;
+    setTimeout(() => {
+      selectListApi();
+    }, 1000);
+  }
 }
 
 onReady(() => {});

src/pages/business/mhxf/fireReport/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <scroll-view class="scroll-height" :scroll-y="true" :data-theme="'theme-' + proxy.$settingStore.themeColor.name">
+  <scroll-view class="scroll-height" :scroll-y="true" :data-theme="'theme-' + proxy.$settingStore.themeColor.name" @scrolltolower="scrolltolower">
     <view class="fireReport">
       <u-empty v-if="dataList.length <= 0" text="暂无数据" mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png"> </u-empty>
       <view class="reportContent" v-else>
@@ -14,7 +14,7 @@
             <view style="color: #3c9cff; cursor: pointer" @click="handleDownload(li.reportPath)">下载报告</view>
           </view>
         </view>
-        <u-loadmore :status="status" />
+        <u-loadmore :status="status" @click="scrolltolower" />
       </view>
     </view>
   </scroll-view>
@@ -57,7 +57,6 @@ function reportInfoListApi() {
     companyId: "",
     sourceType: 2,
   }).then((res) => {
-    console.log(res);
     dataList.value = res.data.records;
     total.value = res.data.total;
 
@@ -140,9 +139,10 @@ function handleDownload(reportPath) {
   }, 2000);
 }
 
-watchEffect(() => {});
-
-onReachBottom(() => {
+/**
+ * @scrollView触底事件
+ */
+function scrolltolower(e) {
   if (total.value == dataList.value.length) {
     status.value = "nomore";
     return;
@@ -153,7 +153,7 @@ onReachBottom(() => {
       reportInfoListApi();
     }, 1000);
   }
-});
+}
 
 // 自定义导航事件
 onNavigationBarButtonTap((e) => {

src/pages/common/applicationInfo/index.vue

@@ -0,0 +1,176 @@
+<template>
+  <u-sticky class="shadow-default" bgColor="#fff" style="top: 0">
+    <u-tabs :list="tabsList" :current="tabsCurrent" @click="tabsClick" lineColor="#333" :activeStyle="{ color: '#333' }" :inactiveStyle="{ color: '#909399' }" :scrollable="true"></u-tabs>
+  </u-sticky>
+
+  <scroll-view class="scroll-height" :scroll-y="true" :scroll-into-view="scrollIntoView" :data-theme="'theme-' + proxy.$settingStore.themeColor.name" style="padding-bottom: 44px">
+    <view class="applicationInfo-container">
+      <view class="content-area" v-show="tabsCurrent == 0">
+        <u-empty v-show="allInfoList.length <= 0" text="暂无数据" mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png"> </u-empty>
+        <view :id="index == allInfoList.length - 1 ? 'bottomInfo' : ''" v-for="(all, index) in allInfoList" :key="index" v-show="allInfoList.length > 0" @click="goContentDetails(all)">
+          <view class="content-area-time text-sm">{{ all.listTime }}</view>
+          <view class="content-area-center radius bg-white">
+            <view class="content-area-center-title">{{ all.typeTitle }}</view>
+            <view class="content-area-center-cont">{{ all.listTitle }}</view>
+          </view>
+        </view>
+      </view>
+      <view class="content-area" v-show="tabsCurrent == 1">
+        <u-empty v-show="noticeList.length <= 0" text="暂无数据" mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png"> </u-empty>
+        <view :id="index == noticeList.length - 1 ? 'bottomInfo' : ''" v-for="(all, index) in noticeList" :key="index" v-show="noticeList.length > 0" @click="goContentDetails(all)">
+          <view class="content-area-time text-sm">{{ all.listTime }}</view>
+          <view class="content-area-center radius bg-white">
+            <view class="content-area-center-title">{{ all.typeTitle }}</view>
+            <view class="content-area-center-cont">{{ all.listTitle }}</view>
+          </view>
+        </view>
+      </view>
+    </view>
+  </scroll-view>
+</template>
+
+<script setup>
+import { onLoad, onShow, onReady, onHide, onLaunch, onNavigationBarButtonTap, onPageScroll } from "@dcloudio/uni-app";
+import { ref, reactive, computed, getCurrentInstance, toRefs, inject } from "vue";
+import { publicStores, useStores } from "@/store/modules/index";
+
+import { infoList } from "@/api/common/applicationInfo.js";
+
+const useStore = useStores();
+
+const { proxy } = getCurrentInstance();
+
+const data = reactive({
+  scrollIntoView: "",
+
+  tabsList: [
+    {
+      name: "全部",
+    },
+    {
+      name: "通知公告",
+    },
+  ],
+  tabsCurrent: 0,
+
+  allInfoList: [],
+  noticeList: [],
+});
+
+const { scrollIntoView, scrollIntoViewBool, tabsList, tabsCurrent, allInfoList, noticeList } = toRefs(data);
+
+/**
+ * @初始化
+ */
+function init() {
+  infoListApi();
+}
+
+/**
+ * @tabs点击事件
+ */
+function tabsClick(e) {
+  tabsCurrent.value = e.index;
+}
+
+/**
+ * @跳转
+ */
+function goContentDetails(e) {
+  if (e.type == "通知公告") {
+    proxy.$tab.navigateTo(`/pages/common/textview/index1?title=${e.typeTitle}&content=${e.listContent}&contentTitle=${e.listTitle}`);
+  }
+}
+
+/**
+ * @通知公告列表
+ * @api接口调用
+ */
+function infoListApi() {
+  proxy.$modal.loading("加载中");
+  infoList({
+    pageNum: 1,
+    pageSize: 20000,
+  }).then((requset) => {
+    if (requset.status === "SUCCESS") {
+      requset.data.rows.forEach((el) => {
+        allInfoList.value.push({
+          type: "通知公告",
+          typeTitle: el.noticeType === "1" ? "系统通知" : el.noticeType === "2" ? "系统公告" : "系统消息",
+          listTime: proxy.$common.jktTimes(el.createTime),
+          listCreateTime: el.createTime,
+          listTitle: el.noticeTitle,
+          listContent: el.noticeContent,
+        });
+
+        noticeList.value.push({
+          type: "通知公告",
+          typeTitle: el.noticeType === "1" ? "系统通知" : el.noticeType === "2" ? "系统公告" : "系统消息",
+          listTime: proxy.$common.jktTimes(el.createTime),
+          listCreateTime: proxy.$common.jktTimes(el.createTime),
+          listTitle: el.noticeTitle,
+          listContent: el.noticeContent,
+        });
+      });
+
+      setTimeout(() => {
+        scrollIntoView.value = "bottomInfo";
+      }, 0);
+
+      setTimeout(() => {
+        proxy.$modal.closeLoading();
+      }, 100);
+    }
+  });
+}
+
+onLoad((options) => {
+  init();
+});
+
+onReady(() => {});
+
+onShow(() => {
+  //调用系统主题颜色
+  proxy.$settingStore.systemThemeColor([1]);
+});
+
+// 自定义导航事件
+onNavigationBarButtonTap((e) => {
+  if (e.float == "right") {
+    proxy.$tab.navigateTo("/pages/mine/setting/index");
+  }
+});
+</script>
+
+<style lang="scss" scoped>
+:deep(.uni-page-head__title) {
+  opacity: 1 !important;
+}
+
+.applicationInfo-container {
+  padding-bottom: 1px;
+
+  .content-area {
+    &-time {
+      padding: 10px 0;
+      text-align: center;
+      color: #909399;
+    }
+
+    &-center {
+      margin: 0 10px 20px 10px;
+      padding: 15px;
+
+      &-title {
+        margin: 0 0 15px 0;
+        color: #909399;
+      }
+
+      &-cont {
+        font-weight: 600;
+      }
+    }
+  }
+}
+</style>

src/pages/common/invoicing/index.vue

@@ -161,7 +161,7 @@ import { onLoad, onShow, onReady, onHide, onLaunch, onNavigationBarButtonTap, on
 import { ref, reactive, computed, getCurrentInstance, toRefs, inject } from "vue";
 import { publicStores, useStores } from "@/store/modules/index";
 
-import { crmInvoiceInfo, page } from "@/api/common/invoicing/index";
+import { crmInvoiceInfo, page } from "@/api/common/invoicing.js";
 
 const { proxy } = getCurrentInstance();
 const publicStore = publicStores();

src/pages/common/loginLog/index.vue

@@ -0,0 +1,139 @@
+<template>
+  <scroll-view class="scroll-height" :scroll-y="true" :data-theme="'theme-' + proxy.$settingStore.themeColor.name" @scrolltolower="scrolltolower">
+    <view class="loginLog-container">
+      <u-empty v-show="dataList.length <= 0" text="暂无数据" mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png"> </u-empty>
+      <view class="container-area" v-show="dataList.length > 0">
+        <view class="container-area-content" v-for="data in dataList" :key="data">
+          <view class="container-area-content-img">
+            <image style="width: 35px; height: 35px" :src="'/static/images/404.png'" mode="aspectFill"></image>
+          </view>
+          <view class="container-area-content-center">
+            <view
+              :style="{
+                fontSize: '15px',
+                color: data.status == '0' ? '#16bf00' : 'red',
+              }"
+              >{{ data.status == "0" ? "登录成功" : "登录失败" }}</view
+            >
+            <view>登陆时间：{{ data.accessTime }}</view>
+            <view>访问IP：{{ data.ipaddr }}</view>
+            <view>登录地址：未知</view>
+            <view>登录方式：未知</view>
+            <view>系统型号：未知</view>
+            <view v-if="data.status == '1'">登录失败原因：{{ data.msg }}</view>
+          </view>
+        </view>
+
+        <u-loadmore :status="status" @click="scrolltolower" />
+      </view>
+    </view>
+  </scroll-view>
+</template>
+
+<script setup>
+import { onLoad, onShow, onReady, onHide, onLaunch, onNavigationBarButtonTap, onPageScroll } from "@dcloudio/uni-app";
+import { ref, reactive, computed, getCurrentInstance, toRefs, inject } from "vue";
+import { publicStores, useStores } from "@/store/modules/index";
+
+import { loginLogList } from "@/api/common/loginLog.js";
+
+const useStore = useStores();
+
+const { proxy } = getCurrentInstance();
+
+const dataList = ref([]);
+const status = ref("loadmore");
+const pageSize = ref(20);
+const current = ref(1);
+const total = ref(0);
+
+/**
+ * @初始化
+ */
+function init() {
+  selectListApi();
+}
+
+/**
+ * @通知公告列表
+ * @api接口调用
+ */
+function selectListApi() {
+  loginLogList({
+    pageNum: current.value,
+    pageSize: pageSize.value,
+    userName: "admin",
+  }).then((requset) => {
+    if (requset.status === "SUCCESS") {
+      dataList.value = requset.data.rows;
+      total.value = requset.data.total;
+
+      if (total.value == dataList.value.length) {
+        status.value = "nomore";
+      }
+    }
+  });
+}
+
+/**
+ * @scrollView触底事件
+ */
+function scrolltolower(e) {
+  if (total.value == dataList.value.length) {
+    status.value = "nomore";
+    return;
+  } else {
+    status.value = "loading";
+    pageSize.value += 10;
+    setTimeout(() => {
+      selectListApi();
+    }, 1000);
+  }
+}
+
+onLoad((options) => {
+  init();
+});
+
+onReady(() => {});
+
+onShow(() => {
+  //调用系统主题颜色
+  proxy.$settingStore.systemThemeColor([1]);
+});
+
+// 自定义导航事件
+onNavigationBarButtonTap((e) => {
+  if (e.float == "right") {
+    proxy.$tab.navigateTo("/pages/mine/setting/index");
+  }
+});
+</script>
+
+<style lang="scss" scoped>
+:deep(.uni-page-head__title) {
+  opacity: 1 !important;
+}
+
+.loginLog-container {
+  padding-bottom: 1px;
+
+  .container-area {
+    &-content {
+      display: flex;
+      border-bottom: 1px solid #909399;
+
+      &-img {
+        margin: auto 15px auto 15px;
+      }
+
+      &-center {
+        width: 100%;
+        font-size: 13px;
+        color: #909399;
+        padding: 15px 0 15px 0;
+      }
+    }
+  }
+}
+</style>

src/pages/common/success/index.vue

@@ -25,7 +25,7 @@ const publicStore = publicStores();
 const { proxy } = getCurrentInstance();
 
 /**
- * @跳转登录
+ * @返回上一级
  */
 function navigateTo() {
   proxy.$tab.navigateBack(1);

src/pages/common/textview/index1.vue

@@ -1,6 +1,8 @@
 <template>
   <view class="view-text">
-    <u-parse class="uni-body view-content" :content="content"></u-parse>
+    <!-- <u-parse class="uni-body view-content" :content="content"></u-parse> -->
+    <h3 style="text-align: center; line-height: 45px">{{ contentTitle }}</h3>
+    <view>{{ content }}</view>
   </view>
 </template>
 
@@ -16,13 +18,15 @@ const { proxy } = getCurrentInstance();
 const data = reactive({
   title: "",
   content: "",
+  contentTitle: "",
 });
 
-const { title, content } = toRefs(data);
+const { title, content, contentTitle } = toRefs(data);
 
 onLoad((options) => {
   title.value = options.title;
   content.value = options.content;
+  contentTitle.value = options.contentTitle;
   uni.setNavigationBarTitle({
     title: options.title,
   });

src/pages/info.vue

@@ -29,6 +29,26 @@
       </view>
     </view> -->
 
+    <view class="uni-content-body">
+      <view class="uni-list padding" @tap="goApplicationInfo()">
+        <view class="uni-avatar">
+          <image class="image-bg" src="@/static/images/common/applicationInfo.png" />
+        </view>
+        <view class="uni-content">
+          <view class="uni-item">
+            <view class="uni-item-cont text-dfl" style="color: #000000">应用消息</view>
+            <!-- <view class="uni-item-right text-sm" style="color: #909399">5月15日</view> -->
+          </view>
+          <view class="flex uni-item">
+            <view class="uni-item-cont text-df" style="color: #909399">您收到一条最新消息，请及时查看</view>
+            <!-- <view class="uni-item-right text-df" style="margin: auto 0">
+              <u-badge numberType="overflow" max="99" :value="1"></u-badge>
+            </view> -->
+          </view>
+        </view>
+      </view>
+    </view>
+
     <view class="uni-content-body">
       <view class="uni-list padding" @tap="goFireBase()">
         <view class="uni-avatar">
@@ -68,6 +88,10 @@ const data = reactive({
 
 const { indexBackgroundImage } = toRefs(data);
 
+function goApplicationInfo() {
+  proxy.$tab.navigateTo("/pages/common/applicationInfo/index");
+}
+
 function goFireBase() {
   proxy.$tab.navigateTo("/pages/info/fireBase/fireBase");
 }

src/pages/mine/secure/index.vue

@@ -40,6 +40,11 @@
       </view>
 
       <view class="menu-list margin-t-0 margin-lr-0">
+        <view class="list-cell list-cell-arrow" @click=" proxy.$tab.navigateTo(`/pages/common/loginLog/index`)">
+          <view class="menu-item-box">
+            <view class="title">登录日志</view>
+          </view>
+        </view>
         <view class="list-cell list-cell-arrow" @click="proxy.$modal.showToast('模块建设中~')">
           <view class="menu-item-box">
             <view class="title">常用设备管理</view>

src/plugins/common.plugins.js

@@ -71,5 +71,30 @@ export default {
     }
     textarea.remove()
     // #endif
+  },
+
+  /**
+   * @param {时间处理(今日,昨日)} 
+   * @param {传入值} time 
+   * @returns 
+   */
+  jktTimes(time) {
+    if (time == undefined) return "";
+    var today = new Date().getDate();//当前时间-日
+    var day = new Date(time).getDate();//传入时间-日
+
+    var newday = today - day
+    if (newday == 0) {
+      var newTime = time.split(" ")[1]
+      var newTime2 = newTime.split(":")
+      return "今天" + newTime2[0] + ":" + newTime2[1];
+    } else if (newday == 1) {
+      var newTime = time.split(" ")[1]
+      var newTime2 = newTime.split(":")
+      return "昨天" + newTime2[0] + ":" + newTime2[1];
+    } else {
+      var newTime = time.split(" ")[0]
+      return newTime
+    }
   }
 };

src/static/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 3620854 */
-  src: url('https://at.alicdn.com/t/c/font_3620854_xb9fkqucr3.woff2?t=1688535027394') format('woff2'),
-       url('https://at.alicdn.com/t/c/font_3620854_xb9fkqucr3.woff?t=1688535027394') format('woff'),
-       url('https://at.alicdn.com/t/c/font_3620854_xb9fkqucr3.ttf?t=1688535027394') format('truetype');
+  src: url('https://at.alicdn.com/t/c/font_3620854_kj985d7f2u.woff2?t=1689669584145') format('woff2'),
+       url('https://at.alicdn.com/t/c/font_3620854_kj985d7f2u.woff?t=1689669584145') format('woff'),
+       url('https://at.alicdn.com/t/c/font_3620854_kj985d7f2u.ttf?t=1689669584145') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.ucicon-app-map:before {
+  content: "\e60a";
+}
+
 .ucicon-chenggong:before {
   content: "\e609";
 }
@@ -153,7 +157,7 @@
   content: "\e66d";
 }
 
-.ucicon-xingzhuang14kaobei2:before {
+.ucicon-shangchuan:before {
   content: "\e66e";
 }