增加制作简报

src/components/common/bigfileUpload.vue

@@ -14,7 +14,7 @@
         </li>
       </ul>
     </div>
-    <el-button type="primary" @click="upload()">开始上传</el-button>
+    <el-button class="startUpload" type="primary" @click="upload()">开始上传</el-button>
   </div>
 </template>
 <script>
@@ -233,33 +233,33 @@ export default {
 #thelist {
   height: auto;
   overflow-y: auto;
-  max-height: calc(100% - 40px);
+  max-height: calc(100% - 130px);
 }
 
 #thelist a {
-  text-decoration: underline;
+  // text-decoration: underline;
   cursor: pointer;
-  font-size: 18px;
+  font-size: 14px;
+  color: white;
 }
 
 #thelist li {
   /* 去掉li前面的小圆点 */
   list-style: none;
   margin: 10px 0px;
+
+  .el-progress{
+    width: 95%;
+    margin-top: 3px;
+    .el-progress-bar{
+      .el-progress-bar__outer{
+        height: 12px !important;
+      }
+    }
+  }
 }
 
-.button-discuss {
-  width: 100px;
-  height: 30px;
-  line-height: 30px;
-  float: left;
-  font-size: 14px;
+.startUpload{
   margin-top: 5px;
-  margin-left: 20px;
-  text-align: center;
-  cursor: pointer;
-  background-image: url(../../assets/img/yqjc/40.png);
-  background-repeat: no-repeat;
-  background-size: 100% 100%;
 }
 </style>

src/util/export_doc_util_zzjb.js

@@ -3,7 +3,7 @@ import Docxtemplater from 'docxtemplater'
 import { saveAs } from 'file-saver'
 import JSZip from 'jszip'
 import ImageModule from 'docxtemplater-image-module-free'
-import { fileUpload } from './http_util';
+// import { fileUpload } from './http_util';
 import { Message } from 'element-ui';
 
 let blobToDataURI = (blob, callback) => {
@@ -79,15 +79,15 @@ export default (templateUrl, data, wordName, isDownload,author) => {
                 type: 'Blob',
                 mimeType: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
             })
-            let fd = new FormData();
-            fd.append("file", out);
-            fd.append("author", author);
-            fd.append("name", wordName);
-            fileUpload('api/rest/document/uploadBriefing', fd).then(res => {
-                if (res == 1) {
-                    Message.success('上传成功！');
-                }
-            })
+            // let fd = new FormData();
+            // fd.append("file", out);
+            // fd.append("author", author);
+            // fd.append("name", wordName);
+            // fileUpload('api/rest/document/uploadBriefing', fd).then(res => {
+            //     if (res == 1) {
+            //         Message.success('上传成功！');
+            //     }
+            // })
             if (isDownload == 1) {
                 // 将目标文件对象保存为目标类型的文件，并命名
                 saveAs(out, wordName + '.docx')

src/view/bookMark/bookMark1.vue

@@ -192,7 +192,7 @@
 <script>
 import { endLoading, get, startLoading, delete_util } from '../../util/http_util'
 import { queryCollection, queryOneNews, queryLiterature, removeCollection } from '../../api/bookMark';
-import { queryCollectionFolder } from '../../api/xxxl/llxx';
+import { queryCollectionFolder, previewPdf } from '../../api/xxxl/llxx';
 export default {
     name: 'bookMark1',
     data() {
@@ -220,28 +220,16 @@ export default {
         showNews(item) {
             this.selectItem = item;
             startLoading();
-            queryOneNews(item.originId).then(res => {
-                if (res != null) {
-                    this.dialogVisible = true;
-                    this.newInfo = res;
-                    this.$nextTick(() => {
-                        let keyword = this.selectItem.description.trim();
-                        let htmlStr = document.getElementById('txt').innerText;
-                        this.newInfo.txt = htmlStr.replace(keyword, "<span style='color:red'>" + keyword + "</span>");
-                    });
-                } else {
-                    queryLiterature(item.originId).then(resLi => {
-                        window.open('api/rest/document/viewLiterature/' + resLi.list[0].folder + '/' + resLi.list[0].name);
-                    }).catch(err => {
-                        this.$message.warning(err.message);
-                    });
+            queryLiterature(item.originId).then(res => {
+                if(res.list.length>0){
+                    previewPdf('LiteraturePDF', res.list[0].name);
+                }else{
+                    this.$message.warning('暂未找到此文件！');
                 }
                 endLoading();
-            })
-                .catch((err) => {
-                    endLoading();
+            }).catch(err => {
                 this.$message.warning(err.message);
-                })
+            });
         },
         handleClose(done) {
             done();

src/view/ddkz/components/noticeDialog.vue

@@ -73,7 +73,7 @@ export default {
                 let type = file.name.split('.')[1];
                 if (type == 'png' || type == 'jpg' || type == 'PNG' || type == 'JPG') {
                     this.form.messageForm = 'PICTURE';
-                } else if (type == 'mp4' || type == 'MP4') {
+                } else if (type == 'mp4' || type == 'MP4' || type == 'flv' || type == 'FLV') {
                     this.form.messageForm = 'VIDEO';
                 } else if (type == 'xlsx' || type == 'xls' || type == 'XLSX' || type == 'XLS') {
                     this.form.messageForm = 'EXCEL';

src/view/sjgl/flfggl.vue

@@ -17,15 +17,22 @@
           <component :is="flfg_wx" :clientDetails="jczc_data" ref="jczc" />
         </div>
       </el-tab-pane>
+      <el-tab-pane>
+        <span slot="label"><i class="el-icon-edit-outline"></i>制作简报</span>
+        <div style="width: 100%; height: 100%">
+          <component :is="createBriefing" ref="createBrief" />
+        </div>
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
 <script>
 import flfg_flfg from "./flfg_flfg.vue";
 import navs_wx from "./wx_data_public.vue";
+import createBriefingDialog from "@/view/sjgl/components/createBriefingDialog.vue";
 let id = 1000;
 export default {
-  components: { flfg_flfg, navs_wx },
+  components: { flfg_flfg, navs_wx ,createBriefingDialog},
   data() {
     return {
       currentRole_wx_data: "flfg_flfg",
@@ -33,6 +40,7 @@ export default {
       editableTabsValue: "0",
       jczc_data: {},
       flfg_wx: "navs_wx",
+      createBriefing:'createBriefingDialog'
     };
   },
   methods: {