工作台图标替换/部分页面代码优化

src/components/oa-scroll/index.vue

@@ -29,14 +29,8 @@
     </slot>
     <slot name="default"> </slot>
     <slot name="bottomLoading">
-      <div
-        class="bottoBox"
-        :style="{
-          marginTop: lowerThreshold + 'px',
-        }"
-        v-if="refresherLoad"
-      >
-        {{ pageSize >= total ? "没有更多啦~" : isScrolltolower }}
+      <div class="bottoBox" :style="`margin-top: ${lowerThreshold + 'px'}`" v-if="refresherLoad">
+        {{ total != 0 ? (pageSize >= total ? "没有更多啦~" : isScrolltolower) : "暂无数据" }}
       </div>
     </slot>
   </scroll-view>

src/pages/business/fireIot/deviceSelect/components/deviceDetailsList.vue

@@ -1,31 +1,43 @@
 <template>
-  <scroll-view class="scroll-height" :scroll-y="true" :data-theme="'theme-' + proxy.$settingStore.themeColor.name" @scrolltolower="scrolltolower">
-    <u-sticky class="example-body" style="top: 0px">
-      <view class="padding-sm padding-tb-10" :class="'bg-' + proxy.$settingStore.themeColor.name">
-        <u--input
-          v-model="deviceName"
-          placeholder="搜索"
-          prefixIcon="search"
-          prefixIconStyle="font-size: 22px;color: #909399"
-          customStyle="height:35px;background-color:#f5f6fa;"
-          @confirm="init()"
-          clearable
-        ></u--input>
-      </view>
-    </u-sticky>
-
-    <u-empty v-show="dataList.length <= 0" text="暂无数据" mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png"> </u-empty>
-    <view v-if="dataList.length > 0" class="deviceDetailsList-container">
-      <view class="menu-list margin-0">
-        <view class="list-cell list-cell-arrow" v-for="(base, index) in dataList" :key="index" @click="handleToDevice(base)">
-          <view class="menu-item-box">
-            <view class="title">{{ base.deviceName }}</view>
+  <u-sticky class="example-body" style="top: 0px">
+    <view class="padding-sm padding-tb-10" :class="'bg-' + proxy.$settingStore.themeColor.name">
+      <u--input
+        v-model="deviceName"
+        placeholder="搜索"
+        prefixIcon="search"
+        prefixIconStyle="font-size: 22px;color: #909399"
+        customStyle="height:35px;background-color:#f5f6fa;"
+        @confirm="init()"
+        clearable
+      ></u--input>
+    </view>
+  </u-sticky>
+
+  <oa-scroll
+    class="scroll-height"
+    :pageSize="pageSize"
+    :total="total"
+    :refresherLoad="true"
+    :refresherEnabled="true"
+    :refresherDefaultStyle="'none'"
+    :refresherThreshold="44"
+    :refresherBackground="'#f5f6f7'"
+    @load="load"
+    @refresh="refresh"
+    :data-theme="'theme-' + proxy.$settingStore.themeColor.name"
+  >
+    <template #default>
+      <view class="deviceDetailsList-container">
+        <view class="menu-list margin-0">
+          <view class="list-cell list-cell-arrow" v-for="(base, index) in dataList" :key="index" @click="handleToDevice(base)">
+            <view class="menu-item-box">
+              <view class="title">{{ base.deviceName }}</view>
+            </view>
           </view>
         </view>
       </view>
-      <u-loadmore :status="status" @click="scrolltolower" />
-    </view>
-  </scroll-view>
+    </template>
+  </oa-scroll>
 </template>
 
 <script setup>
@@ -39,7 +51,6 @@ const { proxy } = getCurrentInstance();
 const publicStore = publicStores();
 
 const dataList = ref([]);
-const status = ref("loadmore");
 const deviceName = ref("");
 const productId = ref("");
 const productName = ref("");
