fix:修改素材

31361a14 · 无尘 · a2fe6cb6 · 31361a14 · 31361a14 · a2fe6cb6
Commit 31361a14 authored May 14, 2020 by 无尘
11 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.3f8161ef4c9631965be90b644fd0e251.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.65ae95cbd0fe8317a65a.js></script><script type=text/javascript src=./static/js/vendor.ec5b5af1da21f97836b5.js></script><script type=text/javascript src=./static/js/app.b7495179c53b2f07ea80.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.1419b733ad1159e54b2b814a0299820b.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.3280f9d1e798062689dd.js></script><script type=text/javascript src=./static/js/vendor.ec5b5af1da21f97836b5.js></script><script type=text/javascript src=./static/js/app.b7495179c53b2f07ea80.js></script></body></html>
\ No newline at end of file
--- a/dist/static/css/app.1419b733ad1159e54b2b814a0299820b.css
+++ b/dist/static/css/app.1419b733ad1159e54b2b814a0299820b.css
--- a/dist/static/css/app.3f8161ef4c9631965be90b644fd0e251.css
+++ b/dist/static/css/app.3f8161ef4c9631965be90b644fd0e251.css
--- a/dist/static/js/4.4087a456468d84048a49.js
+++ b/dist/static/js/4.4087a456468d84048a49.js
--- a/dist/static/js/5.07c6a2396f490878152d.js
+++ b/dist/static/js/5.07c6a2396f490878152d.js
--- a/dist/static/js/5.f458542999ae28ecd59a.js
+++ b/dist/static/js/5.f458542999ae28ecd59a.js
--- a/dist/static/js/6.f1d5161ef40a7ba3f6cf.js
+++ b/dist/static/js/6.f1d5161ef40a7ba3f6cf.js
--- a/dist/static/js/manifest.65ae95cbd0fe8317a65a.js
+++ b/dist/static/js/manifest.65ae95cbd0fe8317a65a.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],d[t]&&u.push(d[t][0]),d[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=f(f.s=n[i]);return o};var c={},d={76:0};function f(a){if(c[a])return c[a].exports;var d=c[a]={i:a,l:!1,exports:{}};return e[a].call(d.exports,d,d.exports,f),d.l=!0,d.exports}f.e=function(e){var a=d[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,f){a=d[e]=[c,f]});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,f.nc&&n.setAttribute("nonce",f.nc),n.src=f.p+"static/js/"+e+"."+{0:"75512f3d6a564da7391d",1:"06c4e42e62c1f75191f0",2:"95860c596ce8eeb79301",3:"317153cd3f6b0047eb86",4:"4087a456468d84048a49",5:"f458542999ae28ecd59a",6:"f1d5161ef40a7ba3f6cf",7:"ece0a2d210892b176e55",8:"7d0a8e6532c58d0c2415",9:"5fbc5faf91d19ada3b4f",10:"a1e55bdf20076ddc24d1",11:"b824cb0d4a2d12ecda5d",12:"6c1505f8ef62166b7a6e",13:"2ccd52bd6e1150f23c90",14:"0225e369d82f24077aba",15:"592a2e6008db77975bcc",16:"bc276325eab50b4b86c0",17:"edf42ec3b001b6cfe65e",18:"4b0922e27b6b34b18611",19:"7a53269ddf9f15768789",20:"73339772cb0f938d6239",21:"9e35f4bb567c79f900c4",22:"4657c811baa7a2a81fa8",23:"b696c3789461b84413c4",24:"4ad7713214fd3234337d",25:"9e5733792c18c643ff3a",26:"54efe70e981ee20ef028",27:"4c65de628f548349df50",28:"c64c6f4563a2c5b34fcf",29:"dd6838c438e8e01143be",30:"6e3dad3ed142df770d0e",31:"963d650c22609bb350cc",32:"648e00249c751be0ef72",33:"3b19f619921aacfda1e4",34:"93b49282fdccc322c7b8",35:"1e1c366da89de72e1273",36:"613f45ac68082928b7d0",37:"eb2f2f6d2d73849ad275",38:"aa5cc391ec4cf87bfad2",39:"ddfeeb2aff4f7ed79c37",40:"7b324f8ae2bf959072d1",41:"e2e9173a1de1a226ccba",42:"e6708846dbe8aa3a739a",43:"c353323742d5dbd08fb8",44:"21732320382ad9591379",45:"ea4b39548055481346ef",46:"77005fb1df27e8d0dcfa",47:"27ddf80c8da77bf9c52d",48:"46491eec4d9b28b07f2a",49:"961ddd83c04214b4e2b0",50:"49955822174c9ebab437",51:"813a21050acac10b3bd6",52:"daeb4b3000f4e6f0622b",53:"ed4f0a40a8c2ab4ef1b5",54:"a63f3b2b05b73e8a3ed6",55:"e08c75127132ad856135",56:"958b7f1db9c52bb2abaf",57:"b059e07220a79fb60d95",58:"38bdda7d88dd6886fbed",59:"ed1cfc8b4f8a46cebdfb",60:"93a2ee002c3cd92e8e0e",61:"c72abb8753a2004d6800",62:"66e0ac1b58f6da721da0",63:"b62d98988a2f683868f1",64:"505a529e5cda237ea46f",65:"bb570dcb8ac1e63ede24",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=d[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),d[e]=void 0)}return n.onerror=n.onload=t,b.appendChild(n),c},f.m=e,f.c=c,f.d=function(e,a,c){f.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},f.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(a,"a",a),a},f.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},f.p="./",f.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],d[t]&&u.push(d[t][0]),d[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=f(f.s=n[i]);return o};var c={},d={76:0};function f(a){if(c[a])return c[a].exports;var d=c[a]={i:a,l:!1,exports:{}};return e[a].call(d.exports,d,d.exports,f),d.l=!0,d.exports}f.e=function(e){var a=d[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,f){a=d[e]=[c,f]});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,f.nc&&n.setAttribute("nonce",f.nc),n.src=f.p+"static/js/"+e+"."+{0:"75512f3d6a564da7391d",1:"06c4e42e62c1f75191f0",2:"95860c596ce8eeb79301",3:"317153cd3f6b0047eb86",4:"b88f80cb21ee98938ee7",5:"07c6a2396f490878152d",6:"1a0b5a4ddf4d73a91f64",7:"ece0a2d210892b176e55",8:"7d0a8e6532c58d0c2415",9:"5fbc5faf91d19ada3b4f",10:"a1e55bdf20076ddc24d1",11:"b824cb0d4a2d12ecda5d",12:"6c1505f8ef62166b7a6e",13:"2ccd52bd6e1150f23c90",14:"0225e369d82f24077aba",15:"592a2e6008db77975bcc",16:"bc276325eab50b4b86c0",17:"edf42ec3b001b6cfe65e",18:"4b0922e27b6b34b18611",19:"7a53269ddf9f15768789",20:"73339772cb0f938d6239",21:"9e35f4bb567c79f900c4",22:"4657c811baa7a2a81fa8",23:"b696c3789461b84413c4",24:"4ad7713214fd3234337d",25:"9e5733792c18c643ff3a",26:"54efe70e981ee20ef028",27:"4c65de628f548349df50",28:"c64c6f4563a2c5b34fcf",29:"dd6838c438e8e01143be",30:"6e3dad3ed142df770d0e",31:"963d650c22609bb350cc",32:"648e00249c751be0ef72",33:"3b19f619921aacfda1e4",34:"93b49282fdccc322c7b8",35:"1e1c366da89de72e1273",36:"613f45ac68082928b7d0",37:"eb2f2f6d2d73849ad275",38:"aa5cc391ec4cf87bfad2",39:"ddfeeb2aff4f7ed79c37",40:"7b324f8ae2bf959072d1",41:"e2e9173a1de1a226ccba",42:"e6708846dbe8aa3a739a",43:"c353323742d5dbd08fb8",44:"21732320382ad9591379",45:"ea4b39548055481346ef",46:"77005fb1df27e8d0dcfa",47:"27ddf80c8da77bf9c52d",48:"46491eec4d9b28b07f2a",49:"961ddd83c04214b4e2b0",50:"49955822174c9ebab437",51:"813a21050acac10b3bd6",52:"daeb4b3000f4e6f0622b",53:"ed4f0a40a8c2ab4ef1b5",54:"a63f3b2b05b73e8a3ed6",55:"e08c75127132ad856135",56:"958b7f1db9c52bb2abaf",57:"b059e07220a79fb60d95",58:"38bdda7d88dd6886fbed",59:"ed1cfc8b4f8a46cebdfb",60:"93a2ee002c3cd92e8e0e",61:"c72abb8753a2004d6800",62:"66e0ac1b58f6da721da0",63:"b62d98988a2f683868f1",64:"505a529e5cda237ea46f",65:"bb570dcb8ac1e63ede24",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=d[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),d[e]=void 0)}return n.onerror=n.onload=t,b.appendChild(n),c},f.m=e,f.c=c,f.d=function(e,a,c){f.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},f.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(a,"a",a),a},f.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},f.p="./",f.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
--- 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 15:00:58
+ * @LastEditTime: 2020-05-14 16:39:24
 -->
 <!--
  <text-edit :categoryId="categoryId" @closeText="closeText" @submitText="submitText"></text-edit>
