Merge branch 'fanghuisheng' of uskycloud/usky-web-mobile into master

src/api/business/ai.js

@@ -6,6 +6,7 @@ import { fetchs, request } from "@/utils/request";
  * @method recordSelect 历史对话
  * @method Update 重命名对话
  * @method Delete 删除对话
+ * @method changeIt 换一换
  */
 export function aiApi() {
     return {
@@ -36,5 +37,12 @@ export function aiApi() {
                 method: 'DELETE',
             });
         },
+        changeIt: (data) => {
+            return request({
+                url: `/service-ai/ai/aliTyqw-test`,
+                method: 'POST',
+                data,
+            });
+        },
     };
 }

src/api/business/door.js

@@ -9,6 +9,8 @@ import { request } from "@/utils/request";
  * @method RecordInsert 记录列表新增
  * @method RecordSelect 记录列表查询
  * @method control 开门
+ * @method attachUpdate 配置修改
+ * @method MySelect 我的门禁
  */
 export function doorApi() {
     return {
@@ -46,13 +48,6 @@ export function doorApi() {
                 data,
             });
         },
-        MyPage: (data) => {
-            return request({
-                url: `/service-eg/egDevice/wePage`,
-                method: 'POST',
-                data,
-            });
-        },
         RecordSelect: (data) => {
             return request({
                 url: `/service-eg/egRecord/page`,
@@ -67,5 +62,19 @@ export function doorApi() {
                 data,
             });
         },
+        attachUpdate: (data) => {
+            return request({
+                url: `/service-eg/egDevice/attachUpdate`,
+                method: 'PUT',
+                data,
+            });
+        },
+        MyPage: (data) => {
+            return request({
+                url: `/service-eg/egDevice/wePage`,
+                method: 'POST',
+                data,
+            });
+        },
     };
 }

src/pages.json

@@ -1050,6 +1050,18 @@
                         }
                     }
                 },
+                {
+                    "path": "list/setting",
+                    "style": {
+                        "navigationBarTitleText": "设备列表",
+                        "enablePullDownRefresh": false,
+                        "navigationStyle": "custom",
+                        "app-plus": {
+                            "bounce": "none",
+                            "titleNView": false
+                        }
+                    }
+                },
                 {
                     "path": "record/index",
                     "style": {

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

@@ -36,7 +36,7 @@
       <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">
+        <u-grid-item class="p10 radius" bgColor="#FFF" v-for="(item, index) in dataList" :key="index" @click="doorSetting(item)">
           <view
             :style="{
               fontSize: '14px',
@@ -54,7 +54,7 @@
             }"
           >
             <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 class="iconfont oaIcon-open_door ml-auto mtb-auto font30" @click.stop="controlStore.openDoor(item, true)"></view>
           </view>
         </u-grid-item>
       </u-grid>
@@ -118,12 +118,10 @@ function init() {
     });
 }
 
