y595705120 3 years ago
parent
commit
2301acfe97

+ 1 - 0
build.cmd

@@ -0,0 +1 @@
+npm run build

+ 7 - 7
src/api/article.js

@@ -8,13 +8,6 @@ export const getArticalList = (data) => {
     })
 }
 
-export const downloadFile = (articalId) => {
-    return service({
-        url: `/api/artical/downloadFile/${articalId}`,
-        method: 'get'
-    })
-}
-
 export const getHotArticalList = (data) => {
     return service({
         url: "/api/base/getHotArticalList",
@@ -130,6 +123,13 @@ export const downloadArtical = (data) => {
     })
 }
 
+export const downloadFile = (data) => {
+    return service({
+        url: "/api/artical/downloadFile",
+        method: 'post',
+        data
+    })
+}
 
 export const applyArtical = (data) => {
     return service({

+ 2 - 5
src/components/Tinymce/components/EditorImage.vue

@@ -62,7 +62,7 @@ export default {
       //   this.$message('Please wait for all images to be uploaded successfully. If there is a network problem, please refresh the page and upload again!')
       //   return
       // }
-      console.log( "this.listObj", this.listObj)
+      // console.log( "this.listObj", this.listObj)
       this.$emit('successCBK', arr)
       this.listObj = {}
       this.fileList = []
@@ -75,7 +75,7 @@ export default {
         hasSuccess: true,
         width: file.width,
         height: file.height,
-        url : "http://smoa.ndjsxh.cn:8888/api/preview/"+ uid
+        url : "http://smoa.ndjsxh.cn:8888/preview/"+ uid
         // url : "http://localhost:8000/api/preview/"+ uid
       }
     },
@@ -93,9 +93,6 @@ export default {
       const _self = this
       const _URL = window.URL || window.webkitURL
       const fileName = file.uid
-
-
-      this.listObj[fileName] = {}
       return new Promise((resolve, reject) => {
         const img = new Image()
         img.src = _URL.createObjectURL(file)

+ 1 - 0
src/pages/data/data.js

@@ -9,6 +9,7 @@ import {
 
 export default {
   departs:[],
+  preview:"http://smoa.ndjsxh.cn:8888/preview/",
   categorys: {
     laws: "法律法规",
     mechanism: "机制制度类",

+ 7 - 3
src/pages/other/file-add.vue

@@ -40,9 +40,9 @@
              <el-input  v-model="info.title" type="text"></el-input>
          </el-form-item>
 
-         <el-form-item label="文章简介"  prop="title">
-
-          </el-form-item>
+        <el-form-item label="文章简介"  prop="filename">
+           <span> {{info.filename}}</span>
+        </el-form-item>
 
 
          <el-form-item label="" class="mt20" prop="brief" label-width="0">
@@ -134,6 +134,10 @@
       }
     },
     methods:{
+      useIframe(){
+        let {filename} = this.info;
+        this.info.brief = `<p><iframe src="${data.preview}${filename}" style="width:100%;height:800px"></iframe></p>`;
+      },
       loadArtical( articalId ){
          getArticalInfo({articalId}).then(res => {
            if (res.code == 200) {

+ 4 - 7
src/pages/other/file-info.vue

@@ -219,6 +219,7 @@
     likeArtical,
     unLikeArtical,
     confirmArtical,
+
     publishArtical
   } from '@/api/article.js'
   import {
@@ -279,14 +280,10 @@
       download() {
         let articalId = this.articalId
         if (this.isLeader > 0 || this.info.isOpen == 1) {
-          this.loading = true
-          // let token=  authDB.get("token")
-          // window.open( `/api/artical/downloadFile/${articalId}?token=${token}`)
-
-          download(`/api/artical/downloadFile/${articalId}`,  res=>{
-            this.loading = false
+          downloadFile( {articalId}).then( res=>{
             if( res.code == 200){
-              this.$message.successMsg("下载完成", 1)
+              this.$message.successMsg("初始化成功", 1)
+              window.open( res.data, "_blank");
             }
           })
         } else {

+ 5 - 4
src/pages/other/my-file.vue

@@ -45,16 +45,16 @@
             <el-table-column label="标题" min-width="200" prop="title">
             </el-table-column>
 
-            <el-table-column label="时间" min-width="80" prop="createAt" align="center">
+            <el-table-column label="时间" min-width="90" prop="createAt" align="center">
               <template slot-scope="{row}">
                 <span> {{row.createAt|toDatetime}}</span>
               </template>
             </el-table-column>
 
-            <el-table-column label="备注" width="60" align="center">
+            <el-table-column label="备注" width="110" align="center">
               <template v-slot="{row}">
                 <el-button  type="text" @click="gotoDetail(row)"> 详情 </el-button>
-                
+
                 <el-button  type="text" @click="download(row)" v-if="selectId==1"> 下载 </el-button>
                 <el-button  type="text" @click="editFile(row)" v-else-if="selectId==5"> 编辑 </el-button>
               </template>
@@ -130,8 +130,9 @@ export default {
   methods: {
     ...mapActions("user", ["logout"]),
     download( row ){
-      let articalId = row.articalId
+      // let articalId = row.articalId
       download( `/api/artical/downloadFile/${articalId}`)
+      // window.open( `http://smoa.ndjsxh.cn:8888/api/downloadFile/${articalId}`)
     },
     editFile( row ){
       let path = "/file-add"