智能门禁功能模块完成/代码优化

src/App.vue

@@ -35,19 +35,6 @@ function stteingInit() {
   // 智能会议
   else if (config.appInfo.appid === "__UNI__F3963F8") {
     plus.screen.lockOrientation("landscape-primary"); //设置屏幕方向（1.竖屏正方向：portrait-primary 2.竖屏反方向：portrait-secondary 3.横屏正方向：landscape-primary 4.横屏反方向：landscape-secondary 5.自然方向：default）
-    plus.navigator.hideSystemNavigation(); //隐藏安卓底部虚拟导航键
-
-    console.log(uni.requireNativePlugin("Fvv-AutoStart"));
-
-    var sc = uni.requireNativePlugin("YxDevice");
-    setTimeout(() => {
-      console.log(sc);
-
-      console.log(sc.getDeviceCustom(16));
-      console.log(sc.getSerialno());
-
-      sc.getDeviceCustom(16);
-    }, 2000);
   }
   // 智能门禁
   else if (config.appInfo.appid === "__UNI__8D6E9FD") {

src/api/business/door.js

@@ -2,24 +2,63 @@ import { request } from "@/utils/request";
 
 /**
  * 门禁接口集合
- * @method control 门禁开门
- * @method Select 门禁列表
+ * @method Select 列表查询
+ * @method Update 列表修改
+ * @method Insert 列表新增
+ * @method Delete 列表删除
+ * @method RecordInsert 记录列表新增
+ * @method RecordSelect 记录列表查询
+ * @method control 开门
  */
 export function doorApi() {
     return {
-        control: (data) => {
+        Select: (data) => {
             return request({
-                url: `/service-eg/egDevice/control`,
-                method: 'GET',
+                url: `/service-eg/egDevice/page`,
+                method: 'POST',
                 data,
             });
         },
-        Select: (data) => {
+        Update: (data) => {
             return request({
-                url: `/service-eg/egDevice/page`,
+                url: `/service-eg/egDevice`,
+                method: 'PUT',
+                data,
+            });
+        },
+        Insert: (data) => {
+            return request({
+                url: `/service-eg/egDevice`,
+                method: 'POST',
+                data,
+            });
+        },
+        Delete: (data) => {
+            return request({
+                url: `/service-eg/egDevice/` + data,
+                method: 'DELETE',
+            });
+        },
+        RecordInsert: (data) => {
+            return request({
+                url: `/service-eg/egRecord`,
+                method: 'POST',
+                data,
+            });
+        },
+        RecordSelect: (data) => {
+            return request({
+                url: `/service-eg/egRecord/page`,
                 method: 'POST',
                 data,
             });
         },
+        control: (data) => {
+            return request({
+                url: `/service-eg/egDevice/control`,
+                method: 'GET',
+                data,
+            });
+        },
     };
 }

src/pages.json

@@ -75,9 +75,9 @@
             }
         },
         {
-            "path": "pages/face/index",
+            "path": "pages/door/index",
             "style": {
-                "navigationBarTitleText": "人脸识别",
+                "navigationBarTitleText": "门禁识别",
                 "enablePullDownRefresh": false,
                 "navigationStyle": "custom",
                 "app-plus": {
@@ -87,9 +87,9 @@
             }
         },
         {
-            "path": "pages/door/index",
+            "path": "pages/face/index",
             "style": {
-                "navigationBarTitleText": "门禁识别",
+                "navigationBarTitleText": "人脸识别",
                 "enablePullDownRefresh": false,
                 "navigationStyle": "custom",
                 "app-plus": {
@@ -979,6 +979,36 @@
                     }
                 }
             ]
+        },
+        {
+            "name": "门禁管理系统",
+            "root": "pages/business/doorManage/",
+            "pages": [
+                {
+                    "path": "list/index",
+                    "style": {
+                        "navigationBarTitleText": "设备列表",
+                        "enablePullDownRefresh": false,
+                        "navigationStyle": "custom",
+                        "app-plus": {
+                            "bounce": "none",
+                            "titleNView": false
+                        }
+                    }
+                },
+                {
+                    "path": "record/index",
+                    "style": {
+                        "navigationBarTitleText": "通行记录",
+                        "enablePullDownRefresh": false,
+                        "navigationStyle": "custom",
+                        "app-plus": {
+                            "bounce": "none",
+                            "titleNView": false
+                        }
+                    }
+                }
+            ]
         }
     ],
     "globalStyle": {

src/pages/business/doorManage/list/index.vue

@@ -0,0 +1,167 @@
+<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>
+  </u-sticky>
+
+  <oa-scroll
+    customClass="doorList-container scroll-height"
+    :pageSize="state.pageSize"
+    :total="state.total"
+    :isSticky="true"
+    :customStyle="{
+      //#ifdef APP-PLUS || MP-WEIXIN
+      height: `calc(100vh - (44px + 50px + ${proxy.$settingStore.StatusBarHeight}))`,
+      //#endif
+      //#ifdef H5
+      height: `calc(100vh - (44px + 50px))`,
+      //#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>
+
+      <u-grid class="p10" :border="true" :col="2" gap="10px">
+        <u-grid-item class="p10 radius" bgColor="#FFF" v-for="(item, index) in dataList" :key="index">
+          <view
+            :style="{
+              fontSize: '14px',
+              fontWeight: 600,
+              marginBottom: '20px',
+              marginRight: 'auto',
+            }"
+          >
+            {{ item.deviceName }}
+          </view>
+          <view
+            class="flex"
+            :style="{
+              width: '100%',
+            }"
+          >
+            <image style="width: 40px; height: 40px" :src="'/static/images/door/lock.png'" mode="aspectFill"></image>
+            <view class="iconfont oaIcon-open_door ml-auto mtb-auto font30" @click="openDoor(item)"></view>
+          </view>
+        </u-grid-item>
+      </u-grid>
+    </template>
+  </oa-scroll>
+
+  <oa-tabbar :tabbarValue="0" :tabbarList="proxy.$constData.doorTabbar" :isSwitchTab="false"></oa-tabbar>
+</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 { doorApi } from "@/api/business/door.js";
+/*----------------------------------组件引入-----------------------------------*/
+/*----------------------------------store引入-----------------------------------*/
+import { useStores, commonStores, controlStores } from "@/store/modules/index";
+/*----------------------------------公共方法引入-----------------------------------*/
+/*----------------------------------公共变量-----------------------------------*/
+const { proxy } = getCurrentInstance();
+const useStore = useStores();
+const controlStore = controlStores();
+/*----------------------------------变量声明-----------------------------------*/
+const state = reactive({
+  loading: false,
+  dataList: [],
+  pageSize: 20,
+  current: 1,
+  total: 0,
+
+  tabsList: [
+    { name: "我收到的", value: 2 },
+    { name: "我发出的", value: 3 },
+    { name: "我负责的", value: 1 },
+  ],
+  tabsCurrent: 0,
+});
+
+const { tabsList, tabsCurrent, dataList } = toRefs(state);
+
+/**
+ * @初始化
+ */
+function init() {
+  state.loading = true;
+  doorApi()
+    .Select({
+      current: state.current, //页数
+      size: state.pageSize, //条数
+    })
+    .then((requset) => {
+      if (requset.data.records.length > 0) {
+        state.dataList = requset.data.records;
+        state.total = requset.data.total;
+        state.loading = false;
+      }
+    })
+    .catch((err) => {
+      state.loading = false;
+    });
+}
+
+/**
+ * @门禁开门
+ */
+function openDoor(event) {
+  event.userName = useStore.nickName;
+  controlStore.openDoor(event);
+}
+
+/**
+ * @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(() => {});
+
+onLoad((options) => {
+  init();
+});
+
+onUnload(() => {});
+</script>
+
+<style lang="scss" scoped>
+.content-area {
+}
+</style>

src/pages/business/doorManage/record/index.vue

@@ -0,0 +1,177 @@
+<template>
+  <u-sticky class="shadow-default" 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>
+  </u-sticky>
+
+  <oa-scroll
+    customClass="doorRecord-container scroll-height"
+    :pageSize="state.size"
+    :total="state.total"
+    :isSticky="true"
+    :customStyle="{
+      //#ifdef APP-PLUS || MP-WEIXIN
+      height: `calc(100vh - (44px + 50px + ${proxy.$settingStore.StatusBarHeight} + ${proxy.$settingStore.tabBarHeight}))`,
+      //#endif
+      //#ifdef H5
+      height: `calc(100vh - (44px + 50px + ${proxy.$settingStore.StatusBarHeight} + ${proxy.$settingStore.tabBarHeight}))`,
+      //#endif
+    }"
+    :refresherLoad="true"
+    :refresherEnabled="true"
+    :refresherDefaultStyle="'none'"
+    :refresherThreshold="44"
+    :lowerThreshold="44"
+    :refresherBackground="'#f5f6f7'"
+    @load="load"
+    @refresh="refresh"
+  >
+    <template #default>
+      <u-loading-page :loading="state.loading" fontSize="16" style="z-index: 99"></u-loading-page>
+      <view class="loginLog-container" :data-theme="'theme-' + proxy.$settingStore.themeColor.name">
+        <view class="container-area">
+          <view class="container-area-content bg-white" v-for="data in state.dataList" :key="data">
+            <view class="container-area-content-img">
+              <image style="width: 40px; height: 40px" :src="'/static/images/door/lock.png'" mode="aspectFill"></image>
+            </view>
+            <view class="container-area-content-center">
+              <view
+                :style="{
+                  fontSize: '14px',
+                  fontWeight: 600,
+                }"
+                >{{ data.egDevice?.deviceName }}</view
+              >
+              <view>通行时间：{{ data.passTime ? data.passTime.replace("T", " ") : "" }}</view>
+              <view>
+                通行结果：
+                <span :style="{ color: data.passResult == '成功' ? '#16bf00' : 'red' }">{{ data.passResult }}</span>
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </template>
+  </oa-scroll>
+
+  <oa-tabbar :tabbarValue="1" :tabbarList="proxy.$constData.doorTabbar" :isSwitchTab="false"></oa-tabbar>
+</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 { doorApi } from "@/api/business/door.js";
+/*----------------------------------组件引入-----------------------------------*/
+/*----------------------------------store引入-----------------------------------*/
+import { useStores, commonStores } from "@/store/modules/index";
+/*----------------------------------公共方法引入-----------------------------------*/
+/*----------------------------------公共变量-----------------------------------*/
+const { proxy } = getCurrentInstance();
+const useStore = useStores();
+/*----------------------------------变量声明-----------------------------------*/
+const state = reactive({
+  dataList: [],
+  current: 1, //页数
+  size: 20, //条数
+  total: 0,
+});
+
+/**
+ * @初始化
+ */
+function init() {
+  selectListApi();
+}
+
+/**
+ * @scrollView加载数据
+ */
+function load() {
+  state.size += 10;
+  selectListApi();
+}
+
+/**
+ * @scrollView刷新数据
+ */
+function refresh() {
+  state.size = 20;
+  selectListApi();
+}
+
+/**
+ * @通知公告列表
+ * @api接口调用
+ */
+function selectListApi() {
+  state.loading = true;
+  doorApi()
+    .RecordSelect({
+      current: state.current, //页数
+      size: state.size, //条数
+      userName: useStore.nickName,
+    })
+    .then((requset) => {
+      if (requset.status === "SUCCESS") {
+        state.dataList = requset.data.records;
+        state.total = requset.data.total;
+        state.loading = false;
+      }
+    })
+    .catch((err) => {
+      state.loading = false;
+    });
+}
+
+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: 0.5px solid #d6d7d9;
+
+      &-img {
+        margin: auto 15px auto 15px;
+      }
+
+      &-center {
+        width: 100%;
+        font-size: 12px;
+        padding: 15px 0 15px 0;
+        line-height: 20px;
+      }
+    }
+  }
+}
+</style>

