09-22 15:33 提交

src/views/system/device/index.vue

@@ -62,6 +62,10 @@
         <el-button type="success" plain icon="el-icon-circle-check" size="mini" @click="openPhone"
           v-hasPermi="['system:manage:add']">打开拨号盘</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button type="success" plain icon="el-icon-s-tools" size="mini"
+          v-hasPermi="['system:manage:add']" @click="healthInterval = true">健康阈值设置</el-button>
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -93,7 +97,7 @@
             </span>
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item command="settingOpen">设备设置</el-dropdown-item>
-              <el-dropdown-item command="healthInterval">健康阈值设置</el-dropdown-item>
+              <!-- <el-dropdown-item command="healthInterval">健康阈值设置</el-dropdown-item> -->
               <el-dropdown-item command="fenceOpen">电子围栏</el-dropdown-item>
               <el-dropdown-item command="health">健康指标</el-dropdown-item>
               <el-dropdown-item command="deviceLog">设备消息日志</el-dropdown-item>
@@ -416,61 +420,61 @@
       <el-form label-width="100px" :data="deviceInterval" :rules="intervalRules">
         <el-row>
           <el-col :span="12">
-            <el-form-item label="最大心率" prop="shouhuan_heart_max">
-              <el-input v-model="deviceInterval.shouhuan_heart_max"></el-input>
+            <el-form-item label="最小心率" prop="shouhuan_heart_min">
+              <el-input v-model="deviceInterval.shouhuan_heart_min"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="最小心率" prop="shouhuan_heart_min">
-              <el-input v-model="deviceInterval.shouhuan_heart_min"></el-input>
+            <el-form-item label="最大心率" prop="shouhuan_heart_max">
+              <el-input v-model="deviceInterval.shouhuan_heart_max"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="最大高压" prop="shouhuan_blood_high_max">
-              <el-input v-model="deviceInterval.shouhuan_blood_high_max" type="number"></el-input>
+            <el-form-item label="最小高压" prop="shouhuan_blood_high_min">
+              <el-input v-model="deviceInterval.shouhuan_blood_high_min" type="number"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="最小高压" prop="shouhuan_blood_high_min">
-              <el-input v-model="deviceInterval.shouhuan_blood_high_min" type="number"></el-input>
+            <el-form-item label="最大高压" prop="shouhuan_blood_high_max">
+              <el-input v-model="deviceInterval.shouhuan_blood_high_max" type="number"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="最大低压" prop="shouhuan_blood_low_max">
-              <el-input v-model="deviceInterval.shouhuan_blood_low_max" type="number"></el-input>
+            <el-form-item label="最小低压" prop="shouhuan_blood_low_min">
+              <el-input v-model="deviceInterval.shouhuan_blood_low_min" type="number"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="最小低压" prop="shouhuan_blood_low_min">
-              <el-input v-model="deviceInterval.shouhuan_blood_low_min" type="number"></el-input>
+            <el-form-item label="最大低压" prop="shouhuan_blood_low_max">
+              <el-input v-model="deviceInterval.shouhuan_blood_low_max" type="number"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="最大血氧" prop="shouhuan_oxygen_max">
-              <el-input v-model="deviceInterval.shouhuan_oxygen_max" type="number"></el-input>
+            <el-form-item label="最小血氧" prop="shouhuan_oxygen_min">
+              <el-input v-model="deviceInterval.shouhuan_oxygen_min" type="number"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="最小血氧" prop="shouhuan_oxygen_min">
-              <el-input v-model="deviceInterval.shouhuan_oxygen_min" type="number"></el-input>
+            <el-form-item label="最大血氧" prop="shouhuan_oxygen_max">
+              <el-input v-model="deviceInterval.shouhuan_oxygen_max" type="number"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="最大体温" prop="shouhuan_body_max">
-              <el-input v-model="deviceInterval.shouhuan_body_max" type="number"></el-input>
+            <el-form-item label="最小体温" prop="shouhuan_body_min">
+              <el-input v-model="deviceInterval.shouhuan_body_min" type="number"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="最小体温" prop="shouhuan_body_min">
-              <el-input v-model="deviceInterval.shouhuan_body_min" type="number"></el-input>
+            <el-form-item label="最大体温" prop="shouhuan_body_max">
+              <el-input v-model="deviceInterval.shouhuan_body_max" type="number"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -854,38 +858,38 @@ export default {
       add_flag: true,
       checkedFence: null,
       items: [],
-      intervalRules: {
-        shouhuan_heart_max: [
-          {required: true, message: '请输入最大心率', trigger: 'blur'}
-        ],
-        shouhuan_heart_min: [
-          {required: true, message: '请输入最小心率', trigger: 'blur'}
-        ],
-        shouhuan_blood_high_max: [
-          {required: true, message: '请输入最大高压', trigger: 'blur'}
-        ],
-        shouhuan_blood_high_min: [
-          {required: true, message: '请输入最小高压', trigger: 'blur'}
-        ],
-        shouhuan_blood_low_max: [
-          {required: true, message: '请输入最大低压', trigger: 'blur'}
-        ],
-        shouhuan_blood_low_min: [
-          {required: true, message: '请输入最小低压', trigger: 'blur'}
-        ],
-        shouhuan_oxygen_max: [
-          {required: true, message: '请输入最大血氧', trigger: 'blur'}
-        ],
-        shouhuan_oxygen_min: [
-          {required: true, message: '请输入最小血氧', trigger: 'blur'}
-        ],
-        shouhuan_body_max: [
-          {required: true, message: '请输入最大体温', trigger: 'blur'}
-        ],
-        shouhuan_body_min: [
-          {required: true, message: '请输入最小体温', trigger: 'blur'}
-        ],
-      }
+      // intervalRules: {
+      //   shouhuan_heart_max: [
+      //     {required: true, message: '请输入最大心率', trigger: 'blur'}
+      //   ],
+      //   shouhuan_heart_min: [
+      //     {required: true, message: '请输入最小心率', trigger: 'blur'}
+      //   ],
+      //   shouhuan_blood_high_max: [
+      //     {required: true, message: '请输入最大高压', trigger: 'blur'}
+      //   ],
+      //   shouhuan_blood_high_min: [
+      //     {required: true, message: '请输入最小高压', trigger: 'blur'}
+      //   ],
+      //   shouhuan_blood_low_max: [
+      //     {required: true, message: '请输入最大低压', trigger: 'blur'}
+      //   ],
+      //   shouhuan_blood_low_min: [
+      //     {required: true, message: '请输入最小低压', trigger: 'blur'}
+      //   ],
+      //   shouhuan_oxygen_max: [
+      //     {required: true, message: '请输入最大血氧', trigger: 'blur'}
+      //   ],
+      //   shouhuan_oxygen_min: [
+      //     {required: true, message: '请输入最小血氧', trigger: 'blur'}
+      //   ],
+      //   shouhuan_body_max: [
+      //     {required: true, message: '请输入最大体温', trigger: 'blur'}
+      //   ],
+      //   shouhuan_body_min: [
+      //     {required: true, message: '请输入最小体温', trigger: 'blur'}
+      //   ],
+      // }
     };
   },
   created() {