@@ -67,7 +67,7 @@ export default {
      },
      rules: {
        materialTitle: [{ required: true, message: '请输入文件标题', trigger: 'blur' }],
-        materialContent: [{ required: true, message: '请输入文件内容', trigger: 'blur' }]
+        link: [{ required: true, message: '请上传文件', trigger: 'blur' }]
      },
      emojiList: emojiArr,
      fileType: '.doc',

--- a/src/views/apps/cloudDaily/customReportSet.vue
+++ b/src/views/apps/cloudDaily/customReportSet.vue
@@ -4,7 +4,7 @@
 * @Author: 无尘
 * @Date: 2019-03-20 14:36:37
 * @LastEditors: 无尘
- * @LastEditTime: 2020-03-17 16:33:08
+ * @LastEditTime: 2020-05-14 16:46:12
 -->
 <template>
  <div class="template-wrap" style="min-height: calc(100vh - 114px);">
@@ -30,7 +30,7 @@
          </div>
          <el-tabs v-model="activeName">
            <el-tab-pane v-if="activeTab == 1" label="交易" name="first">
-              <ul>
+              <ul style="max-width: 450px;">
                <draggable id="list1" :list="tradeInfo" class="compenent" :options="leftOption" :clone="cloneItem" :move="onMove" @start="isDragging = true" @end="itemMoveEnd"
                  ><!-- @end="itemMoveEnd" -->
                  <li :class="['compenent-item', item.fixed == true ? 'fixed-item' : '']" :data-name="item.name" v-for="(item, index) in tradeInfo" :key="index" aria-hidden="true">