@@ -68,10 +79,6 @@ function dmpDeviceInfoApi() {
       uni.setNavigationBarTitle({
         title: `${productName.value}（${total.value}）`,
       });
-
-      if (total.value == dataList.value.length) {
-        status.value = "nomore";
-      }
     }
   });
 }
@@ -87,19 +94,21 @@ function handleToDevice(array) {
 }
 
 /**
- * @scrollView触底事件
+ * @scrollView加载数据
  */
-function scrolltolower(e) {
-  if (total.value == dataList.value.length) {
-    status.value = "nomore";
-    return;
-  } else {
-    status.value = "loading";
-    pageSize.value += 10;
-    setTimeout(() => {
-      dmpDeviceInfoApi();
-    }, 1000);
-  }
+function load() {
+  pageSize.value += 10;
+  init();
+}
+
+/**
+ * @scrollView刷新数据
+ */
+function refresh() {
+  deviceName.value = "";
+  pageSize.value = 20;
+  total.value = 0;
+  init();
 }
 
 onReady(() => {});

src/pages/business/fireIot/deviceSelect/index.vue

@@ -1,16 +1,29 @@
 <template>
-  <scroll-view class="bg-white scroll-height" :scroll-y="true" :data-theme="'theme-' + proxy.$settingStore.themeColor.type">
-    <u-empty v-if="dataList.length <= 0" text="暂无数据" mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png"> </u-empty>
-    <view v-else class="deviceSelect">
-      <u-grid :border="true">
-        <u-grid-item v-for="(base, index) in dataList" :key="index" @click="handleToDevice(base.id, base.productName)">
-          <u-badge type="primary" max="9999" :value="base.deviceCount" :showZero="true" :absolute="true" :offset="[10, 10, 0, 0]"></u-badge>
-          <image class="margin-b-15" style="width: 40px; height: 40px; margin-top: 35px" :src="base.typeImg" mode="aspectFill"></image>
-          <text class="margin-b-15 grid-text">{{ base.productName }}</text>
-        </u-grid-item>
-      </u-grid>
-    </view>
-  </scroll-view>
+  <oa-scroll
+    class="bg-white scroll-height"
+    :pageSize="pageSize"
+    :total="total"
+    :refresherLoad="true"
+    :refresherEnabled="true"
+    :refresherDefaultStyle="'none'"
+    :refresherThreshold="44"
+    :refresherBackground="'#f5f6f7'"
+    @load="load"
+    @refresh="refresh"
+    :data-theme="'theme-' + proxy.$settingStore.themeColor.type"
+  >
+    <template #default>
+      <view class="deviceSelect">
+        <u-grid :border="true">
+          <u-grid-item v-for="(base, index) in dataList" :key="index" @click="handleToDevice(base.id, base.productName)">
+            <u-badge type="primary" max="9999" :value="base.deviceCount" :showZero="true" :absolute="true" :offset="[10, 10, 0, 0]"></u-badge>
+            <image class="margin-b-15" style="width: 40px; height: 40px; margin-top: 35px" :src="base.typeImg" mode="aspectFill"></image>
+            <text class="margin-b-15 grid-text">{{ base.productName }}</text>
+          </u-grid-item>
+        </u-grid>
+      </view>
+    </template>
+  </oa-scroll>
 </template>
 
 <script setup>
@@ -23,7 +36,7 @@ import { dmpProductInfo } from "@/api/business/fireIot/deviceSelect/index";
 const { proxy } = getCurrentInstance();
 
 const dataList = ref([]);
-const pageSize = ref(1000);
+const pageSize = ref(20);
 const current = ref(1);
 const total = ref(0);
 
@@ -53,6 +66,23 @@ function handleToDevice(id, productName) {
   proxy.$tab.navigateTo(`/pages/business/fireIot/deviceSelect/components/deviceDetailsList?id=${id}&productName=${productName}`);
 }
 
+/**
+ * @scrollView加载数据
+ */
+function load() {
+  pageSize.value += 10;
+  init();
+}
+
+/**
+ * @scrollView刷新数据
+ */
+function refresh() {
+  pageSize.value = 20;
+  total.value = 0;
+  init();
+}
+
 onShow(() => {
   //调用系统主题颜色
   proxy.$settingStore.systemThemeColor([1]);

src/pages/business/fireIot/facilitiesView/facilitiesDetailsList.vue

@@ -1,32 +1,43 @@
 <template>
-  <scroll-view class="scroll-height" :scroll-y="true" :data-theme="'theme-' + proxy.$settingStore.themeColor.name" @scrolltolower="scrolltolower">
-    <u-sticky class="example-body" style="top: 0px">
-      <view class="padding-sm padding-tb-10" :class="'bg-' + proxy.$settingStore.themeColor.name">
-        <u--input
-          v-model="facilityName"
-          placeholder="搜索"
-          prefixIcon="search"
-          prefixIconStyle="font-size: 22px;color: #909399"
-          customStyle="height:35px;background-color:#f5f6fa;"
-          @confirm="init()"
-          clearable
-        ></u--input>
-      </view>
-    </u-sticky>
-
-    <u-empty v-show="dataList.length <= 0" text="暂无数据" mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png"> </u-empty>
-    <view v-if="dataList.length > 0" class="facilitiesDetailsList-container">
-      <view class="menu-list margin-0">
-        <view class="list-cell list-cell-arrow" v-for="(base, index) in dataList" :key="index" @click="handleToDevice(base.id)">
-          <view class="menu-item-box">
-            <view class="title">{{ base.facilityName }}</view>
+  <u-sticky class="example-body" style="top: 0px">
+    <view class="padding-sm padding-tb-10" :class="'bg-' + proxy.$settingStore.themeColor.name">
+      <u--input
+        v-model="facilityName"
+        placeholder="搜索"
+        prefixIcon="search"
+        prefixIconStyle="font-size: 22px;color: #909399"
+        customStyle="height:35px;background-color:#f5f6fa;"
+        @confirm="init()"
+        clearable
+      ></u--input>
+    </view>
+  </u-sticky>
+
+  <oa-scroll
+    class="scroll-height"
+    :pageSize="pageSize"
+    :total="total"
+    :refresherLoad="true"
+    :refresherEnabled="true"
+    :refresherDefaultStyle="'none'"
+    :refresherThreshold="44"
+    :refresherBackground="'#f5f6f7'"
+    @load="load"
+    @refresh="refresh"
+    :data-theme="'theme-' + proxy.$settingStore.themeColor.name"
+  >
+    <template #default>
+      <view class="facilitiesDetailsList-container">
+        <view class="menu-list margin-0">
+          <view class="list-cell list-cell-arrow" v-for="(base, index) in dataList" :key="index" @click="handleToDevice(base.id)">
+            <view class="menu-item-box">
+              <view class="title">{{ base.facilityName }}</view>
+            </view>
           </view>
         </view>
       </view>
-
-      <u-loadmore :status="status" @click="scrolltolower" />
-    </view>
-  </scroll-view>
+    </template>
+  </oa-scroll>
 </template>
 
 <script setup>
@@ -39,7 +50,6 @@ import { baseGgpFacility } from "@/api/business/fireIot/facilitiesView/index";
 const { proxy } = getCurrentInstance();
 
 const dataList = ref([]);
-const status = ref("loadmore");
 const facilityType = ref(undefined);
 const facilityName = ref("");
 const facilityTypeName = ref("");
@@ -69,10 +79,6 @@ function selectListApi() {
 
       dataList.value = requset.data.records;
       total.value = requset.data.total;
-
-      if (total.value == dataList.value.length) {
-        status.value = "nomore";
-      }
     }
   });
 }
