公共消息通知悬浮窗/主题样式完善

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

@@ -1,5 +1,5 @@
-<template :data-theme="'theme-' + proxy.$settingStore.themeColor.name">
-  <u-sticky bgColor="#fff" style="box-shadow: 1px 1px 4px rgb(26 26 26 / 10%)">
+<template>
+  <u-sticky class="shadow-default" bgColor="#fff">
     <u-tabs
       :list="list"
       :current="current"
@@ -8,79 +8,80 @@
       lineColor="#333"
       :activeStyle="{ color: '#333' }"
       :inactiveStyle="{ color: '#909399' }"
-      style="border-bottom: 1px solid #eaeef1"
     ></u-tabs>
   </u-sticky>
 
-  <view class="deviceManage" @touchstart="fingerstart" @touchend="fingerend">
-    <uni-swipe-action>
-      <uni-swipe-action-item style="background-color: #ffffff">
-        <view class="content1">
-          <view style="padding: 10px">
-            <u-input style="border-radius: 50px" v-model="dataInput" @blur="blur" prefixIcon="search" prefixIconStyle="color: #0c7bf9" placeholder="请输入设备编号"> </u-input>
-          </view>
+  <scroll-view class="scroll-height" :scroll-y="true" :data-theme="'theme-' + proxy.$settingStore.themeColor.name" style="padding-bottom: 44px">
+    <view class="deviceManage" @touchstart="fingerstart" @touchend="fingerend">
+      <uni-swipe-action>
+        <uni-swipe-action-item class="bg-white">
+          <view class="content1">
+            <view style="padding: 10px">
+              <u-input style="border-radius: 50px" v-model="dataInput" @blur="blur" prefixIcon="search" prefixIconStyle="color: #0c7bf9" placeholder="请输入设备编号"> </u-input>
+            </view>
 
-          <u-empty v-if="!dataRes" text="暂无数据" mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png"> </u-empty>
+            <u-empty v-if="dataList.length <= 0" text="暂无数据" mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png"> </u-empty>
 
-          <u-collapse @change="change" @close="close" @open="open" accordion v-else>
-            <u-collapse-item class="uCollapseItem" v-for="da in dataList" :key="da">
-              <template #title>
-                <view style="display: flex">
-                  <view class="cu-avatar lg" style="margin: 0 10px auto 0; background-color: rgba(0, 0, 0, 0)">
-                    <image class="image-bg" style="width: 80rpx; height: 80rpx" src="@/static/images/deviceManage/1.png"></image>
-                  </view>
-                  <view style="width: 100%">
-                    <view style="display: flex; color: #000000">
-                      <view>设备编号：{{ da.deviceCode }}</view>
-                      <view v-if="da.deviceStatus == 0" style="margin-left: 20px; font-size: 12px; background-color: #aeaeae; color: #ffffff; padding: 0 5px; border-radius: 20px; line-height: 20px">
-                        离线
+            <u-collapse @change="change" @close="close" @open="open" accordion v-else>
+              <u-collapse-item class="uCollapseItem" v-for="da in dataList" :key="da">
+                <template #title>
+                  <view style="display: flex">
+                    <view class="cu-avatar lg" style="margin: 0 10px auto 0; background-color: rgba(0, 0, 0, 0)">
+                      <image class="image-bg" style="width: 80rpx; height: 80rpx" src="@/static/images/deviceManage/1.png"></image>
+                    </view>
+                    <view style="width: 100%">
+                      <view style="display: flex; color: #000000">
+                        <view>设备编号：{{ da.deviceCode }}</view>
+                        <view v-if="da.deviceStatus == 0" style="margin-left: 20px; font-size: 12px; background-color: #aeaeae; color: #ffffff; padding: 0 5px; border-radius: 20px; line-height: 20px">
+                          离线
+                        </view>
+                        <view
+                          v-else-if="da.deviceStatus == 1"
+                          style="margin-left: 20px; font-size: 12px; background-color: #12c100; color: #ffffff; padding: 0 5px; border-radius: 20px; line-height: 20px"
+                        >
+                          正常
+                        </view>
+                        <view
+                          v-else-if="da.deviceStatus == 2"
+                          style="margin-left: 20px; font-size: 12px; background-color: #ff1313; color: #ffffff; padding: 0 5px; border-radius: 20px; line-height: 20px"
+                        >
+                          故障
+                        </view>
+                        <view v-else style="margin-left: 20px; font-size: 12px; background-color: #0d88f0; color: #ffffff; padding: 0 5px; border-radius: 20px; line-height: 20px"> 告警 </view>
                       </view>
-                      <view
-                        v-else-if="da.deviceStatus == 1"
-                        style="margin-left: 20px; font-size: 12px; background-color: #12c100; color: #ffffff; padding: 0 5px; border-radius: 20px; line-height: 20px"
-                      >
-                        正常
+                      <view style="display: flex; font-size: 14px; color: #666666; margin: 10px 0">
+                        <view style="width: 50%; word-break: break-all">监测对象：{{ da.installAddress }}</view>
+                        <view style="width: 50%; word-break: break-all; padding-left: 10px">所属单位：{{ da.companyName }}</view>
                       </view>
-                      <view
-                        v-else-if="da.deviceStatus == 2"
-                        style="margin-left: 20px; font-size: 12px; background-color: #ff1313; color: #ffffff; padding: 0 5px; border-radius: 20px; line-height: 20px"
-                      >
-                        故障
+                      <view style="display: flex; font-size: 14px; color: #666666">
+                        <view style="width: 50%; word-break: break-all">负责人：{{ da.linkPerson }}</view>
+                        <view style="width: 50%; word-break: break-all; padding-left: 10px">联系电话：{{ da.linkPhone }}</view>
                       </view>
-                      <view v-else style="margin-left: 20px; font-size: 12px; background-color: #0d88f0; color: #ffffff; padding: 0 5px; border-radius: 20px; line-height: 20px"> 告警 </view>
-                    </view>
-                    <view style="display: flex; font-size: 14px; color: #666666; margin: 10px 0">
-                      <view style="width: 50%; word-break: break-all">监测对象：{{ da.installAddress }}</view>
-                      <view style="width: 50%; word-break: break-all; padding-left: 10px">所属单位：{{ da.companyName }}</view>
-                    </view>
-                    <view style="display: flex; font-size: 14px; color: #666666">
-                      <view style="width: 50%; word-break: break-all">负责人：{{ da.linkPerson }}</view>
-                      <view style="width: 50%; word-break: break-all; padding-left: 10px">联系电话：{{ da.linkPhone }}</view>
                     </view>
                   </view>
-                </view>
-              </template>
+                </template>
 
-              <view class="u-collapse-content">
-                <!-- <view style="display: flex; flex-wrap: wrap; margin-left: 5%">
+                <view class="u-collapse-content">
+                  <!-- <view style="display: flex; flex-wrap: wrap; margin-left: 5%">
                   <view style="width: 50%; height: 30px; line-height: 30px" v-for="ch in da.dataList" :key="ch">
                     <span>{{ ch.label }}：</span>
                     <span :style="ch.value === '正常' ? 'color:#12C100' : 'color:#FF0101'">{{ ch.value }}</span>
                   </view>
                 </view> -->
-                <view style="display: flex; flex-wrap: wrap; margin-left: 5%">
-                  <view style="width: 50%; height: 30px; line-height: 30px" v-for="ch in da.dataList" :key="ch">
-                    <span>{{ ch.portName }}：</span>
-                    <span>{{ ch.portData }}</span>
+                  <view style="display: flex; flex-wrap: wrap; margin-left: 5%">
+                    <view style="width: 50%; height: 30px; line-height: 30px" v-for="ch in da.dataList" :key="ch">
+                      <span>{{ ch.portName }}：</span>
+                      <span>{{ ch.portData }}</span>
+                    </view>
                   </view>
                 </view>
-              </view>
-            </u-collapse-item>
-          </u-collapse>
-        </view>
-      </uni-swipe-action-item>
-    </uni-swipe-action>
-  </view>
+              </u-collapse-item>
+            </u-collapse>
+          </view>
+        </uni-swipe-action-item>
+      </uni-swipe-action>
+    </view>
+  </scroll-view>
 </template>
 
 <script setup>