-/**
- * @门禁开门
- */
-function openDoor(event) {
-  event.userName = useStore.nickName;
-  controlStore.openDoor(event);
+/** 门禁设置 */
+function doorSetting(event) {
+  proxy.$tab.navigateTo(`/pages/business/door/list/setting?pagesTitle=${event.deviceName}&id=${event.id}`);
+  console.log(event);
 }
 
 /**
@@ -142,14 +140,6 @@ function refresh() {
   init();
 }
 
-/**
- * @tabs点击事件
- */
-function tabsClick(e) {
-  state.tabsCurrent = e.index;
-  init();
-}
-
 onReady(() => {});
 
 onShow(() => {});

src/pages/business/door/list/setting.vue

@@ -0,0 +1,340 @@
+<template>
+  <u-navbar :titleStyle="{ color: '#000' }" :autoBack="true" :title="pageTitle" :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>
+
+  <oa-scroll
+    customClass="doorSetting-container scroll-height"
+    :isSticky="true"
+    :customStyle="{
+      //#ifdef APP-PLUS || MP-WEIXIN
+      height: `calc(100vh - (44px + ${proxy.$settingStore.StatusBarHeight}))`,
+      //#endif
+      //#ifdef H5
+      height: `calc(100vh - (44px))`,
+      //#endif
+    }"
+    :refresherLoad="false"
+    :refresherEnabled="false"
+    :refresherDefaultStyle="'none'"
+    :refresherBackground="'#f5f6f7'"
+    :data-theme="'theme-' + proxy.$settingStore.themeColor.name"
+  >
+    <template #default>
+      <!-- 顶部区域 -->
+      <view class="top-area">
+        <u-button class="top-area-button" type="primary" @click="controlStore.openDoor({ deviceUuid: deviceUuid }, true)">
+          <view>
+            <u-icon class="top-area-button_icon" name="lock" :size="55" color="white"></u-icon>
+            <view class="top-area-button_title">开启门禁</view>
+          </view>
+        </u-button>
+      </view>
+      <!-- 中心区域 -->
+      <view class="center-area">
+        <view class="center-area-seting">
+          <view class="center-area-seting_title">会客模式</view>
+          <view class="center-area-seting_center">
+            <u-subsection :list="subsection.list" :current="subsection.current" mode="subsection" @change="subsectionChange"></u-subsection>
+          </view>
+        </view>
+
+        <view class="center-area-seting">
+          <view class="center-area-seting_title">门禁配置</view>
+          <view class="center-area-seting_center">
+            <view class="center-area-seting_center_item" v-for="(baseListItem, baseListIndex) in baseList" :key="baseListIndex" v-show="baseListItem.status" @click="handle(baseListItem)">
+              <view class="center-area-seting_center_item_title">{{ baseListItem.title }}</view>
+              <view class="center-area-seting_center_item_subTitle">{{ baseListItem.subTitle }}</view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </template>
+  </oa-scroll>
+
+  <u-modal
+    :show="modal.show"
+    title=""
+    :cancelText="'取消'"
+    :zoom="false"
+    :showConfirmButton="true"
+    :showCancelButton="true"
+    :closeOnClickOverlay="true"
+    @confirm="modalConfirm()"
+    @cancel="modal.show = false"
+    @close="modal.show = false"
+  >
+    <view class="slot-content">
+      <view class="remark" style="" v-if="modal.type == '标识语'">
+        <u-textarea v-model="modal.form.remark" placeholder="请输入标识语" border="none" maxlength="200" style="padding: 0px" autoHeight></u-textarea>
+        <view class="remark_changeIt" @click="changeIt()">换一换</view>
+      </view>
+
+      <view class="imgPath" v-if="modal.type == '屏保'">
+        <oa-upload :uploadCount="1" :uploadImage="modal.form.imgPath" @uploadSuccessChange="uploadSuccessChange" @uploadDeleteChange="uploadDeleteChange"></oa-upload>
+      </view>
+    </view>
+  </u-modal>
+</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";
+import { aiApi } from "@/api/business/ai.js";
+/*----------------------------------组件引入-----------------------------------*/
+/*----------------------------------store引入-----------------------------------*/
+import { useStores, commonStores, controlStores } from "@/store/modules/index";
+/*----------------------------------公共方法引入-----------------------------------*/
+/*----------------------------------公共变量-----------------------------------*/
+const { proxy } = getCurrentInstance();
+const useStore = useStores();
+const controlStore = controlStores();
+/*----------------------------------变量声明-----------------------------------*/
+const state = reactive({
+  pageTitle: "",
+  deviceUuid: "",
+  baseList: [
+    // {
+    //   name: "lock",
+    //   title: "授权",
+    // },
+    // {
+    //   name: "star",
+    //   title: "开门密码",
+    // },
+    {
+      name: "star",
+      title: "标识语",
+      subTitle: "标识语/标语",
+      status: true,
+      type: "remark",
+    },
+    {
+      name: "star",
+      title: "屏保",
+      subTitle: "屏保/主题互动",
+      status: true,
+      type: "imgPath",
+    },
+    {
+      name: "photo",
+      title: "通行记录",
+      subTitle: "通行记录/人员通行记录",
+      status: true,
+      type: "record",
+    },
+  ],
+
+  subsection: {
+    list: ["办公", "会客", "外出", "勿扰"],
+    current: 0,
+    value: "",
+  },
+  modal: {
+    show: false,
+    type: "",
+    form: {
+      id: "",
+      imgPath: "",
+      remark: "",
+      password: "",
+      openMode: "",
+    },
+  },
+});
+const { pageTitle, deviceUuid, baseList, subsection, modal } = toRefs(state);
+
+function subsectionChange(e) {
+  state.subsection.current = e;
+  state.subsection.value = state.subsection.list[e];
+}
+
+/** 操作按钮事件 */
+function handle(event) {
+  if (event.type === "remark") {
+    state.modal.type = "标识语";
+    state.modal.show = true;
+  } else if (event.type === "imgPath") {
+    state.modal.type = "屏保";
+    state.modal.show = true;
+  } else if (event.type === "record") {
+    proxy.$tab.navigateTo(`/pages/business/door/record/index?deviceName=${state.pageTitle}`);
+  }
+}
+
+/** 确认事件 */
+function modalConfirm() {
+  doorApi()
+    .attachUpdate(state.modal.form)
+    .then((response) => {
+      proxy.$modal.msgSuccess("配置成功");
+      state.modal.show = false;
+      state.modal.type = "";
+    })
+    .catch((err) => {
+      state.modal.show = false;
+    });
+}
+
+/** 换一换 */
+function changeIt() {
+  aiApi()
+    .changeIt({
+      content: state.pageTitle + "每天一语简洁",
+    })
+    .then((response) => {
+      console.log(response);
+      const data = response.data;
+      state.modal.form.remark = "";
+      state.modal.form.remark = data.reasoningContent;
+    });
+}
+
+/**
+ * @图片上传成功回调
+ */
+function uploadSuccessChange(e) {
+  state.modal.form.imgPath = e.url;
+}
+
+/**
+ * @图片删除回调
+ */
+function uploadDeleteChange(e) {
+  state.modal.form.imgPath = "";
+}
+
+onReady(() => {});
+
+onShow(() => {});
+
+onLoad((options) => {
+  if ("pagesTitle" in options) {
+    state.pageTitle = options.pagesTitle;
+  }
+  if ("id" in options) {
+    state.modal.form.id = options.id;
+
+    doorApi()
+      .Select({
+        id: options.id,
+        current: 1, //页数
+        size: 20000000, //条数
+      })
+      .then((response) => {
+        const records = response.data.records[0];
+        state.modal.form.id = records.id;
+        state.modal.form.imgPath = records.imgPath;
+        state.modal.form.openMode = records.openMode;
+        state.modal.form.remark = records.remark;
+        state.modal.form.password = records.password;
+
+        state.deviceUuid = records.deviceUuid;
+      })
+      .catch((err) => {});
+  }
+});
+
+onUnload(() => {});
+</script>
+
+<style scoped lang="scss">
+.doorSetting-container {
+  background-color: #fff;
+
+  .top-area {
+    &-button {
+      width: 180px;
+      height: 180px;
+      border-radius: 50%;
+      margin: 50px auto;
+
+      &_icon {
+        justify-content: center;
+        margin-bottom: 5px;
+      }
+
+      &_title {
+        font-size: 16px !important;
+      }
+    }
+  }
+
+  .center-area {
+    padding: 20px;
+
+    &-seting {
+      &_title {
+        color: #999999;
+        font-size: 15px;
+        // font-weight: 600;
+        margin: 20px 0 15px 0;
+      }
+
+      &_center {
+        display: flex;
+        flex-wrap: wrap;
+
+        &_item {
+          width: calc(50% - 10px);
+          padding: 15px;
+          margin-bottom: 15px;
+          border-radius: 10px;
+          box-shadow: 0px 0px 10px rgba(60, 156, 255, 0.1);
+
+          &_title {
+            font-size: 14px;
+            margin-bottom: 5px;
+          }
+
+          &_subTitle {
+            font-size: 12px;
+            color: #999999;
+          }
+        }
+
+        &_item:nth-child(odd) {
+          margin-right: 10px;
+        }
+
+        &_item:nth-child(2n) {
+          margin-left: 10px;
+        }
+      }
+    }
+  }
+}
+
+:deep() {
+  .u-modal {
+    &__content {
+      width: 100%;
+    }
+    .slot-content {
+      width: 100%;
+
+      .remark {
+        position: relative;
+
+        &_changeIt {
+          position: absolute;
+          right: 0;
+          z-index: 5;
+          color: #2979ff;
+        }
+      }
+    }
+  }
+
+  .oa-upload {
+    justify-content: center;
+  }
+}
+</style>

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

