我的会议功能模块完成/优化会议系统模块功能/完成门禁系统对接

src/api/business/meeting.js

@@ -249,7 +249,7 @@ export function signOnOut(data) {
 //门禁开门
 export function control(data) {
     return request({
-        url: `/service-meeting/meetingRoom/502_KAT/223212768/control`,
+        url: `/service-iot/deviceHttp/control`,
         method: 'GET',
         params: data
     })

src/pages.json

@@ -752,9 +752,15 @@
                             "titleNView": false
                         }
                     }
-                },
+                }
+            ]
+        },
+        {
+            "name": "会议预约系统",
+            "root": "pages/business/meeting/",
+            "pages": [
                 {
-                    "path": "meeting/index",
+                    "path": "index",
                     "style": {
                         "navigationBarTitleText": "会议预约",
                         "enablePullDownRefresh": false,
@@ -766,7 +772,7 @@
                     }
                 },
                 {
-                    "path": "meeting/new/index",
+                    "path": "new/index",
                     "style": {
                         "navigationBarTitleText": "新建日程",
                         "enablePullDownRefresh": false,
@@ -778,7 +784,7 @@
                     }
                 },
                 {
-                    "path": "meeting/detailed/index",
+                    "path": "detailed/index",
                     "style": {
                         "navigationBarTitleText": "会议详情",
                         "enablePullDownRefresh": false,
@@ -788,6 +794,18 @@
                             "titleNView": false
                         }
                     }
+                },
+                {
+                    "path": "my/index",
+                    "style": {
+                        "navigationBarTitleText": "我的会议",
+                        "enablePullDownRefresh": false,
+                        "navigationStyle": "custom",
+                        "app-plus": {
+                            "bounce": "none",
+                            "titleNView": false
+                        }
+                    }
                 }
             ]
         }

src/pages/business/common/projectMange/write/insert.vue

@@ -109,7 +109,7 @@ function handleSubmit(type, id) {
           ccTo: newData.ccTo,
           reportImage: newData.reportImage,
           reportFile: newData.reportFile,
-          timingTime:newData.timingTime? proxy.$time.getFormatterDate(new Date().getTime()).slice(0,10)+' '+ newData.timingTime.slice(11,20):newData.timingTime,
+          timingTime: newData.timingTime ? proxy.$time.getFormatterDate(new Date().getTime()).slice(0, 10) + " " + newData.timingTime.slice(11, 20) : newData.timingTime,
           isRegularlySend: newData.isRegularlySend,
         };
 

src/pages/business/meeting/components/switchSlot.vue

@@ -0,0 +1,71 @@
+<template>
+  <view class="flex plr10" style="min-height: 50px; line-height: 20px">
+    <view class="flex mtb-auto ptb10 nav" v-for="item in formData" :key="item" @click="itemClick(item.event)" style="overflow-x: auto">
+      <view
+        class="radius p5 mr10"
+        :style="{
+          color: form[item.prop] ? activeColor : disabledColor,
+          backgroundColor: `${form[item.prop] ? activeColor : disabledColor}30`,
+        }"
+      >
+        <span v-if="item.type == 'date'">
+          {{ proxy.$dayjs(form[item.prop]).format("MM月DD日") }}
+          {{ weekData[proxy.$dayjs(form[item.prop]).format("d")] }}
+        </span>
+        <span class="flex" v-else>
+          <span class="mr5">{{ form[item.prop] || item.label }}</span>
+          <u-icon name="arrow-down" :color="disabledColor" size="12"> </u-icon>
+        </span>
+      </view>
+    </view>
+    <view class="ml-auto mtb-auto pl10 nav" @click="resetClick" :style="{ color: activeColor }">重置</view>
+  </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";
+/*----------------------------------接口引入-----------------------------------*/
+/*----------------------------------组件引入-----------------------------------*/
+/*----------------------------------store引入-----------------------------------*/
+import { useStores, commonStores } from "@/store/modules/index";
+/*----------------------------------公共方法引入-----------------------------------*/
+/*----------------------------------公共变量-----------------------------------*/
+const { proxy } = getCurrentInstance();
+const commonStore = commonStores();
+/*----------------------------------变量声明-----------------------------------*/
+const emit = defineEmits(["onClick", "resetClick"]);
+const props = defineProps({
+  form: {
+    type: Object,
+    default: {},
+  },
+  formData: {
+    type: Object,
+    default: [],
+  },
+  weekData: {
+    type: Object,
+    default: ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"],
+  },
+  activeColor: {
+    type: String,
+    default: "",
+  },
+  disabledColor: {
+    type: String,
+    default: "",
+  },
+});
+
+const { form, formData, weekData, activeColor, disabledColor } = toRefs(props);
+
+function itemClick(event) {
+  emit("onClick", ...event);
+}
+
+function resetClick() {
+  emit("resetClick");
+}
+</script>
+<style lang="scss" scoped></style>

src/pages/business/common/meeting/index.vue → src/pages/business/meeting/index.vue

@@ -8,7 +8,7 @@
       </template>
       <template #right>
         <view class="u-navbar__content__right__item">
-          <u-icon name="more-dot-fill" size="19" color="#000"></u-icon>
+          <u-icon name="more-dot-fill" size="19" color="#000" @click="sheet1.show = true"></u-icon>
         </view>
       </template>
     </u-navbar>
@@ -26,21 +26,7 @@
       ></u--input>
     </view>
 
-    <view class="flex plr10" style="line-height: 20px">
-      <view class="flex mtb-auto ptb10 nav" style="overflow-x: auto" @click="handlePopup(true, 'switchTime', {})">
-        <view
-          class="radius p5 mr10"
-          :style="{
-            color: proxy.$settingStore.themeColor.color,
-            backgroundColor: `${proxy.$settingStore.themeColor.color}30`,
-          }"
-        >
-          {{ proxy.$dayjs(form.date).format("MM月DD日") }}
-          {{ weekData[proxy.$dayjs(form.date).format("d")] }}
-        </view>
-      </view>
-      <view class="ml-auto mtb-auto pl10 nav" :style="{ color: proxy.$settingStore.themeColor.color }">重置</view>
-    </view>
+    <switchSlot :form="form" :form-data="formData" :activeColor="proxy.$settingStore.themeColor.color" disabledColor="#999999" @onClick="handlePopup" @resetClick="resetSwitch"></switchSlot>
   </u-sticky>
 
   <oa-scroll
@@ -101,7 +87,6 @@
             <u-icon name="info-circle" size="16" label="更多" labelSize="14" labelColor="#333" color="#333"></u-icon>
           </view>
         </view>
-
         <u-gap height="10" bgColor="#f5f6f7"></u-gap>
         <u-checkbox-group v-model="checkboxValue" placement="column" shape="circle" :borderBottom="true" @change="checkboxChange" style="height: 42vh; overflow: auto">
           <view v-for="(item, index) in checkboxList" :key="index">