@@ -40,7 +40,7 @@
              </ul>
            </el-tab-pane>
            <el-tab-pane v-if="activeTab == 1" label="人员" name="second">
-              <ul>
+              <ul style="max-width: 450px;">
                <draggable id="list2" :list="personInfo" class="compenent" :options="leftOption" :clone="cloneItem" :move="onMove" @start="isDragging = true" @end="itemMoveEnd">
                  <li :class="['compenent-item', item.fixed == true ? 'fixed-item' : '']" :data-name="item.name" v-for="(item, index) in personInfo" :key="index">
                    <span>{{ item.title }}</span>
@@ -49,7 +49,7 @@
              </ul>
            </el-tab-pane>
            <el-tab-pane v-if="activeTab == 1" label="商品" name="third">
-              <ul>
+              <ul style="max-width: 450px;">
                <draggable id="list3" :list="goodsInfo" class="compenent" :options="leftOption" :clone="cloneItem" :move="onMove" @start="isDragging = true" @end="itemMoveEnd">
                  <li :class="['compenent-item', item.fixed == true ? 'fixed-item' : '']" :data-name="item.name" v-for="(item, index) in goodsInfo" :key="index">
                    <span>{{ item.title }}</span>
@@ -58,7 +58,7 @@
              </ul>
            </el-tab-pane>
            <el-tab-pane v-if="activeTab == 1" label="竞品" name="four">
-              <ul>
+              <ul style="max-width: 450px;">
                <draggable id="list4" :list="competeInfo" class="compenent" :options="leftOption" :clone="cloneItem" :move="onMove" @start="isDragging = true" @end="itemMoveEnd">
                  <li :class="['compenent-item', item.fixed == true ? 'fixed-item' : '']" :data-name="item.name" v-for="(item, index) in competeInfo" :key="index">
                    <span>{{ item.title }}</span>
@@ -68,7 +68,7 @@
            </el-tab-pane>
            <el-tab-pane v-if="activeTab == 2" label="自定义字段" name="five">
              <!-- <div class="filed-item-title">其他信息</div> -->
-              <ul>
+              <ul style="max-width: 450px;">
                <draggable id="list5" :list="defineInfo" class="compenent" :options="leftDefineOption" :clone="cloneItem" :move="onChildMove" @start="isDragging = true" @end="itemMoveEnd">
                  <li :class="['compenent-item', item.fixed == true ? 'fixed-item' : '', item.type == 11 ? 'block-class' : '']" :data-type="item.fieldCode" v-for="(item, index) in defineInfo" :key="index">
                    <span v-if="item.type == 0">{{ item.title }}</span>

