bug

src/components/selectSpecialAgenda.vue

-<!--选择特俗议程-->
+<!--选择议程-->
 <template>
     <div class="select-intention">
         <el-dialog title="选择特殊议程" :visible.sync="dialogFormVisible">

src/views/meetManage.vue

@@ -122,7 +122,6 @@
                                     label="操作">
                                 <template slot-scope="scope">
                                   <span class="font-size-20 pointer">
-                                     <i @click="handleEdit(scope.row,scope.$index)" class="el-icon-edit-outline margin-right-10"></i>
                                      <i @click="handleDelete(scope.row,scope.$index)" class="el-icon-delete"></i>
                                 </span>
                                 </template>
@@ -240,14 +239,14 @@
                     (res)=>{
                         res.data.type = "agenda"
                         this.form.agendaList.push(res.data)
-                        this.tableData.push(res.data)
+                        if(res.data.specialAgenda){
+                            this.tableData.push(res.data.specialAgenda)
+                        }else{
+                            this.tableData.push(res.data)
+                        }
                     }
                 )
             },
-            //编辑意向或议程
-            handleEdit(row,index){
-
-            },
             //删除意向或议程
             handleDelete(row,index){
                 if(row.type == "agenda"){

src/views/preview.vue

@@ -8,7 +8,7 @@
 <script>
     import PDFJS from 'pdfjs-dist'
     import * as types from '../store/types'
-
+    let Base64 = require('js-base64').Base64
     export default {
         name: "preview",
         data () {
@@ -16,12 +16,8 @@
                 id:null,
                 pdfDoc: null,
                 loadding: false,
-                meet:{},
                 pages: 0,
                 fileName:'',
-                list:[],  //议程+意向列表
-                attendPerson : '',  //列席人员
-                agendaInfo:[],
             }
         },
         methods:{
@@ -54,6 +50,7 @@
                 })
             },
             loadFile (url) {
+                console.log(url)
                 let _this = this
                 PDFJS.getDocument(url).then(function (pdf) {
                     _this.pdfDoc = pdf
@@ -67,13 +64,17 @@
         mounted(){
             this.$store.commit(types.SIDEWIDTH,0)  //隐藏侧边栏
             let fileName = this.$route.query.fileName
-            let url = '/api/common/file/download?fileName='+fileName
+            console.log(fileName)
+            let url = '/common/file/download?fileName='+fileName
             this.loadFile(url)
         }
     }
 </script>
 
 <style scoped>
+    .preview{
+        height: 100%;
+    }
     canvas {
         display: block;
         border-bottom: 1px solid black;

vue.config.js

@@ -6,8 +6,8 @@ module.exports = {
     devServer:{
         proxy:{
             '/api':{
-                // target:"http://180.168.156.212:4085",
-                target:"http://10.10.202.37:8080",
+                target:"http://180.168.156.212:4085",
+                // target:"http://10.10.202.37:8080",
                 changeOrigin:true,
                 ws:true,
                 pathRewrite:{