sunkuosheng 3 ヶ月 前
コミット
fb79ceb219

+ 1 - 1
ruoyi-ui/src/views/system/jkyj/index.vue

@@ -96,7 +96,7 @@
         </template>
       </el-table-column>
       <el-table-column label="最近上线时间" align="center" prop="zjsbsj" width="150px"/>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="300">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="330">
         <template slot-scope="scope">
           <!--智能手环-->
           <el-dropdown @command="handleCommand($event,scope.row)" v-if="scope.row.sblb==='0'" style="margin-right: 5px">

+ 10 - 0
ruoyi-ui/src/views/system/jkyj/module/component/mapfence.vue

@@ -145,6 +145,16 @@
         this.polyEditor.on('end', function(event) {
           // event.target 即为编辑后的多边形对象,event.target.getPath()得到编辑完成后的点数组
           let pointArr = event.target.getPath()
+          if(pointArr.length>20){
+            _this.$alert('点位不能超过20个', '提醒', {
+              confirmButtonText: '确定',
+              callback: action => {
+                _this.clearPoly();
+              }
+            });
+            return
+
+          }
           this.polygonPaths = []
           for (let i = 0; i < pointArr.length; i++) {
             this.polygonPaths.push({ lat: pointArr[i].lat, lng: pointArr[i].lng })

+ 46 - 44
ruoyi-ui/src/views/system/jkyj/module/znsh.vue

@@ -11,63 +11,63 @@
       <!--<div class="hAuto">-->
         <!--<h3>呼叫电话(A组)</h3>-->
         <el-form-item label="联系人1:" prop="sos1">
-          <el-input v-model="form.sos1"></el-input>
+          <el-input v-model="form.sos1" :maxlength="11"></el-input>
         </el-form-item>
         <el-form-item label="联系人2:" prop="sos2">
-          <el-input v-model="form.sos2"></el-input>
+          <el-input v-model="form.sos2" :maxlength="11"></el-input>
         </el-form-item>
         <el-form-item label="联系人3:" prop="sos3">
-          <el-input v-model="form.sos3"></el-input>
+          <el-input v-model="form.sos3" :maxlength="11"></el-input>
         </el-form-item>
       <!--</div>-->
       </el-tab-pane>
         <el-tab-pane label="测量间隔" name="cljg">
           <el-form-item label="定位间隔(分钟):" prop="locationtimeinterval">
-            <el-input v-model="form.locationtimeinterval"></el-input>
+            <el-input v-model="form.locationtimeinterval" :maxlength="11"></el-input>
           </el-form-item>
-          <el-form-item label="心率间隔(分钟):" prop="heartratetimeinterval   ">
-            <el-input v-model="form.heartratetimeinterval   "></el-input>
+          <el-form-item label="心率间隔(分钟):"  prop="heartratetimeinterval   ">
+            <el-input v-model="form.heartratetimeinterval" :maxlength="11"></el-input>
           </el-form-item>
           <el-form-item label="体温间隔(分钟):" prop="tpi">
-            <el-input v-model="form.tpi"></el-input>
+            <el-input v-model="form.tpi" :maxlength="11"></el-input>
           </el-form-item>
           <el-form-item label="血压间隔(分钟):" prop="bpi">
-            <el-input v-model="form.bpi"></el-input>
+            <el-input v-model="form.bpi" :maxlength="11"></el-input>
           </el-form-item>
           <el-form-item label="血氧间隔(分钟):" prop="oxi">
-            <el-input v-model="form.oxi"></el-input>
+            <el-input v-model="form.oxi" :maxlength="11"></el-input>
           </el-form-item>
         </el-tab-pane>
         <el-tab-pane label="健康阈值" name="jkfz">
           <el-form-item label="最大心率:" prop="maxheartrate">
-            <el-input v-model="form.maxheartrate"></el-input>
+            <el-input v-model="form.maxheartrate" :maxlength="11"></el-input>
           </el-form-item>
           <el-form-item label="最小心率:" prop="minheartrate">
-            <el-input v-model="form.minheartrate"></el-input>
+            <el-input v-model="form.minheartrate" :maxlength="11"></el-input>
           </el-form-item>
           <el-form-item label="高压最大:" prop="bphighmax">
-            <el-input v-model="form.bphighmax"></el-input>
+            <el-input v-model="form.bphighmax" :maxlength="11"></el-input>
           </el-form-item>
           <el-form-item label="高压最小:" prop="bphighmin">
-            <el-input v-model="form.bphighmin"></el-input>
+            <el-input v-model="form.bphighmin" :maxlength="11"></el-input>
           </el-form-item>
           <el-form-item label="低压最大:" prop="bplowmax">
-            <el-input v-model="form.bplowmax"></el-input>
+            <el-input v-model="form.bplowmax" :maxlength="11"></el-input>
           </el-form-item>
           <el-form-item label="低压最小:" prop="bplowmin">
-            <el-input v-model="form.bplowmin"></el-input>
+            <el-input v-model="form.bplowmin" :maxlength="11"></el-input>
           </el-form-item>
           <el-form-item label="血氧最大:" prop="bloodoxmax">
-            <el-input v-model="form.bloodoxmax"></el-input>
+            <el-input v-model="form.bloodoxmax" :maxlength="11"></el-input>
           </el-form-item>
           <el-form-item label="血氧最小:" prop="bloodoxmin">
-            <el-input v-model="form.bloodoxmin"></el-input>
+            <el-input v-model="form.bloodoxmin" :maxlength="11"></el-input>
           </el-form-item>
           <el-form-item label="体温最大:" prop="tempmax">
-            <el-input v-model="form.tempmax"></el-input>
+            <el-input v-model="form.tempmax" :maxlength="11"></el-input>
           </el-form-item>
           <el-form-item label="体温最小:" prop="tempmin">
-            <el-input v-model="form.tempmin"></el-input>
+            <el-input v-model="form.tempmin" :maxlength="11"></el-input>
           </el-form-item>
         </el-tab-pane>
         <el-tab-pane label="计步器" name="jbq">
@@ -84,70 +84,70 @@
         <el-tab-pane label="通讯录" name="txl">
           <el-form-item label="联系人1:" >
             <div class="flexCenter">
-              <el-input v-model="form.pbname1"  placeholder="联系人姓名"></el-input>
-              <el-input v-model="form.book1" placeholder="联系人手机号"></el-input>
+              <el-input v-model="form.pbname1"  placeholder="联系人姓名" :maxlength="11"></el-input>
+              <el-input v-model="form.book1" placeholder="联系人手机号" :maxlength="11"></el-input>
             </div>
           </el-form-item>
           <el-form-item label="联系人2:" >
             <div class="flexCenter">
-              <el-input v-model="form.pbname2"  placeholder="联系人姓名"></el-input>
-              <el-input v-model="form.book2" placeholder="联系人手机号"></el-input>
+              <el-input v-model="form.pbname2"  placeholder="联系人姓名" :maxlength="11"></el-input>
+              <el-input v-model="form.book2" placeholder="联系人手机号" :maxlength="11"></el-input>
             </div>
           </el-form-item>
           <el-form-item label="联系人3:" >
             <div class="flexCenter">
-              <el-input v-model="form.pbname3"  placeholder="联系人姓名"></el-input>
-              <el-input v-model="form.book3" placeholder="联系人手机号"></el-input>
+              <el-input v-model="form.pbname3"  placeholder="联系人姓名" :maxlength="11"></el-input>
+              <el-input v-model="form.book3" placeholder="联系人手机号" :maxlength="11"></el-input>
             </div>
           </el-form-item>
           <el-form-item label="联系人4:" >
           <div class="flexCenter">
-            <el-input v-model="form.pbname4"  placeholder="联系人姓名"></el-input>
-            <el-input v-model="form.book4" placeholder="联系人手机号"></el-input>
+            <el-input v-model="form.pbname4"  placeholder="联系人姓名" :maxlength="11"></el-input>
+            <el-input v-model="form.book4" placeholder="联系人手机号" :maxlength="11"></el-input>
           </div>
         </el-form-item>
           <el-form-item label="联系人5:" >
             <div class="flexCenter">
-              <el-input v-model="form.pbname5"  placeholder="联系人姓名"></el-input>
-              <el-input v-model="form.book5" placeholder="联系人手机号"></el-input>
+              <el-input v-model="form.pbname5"  placeholder="联系人姓名" :maxlength="11"></el-input>
+              <el-input v-model="form.book5" placeholder="联系人手机号" :maxlength="11"></el-input>
             </div>
           </el-form-item>
           <el-form-item label="联系人6:" >
             <div class="flexCenter">
-              <el-input v-model="form.pbname6"  placeholder="联系人姓名"></el-input>
-              <el-input v-model="form.book6" placeholder="联系人手机号"></el-input>
+              <el-input v-model="form.pbname6"  placeholder="联系人姓名" :maxlength="11"></el-input>
+              <el-input v-model="form.book6" placeholder="联系人手机号" :maxlength="11"></el-input>
             </div>
           </el-form-item>
           <el-form-item label="联系人7:" >
             <div class="flexCenter">
-              <el-input v-model="form.pbname7"  placeholder="联系人姓名"></el-input>
-              <el-input v-model="form.book7" placeholder="联系人手机号"></el-input>
+              <el-input v-model="form.pbname7"  placeholder="联系人姓名" :maxlength="11"></el-input>
+              <el-input v-model="form.book7" placeholder="联系人手机号" :maxlength="11"></el-input>
             </div>
           </el-form-item>
           <el-form-item label="联系人8:" >
             <div class="flexCenter">
-              <el-input v-model="form.pbname8"  placeholder="联系人姓名"></el-input>
-              <el-input v-model="form.book8" placeholder="联系人手机号"></el-input>
+              <el-input v-model="form.pbname8"  placeholder="联系人姓名" :maxlength="11"></el-input>
+              <el-input v-model="form.book8" placeholder="联系人手机号" :maxlength="11"></el-input>
             </div>
           </el-form-item>
           <el-form-item label="联系人9:" >
             <div class="flexCenter">
-              <el-input v-model="form.pbname9"  placeholder="联系人姓名"></el-input>
-              <el-input v-model="form.book9" placeholder="联系人手机号"></el-input>
+              <el-input v-model="form.pbname9"  placeholder="联系人姓名" :maxlength="11"></el-input>
+              <el-input v-model="form.book9" placeholder="联系人手机号" :maxlength="11"></el-input>
             </div>
           </el-form-item>
 
           <el-form-item label="联系人10:" >
             <div class="flexCenter">
-              <el-input v-model="form.pbname10"  placeholder="联系人姓名"></el-input>
-              <el-input v-model="form.book10" placeholder="联系人手机号"></el-input>
+              <el-input v-model="form.pbname10"  placeholder="联系人姓名" :maxlength="11"></el-input>
+              <el-input v-model="form.book10" placeholder="联系人手机号" :maxlength="11"></el-input>
             </div>
           </el-form-item>
         </el-tab-pane>
         <el-tab-pane label="血压学习值" name="xyxxz">
           <el-form-item label="血压学习值:" >
             <div class="flexCenter">
-              <el-input v-model="form.studybloodp"  placeholder="输入例如80,120的形式"></el-input>
+              <el-input v-model="form.studybloodp"  placeholder="输入例如80,120的形式" :maxlength="20"></el-input>
             </div>
           </el-form-item>
         </el-tab-pane>
@@ -314,7 +314,7 @@
         <!--</el-tab-pane>-->
 
         <el-tab-pane label="电子围栏"  name="dzwl">
-          <el-form-item label="围栏名字:" prop="dzwlName" :rules="{required:activeName==='dzwl'?true:false, message: '围栏名字不能为空', trigger: 'blur'}">
+          <el-form-item label="围栏名字:" :maxlength="50" prop="dzwlName" :rules="{required:activeName==='dzwl'?true:false, message: '围栏名字不能为空', trigger: 'blur'}">
             <el-input v-model="form.dzwlName"></el-input>
           </el-form-item>
           <el-form-item  label="围栏形状:" prop="vlxz" :rules="{required:activeName==='dzwl'?true:false, message: '围栏形状不能为空', trigger: 'blur'}">
@@ -372,19 +372,21 @@
             <div style="display: flex"  v-for="(domain, index) in form.domains3" :key="'短信提醒'+index">
               <el-form-item
                 label-width="73px"
+
                 :label="'姓名:'"
                 :prop="'domains3.' + index + '.txrxm'"
                 :rules="{required:activeName==='dxtx'?true:false, message: '联系人姓名不能为空', trigger: 'blur'}"
               >
-                <el-input style="width: 80px;" v-model="form.domains3[index].txrxm"></el-input>
+                <el-input  :maxlength="10" style="width: 80px;" v-model="form.domains3[index].txrxm"></el-input>
               </el-form-item>
               <el-form-item
                 :label="'电话:'"
+
                 label-width="70px"
                 :prop="'domains3.' + index + '.txrdh'"
                 :rules="[sjhmRules[0],{required:activeName==='dxtx'?true:false, message: '联系人电话不能为空', trigger: 'blur'}]"
               >
-                <el-input style="width: 120px;" v-model="form.domains3[index].txrdh"></el-input>
+                <el-input  :maxlength="11" style="width: 120px;" v-model="form.domains3[index].txrdh"></el-input>
               </el-form-item>
               <el-form-item
                 :label="'关系:'"
@@ -392,7 +394,7 @@
                 :prop="'domains3.' + index + '.txrgx'"
                 :rules="{required:activeName==='dxtx'?true:false, message: '与通讯人关系不能为空', trigger: 'blur'}"
               >
-                <el-input style="width: 120px;" v-model="form.domains3[index].txrgx"></el-input>
+                <el-input  :maxlength="11" style="width: 120px;" v-model="form.domains3[index].txrgx"></el-input>
               </el-form-item>
               <el-button size="mini"
                          plain