@@ -119,9 +104,7 @@
             </u-checkbox>
           </view>
         </u-checkbox-group>
-
         <u-gap height="10" bgColor="#f5f6f7"></u-gap>
-
         <view class="p10" style="overflow: hidden">
           <u-button type="primary" @click="handleSubmit('下一步')" text="下一步" style="width: 100px; float: right"></u-button>
         </view>
@@ -140,6 +123,18 @@
     @close="sheet.show = false"
     @select="handleSheet"
   ></u-action-sheet>
+
+  <u-action-sheet
+    :actions="sheet1.actions"
+    :show="sheet1.show"
+    cancelText="取消"
+    :round="10"
+    :wrapMaxHeight="'50vh'"
+    :closeOnClickOverlay="true"
+    :safeAreaInsetBottom="true"
+    @close="sheet1.show = false"
+    @select="handleSheet"
+  ></u-action-sheet>
 </template>
 
 <script setup>
@@ -150,10 +145,10 @@ import { ref, reactive, computed, getCurrentInstance, toRefs, inject } from "vue
 import { MeetingRoomList, MeetingRoomReservationList, control } from "@/api/business/meeting.js";
 /*----------------------------------组件引入-----------------------------------*/
 import timeSlot from "./components/timeSlot.vue";
+import switchSlot from "./components/switchSlot.vue";
 /*----------------------------------store引入-----------------------------------*/
 import { useStores, systemStores } from "@/store/modules/index";
 /*----------------------------------公共方法引入-----------------------------------*/
-import { storageSystem } from "@/utils/storage"; // 公共方法引用
 /*----------------------------------公共变量-----------------------------------*/
 const { proxy } = getCurrentInstance();
 const useStore = useStores();
