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

src/views/menu/monitoringCall/components/consultInfo.vue

@@ -231,6 +231,7 @@ export default {
     // margin-bottom: 10px;
     // margin: 20px;
     color: black;
+    margin-top: 10px;
   }
   .bottomClass {
     position: fixed;

src/views/menu/monitoringCall/index.vue

@@ -155,11 +155,12 @@ export default {
     }
   },
   mounted() {
+    this.init()
     setTimeout(() => {
       this.cascaderValue = JSON.parse(window.sessionStorage.getItem('SET_USER_ORGID')) + ''
     }, 1500)
     
-    this.init()
+   
   },
   methods: {
     //单元格点击事件

src/views/menu/training/components/addTraining.vue

@@ -64,6 +64,13 @@
           @cancel="showEndDate = false"
         />
       </van-popup>
+      <div class="mainItem">
+      <div class="label labelPeople">培训资料</div>
+      <template v-for="item in studyList">
+        
+        <imgCom :width="'100'" v-if="this_window.origin+item.url" :key="item.url" :height="'100'" :src="this_window.origin+item.url"></imgCom>
+      </template>
+    </div>
       <!-- 培训内容 -->
       <van-field
         required
@@ -127,6 +134,7 @@
 import NavBar from '@/components/NavBar'
 import CheckPeople from '@/components/peopleList/index.vue'
 import Upload from '@/components/upload/index.vue'
+import imgCom from '@/components/imgCom/index.vue'
 import { gettrainingInfo, edittrainingInfo } from '@/api/training.js'
 import { newDateTime } from '@/utils/date.js'
 import { Dialog, Toast } from 'vant'
@@ -134,11 +142,14 @@ export default {
   name: 'SocAppAddTraining',
   components: {
     NavBar,
+    imgCom,
     Upload,
     CheckPeople
   },
   data() {
     return {
+      this_window:window,
+      studyList: [], //学习资料数组
       startDateTime: new Date(),
       endDateTime: new Date(),
       falg: false, //校验是否通过
@@ -172,6 +183,13 @@ export default {
         if (!data.taskUserList) {
           data.taskUserList = []
         }
+        let newlist = data.fileList || []
+        if (newlist.length > 0) {
+          newlist.forEach(item => {
+            
+            this.studyList.push(JSON.parse(item))
+          })
+        }
         if (!data.imageList) {
           data.imageList = []
         } else {

src/views/menu/training/components/personnelSignature.vue

@@ -1,9 +1,9 @@
 <template>
   <div>
-    <NavBar :go="{type:'push',path:'/training'}"/>
+    <NavBar :go="{ type: 'push', path: '/training' }" />
 
     <div class="mainItem">
-      <div class="label"> 标题</div>
+      <div class="label">标题</div>
       <div>{{ trainingData?.title }}</div>
     </div>
     <div class="mainItem">
@@ -31,6 +31,13 @@
       <div>{{ trainingData?.recorderName }}</div>
     </div>
     <div class="mainItem">
+      <div class="label labelPeople">培训资料</div>
+      <template v-for="item in studyList">
+        
+        <imgCom :width="'100'" v-if="this_window.origin+item.url" :key="item.url" :height="'100'" :src="this_window.origin+item.url"></imgCom>
+      </template>
+    </div>
+    <div class="mainItem">
       <div class="label">培训内容</div>
       <div>{{ trainingData?.content }}</div>
     </div>
@@ -48,22 +55,24 @@
     </div>
     <div class="mainItem">
       <div class="label">上传图片</div>
-      
+
       <imgCom :width="'100'" 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'">
+    <div class="mainItem" v-if="this.$route.params.id.split('_')[1] === 'info'">
       <div class="label labelPeople">参与人员签名图片</div>
-      <template v-for="item in signUserList"  >
-        
-        <imgCom :width="'100'" v-if="item.signImage" :key="item.userId" :height="'100'"  :src="item.signImage"></imgCom>
+      <template v-for="item in signUserList">
+        <imgCom :width="'100'" v-if="item.signImage" :key="item.userId" :height="'100'" :src="item.signImage"></imgCom>
       </template>
-
-     
     </div>
     <van-row>
       <van-col span="24" class="btns">
-        <van-button type="info" class="btn" v-if="this.$route.params.id.split('_')[1]==='edit'" @click="signatureHandler">签名</van-button>
+        <van-button
+          type="info"
+          class="btn"
+          v-if="this.$route.params.id.split('_')[1] === 'edit'"
+          @click="signatureHandler"
+          >签名</van-button
+        >
       </van-col>
     </van-row>
     <van-action-sheet v-model="show" title="签署名字" class="sheet">
@@ -74,11 +83,11 @@
 <script>
 import NavBar from '@/components/NavBar'
 import writingPad from '@/components/writingPad/index.vue'
-import { gettrainingInfo,signtrainingInfo } from '@/api/training.js'
+import { gettrainingInfo, signtrainingInfo } from '@/api/training.js'
 import { upload } from '@/api/public'
 import imgCom from '@/components/imgCom/index.vue'
-import {base64ToBlob} from '@/utils/base64TurnImg.js'
-import config from '@/config/index';
+import { base64ToBlob } from '@/utils/base64TurnImg.js'
+import config from '@/config/index'
 export default {
   name: 'SocAppAddTraining',
   components: {
@@ -88,11 +97,13 @@ export default {
   },
   data() {
     return {
+      this_window:window,
       show: false,
       taskUserList: [], //参与人员
       qsUserList: [], //缺席人员
       imgList: [], //图片数组
       signUserList: [], //参与人员签名数组
+      studyList: [], //学习资料数组
       trainingData: {} //详情数据
     }
   },
@@ -114,11 +125,16 @@ export default {
           }
         })
         this.qsUserList = this.qsUserList.join(',')
-        this.signUserList=data.taskUserList||[]
-        this.imgList = this.trainingData?.imageList?.split(',')||[]
-        console.log(this.qsUserList);
-        console.log(this.signUserList);
-        console.log(this.imgList);
+        this.signUserList = data.taskUserList || []
+        let list = data.fileList || []
+        if (list.length > 0) {
+          list.forEach(item => {
+            
+            this.studyList.push(JSON.parse(item))
+          })
+        }
+        
+        this.imgList = this.trainingData?.imageList?.split(',') || []
       }
     })
   },
@@ -138,30 +154,30 @@ export default {
     resultImg(img) {
       let obj = base64ToBlob(img)
       let formData = new FormData()
-      
+
       obj.name = '签名.jpg'
       formData.append('file', base64ToBlob(img))
-      
+
       upload(formData, 'image')
         .then(res => {
-          console.log(process.env.NODE_ENV);
+          console.log(process.env.NODE_ENV)
           /*上传成功*/
-          let imgUrl = process.env.NODE_ENV === 'development' ?  res.data.url :  res.data.url
-         this.submitSign(imgUrl)
-          
+          let imgUrl = process.env.NODE_ENV === 'development' ? res.data.url : res.data.url
+          this.submitSign(imgUrl)
+
           // this.$emit("imgUrl", res.data.url);
         })
         .catch(err => {
           /*上传失败*/
         })
     },
-    
+
     //提交到后端数据
-    submitSign(url){
+    submitSign(url) {
       signtrainingInfo({
-        id:this.trainingData.id,
-        signImage:url,
-      }).then(res=>{
+        id: this.trainingData.id,
+        signImage: url
+      }).then(res => {
         this.$router.push('/training')
       })
     }
@@ -176,16 +192,16 @@ export default {
   justify-content: space-between;
   background-color: #fff;
   overflow: scroll;
-  div{
+  div {
     flex: 1;
     text-align: right;
   }
-  .label{
+  .label {
     width: 200px;
     flex: none;
     text-align: left;
   }
-  .labelPeople{
+  .labelPeople {
     width: 300px;
   }
 }

src/views/menu/training/index.vue

@@ -240,7 +240,7 @@ export default {
     this.init()
     setTimeout(() => {
       this.cascaderValue = JSON.parse(window.sessionStorage.getItem('SET_USER_ORGID')) + ''
-    }, 1000)
+    }, 500)
   },
   methods: {
     //机构搜索