多页面双头部调整dom结构

src/pages.json

@@ -502,8 +502,13 @@
                 {
                     "path": "deviceManage/components/deviceDetailsList",
                     "style": {
-                        "navigationBarTitleText": "",
-                        "enablePullDownRefresh": false
+                        "navigationBarTitleText": "设备列表",
+                        "enablePullDownRefresh": false,
+                        "navigationStyle": "custom",
+                        "app-plus": {
+                            "bounce": "none",
+                            "titleNView": false
+                        }
                     }
                 },
                 {
@@ -551,8 +556,13 @@
                 {
                     "path": "facilitiesManage/facilitiesDetailsList",
                     "style": {
-                        "navigationBarTitleText": "",
-                        "enablePullDownRefresh": false
+                        "navigationBarTitleText": "设施列表",
+                        "enablePullDownRefresh": false,
+                        "navigationStyle": "custom",
+                        "app-plus": {
+                            "bounce": "none",
+                            "titleNView": false
+                        }
                     }
                 },
                 {
@@ -649,12 +659,7 @@
                     "path": "projectMange/record/index",
                     "style": {
                         "navigationBarTitleText": "工作报告",
-                        "enablePullDownRefresh": false,
-                        "navigationStyle": "custom",
-                        "app-plus": {
-                            "bounce": "none",
-                            "titleNView": false
-                        }
+                        "enablePullDownRefresh": false
                     }
                 },
                 {
@@ -697,18 +702,13 @@
                     "path": "projectMange/write/index",
                     "style": {
                         "navigationBarTitleText": "报告填写",
-                        "enablePullDownRefresh": false,
-                        "navigationStyle": "custom",
-                        "app-plus": {
-                            "bounce": "none",
-                            "titleNView": false
-                        }
+                        "enablePullDownRefresh": false
                     }
                 },
                 {
                     "path": "projectMange/write/insert",
                     "style": {
-                        "navigationBarTitleText": "",
+                        "navigationBarTitleText": "报告填写",
                         "enablePullDownRefresh": false,
                         "navigationStyle": "custom",
                         "app-plus": {
@@ -757,12 +757,9 @@
                     "path": "meeting/index",
                     "style": {
                         "navigationBarTitleText": "会议预约",
-                        "enablePullDownRefresh": false,
-                        "navigationStyle": "custom",
-                        "app-plus": {
-                            "bounce": "none",
-                            "titleNView": false
-                        }
+                        "enablePullDownRefresh": false
+                       
+                        
                     }
                 },
                 {

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

@@ -1,17 +1,5 @@
 <template>
   <u-sticky class="shadow-default" bgColor="#fff" style="top: 0">
-    <u-navbar :titleStyle="{ color: '#000' }" :autoBack="true" title="会议预约" :placeholder="true" :safeAreaInsetTop="true" bgColor="#fff">
-      <template #left>
-        <view class="u-navbar__content__left__item">
-          <u-icon name="arrow-left" size="20" color="#000"></u-icon>
-        </view>
-      </template>
-      <template #right>
-        <view class="u-navbar__content__right__item">
-          <u-icon name="more-dot-fill" size="19" color="#000"></u-icon>
-        </view>
-      </template>
-    </u-navbar>
 
     <view class="flex plr10">
       <u--input
@@ -387,8 +375,13 @@ function refresh() {
 onReady(() => {});
 
 onShow(() => {
+  //设置导航栏颜色
+  uni.setNavigationBarColor({
+     frontColor: '#000000',   //字体颜色
+     backgroundColor: '#ffffff'    //背景颜色
+   })
   //调用系统主题颜色
-  proxy.$settingStore.systemThemeColor([1]);
+  // proxy.$settingStore.systemThemeColor([1]);
 
   init();
 });

src/pages/business/common/projectMange/record/index.vue

@@ -1,12 +1,12 @@
 <template>
   <u-sticky class="shadow-default" bgColor="#fff" style="top: 0">
-    <u-navbar :titleStyle="{ color: '#000' }" :autoBack="true" title="工作报告" :placeholder="true" :safeAreaInsetTop="true" bgColor="#fff">
+    <!-- <u-navbar :titleStyle="{ color: '#000' }" :autoBack="true" title="工作报告" :placeholder="true" :safeAreaInsetTop="true" bgColor="#fff">
       <template #left>
         <view class="u-navbar__content__left__item">
           <u-icon name="arrow-left" size="20" color="#000"></u-icon>
         </view>
       </template>
-    </u-navbar>
+    </u-navbar> -->
     <u-tabs
       :list="tabsList"
       :current="tabsCurrent"
@@ -439,7 +439,12 @@ onReady(() => {});
 onShow(() => {
   state.popup.show = false;
   //调用系统主题颜色
-  proxy.$settingStore.systemThemeColor([1]);
+  // proxy.$settingStore.systemThemeColor([1]);
+  //设置导航栏颜色
+  uni.setNavigationBarColor({
+     frontColor: '#000000',   //字体颜色
+     backgroundColor: '#ffffff'    //背景颜色
+   })
 });
 
 onLoad((options) => {

src/pages/business/common/projectMange/write/index.vue

@@ -1,18 +1,14 @@
 <template>
-  <u-sticky class="shadow-default" bgColor="#fff" style="top: 0">
+  <!-- <u-sticky class="shadow-default" bgColor="#fff" style="top: 0">
     <u-navbar :titleStyle="{ color: '#000' }" :autoBack="true" title="报告填写" :placeholder="true" :safeAreaInsetTop="true" bgColor="#fff">
       <template #left>
         <view class="u-navbar__content__left__item">
           <u-icon name="arrow-left" size="20" color="#000"></u-icon>
         </view>
       </template>
-      <!-- <template #right>
-        <view class="u-navbar__content__right__item">
-          <u-icon name="more-dot-fill" size="19" color="#000"></u-icon>
-        </view>
-      </template> -->
+
     </u-navbar>
-  </u-sticky>
+  </u-sticky> -->
 
   <oa-scroll
     customClass="record-container scroll-height bg-white"
@@ -99,6 +95,10 @@ function goNavigateTo(e) {
 onReady(() => {});
 
 onShow(() => {
+  // uni.setNavigationBarColor({
+  //    frontColor: '#000000',   //字体颜色
+  //    backgroundColor: '#ffffff'    //背景颜色
+  //  })
   //调用系统主题颜色
   proxy.$settingStore.systemThemeColor([1]);
 });

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

@@ -1,4 +1,14 @@
 <template>
+
+  <u-navbar :titleStyle="{ color: '#000' }" :autoBack="true" :title="`${productName}(${total})`" :placeholder="true" :safeAreaInsetTop="true" bgColor="#fff">
+    <template #left>
+      <view class="u-navbar__content__left__item">
+        <u-icon name="arrow-left" size="20" color="#000"></u-icon>
+      </view>
+    </template>
+  </u-navbar>
+
+
   <oa-scroll
     customClass="scroll-height"
     :pageSize="pageSize"
@@ -108,9 +118,9 @@ function dmpDeviceInfoApi() {
       dataList.value = requset.data.records;
       total.value = requset.data.total;
 
-      uni.setNavigationBarTitle({
-        title: `${productName.value}（${total.value}）`,
-      });
+      // uni.setNavigationBarTitle({
+      //   title: `${productName.value}（${total.value}）`,
+      // });
     }
   });
 }
@@ -162,6 +172,9 @@ onShow(() => {
 onLoad((options) => {
   if ("productName" in options) {
     productName.value = options.productName;
+    // uni.setNavigationBarTitle({
+    //     title: `${productName.value}(${options.total})`,
+    //   });
   }
   if ("id" in options) {
     productId.value = parseInt(options.id);

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

@@ -15,9 +15,9 @@
     :data-theme="'theme-' + proxy.$settingStore.themeColor.type"
   >
     <template #default>
-      <view class="deviceManage">
-        <u-grid :border="true">
-          <u-grid-item v-for="(base, index) in dataList" :key="index" @click="handleToDevice(base.id, base.productName)">
+      <view class="deviceManage" style="1px solid #rgba(0,0,0,.1)">
+        <u-grid :border="true" >
+          <u-grid-item v-for="(base, index) in dataList" :key="index" @click="handleToDevice(base.id, base.productName,base.deviceCount)">
             <!-- <u-badge type="primary" max="9999" :value="base.deviceCount" :showZero="true" :absolute="true" :offset="[10, 10, 0, 0]"></u-badge> -->
             <image class="mb15 mt35" style="width: 40px; height: 40px" :src="base.typeImg" mode="aspectFill"></image>
             <view class="mb15 text-ellipsis" style="width: 100%; text-align: center">{{ base.productName }}</view>
@@ -64,7 +64,7 @@ function init() {
   });
 }
 
-function handleToDevice(id, productName) {
+function handleToDevice(id, productName,total) {
   proxy.$tab.navigateTo(`/pages/business/fireIot/deviceManage/components/deviceDetailsList?id=${id}&productName=${productName}`);
 }
 

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

@@ -1,4 +1,13 @@
 <template>
+
+  <u-navbar :titleStyle="{ color: '#000' }" :autoBack="true" :title="`${facilityTypeName}(${total})`" :placeholder="true" :safeAreaInsetTop="true" bgColor="#fff">
+    <template #left>
+      <view class="u-navbar__content__left__item">
+        <u-icon name="arrow-left" size="20" color="#000"></u-icon>
+      </view>
+    </template>
+  </u-navbar>
+
   <oa-scroll
     customClass="scroll-height"
     :pageSize="pageSize"
@@ -73,9 +82,9 @@ function selectListApi() {
   baseGgpFacility({ facilityType: facilityType.value, facilityName: facilityName.value, current: current.value, size: pageSize.value }).then((requset) => {
     if (requset.status === "SUCCESS") {
       if (requset.data.records.length > 0) {
-        uni.setNavigationBarTitle({
-          title: `${facilityTypeName.value}（${requset.data.total}）`,
-        });
+        // uni.setNavigationBarTitle({
+        //   title: `${facilityTypeName.value}（${requset.data.total}）`,
+        // });
       }
 
       dataList.value = requset.data.records;