巡检任务百分比调整

README.md

@@ -6,5 +6,6 @@
 
 ## node>18.1.0||16.17.1
  
+##### 提交时执行 npm run update:setting "zhiHuiYun",防止每次文件变更
 
 

src/manifest.json

@@ -1,46 +1,46 @@
 {
-    "name" : "综合智慧云",
-    "appid" : "__UNI__36DE3A0",
-    "description" : "综合智慧云APP，是一款助力于企业数字化的应用平台，帮助企业提升办公效率，实现组织数字化和业务数字化。",
-    "versionName" : "2.2.3",
-    "versionCode" : 23,
-    "transformPx" : false,
-    "app-plus" : {
-        "compatible" : {
-            "ignoreVersion" : true
+    "name": "综合智慧云",
+    "appid": "__UNI__36DE3A0",
+    "description": "综合智慧云APP，是一款助力于企业数字化的应用平台，帮助企业提升办公效率，实现组织数字化和业务数字化。",
+    "versionName": "2.2.3",
+    "versionCode": 23,
+    "transformPx": false,
+    "app-plus": {
+        "compatible": {
+            "ignoreVersion": true
         },
-        "kernel" : {
-            "ios" : "WKWebview"
+        "kernel": {
+            "ios": "WKWebview"
         },
-        "usingComponents" : true,
-        "nvueStyleCompiler" : "uni-app",
-        "compilerVersion" : 3,
-        "splashscreen" : {
-            "alwaysShowBeforeRender" : true,
-            "waiting" : true,
-            "autoclose" : true,
-            "delay" : 0
+        "usingComponents": true,
+        "nvueStyleCompiler": "uni-app",
+        "compilerVersion": 3,
+        "splashscreen": {
+            "alwaysShowBeforeRender": true,
+            "waiting": true,
+            "autoclose": true,
+            "delay": 0
         },
-        "screenOrientation" : [
+        "screenOrientation": [
             "portrait-primary",
             "portrait-secondary",
             "landscape-primary",
             "landscape-secondary"
         ],
-        "modules" : {
-            "VideoPlayer" : {},
-            "iBeacon" : {},
-            "Geolocation" : {},
-            "Maps" : {},
-            "Barcode" : {},
-            "Fingerprint" : {},
-            "Push" : {},
-            "Camera" : {},
-            "LivePusher" : {}
+        "modules": {
+            "VideoPlayer": {},
+            "iBeacon": {},
+            "Geolocation": {},
+            "Maps": {},
+            "Barcode": {},
+            "Fingerprint": {},
+            "Push": {},
+            "Camera": {},
+            "LivePusher": {}
         },
-        "distribute" : {
-            "android" : {
-                "permissions" : [
+        "distribute": {
+            "android": {
+                "permissions": [
                     "<uses-feature android:name=\"android.hardware.camera\"/>",
                     "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
                     "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
@@ -80,162 +80,176 @@
                     "<uses-permission android:name=\"android.permission.RECEIVE_BOOT_COMPLETED\"/>",
                     "<uses-permission android:name=\"android.permission.SYSTEM_ALERT_WINDOW\"/>"
                 ],
-                "minSdkVersion" : 21,
-                "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ],
-                "targetSdkVersion" : 30
+                "minSdkVersion": 21,
+                "abiFilters": [
+                    "armeabi-v7a",
+                    "arm64-v8a"
+                ],
+                "targetSdkVersion": 30
             },
-            "ios" : {
-                "dSYMs" : false,
-                "privacyDescription" : {
-                    "NSPhotoLibraryUsageDescription" : "该应用需要读取你的相册，用于上传头像",
-                    "NSPhotoLibraryAddUsageDescription" : "该应用需要读取你的相册，用于拍照保存图片",
-                    "NSCameraUsageDescription" : "该应用需要你的相机，用于你拍摄上传头像信息",
-                    "NSMicrophoneUsageDescription" : "该应用需要使用你的麦克风，用于语音播放",
-                    "NSLocationWhenInUseUsageDescription" : "该应用需要你的地理位置，用于天气、签到等功能",
-                    "NSLocationAlwaysUsageDescription" : "该应用需要持续获取用户地理位置，用于天气、签到等功能",
-                    "NSLocationAlwaysAndWhenInUseUsageDescription" : "该应用需要你的地理位置，用于天气、签到等功能",
-                    "NSCalendarsUsageDescription" : "该应用需要获取你的日历，以便更好的体验",
-                    "NSContactsUsageDescription" : "该应用需要读取你的通讯录，以便联系同事",
-                    "NSBluetoothPeripheralUsageDescription" : "该应用需要你的蓝牙，以便读取相关蓝牙设备",
-                    "NFCReaderUsageDescription" : "",
-                    "NSBluetoothAlwaysUsageDescription" : "该应用需要你的蓝牙，以便读取相关蓝牙设备"
+            "ios": {
+                "dSYMs": false,
+                "privacyDescription": {
+                    "NSPhotoLibraryUsageDescription": "该应用需要读取你的相册，用于上传头像",
+                    "NSPhotoLibraryAddUsageDescription": "该应用需要读取你的相册，用于拍照保存图片",
+                    "NSCameraUsageDescription": "该应用需要你的相机，用于你拍摄上传头像信息",
+                    "NSMicrophoneUsageDescription": "该应用需要使用你的麦克风，用于语音播放",
+                    "NSLocationWhenInUseUsageDescription": "该应用需要你的地理位置，用于天气、签到等功能",
+                    "NSLocationAlwaysUsageDescription": "该应用需要持续获取用户地理位置，用于天气、签到等功能",
+                    "NSLocationAlwaysAndWhenInUseUsageDescription": "该应用需要你的地理位置，用于天气、签到等功能",
+                    "NSCalendarsUsageDescription": "该应用需要获取你的日历，以便更好的体验",
+                    "NSContactsUsageDescription": "该应用需要读取你的通讯录，以便联系同事",
+                    "NSBluetoothPeripheralUsageDescription": "该应用需要你的蓝牙，以便读取相关蓝牙设备",
+                    "NFCReaderUsageDescription": "",
+                    "NSBluetoothAlwaysUsageDescription": "该应用需要你的蓝牙，以便读取相关蓝牙设备"
                 },
-                "UIBackgroundModes" : ""
+                "UIBackgroundModes": ""
             },
-            "sdkConfigs" : {
-                "ad" : {},
-                "maps" : {
-                    "amap" : {
-                        "appkey_ios" : "fb35d03fbb17cbf7a8743a522da3c7fc",
-                        "appkey_android" : "ffc71dfd4e576596027f8f45a1b8fb2f",
-                        "name" : "amapBOujshtbA"
+            "sdkConfigs": {
+                "ad": {},
+                "maps": {
+                    "amap": {
+                        "appkey_ios": "fb35d03fbb17cbf7a8743a522da3c7fc",
+                        "appkey_android": "ffc71dfd4e576596027f8f45a1b8fb2f",
+                        "name": "amapBOujshtbA"
                     }
                 },
-                "geolocation" : {
-                    "system" : {
-                        "__platform__" : [ "ios", "android" ]
+                "geolocation": {
+                    "system": {
+                        "__platform__": [
+                            "ios",
+                            "android"
+                        ]
                     },
-                    "amap" : {
-                        "__platform__" : [ "ios", "android" ],
-                        "appkey_ios" : "fb35d03fbb17cbf7a8743a522da3c7fc",
-                        "appkey_android" : "ffc71dfd4e576596027f8f45a1b8fb2f",
-                        "name" : "amapBOujshtbA"
+                    "amap": {
+                        "__platform__": [
+                            "ios",
+                            "android"
+                        ],
+                        "appkey_ios": "fb35d03fbb17cbf7a8743a522da3c7fc",
+                        "appkey_android": "ffc71dfd4e576596027f8f45a1b8fb2f",
+                        "name": "amapBOujshtbA"
                     },
-                    "tencent" : {
-                        "__platform__" : [ "ios", "android" ],
-                        "apikey_ios" : "EGOBZ-74ZET-ST7XS-VYICT-RBLHZ-KLFEX",
-                        "apikey_android" : "EGOBZ-74ZET-ST7XS-VYICT-RBLHZ-KLFEX"
+                    "tencent": {
+                        "__platform__": [
+                            "ios",
+                            "android"
+                        ],
+                        "apikey_ios": "EGOBZ-74ZET-ST7XS-VYICT-RBLHZ-KLFEX",
+                        "apikey_android": "EGOBZ-74ZET-ST7XS-VYICT-RBLHZ-KLFEX"
                     }
                 },
-                "push" : {
-                    "unipush" : {
-                        "version" : "2",
-                        "offline" : true,
-                        "icons" : {
-                            "small" : {
-                                "hdpi" : "unpackage/res/push/36x36.png",
-                                "ldpi" : "unpackage/res/push/18x18.png",
-                                "mdpi" : "unpackage/res/push/24x24.png",
-                                "xhdpi" : "unpackage/res/push/48x48.png",
-                                "xxhdpi" : "unpackage/res/push/72x72.png"
+                "push": {
+                    "unipush": {
+                        "version": "2",
+                        "offline": true,
+                        "icons": {
+                            "small": {
+                                "hdpi": "unpackage/res/push/36x36.png",
+                                "ldpi": "unpackage/res/push/18x18.png",
+                                "mdpi": "unpackage/res/push/24x24.png",
+                                "xhdpi": "unpackage/res/push/48x48.png",
+                                "xxhdpi": "unpackage/res/push/72x72.png"
                             }
                         }
                     }
                 }
             },
-            "icons" : {
-                "android" : {
-                    "hdpi" : "unpackage/res/icons/72x72.png",
-                    "xhdpi" : "unpackage/res/icons/96x96.png",
-                    "xxhdpi" : "unpackage/res/icons/144x144.png",
-                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
+            "icons": {
+                "android": {
+                    "hdpi": "unpackage/res/icons/72x72.png",
+                    "xhdpi": "unpackage/res/icons/96x96.png",
+                    "xxhdpi": "unpackage/res/icons/144x144.png",
+                    "xxxhdpi": "unpackage/res/icons/192x192.png"
                 },
-                "ios" : {
-                    "appstore" : "unpackage/res/icons/1024x1024.png",
-                    "ipad" : {
-                        "app" : "unpackage/res/icons/76x76.png",
-                        "app@2x" : "unpackage/res/icons/152x152.png",
-                        "notification" : "unpackage/res/icons/20x20.png",
-                        "notification@2x" : "unpackage/res/icons/40x40.png",
-                        "proapp@2x" : "unpackage/res/icons/167x167.png",
-                        "settings" : "unpackage/res/icons/29x29.png",
-                        "settings@2x" : "unpackage/res/icons/58x58.png",
-                        "spotlight" : "unpackage/res/icons/40x40.png",
-                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
+                "ios": {
+                    "appstore": "unpackage/res/icons/1024x1024.png",
+                    "ipad": {
+                        "app": "unpackage/res/icons/76x76.png",
+                        "app@2x": "unpackage/res/icons/152x152.png",
+                        "notification": "unpackage/res/icons/20x20.png",
+                        "notification@2x": "unpackage/res/icons/40x40.png",
+                        "proapp@2x": "unpackage/res/icons/167x167.png",
+                        "settings": "unpackage/res/icons/29x29.png",
+                        "settings@2x": "unpackage/res/icons/58x58.png",
+                        "spotlight": "unpackage/res/icons/40x40.png",
+                        "spotlight@2x": "unpackage/res/icons/80x80.png"
                     },
-                    "iphone" : {
-                        "app@2x" : "unpackage/res/icons/120x120.png",
-                        "app@3x" : "unpackage/res/icons/180x180.png",
-                        "notification@2x" : "unpackage/res/icons/40x40.png",
-                        "notification@3x" : "unpackage/res/icons/60x60.png",
-                        "settings@2x" : "unpackage/res/icons/58x58.png",
-                        "settings@3x" : "unpackage/res/icons/87x87.png",
-                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
-                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
+                    "iphone": {
+                        "app@2x": "unpackage/res/icons/120x120.png",
+                        "app@3x": "unpackage/res/icons/180x180.png",
+                        "notification@2x": "unpackage/res/icons/40x40.png",
+                        "notification@3x": "unpackage/res/icons/60x60.png",
+                        "settings@2x": "unpackage/res/icons/58x58.png",
+                        "settings@3x": "unpackage/res/icons/87x87.png",
+                        "spotlight@2x": "unpackage/res/icons/80x80.png",
+                        "spotlight@3x": "unpackage/res/icons/120x120.png"
                     }
                 }
             },
-            "splashscreen" : {
-                "androidStyle" : "default",
-                "android" : {
-                    "hdpi" : "src/static/images/wt/bg.png"
+            "splashscreen": {
+                "androidStyle": "default",
+                "android": {
+                    "hdpi": "src/static/images/wt/bg.png"
                 },
-                "iosStyle" : "common"
+                "iosStyle": "common"
             }
         },
-        "nativePlugins" : {},
-        "safearea" : {
-            "offset" : "none"
+        "nativePlugins": {},
+        "safearea": {
+            "offset": "none"
         }
     },
-    "quickapp" : {},
-    "mp-weixin" : {
-        "appid" : "",
-        "setting" : {
-            "urlCheck" : false,
-            "checkSiteMap" : false
+    "quickapp": {},
+    "mp-weixin": {
+        "appid": "",
+        "setting": {
+            "urlCheck": false,
+            "checkSiteMap": false
         },
-        "usingComponents" : true,
-        "navigateToMiniProgramAppIdList" : [ "wxf5ad8734295d43f8" ]
+        "usingComponents": true,
+        "navigateToMiniProgramAppIdList": [
+            "wxf5ad8734295d43f8"
+        ]
     },
-    "mp-alipay" : {
-        "usingComponents" : true
+    "mp-alipay": {
+        "usingComponents": true
     },
-    "mp-baidu" : {
-        "usingComponents" : true
+    "mp-baidu": {
+        "usingComponents": true
     },
-    "mp-toutiao" : {
-        "usingComponents" : true
+    "mp-toutiao": {
+        "usingComponents": true
     },
-    "uniStatistics" : {
-        "enable" : false
+    "uniStatistics": {
+        "enable": false
     },
-    "h5" : {
-        "publicPath" : "./",
-        "title" : "综合智慧云",
-        "router" : {
-            "mode" : "hash"
+    "h5": {
+        "publicPath": "./",
+        "title": "综合智慧云",
+        "router": {
+            "mode": "hash"
         },
-        "devServer" : {
-            "https" : false,
-            "proxy" : {}
+        "devServer": {
+            "https": false,
+            "proxy": {}
         },
-        "sdkConfigs" : {
-            "maps" : {
-                "amap" : {
-                    "key" : "d4d73a7d572b6ff6028d5f67de62029a",
-                    "securityJsCode" : "be916fcd16d0b33d228c49f0ff096b17",
-                    "serviceHost" : ""
+        "sdkConfigs": {
+            "maps": {
+                "amap": {
+                    "key": "d4d73a7d572b6ff6028d5f67de62029a",
+                    "securityJsCode": "be916fcd16d0b33d228c49f0ff096b17",
+                    "serviceHost": ""
                 }
             }
         },
-        "optimization" : {
-            "treeShaking" : {
-                "enable" : true
+        "optimization": {
+            "treeShaking": {
+                "enable": true
             }
         },
-        "template" : "index.html"
+        "template": "index.html"
     },
-    "vueVersion" : "3",
-    "locale" : "zh-Hans"
-}
+    "vueVersion": "3",
+    "locale": "zh-Hans"
+}

src/pages/login.vue

@@ -304,10 +304,6 @@ onShow(() => {
 });
 
 onLoad((options) => {
-  // console.log(linkUrl.value)
-  console.log("options");
-  console.log(options);
-
   if (options.dataToken) {
     localStorage.setItem("App-Token", options.dataToken);
     localStorage.setItem("type", "innerH5");

src/pages/mine.vue

@@ -52,7 +52,7 @@
                 <view>新消息通知</view>
               </view>
             </view>
-            <view class="list-cell list-cell-arrow" @click="proxy.$settingStore.handleAbout()" v-if="config.appInfo.appid != '__UNI__BF1A1F0'">
+            <view class="list-cell list-cell-arrow" @click="proxy.$settingStore.handleAbout()">
               <view class="menu-item">
                 <view class="iconfont oaIcon-aixin menu-item-icon"></view>
                 <view>关于我们</view>

src/pages/mine/about/index.vue

@@ -8,7 +8,12 @@
       </template>
     </u-navbar>
 
-    <view class="oa-header-section text-center">
+    <view class="oa-header-section text-center" v-if="config.appInfo.appid != '__UNI__BF1A1F0'">
+      <image style="width: 130rpx; height: 130rpx" mode="heightFix" :src="useStore.loginLogo" v-if="useStore.loginLogo" />
+      <image style="width: 130rpx; height: 130rpx" mode="heightFix" src="@/static/logo200.png" v-else />
+      <uni-title type="h2" :title="useStore.loginTitle"></uni-title>
+    </view>
+    <view class="oa-header-section text-center" v-else>
       <image style="width: 130rpx; height: 130rpx" mode="heightFix" :src="useStore.loginLogo" v-if="useStore.loginLogo" />
       <image style="width: 130rpx; height: 130rpx" mode="heightFix" src="@/static/logo200.png" v-else />
       <uni-title type="h2" :title="useStore.loginTitle"></uni-title>
@@ -22,19 +27,19 @@
             <view class="mr15 ml-auto text-right">v{{ version }}</view>
           </view>
         </view>
-        <view class="list-cell list-cell-arrow">
+        <view class="list-cell list-cell-arrow" v-if="config.appInfo.appid != '__UNI__BF1A1F0'">
           <view class="menu-item">
             <view>官方邮箱</view>
             <view class="mr15 ml-auto text-right">{{ email }}</view>
           </view>
         </view>
-        <view class="list-cell list-cell-arrow">
+        <view class="list-cell list-cell-arrow" v-if="config.appInfo.appid != '__UNI__BF1A1F0'">
           <view class="menu-item">
             <view>服务热线</view>
             <view class="mr15 ml-auto text-right">{{ hotline }}</view>
           </view>
         </view>
-        <view class="list-cell list-cell-arrow">
+        <view class="list-cell list-cell-arrow" v-if="config.appInfo.appid != '__UNI__BF1A1F0'">
           <view class="menu-item">
             <view>公司网站</view>
             <view class="mr15 ml-auto text-right">
@@ -45,7 +50,7 @@
       </view>
     </view>
 
-    <view class="oa-footer-section">
+    <view class="oa-footer-section" v-if="config.appInfo.appid != '__UNI__BF1A1F0'">
       <view>{{ copyright }}</view>
       <u-text :text="filingInfo.code" :href="filingInfo.href" mode="link" align="center" size="12"></u-text>
     </view>

src/store/modules/user.js

@@ -378,7 +378,6 @@ const useStores = defineStore("useStores", {
       storage.set("permissions", permissions);
     },
     SET_STORAGE_OBJECT_KEYS(LIST) {
-      console.log(LIST,111)
       Object.keys(LIST).forEach(function (key) {
         storage.set(key, LIST[key]);
         useStores()[key] = LIST[key];

src/uni_modules/c-progress-circle/components/c-progress-circle/c-progress-circle.vue

@@ -9,7 +9,7 @@
 		</view>
 		<view class="cneter-box">
 			<slot>
-				{{(progress*100).toFixed(2)}}%
+				{{Math.round(progress*100)}}%
 			</slot>
 		</view>
 	</view>