src/pages/business/meeting/index.vue

@@ -136,18 +136,19 @@
 import { onLoad, onShow, onReady, onHide, onLaunch, onUnload, onNavigationBarButtonTap, onPageScroll } from "@dcloudio/uni-app";
 import { ref, reactive, computed, getCurrentInstance, toRefs, inject } from "vue";
 /*----------------------------------接口引入-----------------------------------*/
-import { MeetingRoomList, MeetingRoomReservationList } from "@/api/business/meeting.js";
+import { MeetingRoomList, MeetingRoomReservationList, deviceApi } from "@/api/business/meeting.js";
 import { doorApi } from "@/api/business/door.js";
 /*----------------------------------组件引入-----------------------------------*/
 import timeSlot from "./components/timeSlot.vue";
 import switchSlot from "./components/switchSlot.vue";
 /*----------------------------------store引入-----------------------------------*/
-import { useStores, systemStores } from "@/store/modules/index";
+import { useStores, systemStores, controlStores } from "@/store/modules/index";
 /*----------------------------------公共方法引入-----------------------------------*/
 /*----------------------------------公共变量-----------------------------------*/
 const { proxy } = getCurrentInstance();
 const useStore = useStores();
 const systemStore = systemStores();
+const controlStore = controlStores();
 /*----------------------------------变量声明-----------------------------------*/
 const state = reactive({
   loading: false,
@@ -298,7 +299,22 @@ function changeSheet(e) {
   if (e.name == "会议室详情") {
     proxy.$tab.navigateTo(`/pages/business/meeting/detailed/index?roomId=${state.popup.list.roomId}`).then(() => {});
   } else if (e.name == "门禁开门") {
-    openDoor(e);
+    deviceApi()
+      .Select({
+        roomId: state.popup.list.roomId,
+        current: 1,
+        size: 2000,
+      })
+      .then((item) => {
+        var records = item.data.records[0];
+        controlStore.openDoor({
+          deviceUuid: records.deviceUuid,
+          userName: useStore.nickName,
+        });
+      })
+      .catch((err) => {
+        console.log(err);
+      });
   } else if (e.name == "我的会议") {
     proxy.$tab.navigateTo(`/pages/business/meeting/my/index`).then(() => {});
   }

src/pages/door/index.vue

@@ -1,9 +1,9 @@
 <template>
-  <web-view v-show="!faceStore.modal.show" ref="faceView" id="faceView" class="faceView" src="/static/face/door.html" bindmessage="receiveMessage" :webview-styles="webviewStyles" @message="onMessage">
+  <web-view v-show="!controlStore.modal.show" ref="faceView" id="faceView" class="faceView" src="/static/face/door.html" bindmessage="receiveMessage" :webview-styles="webviewStyles" @message="onMessage">
   </web-view>
 
   <u-modal
-    :show="faceStore.modal.show"
+    :show="controlStore.modal.show"
     title=""
     cancelText="退出应用"
     confirmText="确认"
@@ -11,37 +11,37 @@
     :showConfirmButton="true"
     :showCancelButton="true"
     :closeOnClickOverlay="true"
-    @confirm="faceStore.modalConfirm()"
-    @cancel="faceStore.modalCancel()"
-    @close="faceStore.modalClose()"
+    @confirm="controlStore.modalConfirm()"
+    @cancel="controlStore.modalCancel()"
+    @close="controlStore.modalClose()"
   >
     <view class="slot-content">
-      <u-subsection class="mb20" :list="faceStore.subsection.list" :current="faceStore.subsection.value" @change="faceStore.sectionChange"></u-subsection>
+      <u-subsection class="mb20" :list="controlStore.subsection.list" :current="controlStore.subsection.value" @change="controlStore.sectionChange"></u-subsection>
 
-      <view v-if="faceStore.subsection.value == 0">
+      <view v-if="controlStore.subsection.value == 0">
         <view class="mb10 required">服务器地址</view>
         <view class="mb20">
-          <u-input v-model="faceStore.form.linkUrl" placeholder="服务器地址（必填）" border="bottom" style="padding: 6px 0px" />
+          <u-input v-model="controlStore.form.linkUrl" placeholder="服务器地址（必填）" border="bottom" style="padding: 6px 0px" />
         </view>
 
         <view class="mb10">服务器端口</view>
         <view class="mb20">
-          <u-input v-model="faceStore.form.port" placeholder="服务器端口（非必填）" border="bottom" style="padding: 6px 0px" />
+          <u-input v-model="controlStore.form.port" placeholder="服务器端口（非必填）" border="bottom" style="padding: 6px 0px" />
         </view>
       </view>
 
-      <view v-if="faceStore.subsection.value == 1">
+      <view v-if="controlStore.subsection.value == 1">
         <view class="mb10">绑定门禁</view>
         <view>
           <u-input
-            v-model="faceStore.form.doorName"
+            v-model="controlStore.form.doorName"
             placeholder="门禁（必选）"
             suffixIcon="arrow-right"
             suffixIconStyle="color: #909399"
             border="none"
             disabledColor="transparent"
             disabled
-            @click="faceStore.handlePicker('绑定门禁')"
+            @click="controlStore.handlePicker('绑定门禁')"
           />
         </view>
       </view>
@@ -49,16 +49,16 @@
   </u-modal>
 
   <u-picker
-    :show="faceStore.picker.show"
-    :columns="faceStore.picker.list"
-    :title="'请选择' + faceStore.picker.title"
+    :show="controlStore.picker.show"
+    :columns="controlStore.picker.list"
+    :title="'请选择' + controlStore.picker.title"
     keyName="name"
     visibleItemCount="6"
-    :defaultIndex="[faceStore.picker.defaultIndex]"
+    :defaultIndex="[controlStore.picker.defaultIndex]"
     :closeOnClickOverlay="true"
-    @close="faceStore.picker.show = false"
-    @cancel="faceStore.picker.show = false"
-    @confirm="faceStore.pickerConfirm"
+    @close="controlStore.picker.show = false"
+    @cancel="controlStore.picker.show = false"
+    @confirm="controlStore.pickerConfirm"
   ></u-picker>
 </template>
 <script setup>
@@ -68,9 +68,9 @@ import { ref, reactive, computed, getCurrentInstance, toRefs, inject, nextTick,
 /*----------------------------------接口引入-----------------------------------*/
 /*----------------------------------组件引入-----------------------------------*/
 /*----------------------------------store引入-----------------------------------*/
-import { faceStores } from "@/store/modules/index";
+import { controlStores } from "@/store/modules/index";
 /*----------------------------------公共方法引入-----------------------------------*/
-const faceStore = faceStores();
+const controlStore = controlStores();
 /*----------------------------------公共变量-----------------------------------*/
 const state = reactive({
   webviewStyles: {
@@ -82,14 +82,14 @@ const { webviewStyles } = toRefs(state);
 
 // 初始化
 function init() {
-  faceStore.pageFunction = ["门禁"];
-  faceStore.initCamera();
-  faceStore.initNfc();
-  faceStore.initData();
+  controlStore.pageFunction = ["门禁"];
+  controlStore.initCamera();
+  controlStore.initNfc();
+  controlStore.initData();
 
-  faceStore.handleChildren({
+  controlStore.handleChildren({
     funcName: "初始化数据",
-    data: JSON.stringify(faceStore.form),
+    data: JSON.stringify(controlStore.form),
   });
 }
 
@@ -97,11 +97,11 @@ function init() {
  * @接收子页面传过来的值
  */
 function onMessage(e) {
-  faceStore.analysisData(e.detail.data[0]);
+  controlStore.analysisData(e.detail.data[0]);
 }
 // #ifdef H5
 window.onmessage = function (event) {
-  faceStore.analysisData(event.data);
+  controlStore.analysisData(event.data);
 };
 // #endif
 

src/pages/face/index.vue

@@ -1,6 +1,6 @@
 <template>
   <web-view
-    v-show="!faceStore.modal.show"
+    v-show="!controlStore.modal.show"
     ref="faceView"
     id="faceView"
     class="faceView"
@@ -12,37 +12,37 @@
   </web-view>
 
   <u-modal
-    :show="faceStore.modal.show"
+    :show="controlStore.modal.show"
     title="配置服务器"
     :cancelText="'退出应用'"
     :zoom="false"
     :showConfirmButton="true"
     :showCancelButton="true"
     :closeOnClickOverlay="true"
-    @confirm="faceStore.modalConfirm(), getMeetingRoomReservationList()"
-    @cancel="faceStore.modalCancel()"
-    @close="faceStore.modalClose()"
+    @confirm="controlStore.modalConfirm(), getMeetingRoomReservationList()"
+    @cancel="controlStore.modalCancel()"
+    @close="controlStore.modalClose()"
   >
     <view class="slot-content">
-      <u-subsection class="mb20" :list="faceStore.subsection.list" :current="faceStore.subsection.value" @change="faceStore.sectionChange"></u-subsection>
+      <u-subsection class="mb20" :list="controlStore.subsection.list" :current="controlStore.subsection.value" @change="controlStore.sectionChange"></u-subsection>
 
-      <view v-if="faceStore.subsection.value == 0">
+      <view v-if="controlStore.subsection.value == 0">
         <view class="mb10 required">服务器地址</view>
         <view class="mb20">
-          <u-input v-model="faceStore.form.linkUrl" placeholder="服务器地址（必填）" border="bottom" style="padding: 6px 0px" />
+          <u-input v-model="controlStore.form.linkUrl" placeholder="服务器地址（必填）" border="bottom" style="padding: 6px 0px" />
         </view>
 
         <view class="mb10">服务器端口</view>
         <view class="mb20">
-          <u-input v-model="faceStore.form.port" placeholder="服务器端口（非必填）" border="bottom" style="padding: 6px 0px" />
+          <u-input v-model="controlStore.form.port" placeholder="服务器端口（非必填）" border="bottom" style="padding: 6px 0px" />
         </view>
       </view>
 
-      <view v-if="faceStore.subsection.value == 1">
+      <view v-if="controlStore.subsection.value == 1">
         <view class="mb10 required">绑定会议室</view>
         <view class="mb20">
           <u-input
-            v-model="faceStore.form.meetingName"
+            v-model="controlStore.form.meetingName"
             placeholder="会议室（必选）"
             suffixIcon="arrow-right"
             suffixIconStyle="color: #909399"
@@ -50,38 +50,40 @@
             style="padding: 6px 0px"
             disabledColor="transparent"
             disabled
-            @click="faceStore.handlePicker('绑定会议室')"
+            @click="controlStore.handlePicker('绑定会议室')"
           />
         </view>
 
         <view class="mb10 required">绑定门禁</view>
         <view>
           <u-input
-            v-model="faceStore.form.doorName"
+            v-model="controlStore.form.doorName"
             placeholder="门禁（必选）"
             suffixIcon="arrow-right"
             suffixIconStyle="color: #909399"
             border="none"
             disabledColor="transparent"
             disabled
-            @click="faceStore.handlePicker('绑定门禁')"
+            @click="controlStore.handlePicker('绑定门禁')"
           />
         </view>
+
+        <view class="mb10 required" @click="handleButton()">开启灯光</view>
       </view>
     </view>
   </u-modal>
 
   <u-picker
-    :show="faceStore.picker.show"
-    :columns="faceStore.picker.list"
-    :title="'请选择' + faceStore.picker.title"
+    :show="controlStore.picker.show"
+    :columns="controlStore.picker.list"
+    :title="'请选择' + controlStore.picker.title"
     keyName="name"
     visibleItemCount="6"
-    :defaultIndex="[faceStore.picker.defaultIndex]"
+    :defaultIndex="[controlStore.picker.defaultIndex]"
     :closeOnClickOverlay="true"
-    @close="faceStore.picker.show = false"
-    @cancel="faceStore.picker.show = false"
-    @confirm="faceStore.pickerConfirm"
+    @close="controlStore.picker.show = false"
+    @cancel="controlStore.picker.show = false"
+    @confirm="controlStore.pickerConfirm"
   ></u-picker>
 </template>
 <script setup>
@@ -93,10 +95,10 @@ import { ref, reactive, computed, getCurrentInstance, toRefs, inject, nextTick,
 import { meetingApi, signOnOut } from "@/api/business/meeting.js";
 /*----------------------------------组件引入-----------------------------------*/
 /*----------------------------------store引入-----------------------------------*/
-import { faceStores } from "@/store/modules/index";
+import { controlStores } from "@/store/modules/index";
 /*----------------------------------公共方法引入-----------------------------------*/
 const { proxy } = getCurrentInstance();
-const faceStore = faceStores();
+const controlStore = controlStores();
 /*----------------------------------公共变量-----------------------------------*/
 const state = reactive({
   webviewStyles: {
@@ -111,28 +113,28 @@ const { webviewStyles, meetingRoomList, modal, picker, form, inter } = toRefs(st
 
 // 初始化
 function init() {
-  faceStore.pageFunction = ["门禁", "会议"];
-  faceStore.initCamera();
-  faceStore.initNfc();
-  faceStore.initData();
-
-  if (!inter.interMeeting) {
-    getMeetingRoomReservationList();
-    inter.interMeeting = setInterval(() => {
-      getMeetingRoomReservationList();
-    }, 1000 * 5);
-  }
+  controlStore.pageFunction = ["门禁", "会议"];
+  controlStore.initCamera();
+  controlStore.initNfc();
+  controlStore.initData();
+
+  // if (!inter.interMeeting) {
+  //   getMeetingRoomReservationList();
+  //   inter.interMeeting = setInterval(() => {
+  //     getMeetingRoomReservationList();
+  //   }, 1000 * 5);
+  // }
 }
 
 /**
  * @会议室详情列表
  */
 function getMeetingRoomReservationList() {
-  faceStore.meetingTimeList = [];
-  faceStore.meetingReservaList.thisVenueData = [];
-  faceStore.meetingReservaList.thisVenueTime = {};
-  faceStore.meetingReservaList.nextSceneData = [];
-  faceStore.meetingReservaList.nextSceneTime = {};
+  controlStore.meetingTimeList = [];
+  controlStore.meetingReservaList.thisVenueData = [];
+  controlStore.meetingReservaList.thisVenueTime = {};
+  controlStore.meetingReservaList.nextSceneData = [];
+  controlStore.meetingReservaList.nextSceneTime = {};
 
   for (let i = 0; i <= 23.5; i += 0.5) {
     var time = "";
@@ -150,7 +152,7 @@ function getMeetingRoomReservationList() {
       }
     }
 
-    faceStore.meetingTimeList.push({
+    controlStore.meetingTimeList.push({
       startTime: time,
       endTime: time,
       isEnd: 0,
@@ -161,36 +163,36 @@ function getMeetingRoomReservationList() {
 
   meetingApi()
     .GetMeetingRoomReservationList({
-      domain: faceStore.form.domain,
-      meetingRoomId: faceStore.form.meetingId,
+      domain: controlStore.form.domain,
+      meetingRoomId: controlStore.form.meetingId,
       date: proxy.$dayjs().format("YYYY-MM-DD") + " 00:00:00",
     })
     .then((requset) => {
       if (requset.data.length > 0) {
-        faceStore.meetingReservaList.dataAll = requset.data[0];
-        faceStore.meetingReservaList.dataAll.dmMeetingList.forEach((e, index) => {
+        controlStore.meetingReservaList.dataAll = requset.data[0];
+        controlStore.meetingReservaList.dataAll.dmMeetingList.forEach((e, index) => {
           //判断开始时间和结束时间是否包含当前时间
           if (proxy.$dayjs().isBetween(e.startDate, e.endDate, null, "[]")) {
-            faceStore.meetingReservaList.thisVenueData.push(e);
-            faceStore.meetingReservaList.thisVenueTime = proxy.$time.timeRestructuring(faceStore.meetingReservaList.dataAll.meetingRoomUsage[index]);
+            controlStore.meetingReservaList.thisVenueData.push(e);
+            controlStore.meetingReservaList.thisVenueTime = proxy.$time.timeRestructuring(controlStore.meetingReservaList.dataAll.meetingRoomUsage[index]);
           }
           //判断当前时间是否相同或在其之前
-          if (proxy.$dayjs().isSameOrBefore(e.startDate) && faceStore.meetingReservaList.nextSceneData.length < 1) {
-            faceStore.meetingReservaList.nextSceneData.push(e);
-            faceStore.meetingReservaList.nextSceneTime = proxy.$time.timeRestructuring(faceStore.meetingReservaList.dataAll.meetingRoomUsage[index]);
+          if (proxy.$dayjs().isSameOrBefore(e.startDate) && controlStore.meetingReservaList.nextSceneData.length < 1) {
+            controlStore.meetingReservaList.nextSceneData.push(e);
+            controlStore.meetingReservaList.nextSceneTime = proxy.$time.timeRestructuring(controlStore.meetingReservaList.dataAll.meetingRoomUsage[index]);
           }
         });
 
-        faceStore.meetingReservaList.timeList = showTimeSegments(faceStore.meetingTimeList);
-        faceStore.handleChildren({
+        controlStore.meetingReservaList.timeList = showTimeSegments(controlStore.meetingTimeList);
+        controlStore.handleChildren({
           funcName: "初始化数据",
-          data: JSON.stringify(faceStore.meetingReservaList),
+          data: JSON.stringify(controlStore.meetingReservaList),
         });
       } else {
-        faceStore.meetingReservaList.timeList = faceStore.meetingTimeList;
-        faceStore.handleChildren({
+        controlStore.meetingReservaList.timeList = controlStore.meetingTimeList;
+        controlStore.handleChildren({
           funcName: "初始化数据",
-          data: JSON.stringify(faceStore.meetingReservaList),
+          data: JSON.stringify(controlStore.meetingReservaList),
         });
       }
     })
@@ -204,7 +206,7 @@ function showTimeSegments(times) {
   for (var i = 0; i < timesXleList.length; i++) {
     const timeValue = new Date(`${proxy.$dayjs().format("YYYY-MM-DD")}T${timesXleList[i].startTime}`);
 
-    faceStore.meetingReservaList.dataAll.meetingRoomUsage.forEach((item) => {
+    controlStore.meetingReservaList.dataAll.meetingRoomUsage.forEach((item) => {
       const timeList = proxy.$time.timeRestructuring(item);
       const startValue = new Date(`${proxy.$dayjs().format("YYYY-MM-DD")}T${timeList.startTime}`);
       const endValue = new Date(`${proxy.$dayjs().format("YYYY-MM-DD")}T${timeList.endTime}`);
@@ -215,7 +217,7 @@ function showTimeSegments(times) {
     });
   }
 
-  faceStore.meetingReservaList.dataAll.meetingRoomUsage.forEach((item) => {
+  controlStore.meetingReservaList.dataAll.meetingRoomUsage.forEach((item) => {
     const timeList = proxy.$time.timeRestructuring(item);
     const startValue = new Date(`${proxy.$dayjs().format("YYYY-MM-DD")}T${timeList.startTime}`);
     const endValue = new Date(`${proxy.$dayjs().format("YYYY-MM-DD")}T${timeList.endTime}`);
@@ -257,18 +259,83 @@ function showTimeSegments(times) {
  * @接收子页面传过来的值
  */
 function onMessage(e) {
-  faceStore.analysisData(e.detail.data[0]);
+  controlStore.analysisData(e.detail.data[0]);
 }
 // #ifdef H5
 window.onmessage = function (event) {
-  faceStore.analysisData(event.data);
+  controlStore.analysisData(event.data);
 };
 // #endif
 
+function testAsyncFunc(imgUrl, index) {
+  // 调用异步方法
+  testModule.testAsyncFunc(
+    {
+      imgUrl: imgUrl,
+    },
+    (ret) => {
+      console.log(ret);
+    }
+  );
+}
+
+const device = uni.requireNativePlugin("device");
+function handleButton(){
+  device.setLed("绿色");
+}
+
 onLoad((options) => {
   setTimeout(() => {
     init();
   }, 500);
+
+  // const plugin = uni.requireNativePlugin("temp_plugin");
+  // console.log(plugin);
+
+  // console.log("设备名称:", plugin.getDeviceName());
+
+  // plugin.showToast("我是原生插件Toast");
+
+
+  console.log(device);
+
+  console.log("IP地址:", device.getIpAddress());
+
+  
+
+  // device.invoke1();
+
+  // console.log("序列号:", device.getSerialno());
+
+  // console.log("分区信息:", device.getDeviceCustom(16));
+  // device.setLed("蓝色");
+
+  // 假设你已经配置好了uniapp的Android插件
+  const main = plus.android.runtimeMainActivity();
+  const Intent = plus.android.importClass("android.content.Intent");
+  const MyActivity = plus.android.importClass("com.example.device.test"); // 替换为你的包名和Activity名
+
+  // 创建一个Intent来启动你的Activity
+  const intent = new Intent(main, MyActivity);
+
+  // 添加需要的额外数据到intent
+  intent.putExtra("com.example.device.test.setLed", "绿色");
+
+  // 启动Activity
+  main.sendBroadcast(intent);
+
+  // var testModule = uni.requireNativePlugin("opencv_plugin");
+
+  // console.log(testModule);
+
+  // testModule.testAsyncFunc(
+  //   {
+  //     imgUrl: "https://img0.baidu.com/it/u=3389607,2584865022&fm=253&fmt=auto&app=138&f=PNG?w=449&h=645",
+  //   },
+  //   (ret) => {
+  //     console.log(ret);
+  //   }
+  // );
 });
 
 onShow(() => {});

src/plugins/constData.plugins.js

@@ -102,29 +102,30 @@ let projectTabbar = [
 	{
 		pagePath: "/pages/business/common/projectMange/record/index",
 		iconClass: "oaIcon-tab-reportRecord",
-		iconPath: "/static/images/tabBar/tab-home.png",
-		selectedIconPath: "/static/images/tabBar/tab-home-blue.png",
+		iconPath: "",
+		selectedIconPath: "",
 		text: "报告记录",
 		dot: false,
 	},
 	{
 		pagePath: "/pages/business/common/projectMange/write/index",
 		iconClass: "oaIcon-tab-reportInsert",
-		iconPath: "/static/images/tabBar/tab-info.png",
-		selectedIconPath: "/static/images/tabBar/tab-info-blue.png",
+		iconPath: "",
+		selectedIconPath: "",
 		text: "报告填写",
 		dot: false,
 	},
 	{
 		pagePath: "/pages/business/common/projectMange/list/index",
 		iconClass: "oaIcon-tab-projectsList",
-		iconPath: "/static/images/tabBar/tab-my.png",
-		selectedIconPath: "/static/images/tabBar/tab-my-blue.png",
+		iconPath: "",
+		selectedIconPath: "",
 		text: "项目列表",
 		dot: false,
 	},
 	// {
 	// 	pagePath: "/pages/mine",
+	//  iconClass: "oaIcon-tab-reportInsert",
 	// 	iconPath: "/static/images/tabBar/tab-my.png",
 	// 	selectedIconPath: "/static/images/tabBar/tab-my-blue.png",
 	// 	text: "统计导出",
@@ -132,6 +133,7 @@ let projectTabbar = [
 	// },
 	// {
 	// 	pagePath: "/pages/info",
+	//  iconClass: "oaIcon-tab-reportInsert",
 	// 	iconPath: "/static/images/tabBar/tab-info.png",
 	// 	selectedIconPath: "/static/images/tabBar/tab-info-blue.png",
 	// 	text: "模板管理",
@@ -140,6 +142,27 @@ let projectTabbar = [
 ]
 
 
+// 门禁管理底部导航栏
+let doorTabbar = [
+	{
+		pagePath: "/pages/business/doorManage/list/index",
+		iconClass: "oaIcon-tab-projectsList",
+		iconPath: "",
+		selectedIconPath: "",
+		text: "首页",
+		dot: false,
+	},
+	{
+		pagePath: "/pages/business/doorManage/record/index",
+		iconClass: "oaIcon-tab-reportRecord",
+		iconPath: "",
+		selectedIconPath: "",
+		text: "记录",
+		dot: false,
+	},
+]
+
+
 export default {
 	// 主题列表
 	themeList: [
@@ -288,5 +311,6 @@ export default {
 	homeRouter: homeRouter,
 	xunJianList: xunJianList,
 	homeTabbar: homeTabbar,
-	projectTabbar: projectTabbar
+	projectTabbar: projectTabbar,
+	doorTabbar: doorTabbar
 };

src/static/face/door.html

@@ -154,7 +154,8 @@
                 <div class="title">{{ state.doorName || '未绑定会议室' }}</div>
             </div>
             <div class="qrCode">
-                <div class="buttom">打开二维码</div>
+                <!-- <div class="buttom">打开二维码</div> -->
+                <div class="buttom" @click="parentMessage('点击开门')">点击开门</div>
             </div>
         </div>
     </div>

src/static/iconfont/iconfont.css

@@ -1,8 +1,9 @@
 @font-face {
-  font-family: "iconfont"; /* Project id 4510027 */
-  src: url('https://at.alicdn.com/t/c/font_4510027_p1rynf6nken.woff2?t=1723634694993') format('woff2'),
-       url('https://at.alicdn.com/t/c/font_4510027_p1rynf6nken.woff?t=1723634694993') format('woff'),
-       url('https://at.alicdn.com/t/c/font_4510027_p1rynf6nken.ttf?t=1723634694993') format('truetype');
+  font-family: "iconfont";
+  /* Project id 4510027 */
+  src: url('https://at.alicdn.com/t/c/font_4510027_0coe61tox5x.woff2?t=1735634817751') format('woff2'),
+    url('https://at.alicdn.com/t/c/font_4510027_0coe61tox5x.woff?t=1735634817751') format('woff'),
+    url('https://at.alicdn.com/t/c/font_4510027_0coe61tox5x.ttf?t=1735634817751') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +14,18 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.oaIcon-open_door:before {
+  content: "\e64e";
+}
+
+.oaIcon-door:before {
+  content: "\e78b";
+}
+
+.oaIcon-rizhi:before {
+  content: "\ea45";
+}
+
 .oaIcon-tab-home:before {
   content: "\e60e";
 }
@@ -191,5 +204,4 @@
 
 .oaIcon-qingchu:before {
   content: "\e61f";
-}
-
+}

src/store/modules/face.js → src/store/modules/control.js

@@ -2,13 +2,15 @@ import { defineStore } from "pinia";
 import { doorApi } from "@/api/business/door.js";
 import { faceApi } from "@/api/business/face.js";
 import { meetingApi, signOnOut } from "@/api/business/meeting.js";
+import { getToken, setToken, removeToken } from "@/utils/auth";
+import dayjs from 'dayjs'
 import config from "@/config";
 import nfc from "@/plugins/nfc.plugins.js";
 import modal from "@/plugins/modal.plugins.js";
 import keyListen from "@/plugins/keyListen.plugins.js";
 import permission from "@/plugins/permission.plugins.js";
 
-const faceStore = defineStore("face", {
+const controlStore = defineStore("control", {
     state: () => ({
         pageFunction: [],
         form: {
@@ -192,6 +194,27 @@ const faceStore = defineStore("face", {
             this.picker.show = false;
         },
 
+        /**
+         * @会议室下拉列表
+         */
+        getMeetingRoomList() {
+            var that = this
+            that.meetingRoomList = [];
+            meetingApi()
+                .GetMeetingRoomList({
+                    domain: that.form.domain,
+                })
+                .then((requset) => {
+                    if (requset.data.length > 0) {
+                        requset.data.forEach((e) => {
+                            that.meetingRoomList.push({
+                                value: e.roomId,
+                                name: e.roomName,
+                            });
+                        });
+                    }
+                });
+        },
         /**
          * @门禁下拉列表
          */
@@ -216,19 +239,42 @@ const faceStore = defineStore("face", {
         /**
          * @门禁开门
          */
-        openDoor(item) {
+        openDoor(event) {
+            var that = this
             doorApi()
                 .control({
-                    domain: this.form.domain, //域名
-                    userId: item.userId,
-                    userName: item.faceName,
+                    domain: !getToken() ? this.form.domain : undefined, //域名
+                    userId: !getToken() ? event.userId : undefined,
+                    userName: !getToken() ? event.userName : undefined,
                     productCode: "502_USKY",
-                    deviceUuid: this.form.doorId,
+                    deviceUuid: !getToken() ? this.form.doorId : event.deviceUuid,
                     commandCode: "door_onoff",
                     commandValue: 1,
                 })
-                .then((item2) => {
+                .then((item) => {
                     console.log("开门成功");
+                    that.insertDoorRecord(event, "成功");
+                })
+                .catch((err) => {
+                    console.log(err);
+                    that.insertDoorRecord(event, "失败：" + err);
+                });
+        },
+        /**
+         * @新增开门记录
+         */
+        insertDoorRecord(event, msg) {
+            doorApi()
+                .RecordInsert({
+                    domain: !getToken() ? this.form.domain : undefined, //域名
+                    userName: event.userName, //用户姓名
+                    deviceUuid: event.deviceUuid, //设备Uuid
+                    passType: 3, //通行方式(1、人脸 2、刷卡 3、手机)
+                    passTime: dayjs().format("YYYY-MM-DDTHH:mm:ss"), //通行时间
+                    passResult: msg, //通行结果
+                })
+                .then((item) => {
+                    console.log(msg);
                 })
                 .catch((err) => {
                     console.log(err);
@@ -246,44 +292,25 @@ const faceStore = defineStore("face", {
                 })
                 .then((item) => {
                     if (item.data.code === 200 || item.data.code === 201) {
-                        modal.msg(item.data.msg);
+                        item.data.userName = item.data.faceName;
                         if (that.pageFunction.includes('会议')) {
-                            that.meetingVerify(item);
+                            that.meetingVerify(item.data);
                         } else {
                             that.openDoor(item.data);
                         }
-                    } else {
-                        if (item.data.msg != "人脸验证接口返回异常") {
-                            modal.msg(item.data.msg);
-                        }
                     }
+
+                    if (item.data.msg != "人脸验证接口返回异常") {
+                        modal.msg(item.data.msg);
+                    }
+
                     that.handleChildren({ funcName: "人脸冷却", data: {} });
                 })
                 .catch((err) => {
                     that.handleChildren({ funcName: "人脸冷却", data: {} });
                 });
         },
-        /**
-         * @会议室下拉列表
-         */
-        getMeetingRoomList() {
-            var that = this
-            that.meetingRoomList = [];
-            meetingApi()
-                .GetMeetingRoomList({
-                    domain: that.form.domain,
-                })
-                .then((requset) => {
-                    if (requset.data.length > 0) {
-                        requset.data.forEach((e) => {
-                            that.meetingRoomList.push({
-                                value: e.roomId,
-                                name: e.roomName,
-                            });
-                        });
-                    }
-                });
-        },
+
         /**
          * @会议验证
          */
@@ -294,18 +321,15 @@ const faceStore = defineStore("face", {
                     .Attendee({
                         domain: this.form.domain,
                         meetingId: this.meetingReservaList.thisVenueData[0].meetingId,
-                        userId: event.data.userId,
-                        userName: event.data.faceName,
+                        userId: event.userId,
+                        userName: event.userName,
                     })
                     .then((item) => {
                         if (item.data.status == "1") {
-                            modal.msg(item.data.msg);
-                            var msg = `[${event.data.faceName}] ${item.data.msg}`;
                             that.openDoor(event);
                             that.meetingSign(event);
-                        } else {
-                            modal.msg(item.data.msg);
                         }
+                        modal.msg(item.data.msg);
                     });
             }
         },
@@ -316,7 +340,7 @@ const faceStore = defineStore("face", {
             signOnOut({
                 domain: this.form.domain,
                 meetingId: this.meetingReservaList.thisVenueData[0].meetingId,
-                userId: event.data.userId, //参会人Id
+                userId: event.userId, //参会人Id
                 mothodType: 0, //签到签退类别(0.签到 1.签退)
                 signType: 1, //签到签退方式(0.人工 1.人脸)
             }).then((item) => { });
@@ -331,6 +355,11 @@ const faceStore = defineStore("face", {
                     this.modal.show = true;
                 } else if (event.funcName == "人脸识别") {
                     this.faceVerify(event.data.imageBase);
+                } else if (event.funcName == "点击开门") {
+                    this.openDoor({
+                        userId: 99,
+                        userName: "方惠圣",
+                    });
                 }
             }
         },
@@ -354,4 +383,4 @@ const faceStore = defineStore("face", {
     },
 });
 
-export default faceStore;
+export default controlStore;

src/store/modules/index.js

@@ -3,7 +3,7 @@ import commonStores from "@/store/modules/common.js";
 import settingStores from "@/store/modules/setting.js";
 import xunJianStores from "@/store/modules/xunJian.js";
 import systemStores from "@/store/modules/system.js";
-import faceStores from "@/store/modules/face.js";
+import controlStores from "@/store/modules/control.js";
 
 export {
     useStores,
@@ -11,5 +11,5 @@ export {
     settingStores,
     xunJianStores,
     systemStores,
-    faceStores
+    controlStores
 };

src/uni_modules/uview-plus/components/u-subsection/u-subsection.vue

@@ -217,7 +217,6 @@ export default {
             // #endif
         },
         clickHandler(index) {
-            this.innerCurrent = index
             this.$emit("change", index);
         },
     },