@@ -194,7 +195,7 @@ function rightscroll(dista) {
   if (current.value >= 1) {
     current.value--;
   } else {
-    current.value = 0;
+    current.value = list.value.length - 1;
   }
 }
 /**
@@ -224,12 +225,6 @@ function classifySearch(params) {
     console.log(res.data.records);
 
     dataList.value = res.data.records;
-
-    if (!dataList.value[0]) {
-      dataRes.value = 0;
-    } else {
-      dataRes.value = 1;
-    }
   });
 }
 // end
@@ -286,9 +281,6 @@ onMounted(() => {});
 </script>
 
 <style lang="scss">
-body {
-  background: #fff;
-}
 .is-selected {
   color: #1989fa;
 }

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

@@ -1,21 +1,23 @@
 <template>
-  <view class="fireReport">
-    <u-empty v-if="dataList.length <= 0" text="暂无数据" mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png"> </u-empty>
-    <view class="reportContent" v-else>
-      <view class="contentDom" v-for="(li, index) in dataList" :key="index">
-        <view style="margin: auto 10px auto 0" @click="handleSelect()">
-          <u-image src="@/static/images/fireReport/icon1.png" width="13px" height="13px"></u-image>
-        </view>
-        <view style="margin: 0 auto 0 0" @click="handleSelect(li.reportPath)">
-          <view>{{ li.reportName }}</view>
-        </view>
-        <view>
-          <view style="color: #3c9cff; cursor: pointer" @click="handleDownload(li.reportPath)">下载报告</view>
+  <scroll-view class="scroll-height" :scroll-y="true" :data-theme="'theme-' + proxy.$settingStore.themeColor.name">
+    <view class="fireReport">
+      <u-empty v-if="dataList.length <= 0" text="暂无数据" mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png"> </u-empty>
+      <view class="reportContent" v-else>
+        <view class="contentDom" v-for="(li, index) in dataList" :key="index">
+          <view style="margin: auto 10px auto 0" @click="handleSelect()">
+            <u-image src="@/static/images/fireReport/icon1.png" width="13px" height="13px"></u-image>
+          </view>
+          <view style="margin: 0 auto 0 0" @click="handleSelect(li.reportPath)">
+            <view>{{ li.reportName }}</view>
+          </view>
+          <view>
+            <view style="color: #3c9cff; cursor: pointer" @click="handleDownload(li.reportPath)">下载报告</view>
+          </view>
         </view>
+        <u-loadmore :status="status" />
       </view>
-      <u-loadmore :status="status" />
     </view>
-  </view>
+  </scroll-view>
 </template>
 
 <script setup>

src/pages/business/mhxf/informationSelect-test/index.vue

@@ -1,14 +1,6 @@
 <template>
-  <u-sticky bgColor="#fff" style="box-shadow: 1px 1px 4px rgb(26 26 26 / 10%)">
-    <u-tabs
-      :list="list"
-      :current="current"
-      @click="tabsClick"
-      lineColor="#333"
-      :activeStyle="{ color: '#333' }"
-      :inactiveStyle="{ color: '#909399' }"
-      style="border-bottom: 1px solid #eaeef1"
-    ></u-tabs>
+  <u-sticky class="shadow-default" bgColor="#fff">
+    <u-tabs :list="list" :current="current" @click="tabsClick" lineColor="#333" :activeStyle="{ color: '#333' }" :inactiveStyle="{ color: '#909399' }"></u-tabs>
   </u-sticky>
 
   <view class="informationSelect" @touchstart="fingerstart" @touchend="fingerend" style="background-color: #ffffff">

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

@@ -1,44 +1,38 @@
 <template>
-  <u-sticky bgColor="#fff" style="box-shadow: 1px 1px 4px rgb(26 26 26 / 10%)">
-    <u-tabs
-      :list="list"
-      :current="current"
-      @click="tabsClick"
-      lineColor="#333"
-      :activeStyle="{ color: '#333' }"
-      :inactiveStyle="{ color: '#909399' }"
-      style="border-bottom: 1px solid #eaeef1"
-    ></u-tabs>
+  <u-sticky class="shadow-default" bgColor="#fff">
+    <u-tabs :list="list" :current="current" @click="tabsClick" lineColor="#333" :activeStyle="{ color: '#333' }" :inactiveStyle="{ color: '#909399' }"></u-tabs>
   </u-sticky>
 
-  <view class="informationSelect" @touchstart="fingerstart" @touchend="fingerend" style="background-color: #ffffff">
-    <uni-swipe-action>
-      <uni-swipe-action-item>
-        <!-- 各类查询 start -->
-        <view class="content">
-          <u-input style="border-radius: 50px; margin-bottom: 10px" @blur="blur" v-model="dataInput" prefixIcon="search" prefixIconStyle="color: #0c7bf9" :placeholder="placeholderText"> </u-input>
-          <u-empty v-if="!dataRes" text="暂无数据" mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png"> </u-empty>
-          <view v-if="current == 8">
-            <view class="con">
-              <view class="time">{{ newTime }}</view>
-              <video src="http://file.usky.cn/statics/video/20230203.mp4" autoplay :controls="false" :show-center-play-btn="false" :loop="true" style="width: 100%"></video>
+  <scroll-view class="bg-white scroll-height" :scroll-y="true" :data-theme="'theme-' + proxy.$settingStore.themeColor.name" style="padding-bottom: 44px">
+    <view class="bg-white informationSelect" @touchstart="fingerstart" @touchend="fingerend">
+      <uni-swipe-action>
+        <uni-swipe-action-item>
+          <!-- 各类查询 start -->
+          <view class="content">
+            <u-input style="border-radius: 50px; margin-bottom: 10px" @blur="blur" v-model="dataInput" prefixIcon="search" prefixIconStyle="color: #0c7bf9" :placeholder="placeholderText"> </u-input>
+            <u-empty v-if="!dataRes" text="暂无数据" mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png"> </u-empty>
+            <view v-if="current == 8">
+              <view class="con">
+                <view class="time">{{ newTime }}</view>
+                <video src="http://file.usky.cn/statics/video/20230203.mp4" autoplay :controls="false" :show-center-play-btn="false" :loop="true" style="width: 100%"></video>
+              </view>
+            </view>
+            <view v-else>
+              <u-row v-for="po in classifyData" :key="po">
+                <u-col span="4">
+                  <view style="text-align: right; padding: 0px 5px 0px 5px">{{ po.title }}</view>
+                </u-col>
+                <u-col span="8">
+                  <view style="text-align: left; padding: 0px 5px 0px 5px">{{ po.value }}</view>
+                </u-col>
+              </u-row>
             </view>
           </view>
-          <view v-else>
-            <u-row v-for="po in classifyData" :key="po">
-              <u-col span="4">
-                <view style="text-align: right; padding: 0px 5px 0px 5px">{{ po.title }}</view>
-              </u-col>
-              <u-col span="8">
-                <view style="text-align: left; padding: 0px 5px 0px 5px">{{ po.value }}</view>
-              </u-col>
-            </u-row>
-          </view>
-        </view>
-        <!-- 各类查询 end -->
-      </uni-swipe-action-item>
-    </uni-swipe-action>
-  </view>
+          <!-- 各类查询 end -->
+        </uni-swipe-action-item>
+      </uni-swipe-action>
+    </view>
+  </scroll-view>
 </template>
 
 <script setup>

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

@@ -1,172 +1,186 @@
 <template>
-  <u-sticky bgColor="#fff" style="box-shadow: 1px 1px 4px rgb(26 26 26 / 10%)">
-    <u-tabs
-      :list="list"
-      :current="current"
-      @click="tabsClick"
-      lineColor="#333"
-      :activeStyle="{ color: '#333' }"
-      :inactiveStyle="{ color: '#909399' }"
-      style="border-bottom: 1px solid #eaeef1"
-    ></u-tabs>
+  <u-sticky class="shadow-default" bgColor="#fff">
+    <u-tabs :list="list" :current="current" @click="tabsClick" lineColor="#333" :activeStyle="{ color: '#333' }" :inactiveStyle="{ color: '#909399' }"></u-tabs>
   </u-sticky>
 
-  <view class="needMatter" @touchstart="fingerstart" @touchend="fingerend">
-    <u-empty v-if="classifyData.length <= 0" text="暂无数据" mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png"> </u-empty>
-
-    <view class="content" v-else>
-      <u-collapse>
-        <u-collapse-item v-for="(cl, index) in classifyData" :key="index">
-          <template #title>
-            <view style="display: flex; line-height: 25px">
-              <view style="padding-top: 4px">
-                <u--image src="/static/images/needMatter/icon1.png" width="14px" height="15px"></u--image>
-              </view>
-              <view style="padding: 0 10px; white-space: nowrap; font-size: 16px">
-                <view>待办通知</view>
-                <view>建议完成限期：</view>
-                <view style="font-size: 14px; color: #666666">{{ cl.reformId }}</view>
-              </view>
-              <view style="width: 100%; text-align: center; font-size: 16px">
-                <view
-                  :style="{
-                    color:
-                      cl.reformStatus == 1 ? '#0887F8' : cl.reformStatus == 2 ? '#23DEDC' : cl.reformStatus == 3 ? '#16BF00' : cl.reformStatus == 4 ? '#F94343' : cl.reformStatus == 5 ? '#9D40F3' : '',
-                  }"
-                >
-                  {{
-                    cl.reformStatus == 1 ? "已接收" : cl.reformStatus == 2 ? "进行中" : cl.reformStatus == 3 ? "待办完成" : cl.reformStatus == 4 ? "审核不通过" : cl.reformStatus == 5 ? "审核通过" : ""
-                  }}
+  <scroll-view class="scroll-height" :scroll-y="true" :data-theme="'theme-' + proxy.$settingStore.themeColor.name" style="padding-bottom: 44px">
+    <view class="needMatter" @touchstart="fingerstart" @touchend="fingerend">
+      <u-empty v-if="classifyData.length <= 0" text="暂无数据" mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png"> </u-empty>
+
+      <view class="content" v-else>
+        <u-collapse>
+          <u-collapse-item v-for="(cl, index) in classifyData" :key="index">
+            <template #title>
+              <view style="display: flex; line-height: 25px">
+                <view style="padding-top: 4px">
+                  <u--image src="/static/images/needMatter/icon1.png" width="14px" height="15px"></u--image>
+                </view>
+                <view style="padding: 0 10px; white-space: nowrap; font-size: 16px">
+                  <view>待办通知</view>
+                  <view>建议完成限期：</view>
+                  <view style="font-size: 14px; color: #666666">{{ cl.reformId }}</view>
+                </view>
+                <view style="width: 100%; text-align: center; font-size: 16px">
+                  <view
+                    :style="{
+                      color:
+                        cl.reformStatus == 1
+                          ? '#0887F8'
+                          : cl.reformStatus == 2
+                          ? '#23DEDC'
+                          : cl.reformStatus == 3
+                          ? '#16BF00'
+                          : cl.reformStatus == 4
+                          ? '#F94343'
+                          : cl.reformStatus == 5
+                          ? '#9D40F3'
+                          : '',
+                    }"
+                  >
+                    {{
+                      cl.reformStatus == 1
+                        ? "已接收"
+                        : cl.reformStatus == 2
+                        ? "进行中"
+                        : cl.reformStatus == 3
+                        ? "待办完成"
+                        : cl.reformStatus == 4
+                        ? "审核不通过"
+                        : cl.reformStatus == 5
+                        ? "审核通过"
+                        : ""
+                    }}
+                  </view>
+                  <view style="text-align: left">{{ cl.limitTime }}</view>
+                  <view style="font-size: 14px; color: #666666">{{ cl.sendTime }}</view>
                 </view>
-                <view style="text-align: left">{{ cl.limitTime }}</view>
-                <view style="font-size: 14px; color: #666666">{{ cl.sendTime }}</view>
               </view>
-            </view>
-          </template>
-          <view class="u-collapse-content">
-            <view class="tableType1" style="margin-bottom: 10px">
-              <u-row>
-                <u-col span="2">
-                  <view>序号</view>
-                </u-col>
-                <u-col span="5.5">
-                  <view>待办项</view>
-                </u-col>
-                <u-col span="4.5">
-                  <view>原因</view>
-                </u-col>
-              </u-row>
-              <u-row v-for="(co, index) in cl.reformPart.data" :key="index">
-                <u-col span="2">
-                  <view>{{ index + 1 }}</view>
-                </u-col>
-                <u-col span="5.5">
-                  <view>{{ co.item }}</view>
-                </u-col>
-                <u-col span="4.5">
-                  <view>{{ co.reason }}</view>
-                </u-col>
-              </u-row>
-            </view>
+            </template>
+            <view class="u-collapse-content">
+              <view class="tableType1" style="margin-bottom: 10px">
+                <u-row>
+                  <u-col span="2">
+                    <view>序号</view>
+                  </u-col>
+                  <u-col span="5.5">
+                    <view>待办项</view>
+                  </u-col>
+                  <u-col span="4.5">
+                    <view>原因</view>
+                  </u-col>
+                </u-row>
+                <u-row v-for="(co, index) in cl.reformPart.data" :key="index">
+                  <u-col span="2">
+                    <view>{{ index + 1 }}</view>
+                  </u-col>
+                  <u-col span="5.5">
+                    <view>{{ co.item }}</view>
+                  </u-col>
+                  <u-col span="4.5">
+                    <view>{{ co.reason }}</view>
+                  </u-col>
+                </u-row>
+              </view>
 
-            <view v-if="cl.reformStatus == 1">
-              <u-steps current="0" dot>
-                <u-steps-item style="text-align: center" title="已接收" :desc="cl.sendTime ? cl.sendTime.replace(' ', '\n') : ''"> </u-steps-item>
-                <u-steps-item style="text-align: center" title="进行中" :desc="cl.reformTime ? cl.reformTime.replace(' ', '\n') : ''"></u-steps-item>
-                <u-steps-item style="text-align: center" title="待审核" :desc="cl.reviewTime ? cl.reviewTime.replace(' ', '\n') : ''"></u-steps-item>
-              </u-steps>
+              <view v-if="cl.reformStatus == 1">
+                <u-steps current="0" dot>
+                  <u-steps-item style="text-align: center" title="已接收" :desc="cl.sendTime ? cl.sendTime.replace(' ', '\n') : ''"> </u-steps-item>
+                  <u-steps-item style="text-align: center" title="进行中" :desc="cl.reformTime ? cl.reformTime.replace(' ', '\n') : ''"></u-steps-item>
+                  <u-steps-item style="text-align: center" title="待审核" :desc="cl.reviewTime ? cl.reviewTime.replace(' ', '\n') : ''"></u-steps-item>
+                </u-steps>
 
-              <view style="font-size: 14px; line-height: 20px; margin-top: 10px">
-                <u-button style="width: 60px; height: 23px" type="primary" text="去整改" shape="circle" @click="handleSubmit(cl, '去整改')"></u-button>
+                <view style="font-size: 14px; line-height: 20px; margin-top: 10px">
+                  <u-button style="width: 60px; height: 23px" type="primary" text="去整改" shape="circle" @click="handleSubmit(cl, '去整改')"></u-button>
+                </view>
               </view>
-            </view>
 
-            <view v-if="cl.reformStatus == 2">
-              <u-steps current="1" dot>
-                <u-steps-item style="text-align: center" title="已接收" :desc="cl.sendTime ? cl.sendTime.replace(' ', '\n') : ''"> </u-steps-item>
-                <u-steps-item style="text-align: center" title="进行中" :desc="cl.reformTime ? cl.reformTime.replace(' ', '\n') : ''"></u-steps-item>
-                <u-steps-item style="text-align: center" title="待审核" :desc="cl.reviewTime ? cl.reviewTime.replace(' ', '\n') : ''"></u-steps-item>
-              </u-steps>
+              <view v-if="cl.reformStatus == 2">
+                <u-steps current="1" dot>
+                  <u-steps-item style="text-align: center" title="已接收" :desc="cl.sendTime ? cl.sendTime.replace(' ', '\n') : ''"> </u-steps-item>
+                  <u-steps-item style="text-align: center" title="进行中" :desc="cl.reformTime ? cl.reformTime.replace(' ', '\n') : ''"></u-steps-item>
+                  <u-steps-item style="text-align: center" title="待审核" :desc="cl.reviewTime ? cl.reviewTime.replace(' ', '\n') : ''"></u-steps-item>
+                </u-steps>
 
-              <view style="font-size: 14px; line-height: 20px; margin-top: 10px">
-                <u-button style="width: 60px; height: 23px" type="primary" text="填报" shape="circle" @click="handleSubmit(cl, '填报')"></u-button>
+                <view style="font-size: 14px; line-height: 20px; margin-top: 10px">
+                  <u-button style="width: 60px; height: 23px" type="primary" text="填报" shape="circle" @click="handleSubmit(cl, '填报')"></u-button>
+                </view>
               </view>
-            </view>
 
-            <view v-if="cl.reformStatus == 3">
-              <u-steps current="1" dot>
-                <u-steps-item style="text-align: center" title="已接收" :desc="cl.sendTime ? cl.sendTime.replace(' ', '\n') : ''"> </u-steps-item>
-                <u-steps-item style="text-align: center" title="待办完成" :desc="cl.reformTime ? cl.reformTime.replace(' ', '\n') : ''"></u-steps-item>
-                <u-steps-item style="text-align: center" title="待审核" :desc="cl.reviewTime ? cl.reviewTime.replace(' ', '\n') : ''"></u-steps-item>
-              </u-steps>
-            </view>
+              <view v-if="cl.reformStatus == 3">
+                <u-steps current="1" dot>
+                  <u-steps-item style="text-align: center" title="已接收" :desc="cl.sendTime ? cl.sendTime.replace(' ', '\n') : ''"> </u-steps-item>
+                  <u-steps-item style="text-align: center" title="待办完成" :desc="cl.reformTime ? cl.reformTime.replace(' ', '\n') : ''"></u-steps-item>
+                  <u-steps-item style="text-align: center" title="待审核" :desc="cl.reviewTime ? cl.reviewTime.replace(' ', '\n') : ''"></u-steps-item>
+                </u-steps>
+              </view>
 
-            <view v-if="cl.reformStatus == 4">
-              <u-steps current="2" dot>
-                <u-steps-item style="text-align: center" title="已接收" :desc="cl.sendTime ? cl.sendTime.replace(' ', '\n') : ''"> </u-steps-item>
-                <u-steps-item style="text-align: center" title="待办完成" :desc="cl.reformTime ? cl.reformTime.replace(' ', '\n') : ''"></u-steps-item>
-                <u-steps-item style="text-align: center" title="审核不通过" :desc="cl.reviewTime ? cl.reviewTime.replace(' ', '\n') : ''" error></u-steps-item>
-              </u-steps>
+              <view v-if="cl.reformStatus == 4">
+                <u-steps current="2" dot>
+                  <u-steps-item style="text-align: center" title="已接收" :desc="cl.sendTime ? cl.sendTime.replace(' ', '\n') : ''"> </u-steps-item>
+                  <u-steps-item style="text-align: center" title="待办完成" :desc="cl.reformTime ? cl.reformTime.replace(' ', '\n') : ''"></u-steps-item>
+                  <u-steps-item style="text-align: center" title="审核不通过" :desc="cl.reviewTime ? cl.reviewTime.replace(' ', '\n') : ''" error></u-steps-item>
+                </u-steps>
 
-              <view style="font-size: 14px; line-height: 20px; margin-top: 10px">
-                <view>备注：{{ cl.reviewRemark ? cl.reviewRemark : "无" }}</view>
-              </view>
+                <view style="font-size: 14px; line-height: 20px; margin-top: 10px">
+                  <view>备注：{{ cl.reviewRemark ? cl.reviewRemark : "无" }}</view>
+                </view>
 
-              <view style="font-size: 14px; line-height: 20px; margin-top: 10px">
-                <u-button style="width: 60px; height: 23px" type="primary" text="去整改" shape="circle" @click="handleSubmit(cl, '去整改')"></u-button>
+                <view style="font-size: 14px; line-height: 20px; margin-top: 10px">
+                  <u-button style="width: 60px; height: 23px" type="primary" text="去整改" shape="circle" @click="handleSubmit(cl, '去整改')"></u-button>
+                </view>
               </view>
-            </view>
 
-            <view v-if="cl.reformStatus == 5">
-              <u-steps current="2" dot>
-                <u-steps-item style="text-align: center" title="已接收" :desc="cl.sendTime ? cl.sendTime.replace(' ', '\n') : ''"> </u-steps-item>
-                <u-steps-item style="text-align: center" title="待办完成" :desc="cl.reformTime ? cl.reformTime.replace(' ', '\n') : ''"></u-steps-item>
-                <u-steps-item style="text-align: center" title="审核通过" :desc="cl.reviewTime ? cl.reviewTime.replace(' ', '\n') : ''"></u-steps-item>
-              </u-steps>
-
-              <view style="font-size: 14px; line-height: 20px; margin-top: 10px">
-                <view style="display: flex">
-                  <view style="white-space: nowrap">整改资料：</view>
-                  <view style="width: 100%">
-                    <view style="display: flex" v-for="(i, index) in 5" :key="index">
-                      <view>{{ cl["reformPathName" + (index + 1)] }}</view>
-                      <!-- <view style="margin: auto 0 auto auto">
+              <view v-if="cl.reformStatus == 5">
+                <u-steps current="2" dot>
+                  <u-steps-item style="text-align: center" title="已接收" :desc="cl.sendTime ? cl.sendTime.replace(' ', '\n') : ''"> </u-steps-item>
+                  <u-steps-item style="text-align: center" title="待办完成" :desc="cl.reformTime ? cl.reformTime.replace(' ', '\n') : ''"></u-steps-item>
+                  <u-steps-item style="text-align: center" title="审核通过" :desc="cl.reviewTime ? cl.reviewTime.replace(' ', '\n') : ''"></u-steps-item>
+                </u-steps>
+
+                <view style="font-size: 14px; line-height: 20px; margin-top: 10px">
+                  <view style="display: flex">
+                    <view style="white-space: nowrap">整改资料：</view>
+                    <view style="width: 100%">
+                      <view style="display: flex" v-for="(i, index) in 5" :key="index">
+                        <view>{{ cl["reformPathName" + (index + 1)] }}</view>
+                        <!-- <view style="margin: auto 0 auto auto">
                         <u--image src="/static/images/needMatter/icon2.png" width="15px" height="15px"></u--image>
                       </view> -->
+                      </view>
                     </view>
                   </view>
+                  <u-line style="margin: 5px 0" color="#E5E5E5"></u-line>
+                  <view>备注：{{ cl.reviewRemark ? cl.reviewRemark : "无" }}</view>
                 </view>
-                <u-line style="margin: 5px 0" color="#E5E5E5"></u-line>
-                <view>备注：{{ cl.reviewRemark ? cl.reviewRemark : "无" }}</view>
               </view>
             </view>
-          </view>
-        </u-collapse-item>
-      </u-collapse>
-
-      <view>
-        <u-modal
-          :show="modalShow"
-          title="填报（火灾报警系统）"
-          :showCancelButton="true"
-          :showConfirmButton="true"
-          :closeOnClickOverlay="true"
-          @close="modalShow = false"
-          @cancel="modalShow = false"
-          @confirm="handleConfirm"
-        >
-          <view style="width: 100%">
-            <uni-section title="图片上传：" type="line">
-              <u-upload :fileList="fileList" name="6" @afterRead="afterRead" multiple :maxCount="5" width="80" height="80"> </u-upload>
-            </uni-section>
-            <uni-section title="备注：" type="line">
-              <u--textarea v-model="textValue" placeholder="请输入内容"></u--textarea>
-            </uni-section>
-          </view>
-        </u-modal>
+          </u-collapse-item>
+        </u-collapse>
+
+        <view>
+          <u-modal
+            :show="modalShow"
+            title="填报（火灾报警系统）"
+            :showCancelButton="true"
+            :showConfirmButton="true"
+            :closeOnClickOverlay="true"
+            @close="modalShow = false"
+            @cancel="modalShow = false"
+            @confirm="handleConfirm"
+          >
+            <view style="width: 100%">
+              <uni-section title="图片上传：" type="line">
+                <u-upload :fileList="fileList" name="6" @afterRead="afterRead" multiple :maxCount="5" width="80" height="80"> </u-upload>
+              </uni-section>
+              <uni-section title="备注：" type="line">
+                <u--textarea v-model="textValue" placeholder="请输入内容"></u--textarea>
+              </uni-section>
+            </view>
+          </u-modal>
+        </view>
       </view>
     </view>
-  </view>
+  </scroll-view>
 </template>
 
 <script setup>

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

@@ -1,316 +1,313 @@
 <template>
-  <view id="unitInfoCollection" v-if="!successBool">
-    <view>
-      <u-notice-bar text="注：信息提交后不可修改，提交前请核对填写是否有误" :duration="7000" color="#FF0000" bgColor="#FFFFFF"></u-notice-bar>
-    </view>
+  <scroll-view class="scroll-height" :scroll-y="true" :data-theme="'theme-' + proxy.$settingStore.themeColor.name">
+    <view id="unitInfoCollection" v-if="!successBool">
+      <view>
+        <u-notice-bar text="注：信息提交后不可修改，提交前请核对填写是否有误" :duration="7000" color="#FF0000" bgColor="#FFFFFF"></u-notice-bar>
+      </view>
 
-    <view class="centerOne" v-if="pagingBool">
-      <view class="title"> 单位基本信息（1/2） </view>
-
-      <u--form :model="form" ref="uForm" :rules="rules" labelWidth="130">
-        <view style="padding: 10px 0">
-          <view style="padding: 10px 10px 20px 10px; background: #ffffff">
-            <view style="padding-left: 9px">
-              <u-form-item label="单位名称" prop="companyName" required :borderBottom="true">
-                <u-input v-model="form.companyName" placeholder="请输入单位名称" border="none">
-                  <template #suffix>
-                    <u-icon name="search" color="#999999" size="22" @click="companySubmit(form.companyName)"></u-icon>
-                  </template>
-                </u-input>
-              </u-form-item>
-              <u-form-item label="统一社会信用代码" prop="organization" required :borderBottom="true">
-                <u-input v-model="form.organization" placeholder="请输入统一社会信用代码" border="none" maxlength="18" />
-              </u-form-item>
-              <u-form-item label="法人代表" prop="delegateName" required :borderBottom="true">
-                <u-input v-model="form.delegateName" placeholder="请输入法人代表" border="none" />
-              </u-form-item>
-              <u-form-item label="所属街镇" prop="streetTown" required :borderBottom="true" @click="handleAction('所属街镇')">
-                <u-input v-model="form.streetTown" placeholder="请选择所属街镇" suffixIcon="arrow-right" suffixIconStyle="color: #909399" border="none" disabledColor="transparent" disabled />
-              </u-form-item>
-              <u-form-item label="单位地址" prop="address" required :borderBottom="true">
-                <u-input v-model="form.address" placeholder="请输入单位地址" border="none" />
-              </u-form-item>
-              <u-form-item label="消防管理人电话" prop="fireManagePhone" required :borderBottom="true">
-                <u-input v-model="form.fireManagePhone" placeholder="请输入消防管理人电话" border="none" maxlength="11" />
-              </u-form-item>
-              <u-form-item label="成立时间" prop="foundTime" required :borderBottom="true" @click="handleDateTime('成立时间', 0, form.foundTime)">
-                <u-input v-model="form.foundTime" placeholder="请选择成立时间" border="none" suffixIcon="calendar" suffixIconStyle="color: #909399;font-size:22px" />
-              </u-form-item>
-              <u-form-item label="单位使用性质" prop="companyNature" :borderBottom="true" @click="handleAction('单位使用性质')" required>
-                <u-input v-model="form.companyNature" placeholder="请选择单位使用性质" suffixIcon="arrow-right" suffixIconStyle="color: #909399" border="none" disabledColor="transparent" disabled />
-              </u-form-item>
-              <u-form-item label="产证" prop="birthCert" :borderBottom="true" @click="handleAction('产证')" required>
-                <u-input v-model="form.birthCert" placeholder="请选择产证" suffixIcon="arrow-right" suffixIconStyle="color: #909399" border="none" disabledColor="transparent" disabled />
-              </u-form-item>
-              <u-form-item label="单位建筑面积" prop="buildArea" :borderBottom="true" required>
-                <u-input type="number" v-model="form.buildArea" placeholder="请输入单位建筑面积" suffixIcon="平方米" suffixIconStyle="color:#999999;font-size:15px" border="none" />
-              </u-form-item>
-              <u-form-item label="消防安全责任人" prop="fireDutyName" :borderBottom="true">
-                <u-input v-model="form.fireDutyName" placeholder="请输入消防安全责任人" border="none" />
-              </u-form-item>
-              <u-form-item label="消防安全管理人" prop="fireManageName" :borderBottom="true">
-                <u-input v-model="form.fireManageName" placeholder="请输入消防安全管理人" border="none" />
-              </u-form-item>
-              <u-form-item label="职工人数" prop="employeeNum" :borderBottom="true">
-                <u-input type="digit" v-model="form.employeeNum" placeholder="请输入职工人数" suffixIcon="人" suffixIconStyle="color:#999999;font-size:15px" border="none" />
-              </u-form-item>
-              <u-form-item label="固定资产(万元）" prop="fixedAssets" :borderBottom="true">
-                <u-input type="number" v-model="form.fixedAssets" placeholder="请输入固定资产(万元）" suffixIcon="万元" suffixIconStyle="color:#999999;font-size:15px" border="none" />
-              </u-form-item>
+      <view class="centerOne" v-if="pagingBool">
+        <view class="title"> 单位基本信息（1/2） </view>
+
+        <u--form :model="form" ref="uForm" :rules="rules" labelWidth="130">
+          <view style="padding: 10px 0">
+            <view style="padding: 10px 10px 20px 10px; background: #ffffff">
+              <view style="padding-left: 9px">
+                <u-form-item label="单位名称" prop="companyName" required :borderBottom="true">
+                  <u-input v-model="form.companyName" placeholder="请输入单位名称" border="none">
+                    <template #suffix>
+                      <u-icon name="search" color="#999999" size="22" @click="companySubmit(form.companyName)"></u-icon>
+                    </template>
+                  </u-input>
+                </u-form-item>
+                <u-form-item label="统一社会信用代码" prop="organization" required :borderBottom="true">
+                  <u-input v-model="form.organization" placeholder="请输入统一社会信用代码" border="none" maxlength="18" />
+                </u-form-item>
+                <u-form-item label="法人代表" prop="delegateName" required :borderBottom="true">
+                  <u-input v-model="form.delegateName" placeholder="请输入法人代表" border="none" />
+                </u-form-item>
+                <u-form-item label="所属街镇" prop="streetTown" required :borderBottom="true" @click="handleAction('所属街镇')">
+                  <u-input v-model="form.streetTown" placeholder="请选择所属街镇" suffixIcon="arrow-right" suffixIconStyle="color: #909399" border="none" disabledColor="transparent" disabled />
+                </u-form-item>
+                <u-form-item label="单位地址" prop="address" required :borderBottom="true">
+                  <u-input v-model="form.address" placeholder="请输入单位地址" border="none" />
+                </u-form-item>
+                <u-form-item label="消防管理人电话" prop="fireManagePhone" required :borderBottom="true">
+                  <u-input v-model="form.fireManagePhone" placeholder="请输入消防管理人电话" border="none" maxlength="11" />
+                </u-form-item>
+                <u-form-item label="成立时间" prop="foundTime" required :borderBottom="true" @click="handleDateTime('成立时间', 0, form.foundTime)">
+                  <u-input v-model="form.foundTime" placeholder="请选择成立时间" border="none" suffixIcon="calendar" suffixIconStyle="color: #909399;font-size:22px" />
+                </u-form-item>
+                <u-form-item label="单位使用性质" prop="companyNature" :borderBottom="true" @click="handleAction('单位使用性质')" required>
+                  <u-input v-model="form.companyNature" placeholder="请选择单位使用性质" suffixIcon="arrow-right" suffixIconStyle="color: #909399" border="none" disabledColor="transparent" disabled />
+                </u-form-item>
+                <u-form-item label="产证" prop="birthCert" :borderBottom="true" @click="handleAction('产证')" required>
+                  <u-input v-model="form.birthCert" placeholder="请选择产证" suffixIcon="arrow-right" suffixIconStyle="color: #909399" border="none" disabledColor="transparent" disabled />
+                </u-form-item>
+                <u-form-item label="单位建筑面积" prop="buildArea" :borderBottom="true" required>
+                  <u-input type="number" v-model="form.buildArea" placeholder="请输入单位建筑面积" suffixIcon="平方米" suffixIconStyle="color:#999999;font-size:15px" border="none" />
+                </u-form-item>
+                <u-form-item label="消防安全责任人" prop="fireDutyName" :borderBottom="true">
+                  <u-input v-model="form.fireDutyName" placeholder="请输入消防安全责任人" border="none" />
+                </u-form-item>
+                <u-form-item label="消防安全管理人" prop="fireManageName" :borderBottom="true">
+                  <u-input v-model="form.fireManageName" placeholder="请输入消防安全管理人" border="none" />
+                </u-form-item>
+                <u-form-item label="职工人数" prop="employeeNum" :borderBottom="true">
+                  <u-input type="digit" v-model="form.employeeNum" placeholder="请输入职工人数" suffixIcon="人" suffixIconStyle="color:#999999;font-size:15px" border="none" />
+                </u-form-item>
+                <u-form-item label="固定资产(万元）" prop="fixedAssets" :borderBottom="true">
+                  <u-input type="number" v-model="form.fixedAssets" placeholder="请输入固定资产(万元）" suffixIcon="万元" suffixIconStyle="color:#999999;font-size:15px" border="none" />
+                </u-form-item>
+              </view>
             </view>
           </view>
-        </view>
-      </u--form>
+        </u--form>
 
-      <view style="padding-bottom: 70px"> </view>
+        <view style="padding-bottom: 70px"> </view>
 
-      <view style="position: fixed; left: 0; right: 0; bottom: 0; padding: 15px">
-        <view>
-          <u-button type="primary" style="width: 100%; height: 40px; font-size: 14px" @click="handleSubmit('下一步')" shape="circle"> 下一步 </u-button>
+        <view class="app-position-fixed">
+          <u-button class="app-buttom" type="primary" @click="handleSubmit('下一步')" shape="circle"> 下一步 </u-button>
         </view>
       </view>
-    </view>
 
-    <view class="centerTwo" v-else>
-      <view class="title"> 所在建筑信息（2/2） </view>
+      <view class="centerTwo" v-else>
+        <view class="title"> 所在建筑信息（2/2） </view>
 
-      <u--form ref="uForm1" :model="form" :rules="rules" labelWidth="130">
-        <view style="padding: 10px 0" v-for="(li, index) in form.baseBuildList" :key="index">
-          <view class="" style="padding: 10px 10px 20px 10px; background: #ffffff">
-            <view style="display: flex; overflow: hidden">
-              <image style="width: 15px; height: 15px; margin: auto 10px auto 0" src="@/static/images/unitInfoCollection/icon1.png" />
-              <view style="margin: auto auto auto 0">建筑{{ index + 1 }}</view>
-              <u-icon v-if="form.baseBuildList.length > 1" name="trash" color="#FF0000" size="20" style="float: right" @click="deleteSubmit('建筑', index)"></u-icon>
-            </view>
-            <view style="padding-left: 9px">
-              <u-form-item label="建筑名称" :prop="`baseBuildList.${index}.baseBuild.buildName`" required :borderBottom="true">
-                <u-input v-model="li.baseBuild.buildName" placeholder="请输入建筑名称" border="none" maxlength="30" />
-              </u-form-item>
-              <u-form-item label="建筑地址" :prop="`baseBuildList.${index}.baseBuild.address`" required :borderBottom="true">
-                <u-input v-model="li.baseBuild.address" placeholder="请输入建筑地址" border="none" maxlength="100" />
-              </u-form-item>
-              <u-form-item label="建筑结构" :prop="`baseBuildList.${index}.baseBuild.buildStructure`" required :borderBottom="true" @click="handleAction('建筑结构', index)">
-                <u-input
-                  v-model="li.baseBuild.buildStructure"
-                  placeholder="请选择建筑结构"
-                  border="none"
-                  suffixIcon="arrow-right"
-                  suffixIconStyle="color: #909399"
-                  disabledColor="transparent"
-                  disabled
-                />
-              </u-form-item>
-
-              <u-form-item v-if="li.baseBuild.buildStructure === '钢结构'" label="是否有防火涂层" :prop="`baseBuildList.${index}.baseBuild.fireproofCoat`" required :borderBottom="true">
-                <u-radio-group v-model="li.baseBuild.fireproofCoat" placement="row">
-                  <u-radio style="margin-right: 30px" :name="0" label="无"></u-radio>
-                  <u-radio :name="1" label="有"></u-radio>
-                </u-radio-group>
-              </u-form-item>
-
-              <u-form-item label="建筑高度" :prop="`baseBuildList.${index}.baseBuild.buildHigh`" required :borderBottom="true">
-                <u-input type="number" v-model="li.baseBuild.buildHigh" placeholder="请输入建筑高度" suffixIcon="米" suffixIconStyle="color: #909399;font-size:15px" border="none" maxlength="20" />
-              </u-form-item>
-              <u-form-item label="地上层数" :prop="`baseBuildList.${index}.baseBuild.aboveFloor`" required :borderBottom="true">
-                <u-input type="number" v-model="li.baseBuild.aboveFloor" placeholder="请输入地上层数" border="none" maxlength="5" />
-              </u-form-item>
-              <u-form-item label="地下层数" prop="li.underFloor" :borderBottom="true">
-                <u-input type="number" v-model="li.baseBuild.underFloor" placeholder="请输入地下层数" border="none" maxlength="5" />
-              </u-form-item>
-              <u-form-item label="建筑面积" :prop="`baseBuildList.${index}.baseBuild.buildArea`" required :borderBottom="true">
-                <u-input type="digit" v-model="li.baseBuild.buildArea" placeholder="请输入建筑面积" suffixIcon="平方米" suffixIconStyle="color:#999999;font-size:15px" border="none" maxlength="20" />
-              </u-form-item>
-              <u-form-item label="地下空间" prop="li.underSpace" :borderBottom="true">
-                <u-input
-                  type="number"
-                  v-model="li.baseBuild.underSpace"
-                  placeholder="请输入地下空间面积"
-                  suffixIcon="平方米"
-                  suffixIconStyle="color:#999999;font-size:15px"
-                  border="none"
-                  maxlength="20"
-                />
-              </u-form-item>
-              <u-form-item label="建成年份" :prop="`baseBuildList.${index}.baseBuild.completeYear`" required :borderBottom="true" @click="handleDateTime('建成年份', index, li.completeYear)">
-                <u-input
-                  v-model="li.baseBuild.completeYear"
-                  placeholder="请选择建成年份"
-                  suffixIcon="calendar"
-                  suffixIconStyle="color: #909399;font-size:22px"
-                  border="none"
-                  disabledColor="transparent"
-                  disabled
-                />
-              </u-form-item>
-              <u-form-item label="使用性质" :prop="`baseBuildList.${index}.baseBuild.useCharacter`" required :borderBottom="true" @click="handleAction('使用性质', index)">
-                <u-input
-                  v-model="li.baseBuild.useCharacter"
-                  placeholder="请选择使用性质"
-                  suffixIcon="arrow-right"
-                  suffixIconStyle="color: #909399"
-                  border="none"
-                  disabledColor="transparent"
-                  disabled
-                />
-              </u-form-item>
-
-              <view
-                v-if="
-                  li.baseBuild.useCharacter == '生产类厂房' || li.baseBuild.useCharacter == '仓库、物流' || li.baseBuild.useCharacter == '涉及易燃易爆危险品的单位（生产、充装、储存、供应、销售等）'
-                "
-              >
-                <view style="margin: 10px 0; text-align: center">危险品生产数量（吨/月）</view>
-                <u-form-item label="甲类" prop="li.baseBuildAttach.hazardousProduceA" :borderBottom="true">
-                  <u-input type="number" v-model="li.baseBuildAttach.hazardousProduceA" placeholder="请输入甲类" border="none" maxlength="24" />
+        <u--form ref="uForm1" :model="form" :rules="rules" labelWidth="130">
+          <view style="padding: 10px 0" v-for="(li, index) in form.baseBuildList" :key="index">
+            <view class="" style="padding: 10px 10px 20px 10px; background: #ffffff">
+              <view style="display: flex; overflow: hidden">
+                <image style="width: 15px; height: 15px; margin: auto 10px auto 0" src="@/static/images/unitInfoCollection/icon1.png" />
+                <view style="margin: auto auto auto 0">建筑{{ index + 1 }}</view>
+                <u-icon v-if="form.baseBuildList.length > 1" name="trash" color="#FF0000" size="20" style="float: right" @click="deleteSubmit('建筑', index)"></u-icon>
+              </view>
+              <view style="padding-left: 9px">
+                <u-form-item label="建筑名称" :prop="`baseBuildList.${index}.baseBuild.buildName`" required :borderBottom="true">
+                  <u-input v-model="li.baseBuild.buildName" placeholder="请输入建筑名称" border="none" maxlength="30" />
                 </u-form-item>
-                <u-form-item label="乙类" prop="li.baseBuildAttach.hazardousProduceB" :borderBottom="true">
-                  <u-input type="number" v-model="li.baseBuildAttach.hazardousProduceB" placeholder="请输入乙类" border="none" maxlength="24" />
+                <u-form-item label="建筑地址" :prop="`baseBuildList.${index}.baseBuild.address`" required :borderBottom="true">
+                  <u-input v-model="li.baseBuild.address" placeholder="请输入建筑地址" border="none" maxlength="100" />
                 </u-form-item>
-                <u-form-item label="丙类" prop="li.baseBuildAttach.hazardousProduceC" :borderBottom="true">
-                  <u-input type="number" v-model="li.baseBuildAttach.hazardousProduceC" placeholder="请输入丙类" border="none" maxlength="24" />
+                <u-form-item label="建筑结构" :prop="`baseBuildList.${index}.baseBuild.buildStructure`" required :borderBottom="true" @click="handleAction('建筑结构', index)">
+                  <u-input
+                    v-model="li.baseBuild.buildStructure"
+                    placeholder="请选择建筑结构"
+                    border="none"
+                    suffixIcon="arrow-right"
+                    suffixIconStyle="color: #909399"
+                    disabledColor="transparent"
+                    disabled
+                  />
                 </u-form-item>
-                <u-form-item label="丁戊类" prop="li.baseBuildAttach.hazardousProduceD" :borderBottom="true">
-                  <u-input type="number" v-model="li.baseBuildAttach.hazardousProduceD" placeholder="请输入丁戊类" border="none" maxlength="24" />
+
+                <u-form-item v-if="li.baseBuild.buildStructure === '钢结构'" label="是否有防火涂层" :prop="`baseBuildList.${index}.baseBuild.fireproofCoat`" required :borderBottom="true">
+                  <u-radio-group v-model="li.baseBuild.fireproofCoat" placement="row">
+                    <u-radio style="margin-right: 30px" :name="0" label="无"></u-radio>
+                    <u-radio :name="1" label="有"></u-radio>
+                  </u-radio-group>
                 </u-form-item>
-                <view style="margin: 10px 0; text-align: center">危险品存储数量（吨）</view>
-                <u-form-item label="甲类" prop="li.baseBuildAttach.hazardousStorageA" :borderBottom="true">
-                  <u-input type="number" v-model="li.baseBuildAttach.hazardousStorageA" placeholder="请输入甲类" border="none" maxlength="24" />
+
+                <u-form-item label="建筑高度" :prop="`baseBuildList.${index}.baseBuild.buildHigh`" required :borderBottom="true">
+                  <u-input type="number" v-model="li.baseBuild.buildHigh" placeholder="请输入建筑高度" suffixIcon="米" suffixIconStyle="color: #909399;font-size:15px" border="none" maxlength="20" />
                 </u-form-item>
-                <u-form-item label="乙类" prop="li.baseBuildAttach.hazardousStorageB" :borderBottom="true">
-                  <u-input type="number" v-model="li.baseBuildAttach.hazardousStorageB" placeholder="请输入乙类" border="none" maxlength="24" />
+                <u-form-item label="地上层数" :prop="`baseBuildList.${index}.baseBuild.aboveFloor`" required :borderBottom="true">
+                  <u-input type="number" v-model="li.baseBuild.aboveFloor" placeholder="请输入地上层数" border="none" maxlength="5" />
                 </u-form-item>
-                <u-form-item label="丙类" prop="li.baseBuildAttach.hazardousStorageC" :borderBottom="true">
-                  <u-input type="number" v-model="li.baseBuildAttach.hazardousStorageC" placeholder="请输入丙类" border="none" maxlength="24" />
+                <u-form-item label="地下层数" prop="li.underFloor" :borderBottom="true">
+                  <u-input type="number" v-model="li.baseBuild.underFloor" placeholder="请输入地下层数" border="none" maxlength="5" />
                 </u-form-item>
-                <u-form-item label="丁戊类" prop="li.baseBuildAttach.hazardousStorageD" :borderBottom="true">
-                  <u-input type="number" v-model="li.baseBuildAttach.hazardousStorageD" placeholder="请输入丁戊类" border="none" maxlength="24" />
+                <u-form-item label="建筑面积" :prop="`baseBuildList.${index}.baseBuild.buildArea`" required :borderBottom="true">
+                  <u-input type="digit" v-model="li.baseBuild.buildArea" placeholder="请输入建筑面积" suffixIcon="平方米" suffixIconStyle="color:#999999;font-size:15px" border="none" maxlength="20" />
+                </u-form-item>
+                <u-form-item label="地下空间" prop="li.underSpace" :borderBottom="true">
+                  <u-input
+                    type="number"
+                    v-model="li.baseBuild.underSpace"
+                    placeholder="请输入地下空间面积"
+                    suffixIcon="平方米"
+                    suffixIconStyle="color:#999999;font-size:15px"
+                    border="none"
+                    maxlength="20"
+                  />
+                </u-form-item>
+                <u-form-item label="建成年份" :prop="`baseBuildList.${index}.baseBuild.completeYear`" required :borderBottom="true" @click="handleDateTime('建成年份', index, li.completeYear)">
+                  <u-input
+                    v-model="li.baseBuild.completeYear"
+                    placeholder="请选择建成年份"
+                    suffixIcon="calendar"
+                    suffixIconStyle="color: #909399;font-size:22px"
+                    border="none"
+                    disabledColor="transparent"
+                    disabled
+                  />
+                </u-form-item>
+                <u-form-item label="使用性质" :prop="`baseBuildList.${index}.baseBuild.useCharacter`" required :borderBottom="true" @click="handleAction('使用性质', index)">
+                  <u-input
+                    v-model="li.baseBuild.useCharacter"
+                    placeholder="请选择使用性质"
+                    suffixIcon="arrow-right"
+                    suffixIconStyle="color: #909399"
+                    border="none"
+                    disabledColor="transparent"
+                    disabled
+                  />
                 </u-form-item>
-              </view>
-
-              <u-form-item label="消防设施设置" :prop="`baseBuildList.${index}.baseBuild.fireFacilitySystem`" required :borderBottom="true">
-                <u-checkbox-group v-model="li.baseBuild.fireFacilitySystem" placement="column" @change="checkboxChange">
-                  <u-checkbox :customStyle="{ marginBottom: '8px' }" label="自动喷水灭火系统" :name="1"> </u-checkbox>
-                  <u-checkbox :customStyle="{ marginBottom: '8px' }" label="火灾自动报警系统" :name="2"> </u-checkbox>
-                  <u-checkbox :customStyle="{ marginBottom: '8px' }" label="防排烟与排烟系统" :name="3"> </u-checkbox>
-                  <u-checkbox :customStyle="{ marginBottom: '8px' }" label="消防物联网系统" :name="4"> </u-checkbox>
-                </u-checkbox-group>
-              </u-form-item>
-
-              <u-form-item label="其他设施" :prop="`li.baseBuildList.baseBuild.otherSystem`" :borderBottom="true">
-                <u-checkbox-group v-model="li.baseBuild.otherSystem" placement="column" @change="checkboxChange">
-                  <u-checkbox :customStyle="{ marginBottom: '8px' }" label="泡沫灭火系统" :name="1"> </u-checkbox>
-                  <u-checkbox :customStyle="{ marginBottom: '8px' }" label="水喷雾、细水雾灭火系统" :name="2"> </u-checkbox>
-                  <u-checkbox :customStyle="{ marginBottom: '8px' }" label="消防炮、自动跟踪定位射流灭火系统" :name="3"> </u-checkbox>
-                  <u-checkbox :customStyle="{ marginBottom: '8px' }" label="气体灭火系统" :name="4"> </u-checkbox>
-                  <u-checkbox :customStyle="{ marginBottom: '8px' }" label="干粉灭火系统" :name="5"> </u-checkbox>
-                  <u-checkbox :customStyle="{ marginBottom: '8px' }" label="其他" :name="6"> </u-checkbox>
-                  <u-input v-if="li.baseBuild.otherSystem.includes(6)" v-model="li.baseBuild.otherFacilities" placeholder="请输入消防设施名称" border="none" />
-                </u-checkbox-group>
-              </u-form-item>
-
-              <view>
-                <view v-for="(base, baseIndex) in li.baseBuildExtinguishList" :key="baseIndex">
-                  <view style="margin: 10px 0; text-align: left">
-                    {{ "灭火器" + (baseIndex + 1) }}
-                    <u-icon v-if="li.baseBuildExtinguishList.length > 1" name="trash" color="#FF0000" size="20" style="float: right" @click="deleteSubmit('灭火器', index, baseIndex)"></u-icon>
-                  </view>
 
-                  <u-form-item
-                    label="类型"
-                    :prop="`baseBuildList.${index}.baseBuildExtinguishList.${baseIndex}.extinguishType`"
-                    required
-                    :borderBottom="true"
-                    @click="handleAction('灭火器', index, baseIndex)"
-                  >
-                    <u-input v-model="base.extinguishType" placeholder="请选择类型" border="none" suffixIcon="arrow-right" suffixIconStyle="color: #909399" disabledColor="transparent" disabled />
+                <view
+                  v-if="
+                    li.baseBuild.useCharacter == '生产类厂房' || li.baseBuild.useCharacter == '仓库、物流' || li.baseBuild.useCharacter == '涉及易燃易爆危险品的单位（生产、充装、储存、供应、销售等）'
+                  "
+                >
+                  <view style="margin: 10px 0; text-align: center">危险品生产数量（吨/月）</view>
+                  <u-form-item label="甲类" prop="li.baseBuildAttach.hazardousProduceA" :borderBottom="true">
+                    <u-input type="number" v-model="li.baseBuildAttach.hazardousProduceA" placeholder="请输入甲类" border="none" maxlength="24" />
+                  </u-form-item>
+                  <u-form-item label="乙类" prop="li.baseBuildAttach.hazardousProduceB" :borderBottom="true">
+                    <u-input type="number" v-model="li.baseBuildAttach.hazardousProduceB" placeholder="请输入乙类" border="none" maxlength="24" />
+                  </u-form-item>
+                  <u-form-item label="丙类" prop="li.baseBuildAttach.hazardousProduceC" :borderBottom="true">
+                    <u-input type="number" v-model="li.baseBuildAttach.hazardousProduceC" placeholder="请输入丙类" border="none" maxlength="24" />
+                  </u-form-item>
+                  <u-form-item label="丁戊类" prop="li.baseBuildAttach.hazardousProduceD" :borderBottom="true">
+                    <u-input type="number" v-model="li.baseBuildAttach.hazardousProduceD" placeholder="请输入丁戊类" border="none" maxlength="24" />
                   </u-form-item>
-                  <u-form-item label="数量" :prop="`baseBuildList.${index}.baseBuildExtinguishList.${baseIndex}.extinguishNum`" :borderBottom="true" required>
-                    <u-input type="number" v-model="base.extinguishNum" placeholder="请输入数量" border="none" maxlength="10" />
+                  <view style="margin: 10px 0; text-align: center">危险品存储数量（吨）</view>
+                  <u-form-item label="甲类" prop="li.baseBuildAttach.hazardousStorageA" :borderBottom="true">
+                    <u-input type="number" v-model="li.baseBuildAttach.hazardousStorageA" placeholder="请输入甲类" border="none" maxlength="24" />
+                  </u-form-item>
+                  <u-form-item label="乙类" prop="li.baseBuildAttach.hazardousStorageB" :borderBottom="true">
+                    <u-input type="number" v-model="li.baseBuildAttach.hazardousStorageB" placeholder="请输入乙类" border="none" maxlength="24" />
+                  </u-form-item>
+                  <u-form-item label="丙类" prop="li.baseBuildAttach.hazardousStorageC" :borderBottom="true">
+                    <u-input type="number" v-model="li.baseBuildAttach.hazardousStorageC" placeholder="请输入丙类" border="none" maxlength="24" />
+                  </u-form-item>
+                  <u-form-item label="丁戊类" prop="li.baseBuildAttach.hazardousStorageD" :borderBottom="true">
+                    <u-input type="number" v-model="li.baseBuildAttach.hazardousStorageD" placeholder="请输入丁戊类" border="none" maxlength="24" />
                   </u-form-item>
                 </view>
-                <u-button
-                  type="primary"
-                  style="width: 100px; height: 25px; margin-top: 10px"
-                  v-if="li.baseBuildExtinguishList.length < 6"
-                  @click="addSubmit('灭火器', index)"
-                  shape="circle"
-                  icon="plus"
-                  :plain="true"
-                  size="mini"
-                >
-                  添加灭火器
-                </u-button>
+
+                <u-form-item label="消防设施设置" :prop="`baseBuildList.${index}.baseBuild.fireFacilitySystem`" required :borderBottom="true">
+                  <u-checkbox-group v-model="li.baseBuild.fireFacilitySystem" placement="column" @change="checkboxChange">
+                    <u-checkbox :customStyle="{ marginBottom: '8px' }" label="自动喷水灭火系统" :name="1"> </u-checkbox>
+                    <u-checkbox :customStyle="{ marginBottom: '8px' }" label="火灾自动报警系统" :name="2"> </u-checkbox>
+                    <u-checkbox :customStyle="{ marginBottom: '8px' }" label="防排烟与排烟系统" :name="3"> </u-checkbox>
+                    <u-checkbox :customStyle="{ marginBottom: '8px' }" label="消防物联网系统" :name="4"> </u-checkbox>
+                  </u-checkbox-group>
+                </u-form-item>
+
+                <u-form-item label="其他设施" :prop="`li.baseBuildList.baseBuild.otherSystem`" :borderBottom="true">
+                  <u-checkbox-group v-model="li.baseBuild.otherSystem" placement="column" @change="checkboxChange">
+                    <u-checkbox :customStyle="{ marginBottom: '8px' }" label="泡沫灭火系统" :name="1"> </u-checkbox>
+                    <u-checkbox :customStyle="{ marginBottom: '8px' }" label="水喷雾、细水雾灭火系统" :name="2"> </u-checkbox>
+                    <u-checkbox :customStyle="{ marginBottom: '8px' }" label="消防炮、自动跟踪定位射流灭火系统" :name="3"> </u-checkbox>
+                    <u-checkbox :customStyle="{ marginBottom: '8px' }" label="气体灭火系统" :name="4"> </u-checkbox>
+                    <u-checkbox :customStyle="{ marginBottom: '8px' }" label="干粉灭火系统" :name="5"> </u-checkbox>
+                    <u-checkbox :customStyle="{ marginBottom: '8px' }" label="其他" :name="6"> </u-checkbox>
+                    <u-input v-if="li.baseBuild.otherSystem.includes(6)" v-model="li.baseBuild.otherFacilities" placeholder="请输入消防设施名称" border="none" />
+                  </u-checkbox-group>
+                </u-form-item>
+
+                <view>
+                  <view v-for="(base, baseIndex) in li.baseBuildExtinguishList" :key="baseIndex">
+                    <view style="margin: 10px 0; text-align: left">
+                      {{ "灭火器" + (baseIndex + 1) }}
+                      <u-icon v-if="li.baseBuildExtinguishList.length > 1" name="trash" color="#FF0000" size="20" style="float: right" @click="deleteSubmit('灭火器', index, baseIndex)"></u-icon>
+                    </view>
+
+                    <u-form-item
+                      label="类型"
+                      :prop="`baseBuildList.${index}.baseBuildExtinguishList.${baseIndex}.extinguishType`"
+                      required
+                      :borderBottom="true"
+                      @click="handleAction('灭火器', index, baseIndex)"
+                    >
+                      <u-input v-model="base.extinguishType" placeholder="请选择类型" border="none" suffixIcon="arrow-right" suffixIconStyle="color: #909399" disabledColor="transparent" disabled />
+                    </u-form-item>
+                    <u-form-item label="数量" :prop="`baseBuildList.${index}.baseBuildExtinguishList.${baseIndex}.extinguishNum`" :borderBottom="true" required>
+                      <u-input type="number" v-model="base.extinguishNum" placeholder="请输入数量" border="none" maxlength="10" />
+                    </u-form-item>
+                  </view>
+                  <u-button
+                    style="width: 100px; height: 25px; margin-top: 10px"
+                    v-if="li.baseBuildExtinguishList.length < 6"
+                    @click="addSubmit('灭火器', index)"
+                    shape="circle"
+                    icon="plus"
+                    :plain="true"
+                    size="mini"
+                  >
+                    添加灭火器
+                  </u-button>
+                </view>
               </view>
             </view>
           </view>
-        </view>
-      </u--form>
+        </u--form>
 
-      <view style="padding-bottom: 70px">
-        <u-button type="primary" style="width: 25%; height: 25px; margin-top: 10px" @click="addSubmit('建筑')" shape="circle" icon="plus" size="mini"> 添加建筑 </u-button>
-      </view>
+        <view style="padding-bottom: 70px">
+          <u-button type="primary" style="width: 25%; height: 25px; margin-top: 10px" @click="addSubmit('建筑')" shape="circle" icon="plus" size="mini"> 添加建筑 </u-button>
+        </view>
 
-      <view style="position: fixed; left: 0; right: 0; bottom: 0; padding: 15px; background-color: transparent">
-        <view style="display: flex">
-          <u-button style="width: 50%; height: 40px; font-size: 14px; margin-right: 15px" @click="handleSubmit('上一步')" shape="circle" customStyle="border-color:#3c9cff;color:#3c9cff">
-            上一步
-          </u-button>
+        <view class="app-position-fixed">
+          <view class="app-flex">
+            <u-button class="app-buttom" style="margin-right: 15px" @click="handleSubmit('上一步')" shape="circle"> 上一步 </u-button>
 
-          <u-button type="primary" style="width: 50%; height: 40px; font-size: 14px" @click="handleSubmit('提交')" shape="circle"> 提交 </u-button>
+            <u-button class="app-buttom" type="primary" @click="handleSubmit('提交')" shape="circle"> 提交 </u-button>
+          </view>
         </view>
       </view>
+
+      <u-picker
+        :show="actionShow"
+        :columns="actionsList"
+        :title="'请选择' + actionTitle"
+        keyName="name"
+        visibleItemCount="6"
+        :defaultIndex="[actionDefaultIndex]"
+        :closeOnClickOverlay="true"
+        @close="actionShow = false"
+        @cancel="actionShow = false"
+        @confirm="selectAction"
+      ></u-picker>
+
+      <u-datetime-picker
+        :show="showTime"
+        v-model="timeValue"
+        mode="date"
+        @close="showTime = false"
+        @cancel="showTime = false"
+        @confirm="timeSubmit"
+        :closeOnClickOverlay="true"
+        :minDate="Number(new Date('1900'))"
+        :maxDate="Number(new Date())"
+      ></u-datetime-picker>
+
+      <u-modal
+        :show="modalShow"
+        title="系统提示"
+        confirmText="修改"
+        cancelText="新增"
+        :showCancelButton="true"
+        cancelColor="#2979ff"
+        @confirm="handleSubmitApi('是')"
+        @cancel="handleSubmitApi('否')"
+        :closeOnClickOverlay="true"
+        @close="modalShow = false"
+      >
+        <view class="slot-content">
+          <view style="text-align: center; margin-bottom: 10px">是否修改单位名称为“{{ newCompanyName }}”的信息？</view>
+          <view style="text-align: center; font-size: 13px; color: #ff0000">注：“修改”则点击修改，“新增”将提交一条新的记录，如需“取消”操作可点击空白区域</view>
+        </view>
+      </u-modal>
     </view>
 
-    <u-picker
-      :show="actionShow"
-      :columns="actionsList"
-      :title="'请选择' + actionTitle"
-      keyName="name"
-      visibleItemCount="6"
-      :defaultIndex="[actionDefaultIndex]"
-      :closeOnClickOverlay="true"
-      @close="actionShow = false"
-      @cancel="actionShow = false"
-      @confirm="selectAction"
-    ></u-picker>
-
-    <u-datetime-picker
-      :show="showTime"
-      v-model="timeValue"
-      mode="date"
-      @close="showTime = false"
-      @cancel="showTime = false"
-      @confirm="timeSubmit"
-      :closeOnClickOverlay="true"
-      :minDate="Number(new Date('1900'))"
-      :maxDate="Number(new Date())"
-    ></u-datetime-picker>
-
-    <u-modal
-      :show="modalShow"
-      title="系统提示"
-      confirmText="修改"
-      cancelText="新增"
-      :showCancelButton="true"
-      cancelColor="#2979ff"
-      @confirm="handleSubmitApi('是')"
-      @cancel="handleSubmitApi('否')"
-      :closeOnClickOverlay="true"
-      @close="modalShow = false"
-    >
-      <view class="slot-content">
-        <view style="text-align: center; margin-bottom: 10px">是否修改单位名称为“{{ newCompanyName }}”的信息？</view>
-        <view style="text-align: center; font-size: 13px; color: #ff0000">注：“修改”则点击修改，“新增”将提交一条新的记录，如需“取消”操作可点击空白区域</view>
+    <view v-else>
+      <view style="display: flex">
+        <image style="width: 120px; height: 120px; margin: 50px auto 20px auto" src="@/static/images/unitInfoCollection/success.png" />
       </view>
-    </u-modal>
-  </view>
-
-  <view v-else>
-    <view style="display: flex">
-      <image style="width: 120px; height: 120px; margin: 50px auto 20px auto" src="@/static/images/unitInfoCollection/success.png" />
+      <view style="text-align: center; font-weight: 600">提交成功</view>
     </view>
-    <view style="text-align: center; font-weight: 600">提交成功</view>
-  </view>
+  </scroll-view>
 </template>
 
 <script setup>

src/pages/business/mhxf/xunJian/collect/components/collectDetail.vue

@@ -1,5 +1,5 @@
 <template>
-  <scroll-view scroll-y class="grayBackgroundColor">
+  <scroll-view class="scroll-height" :scroll-y="true" :data-theme="'theme-' + proxy.$settingStore.themeColor.name">
     <view class="bg-white" style="padding: 15px 15px 15px 15px">
       <u-form ref="form" labelPosition="left" :model="model" :rules="rules" labelWidth="82">
         <u-form-item label="地点号码：" prop="siteNubmber">
@@ -100,15 +100,6 @@ onMounted(() => {});
 </style>
 
 <style scoped>
-.bg-white {
-  background-color: #ffffff;
-}
-
-.reportLeft {
-  margin-right: 15px;
-  display: flex;
-}
-
 .reportCenter {
 }
 

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

@@ -1,10 +1,10 @@
 <template>
-  <scroll-view scroll-y class="grayBackgroundColor">
+  <scroll-view class="scroll-height" :scroll-y="true" :data-theme="'theme-' + proxy.$settingStore.themeColor.name">
     <view class="example-body" v-if="show">
       <uni-datetime-picker v-model="datetimerange" type="daterange" rangeSeparator="~" @change="confirm" />
     </view>
     <view v-for="(cu, index) in dataList.siteList" :key="index" class="bg-white" style="display: flex; padding: 15px 0px 15px 15px; margin-bottom: 15px">
-      <view class="reportLeft">
+      <view class="flex margin-right-15">
         <u-image style="margin: auto" width="40" height="40" src="@/static/images/xunjian/scan.png" v-if="cu.siteType == 1" shape="circle"></u-image>
 
         <u-image style="margin: auto" width="40" height="40" src="@/static/images/xunjian/NFC.png" v-if="cu.siteType == 2" shape="circle"></u-image>
@@ -103,15 +103,6 @@ onMounted(() => {
 </style>
 
 <style scoped>
-.bg-white {
-  background-color: #ffffff;
-}
-
-.reportLeft {
-  margin-right: 15px;
-  display: flex;
-}
-
 .reportCenter {
 }
 

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

@@ -1,5 +1,5 @@
 <template>
-  <scroll-view scroll-y class="grayBackgroundColor">
+  <scroll-view class="scroll-height" :scroll-y="true" :data-theme="'theme-' + proxy.$settingStore.themeColor.name">
     <!-- 按组使用 -->
     <uni-swipe-action>
       <uni-swipe-action-item
@@ -10,8 +10,8 @@
         @change="swipeChange($event, index)"
         style="margin-bottom: 15px"
       >
-        <view class="bg-white" style="display: flex; padding: 15px 0px 15px 15px">
-          <view class="reportLeft">
+        <view class="flex bg-white" style="padding: 15px 0px 15px 15px">
+          <view class="flex margin-right-15">
             <u-image style="margin: auto" width="40" height="40" src="@/static/images/xunjian/scan.png" v-if="cu.siteType == 1" shape="circle"></u-image>
 
             <u-image style="margin: auto" width="40" height="40" src="@/static/images/xunjian/NFC.png" v-if="cu.siteType == 2" shape="circle"></u-image>
@@ -205,18 +205,6 @@ onMounted(() => {});
 </style>
 
 <style scoped>
-.bg-white {
-  background-color: #ffffff;
-}
-
-.reportLeft {
-  margin-right: 15px;
-  display: flex;
-}
-
-.reportCenter {
-}
-
 .reportCenter .centerSiteName {
   font-size: 15px;
   margin-bottom: 5px;

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

@@ -1,5 +1,5 @@
 <template>
-  <scroll-view scroll-y :data-theme="'theme-' + proxy.$settingStore.themeColor.name">
+  <scroll-view class="scroll-height" :scroll-y="true" :data-theme="'theme-' + proxy.$settingStore.themeColor.name">
     <view class="xunjian-plan-content">
       <view class="bg-white padding-15 margin-bottom-15" v-for="(con, index) in contentList" :key="index">
         <view class="flex margin-bottom-10">
@@ -230,11 +230,11 @@ onMounted(() => {});
 <style lang="scss">
 .xunjian-plan-content {
   //#ifdef H5
-  margin-bottom: 125px;
+  padding-bottom: 125px;
   //#endif
 
   //#ifdef APP-PLUS
-  margin-bottom: 130px;
+  padding-bottom: 130px;
   //#endif
 }
 </style>

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

@@ -1,7 +1,7 @@
 <template>
-  <scroll-view scroll-y>
-    <view class="margin-bottom-15 bg-white" style="display: flex; padding: 15px 0px 15px 15px" v-for="cu in currentDateList" :key="cu">
-      <view class="reportLeft" @click="pulicClick(cu)">
+  <scroll-view class="scroll-height" :scroll-y="true" :data-theme="'theme-' + proxy.$settingStore.themeColor.name">
+    <view class="flex margin-bottom-15 bg-white" style="padding: 15px 0px 15px 15px" v-for="cu in currentDateList" :key="cu">
+      <view class="flex margin-right-15" @click="pulicClick(cu)">
         <u-image style="margin: auto" width="40" height="40" src="@/static/images/xunjian/scan.png" v-if="cu.siteType == 1" shape="circle"></u-image>
 
         <u-image style="margin: auto" width="40" height="40" src="@/static/images/xunjian/NFC.png" v-if="cu.siteType == 2" shape="circle"></u-image>
@@ -53,7 +53,6 @@
         </view>
       </view>
     </view>
-
     <view style="position: fixed; right: 0; bottom: 50px">
       <u-image width="67" height="67" src="@/static/images/xunjian/plan-scan.png" shape="circle" @click="scanClick()"></u-image>
     </view>
@@ -203,14 +202,6 @@ onMounted(() => {});
 </style>
 
 <style scoped>
-.reportLeft {
-  margin-right: 15px;
-  display: flex;
-}
-
-.reportCenter {
-}
-
 .reportCenter .centerSiteName {
   font-size: 15px;
   margin-bottom: 5px;

src/pages/business/mhxf/xunJian/plan/components/siteDetails.vue

@@ -1,5 +1,5 @@
 <template>
-  <scroll-view scroll-y :data-theme="'theme-' + proxy.$settingStore.themeColor.name">
+  <scroll-view class="scroll-height" :scroll-y="true" :data-theme="'theme-' + proxy.$settingStore.themeColor.name">
     <view class="xunjian-plan-siteDetails">
       <view class="flex bg-white padding-15 margin-bottom-15">
         <u-image style="margin: auto 15px auto 0" width="40" height="40" src="@/static/images/xunjian/scan.png" v-if="siteList.siteType == 1" shape="circle"></u-image>
@@ -176,11 +176,11 @@ onMounted(() => {});
 <style lang="scss" scoped>
 .xunjian-plan-siteDetails {
   //#ifdef H5
-  margin-bottom: 70px;
+  padding-bottom: 70px;
   //#endif
 
   //#ifdef APP-PLUS
-  margin-bottom: 75px;
+  padding-bottom: 75px;
   //#endif
 }
 </style>

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

@@ -1,6 +1,6 @@
 <template>
-  <scroll-view scroll-y>
-    <view class="xunjian-plan-container" :data-theme="'theme-' + proxy.$settingStore.themeColor.name">
+  <scroll-view class="scroll-height" :scroll-y="true" :data-theme="'theme-' + proxy.$settingStore.themeColor.name">
+    <view class="xunjian-plan-container">
       <!-- 日历组件 -->
       <oa-calendar class="uni-calendar--hook" :selected="info.selected" :showMonth="false" @change="change" @monthSwitch="monthSwitch" :currentDate="currentDateList" />
 

src/pages/business/mhxf/xunJian/xunJian.vue

@@ -1,5 +1,5 @@
 <template>
-  <scroll-view scroll-x>
+  <scroll-view class="scroll-height" :scroll-y="true" :data-theme="'theme-' + proxy.$settingStore.themeColor.name">
     <view class="padding-sm">
       <!-- 图表 -->
       <view class="section1 section bg-white padding-xs">

src/pages/index.vue

@@ -54,6 +54,17 @@
         @change="swiperChange"
       >
       </u-swiper>
+
+      <image v-if="!arrayList.swiperBool" src="@/static/images/index/banner1.png" style="width: 100%; height: 160px"></image>
+
+      <view class="app-info-notice bg-white radius shadow-default margin-lr-sm margin-bottom-sm">
+        <view class="flex">
+          <view class="info-title text-df">综合智慧云</view>
+          <view class="info-time text-sm">03-21 19:23</view>
+        </view>
+        <view class="info-content text-sm">综合智慧云app，助力企业数字化转型升级，超多业务功能，全新部署上线，操作简单流畅...</view>
+      </view>
+
       <!-- 轮播图 结束 -->
 
       <!-- 宫格列表 -->
@@ -88,7 +99,7 @@
     </view>
   </view>
 
-  <oa-tabbar></oa-tabbar>
+  <oa-tabbar :tabbarValue="0"></oa-tabbar>
 </template>
 
 <script setup>
@@ -113,7 +124,7 @@ const { proxy } = getCurrentInstance();
 const arrayList = reactive({
   dialogFlag: false,
 
-  swiperBool: false,
+  swiperBool: true,
   swiperIndex: 0,
   swiperTime: 5000,
   swiperList: [
@@ -122,16 +133,6 @@ const arrayList = reactive({
       link: "",
       linkType: 1,
     },
-    {
-      url: "../static/images/index/banner2.jpg",
-      link: "",
-      linkType: 1,
-    },
-    {
-      url: "../static/images/index/banner3.jpg",
-      link: "",
-      linkType: 1,
-    },
   ],
 
   // cuIconList: json.cuIconList,

src/pages/mine/info/index.vue

@@ -1,16 +1,7 @@
 <template>
   <view :data-theme="'theme-' + proxy.$settingStore.themeColor.name" class="info-container">
-    <u-sticky bgColor="#fff" style="box-shadow: 1px 1px 4px rgb(26 26 26 / 10%)">
-      <u-tabs
-        :list="tabsList"
-        :current="tabsCurrent"
-        @click="tabsClick"
-        lineColor="#333"
-        :activeStyle="{ color: '#333' }"
-        :inactiveStyle="{ color: '#909399' }"
-        :scrollable="false"
-        style="border-bottom: 1px solid #eaeef1"
-      ></u-tabs>
+    <u-sticky class="shadow-default" bgColor="#fff">
+      <u-tabs :list="tabsList" :current="tabsCurrent" @click="tabsClick" lineColor="#333" :activeStyle="{ color: '#333' }" :inactiveStyle="{ color: '#909399' }" :scrollable="false"></u-tabs>
     </u-sticky>
 
     <view class="content-section" v-show="tabsCurrent == 0">
@@ -39,7 +30,7 @@
             <view style="margin: 0 15px 0 auto; font-size: 14px; color: #909399">{{ user.email }}</view>
           </view>
         </view>
-        <view class="list-cell list-cell-arrow" @click="proxy.$settingStore.handleAbout()">
+        <view class="list-cell list-cell-arrow" @click="handleUserModal('修改性别')">
           <view class="menu-item-box">
             <view class="title">性别</view>
             <view style="margin: 0 15px 0 auto; font-size: 14px; color: #909399">{{ user.sex == "0" ? "男" : "女" }}</view>
@@ -117,6 +108,12 @@
       <view v-if="modalTitle === '修改邮箱'">
         <u--input v-model="userArr.email" :placeholder="modalTitle" border="bottom" clearable></u--input>
       </view>
+
+      <view v-if="modalTitle === '修改性别'">
+        <u-radio-group v-model="userArr.sex" placement="row">
+          <u-radio v-for="se in sexs" :key="se" :activeColor="proxy.$settingStore.themeColor.color" :label="se.text" :name="se.value" style="margin-right: 15px"></u-radio>
+        </u-radio-group>
+      </view>
     </view>
   </u-modal>
 </template>
@@ -183,8 +180,6 @@ const data = reactive({
   modalTitle: "",
 });
 
-// .test(value)
-
 const { name, phone, tabsList, tabsCurrent, sexs, modalShow, modalTitle } = toRefs(data);
 
 const form = ref(null);
@@ -208,7 +203,7 @@ function handleConfirm() {
       return;
     }
 
-    if (/^1[3|4|5|6|7|8|9][0-9]\d{8}$/.test(userArr.value.phonenumber)) {
+    if (!/^1[3|4|5|6|7|8|9][0-9]\d{8}$/.test(userArr.value.phonenumber)) {
       proxy.$modal.showToast("请输入正确的手机号码");
       return;
     }
@@ -220,12 +215,19 @@ function handleConfirm() {
       return;
     }
 
-    if (/^\w+((-\w+)|(\.\w+))*\@[A-Za-z0-9]+((\.|-)[A-Za-z0-9]+)*\.[A-Za-z0-9]+$/.test(userArr.value.email)) {
+    if (!/^\w+((-\w+)|(\.\w+))*\@[A-Za-z0-9]+((\.|-)[A-Za-z0-9]+)*\.[A-Za-z0-9]+$/.test(userArr.value.email)) {
       proxy.$modal.showToast("请输入正确的邮箱地址");
       return;
     }
   }
 
+  if (modalTitle.value == "修改性别") {
+    if (!userArr.value.sex) {
+      proxy.$modal.showToast("请选择性别");
+      return;
+    }
+  }
+
   updateUserProfile(userArr.value).then((response) => {
     proxy.$tab.reLaunch("/pages/mine/index");
     useStore.getUser();
@@ -262,8 +264,6 @@ onNavigationBarButtonTap((e) => {
 });
 </script>
 
-<style lang="scss" scoped></style>
-
 <style lang="scss" scoped>
 :deep(.uni-page-head__title) {
   opacity: 1 !important;

src/static/scss/sidebar.scss

@@ -3,18 +3,28 @@
 //全局按钮样式修改
 uni-button[type='primary'] {
     @include font_color('fontColor');
-    @include background_color('backgroundColor');
+    @include background_color('themeColor');
     border-width: 0px !important;
 }
 
+.u-button--info {
+    @include font_color('themeColor');
+    @include border_color('themeColor');
+
+    .u-icon__icon--info {
+        @include font_color('themeColor')
+    }
+
+}
+
 .u-button--primary {
-    @include background_color('backgroundColor');
-    @include border_color('backgroundColor');
+    @include background_color('themeColor');
+    @include border_color('themeColor');
 }
 
 //全局背景样式修改
 .theme-back {
-    @include background_color('backgroundColor');
+    @include background_color('themeColor');
 }
 
 /*
@@ -44,14 +54,14 @@ uni-button[type='primary'] {
 
     .uni-section-header__decoration {
         height: 14px !important;
-        @include background_color('backgroundColor');
+        @include background_color('themeColor');
     }
 
     .uni-section-header__content {
         uni-text {
             font-size: 15px !important;
             // color: #149eff !important;
-            @include font_color('backgroundColor');
+            @include font_color('themeColor');
             font-weight: 600 !important;
         }
     }
@@ -73,16 +83,16 @@ uni-button[type='primary'] {
             .uni-calendar__weeks {
                 .uni-calendar__weeks-item {
                     .uni-calendar-item--isDay-text {
-                        @include font_color('backgroundColor');
+                        @include font_color('themeColor');
                     }
 
                     .uni-calendar-item--isDay {
-                        @include background_color('backgroundColor');
+                        @include background_color('themeColor');
                         @include font_color('fontColor');
                     }
 
                     .uni-calendar-item--checked {
-                        @include background_color('backgroundColor');
+                        @include background_color('themeColor');
                     }
                 }
             }
@@ -92,16 +102,12 @@ uni-button[type='primary'] {
 
 //日历样式 结束
 
-.deviceManage {
-    @include background_color('backgroundColor');
-    @include font_color('fontColor');
-}
 
 //自定义头部导航样式 开始
 .u-navbar {
     .u-navbar--fixed {
         .u-navbar__content {
-            @include background_color('backgroundColor');
+            @include background_color('themeColor');
         }
     }
 }
@@ -111,7 +117,7 @@ uni-button[type='primary'] {
 
 //iconfont样式 开始
 .menu-list .menu-item-box .menu-icon {
-    @include font_color('backgroundColor');
+    @include font_color('themeColor');
 }
 
 //iconfont样式 结束

src/static/scss/themes.scss

@@ -1,60 +1,73 @@
 $themes: (
   theme-rf: ( //浅蓝-主题
-    fontColor:#fff,
-    backgroundColor:#149eff,
+    themeColor:#149eff,
 
+    fontColor:#fff,
   ),
   theme-blue: ( //海蓝-主题
+    themeColor:#0081ff,
+
     fontColor:#fff,
-    backgroundColor:#0081ff,
   ),
   theme-red: ( //嫣红-主题
+    themeColor:#e54d42,
+
     fontColor:#fff,
-    backgroundColor:#e54d42,
   ),
   theme-orange: ( //桔橙-主题
+    themeColor:#f37b1d,
+
     fontColor:#fff,
-    backgroundColor:#f37b1d,
   ),
   theme-yellow: ( //明黄-主题
+    themeColor:#fbbd08,
+
     fontColor:#fff,
-    backgroundColor:#fbbd08,
   ),
   theme-olive: ( //橄榄-主题
+    themeColor:#8dc63f,
+
     fontColor:#fff,
-    backgroundColor:#8dc63f,
   ),
   theme-green: ( //森绿-主题
+    themeColor:#39b54a,
+
     fontColor:#fff,
-    backgroundColor:#39b54a,
   ),
   theme-cyan: ( //天青-主题
+    themeColor:#1cbbb4,
+
     fontColor:#fff,
-    backgroundColor:#1cbbb4,
   ),
   theme-purple: ( //姹紫-主题
+    themeColor:#6739b6,
+
     fontColor:#fff,
-    backgroundColor:#6739b6,
   ),
   theme-mauve: ( //木槿-主题
+    themeColor:#9c26b0,
+
     fontColor:#fff,
-    backgroundColor:#9c26b0,
   ),
   theme-pink: ( //桃粉-主题
+    themeColor:#e03997,
+
     fontColor:#fff,
-    backgroundColor:#e03997,
   ),
   theme-brown: ( //棕褐-主题
+    themeColor:#a5673f,
+
     fontColor:#fff,
-    backgroundColor:#a5673f,
   ),
   theme-grey: ( //玄灰-主题
+    themeColor:#8799a3,
+
     fontColor:#fff,
-    backgroundColor:#8799a3,
   ),
   theme-black: ( //墨黑-主题
+    themeColor:#333333,
+
     fontColor:#fff,
-    backgroundColor:#333333,
   ),
 
 );