@@ -85,19 +91,21 @@ function handleToDevice(id) {
 }
 
 /**
- * @scrollView触底事件
+ * @scrollView加载数据
  */
-function scrolltolower(e) {
-  if (total.value == dataList.value.length) {
-    status.value = "nomore";
-    return;
-  } else {
-    status.value = "loading";
-    pageSize.value += 10;
-    setTimeout(() => {
-      selectListApi();
-    }, 1000);
-  }
+function load() {
+  pageSize.value += 10;
+  init();
+}
+
+/**
+ * @scrollView刷新数据
+ */
+function refresh() {
+  facilityName.value = "";
+  pageSize.value = 20;
+  total.value = 0;
+  init();
 }
 
 onReady(() => {});

src/pages/business/fireIot/facilitiesView/index.vue

@@ -1,35 +1,46 @@
 <template>
-  <scroll-view class="scroll-height" :scroll-y="true" :data-theme="'theme-' + proxy.$settingStore.themeColor.name">
-    <view class="flex padding-tb-sm bg-white">
-      <view class="padding-lr-sm text-center" style="width: 50%">设施类型：{{ typeNum || 0 }}</view>
-      <view class="divider-default"></view>
-      <view class="padding-lr-sm text-center" style="width: 50%">设施总数：{{ facilityNum || 0 }}</view>
-    </view>
-
-    <view class="flex bg-white margin-lr-sm margin-top-sm padding-sm shadow-default radius" v-for="(data, index) in dataList" :key="index">
-      <view class="margin-right-sm" style="margin-top: auto; margin-bottom: auto" @click="handleToDevice(data.id, data.typeName)">
-        <image style="width: 40px; height: 40px" :src="data.typeImg ? data.typeImg : '/static/images/404.png'" mode="aspectFill"></image>
+  <oa-scroll
+    class="scroll-height"
+    :refresherLoad="false"
+    :refresherEnabled="true"
+    :refresherDefaultStyle="'none'"
+    :refresherThreshold="44"
+    :refresherBackground="'#f5f6f7'"
+    @refresh="refresh"
+    :data-theme="'theme-' + proxy.$settingStore.themeColor.name"
+  >
+    <template #default>
+      <view class="flex padding-tb-sm bg-white">
+        <view class="padding-lr-sm text-center" style="width: 50%">设施类型：{{ typeNum || 0 }}</view>
+        <view class="divider-default"></view>
+        <view class="padding-lr-sm text-center" style="width: 50%">设施总数：{{ facilityNum || 0 }}</view>
       </view>
 
-      <view style="width: 100%" @click="handleToDevice(data.id, data.typeName)">
-        <view class="flex margin-bottom-xl">
-          <view class="text-dfl text-bold">{{ data.typeName }}</view>
-          <view style="font-size: 14px; margin-top: auto; margin-right: auto">（{{ data.typeFacilityNum || 0 }}）</view>
+      <view class="flex bg-white margin-lr-sm margin-top-sm padding-sm shadow-default radius" v-for="(data, index) in dataList" :key="index">
+        <view class="margin-right-sm" style="margin-top: auto; margin-bottom: auto" @click="handleToDevice(data.id, data.typeName)">
+          <image style="width: 40px; height: 40px" :src="data.typeImg ? data.typeImg : '/static/images/404.png'" mode="aspectFill"></image>
         </view>
-        <view>
-          <view class="flex">
-            <view style="font-size: 14px; width: 33.33%">正常：{{ data.normalFacilityNum || 0 }}</view>
-            <view style="font-size: 14px; width: 33.33%">维修：{{ data.upkeepFacilityNum || 0 }}</view>
-            <view style="font-size: 14px; width: 33.33%">关闭：{{ data.closeFacilityNum || 0 }}</view>
+
+        <view style="width: 100%" @click="handleToDevice(data.id, data.typeName)">
+          <view class="flex margin-bottom-xl">
+            <view class="text-dfl text-bold">{{ data.typeName }}</view>
+            <view style="font-size: 14px; margin-top: auto; margin-right: auto">（{{ data.typeFacilityNum || 0 }}）</view>
+          </view>
+          <view>
+            <view class="flex">
+              <view style="font-size: 14px; width: 33.33%">正常：{{ data.normalFacilityNum || 0 }}</view>
+              <view style="font-size: 14px; width: 33.33%">维修：{{ data.upkeepFacilityNum || 0 }}</view>
+              <view style="font-size: 14px; width: 33.33%">关闭：{{ data.closeFacilityNum || 0 }}</view>
+            </view>
           </view>
         </view>
-      </view>
 
-      <view style="margin-top: auto; margin-bottom: auto" @click="handleToMap(data.id)">
-        <view class="iconfont ucicon-app-map icon" :style="{ color: proxy.$settingStore.themeColor.color, fontSize: '22px' }"></view>
+        <view style="margin-top: auto; margin-bottom: auto" @click="handleToMap(data.id)">
+          <view class="iconfont ucicon-app-map icon" :style="{ color: proxy.$settingStore.themeColor.color, fontSize: '22px' }"></view>
+        </view>
       </view>
-    </view>
-  </scroll-view>
+    </template>
+  </oa-scroll>
 </template>
 
 <script setup>
@@ -63,6 +74,13 @@ function init() {
   });
 }
 
