bug

src/App.vue

@@ -4,7 +4,7 @@
       <navbar></navbar>
     </el-header>
     <el-container>
-      <el-aside width="200px">
+      <el-aside v-show="showSide" width="200px">
         <sidebar></sidebar>
       </el-aside>
       <div ref="mainContainer" class="main-container">
@@ -16,13 +16,31 @@
 <script>
   import Sidebar from "./views/sidebar";
   import Navbar from "./views/navbar";
+  import {mapGetters,mapState} from 'vuex';
 
   export default {
       components: {
           Navbar,
           Sidebar},
+      data(){
+        return {
+            showSide:true
+        }
+      },
       mounted(){
 
+      },
+      computed:{
+          ...mapGetters([
+              'getSideWidth'
+          ])
+      },
+      watch:{
+          getSideWidth(value){
+              if(value === 0){
+                  this.showSide = false;
+              }
+          }
       }
 
   }

src/store/store.js

@@ -11,22 +11,29 @@ Vue.use(Vuex);
  */
 
 export default new Vuex.Store({
-  state:{
-    user:{},
-    token:null,
-    title:''
-  },
-  mutations:{
-    [types.LOGIN]: (state, data) => {
-      localStorage.token = data;
-      state.token = data;
+    state: {
+        user: {},
+        token: null,
+        title: '',
+        sideWidth: ''
     },
-    [types.LOGOUT]: (state) => {
-      localStorage.removeItem('token');
-      state.token = null
+    mutations: {
+        [types.LOGIN]: (state, data) => {
+            localStorage.token = data;
+            state.token = data;
+        },
+        [types.LOGOUT]: (state) => {
+            localStorage.removeItem('token');
+            state.token = null
+        },
+        [types.SIDEWIDTH]: (state, data) => {
+            console.log('宽度'+data)
+            state.sideWidth = data;
+        }
     },
-    [types.TITLE]: (state, data) => {
-      state.title = data;
+    getters: {
+        getSideWidth: state => {
+            return state.sideWidth
+        }
     }
-  }
 })

src/store/types.js

@@ -2,4 +2,4 @@ export const  LOGIN = 'login';
 
 export const LOGOUT = 'logout';
 
-export const TITLE = 'title';
+export const SIDEWIDTH = 'SIDEWIDTH';

src/views/meetManage.vue

@@ -333,12 +333,13 @@
             },
             //预览
             handlePreview(){
-                this.$router.push({
-                    path:'/viewFile',
+                let newpage = this.$router.resolve({
+                    name: 'viewFile',
                     query:{
                         id:this.item.id
                     }
                 })
+                window.open(newpage.href, '_blank');
             }
         }
     }

src/views/sidebar.vue

@@ -33,6 +33,7 @@
 </template>
 
 <script>
+
     export default {
         name: "sidebar",
         data(){
@@ -42,7 +43,7 @@
         },
         mounted(){
             this.$refs.sidebar.style.height = window.innerHeight +'px'
-        }
+        },
     }
 </script>
 

src/views/viewFile.vue

@@ -4,8 +4,8 @@
             <el-col class="left" :span="24">
                 <div class="text-center">
                     <p class="margin-10-0">{{meet.title}}</p>
-                    <p  class="margin-10-0">时间：{{meet.meetingDate}}</p>
-                    <p  class="margin-10-0">地点：{{meet.address}}</p>
+                    <p  class="margin-10-0">时间：{{meet.meetingTime | formatDate}}</p>
+                    <p  class="margin-10-0">地点：{{meet.meetingAddress}}</p>
                 </div>
                 <p>一、会议主题</p>
                <div class="padding-0-20">
@@ -20,8 +20,8 @@
                 <div class="padding-0-20">
                     <p class="padding-10-0">汇报</p>
                 </div>
-                <p @click="getFile">四、附件</p>
-                <p>五、信息处意向1</p>
+                <p>四、附件</p>
+                <p>五、信息处意向</p>
                 <div class="padding-0-20">
                     <p class="padding-10-0">汇报</p>
                 </div>
@@ -32,23 +32,23 @@
                         <el-select size="small"  placeholder="请选择" @change="changeFile" v-model="fileName">
                             <el-option
                                     v-for="item in options"
-                                    :key="item.value"
-                                    :label="item.label"
-                                    :value="item.value">
+                                    :key="item.id"
+                                    :label="item.name"
+                                    :value="item.name">
                             </el-option>
                         </el-select>
                     </el-col>
                     <el-col class="text-center" :span="18">
-                        议程主题
+                        议程主题：{{meet.title}}
                     </el-col>
                 </el-row>
                 <el-row>
                     <el-col class="text-center margin-20-0" :span="6">
-                        附件名称
+                        附件名称：{{fileName}}
                     </el-col>
-                    <el-col :span="18">
+                </el-row>
+                <el-row>
                         <canvas v-for="page in pages" :id="'the-canvas'+page" :key="page"></canvas>
-                    </el-col>
                 </el-row>
             </el-col>
         </el-row>
@@ -58,6 +58,9 @@
 <script>
     import PDFJS from 'pdfjs-dist'
     import {getMeetingById} from '../api/api'
+    import {formatDate} from "../common/date";
+    import * as types from '../store/types'
+
     let Base64 = require('js-base64').Base64
     export default {
         data () {
@@ -72,9 +75,17 @@
             }
         },
         methods: {
-            changeFile(fileName){
-                let url = '/api/common/file/download?fileName='+fileName
-                this.loadFile(url)
+            changeFile(){
+                let url = '/api/common/file/download?fileName='+this.fileName
+                if(!this.fileName.includes('pdf')){
+                    console.log('download')
+                    let elemIF = document.createElement("iframe");
+                    elemIF.src = url;
+                    elemIF.style.display = "none";
+                    document.body.appendChild(elemIF);
+                }else{
+                    this.loadFile(url)
+                }
             },
             renderPage (num) {
                 let _this = this
@@ -88,9 +99,9 @@
                         ctx.oBackingStorePixelRatio ||
                         ctx.backingStorePixelRatio || 1
                     let ratio = dpr / bsr
-                    var viewport = page.getViewport(screen.availWidth / page.getViewport(1).width)
-                    canvas.width = viewport.width * ratio
-                    canvas.height = viewport.height * ratio
+                    let viewport = page.getViewport(screen.availWidth / page.getViewport(1).width)
+                    canvas.width = (viewport.width) * ratio
+                    canvas.height = (viewport.height) * ratio
                     canvas.style.width = viewport.width + 'px'
                     canvas.style.height = viewport.height + 'px'
                     ctx.setTransform(ratio, 0, 0, ratio, 0, 0)
@@ -114,20 +125,41 @@
                         _this.renderPage(1)
                     })
                 })
-            }
+            },
         },
         mounted () {
+            this.$store.commit(types.SIDEWIDTH,0)
             this.id = this.$route.query.id
             getMeetingById({id:this.id}).then(
                 (res)=>{
-
+                    this.meet = res.data
+                    res.data.intentionList.forEach(e=>{
+                        e.accessories.forEach(f=>{
+                            this.options.push(f)
+                        })
+                    })
+                    res.data.agendaList.map(e=>{
+                        e.accessories.forEach(f=>{
+                            this.options.push(f)
+                        })
+                    })
                 }
             )
+        },
+        filters:{
+            formatDate(time){
+                let date = new Date(time);
+                return formatDate(date,'yyyy-MM-dd hh:mm');
+            }
+
         }
     }
 </script>
 
 <style lang="scss">
+    .main-container {
+        width: 100%;
+    }
     .left{
         background-color: #b5cdde;
         padding: 10px 20px;
@@ -147,5 +179,6 @@
     canvas {
         display: block;
         border-bottom: 1px solid black;
+        width: 100%;
     }
 </style>

vue.config.js

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