@@ -168,6 +163,20 @@ const state = reactive({
     date: proxy.$dayjs().format("YYYY-MM-DD"),
     meetingRoomName: "",
   },
+  formData: [
+    {
+      type: "date",
+      prop: "date",
+      label: "",
+      event: [true, "switchTime", {}],
+    },
+    {
+      type: "text",
+      prop: "meetingRoomName",
+      label: "会议室名称",
+      event: [],
+    },
+  ],
   popup: {
     show: false,
     type: "",
@@ -177,11 +186,6 @@ const state = reactive({
     show: false,
     title: "",
     actions: [
-      {
-        name: "更多",
-        fontSize: "16",
-        disabled: true,
-      },
       {
         name: "门禁开门",
         fontSize: "16",
@@ -194,12 +198,22 @@ const state = reactive({
       },
     ],
   },
-  weekData: ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"],
+  sheet1: {
+    show: false,
+    title: "",
+    actions: [
+      {
+        name: "我的会议",
+        fontSize: "16",
+        type: "meeting-my",
+      },
+    ],
+  },
   checkboxValue: [],
   checkboxList: [],
 });
 
-const { loading, dataList, pageSize, total, form, popup, sheet, weekData, checkboxValue, checkboxList } = toRefs(state);
+const { loading, dataList, pageSize, total, form, formData, popup, sheet, sheet1, checkboxValue, checkboxList } = toRefs(state);
 
 /** 初始化 */
 function init() {
@@ -307,18 +321,10 @@ function handleSubmit() {
     meetingFileList: [], //会议文件信息
   };
 
-  proxy.$tab.navigateTo(`/pages/business/common/meeting/new/index`);
+  proxy.$tab.navigateTo(`/pages/business/meeting/new/index`);
   state.popup.show = false;
 }
 
-/** 实时保存填写数据 */
-function realTimeSaving() {
-  if (!state.form.id) {
-    state.saveTime = proxy.$time.formatterDate(new Date(), "hh:mm");
-    storageSystem.set("project", state);
-  }
-}
-
 /** 日历日期改变事件 */
 function calendarChange(e) {
   state.form.date = e.fulldate;
@@ -333,9 +339,11 @@ function calendarMonthSwitch(e) {
 /** 操作菜单 */
 function handleSheet(e) {
   if (e.type == "meeting-details") {
-    proxy.$tab.navigateTo(`/pages/business/common/meeting/detailed/index?roomId=${state.popup.list.roomId}`).then(() => {});
+    proxy.$tab.navigateTo(`/pages/business/meeting/detailed/index?roomId=${state.popup.list.roomId}`).then(() => {});
   } else if (e.type == "meeting-room") {
     openDoor();
+  } else if (e.type == "meeting-my") {
+    proxy.$tab.navigateTo(`/pages/business/meeting/my/index`).then(() => {});
   }
 }
 
@@ -377,6 +385,11 @@ function handlePopup(show, type, list) {
   }
 }
 
+/** 重置选项卡 */
+function resetSwitch() {
+  state.form.date = proxy.$dayjs().format("YYYY-MM-DD");
+}
+
 /**
  * @scrollView刷新数据
  */

src/pages/business/meeting/my/index.vue

@@ -0,0 +1,294 @@
+<template>
+  <u-sticky class="shadow-default" bgColor="#fff" style="top: 0">
+    <u-navbar :titleStyle="{ color: '#000' }" :autoBack="true" title="我的会议" :placeholder="true" :safeAreaInsetTop="true" bgColor="#fff">
+      <template #left>
+        <view class="u-navbar__content__left__item">
+          <u-icon name="arrow-left" size="20" color="#000"></u-icon>
+        </view>
+      </template>
+    </u-navbar>
+    <switchSlot :form="form" :form-data="formData" :activeColor="proxy.$settingStore.themeColor.color" disabledColor="#999999" @onClick="handlePopup" @resetClick="resetSwitch"></switchSlot>
+  </u-sticky>
+
+  <oa-scroll
+    customClass="record-container scroll-height"
+    :pageSize="pageSize"
+    :total="total"
+    :isSticky="true"
+    :customStyle="{
+      //#ifdef APP-PLUS || MP-WEIXIN
+      height: `calc(100vh - (88px + ${proxy.$settingStore.StatusBarHeight}))`,
+      //#endif
+      //#ifdef H5
+      height: `calc(100vh - (88px))`,
+      //#endif
+    }"
+    :refresherLoad="true"
+    :refresherEnabled="true"
+    :refresherDefaultStyle="'none'"
+    :refresherThreshold="44"
+    :lowerThreshold="44"
+    :refresherBackground="'#f5f6f7'"
+    @load="load"
+    @refresh="refresh"
+    :data-theme="'theme-' + proxy.$settingStore.themeColor.name"
+  >
+    <template #default>
+      <u-loading-page :loading="state.loading" fontSize="16" style="z-index: 99"></u-loading-page>
+
+      <view class="content-area" v-for="(el, index) in reportListNewData" :key="index">
+        <view class="content-area-time font14" v-if="!el.id">{{ proxy.$time.jktTimes(el.submitDate, "否") }}</view>
+        <view class="content-area-center bg-white" v-else style="margin: 0 10px 10px; border-radius: 10px">
+          <view class="content-area-top menu-item" style="float: right; padding: 10px 0px">
+            <view class="content-area-top-time"> </view>
+            <u-icon class="content-area-top-icon" name="more-dot-fill" size="20" color="#000" @click="moreClick(el)"></u-icon>
+          </view>
+          <view class="flex mb10" @click="goContentDetails(el)">
+            <img :src="el.avatar" class="content-area-center-avatarImg mr10" v-if="el.avatar" />
+            <u-avatar
+              v-if="!el.avatar"
+              class="content-area-center-avatar mr10"
+              :text="el.createBy.length > 2 ? el.createBy.slice(1, 3) : el.createBy"
+              shape="square"
+              size="35"
+              fontSize="10"
+              color="#ffffff"
+              :bgColor="proxy.$settingStore.themeColor.color"
+            ></u-avatar>
+            <view>
+              <view class="content-area-center-title font14 mb5">{{ el.createBy }}的日报</view>
+              <view class="content-area-center-time font12">{{ proxy.$time.jktTimes(el.submitDate.replace("T", " ")) }}</view>
+            </view>
+          </view>
+          <view class="mb5" @click="goContentDetails(el)">
+            <u-text :text="el.contentText.length >= 100 ? el.contentText.slice(0, 100) + '···' : el.contentText" color="#666666" size="14"></u-text>
+          </view>
+          <view class="flex" v-if="el.createBy != useStore.nickName" @click="goContentDetails(el)">
+            <u-tag class="mr10" type="info" text="已读" size="mini" plain v-if="el.readFlag === 1" style="margin: 0 auto"></u-tag>
+            <u-tag class="mr10" type="error" text="未读" size="mini" plain v-if="el.readFlag === 0" style="margin: 0 auto"></u-tag>
+            <u-text text="全文" :color="proxy.$settingStore.themeColor.color" size="14"></u-text>
+          </view>
+        </view>
+      </view>
+    </template>
+  </oa-scroll>
+</template>
+
+<script setup>
+/*----------------------------------依赖引入-----------------------------------*/
+import { onLoad, onShow, onReady, onHide, onLaunch, onUnload, onNavigationBarButtonTap, onPageScroll } from "@dcloudio/uni-app";
+import { ref, reactive, computed, getCurrentInstance, toRefs, inject } from "vue";
+/*----------------------------------接口引入-----------------------------------*/
+import { projectApi } from "@/api/business/project.js";
+/*----------------------------------组件引入-----------------------------------*/
+import switchSlot from "../components/switchSlot.vue";
+/*----------------------------------store引入-----------------------------------*/
+import { useStores, commonStores } from "@/store/modules/index";
+/*----------------------------------公共方法引入-----------------------------------*/
+/*----------------------------------公共变量-----------------------------------*/
+const { proxy } = getCurrentInstance();
+const useStore = useStores();
+/*----------------------------------变量声明-----------------------------------*/
+const state = reactive({
+  tabsList: [
+    { name: "我收到的", value: 2 },
+    { name: "我发出的", value: 3 },
+    { name: "我负责的", value: 1 },
+  ],
+  tabsCurrent: 0,
+
+  loading: false,
+  reportListNewData: [],
+  pageSize: 20,
+  current: 1,
+  total: 0,
+  modalShow: false,
+  modalType: "",
+  modalEvent: {},
+
+  popup: {
+    show: false, //弹窗显示
+    content: "", //提示信息
+  },
+  modal: {
+    type: "", //操作类型
+    show: false, //弹窗显示
+    content: "", //提示信息
+  },
+  eventList: {}, //数据存储
+
+  reportData: {},
+  tip: {
+    type: undefined, //弹框类型
+    content: "", //提示信息
+    data: {}, //带入数据
+    operation: undefined, //操作类型
+  },
+  timedList: [],
+  tree: [],
+});
+
+const { tabsList, tabsCurrent, reportListNewData, pageSize, current, total, popup, eventList, modal, timedList, tree } = toRefs(state);
+
+/**
+ * @初始化
+ */
+function init() {
+  let arrayList = [];
+  projectApi()
+    .ReportRecord({
+      // startDate: "2024-07-10",
+      // endDate: "2024-07-10",
+      pageNum: state.current,
+      pageSize: state.pageSize,
+      projectAscription: state.tabsList[state.tabsCurrent].value,
+    })
+    .then((requset) => {
+      requset.data.records.forEach((el) => {
+        el.contentText = "";
+        el.workContents.forEach((cl) => {
+          el.contentText += `${cl.projectName} ${cl.workTime}h \n ${cl.workContent} \n`;
+        });
+      });
+      state.total = requset.data.total;
+      state.loading = false;
+
+      var reportListData = requset.data.records;
+      var groupBySubmitTime = reportListData.reduce((acc, current) => {
+        const existIndex = acc.findIndex((item) => item.submitDate.slice(0, 10) === current.submitDate.slice(0, 10));
+        if (existIndex === -1) {
+          acc.push({ submitDate: current.submitDate, items: [current] });
+        } else {
+          acc[existIndex].items.push(current);
+        }
+        return acc;
+      }, []);
+
+      groupBySubmitTime.forEach(function (item, index) {
+        item.items.unshift({ submitDate: item.submitDate });
+        item.items.forEach(function (aa) {
+          arrayList.push(aa);
+        });
+      });
+
+      state.reportListNewData = arrayList;
+    })
+    .catch((err) => {
+      state.loading = false;
+    });
+  projectApi()
+    .TimedReports({})
+    .then((requset) => {
+      state.timedList = requset.data;
+    })
+    .catch((err) => {});
+}
+
+/**
+ * @跳转详情
+ */
+function goContentDetails(e) {
+  if (state.tabsCurrent == 0 && e.readFlag != 1) {
+    projectApi()
+      .ReportRecordReadFlag({ reportId: e.id })
+      .then((res) => {
+        if (res.status == "SUCCESS") {
+          proxy.$tab.navigateTo(`/pages/business/common/projectMange/record/details?reportId=${e.id}`);
+        } else {
+          proxy.$modal.msgError("读取异常");
+        }
+      });
+  } else {
+    proxy.$tab.navigateTo(`/pages/business/common/projectMange/record/details?reportId=${e.id}`);
+  }
+}
+
+/**
+ * @scrollView加载数据
+ */
+function load() {
+  state.pageSize += 10;
+  init();
+}
+
+/**
+ * @scrollView刷新数据
+ */
+function refresh() {
+  state.pageSize = 20;
+  init();
+}
+
+/**
+ * @tabs点击事件
+ */
+function tabsClick(e) {
+  state.tabsCurrent = e.index;
+  init();
+}
+
+onReady(() => {});
+
+onShow(() => {
+  state.popup.show = false;
+  //调用系统主题颜色
+  proxy.$settingStore.systemThemeColor([1]);
+});
+
+onLoad((options) => {
+  init();
+  uni.$on("projectMange_record", function (value) {
+    init();
+  });
+});
+
+onUnload(() => {
+  uni.$off("projectMange_record"); //将值删除监听器
+});
+</script>
+
+<style lang="scss" scoped>
+.content-area {
+  &-time {
+    padding: 10px;
+    text-align: left;
+    color: #000000;
+    font-weight: 600;
+  }
+
+  &-center {
+    margin: 0;
+    padding: 15px;
+    overflow: hidden;
+    border-bottom: 1px solid #eaeef1;
+
+    &:last-child {
+      border-bottom: 0px solid #eaeef1;
+    }
+
+    &-avatar {
+      margin: auto 0;
+    }
+    &-avatarImg {
+      width: 35px;
+      height: 35px;
+      border-radius: 4px;
+    }
+
+    &-title {
+      margin: 0 0 15px 0;
+      font-weight: 600;
+      color: #000000;
+    }
+  }
+}
+
+.pp {
+  text-align: left;
+}
+</style>
+<style>
+.pp .u-modal__content {
+  justify-content: left !important;
+}
+</style>

src/pages/business/zhaf/xunJian/collect/index.vue

@@ -97,7 +97,10 @@ const xunJianStore = xunJianStores(); //全局变量值Store
  * @NFC
  */
 function nfcClick() {
-  proxy.$nfc.initNFC();
+  // proxy.$nfc.initNFC();
+  uni.navigateTo({
+    url: "/pages/common/nfc/index",
+  });
 }
 
 /**
@@ -231,7 +234,7 @@ onShow(() => {
     setTimeout(() => {
       proxy.$tab.navigateTo(`/pages/business/zhaf/xunJian/collect/components/collectDetail?siteNubmber=${value}&siteType=${2}`);
       uni.$off("NFC_readID"); //将值删除监听器
-    }, 0);
+    }, 100);
   });
 });
 

src/pages/business/zhaf/xunJian/plan/components/report.vue

@@ -112,7 +112,10 @@ function pulicClick(obj) {
  * @NFC
  */
 function nfcClick() {
-  proxy.$nfc.initNFC();
+  // proxy.$nfc.initNFC();
+  uni.navigateTo({
+    url: "/pages/common/nfc/index",
+  });
 }
 
 /**

src/pages/business/zhaf/xunJian/plan/index.vue

@@ -191,7 +191,10 @@ function reportClick(obj) {
  * @NFC
  */
 function nfcClick() {
-  proxy.$nfc.initNFC();
+  // proxy.$nfc.initNFC();
+  uni.navigateTo({
+    url: "/pages/common/nfc/index",
+  });
 }
 
 /**

src/pages/common/nfc/index.vue

@@ -15,8 +15,20 @@ import { ref, reactive, computed, getCurrentInstance, toRefs, inject, watch } fr
 const { proxy } = getCurrentInstance();
 
 onLoad((options) => {
+  // 开启nfc初始化
+  proxy.$nfc.initNFC();
   // 开启nfc监听
-  proxy.$nfc.readNFC();
+  proxy.$nfc.readNFC().then((event) => {
+    setTimeout(() => {
+      proxy.$tab.navigateBack(1); //返回上一级页面
+      uni.$emit("NFC_readID", event); //将值存储监听器
+    }, 1000);
+  });
+});
+
+onShow(() => {
+  //调用系统主题颜色
+  proxy.$settingStore.systemThemeColor([1]);
 });
 
 onUnload(() => {
@@ -24,11 +36,6 @@ onUnload(() => {
 });
 
 onReady(() => {});
-
-onShow(() => {
-  //调用系统主题颜色
-  proxy.$settingStore.systemThemeColor([1]);
-});
 </script>
 
 <style lang="scss" scoped>

src/pages/face/api.js

@@ -57,11 +57,26 @@ export function signOnOut(data) {
     })
 }
 
-//门禁开门
-export function control(data) {
-    return request({
-        url: `/service-meeting/meetingRoom/502_KAT/223212768/control`,
-        method: 'GET',
-        params: data
-    })
+/**
+ * 门禁接口集合
+ * @method doorControl 门禁开门
+ * @method doorList 门禁列表
+ */
+export function doorApi() {
+    return {
+        doorControl: (data) => {
+            return request({
+                url: `/service-iot/deviceHttp/control`,
+                method: 'GET',
+                data,
+            });
+        },
+        doorList: (data) => {
+            return request({
+                url: `/service-iot/dmpDeviceInfo/pageWhite`,
+                method: 'POST',
+                data,
+            });
+        },
+    };
 }

src/pages/face/index.vue

@@ -29,19 +29,35 @@
       </view>
       <view v-if="meetingRoomList.length > 0">
         <view class="mb10 required">绑定会议室</view>
-        <view>
+        <view class="mb20">
           <u-input
             v-model="form.meetingName"
             placeholder="会议室（必选）"
             suffixIcon="arrow-right"
             suffixIconStyle="color: #909399"
-            border="none"
+            border="bottom"
+            style="padding: 6px 0px"
             disabledColor="transparent"
             disabled
             @click="handlePicker('绑定会议室')"
           />
         </view>
       </view>
+      <view>
+        <view class="mb10 required">绑定门禁</view>
+        <view>
+          <u-input
+            v-model="form.doorName"
+            placeholder="门禁（必选）"
+            suffixIcon="arrow-right"
+            suffixIconStyle="color: #909399"
+            border="none"
+            disabledColor="transparent"
+            disabled
+            @click="handlePicker('绑定门禁')"
+          />
+        </view>
+      </view>
     </view>
   </u-modal>
 
@@ -64,7 +80,7 @@ import config from "@/config";
 import { onLoad, onShow, onReady, onHide, onLaunch, onUnload, onNavigationBarButtonTap, onPageScroll } from "@dcloudio/uni-app";
 import { ref, reactive, computed, getCurrentInstance, toRefs, inject, nextTick, watch } from "vue";
 /*----------------------------------接口引入-----------------------------------*/
-import { meetingApi, faceApi, signOnOut, control } from "./api.js";
+import { meetingApi, faceApi, signOnOut, doorApi } from "./api.js";
 /*----------------------------------组件引入-----------------------------------*/
 /*----------------------------------store引入-----------------------------------*/
 /*----------------------------------公共方法引入-----------------------------------*/
@@ -75,6 +91,7 @@ const state = reactive({
     width: "100%",
     height: "100%",
   },
+  meetingDoorList: [],
   meetingRoomList: [],
   meetingTimeList: [],
   meetingReservaList: {
@@ -100,6 +117,8 @@ const state = reactive({
     domain: undefined,
     meetingId: undefined,
     meetingName: undefined,
+    doorId: undefined,
+    doorName: undefined,
   },
   inter: {
     interMeeting: null,
@@ -109,13 +128,19 @@ const { webviewStyles, meetingRoomList, modal, picker, form, inter } = toRefs(st
 
 // 初始化
 function init() {
-  uni.chooseImage({
-    sourceType: ["camera"],
-    success(res) {
-      console.log(res);
-    },
+  //#ifdef APP-PLUS
+  proxy.$permission.getPermisson("camera").then((res) => {
+    if (res) {
+      handleChildren({
+        funcName: "开启摄像头",
+        data: {},
+      });
+    }
   });
 
+  initNfc();
+  //#endif
+
   var storage = uni.getStorageSync("storage_face");
   if (storage) {
     state.form.domain = storage.domain;
@@ -123,19 +148,32 @@ function init() {
     state.form.port = storage.port ? storage.port : "";
     state.form.meetingId = storage.meetingId || undefined;
     state.form.meetingName = storage.meetingName || undefined;
+    state.form.doorId = storage.doorId || undefined;
+    state.form.doorName = storage.doorName || undefined;
   }
 
-  getMeetingRoomList();
-  getMeetingRoomReservationList();
-  inter.interMeeting = setInterval(() => {
+  if (!inter.interMeeting) {
     getMeetingRoomReservationList();
-  }, 1000 * 5);
+    inter.interMeeting = setInterval(() => {
+      getMeetingRoomReservationList();
+    }, 1000 * 5);
+  }
+}
+
+// 初始化NFC开门
+function initNfc() {
+  proxy.$nfc.initNFC();
+  proxy.$nfc.readNFC().then((e) => {
+    openDoor();
+    initNfc();
+  });
 }
 
 /**
  * @会议室下拉列表
  */
 function getMeetingRoomList() {
+  state.meetingRoomList = [];
   meetingApi()
     .GetMeetingRoomList({
       domain: state.form.domain,
@@ -152,6 +190,31 @@ function getMeetingRoomList() {
     });
 }
 
+/**
+ * @门禁下拉列表
+ */
+function getdoorList() {
+  state.meetingDoorList = [];
+  doorApi()
+    .doorList({
+      current: 1, //页数
+      size: 2000, //条数
+      productCode: "502_KAT", //产品编码
+      deviceStatus: 2, //设备状态;1：在线，2：离线
+      domain: state.form.domain, //域名
+    })
+    .then((requset) => {
+      if (requset.data.records.length > 0) {
+        requset.data.records.forEach((e) => {
+          state.meetingDoorList.push({
+            value: e.deviceId,
+            name: e.deviceName,
+          });
+        });
+      }
+    });
+}
+
 /**
  * @会议室详情列表
  */
@@ -297,7 +360,7 @@ function faceVerify(imageBase) {
         if (state.meetingReservaList.thisVenueData.length > 0) {
           meetingVerify(item);
         } else {
-          openDoor();
+          openDoor(item);
         }
       } else {
         proxy.$modal.msg(item.data.msg);
@@ -309,25 +372,25 @@ function faceVerify(imageBase) {
 /**
  * @会议验证
  */
-function meetingVerify(item) {
+function meetingVerify(event) {
   meetingApi()
     .Attendee({
       domain: state.form.domain,
       meetingId: state.meetingReservaList.thisVenueData[0].meetingId,
-      userId: item.data.userId,
-      userName: item.data.faceName,
+      userId: event.data.userId,
+      userName: event.data.faceName,
     })
     .then((item1) => {
       if (item1.data.status == "1") {
         proxy.$modal.msg(item1.data.msg);
-        state.msg = `[${item.data.faceName}] ${item1.data.msg}`;
+        state.msg = `[${event.data.faceName}] ${item1.data.msg}`;
 
-        openDoor();
+        openDoor(event);
 
         signOnOut({
           domain: state.form.domain,
           meetingId: state.meetingReservaList.thisVenueData[0].meetingId,
-          userId: item.data.userId, //参会人Id
+          userId: event.data.userId, //参会人Id
           mothodType: 0, //签到签退类别(0.签到 1.签退)
           signType: 1, //签到签退方式(0.人工 1.人脸)
         }).then((item2) => {});
@@ -340,11 +403,17 @@ function meetingVerify(item) {
 /**
  * @门禁开门
  */
-function openDoor() {
-  control({
-    domain: state.form.domain,
-    commandStr: JSON.stringify({ method: "control", params: { device_id: "223212768", command: 2 } }),
-  })
+function openDoor(item) {
+  doorApi()
+    .doorControl({
+      domain: state.form.domain,
+      userId: item.data.userId || undefined,
+      userName: item.data.faceName || undefined,
+      productCode: "502_KAT",
+      deviceId: state.form.doorId,
+      commandCode: "door_onoff",
+      commandValue: 1,
+    })
     .then((item2) => {
       proxy.$modal.msg("开门成功");
     })
@@ -372,6 +441,11 @@ function modalConfirm() {
     return;
   }
 
+  if (!state.form.doorName) {
+    proxy.$modal.msg("请选择绑定门禁");
+    return;
+  }
+
   uni.setStorageSync("storage_face", state.form);
   state.modal.show = false;
   getMeetingRoomReservationList();
@@ -385,6 +459,10 @@ function handlePicker(value, index, ind) {
     state.picker.title = "绑定会议室";
     state.picker.list = [state.meetingRoomList];
     state.picker.defaultIndex = 0;
+  } else if (value == "绑定门禁") {
+    state.picker.title = "绑定门禁";
+    state.picker.list = [state.meetingDoorList];
+    state.picker.defaultIndex = 0;
   }
   state.picker.show = true;
 }
@@ -396,6 +474,9 @@ function pickerConfirm(e) {
   if (state.picker.title == "绑定会议室") {
     state.form.meetingId = e.value[0].value;
     state.form.meetingName = e.value[0].name;
+  } else if (state.picker.title == "绑定门禁") {
+    state.form.doorId = e.value[0].value;
+    state.form.doorName = e.value[0].name;
   }
   state.picker.show = false;
 }
@@ -415,7 +496,6 @@ function modalCancel() {
  */
 function analysisData(event) {
   if ("funcName" in event) {
-    console.log(event.funcName);
     if (event.funcName == "打开配置") {
       state.modal.show = true;
     } else if (event.funcName == "人脸识别") {
@@ -454,9 +534,13 @@ window.onmessage = function (event) {
 // #endif
 
 onLoad((options) => {
-  init();
+  setTimeout(() => {
+    init();
+  }, 500);
 });
 
+onShow(() => {});
+
 onUnload(() => {
   clearInterval(inter.interMeeting); //销毁之前定时器
 });
@@ -464,8 +548,6 @@ onUnload(() => {
 watch(
   () => [state.form.linkUrl, state.form.port],
   (val) => {
-    state.meetingRoomList = [];
-
     if (!state.form.linkUrl) {
       return;
     }
@@ -481,8 +563,10 @@ watch(
         domain += ":" + state.form.port;
       }
     }
+
     state.form.domain = domain;
     config.baseUrl = "http://" + state.form.domain + "/prod-api";
+    getdoorList();
     getMeetingRoomList();
   }
 );

src/plugins/index.js

@@ -7,6 +7,7 @@ import time from "./time.plugins.js";
 import constData from "./constData.plugins.js";
 import nfc from "./nfc.plugins.js";
 import keyListen from "./keyListen.plugins.js";
+import permission from "./permission.plugins.js";
 
 import config from "@/config"; // config
 import { useDict } from '@/utils/dict'
@@ -63,6 +64,8 @@ export default {
     // 公共物理按钮监听
     app.provide("$keyListen", keyListen);
     app.config.globalProperties.$keyListen = keyListen;
-
+    // App权限判断
+    app.provide("$permission", permission);
+    app.config.globalProperties.$permission = permission;
   },
 };

src/plugins/nfc.plugins.js

@@ -23,7 +23,7 @@ var techListsArray = [
 export default {
     initNFC() {
         if (uni.getSystemInfoSync().platform == "android") {
-            listenNFCStatus();
+            listenNFCStatus()
         }
 
         if (uni.getSystemInfoSync().platform == "ios") {
@@ -35,9 +35,18 @@ export default {
         }
     },
     readNFC(callback) {
-        if (uni.getSystemInfoSync().platform == "android") {
-            readData(callback);
-        }
+        return new Promise((resolve, reject) => {
+            if (uni.getSystemInfoSync().platform == "android") {
+                plus.globalEvent.addEventListener("newintent", function () {
+                    readyRead = true; //开启读
+                    plus.device.vibrate(500); //调用手机震动
+                    settingStores().nfcWaiting = '请将手机靠近NFC标签'
+                    handleNFCData().then((event) => {
+                        resolve(event)
+                    })
+                }, false);
+            }
+        })
     },
     closeNFC() {
         if (uni.getSystemInfoSync().platform == "android") {
@@ -72,10 +81,6 @@ function listenNFCStatus() {
             return;
         }
 
-        uni.navigateTo({
-            url: "/pages/common/nfc/index",
-        });
-
         var intent = new Intent(main, main.getClass());
         intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
         var pendingIntent = PendingIntent.getActivity(main, 0, intent, 0);
@@ -83,14 +88,6 @@ function listenNFCStatus() {
         ndef.addDataType("*/*");
         var intentFiltersArray = [ndef];
 
-        plus.globalEvent.addEventListener(
-            "newintent",
-            function () {
-                plus.device.vibrate(500);//调用手机震动
-                setTimeout(handleNFCData, 1000);// 轮询调用 NFC
-            },
-            false
-        );
         plus.globalEvent.addEventListener(
             "pause",
             function (e) {
@@ -120,23 +117,23 @@ function listenNFCStatus() {
 }
 
 function handleNFCData() {
-    NdefRecord = plus.android.importClass("android.nfc.NdefRecord");
-    NdefMessage = plus.android.importClass("android.nfc.NdefMessage");
-    var main = plus.android.runtimeMainActivity();
-    var intent = main.getIntent();
-    if ("android.nfc.action.TECH_DISCOVERED" == intent.getAction()) {
-        if (readyWriteData) {
-            //__write(intent);
-            readyWriteData = false;
-        } else if (readyRead) {
-            __read(intent);
-            readyRead = false;
+    return new Promise((resolve, reject) => {
+        NdefRecord = plus.android.importClass("android.nfc.NdefRecord");
+        NdefMessage = plus.android.importClass("android.nfc.NdefMessage");
+        var main = plus.android.runtimeMainActivity();
+        var intent = main.getIntent();
+        if ("android.nfc.action.TECH_DISCOVERED" == intent.getAction()) {
+            if (readyWriteData) {
+                //__write(intent);
+                readyWriteData = false;
+            } else if (readyRead) {
+                __read(intent).then((event) => {
+                    resolve(event)
+                });
+                readyRead = false;
+            }
         }
-    }
-}
-
-function showToast(msg) {
-    plus.nativeUI.toast(msg);
+    })
 }
 
 /**
@@ -209,28 +206,31 @@ function __write(intent) {
  * @returns
  */
 function __read(intent) {
-    try {
-        settingStores().nfcWaiting = '请勿移开标签\n正在读取数据...'
-        // waiting.setTitle("请勿移开标签\n正在读取数据...");
-        var tag = plus.android.importClass("android.nfc.Tag");
-        tag = intent.getParcelableExtra(NfcAdapter.EXTRA_TAG);
-        var bytesId = intent.getByteArrayExtra(NfcAdapter.EXTRA_ID);
-        // waiting.close();
-        var tagid = bytesToHexString(tag.getId());
+    return new Promise((resolve, reject) => {
+        try {
+            settingStores().nfcWaiting = '请勿移开标签\n正在读取数据...'
+            // waiting.setTitle("请勿移开标签\n正在读取数据...");
+            var tag = plus.android.importClass("android.nfc.Tag");
+            tag = intent.getParcelableExtra(NfcAdapter.EXTRA_TAG);
+            var bytesId = intent.getByteArrayExtra(NfcAdapter.EXTRA_ID);
+            // waiting.close();
+            var tagid = bytesToHexString(tag.getId());
 
-        setTimeout(() => {
-            uni.$emit("NFC_readID", tagid); //将值存储监听器
-            tab.navigateBack(1); //返回上一级页面
-            closeReadAndWrite();
-        }, 1000);
-    } catch (e) {
-        uni.showToast({
-            title: e,
-            icon: "none",
-        });
-    }
+            resolve(tagid)
+        } catch (e) {
+            uni.showToast({
+                title: e,
+                icon: "none",
+            });
+        }
+    })
 }
 
+/**
+ * @十六进制转换
+ * @param { 值 } inarray 
+ * @returns 
+ */
 function bytesToHexString(inarray) {
     var i, j, x;
     var hex = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C", "D", "E", "F"];
@@ -281,14 +281,13 @@ function writeData() {
     // waiting = plus.nativeUI.showWaiting("请将手机靠近NFC标签！");
 }
 
-function readData() {
-    readyRead = true;
-    settingStores().nfcWaiting = '请将手机靠近NFC标签'
-    // waiting = plus.nativeUI.showWaiting("请将手机靠近NFC标签！", {
-    //     modal: false,
-    // });
+function showToast(msg) {
+    plus.nativeUI.toast(msg);
 }
 
+/**
+ * @关闭NFC
+ */
 function closeReadAndWrite() {
     readyWriteData = false;
     readyRead = false;

src/plugins/permission.plugins.js

@@ -0,0 +1,238 @@
+let isIos = false;
+
+// #ifdef APP-PLUS
+isIos = (plus.os.name === 'iOS')
+// #endif
+
+// 判断安卓主方法
+function requestAndroidPermission(permissionID, ifRequest) {
+	return new Promise((resolve, reject) => {
+		plus.android.requestPermissions([permissionID], onSuccess, onError)
+		function onSuccess(res) {
+			const grantedList = res.granted
+			const deniedList = res.deniedPresent
+			const deniedAlwaysList = res.deniedAlways
+			if (grantedList.includes(permissionID)) {
+				resolve(true)
+			} else {
+				resolve(false)
+				ifRequest && gotoAppPermissionSetting()
+			}
+		}
+		function onError(err) {
+			reject(err)
+		}
+	})
+}
+
+// 分别判断Ios
+function judgeIosPermissionPush(ifRequest) {
+	return new Promise(resolve => {
+		var UIApplication = plus.ios.import("UIApplication");
+		var app = UIApplication.sharedApplication();
+		var enabledTypes = 0;
+		if (app.currentUserNotificationSettings) {
+			var settings = app.currentUserNotificationSettings();
+			enabledTypes = settings.plusGetAttribute("types");
+			if (enabledTypes == 0) {
+				ifRequest && gotoAppPermissionSetting()
+				resolve(false)
+			} else {
+				resolve(true)
+			}
+			plus.ios.deleteObject(settings);
+		} else {
+			enabledTypes = app.enabledRemoteNotificationTypes();
+			if (enabledTypes == 0) {
+				ifRequest && gotoAppPermissionSetting()
+				resolve(false)
+			} else {
+				resolve(true)
+			}
+		}
+		plus.ios.deleteObject(app);
+		plus.ios.deleteObject(UIApplication);
+	})
+}
+
+// 判断定位权限是否开启
+function judgeIosPermissionLocation(ifRequest) {
+	return new Promise(resolve => {
+		var cllocationManger = plus.ios.import("CLLocationManager");
+		var status = cllocationManger.authorizationStatus();
+		if (status == 2) {
+			ifRequest && gotoAppPermissionSetting()
+			resolve(false)
+		} else {
+			resolve(true)
+		}
+		plus.ios.deleteObject(cllocationManger);
+	})
+}
+
+// 判断麦克风权限是否开启
+function judgeIosPermissionRecord(ifRequest) {
+	return new Promise(resolve => {
+		var avaudiosession = plus.ios.import("AVAudioSession");
+		var avaudio = avaudiosession.sharedInstance();
+		var permissionStatus = avaudio.recordPermission();
+		if (permissionStatus == 1684369017 || permissionStatus == 1970168948) {
+			ifRequest && gotoAppPermissionSetting()
+			resolve(false)
+		} else {
+			resolve(true)
+		}
+		plus.ios.deleteObject(avaudiosession);
+	})
+}
+
+// 判断相机权限是否开启
+function judgeIosPermissionCamera(ifRequest) {
+	return new Promise(resolve => {
+		var AVCaptureDevice = plus.ios.import("AVCaptureDevice");
+		var authStatus = AVCaptureDevice.authorizationStatusForMediaType('vide');
+		if (authStatus == 3) {
+			resolve(true)
+		} else {
+			ifRequest && gotoAppPermissionSetting()
+			resolve(false)
+		}
+		plus.ios.deleteObject(AVCaptureDevice);
+	})
+}
+
+// 判断相册权限是否开启
+function judgeIosPermissionPhotoLibrary(ifRequest) {
+	return new Promise(resolve => {
+		var PHPhotoLibrary = plus.ios.import("PHPhotoLibrary");
+		var authStatus = PHPhotoLibrary.authorizationStatus();
+		if (authStatus == 3) {
+			resolve(true)
+		} else {
+			ifRequest && gotoAppPermissionSetting()
+			resolve(false)
+		}
+		plus.ios.deleteObject(PHPhotoLibrary);
+	})
+}
+
+// 判断通讯录权限是否开启
+function judgeIosPermissionContact(ifRequest) {
+	return new Promise(resolve => {
+		var CNContactStore = plus.ios.import("CNContactStore");
+		var cnAuthStatus = CNContactStore.authorizationStatusForEntityType(0);
+		if (cnAuthStatus == 3) {
+			resolve(true)
+		} else {
+			ifRequest && gotoAppPermissionSetting()
+			resolve(false)
+		}
+		plus.ios.deleteObject(CNContactStore);
+	})
+}
+
+// 判断所有权限
+function getPermisson(permisson, ifRequest = false) {
+	switch (permisson) {
+		case "location":
+			if (isIos) {
+				return judgeIosPermissionLocation(ifRequest)
+			} else {
+				return requestAndroidPermission("android.permission.ACCESS_FINE_LOCATION", ifRequest)
+			}
+			break;
+		case "camera":
+			if (isIos) {
+				return judgeIosPermissionCamera(ifRequest)
+			} else {
+				return requestAndroidPermission("android.permission.CAMERA", ifRequest)
+			}
+			break;
+		case "photo":
+			if (isIos) {
+				return judgeIosPermissionPhotoLibrary(ifRequest)
+			} else {
+				return requestAndroidPermission("android.permission.READ_EXTERNAL_STORAGE", ifRequest)
+			}
+			break;
+		case "record":
+			if (isIos) {
+				return judgeIosPermissionRecord(ifRequest)
+			} else {
+				return requestAndroidPermission("android.permission.RECORD_AUDIO", ifRequest)
+			}
+			break;
+		case "contact":
+			if (isIos) {
+				return judgeIosPermissionContact(ifRequest)
+			} else {
+				return requestAndroidPermission("android.permission.READ_CONTACTS", ifRequest)
+			}
+			break;
+		case "call":
+			if (isIos) {
+				return Promise.resolve(true)
+			} else {
+				return requestAndroidPermission("android.permission.CALL_PHONE", ifRequest)
+			}
+			break;
+		case "push":
+			if (isIos) {
+				return judgeIosPermissionPush(ifRequest)
+			} else {
+				return Promise.resolve(true)
+			}
+			break;
+		default:
+			break;
+	}
+}
+
+// 去设置
+function gotoAppPermissionSetting() {
+	if (isIos) {
+		var UIApplication = plus.ios.import("UIApplication");
+		var application2 = UIApplication.sharedApplication();
+		var NSURL2 = plus.ios.import("NSURL");
+		// var setting2 = NSURL2.URLWithString("prefs:root=LOCATION_SERVICES");		
+		var setting2 = NSURL2.URLWithString("app-settings:");
+		application2.openURL(setting2);
+
+		plus.ios.deleteObject(setting2);
+		plus.ios.deleteObject(NSURL2);
+		plus.ios.deleteObject(application2);
+	} else {
+		var Intent = plus.android.importClass("android.content.Intent");
+		var Settings = plus.android.importClass("android.provider.Settings");
+		var Uri = plus.android.importClass("android.net.Uri");
+		var mainActivity = plus.android.runtimeMainActivity();
+		var intent = new Intent();
+		intent.setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+		var uri = Uri.fromParts("package", mainActivity.getPackageName(), null);
+		intent.setData(uri);
+		mainActivity.startActivity(intent);
+	}
+}
+
+// 检查是否开启了定位
+function checkSystemEnableLocation() {
+	if (isIos) {
+		var result = false;
+		var cllocationManger = plus.ios.import("CLLocationManager");
+		var result = cllocationManger.locationServicesEnabled();
+		plus.ios.deleteObject(cllocationManger);
+		return result;
+	} else {
+		var context = plus.android.importClass("android.content.Context");
+		var locationManager = plus.android.importClass("android.location.LocationManager");
+		var main = plus.android.runtimeMainActivity();
+		var mainSvr = main.getSystemService(context.LOCATION_SERVICE);
+		var result = mainSvr.isProviderEnabled(locationManager.GPS_PROVIDER);
+		return result
+	}
+}
+
+export default {
+	getPermisson,
+	checkSystemEnableLocation
+}

src/static/face/index.html

@@ -134,6 +134,27 @@
             height: 240px;
         }
 
+        .specialEffects1,
+        .specialEffects2 {
+            width: 445px;
+            height: 330px;
+            position: absolute;
+            z-index: 2000 !important;
+            transform: translate(-50%, -50%);
+            top: 50%;
+            left: 50%;
+        }
+
+        .specialEffects1 {
+            background: url(img/face.gif) no-repeat;
+            background-size: 445px 330px;
+        }
+
+        .specialEffects2 {
+            background: url(img/face_detection.gif) no-repeat;
+            background-size: 445px 330px;
+        }
+
         .home-card-bottom {
             width: 100%;
             position: absolute;
@@ -214,6 +235,9 @@
             <div class="home-card-right-footer" id="home-card-right-footer">
                 <video id="video" width="320" height="240" preload autoplay loop muted></video>
                 <canvas id="canvas" width="320" height="240"></canvas>
+                <!--人脸特效区域-->
+                <div class="specialEffects1" v-if="state.faceImgState"></div>
+                <div class="specialEffects2" v-else></div>
             </div>
 
         </div>
@@ -233,13 +257,16 @@
             props: {},
             data() {
                 return {
+                    tracker: null,
+                    trackerTask: null,
                     state: {
                         dataAll: {},
                         thisVenueData: [],
                         thisVenueTime: {},
                         nextSceneData: [],
                         nextSceneTime: {},
-                        timeList: []
+                        timeList: [],
+                        faceImgState: true,
                     },
                     timeOutEvent: 0
                 };
@@ -258,17 +285,17 @@
                     canvas.style.transform = 'scaleX(-1)';//画布翻转(1.水平翻转-scaleX(-1) 2.垂直翻转-scaleY(-1))
                     var context = canvas.getContext('2d');
                     var time = 5000;
-                    var tracker = new tracking.ObjectTracker('face');
-                    tracker.setInitialScale(4); //设置识别的放大比例
-                    tracker.setStepSize(2);//设置步长
-                    tracker.setEdgesDensity(0.1);//边缘密度
+                    that.tracker = new tracking.ObjectTracker('face');
+                    that.tracker.setInitialScale(4); //设置识别的放大比例
+                    that.tracker.setStepSize(2);//设置步长
+                    that.tracker.setEdgesDensity(0.1);//边缘密度
                     //启动摄像头，并且识别视频内容
-                    var trackerTask = tracking.track('#video', tracker, {
+                    that.trackerTask = tracking.track('#video', that.tracker, {
                         camera: true
                     });
 
                     var flag = true;
-                    tracker.on('track', function (event) {
+                    that.tracker.on('track', function (event) {
                         if (event.data.length === 0) {
                             // console.log('未检测到人脸')
                             context.clearRect(0, 0, canvas.width, canvas.height);
@@ -284,12 +311,14 @@
                             });
                             if (flag) {
                                 console.log("拍照");
+                                that.state.faceImgState = false;
                                 context.drawImage(video, 0, 0, video.width, video.height);
                                 that.saveAsLocalImage();//调用获取图片bold
                                 context.clearRect(0, 0, canvas.width, canvas.height);
                                 flag = false;
                                 setTimeout(function () {
                                     flag = true;
+                                    that.state.faceImgState = true;
                                 }, time);
                             } else {
                                 //console.log("冷却中");
@@ -352,8 +381,8 @@
                             this.state.nextSceneTime = JSON.parse(event.data).nextSceneTime
                             this.state.timeList = JSON.parse(event.data).timeList
                             this.initData();
-                        } else if (event.funcName == "撒点") {
-
+                        } else if (event.funcName == "开启摄像头") {
+                            this.initVido();//调用初始化摄像头
                         }
                     }
                 },
@@ -361,6 +390,28 @@
                 longPress() {
                     this.parentMessage('打开配置')
                     this.timeOutEvent = 0
+                },
+                // 监听页面是否隐藏
+                handleVisibilityChange() {
+                    if (document.visibilityState === 'visible') {
+                        // 页面变为可见时的处理逻辑
+                        console.log('页面变为可见');
+                        this.initVido();
+                    } else if (document.visibilityState === 'hidden') {
+                        // 页面变为不可见时的处理逻辑
+                        console.log('页面变为不可见');
+                        this.closeFace();
+                    }
+                },
+                closeFace() {
+                    try {
+                        this.tracker = null
+                        // 关闭摄像头
+                        let video = document.getElementById('video')
+                        video.srcObject.getTracks()[0].stop()
+                        // 停止侦测
+                        this.trackerTask.stop()
+                    } catch (error) { }
                 }
             },
             created() {
@@ -374,7 +425,7 @@
                 });
             },
             mounted() {
-                this.initVido();//调用初始化摄像头
+                document.addEventListener('visibilitychange', this.handleVisibilityChange);
             },
             beforeDestroy() {
                 // 移除window方法

unpackage/config/setting.js

@@ -27,7 +27,7 @@ filesToModify.forEach((file) => {
                 state.name = '智能会议'
                 state.appid = '__UNI__F3963F8'
                 state.description = '智能会议APP，是一款集成了现代信息技术和智能化管理功能的移动应用程序，旨在提升会议体验和管理效率。'
-                state.versionName = "2.0.1"
+                state.versionName = "2.0.5"
                 state.versionCode = 1
                 state.h5.title = '智能会议'
             }