推荐序号限制。

src/views/Editor/modules/imageEdAJ.vue

 <!--
  * @Author: your name
  * @Date: 2021-10-22 11:36:10
- * @LastEditTime: 2022-01-18 15:26:38
+ * @LastEditTime: 2022-01-18 15:52:01
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue
@@ -165,7 +165,7 @@
           </div>
           <div class="positions positons-hand" v-show="zzwSwitch == 2">
             <div class="hand-item" v-for="(item, index) in handsType" :key="index">
-              <el-checkbox class="check" v-model="item.isSelected"  @change="handleHandPosition">{{
+              <el-checkbox class="check" v-model="item.isSelected" @change="handleHandPosition">{{
 								item.name
 							}}</el-checkbox>
             </div>
@@ -1884,7 +1884,7 @@ export default {
               self.rightFinger.forEach(item2 => {
                 if (item2.code == item) {
                   item2.isSelected = true
-                } 
+                }
               })
               self.leftFinger.forEach(item3 => {
                 if (item3.code == item) {
@@ -5152,6 +5152,11 @@ export default {
 
         // 裁剪
         if (this.zwType == "指纹") {
+          if (Number(this.tjxh) < 1) {
+            this.tjxh = 1
+          } else if (Number(this.tjxh) > 99) {
+            this.tjxh = 99
+          }
           if (this.fingersNumber.indexOf(Number(this.tjxh)) != -1) {
             this.$message.error('指纹序号重复！')
             return
@@ -5161,6 +5166,9 @@ export default {
           this.isTpdr_flag = false;
           this.startEditImage = false;
         } else {
+          if (Number(this.tjxh) < 101) {
+            this.tjxh = 101
+          }
           if (this.handsNumber.indexOf(Number(this.tjxh)) != -1) {
             this.$message.error('掌纹序号重复！')
             return

src/views/bzxxgl/scss/fhxxLT.scss

@@ -451,3 +451,10 @@
     color: #fa9500 !important;
   }
 }
+
+.xmbm {
+  width: 42px;
+  overflow: hidden;
+  text-overflow:ellipsis;
+  white-space: nowrap;
+}

src/views/zzwcj/fingerprint.scss

@@ -2789,7 +2789,7 @@ $dashed:var(--dashed,#055FE7);
     }
     // .el-progress-circle
     /deep/.el-progress-circle__track {
-      stroke: $uploadingcircleBg;
+      // stroke: $uploadingcircleBg;
     }
     .pro {
       border: $uploadingBorder solid #26d31f;

src/views/zzwcj/fingerprint.vue

@@ -605,7 +605,7 @@
     <div class="uploading" v-show="uploadingStart">
       <!-- <div class="uploading"> -->
       <div class="uploading-content" v-show="uploadingClose=='uploading'">
-        <el-progress class="pro" type="circle" :percentage="percentage" :color="uploadingColor" :show-text="isShowUploadingTxt" v-if="percentage"></el-progress>
+        <el-progress class="pro" type="circle" :percentage="percentage" :color="uploadingColor" :show-text="isShowUploadingTxt"></el-progress>
         <div class="uploading-title">{{uploadingTitle}}</div>
         <div class="uploading-tip">{{uploadingTip}}</div>
         <div v-show="isUploadingFinish" class="uploading-finish">
@@ -1157,10 +1157,14 @@ export default {
     // //console.log(this.rybh);
   },
   async mounted () {
-    // setInterval(() => {
+    // this.uploadingStart = true
+    // let timePercentage = setInterval(() => {
     //   this.percentage++
-    // }, 5000);
-    // console.log(this.themeType);
+    //   if (this.percentage == 90) {
+    //     clearInterval(timePercentage)
+    //   }
+    // }, 1000);
+
     let self = this
     /************************/
     function getIPs (callback) {
@@ -8310,7 +8314,7 @@ export default {
         }, 1500);
         return
       } else {
-        if (self.cj_type === 0) {
+        if (self.cj_type === 0 || self.cj_type === 2) {
           self.isUploadingFinish = true
           self.isShowUploadingTxt = false
           self.uploadingTitle = '指纹上传完成'

src/views/zzwlr/xzry.vue

 <!--
  * @Author: your name
  * @Date: 2021-09-07 10:31:34
- * @LastEditTime: 2022-01-18 11:48:54
+ * @LastEditTime: 2022-01-18 14:31:18
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \founder_vue\src\views\zzwlr\Index.vue
@@ -304,9 +304,8 @@
           zjhm: [
             { required: true, message: "请输入证件号码", trigger: "blur" },
             {
-              pattern: this.isZjhm,
-                // /(^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)|(^[1-9]\d{5}\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{2}$)/,
-               
+              pattern: 
+                /(^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)|(^[1-9]\d{5}\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{2}$)/,
               message: "证件号码格式有误！",
               trigger: "blur",
             },
@@ -360,7 +359,12 @@
         // console.log(this.$route.params.type==='edit');
         this.edit = "新增人员";
       }
-      this.ruleForm.cyzjdm = "111" ? this.isZjhm : /^(?:0|[1-9]\d{3,30})?$/
+      // this.ruleForm.cyzjdm == "111" ? this.isZjhm : /^(?:0|[1-9]\d{3,30})?$/
+      if(this.ruleForm.cyzjdm == "111") {
+        this.isZjhm = /(^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)|(^[1-9]\d{5}\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{2}$)/
+      } else {
+        this.isZjhm = /^(?:0|[1-9]\d{3,30})?$/
+      }
     },
     methods: {
       auto(){
@@ -391,6 +395,13 @@
         this.ruleForm.nysj = "2022-01-17"
         this.ruleForm.nyryGmsfhm = "132910199608122049"
         this.ruleForm.nyryLxdh = "13111133331"
+
+        // if(this.ruleForm.cyzjdm == "111") {
+        //   this.$set(this.rules.zjhm[1], 'pattern', /(^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)|(^[1-9]\d{5}\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{2}$)/)
+        // } else {
+        //   this.$set(this.rules.zjhm[1], 'pattern', /^(?:0|[1-9]\d{3,30})?$/)
+        // }
+        console.log(this.rules.zjhm);
       },
       disabledDate(a) {
         if (a.getTime() > new Date().getTime()) {
@@ -619,6 +630,15 @@
           });
       },
     },
+    watch: {
+      "ruleForm.cyzjdm"(newValue, oldValue) {
+        if(this.ruleForm.cyzjdm == "111") {
+          this.$set(this.rules.zjhm[1], 'pattern', /(^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)|(^[1-9]\d{5}\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{2}$)/)
+        } else {
+          this.$set(this.rules.zjhm[1], 'pattern', /^(?:0|[1-9]\d{3,30})?$/)
+        }
+      }
+    },
   };
 </script>