+/**
+ * @scrollView刷新数据
+ */
+function refresh() {
+  init();
+}
+
 /**
  * @设施详情列表跳转点击事件
  */

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

@@ -1,23 +1,35 @@
 <template>
-  <scroll-view class="scroll-height" :scroll-y="true" :data-theme="'theme-' + proxy.$settingStore.themeColor.name" @scrolltolower="scrolltolower">
-    <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>
+  <oa-scroll
+    class="scroll-height"
+    :pageSize="pageSize"
+    :total="total"
+    :refresherLoad="true"
+    :refresherEnabled="true"
+    :refresherDefaultStyle="'none'"
+    :refresherThreshold="44"
+    :refresherBackground="'#f5f6f7'"
+    @load="load"
+    @refresh="refresh"
+    :data-theme="'theme-' + proxy.$settingStore.themeColor.name"
+  >
+    <template #default>
+      <view class="fireReport">
+        <view class="reportContent">
+          <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>
         </view>
-        <u-loadmore :status="status" @click="scrolltolower" />
       </view>
-    </view>
-  </scroll-view>
+    </template>
+  </oa-scroll>
 </template>
 
 <script setup>
@@ -33,7 +45,6 @@ const { proxy } = getCurrentInstance();
 
 const dataRes = ref(true);
 const dataList = ref([]);
