fix:修改素材

bddf6748 · 无尘 · 56885645 · bddf6748 · 56885645 · bddf6748
Commit bddf6748 authored May 14, 2020 by 无尘
10 changed files
--- a/dist/index.html
+++ b/dist/index.html
-<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>好办管理平台</title><link rel=stylesheet type=text/css href=//web-1251519181.file.myqcloud.com/custom-element/custom-element.1.0.28.css><link href=./static/css/app.7b1c8fc2c1ceb962720dd326edd6fe5c.css rel=stylesheet></head><body style="min-width: 1400px;" class=damolish><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script>// Raven.config('https://3715a345910d4c768e7a1ec14619c2d5@sentry.io/1413672').install();</script><script type=text/javascript src=./static/js/manifest.1c5ee32d887b130e2716.js></script><script type=text/javascript src=./static/js/vendor.ec5b5af1da21f97836b5.js></script><script type=text/javascript src=./static/js/app.73f179c0b16048b4cd11.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>好办管理平台</title><link rel=stylesheet type=text/css href=//web-1251519181.file.myqcloud.com/custom-element/custom-element.1.0.28.css><link href=./static/css/app.aa3cb0a57d591c57519e7821b94aecdc.css rel=stylesheet></head><body style="min-width: 1400px;" class=damolish><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script>// Raven.config('https://3715a345910d4c768e7a1ec14619c2d5@sentry.io/1413672').install();</script><script type=text/javascript src=./static/js/manifest.63a0399bc66d17e57607.js></script><script type=text/javascript src=./static/js/vendor.ec5b5af1da21f97836b5.js></script><script type=text/javascript src=./static/js/app.73f179c0b16048b4cd11.js></script></body></html>
\ No newline at end of file
--- a/dist/static/css/app.7b1c8fc2c1ceb962720dd326edd6fe5c.css
+++ b/dist/static/css/app.7b1c8fc2c1ceb962720dd326edd6fe5c.css
--- a/dist/static/css/app.aa3cb0a57d591c57519e7821b94aecdc.css
+++ b/dist/static/css/app.aa3cb0a57d591c57519e7821b94aecdc.css
--- a/dist/static/js/5.c056ac7c79aab226f1ac.js
+++ b/dist/static/js/5.c056ac7c79aab226f1ac.js
--- a/dist/static/js/5.e3ef8a5358b112a4f4a1.js
+++ b/dist/static/js/5.e3ef8a5358b112a4f4a1.js
--- a/dist/static/js/manifest.1c5ee32d887b130e2716.js
+++ b/dist/static/js/manifest.1c5ee32d887b130e2716.js
-!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,b,n){for(var r,t,o,i=0,u=[];i<c.length;i++)t=c[i],f[t]&&u.push(f[t][0]),f[t]=0;for(r in b)Object.prototype.hasOwnProperty.call(b,r)&&(e[r]=b[r]);for(a&&a(c,b,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=d(d.s=n[i]);return o};var c={},f={76:0};function d(a){if(c[a])return c[a].exports;var f=c[a]={i:a,l:!1,exports:{}};return e[a].call(f.exports,f,f.exports,d),f.l=!0,f.exports}d.e=function(e){var a=f[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,d){a=f[e]=[c,d]});a[2]=c;var b=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,d.nc&&n.setAttribute("nonce",d.nc),n.src=d.p+"static/js/"+e+"."+{0:"75512f3d6a564da7391d",1:"06c4e42e62c1f75191f0",2:"95860c596ce8eeb79301",3:"317153cd3f6b0047eb86",4:"c3c7a44f10799d6b0570",5:"e3ef8a5358b112a4f4a1",6:"f1d5161ef40a7ba3f6cf",7:"ece0a2d210892b176e55",8:"7d0a8e6532c58d0c2415",9:"ea31d337331fea67d62b",10:"62eecd9e2e85ea911ebd",11:"9b3374cd4a81129f7a3c",12:"6c1505f8ef62166b7a6e",13:"2ccd52bd6e1150f23c90",14:"0225e369d82f24077aba",15:"592a2e6008db77975bcc",16:"bc276325eab50b4b86c0",17:"edf42ec3b001b6cfe65e",18:"4b0922e27b6b34b18611",19:"30252583b235f2c70040",20:"ba2e2bd0823422a4de6c",21:"9e35f4bb567c79f900c4",22:"4657c811baa7a2a81fa8",23:"b696c3789461b84413c4",24:"4ad7713214fd3234337d",25:"9e5733792c18c643ff3a",26:"54efe70e981ee20ef028",27:"4c65de628f548349df50",28:"4fbce325a868a8eed45f",29:"dd6838c438e8e01143be",30:"6e3dad3ed142df770d0e",31:"963d650c22609bb350cc",32:"648e00249c751be0ef72",33:"3b19f619921aacfda1e4",34:"b57b41292517a536addb",35:"cf76e4b74afa283a3eec",36:"db02c347e3e009b70eac",37:"5038b3a9b73a30e92ed9",38:"8dacabcebbcf33c09d69",39:"36ad49af4ad28511cb7e",40:"53d1aada48d77cf4670b",41:"b7276467d43930494f90",42:"cef9078afe497dcad23b",43:"c353323742d5dbd08fb8",44:"21732320382ad9591379",45:"ea4b39548055481346ef",46:"77005fb1df27e8d0dcfa",47:"27ddf80c8da77bf9c52d",48:"46491eec4d9b28b07f2a",49:"961ddd83c04214b4e2b0",50:"49955822174c9ebab437",51:"c84a655307ea7a2993bc",52:"23ce7f8f10e2d853d7e7",53:"03649cc9cbca035a1d60",54:"4c35b1e21352f05966df",55:"8a707dea9d35fe36a516",56:"a497356aa0b1b941f70e",57:"fa0993908f0e01751c40",58:"89745e27566eaf3aebae",59:"35846fe10eaf6d8a8c93",60:"02ef368f3955ef4fa3ee",61:"cc56326182e5e1134503",62:"ef71a1048465b72ae595",63:"aaaae3e573c9454df03d",64:"6e4ab38ada941a5fb834",65:"859191282a6e5fdc4b7f",66:"a970ad3d710b5c92c175",67:"0dd6204bfe8e0903ea36",68:"b0e48542a6189f95e7a9",69:"78c1148df0648f724434",70:"d8b620c8d056d806ac23",71:"8ce9113b1568e9bf5537",72:"a6222ada9c9a2655c92a",73:"959fb844a60624eba321"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var a=f[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return n.onerror=n.onload=t,b.appendChild(n),c},d.m=e,d.c=c,d.d=function(e,a,c){d.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},d.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return d.d(a,"a",a),a},d.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},d.p="./",d.oe=function(e){throw console.error(e),e}}([]);
+!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,b,n){for(var r,t,o,i=0,u=[];i<c.length;i++)t=c[i],f[t]&&u.push(f[t][0]),f[t]=0;for(r in b)Object.prototype.hasOwnProperty.call(b,r)&&(e[r]=b[r]);for(a&&a(c,b,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=d(d.s=n[i]);return o};var c={},f={76:0};function d(a){if(c[a])return c[a].exports;var f=c[a]={i:a,l:!1,exports:{}};return e[a].call(f.exports,f,f.exports,d),f.l=!0,f.exports}d.e=function(e){var a=f[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,d){a=f[e]=[c,d]});a[2]=c;var b=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,d.nc&&n.setAttribute("nonce",d.nc),n.src=d.p+"static/js/"+e+"."+{0:"75512f3d6a564da7391d",1:"06c4e42e62c1f75191f0",2:"95860c596ce8eeb79301",3:"317153cd3f6b0047eb86",4:"c3c7a44f10799d6b0570",5:"c056ac7c79aab226f1ac",6:"f1d5161ef40a7ba3f6cf",7:"ece0a2d210892b176e55",8:"7d0a8e6532c58d0c2415",9:"ea31d337331fea67d62b",10:"62eecd9e2e85ea911ebd",11:"9b3374cd4a81129f7a3c",12:"6c1505f8ef62166b7a6e",13:"2ccd52bd6e1150f23c90",14:"0225e369d82f24077aba",15:"592a2e6008db77975bcc",16:"bc276325eab50b4b86c0",17:"edf42ec3b001b6cfe65e",18:"4b0922e27b6b34b18611",19:"30252583b235f2c70040",20:"ba2e2bd0823422a4de6c",21:"9e35f4bb567c79f900c4",22:"4657c811baa7a2a81fa8",23:"b696c3789461b84413c4",24:"4ad7713214fd3234337d",25:"9e5733792c18c643ff3a",26:"54efe70e981ee20ef028",27:"4c65de628f548349df50",28:"4fbce325a868a8eed45f",29:"dd6838c438e8e01143be",30:"6e3dad3ed142df770d0e",31:"963d650c22609bb350cc",32:"648e00249c751be0ef72",33:"3b19f619921aacfda1e4",34:"b57b41292517a536addb",35:"cf76e4b74afa283a3eec",36:"db02c347e3e009b70eac",37:"5038b3a9b73a30e92ed9",38:"8dacabcebbcf33c09d69",39:"36ad49af4ad28511cb7e",40:"53d1aada48d77cf4670b",41:"b7276467d43930494f90",42:"cef9078afe497dcad23b",43:"c353323742d5dbd08fb8",44:"21732320382ad9591379",45:"ea4b39548055481346ef",46:"77005fb1df27e8d0dcfa",47:"27ddf80c8da77bf9c52d",48:"46491eec4d9b28b07f2a",49:"961ddd83c04214b4e2b0",50:"49955822174c9ebab437",51:"c84a655307ea7a2993bc",52:"23ce7f8f10e2d853d7e7",53:"03649cc9cbca035a1d60",54:"4c35b1e21352f05966df",55:"8a707dea9d35fe36a516",56:"a497356aa0b1b941f70e",57:"fa0993908f0e01751c40",58:"89745e27566eaf3aebae",59:"35846fe10eaf6d8a8c93",60:"02ef368f3955ef4fa3ee",61:"cc56326182e5e1134503",62:"ef71a1048465b72ae595",63:"aaaae3e573c9454df03d",64:"6e4ab38ada941a5fb834",65:"859191282a6e5fdc4b7f",66:"a970ad3d710b5c92c175",67:"0dd6204bfe8e0903ea36",68:"b0e48542a6189f95e7a9",69:"78c1148df0648f724434",70:"d8b620c8d056d806ac23",71:"8ce9113b1568e9bf5537",72:"a6222ada9c9a2655c92a",73:"959fb844a60624eba321"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var a=f[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return n.onerror=n.onload=t,b.appendChild(n),c},d.m=e,d.c=c,d.d=function(e,a,c){d.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},d.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return d.d(a,"a",a),a},d.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},d.p="./",d.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
--- a/src/assets/file.svg
+++ b/src/assets/file.svg
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 200 200" style="enable-background:new 0 0 200 200;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#3D6AE8;}
+	.st1{fill:#86ADF2;}
+	.st2{fill:#E1EDFF;}
+</style>
+<g>
+	<path class="st0" d="M28.6,1H120l60,59.7v130.6c0,4.7-3.8,8.5-8.6,8.5H28.6c-4.7,0-8.6-3.8-8.6-8.5V9.5C20,4.8,23.8,1,28.6,1z"/>
+	<path class="st1" d="M120,1l60,60h-46.7C126,61,120,55,120,47.7V1z"/>
+	<path class="st2" d="M46.7,100.4h106.7v20H46.7V100.4z M46.7,140.4h106.7v20H46.7V140.4z"/>
+</g>
+</svg>
--- a/src/components/set/file-edit.vue
+++ b/src/components/set/file-edit.vue
@@ -4,7 +4,7 @@
 * @Author: 无尘
 * @Date: 2020-04-14 09:50:16
 * @LastEditors: 无尘
- * @LastEditTime: 2020-05-14 10:44:29
+ * @LastEditTime: 2020-05-14 10:53:59
 -->
 <!--
  <text-edit :categoryId="categoryId" @closeText="closeText" @submitText="submitText"></text-edit>
@@ -19,7 +19,8 @@
        </el-form-item>
        <el-form-item label="文件" prop="link">
          <el-upload class="upload-demo notice-upload-file" :action="uploadUrl()" :before-upload="beforeFileUpload" :on-success="handleFileSuccess" :on-change="handleFileChange" :on-remove="handleRemove" :limit="1" :on-exceed="handleExceed" :file-list="fileDatas">
-            <el-button type="primary"><i class="el-icon-upload el-icon--right" style="font-size: 16px;padding-right:5px;"></i>上传</el-button><span class="font-12 color-606266 p-l-20">普通文件，不大于20MB。支持word及excle，pdf，ppt，zip，rar格式</span>
+            <el-button type="primary"><i class="el-icon-upload el-icon--right" style="font-size: 16px;padding-right:5px;"></i>上传</el-button>
+            <div slot="tip" class="font-12 color-606266 p-l-20">普通文件，不大于20MB。支持word及excle，pdf，ppt，zip，rar格式</div>
          </el-upload>
        </el-form-item>
      </el-form>
@@ -97,7 +98,7 @@ export default {
      const isFiles = file.name.includes('pdf') || file.name.includes('doc') || file.name.includes('xls') || file.name.includes('ppt') || file.name.includes('zip') || file.name.includes('rar');
      const isLt20M = file.size / 1024 / 1024 <= 20;
      if (!isLt20M) {
-        that.$message.error('文件大小超出限制，无法上传');
+        that.$message.error('文件大小超出20M，无法上传');
      }
      if (!isFiles) {
        that.$message.error('仅支持word及excle，pdf，ppt，zip，rar格式');
@@ -165,10 +166,10 @@ export default {
      const that = this;
      const data = {
        categoryId: that.categoryId,
-        materialType: 1,
+        materialType: 5,
        materialId: that.ruleForm.materialId,
        materialTitle: that.ruleForm.materialTitle,
-        materialContent: that.ruleForm.materialContent
+        link: that.ruleForm.link
      };
      postRequest(that.ruleForm.materialId ? '/haoban-manage3-web/material-edit' : '/haoban-manage3-web/material-add', data)
        .then(res => {

--- a/src/components/set/file-table.vue
+++ b/src/components/set/file-table.vue
@@ -4,7 +4,7 @@
 * @Author: 无尘
 * @Date: 2019-03-20 14:36:37
 * @LastEditors: 无尘
- * @LastEditTime: 2020-05-14 10:44:53
+ * @LastEditTime: 2020-05-14 11:01:03
 -->
 <!--
 <text-table :categoryId="categoryId"  :textTableData="textTableData" @handleSelectionChange="handleSelectionChange" @refreshTable="refreshTable" @handleCurrentChange="handleCurrentChange" @handleSizeChange="handleSizeChange"></text-table>
@@ -31,8 +31,10 @@
          >{{ scope.row.materialTitle }}
        </template>
      </el-table-column>
-      <el-table-column prop="" label="内容" show-overflow-tooltip>
+      <el-table-column prop="" label="内容">
-        <template slot-scope="scope">{{ scope.row.materialContent }}</template>
+        <template slot-scope="scope">
+          <div style="width: 40px;height:40px;background:#f5f7fa;" @click="toOpenFile(scope.row)"><img style="width: 19px;" src="../../assets/file.svg" alt="" /></div>
+        </template>
      </el-table-column>
      <el-table-column prop="" label="编辑人" show-overflow-tooltip>
        <template slot-scope="scope">{{ scope.row.staffName }}</template>
@@ -111,6 +113,9 @@ export default {
  },
  computed: {},
  methods: {
+    toOpenFile(row) {
+      window.open(row.link);
+    },
    /**
     * 文本弹窗关闭
     */

--- a/src/views/enterprise/material.vue
+++ b/src/views/enterprise/material.vue
@@ -4,7 +4,7 @@
 * @Author: 无尘
 * @Date: 2020-03-16 09:59:39
 * @LastEditors: 无尘
- * @LastEditTime: 2020-05-14 10:46:04
+ * @LastEditTime: 2020-05-14 11:02:54
 -->
 <template>
  <div class="daily-set-wrap ">
@@ -100,6 +100,7 @@
              </el-tab-pane>
              <el-tab-pane label="文件" name="5">
                <span slot="label"><i class="iconfont iconwenjian p-r-5  color-606266"></i>文件</span>
+                <file-table :currentPage="currentPage" :pageSize="pageSize" :total="total" :categoryId="currentCategoryId" :textTableData="tableData" @handleSelectionChange="handleSelectionChange" @refreshTable="refreshTable" @handleCurrentChange="handleCurrentChange" @handleSizeChange="handleSizeChange"></file-table>
              </el-tab-pane>
            </el-tabs>
          </div>
@@ -124,6 +125,7 @@ import textTable from '@/components/set/text-table.vue';
 import imageTable from '@/components/set/image-table.vue';
 import webTable from '@/components/set/web-table.vue';
 import videoTable from '@/components/set/video-table.vue';
+import fileTable from '@/components/set/file-table.vue';
 import groupDialog from '@/components/set/group-dialog.vue';
 import { getRequest, postRequest } from '@/api/api';
 import { _debounce } from '@/common/js/public';
@@ -484,7 +486,7 @@ export default {
  destroyed() {
    document.documentElement.style.backgroundColor = '#fff';
  },
-  components: { groupDialog, textTable, imageTable, webTable, videoTable, textEdit, imageEdit, webEdit, videoEdit, fileEdit }
+  components: { groupDialog, textTable, imageTable, webTable, videoTable, fileTable, textEdit, imageEdit, webEdit, videoEdit, fileEdit }
 };
 </script>
 <style type="text/less" lang="less" scoped>