列表、日志 图片

src/views/eventdetailsdialog.vue

@@ -103,31 +103,25 @@
 																		</div>
 																		<div>
 																			<router-link to="#"
-																				@click.native="clickFile(itemfile.fileUrl,itemfile.fileName)"
+																				@click.native="clickFile(itemfile.fileUrl,itemfile.fileName,itemfile.fileType)"
 																				v-for="(itemfile,indexfile) in item.fileVOs">
-																				<!-- 使用el-image的:src需要加require -->
-																				<!--                                        <img v-if="isAssetTypeAnImage(itemfile.fileUrl)"-->
-																				<!--                                             style="width:3rem; height:3rem;margin: 2px;"-->
-																				<!--                                             :src="itemfile.fileUrl"-->
-																				<!--                                             :title="itemfile.fileName">-->
-																				<!--                                        </img>-->
 																				<el-image :src="itemfile.fileUrl"
-																					v-if="isAssetTypeAnImage(itemfile.fileUrl)"
-																					:preview-src-list="assetTypeAnImage(item.attachs)"
+																					v-if="itemfile.fileType=='image'"
+																					:preview-src-list="assetTypeAnImage(item.fileVOs)"
 																					style="width:3rem; height:3rem;margin: 2px;"
 																					:title="itemfile.fileName">
 																				</el-image>
-																				<img v-else-if="isAssetTypeAnMp4(itemfile.fileUrl)"
+																				<img v-else-if="itemfile.fileType=='video'"
 																					style="width:3rem; height:3rem;margin: 2px;"
 																					:src="require('@/assets/fileTypeImage/mp4.png')"
 																					:title="itemfile.fileName">
 																				</img>
-																				<img v-else-if="isAssetTypeAnWord(itemfile.fileUrl)"
+																				<img v-else-if="itemfile.fileType=='word'"
 																					style="width:3rem; height:3rem;margin: 2px;"
 																					:src="require('@/assets/fileTypeImage/word.png')"
 																					:title="itemfile.fileName">
 																				</img>
-																				<img v-else-if="isAssetTypeAnExcel(itemfile.fileUrl)"
+																				<img v-else-if="itemfile.fileType=='excel'"
 																					style="width:3rem; height:3rem;margin: 2px;"
 																					:src="require('@/assets/fileTypeImage/excel.png')"
 																					:title="itemfile.fileName">
@@ -1228,56 +1222,14 @@
 				let imageList = []
 				if (filePath != null && filePath.length > 0) {
 					for (let i = 0; i < filePath.length; i++) {
-						//获取最后一个.的位置
-						var index = filePath[i].lastIndexOf('.')
-						//获取后缀
-						var ext = filePath[i].substr(index + 1)
-						let aa = ['png', 'jpg', 'jpeg', 'bmp', 'gif', 'webp', 'psd', 'svg', 'tiff'].indexOf(ext
-							.toLowerCase()) !== -1
-						if (aa) {
-							imageList.push(filePath[i])
+						if (filePath[i].fileType=='image') {
+							imageList.push(filePath[i].fileUrl)
 						}
 					}
 				}
+        debugger
 				return imageList
 			},
-			// 判断是否为图片
-			isAssetTypeAnImage(filePath) {
-				//获取最后一个.的位置
-				var index = filePath.lastIndexOf('.')
-				//获取后缀
-				var ext = filePath.substr(index + 1)
-				let aa = ['png', 'jpg', 'jpeg', 'bmp', 'gif', 'webp', 'psd', 'svg', 'tiff'].indexOf(ext.toLowerCase()) !==
-					-1
-				return aa
-			},
-			// 判断是否为视频
-			isAssetTypeAnMp4(filePath) {
-				//获取最后一个.的位置
-				var index = filePath.lastIndexOf('.')
-				//获取后缀
-				var ext = filePath.substr(index + 1)
-				let aa = ['mp4'].indexOf(ext.toLowerCase()) !== -1
-				return aa
-			},
-			// 判断是否为Word
-			isAssetTypeAnWord(filePath) {
-				//获取最后一个.的位置
-				var index = filePath.lastIndexOf('.')
-				//获取后缀
-				var ext = filePath.substr(index + 1)
-				let aa = ['doc', 'docx'].indexOf(ext.toLowerCase()) !== -1
-				return aa
-			},
-			// 判断是否为Excel
-			isAssetTypeAnExcel(filePath) {
-				//获取最后一个.的位置
-				var index = filePath.lastIndexOf('.')
-				//获取后缀
-				var ext = filePath.substr(index + 1)
-				let aa = ['xlsx', 'xls', 'csv'].indexOf(ext.toLowerCase()) !== -1
-				return aa
-			},
 			// 获取文件名称
 			getFileName(name) {
 				if (name.lastIndexOf('/') > -1) {
@@ -1286,10 +1238,10 @@
 					return ''
 				}
 			},
-			clickFile(fileUrl, fileName) {
-				if (this.isAssetTypeAnImage(fileUrl)) {
+			clickFile(fileUrl, fileName,fileType) {
+				if (fileType=='image') {
 					return
-				} else if (this.isAssetTypeAnMp4(fileUrl)) {
+				} else if (fileType=='video') {
 					this.showTcPlayer = true
 					setTimeout(() => {
 						this.playVideo = fileUrl

src/views/forest.vue

@@ -279,7 +279,7 @@
                 <div class="d-l-con padding-box nowrap" v-for="(item,index) in eventList"
                      @click="dropLocation(item.latitude,item.longitude)">
                   <div class="bgt-img">
-                    <img v-if="item.picturePath!=null&&item.picturePath!=''&& isAssetTypeAnImage(item.picturePath)"
+                    <img v-if="item.picturePath!=null&&item.picturePath!=''&& item.pictureType == 'image'"
                          :src="item.picturePath"
                          style="width: 93px;height: 64px"/>
                     <img v-else src="../assets/images/integrated/event-img-sub.png" style="width: 93px;height: 64px"/>
@@ -606,7 +606,7 @@ export default {
             '                </div>' +
             '                </div>' +
             '                </span>'
-          if (this.eventList[i].picturePath != null && this.eventList[i].picturePath != '' && this.isAssetTypeAnImage(this.eventList[i].picturePath)) {
+          if (this.eventList[i].pictureType == 'image' && this.eventList[i].picturePath != null && this.eventList[i].picturePath != '') {
             markersMap.bindPopupHtml += '<span>' +
               '                  <div class="d-l-con">' +
               '                  <div class="d-l-l-text">' +
@@ -965,7 +965,7 @@ export default {
               '                </div>' +
               '                </div>' +
               '                </span>'
-            if (this.eventList[i].picturePath != null && this.eventList[i].picturePath != '' && this.isAssetTypeAnImage(this.eventList[i].picturePath)) {
+            if (this.eventList[i].pictureType == 'image' && this.eventList[i].picturePath != null && this.eventList[i].picturePath != '') {
               markersMap.bindPopupHtml += '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
@@ -990,15 +990,6 @@ export default {
         }
       })
     },
-    // 判断是否为图片
-    isAssetTypeAnImage(filePath) {
-      //获取最后一个.的位置
-      var index = filePath.lastIndexOf('.')
-      //获取后缀
-      var ext = filePath.substr(index + 1)
-      let aa = ['png', 'jpg', 'jpeg', 'bmp', 'gif', 'webp', 'psd', 'svg', 'tiff'].indexOf(ext.toLowerCase()) !== -1
-      return aa
-    },
     getEventByEventType(day) {
       let that = this
       //右侧获取事件分类