-const status = ref("loadmore");
 const pageSize = ref(20);
 const pageNum = ref(1);
 const total = ref(0);
@@ -59,10 +70,6 @@ function reportInfoListApi() {
   }).then((res) => {
     dataList.value = res.data.records;
     total.value = res.data.total;
-
-    if (total.value == dataList.value.length) {
-      status.value = "nomore";
-    }
   });
 }
 
@@ -140,19 +147,20 @@ function handleDownload(reportPath) {
 }
 
 /**
- * @scrollView触底事件
+ * @scrollView加载数据
  */
-function scrolltolower(e) {
-  if (total.value == dataList.value.length) {
-    status.value = "nomore";
-    return;
-  } else {
-    status.value = "loading";
-    pageSize.value += 10;
-    setTimeout(() => {
-      reportInfoListApi();
-    }, 1000);
-  }
+function load() {
+  pageSize.value += 10;
+  reportInfoListApi();
+}
+
+/**
+ * @scrollView刷新数据
+ */
+function refresh() {
+  pageSize.value = 20;
+  total.value = 0;
+  reportInfoListApi();
 }
 
 // 自定义导航事件
@@ -181,7 +189,6 @@ onMounted(() => {});
 
 <style lang="scss">
 .fireReport {
-  height: calc(100vh - 44px);
   background-color: #f7f7f7;
   .reportContent {
     .contentDom {

src/pages/common/applicationInfo/index.vue

@@ -12,6 +12,7 @@
           <view class="content-area-center radius bg-white">
             <view class="content-area-center-title">{{ all.typeTitle }}</view>
             <view class="content-area-center-cont">{{ all.listTitle }}</view>
+            <view class="content-area-center-buttom">查看详情 </view>
           </view>
         </view>
       </view>
@@ -22,6 +23,7 @@
           <view class="content-area-center radius bg-white">
             <view class="content-area-center-title">{{ all.typeTitle }}</view>
             <view class="content-area-center-cont">{{ all.listTitle }}</view>
+            <view class="content-area-center-buttom">查看详情 </view>
           </view>
         </view>
       </view>
@@ -161,6 +163,7 @@ onNavigationBarButtonTap((e) => {
     &-center {
       margin: 0 10px 20px 10px;
       padding: 15px;
+      overflow: hidden;
 
       &-title {
         margin: 0 0 15px 0;
@@ -170,6 +173,11 @@ onNavigationBarButtonTap((e) => {
       &-cont {
         font-weight: 600;
       }
+
+      &-buttom {
+        float: right;
+        color: #2a98ff;
+      }
     }
   }
 }

src/pages/common/customManage/index.vue

@@ -55,7 +55,8 @@
                   {{ data.maintainStatus == 1 ? "使用中" : "已到期" }}
                 </span>
               </view>
-              <view> 客户地址： {{ data.customAddress }} </view>
+              <view style="min-width: 50%"> 客户地址： {{ data.customAddress }} </view>
+              <view style="min-width: 50%">销售负责人：{{ data.salePerson }}</view>
             </view>
           </view>
         </view>

src/pages/index.vue

@@ -343,7 +343,7 @@ function getAppRoutersData() {
     // domain :'172.16.120.165:13203'
   }).then((res) => {
     res.data.forEach((el) => {
-      el.meta.icon = `/static/icons/index/${el.meta.icon}.svg`;
+      el.meta.icon = `/static/icons/index/${el.meta.icon}.png`;
     });
 
     cuIconList.value = res.data;

src/pages/info.vue

@@ -49,7 +49,7 @@
       </view>
     </view>
 
-    <view class="uni-content-body">
+    <!-- <view class="uni-content-body">
       <view class="uni-list padding" @tap="goFireBase()">
         <view class="uni-avatar">
           <image class="image-bg" src="@/static/images/info/fireBase.png" />
@@ -67,7 +67,7 @@
           </view>
         </view>
       </view>
-    </view>
+    </view> -->
   </scroll-view>
 
   <oa-tabbar :tabbarValue="1"></oa-tabbar>

src/pages/login.vue

@@ -179,6 +179,9 @@ function env() {
     // linkUrl.value = window.location.host;
     // linkUrl.value='ces.cn';
     // linkUrl.value = "172.16.120.165:13207";
+    // linkUrl.value = "172.16.120.165:13200";
+    // linkUrl.value = "1";
+
     useStore.GetMobileTenantConfig({ url: linkUrl.value });
   }
   //#endif
@@ -260,14 +263,12 @@ function login(data) {
 function handleUserAgrement() {
   let site = config.appInfo.agreements[0];
   proxy.$tab.navigateTo(`/pages/common/webview/index?title=${site.title}&url=${site.url}`);
-  // proxy.$tab.navigateTo(`/pages/common/textview/index1?title=${site.title}&content=${site.content}`);
 }
 
 // 隐私协议
 function handlePrivacy() {
   let site = config.appInfo.agreements[1];
   proxy.$tab.navigateTo(`/pages/common/webview/index?title=${site.title}&url=${site.url}`);
-  // proxy.$tab.navigateTo(`/pages/common/textview/index1?title=${site.title}&content=${site.content}`);
 }
 
 onShow(() => {