Sfoglia il codice sorgente

日志文件上传

彭宇 2 anni fa
parent
commit
048a5cd9d3
2 ha cambiato i file con 28 aggiunte e 23 eliminazioni
  1. 13 12
      src/views/eventLogUpload.vue
  2. 15 11
      src/views/eventdetailsdialog.vue

+ 13 - 12
src/views/eventLogUpload.vue

@@ -1,8 +1,7 @@
 <template>
   <div class="upload-file">
     <el-dialog title="文件上传" :visible.sync="showEventLogUpload" v-if="showEventLogUpload" width="770px"
-               style="height: 700px;"
-               @close="cancelEventLogUploadShow()">
+               style="height: 700px;">
       <el-upload
         multiple
         :action="uploadFileUrl"
@@ -23,7 +22,7 @@
         <div class="el-upload__tip" slot="tip" v-if="showTip">
           请上传
           <template v-if="fileSize"> 大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b></template>
-          <template v-if="fileType"> 格式为 <b style="color: #f56c6c">{{ fileType.join('/') }}</b></template>
+<!--          <template v-if="fileType"> 格式为 <b style="color: #f56c6c">{{ fileType.join('/') }}</b></template>-->
           的文件
         </div>
       </el-upload>
@@ -49,7 +48,8 @@
 <script>
 import { getToken } from '@/utils/auth'
 import {
-  eventLogUpload
+  eventLogUpload,
+  getEventDetail
 } from '@/api/forest'
 
 export default {
@@ -67,11 +67,11 @@ export default {
       type: Number,
       default: 5
     },
-    // 文件类型, 例如['png', 'jpg', 'jpeg']
-    fileType: {
-      type: Array,
-      default: () => ['png', 'jpg', 'jpeg', 'doc', 'xls', 'ppt', 'txt', 'pdf']
-    },
+    // // 文件类型, 例如['png', 'jpg', 'jpeg']
+    // fileType: {
+    //   type: Array,
+    //   default: () => []
+    // },
     // 是否显示提示
     isShowTip: {
       type: Boolean,
@@ -118,7 +118,7 @@ export default {
   computed: {
     // 是否显示提示
     showTip() {
-      return this.isShowTip && (this.fileType || this.fileSize)
+      return this.isShowTip
     }
   },
   methods: {
@@ -135,6 +135,8 @@ export default {
         if(res.code==200){
           this.$message.success(`上传成功!`);
           this.showEventLogUpload = false
+          this.cancelEventLogUploadShow();
+          this.$parent.refreshEventDialog(this.eventCode)
         }
       })
     },
@@ -144,7 +146,6 @@ export default {
       this.showEventLogUpload = true
     },
     cancelEventLogUploadShow() {
-      alert(111)
       //关闭页面
       this.fileList = []
       this.uploadList = []
@@ -152,7 +153,7 @@ export default {
     // 上传前校检格式和大小
     handleBeforeUpload(file) {
       // 校检文件类型
-      if (this.fileType) {
+      if (false) {
         let fileExtension = ''
         if (file.name.lastIndexOf('.') > -1) {
           fileExtension = file.name.slice(file.name.lastIndexOf('.') + 1)

+ 15 - 11
src/views/eventdetailsdialog.vue

@@ -54,7 +54,7 @@
                 <supermapDialog ref="supermapDialog"
                                 style="position: absolute; top:0;left: 0;"
                                 :mapDiv="'forestWarmSuperMap'"
-                                :mapSite="{zoom:12,doubleClickZoom:false,dragging:false,scrollWheelZoom:true}"
+                                :mapSite="{zoom:12,doubleClickZoom:false,dragging:false,scrollWheelZoom:false}"
                                 :codes="['9fa5']"
                                 :isSideBySide="false"
                                 :isdynamicPlotting="true"/>
@@ -85,10 +85,15 @@
                                       {{ item.logContent }}
                                     </div>
                                     <div>
-                                      <el-image :src="url"
-                                                :preview-src-list="srcList"
+                                      <el-image :src="itemfile"
+                                                :preview-src-list="item.attachs"
                                                 style="width:3rem; height:3rem;margin: 2px;"
-                                                v-for="(item,index) in 10">
+                                                v-for="(itemfile,index1) in item.attachs">
+                                      </el-image>
+                                      <el-image :src="itemfile"
+                                                :preview-src-list="item.attachs"
+                                                style="width:3rem; height:3rem;margin: 2px;"
+                                                v-for="(itemfile,index1) in item.attachs">
                                       </el-image>
                                     </div>
                                   </div>
@@ -212,12 +217,6 @@ export default {
           icon: 'sj-icon-jkzx'
         }
       ],
-      //图片虚拟
-      url: require('@/assets/images/visual/img-sample.png'),
-      srcList: [
-        require('@/assets/images/visual/img-sample.png'),
-        require('@/assets/images/visual/img-sample2.png')
-      ],
       //文本域
       feedback: ''
 
@@ -238,7 +237,6 @@ export default {
       getEventDetail({ eventCode: eventCode }).then(res => {
         this.eventDialog = true
         this.eventlog = res.data.eventlog
-        console.log(this.eventlog)
         if (res.data.catalogue != null && res.data.catalogue.length > 0) {
           let markersMap = {
             lng: 124.59,
@@ -277,6 +275,12 @@ export default {
         }
       })
     },
+    refreshEventDialog(eventCode) {
+      //获取事件日志
+      getEventDetail({ eventCode: eventCode }).then(res => {
+        this.eventlog = res.data.eventlog
+      })
+    },
     // 页面元素转图片
     toImage() {
       // 手动创建一个 canvas 标签