--- a/src/views/apps/cloudDaily/systemReport.vue
+++ b/src/views/apps/cloudDaily/systemReport.vue
@@ -3,8 +3,8 @@
 * @version: 1.0.0
 * @Author: 无尘
 * @Date: 2019-03-20 14:36:37
- * @LastEditors  : 无尘
+ * @LastEditors: 无尘
- * @LastEditTime : 2020-04-07 10:32:27
+ * @LastEditTime: 2020-05-14 16:46:30
 -->
 <template>
  <div class="template-wrap" :style="{ minHeight: bodyHeight }">
@@ -33,7 +33,7 @@
          <!-- tab 切换 -->
          <el-tabs v-model="activeName">
            <el-tab-pane label="卡片" name="first">
-              <ul>
+              <ul style="max-width: 450px;">
                <draggable id="list1" :list="cardInfo" class="compenent" :options="leftOption" :move="onMove" @start="isDragging = true" @end="itemMoveEnd"
                  ><!-- @end="itemMoveEnd" -->
                  <li :class="['compenent-item', item.fixed == true ? 'fixed-item' : '']" :data-name="item.name" v-for="(item, index) in cardInfo" :key="index" @mousedown="clickItem(item)" aria-hidden="true">
@@ -43,7 +43,7 @@
              </ul>
            </el-tab-pane>
            <el-tab-pane label="交易" name="second">
-              <ul>
+              <ul style="max-width: 450px;">
                <draggable id="list2" :list="tradeInfo" class="compenent" :options="leftOption" :move="onMove" @start="isDragging = true" @end="itemMoveEnd">
                  <li :class="['compenent-item', item.fixed == true ? 'fixed-item' : '']" :data-name="item.name" v-for="(item, index) in tradeInfo" :key="index" @mousedown="clickItem(item)">
                    <span>{{ item.title }}</span>
@@ -52,7 +52,7 @@
              </ul>
            </el-tab-pane>
            <el-tab-pane label="生日会员" name="third">
-              <ul>
+              <ul style="max-width: 450px;">
                <draggable id="list3" :list="birthdayMemberInfo" class="compenent" :options="leftOption" :move="onMove" @start="isDragging = true" @end="itemMoveEnd">
                  <li :class="['compenent-item', item.fixed == true ? 'fixed-item' : '']" :data-name="item.name" v-for="(item, index) in birthdayMemberInfo" :key="index" @mousedown="clickItem(item)">
                    <span>{{ item.title }}</span>
@@ -61,7 +61,7 @@
              </ul>
            </el-tab-pane>
            <el-tab-pane label="会员" name="four">
-              <ul>
+              <ul style="max-width: 450px;">
                <draggable id="list4" :list="memberInfo" class="compenent" :options="leftOption" :move="onMove" @start="isDragging = true" @end="itemMoveEnd">
                  <li :class="['compenent-item', item.fixed == true ? 'fixed-item' : '']" :data-name="item.name" v-for="(item, index) in memberInfo" :key="index" @mousedown="clickItem(item)">
                    <span>{{ item.title }}</span>
@@ -70,7 +70,7 @@
              </ul>
            </el-tab-pane>
            <el-tab-pane label="执行力" name="five">
-              <ul>
+              <ul style="max-width: 450px;">
                <draggable id="list5" :list="powerInfo" class="compenent" :options="leftOption" :move="onMove" @start="isDragging = true" @end="itemMoveEnd">
                  <li :class="['compenent-item', item.fixed == true ? 'fixed-item' : '']" :data-name="item.name" v-for="(item, index) in powerInfo" :key="index" @mousedown="clickItem(item)">
                    <span>{{ item.title }}</span>
@@ -713,9 +713,11 @@ export default {
    .template-cell-l {
      width: 420px;
      min-width: 33%;
+      max-width: 450px;
      float: left;
      height: calc(100vh - 190px);
      padding-top: 16px; /* border-right: 2px solid #E4E7ED; */
+      border-right: 2px solid #E4E7ED;
      .template-cell-title {
        font-weight: bold;
        padding-left: 20px;
@@ -850,7 +852,7 @@ export default {
      padding-top: 48px;
      margin: 0 20px;
      position: relative;
-      border-left: 2px solid #e4e7ed;
+      // border-left: 2px solid #e4e7ed;
      .view-content {
        position: relative;
      }