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

src/pages/business/meeting/index.vue

@@ -320,25 +320,6 @@ function changeSheet(e) {
   }
 }
 
-/**
- * @门禁开门
- */
-function openDoor(e) {
-  doorApi()
-    .control({
-      productCode: "502_USKY",
-      deviceUuid: e.deviceUuid,
-      commandCode: "door_onoff",
-      commandValue: 1,
-    })
-    .then((item2) => {
-      proxy.$modal.msg("开门成功");
-    })
-    .catch((err) => {
-      console.log(err);
-    });
-}
-
 /** 操作菜单 */
 function handleSheet(show, type) {
   state.sheet.show = show;

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

@@ -49,7 +49,7 @@
         <view class="content-area-time font14">{{ proxy.$time.jktTimes(date, "否") }}</view>
         <view class="content-area-center bg-white radius mb10 mlr10" v-for="(el, ind) in group" :key="ind">
           <view class="flex mb10">
-            <view class="content-area-center-title font14 mr-auto">方惠圣预约的会议</view>
+            <view class="content-area-center-title font14 mr-auto">{{ el.createBy }}预约的会议</view>
             <!-- <u-icon class="" name="more-dot-fill" size="20" color="#000" @click="moreClick(el)"></u-icon> -->
           </view>
           <view class="mb5">

src/pages/business/zhaf/xunJian/collect/components/collectRecord.vue

@@ -4,7 +4,7 @@
       <view class="u-navbar__content__center__item"> 采集记录 </view>
     </template>
     <template #right>
-      <view class="u-navbar__content__right__item ">
+      <view class="u-navbar__content__right__item">
         <text class="iconfont oaIcon-shaixuan font18" @click="handleIconClick('筛选')"></text>
       </view>
     </template>
@@ -13,6 +13,7 @@
   <oa-scroll
     customClass="scroll-height"
     :total="state.total"
+    :customStyle="{ height: `calc(100vh - (44px + ${proxy.$settingStore.StatusBarHeight} + ${proxy.$settingStore.tabBarHeight}))` }"
     :refresherEnabled="true"
     :refresherEnabledTitle="true"
     :refresherDefaultStyle="'none'"

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

@@ -13,6 +13,7 @@
   <oa-scroll
     customClass="scroll-height"
     :total="xunJianStore.collectDataList.length"
+    :customStyle="{ height: `calc(100vh - (44px + ${proxy.$settingStore.StatusBarHeight} + ${proxy.$settingStore.tabBarHeight}))` }"
     :isSticky="false"
     :refresherEnabled="true"
     :refresherEnabledTitle="true"

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

@@ -151,11 +151,37 @@ async function buttonClick(type) {
     proxy.$tab.navigateBack(1); //返回到需要执行方法的页面
   } else if (type == 2) {
     //提交
+    if (contentList.value.length == 0) {
+      proxy.$modal.msg("巡检内容未配置！");
+      setTimeout(() => {
+        proxy.$tab.navigateBack(3); //返回到需要执行方法的页面
+      }, 1000);
+      return;
+    }
 
-    const recordOptionList = [];
-    if (contentList.value.length > 0) {
-      contentList.value.forEach((e) => {
-        if (e.contentOptionListValue && e.contentOptionList.length > 0) {
+    let recordOptionList = [];
+    let shouldContinue = true;
+
+    for (const e of contentList.value) {
+      if (!shouldContinue) break; // 如果应该停止，则跳出循环
+
+      try {
+        if (!e.contentOptionListValue && e.contentOptionListValue1 == 0) {
+          shouldContinue = false; // 调用失败时终止循环
+          throw `请检查“${e.contentTitle}”内容是否填写！`;
+        }
+
+        if (e.submissionMethod == 1 && e.contentOptionListValue1 > 0) {
+          e.contentOptionListValue1.forEach((l) => {
+            recordOptionList.push({
+              contentId: e.id,
+              contentOptionId: l,
+              remarks: e.remarks,
+            });
+          });
+        }
+
+        if (e.submissionMethod == 2 && e.contentOptionListValue) {
           recordOptionList.push({
             contentId: e.id,
             contentOptionId: e.contentOptionListValue,
@@ -163,24 +189,17 @@ async function buttonClick(type) {
           });
         }
 
-        if (e.contentOptionListValue && e.contentOptionList.length == 0) {
+        if (e.submissionMethod == 3 && e.contentOptionListValue) {
           recordOptionList.push({
             contentId: e.id,
             content: e.contentOptionListValue,
             remarks: e.remarks,
           });
         }
-
-        if (e.contentOptionListValue1.length > 0) {
-          e.contentOptionListValue1.forEach((l) => {
-            recordOptionList.push({
-              contentId: e.id,
-              contentOptionId: l,
-              remarks: e.remarks,
-            });
-          });
-        }
-      });
+      } catch (error) {
+        proxy.$modal.msg(error);
+        shouldContinue = false; // 调用失败时终止循环
+      }
     }
 
     const array = {
@@ -209,16 +228,14 @@ async function buttonClick(type) {
           content.value = "提交成功，确定后返回！";
           show.value = true;
           errorApi()
-            .Insert(
-              {
-                "eventName": "巡检事件",
-                "eventType": 9,
-                "eventLevel": 1,
-                "eventCategory": 9,
-                "deviceId": proxy.$settingStore.deviceList.deviceId,
-                "planId": xunJianStore.planId
-              }
-            )
+            .Insert({
+              eventName: "巡检事件",
+              eventType: 9,
+              eventLevel: 1,
+              eventCategory: 9,
+              deviceId: proxy.$settingStore.deviceList.deviceId,
+              planId: xunJianStore.planId,
+            })
             .catch((err) => {
               proxy.$modal.msg(err);
             });

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

@@ -114,11 +114,12 @@ function pulicClick(obj) {
     xunJianStore.inspectionStatus = 1;
     xunJianStore.siteId = obj.id;
     xunJianStore.siteNubmber = "";
-
     if (obj.siteType == 1) {
       scanClick();
     } else if (obj.siteType == 2) {
       nfcClick();
+    } else {
+      siteDetailsApi(obj.siteNubmber); //测试专用
     }
   }
 }
@@ -215,50 +216,46 @@ function currentApi() {
 /**
  * @异常上报
  */
-function AbnormalReport(){
+function AbnormalReport() {
   errorApi()
-  .Insert(
-    {
-      "eventName": "执行任务",
-      "eventType": 8,
-      "eventLevel": 1,
-      "eventCategory": 8,
-      "deviceId": proxy.$settingStore.deviceList.deviceId,
-      "planId": xunJianStore.planId
-    }
-  )
-  .catch((err) => {
-    proxy.$modal.msg(err);
-  });
+    .Insert({
+      eventName: "执行任务",
+      eventType: 8,
+      eventLevel: 1,
+      eventCategory: 8,
+      deviceId: proxy.$settingStore.deviceList.deviceId,
+      planId: xunJianStore.planId,
+    })
+    .catch((err) => {
+      proxy.$modal.msg(err);
+    });
 }
 
 /**
  * @结束巡检
  */
 function endInspection() {
-
   errorApi()
-  .Insert(
-    {
-      "eventName": "结束巡检",
-      "eventType": 10,
-      "eventLevel": 1,
-      "eventCategory": 10,
-      "deviceId": proxy.$settingStore.deviceList.deviceId,
-      "planId": xunJianStore.planId
-    }
-  ).then(() => {
-    proxy.$modal.msg("结束巡检成功");
-    uni.navigateBack();
-  })
-  .catch((err) => {
-    proxy.$modal.msg(err);
-  });
+    .Insert({
+      eventName: "结束巡检",
+      eventType: 10,
+      eventLevel: 1,
+      eventCategory: 10,
+      deviceId: proxy.$settingStore.deviceList.deviceId,
+      planId: xunJianStore.planId,
+    })
+    .then(() => {
+      proxy.$modal.msg("结束巡检成功");
+      uni.navigateBack();
+    })
+    .catch((err) => {
+      proxy.$modal.msg(err);
+    });
 }
 
 onLoad((options) => {
   currentApi();
-  AbnormalReport()
+  AbnormalReport();
 });
 
 onShow(() => {

src/static/iconfont/iconfont.css

@@ -1,9 +1,8 @@
-/* 在线链接服务仅供平台体验和调试使用，平台不承诺服务的稳定性，企业客户需下载字体包自行发布使用并做好备份。 */
 @font-face {
-  font-family: 'iconfont';  /* Project id 4510027 */
-  src: url('https://at.alicdn.com/t/c/font_4510027_3kicjk51jpr.woff2?t=1740548739368') format('woff2'),
-  url('https://at.alicdn.com/t/c/font_4510027_3kicjk51jpr.woff?t=1740548739368') format('woff'),
-  url('https://at.alicdn.com/t/c/font_4510027_3kicjk51jpr.ttf?t=1740548739368') format('truetype');
+  font-family: "iconfont"; /* Project id 4510027 */
+  src: url('iconfont.woff2?t=1741163438430') format('woff2'),
+       url('iconfont.woff?t=1741163438430') format('woff'),
+       url('iconfont.ttf?t=1741163438430') format('truetype');
 }
 
 .iconfont {
@@ -14,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.oaIcon-exit:before {
+  content: "\e62a";
+}
+
 .oaIcon-tab-reportCount:before {
   content: "\e624";
 }