coys 2 lat temu
rodzic
commit
3b0b412a86

+ 21 - 24
src/components/upload/index.vue

@@ -1,5 +1,5 @@
 <template>
-<!--  <div>
+  <!-- <div>
     <van-uploader
       accept=""
       ref="uploader"
@@ -10,27 +10,25 @@
       @click-upload="useCamera(2)"
       @delete="deleteHandler"
       :max-size="maxSize * 1024 * 1024"
-
     />
-    &lt;!&ndash; :after-read="afterRead" &ndash;&gt;
-    &lt;!&ndash; :before-read="beforeRead" &ndash;&gt;
-  </div>-->
+    &lt;!&ndash; :after-read="afterRead" &ndash;&gt; &lt;!&ndash; :before-read="beforeRead" &ndash;&gt;
+  </div> -->
   <div>
-    <div  style="float: left">
+    <div style="float: left">
       <van-uploader
         ref="uploader"
         v-bind="$attrs"
         v-model="fileList"
-        :before-read="beforeRead"
-        :after-read="afterRead"
         :max-count="maxCount"
         @delete="deleteHandler"
         :show-upload="false"
-        :max-size="maxSize * 1024*1024"/>
+        :max-size="maxSize * 1024 * 1024"
+        />
+        <!-- :before-read="beforeRead"
+        :after-read="afterRead" -->
     </div>
-    <div  class="van-uploader__upload" @click="useCamera(2)">
-      <i class="van-icon van-icon-photograph van-uploader__upload-icon">
-      </i>
+    <div class="van-uploader__upload" @click="useCamera(2)">
+      <i class="van-icon van-icon-photograph van-uploader__upload-icon"> </i>
     </div>
   </div>
 </template>
@@ -92,10 +90,10 @@ export default {
     useCamera(actionType) {
       window.openCameraCallBack = null
       window.openCameraCallBack = this.openCameraCallBack
-      let parms = {};
+      let parms = {}
       if (actionType) {
-        parms.actionType = actionType;
-        parms.compressKb = "500";
+        parms.actionType = actionType
+        parms.compressKb = '500'
       }
       let system = this.isAndroidOrIos()
       if (system === 1) {
@@ -122,17 +120,17 @@ export default {
     },
 
     openCameraCallBack(data) {
-      let params = {};
-      try{
-        let img = JSON.parse(data);
+      let params = {}
+      try {
+        let img = JSON.parse(data)
         params = {
           extension: img.extension,
-          content: img.content,
+          content: img.content
         }
-      }catch (e) {
+      } catch (e) {
         params = {
           extension: data.extension,
-          content: data.content,
+          content: data.content
         }
       }
       uploadBase64(params)
@@ -164,9 +162,8 @@ export default {
     prop: 'value',
     event: 'input'
   },
-  destroyed(){
-    window.openCameraCallBack = null;
-
+  destroyed() {
+    window.openCameraCallBack = null
   }
 }
 </script>

+ 4 - 0
src/views/menu/rehearsalTask/components/rehearsalTaskSign.vue

@@ -258,7 +258,11 @@ export default {
         this.qsUserList = this.qsUserList.join(',')
 
         this.signUserList = data.taskUserList || []
+        if(data.taskUserList){
+        
+
         this.signUserListMap = data.taskUserList.map(item=>item.signImage) || []
+        }
         let list = data.fileList || []
         if (list.length > 0) {
           list.forEach(item => {

+ 6 - 0
src/views/menu/training/components/personnelSignature.vue

@@ -58,6 +58,7 @@
     </div>
     <div class="mainItem" >
       <div class="label">上传图片</div>
+      
       <imgCom :width="'100'" :list="imgList" v-for="item in imgList" :key="item" :height="'100'" :src="item"></imgCom>
     </div>
     <div class="mainItem" v-if="this.$route.params.id.split('_')[1] === 'info'">
@@ -134,7 +135,11 @@ export default {
         this.qsUserList = this.qsUserList.join(',')
 
         this.signUserList = data.taskUserList || []
+        if(data.taskUserList){
+        
+
         this.signUserListMap = data.taskUserList.map(item=>item.signImage) || []
+        }
       
         let list = data.fileList || []
         if (list.length > 0) {
@@ -152,6 +157,7 @@ export default {
         if(this.trainingData.imageList){
 
           this.imgList = this.trainingData.imageList.split(',') || []
+         
         }