Selaa lähdekoodia

Merge dev into prod (keep prod config files)

liujia 2 kuukautta sitten
vanhempi
commit
0d1b7d2f71

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-project",
-  "version": "0.1.10",
+  "version": "0.1.11",
   "private": true,
   "type": "module",
   "scripts": {

+ 5 - 2
src/views/device/detail/components/deviceBaseConfig/index.vue

@@ -203,7 +203,7 @@
           <template #suffix>
             <a-tooltip>
               <template #title>
-                <div>默认: 53秒</div>
+                <div>需大于0,默认: 53秒</div>
               </template>
               <info-circle-outlined style="color: rgba(0, 0, 0, 0.45)" />
             </a-tooltip>
@@ -317,7 +317,10 @@ const saveBaseConfig = async () => {
           height: baseFormState.installHeight,
           northAngle: baseFormState.northAngle,
           tenantId: baseFormState?.tenantId,
-          fallingConfirm: Number(baseFormState?.fallingConfirm),
+          fallingConfirm:
+            Number(baseFormState?.fallingConfirm) > 0
+              ? Number(baseFormState?.fallingConfirm)
+              : null,
         })
         saveBaseLoading.value = false
         message.success('保存成功')

+ 5 - 5
src/views/device/detail/index.vue

@@ -438,11 +438,11 @@ onUnmounted(() => {
     background-color: #f5f5f5;
     border-radius: 10px;
 
-    :deep(.info) {
-      &-content {
-        align-items: center !important;
-      }
-    }
+    // :deep(.info) {
+    //   &-content {
+    //     align-items: center !important;
+    //   }
+    // }
 
     .radarBox {
       position: relative;