Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc_app into V0.0.2

src/components/upload/gxuploader.vue

@@ -70,7 +70,7 @@ export default {
   },
   methods: {
     openCameraCallBack(data) {
-
+      alert(data);
       let params = {};
       try{
         let img = JSON.parse(data);
@@ -97,6 +97,10 @@ export default {
       });
     },
     useCamera(actionType) {
+      if(this.fileList.length >= this.maxCount){
+        this.$toast('最多上传'+this.maxCount+'张图片')
+        return
+      }
       window.openCameraCallBack = null;
       window.openCameraCallBack = this.openCameraCallBack;
       let parms = {};

src/views/menu/securityCheckRegister/addCheck.vue

@@ -119,6 +119,7 @@ export default {
           return
         }
         res.rows.forEach(v=>{
+          v.isAdd = 1;
           v.checked = false;
           v.pointId = v.id;
         });

src/views/menu/securityCheckRegister/detail.vue

@@ -86,12 +86,13 @@
                   />
                   <van-field
                     required
+                    :maxlength="200"
                     v-model="item.remark"
                     rows="1"
                     autosize
                     label="情况描述："
                     type="textarea"
-                    placeholder="请输入"
+                    placeholder="请输入(200字以内)"
                   />
                   <div class="upload-box">
                     <uploader v-if="enable" :maxCount="5" v-model="item.imgData" />
@@ -197,6 +198,16 @@ export default {
     window.openNFCScanCallBack = null
   },
   methods: {
+    //长度校验
+    validator(val) {
+      let len = val.length;
+      if( len > 5) {
+        this.$toast.fail('问题情况输入长度不能超过200');
+        return true
+      }else {
+        return false
+      }
+    },
     getNfcState(arr){
         arr = arr || [];
         let num = 0;
@@ -312,6 +323,7 @@ export default {
           if (!existingPoint) {
             console.log(existingItem, 'point添加成功')
             this.$nextTick(() => {
+              valItem.isAdd = 1;
               existingItem.pointList.push(valItem)
               this.active = true
             })
@@ -321,6 +333,7 @@ export default {
         } else {
           console.log(valItem, 'item添加成功')
           this.checkList.push({
+            isAdd:1,
             itemId: valItem.itemId,
             itemName: valItem.itemName,
             pointList: [valItem]