فهرست منبع

2024.1.26视频

bulusiLuo 1 سال پیش
والد
کامیت
3c13e65c17

+ 19 - 15
src/components/projectCom/fileShow/index.vue

@@ -12,13 +12,8 @@
       <!-- 图片附件 -->
       <div v-if="imageList.length > 0" class="imageShow">
         <template v-for="(item, index) in imageList">
-          <el-image
-            style="width: 100px; height: 100px"
-            v-if="item.address"
-            :key="currentDate + '_imageItem_' + index"
-            :src="item.address"
-            :preview-src-list="imageAddressList"
-          >
+          <el-image style="width: 100px; height: 100px" v-if="item.address" :key="currentDate + '_imageItem_' + index"
+            :src="item.address" :preview-src-list="imageAddressList">
           </el-image>
         </template>
       </div>
@@ -38,7 +33,7 @@
         <template v-for="(item, index) in otherList">
           <div class="otherItem" :key="currentDate + '_otherItem_' + index">
             <a :href="item.address" :download="item.fileName">{{ item.fileName }}</a>
-              <slot></slot>
+            <slot></slot>
           </div>
         </template>
       </div>
@@ -82,6 +77,7 @@ export default {
       const otherList = []
       const imageAddressList = []
       if (fileList instanceof Array) {
+        debugger
         fileList.forEach((item) => {
           const filePath = item.filePath //存放路径
           const fileName = item.fileName //文件名称
@@ -93,12 +89,12 @@ export default {
             })
             imageAddressList.push(getImageUrl(filePath))
           }
-          //else if(this.isVideo(filePath)){
-          //   videoList.push({
-          //     fileName:fileName,
-          //     address:getFileUrl(filePath,fileName)
-          //   })
-          // }
+          else if (this.isVideo(filePath)) {
+            videoList.push({
+              fileName: fileName,
+              address: getFileUrl(filePath, fileName)
+            })
+          }
           //else if(this.isVoice(item)){
           //   voiceList.push({
           //     fileName:fileName,
@@ -155,7 +151,7 @@ export default {
       // MP4 = 带有 H.264 视频编码和 AAC 音频编码的 MPEG 4 文件
       // WebM = 带有 VP8 视频编码和 Vorbis 音频编码的 WebM 文件
       // Ogg = 带有 Theora 视频编码和 Vorbis 音频编码的 Ogg 文件
-      let imgArr = ['.mp4', 'ogg', 'webm']
+      let imgArr = ['mp4', 'ogg', 'webm']
       return imgArr.indexOf(type) !== -1 ? true : false
     },
 
@@ -213,6 +209,7 @@ export default {
   width: calc(100% - 150px);
   float: left;
 }
+
 .videoShow,
 .imageShow,
 .otherShow,
@@ -227,20 +224,24 @@ export default {
   flex-wrap: wrap;
   justify-content: left;
   align-items: center;
+
   /deep/.el-image {
     width: 25%;
     padding-right: 10px;
     padding-bottom: 10px;
+
     img {
       position: relative;
       width: 100%;
     }
   }
+
   .videoItem {
     width: 33%;
     padding-right: 10px;
     padding-bottom: 10px;
   }
+
   .otherItem {
     padding-right: 10px;
     padding-bottom: 10px;
@@ -248,14 +249,17 @@ export default {
     text-decoration: underline;
     cursor: pointer;
   }
+
   .otherList {
     width: 25%;
     padding-right: 20px;
     padding-bottom: 10px;
   }
 }
+
 .voiceShow {
   flex-direction: column;
+
   .voiceItem {
     width: 100%;
     height: 34px;

+ 9 - 13
src/components/projectCom/fileUpload/index.vue

@@ -1,17 +1,8 @@
 <template>
   <div class="upLoadDiv">
     <div class="upLoadRe" v-if="showRequire" style="float: left"></div>
-    <el-upload
-      v-if="fileShow"
-      class="upload-demo"
-      :auto-upload="false"
-      :on-change="handleChange"
-      :on-remove="removeChange"
-      :on-preview="onPreview"
-      action=""
-      :multiple="true"
-      :file-list="fileList"
-    >
+    <el-upload v-if="fileShow" class="upload-demo" :auto-upload="false" :on-change="handleChange"
+      :on-remove="removeChange" :on-preview="onPreview" action="" :multiple="true" :file-list="fileList">
       <el-button size="small" type="primary" class="upload-btn">{{ config.btnText || '点击上传' }}</el-button>
       <div v-if="config.showTip" slot="tip" class="el-upload__tip">
         {{ this.config.showTipTitle || '单个文件不能超过20M,且合计不能超过100M' }}
@@ -50,7 +41,7 @@ export default {
       fileList: [], //所有的文件
       addFile: [], //新加的文件
       deleteFile: [], //和展示的文件相比被删除的文件
-      maxSingleSize: 50 * 1024 * 1024, //单个最大限制50M
+      maxSingleSize: 60 * 1024 * 1024, //单个最大限制60M
       totalSize: 100 * 1024 * 1024, //最大限制100M
       currentSize: 0, //当前文件大小
       fileShow: false
@@ -186,11 +177,13 @@ export default {
     float: left;
     margin-right: 16px;
   }
+
   /deep/.el-upload__tip {
     position: relative;
     float: left;
-    margin-top: 0px !important ;
+    margin-top: 0px !important;
   }
+
   /deep/.el-upload-list {
     width: 100%;
     position: relative;
@@ -200,13 +193,16 @@ export default {
     flex-wrap: wrap;
     justify-content: left;
     align-items: center;
+
     .el-upload-list__item {
       width: 20%;
+
       &:first-child {
         margin-top: 0px !important;
       }
     }
   }
+
   .upLoadRe::before {
     content: '*';
     position: relative;

+ 2 - 2
src/views/zhpt/projectManager/IndoorRenovation/components/printPdfLin.vue

@@ -16,9 +16,9 @@
       <!-- <hr /> -->
 
       <div>
-        <!-- <div style="text-align: right;color: rgb(148 145 145);font-size: 18px;margin-bottom: 10px;">
+        <div style="text-align: right;color: rgb(148 145 145);font-size: 18px;margin-bottom: 10px;">
           <span>已审核</span>
-        </div> -->
+        </div>
         <table width="100%" :id="disTableList.tableId" border="1" bordercolor="#ccc" style="text-align: center"
           cellspacing="0" cellpadding="5" class="CLtable tableClass">
           <tr style="width: 100%">

+ 2 - 2
src/views/zhpt/projectManager/IndoorRenovation/components/printPdfSell.vue

@@ -15,9 +15,9 @@
       </div> -->
       <!-- <hr /> -->
       <div>
-        <!-- <div style="text-align: right;color: rgb(148 145 145);font-size: 18px;margin-bottom: 10px;">
+        <div style="text-align: right;color: rgb(148 145 145);font-size: 18px;margin-bottom: 10px;">
           <span>已审核</span>
-        </div> -->
+        </div>
         <table width="100%" :id="disTableList.tableId" border="1" bordercolor="#ccc" style="text-align: center"
           cellspacing="0" cellpadding="5" class="CLtable tableClass">
           <tr style="width: 100%">