From 36c1c5e21cf044920bd3dcf42ed7dbcf9a2d6c3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A3=B7=E5=8F=B6?=
 <14103883+leaf-phos@user.noreply.gitee.com>
Date: Wed, 30 Apr 2025 10:39:28 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jsconfig.json                                 | 57 +++++++++++++++++--
 src/views/bst/area/edit/edit.vue              | 16 ++++++
 .../device/view/components/DeviceLocation.vue |  2 +
 .../user/view/components/UserStatistics.vue   |  3 +-
 4 files changed, 73 insertions(+), 5 deletions(-)

diff --git a/jsconfig.json b/jsconfig.json
index af62672..13f89b5 100644
--- a/jsconfig.json
+++ b/jsconfig.json
@@ -2,9 +2,58 @@
     "compilerOptions": {
         "baseUrl": "./",
         "paths": {
-        "@/*": ["src/*"]
-        }
+            "@/*": ["src/*"],
+            "components/*": ["src/components/*"],
+            "views/*": ["src/views/*"],
+            "api/*": ["src/api/*"],
+            "utils/*": ["src/utils/*"],
+            "assets/*": ["src/assets/*"]
+        },
+        "target": "ES6",
+        "module": "ESNext",
+        "moduleResolution": "node",
+        "allowSyntheticDefaultImports": true,
+        "experimentalDecorators": true,
+        "allowJs": true,
+        "checkJs": false,
+        "strict": true,
+        "noImplicitAny": false,
+        "strictNullChecks": false,
+        "esModuleInterop": true,
+        "skipLibCheck": true,
+        "forceConsistentCasingInFileNames": true,
+        "resolveJsonModule": true,
+        "jsx": "preserve",
+        "lib": ["dom", "esnext"],
+        "types": ["@types/node"],
+        "sourceMap": true,
+        "allowSyntheticDefaultImports": true,
+        "experimentalDecorators": true,
+        "emitDecoratorMetadata": true,
+        "noEmit": true,
+        "isolatedModules": true,
+        "preserveSymlinks": true
     },
-    "include": ["src/**/*"],
-    "exclude": ["node_modules"]
+    "include": [
+        "src/**/*",
+        "src/**/*.vue",
+        "src/**/*.js",
+        "src/**/*.ts",
+        "src/**/*.jsx",
+        "src/**/*.tsx",
+        "src/**/*.json"
+    ],
+    "exclude": [
+        "node_modules",
+        "dist",
+        "build",
+        "**/node_modules",
+        "**/dist",
+        "**/build"
+    ],
+    "vueCompilerOptions": {
+        "target": 2.7,
+        "experimentalCompatMode": 2,
+        "strictTemplates": false
+    }
 }
\ No newline at end of file
diff --git a/src/views/bst/area/edit/edit.vue b/src/views/bst/area/edit/edit.vue
index 7ec9fa9..a7257a0 100644
--- a/src/views/bst/area/edit/edit.vue
+++ b/src/views/bst/area/edit/edit.vue
@@ -75,6 +75,9 @@
                   <template #append>米</template>
                 </el-input>
               </form-col>
+              <!-- <form-col :span="span * 2"  label="超时断电" prop="timeoutLock" tip="风险操作！！！开启后，当订单的预存不足时，将会对车辆进行断电">
+                <el-switch v-model="form.timeoutLock" active-text="开启" inactive-text="关闭" @change="onChangeTimeoutLock"/>
+              </form-col> -->
             </el-row>
           </collapse-panel>
           <collapse-panel title="还车设置" :value="true">
@@ -183,6 +186,19 @@ export default {
     }
   },
   methods: {
+    onChangeTimeoutLock(val) {
+      if (val) {
+        this.$confirm('开启超时断电功能可能造成安全事故，是否继续？', '风险提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.form.timeoutLock = true;
+        }).catch(() => {
+          this.form.timeoutLock = false;
+        });
+      }
+    },
     /** 获取运营区详细信息 */
     getInfo(id) {
       this.loading = true;
diff --git a/src/views/bst/device/view/components/DeviceLocation.vue b/src/views/bst/device/view/components/DeviceLocation.vue
index 179a4ef..28d12f0 100644
--- a/src/views/bst/device/view/components/DeviceLocation.vue
+++ b/src/views/bst/device/view/components/DeviceLocation.vue
@@ -99,6 +99,8 @@ export default {
       areaSubList: [],
       locationLogList: [],
       queryParams: {
+        orderByColumn: "at",
+        isAsc: "asc",
         timeRange: [parseTime(new Date(), '{y}-{m}-{d} 00:00:00'), parseTime(new Date(), '{y}-{m}-{d} 23:59:59')]
       },
       loading: false,
diff --git a/src/views/system/user/view/components/UserStatistics.vue b/src/views/system/user/view/components/UserStatistics.vue
index 3479784..1dc723a 100644
--- a/src/views/system/user/view/components/UserStatistics.vue
+++ b/src/views/system/user/view/components/UserStatistics.vue
@@ -139,7 +139,8 @@ export default {
             StatKeys.AREA_COUNT,
             StatKeys.AREA_JOIN_COUNT,
             StatKeys.AREA_JOIN_PARTNER_COUNT,
-            StatKeys.USER_MCH_COUNT
+            StatKeys.USER_MCH_COUNT,
+            StatKeys.BONUS_WAIT_DIVIDE_AMOUNT
           ]
         })
         if (res.code === 200) {