@@ -81,6 +81,9 @@ const state = reactive({
   current: 1, //页数
   size: 20, //条数
   total: 0,
+  param: {
+    deviceName: undefined,
+  },
 });
 
 /**
@@ -107,7 +110,6 @@ function refresh() {
 }
 
 /**
- * @通知公告列表
  * @api接口调用
  */
 function selectListApi() {
@@ -117,6 +119,7 @@ function selectListApi() {
       current: state.current, //页数
       size: state.size, //条数
       userName: useStore.nickName,
+      deviceName: state.param.deviceName,
     })
     .then((requset) => {
       if (requset.status === "SUCCESS") {
@@ -131,6 +134,9 @@ function selectListApi() {
 }
 
 onLoad((options) => {
+  if ("deviceName" in options) {
+    state.param.deviceName = options.deviceName;
+  }
   init();
 });
 

src/pages/business/meeting/index.vue

@@ -307,10 +307,7 @@ function changeSheet(e) {
       })
       .then((item) => {
         var records = item.data.records[0];
-        controlStore.openDoor({
-          deviceUuid: records.deviceUuid,
-          userName: useStore.nickName,
-        });
+        controlStore.openDoor({ deviceUuid: records.deviceUuid }, true);
       })
       .catch((err) => {
         console.log(err);

src/pages/login.vue

@@ -179,10 +179,14 @@ function init() {
   //#ifdef H5
   useStore.GetWxOpenId(1); //调用获取微信公众号openId
 
-  if (window.location.host) {
+  if (window.location.host.indexOf("localhost") != -1) {
+    linkUrl.value = "192.168.10.165:13200";
+    useStore.GetMobileTenantConfig({ url: linkUrl.value });
+  } else {
     linkUrl.value = window.location.host;
     useStore.GetMobileTenantConfig({ url: linkUrl.value });
   }
+
   //#endif
 
   //#ifdef APP-PLUS || MP-WEIXIN

src/store/modules/control.js

@@ -1,4 +1,5 @@
 import { defineStore } from "pinia";
+import { useStores } from "@/store/modules/index";
 import { doorApi } from "@/api/business/door.js";
 import { faceApi } from "@/api/business/face.js";
 import { meetingApi, signOnOut } from "@/api/business/meeting.js";
@@ -255,8 +256,9 @@ const controlStore = defineStore("control", {
         /**
          * @门禁开门
          */
-        openDoor(event) {
+        openDoor(event, isToken) {
             var that = this
+
             if (this.isClicked) {
                 modal.msg("请勿重复点击！");
                 return;
@@ -264,13 +266,15 @@ const controlStore = defineStore("control", {
                 this.isClicked = true;
             }
 
+            event.userName = useStores().nickName
+
             doorApi()
                 .control({
-                    domain: !getToken() ? this.form.domain : undefined, //域名
-                    userId: !getToken() ? event.userId : undefined,
-                    userName: !getToken() ? event.userName : undefined,
+                    domain: !isToken ? this.form.domain : undefined, //域名
+                    userId: !isToken ? event.userId : undefined,
+                    userName: !isToken ? event.userName : undefined,
+                    deviceUuid: !isToken ? this.form.doorList.id : event.deviceUuid,
                     productCode: "502_USKY",
-                    deviceUuid: !getToken() ? this.form.doorList.id : event.deviceUuid,
                     commandCode: "door_onoff",
                     commandValue: 1,
                 })
@@ -325,7 +329,7 @@ const controlStore = defineStore("control", {
                         if (that.pageFunction.includes('会议')) {
                             that.meetingVerify(item.data);
                         } else {
-                            that.openDoor(item.data);
+                            that.openDoor(item.data, true);
                         }
                     }
 
@@ -355,7 +359,7 @@ const controlStore = defineStore("control", {
                     })
                     .then((item) => {
                         if (item.data.status == "1") {
-                            that.openDoor(event);
+                            that.openDoor(event, true);
                             that.meetingSign(event);
                         }
                         modal.msg(item.data.msg);
@@ -388,10 +392,7 @@ const controlStore = defineStore("control", {
                 } else if (event.funcName == "人脸识别") {
                     this.faceVerify(event.data.imageBase);
                 } else if (event.funcName == "点击开门") {
-                    this.openDoor({
-                        userId: 99,
-                        userName: "方惠圣",
-                    });
+                    this.openDoor({ userId: 99, userName: "方惠圣", }, false);
                 }
             }
         },