Procházet zdrojové kódy

重点攻坚最新代码

237735408@qq.com před 2 roky
rodič
revize
3116fa7ce0
51 změnil soubory, kde provedl 8731 přidání a 46 odebrání
  1. binární
      public/static/js/luckysheet_old/assets/iconfont/Anton-Regular.ttf
  2. binární
      public/static/js/luckysheet_old/assets/iconfont/HanaleiFill-Regular.ttf
  3. binární
      public/static/js/luckysheet_old/assets/iconfont/Pacifico-Regular.ttf
  4. 539 0
      public/static/js/luckysheet_old/assets/iconfont/demo.css
  5. 2700 0
      public/static/js/luckysheet_old/assets/iconfont/demo_index.html
  6. 457 0
      public/static/js/luckysheet_old/assets/iconfont/iconfont.css
  7. binární
      public/static/js/luckysheet_old/assets/iconfont/iconfont.eot
  8. 1 0
      public/static/js/luckysheet_old/assets/iconfont/iconfont.js
  9. 779 0
      public/static/js/luckysheet_old/assets/iconfont/iconfont.json
  10. 356 0
      public/static/js/luckysheet_old/assets/iconfont/iconfont.svg
  11. binární
      public/static/js/luckysheet_old/assets/iconfont/iconfont.ttf
  12. binární
      public/static/js/luckysheet_old/assets/iconfont/iconfont.woff
  13. binární
      public/static/js/luckysheet_old/assets/iconfont/iconfont.woff2
  14. binární
      public/static/js/luckysheet_old/css/EwaAntH.gif
  15. binární
      public/static/js/luckysheet_old/css/EwaAntV.gif
  16. binární
      public/static/js/luckysheet_old/css/arrow-down.png
  17. binární
      public/static/js/luckysheet_old/css/loading.gif
  18. 1 0
      public/static/js/luckysheet_old/css/luckysheet.css
  19. 505 0
      public/static/js/luckysheet_old/css/menuSprite.svg
  20. binární
      public/static/js/luckysheet_old/css/paint_16px.ico
  21. binární
      public/static/js/luckysheet_old/css/paint_24px.ico
  22. binární
      public/static/js/luckysheet_old/css/paint_32px.ico
  23. 528 0
      public/static/js/luckysheet_old/css/sprite38.svg
  24. binární
      public/static/js/luckysheet_old/css/waffle_sprite.png
  25. 1 0
      public/static/js/luckysheet_old/expendPlugins/chart/chartmix.css
  26. 34 0
      public/static/js/luckysheet_old/expendPlugins/chart/chartmix.umd.min.js
  27. binární
      public/static/js/luckysheet_old/fonts/FontAwesome.otf
  28. binární
      public/static/js/luckysheet_old/fonts/fontawesome-webfont.eot
  29. 2671 0
      public/static/js/luckysheet_old/fonts/fontawesome-webfont.svg
  30. binární
      public/static/js/luckysheet_old/fonts/fontawesome-webfont.ttf
  31. binární
      public/static/js/luckysheet_old/fonts/fontawesome-webfont.woff
  32. binární
      public/static/js/luckysheet_old/fonts/fontawesome-webfont.woff2
  33. 10 0
      public/static/js/luckysheet_old/luckysheet.esm.js
  34. 10 0
      public/static/js/luckysheet_old/luckysheet.umd.js
  35. 1 0
      public/static/js/luckysheet_old/plugins/css/pluginsCss.css
  36. binární
      public/static/js/luckysheet_old/plugins/images/CFcolorGradation.png
  37. binární
      public/static/js/luckysheet_old/plugins/images/CFdataBar.png
  38. binární
      public/static/js/luckysheet_old/plugins/images/CFicons.png
  39. binární
      public/static/js/luckysheet_old/plugins/images/icon_dropCell.png
  40. binární
      public/static/js/luckysheet_old/plugins/images/ui-icons_444444_256x240.png
  41. binární
      public/static/js/luckysheet_old/plugins/images/ui-icons_555555_256x240.png
  42. binární
      public/static/js/luckysheet_old/plugins/images/ui-icons_777620_256x240.png
  43. binární
      public/static/js/luckysheet_old/plugins/images/ui-icons_777777_256x240.png
  44. binární
      public/static/js/luckysheet_old/plugins/images/ui-icons_cc0000_256x240.png
  45. binární
      public/static/js/luckysheet_old/plugins/images/ui-icons_ffffff_256x240.png
  46. 1 0
      public/static/js/luckysheet_old/plugins/js/plugin.js
  47. 10 0
      public/static/js/luckysheet_old/plugins/plugins.css
  48. 104 39
      public/static/views/kccExcel.html
  49. 15 4
      src/pages/main/keyChannelCoop/appendix.vue
  50. 7 2
      src/pages/main/keyChannelCoop/onlineExcel.vue
  51. 1 1
      src/pages/main/keyChannelCoop/onlineExcelInfo.vue

binární
public/static/js/luckysheet_old/assets/iconfont/Anton-Regular.ttf


binární
public/static/js/luckysheet_old/assets/iconfont/HanaleiFill-Regular.ttf


binární
public/static/js/luckysheet_old/assets/iconfont/Pacifico-Regular.ttf


+ 539 - 0
public/static/js/luckysheet_old/assets/iconfont/demo.css

@@ -0,0 +1,539 @@
+/* Logo 字体 */
+@font-face {
+  font-family: "iconfont logo";
+  src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834');
+  src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834#iefix') format('embedded-opentype'),
+    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.woff?t=1545807318834') format('woff'),
+    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.ttf?t=1545807318834') format('truetype'),
+    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.svg?t=1545807318834#iconfont') format('svg');
+}
+
+.logo {
+  font-family: "iconfont logo";
+  font-size: 160px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+/* tabs */
+.nav-tabs {
+  position: relative;
+}
+
+.nav-tabs .nav-more {
+  position: absolute;
+  right: 0;
+  bottom: 0;
+  height: 42px;
+  line-height: 42px;
+  color: #666;
+}
+
+#tabs {
+  border-bottom: 1px solid #eee;
+}
+
+#tabs li {
+  cursor: pointer;
+  width: 100px;
+  height: 40px;
+  line-height: 40px;
+  text-align: center;
+  font-size: 16px;
+  border-bottom: 2px solid transparent;
+  position: relative;
+  z-index: 1;
+  margin-bottom: -1px;
+  color: #666;
+}
+
+
+#tabs .active {
+  border-bottom-color: #f00;
+  color: #222;
+}
+
+.tab-container .content {
+  display: none;
+}
+
+/* 页面布局 */
+.main {
+  padding: 30px 100px;
+  width: 960px;
+  margin: 0 auto;
+}
+
+.main .logo {
+  color: #333;
+  text-align: left;
+  margin-bottom: 30px;
+  line-height: 1;
+  height: 110px;
+  margin-top: -50px;
+  overflow: hidden;
+  *zoom: 1;
+}
+
+.main .logo a {
+  font-size: 160px;
+  color: #333;
+}
+
+.helps {
+  margin-top: 40px;
+}
+
+.helps pre {
+  padding: 20px;
+  margin: 10px 0;
+  border: solid 1px #e7e1cd;
+  background-color: #fffdef;
+  overflow: auto;
+}
+
+.icon_lists {
+  width: 100% !important;
+  overflow: hidden;
+  *zoom: 1;
+}
+
+.icon_lists li {
+  width: 100px;
+  margin-bottom: 10px;
+  margin-right: 20px;
+  text-align: center;
+  list-style: none !important;
+  cursor: default;
+}
+
+.icon_lists li .code-name {
+  line-height: 1.2;
+}
+
+.icon_lists .icon {
+  display: block;
+  height: 100px;
+  line-height: 100px;
+  font-size: 42px;
+  margin: 10px auto;
+  color: #333;
+  -webkit-transition: font-size 0.25s linear, width 0.25s linear;
+  -moz-transition: font-size 0.25s linear, width 0.25s linear;
+  transition: font-size 0.25s linear, width 0.25s linear;
+}
+
+.icon_lists .icon:hover {
+  font-size: 100px;
+}
+
+.icon_lists .svg-icon {
+  /* 通过设置 font-size 来改变图标大小 */
+  width: 1em;
+  /* 图标和文字相邻时,垂直对齐 */
+  vertical-align: -0.15em;
+  /* 通过设置 color 来改变 SVG 的颜色/fill */
+  fill: currentColor;
+  /* path 和 stroke 溢出 viewBox 部分在 IE 下会显示
+      normalize.css 中也包含这行 */
+  overflow: hidden;
+}
+
+.icon_lists li .name,
+.icon_lists li .code-name {
+  color: #666;
+}
+
+/* markdown 样式 */
+.markdown {
+  color: #666;
+  font-size: 14px;
+  line-height: 1.8;
+}
+
+.highlight {
+  line-height: 1.5;
+}
+
+.markdown img {
+  vertical-align: middle;
+  max-width: 100%;
+}
+
+.markdown h1 {
+  color: #404040;
+  font-weight: 500;
+  line-height: 40px;
+  margin-bottom: 24px;
+}
+
+.markdown h2,
+.markdown h3,
+.markdown h4,
+.markdown h5,
+.markdown h6 {
+  color: #404040;
+  margin: 1.6em 0 0.6em 0;
+  font-weight: 500;
+  clear: both;
+}
+
+.markdown h1 {
+  font-size: 28px;
+}
+
+.markdown h2 {
+  font-size: 22px;
+}
+
+.markdown h3 {
+  font-size: 16px;
+}
+
+.markdown h4 {
+  font-size: 14px;
+}
+
+.markdown h5 {
+  font-size: 12px;
+}
+
+.markdown h6 {
+  font-size: 12px;
+}
+
+.markdown hr {
+  height: 1px;
+  border: 0;
+  background: #e9e9e9;
+  margin: 16px 0;
+  clear: both;
+}
+
+.markdown p {
+  margin: 1em 0;
+}
+
+.markdown>p,
+.markdown>blockquote,
+.markdown>.highlight,
+.markdown>ol,
+.markdown>ul {
+  width: 80%;
+}
+
+.markdown ul>li {
+  list-style: circle;
+}
+
+.markdown>ul li,
+.markdown blockquote ul>li {
+  margin-left: 20px;
+  padding-left: 4px;
+}
+
+.markdown>ul li p,
+.markdown>ol li p {
+  margin: 0.6em 0;
+}
+
+.markdown ol>li {
+  list-style: decimal;
+}
+
+.markdown>ol li,
+.markdown blockquote ol>li {
+  margin-left: 20px;
+  padding-left: 4px;
+}
+
+.markdown code {
+  margin: 0 3px;
+  padding: 0 5px;
+  background: #eee;
+  border-radius: 3px;
+}
+
+.markdown strong,
+.markdown b {
+  font-weight: 600;
+}
+
+.markdown>table {
+  border-collapse: collapse;
+  border-spacing: 0px;
+  empty-cells: show;
+  border: 1px solid #e9e9e9;
+  width: 95%;
+  margin-bottom: 24px;
+}
+
+.markdown>table th {
+  white-space: nowrap;
+  color: #333;
+  font-weight: 600;
+}
+
+.markdown>table th,
+.markdown>table td {
+  border: 1px solid #e9e9e9;
+  padding: 8px 16px;
+  text-align: left;
+}
+
+.markdown>table th {
+  background: #F7F7F7;
+}
+
+.markdown blockquote {
+  font-size: 90%;
+  color: #999;
+  border-left: 4px solid #e9e9e9;
+  padding-left: 0.8em;
+  margin: 1em 0;
+}
+
+.markdown blockquote p {
+  margin: 0;
+}
+
+.markdown .anchor {
+  opacity: 0;
+  transition: opacity 0.3s ease;
+  margin-left: 8px;
+}
+
+.markdown .waiting {
+  color: #ccc;
+}
+
+.markdown h1:hover .anchor,
+.markdown h2:hover .anchor,
+.markdown h3:hover .anchor,
+.markdown h4:hover .anchor,
+.markdown h5:hover .anchor,
+.markdown h6:hover .anchor {
+  opacity: 1;
+  display: inline-block;
+}
+
+.markdown>br,
+.markdown>p>br {
+  clear: both;
+}
+
+
+.hljs {
+  display: block;
+  background: white;
+  padding: 0.5em;
+  color: #333333;
+  overflow-x: auto;
+}
+
+.hljs-comment,
+.hljs-meta {
+  color: #969896;
+}
+
+.hljs-string,
+.hljs-variable,
+.hljs-template-variable,
+.hljs-strong,
+.hljs-emphasis,
+.hljs-quote {
+  color: #df5000;
+}
+
+.hljs-keyword,
+.hljs-selector-tag,
+.hljs-type {
+  color: #a71d5d;
+}
+
+.hljs-literal,
+.hljs-symbol,
+.hljs-bullet,
+.hljs-attribute {
+  color: #0086b3;
+}
+
+.hljs-section,
+.hljs-name {
+  color: #63a35c;
+}
+
+.hljs-tag {
+  color: #333333;
+}
+
+.hljs-title,
+.hljs-attr,
+.hljs-selector-id,
+.hljs-selector-class,
+.hljs-selector-attr,
+.hljs-selector-pseudo {
+  color: #795da3;
+}
+
+.hljs-addition {
+  color: #55a532;
+  background-color: #eaffea;
+}
+
+.hljs-deletion {
+  color: #bd2c00;
+  background-color: #ffecec;
+}
+
+.hljs-link {
+  text-decoration: underline;
+}
+
+/* 代码高亮 */
+/* PrismJS 1.15.0
+https://prismjs.com/download.html#themes=prism&languages=markup+css+clike+javascript */
+/**
+ * prism.js default theme for JavaScript, CSS and HTML
+ * Based on dabblet (http://dabblet.com)
+ * @author Lea Verou
+ */
+code[class*="language-"],
+pre[class*="language-"] {
+  color: black;
+  background: none;
+  text-shadow: 0 1px white;
+  font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
+  text-align: left;
+  white-space: pre;
+  word-spacing: normal;
+  word-break: normal;
+  word-wrap: normal;
+  line-height: 1.5;
+
+  -moz-tab-size: 4;
+  -o-tab-size: 4;
+  tab-size: 4;
+
+  -webkit-hyphens: none;
+  -moz-hyphens: none;
+  -ms-hyphens: none;
+  hyphens: none;
+}
+
+pre[class*="language-"]::-moz-selection,
+pre[class*="language-"] ::-moz-selection,
+code[class*="language-"]::-moz-selection,
+code[class*="language-"] ::-moz-selection {
+  text-shadow: none;
+  background: #b3d4fc;
+}
+
+pre[class*="language-"]::selection,
+pre[class*="language-"] ::selection,
+code[class*="language-"]::selection,
+code[class*="language-"] ::selection {
+  text-shadow: none;
+  background: #b3d4fc;
+}
+
+@media print {
+
+  code[class*="language-"],
+  pre[class*="language-"] {
+    text-shadow: none;
+  }
+}
+
+/* Code blocks */
+pre[class*="language-"] {
+  padding: 1em;
+  margin: .5em 0;
+  overflow: auto;
+}
+
+:not(pre)>code[class*="language-"],
+pre[class*="language-"] {
+  background: #f5f2f0;
+}
+
+/* Inline code */
+:not(pre)>code[class*="language-"] {
+  padding: .1em;
+  border-radius: .3em;
+  white-space: normal;
+}
+
+.token.comment,
+.token.prolog,
+.token.doctype,
+.token.cdata {
+  color: slategray;
+}
+
+.token.punctuation {
+  color: #999;
+}
+
+.namespace {
+  opacity: .7;
+}
+
+.token.property,
+.token.tag,
+.token.boolean,
+.token.number,
+.token.constant,
+.token.symbol,
+.token.deleted {
+  color: #905;
+}
+
+.token.selector,
+.token.attr-name,
+.token.string,
+.token.char,
+.token.builtin,
+.token.inserted {
+  color: #690;
+}
+
+.token.operator,
+.token.entity,
+.token.url,
+.language-css .token.string,
+.style .token.string {
+  color: #9a6e3a;
+  background: hsla(0, 0%, 100%, .5);
+}
+
+.token.atrule,
+.token.attr-value,
+.token.keyword {
+  color: #07a;
+}
+
+.token.function,
+.token.class-name {
+  color: #DD4A68;
+}
+
+.token.regex,
+.token.important,
+.token.variable {
+  color: #e90;
+}
+
+.token.important,
+.token.bold {
+  font-weight: bold;
+}
+
+.token.italic {
+  font-style: italic;
+}
+
+.token.entity {
+  cursor: help;
+}

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 2700 - 0
public/static/js/luckysheet_old/assets/iconfont/demo_index.html


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 457 - 0
public/static/js/luckysheet_old/assets/iconfont/iconfont.css


binární
public/static/js/luckysheet_old/assets/iconfont/iconfont.eot


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 1 - 0
public/static/js/luckysheet_old/assets/iconfont/iconfont.js


+ 779 - 0
public/static/js/luckysheet_old/assets/iconfont/iconfont.json

@@ -0,0 +1,779 @@
+{
+  "id": "1990368",
+  "name": "lucksheet",
+  "font_family": "iconfont",
+  "css_prefix_text": "luckysheet-iconfont-",
+  "description": "",
+  "glyphs": [
+    {
+      "icon_id": "17878780",
+      "name": "链接",
+      "font_class": "lianjie",
+      "unicode": "e7f8",
+      "unicode_decimal": 59384
+    },
+    {
+      "icon_id": "17612330",
+      "name": "打印区域",
+      "font_class": "dayinquyu",
+      "unicode": "e7f5",
+      "unicode_decimal": 59381
+    },
+    {
+      "icon_id": "17612331",
+      "name": "打印页面配置",
+      "font_class": "dayinyemianpeizhi",
+      "unicode": "e7f6",
+      "unicode_decimal": 59382
+    },
+    {
+      "icon_id": "17612332",
+      "name": "打印标题",
+      "font_class": "dayinbiaoti",
+      "unicode": "e7f7",
+      "unicode_decimal": 59383
+    },
+    {
+      "icon_id": "17600443",
+      "name": "分页预览",
+      "font_class": "fenyeyulan",
+      "unicode": "e7f2",
+      "unicode_decimal": 59378
+    },
+    {
+      "icon_id": "17600444",
+      "name": "普通",
+      "font_class": "putong",
+      "unicode": "e7f3",
+      "unicode_decimal": 59379
+    },
+    {
+      "icon_id": "17600445",
+      "name": "页面布局",
+      "font_class": "yemianbuju",
+      "unicode": "e7f4",
+      "unicode_decimal": 59380
+    },
+    {
+      "icon_id": "17597312",
+      "name": "表格锁定",
+      "font_class": "biaogesuoding",
+      "unicode": "e7ee",
+      "unicode_decimal": 59374
+    },
+    {
+      "icon_id": "17444514",
+      "name": "转到",
+      "font_class": "zhuandao1",
+      "unicode": "e7f1",
+      "unicode_decimal": 59377
+    },
+    {
+      "icon_id": "17444503",
+      "name": "右箭头",
+      "font_class": "youjiantou",
+      "unicode": "e7ed",
+      "unicode_decimal": 59373
+    },
+    {
+      "icon_id": "17444507",
+      "name": "菜单",
+      "font_class": "caidan2",
+      "unicode": "e7ef",
+      "unicode_decimal": 59375
+    },
+    {
+      "icon_id": "17444508",
+      "name": "替换",
+      "font_class": "tihuan",
+      "unicode": "e7f0",
+      "unicode_decimal": 59376
+    },
+    {
+      "icon_id": "17392794",
+      "name": "冻结",
+      "font_class": "dongjie1",
+      "unicode": "e7e1",
+      "unicode_decimal": 59361
+    },
+    {
+      "icon_id": "17392795",
+      "name": "剪",
+      "font_class": "jian1",
+      "unicode": "e7e2",
+      "unicode_decimal": 59362
+    },
+    {
+      "icon_id": "17392796",
+      "name": "加",
+      "font_class": "jia1",
+      "unicode": "e7e3",
+      "unicode_decimal": 59363
+    },
+    {
+      "icon_id": "17392797",
+      "name": "溢出",
+      "font_class": "yichu1",
+      "unicode": "e7e4",
+      "unicode_decimal": 59364
+    },
+    {
+      "icon_id": "17392798",
+      "name": "升序",
+      "font_class": "shengxu1",
+      "unicode": "e7e5",
+      "unicode_decimal": 59365
+    },
+    {
+      "icon_id": "17392799",
+      "name": "内框线",
+      "font_class": "neikuangxian",
+      "unicode": "e7e6",
+      "unicode_decimal": 59366
+    },
+    {
+      "icon_id": "17392800",
+      "name": "清除筛选",
+      "font_class": "qingchushaixuan",
+      "unicode": "e7e7",
+      "unicode_decimal": 59367
+    },
+    {
+      "icon_id": "17392801",
+      "name": "文本向上",
+      "font_class": "wenbenxiangshang",
+      "unicode": "e7e8",
+      "unicode_decimal": 59368
+    },
+    {
+      "icon_id": "17392802",
+      "name": "降序",
+      "font_class": "jiangxu1",
+      "unicode": "e7e9",
+      "unicode_decimal": 59369
+    },
+    {
+      "icon_id": "17392803",
+      "name": "内框横线",
+      "font_class": "neikuanghengxian",
+      "unicode": "e7ea",
+      "unicode_decimal": 59370
+    },
+    {
+      "icon_id": "17392804",
+      "name": "内框竖线",
+      "font_class": "neikuangshuxian",
+      "unicode": "e7eb",
+      "unicode_decimal": 59371
+    },
+    {
+      "icon_id": "17392805",
+      "name": "自定义排序",
+      "font_class": "zidingyipaixu",
+      "unicode": "e7ec",
+      "unicode_decimal": 59372
+    },
+    {
+      "icon_id": "16746498",
+      "name": "logo2",
+      "font_class": "logo2",
+      "unicode": "e7df",
+      "unicode_decimal": 59359
+    },
+    {
+      "icon_id": "16746532",
+      "name": "logo",
+      "font_class": "logo",
+      "unicode": "e7e0",
+      "unicode_decimal": 59360
+    },
+    {
+      "icon_id": "16730159",
+      "name": "文本倾斜",
+      "font_class": "wenbenqingxie1",
+      "unicode": "e7de",
+      "unicode_decimal": 59358
+    },
+    {
+      "icon_id": "16728412",
+      "name": "加粗",
+      "font_class": "jiacu",
+      "unicode": "e7d9",
+      "unicode_decimal": 59353
+    },
+    {
+      "icon_id": "16728080",
+      "name": "搜索",
+      "font_class": "sousuo",
+      "unicode": "e78a",
+      "unicode_decimal": 59274
+    },
+    {
+      "icon_id": "16728081",
+      "name": "关闭",
+      "font_class": "guanbi",
+      "unicode": "e78b",
+      "unicode_decimal": 59275
+    },
+    {
+      "icon_id": "16728082",
+      "name": "下一个",
+      "font_class": "xiayige",
+      "unicode": "e78c",
+      "unicode_decimal": 59276
+    },
+    {
+      "icon_id": "16728083",
+      "name": "下拉",
+      "font_class": "xiala",
+      "unicode": "e78d",
+      "unicode_decimal": 59277
+    },
+    {
+      "icon_id": "16728084",
+      "name": "文本颜色",
+      "font_class": "wenbenyanse",
+      "unicode": "e78e",
+      "unicode_decimal": 59278
+    },
+    {
+      "icon_id": "16728085",
+      "name": "上一个",
+      "font_class": "shangyige",
+      "unicode": "e78f",
+      "unicode_decimal": 59279
+    },
+    {
+      "icon_id": "16728086",
+      "name": "数据透视",
+      "font_class": "shujutoushi",
+      "unicode": "e790",
+      "unicode_decimal": 59280
+    },
+    {
+      "icon_id": "16728087",
+      "name": "填充",
+      "font_class": "tianchong",
+      "unicode": "e791",
+      "unicode_decimal": 59281
+    },
+    {
+      "icon_id": "16728088",
+      "name": "增加小数位",
+      "font_class": "zengjiaxiaoshuwei",
+      "unicode": "e792",
+      "unicode_decimal": 59282
+    },
+    {
+      "icon_id": "16728089",
+      "name": "编辑2",
+      "font_class": "bianji2",
+      "unicode": "e793",
+      "unicode_decimal": 59283
+    },
+    {
+      "icon_id": "16728090",
+      "name": "截屏",
+      "font_class": "jieping",
+      "unicode": "e794",
+      "unicode_decimal": 59284
+    },
+    {
+      "icon_id": "16728092",
+      "name": "减小小数位",
+      "font_class": "jianxiaoxiaoshuwei",
+      "unicode": "e796",
+      "unicode_decimal": 59286
+    },
+    {
+      "icon_id": "16728093",
+      "name": "菜单",
+      "font_class": "caidan",
+      "unicode": "e797",
+      "unicode_decimal": 59287
+    },
+    {
+      "icon_id": "16728094",
+      "name": "数据库",
+      "font_class": "shujuku",
+      "unicode": "e798",
+      "unicode_decimal": 59288
+    },
+    {
+      "icon_id": "16728095",
+      "name": "无边框",
+      "font_class": "wubiankuang",
+      "unicode": "e799",
+      "unicode_decimal": 59289
+    },
+    {
+      "icon_id": "16728096",
+      "name": "编辑",
+      "font_class": "bianji",
+      "unicode": "e79a",
+      "unicode_decimal": 59290
+    },
+    {
+      "icon_id": "16728097",
+      "name": "清除样式",
+      "font_class": "qingchuyangshi",
+      "unicode": "e79b",
+      "unicode_decimal": 59291
+    },
+    {
+      "icon_id": "16728099",
+      "name": "删除",
+      "font_class": "shanchu",
+      "unicode": "e79c",
+      "unicode_decimal": 59292
+    },
+    {
+      "icon_id": "16728100",
+      "name": "文本居中对齐",
+      "font_class": "wenbenjuzhongduiqi",
+      "unicode": "e79d",
+      "unicode_decimal": 59293
+    },
+    {
+      "icon_id": "16728101",
+      "name": "打印",
+      "font_class": "dayin",
+      "unicode": "e79e",
+      "unicode_decimal": 59294
+    },
+    {
+      "icon_id": "16728102",
+      "name": "文本分割",
+      "font_class": "wenbenfenge",
+      "unicode": "e79f",
+      "unicode_decimal": 59295
+    },
+    {
+      "icon_id": "16728103",
+      "name": "函数‘",
+      "font_class": "hanshu",
+      "unicode": "e7a0",
+      "unicode_decimal": 59296
+    },
+    {
+      "icon_id": "16728104",
+      "name": "降序",
+      "font_class": "jiangxu",
+      "unicode": "e7a1",
+      "unicode_decimal": 59297
+    },
+    {
+      "icon_id": "16728105",
+      "name": "顶部对齐",
+      "font_class": "dingbuduiqi",
+      "unicode": "e7a2",
+      "unicode_decimal": 59298
+    },
+    {
+      "icon_id": "16728106",
+      "name": "图片",
+      "font_class": "tupian",
+      "unicode": "e7a3",
+      "unicode_decimal": 59299
+    },
+    {
+      "icon_id": "16728107",
+      "name": "向下90",
+      "font_class": "xiangxia90",
+      "unicode": "e7a4",
+      "unicode_decimal": 59300
+    },
+    {
+      "icon_id": "16728108",
+      "name": "竖排文字",
+      "font_class": "shupaiwenzi",
+      "unicode": "e7a5",
+      "unicode_decimal": 59301
+    },
+    {
+      "icon_id": "16728109",
+      "name": "全加边框",
+      "font_class": "quanjiabiankuang",
+      "unicode": "e7a6",
+      "unicode_decimal": 59302
+    },
+    {
+      "icon_id": "16728110",
+      "name": "升序",
+      "font_class": "shengxu",
+      "unicode": "e7a7",
+      "unicode_decimal": 59303
+    },
+    {
+      "icon_id": "16728111",
+      "name": "裁剪",
+      "font_class": "caijian",
+      "unicode": "e7a8",
+      "unicode_decimal": 59304
+    },
+    {
+      "icon_id": "16728112",
+      "name": "金额",
+      "font_class": "jine",
+      "unicode": "e7a9",
+      "unicode_decimal": 59305
+    },
+    {
+      "icon_id": "16728113",
+      "name": "菜单1",
+      "font_class": "caidan1",
+      "unicode": "e7aa",
+      "unicode_decimal": 59306
+    },
+    {
+      "icon_id": "16728114",
+      "name": "取消合并",
+      "font_class": "quxiaohebing",
+      "unicode": "e7ab",
+      "unicode_decimal": 59307
+    },
+    {
+      "icon_id": "16728115",
+      "name": "文本下划线",
+      "font_class": "wenbenxiahuaxian",
+      "unicode": "e7ac",
+      "unicode_decimal": 59308
+    },
+    {
+      "icon_id": "16728116",
+      "name": "上边框",
+      "font_class": "shangbiankuang",
+      "unicode": "e7ad",
+      "unicode_decimal": 59309
+    },
+    {
+      "icon_id": "16728117",
+      "name": "定位",
+      "font_class": "dingwei",
+      "unicode": "e7ae",
+      "unicode_decimal": 59310
+    },
+    {
+      "icon_id": "16728118",
+      "name": "四周加边框",
+      "font_class": "sizhoujiabiankuang",
+      "unicode": "e7af",
+      "unicode_decimal": 59311
+    },
+    {
+      "icon_id": "16728119",
+      "name": "侧边栏收起",
+      "font_class": "cebianlanshouqi",
+      "unicode": "e7b0",
+      "unicode_decimal": 59312
+    },
+    {
+      "icon_id": "16728120",
+      "name": "合并",
+      "font_class": "hebing",
+      "unicode": "e7b1",
+      "unicode_decimal": 59313
+    },
+    {
+      "icon_id": "16728121",
+      "name": "向上倾斜",
+      "font_class": "xiangshangqingxie",
+      "unicode": "e7b2",
+      "unicode_decimal": 59314
+    },
+    {
+      "icon_id": "16728122",
+      "name": "水平对齐",
+      "font_class": "shuipingduiqi",
+      "unicode": "e7b3",
+      "unicode_decimal": 59315
+    },
+    {
+      "icon_id": "16728123",
+      "name": "文本删除线",
+      "font_class": "wenbenshanchuxian",
+      "unicode": "e7b4",
+      "unicode_decimal": 59316
+    },
+    {
+      "icon_id": "16728124",
+      "name": "文本右对齐",
+      "font_class": "wenbenyouduiqi",
+      "unicode": "e7b5",
+      "unicode_decimal": 59317
+    },
+    {
+      "icon_id": "16728125",
+      "name": "前进",
+      "font_class": "qianjin",
+      "unicode": "e7b6",
+      "unicode_decimal": 59318
+    },
+    {
+      "icon_id": "16728126",
+      "name": "图表",
+      "font_class": "tubiao",
+      "unicode": "e7b7",
+      "unicode_decimal": 59319
+    },
+    {
+      "icon_id": "16728127",
+      "name": "右边框",
+      "font_class": "youbiankuang",
+      "unicode": "e7b8",
+      "unicode_decimal": 59320
+    },
+    {
+      "icon_id": "16728128",
+      "name": "百分号",
+      "font_class": "baifenhao",
+      "unicode": "e7b9",
+      "unicode_decimal": 59321
+    },
+    {
+      "icon_id": "16728129",
+      "name": "格式刷",
+      "font_class": "geshishua",
+      "unicode": "e7ba",
+      "unicode_decimal": 59322
+    },
+    {
+      "icon_id": "16728130",
+      "name": "保存",
+      "font_class": "baocun",
+      "unicode": "e7bb",
+      "unicode_decimal": 59323
+    },
+    {
+      "icon_id": "16728131",
+      "name": "数据验证",
+      "font_class": "shujuyanzheng",
+      "unicode": "e7bc",
+      "unicode_decimal": 59324
+    },
+    {
+      "icon_id": "16728132",
+      "name": "截断",
+      "font_class": "jieduan",
+      "unicode": "e7bd",
+      "unicode_decimal": 59325
+    },
+    {
+      "icon_id": "16728133",
+      "name": "格式条件",
+      "font_class": "geshitiaojian",
+      "unicode": "e7be",
+      "unicode_decimal": 59326
+    },
+    {
+      "icon_id": "16728134",
+      "name": "自动换行",
+      "font_class": "zidonghuanhang",
+      "unicode": "e7bf",
+      "unicode_decimal": 59327
+    },
+    {
+      "icon_id": "16728135",
+      "name": "侧边栏展开",
+      "font_class": "cebianlanzhankai",
+      "unicode": "e7c0",
+      "unicode_decimal": 59328
+    },
+    {
+      "icon_id": "16728136",
+      "name": "筛选2",
+      "font_class": "shaixuan2",
+      "unicode": "e7c1",
+      "unicode_decimal": 59329
+    },
+    {
+      "icon_id": "16728137",
+      "name": "向下倾斜",
+      "font_class": "xiangxiaqingxie",
+      "unicode": "e7c2",
+      "unicode_decimal": 59330
+    },
+    {
+      "icon_id": "16728138",
+      "name": "溢出",
+      "font_class": "yichu",
+      "unicode": "e7c3",
+      "unicode_decimal": 59331
+    },
+    {
+      "icon_id": "16728139",
+      "name": "垂直合并",
+      "font_class": "chuizhihebing",
+      "unicode": "e7c4",
+      "unicode_decimal": 59332
+    },
+    {
+      "icon_id": "16728140",
+      "name": "文本分散对齐",
+      "font_class": "wenbenfensanduiqi",
+      "unicode": "e7c5",
+      "unicode_decimal": 59333
+    },
+    {
+      "icon_id": "16728141",
+      "name": "左边框",
+      "font_class": "zuobiankuang",
+      "unicode": "e7c6",
+      "unicode_decimal": 59334
+    },
+    {
+      "icon_id": "16728142",
+      "name": "分页查看",
+      "font_class": "fenyechakan",
+      "unicode": "e7c7",
+      "unicode_decimal": 59335
+    },
+    {
+      "icon_id": "16728143",
+      "name": "运行",
+      "font_class": "yunhang",
+      "unicode": "e7c8",
+      "unicode_decimal": 59336
+    },
+    {
+      "icon_id": "16728144",
+      "name": "列",
+      "font_class": "lie",
+      "unicode": "e7c9",
+      "unicode_decimal": 59337
+    },
+    {
+      "icon_id": "16728145",
+      "name": "全屏",
+      "font_class": "quanping",
+      "unicode": "e7ca",
+      "unicode_decimal": 59338
+    },
+    {
+      "icon_id": "16728146",
+      "name": "筛选",
+      "font_class": "shaixuan",
+      "unicode": "e7cb",
+      "unicode_decimal": 59339
+    },
+    {
+      "icon_id": "16728147",
+      "name": "更新",
+      "font_class": "gengxin",
+      "unicode": "e7cc",
+      "unicode_decimal": 59340
+    },
+    {
+      "icon_id": "16728148",
+      "name": "清除",
+      "font_class": "qingchu",
+      "unicode": "e7cd",
+      "unicode_decimal": 59341
+    },
+    {
+      "icon_id": "16728149",
+      "name": "行",
+      "font_class": "hang",
+      "unicode": "e7ce",
+      "unicode_decimal": 59342
+    },
+    {
+      "icon_id": "16728150",
+      "name": "注释",
+      "font_class": "zhushi",
+      "unicode": "e7cf",
+      "unicode_decimal": 59343
+    },
+    {
+      "icon_id": "16728151",
+      "name": "剪",
+      "font_class": "jian",
+      "unicode": "e7d0",
+      "unicode_decimal": 59344
+    },
+    {
+      "icon_id": "16728152",
+      "name": "计算",
+      "font_class": "jisuan",
+      "unicode": "e7d1",
+      "unicode_decimal": 59345
+    },
+    {
+      "icon_id": "16728153",
+      "name": "加",
+      "font_class": "jia",
+      "unicode": "e7d2",
+      "unicode_decimal": 59346
+    },
+    {
+      "icon_id": "16728154",
+      "name": "底部对齐",
+      "font_class": "dibuduiqi",
+      "unicode": "e7d3",
+      "unicode_decimal": 59347
+    },
+    {
+      "icon_id": "16728155",
+      "name": "向上90",
+      "font_class": "xiangshang90",
+      "unicode": "e7d4",
+      "unicode_decimal": 59348
+    },
+    {
+      "icon_id": "16728156",
+      "name": "无选装",
+      "font_class": "wuxuanzhuang",
+      "unicode": "e7d5",
+      "unicode_decimal": 59349
+    },
+    {
+      "icon_id": "16728157",
+      "name": "显示隐藏网格",
+      "font_class": "xianshiyincangwangge",
+      "unicode": "e7d6",
+      "unicode_decimal": 59350
+    },
+    {
+      "icon_id": "16728158",
+      "name": "冻结",
+      "font_class": "dongjie",
+      "unicode": "e7d7",
+      "unicode_decimal": 59351
+    },
+    {
+      "icon_id": "16728159",
+      "name": "文本左对齐",
+      "font_class": "wenbenzuoduiqi",
+      "unicode": "e7d8",
+      "unicode_decimal": 59352
+    },
+    {
+      "icon_id": "16728161",
+      "name": "后退",
+      "font_class": "houtui",
+      "unicode": "e7da",
+      "unicode_decimal": 59354
+    },
+    {
+      "icon_id": "16728162",
+      "name": "水平合并",
+      "font_class": "shuipinghebing",
+      "unicode": "e7db",
+      "unicode_decimal": 59355
+    },
+    {
+      "icon_id": "16728163",
+      "name": "下边框",
+      "font_class": "xiabiankuang",
+      "unicode": "e7dc",
+      "unicode_decimal": 59356
+    },
+    {
+      "icon_id": "16728164",
+      "name": "设置",
+      "font_class": "shezhi",
+      "unicode": "e7dd",
+      "unicode_decimal": 59357
+    }
+  ]
+}

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 356 - 0
public/static/js/luckysheet_old/assets/iconfont/iconfont.svg


binární
public/static/js/luckysheet_old/assets/iconfont/iconfont.ttf


binární
public/static/js/luckysheet_old/assets/iconfont/iconfont.woff


binární
public/static/js/luckysheet_old/assets/iconfont/iconfont.woff2


binární
public/static/js/luckysheet_old/css/EwaAntH.gif


binární
public/static/js/luckysheet_old/css/EwaAntV.gif


binární
public/static/js/luckysheet_old/css/arrow-down.png


binární
public/static/js/luckysheet_old/css/loading.gif


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 1 - 0
public/static/js/luckysheet_old/css/luckysheet.css


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 505 - 0
public/static/js/luckysheet_old/css/menuSprite.svg


binární
public/static/js/luckysheet_old/css/paint_16px.ico


binární
public/static/js/luckysheet_old/css/paint_24px.ico


binární
public/static/js/luckysheet_old/css/paint_32px.ico


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 528 - 0
public/static/js/luckysheet_old/css/sprite38.svg


binární
public/static/js/luckysheet_old/css/waffle_sprite.png


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 1 - 0
public/static/js/luckysheet_old/expendPlugins/chart/chartmix.css


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 34 - 0
public/static/js/luckysheet_old/expendPlugins/chart/chartmix.umd.min.js


binární
public/static/js/luckysheet_old/fonts/FontAwesome.otf


binární
public/static/js/luckysheet_old/fonts/fontawesome-webfont.eot


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 2671 - 0
public/static/js/luckysheet_old/fonts/fontawesome-webfont.svg


binární
public/static/js/luckysheet_old/fonts/fontawesome-webfont.ttf


binární
public/static/js/luckysheet_old/fonts/fontawesome-webfont.woff


binární
public/static/js/luckysheet_old/fonts/fontawesome-webfont.woff2


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 10 - 0
public/static/js/luckysheet_old/luckysheet.esm.js


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 10 - 0
public/static/js/luckysheet_old/luckysheet.umd.js


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 1 - 0
public/static/js/luckysheet_old/plugins/css/pluginsCss.css


binární
public/static/js/luckysheet_old/plugins/images/CFcolorGradation.png


binární
public/static/js/luckysheet_old/plugins/images/CFdataBar.png


binární
public/static/js/luckysheet_old/plugins/images/CFicons.png


binární
public/static/js/luckysheet_old/plugins/images/icon_dropCell.png


binární
public/static/js/luckysheet_old/plugins/images/ui-icons_444444_256x240.png


binární
public/static/js/luckysheet_old/plugins/images/ui-icons_555555_256x240.png


binární
public/static/js/luckysheet_old/plugins/images/ui-icons_777620_256x240.png


binární
public/static/js/luckysheet_old/plugins/images/ui-icons_777777_256x240.png


binární
public/static/js/luckysheet_old/plugins/images/ui-icons_cc0000_256x240.png


binární
public/static/js/luckysheet_old/plugins/images/ui-icons_ffffff_256x240.png


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 1 - 0
public/static/js/luckysheet_old/plugins/js/plugin.js


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 10 - 0
public/static/js/luckysheet_old/plugins/plugins.css


+ 104 - 39
public/static/views/kccExcel.html

@@ -27,13 +27,14 @@
                 loadingMask.parentNode.removeChild(loadingMask);
             }
         }
+
     </script>
     <script src="/static/js/layui.js?v=1.0.0"></script>
     <script src="/static/js/exceljs.js"></script>
     <script src="/static/js/fileSave.js"></script>
     <script src="/static/js/luckysheet/luckSheetExcel.js"></script>
-    <script src="/static/js/luckysheet/plugins/js/plugin.js"></script>
-    <script src="/static/js/luckysheet/luckysheet.umd.js"></script>
+    <script src="../js/luckysheet_old/plugins/js/plugin.js?v=1.0.0"></script>
+    <script src="../js/luckysheet_old/luckysheet.umd.js?v=1.0.0"></script>
     <script src="/static/js/api.config.js"></script>
     <script src="/static/js/util.js?v=1.0.0"></script>
     <script src="/static/js/url.js?v=1.0.0"></script>
@@ -57,13 +58,16 @@
 </style>
 
 <body style="background: #fff;">
-<div class="layui-inline" id="monthSelect">
+<div class="layui-inline" id="monthSelect" style="width: 100%">
     <div class="layui-input-inline">
-
         <form class="layui-form mc-work-form">
-            <label> 地市可编辑列:从 </label><input type="number" id="editFrom" style="width: 100px"></input> 到 <input type="number" id="editTo" style="width: 100px"></input>
+            <label> 地市可编辑列:从 </label><input type="text" id="editFrom" style="width: 100px"
+                                            onkeyup="this.value=this.value.replace(/[^a-zA-Z]/g,'')"></input> 到 <input
+            type="text" id="editTo" style="width: 100px"
+            onkeyup="this.value=this.value.replace(/[^a-zA-Z]/g,'')"></input>
         </form>
     </div>
+    <label style="color: red;float: right;padding-right: 10px">提示:请在第三列填写地市</label>
 </div>
 <div style="height:90%;width: 100%;">
     <div id="luckysheet" style="width:100%;height:100%">
@@ -148,6 +152,9 @@
                         toolBar += '<button id="exports" class="btn btn-primary" style="padding:3px 6px;font-size: 12px;margin-right: 10px;">导出</button>';
                     }
                     toolBar += '<button id="fullScreen" class="btn btn-primary" style="padding:3px 6px;font-size: 12px;margin-right: 10px;">全屏显示</button><button id="exitFullScreen" class="btn btn-primary" style="padding:3px 6px;font-size: 12px;margin-right: 10px;display:none">退出全屏</button>';
+                    var eJson = res.body.excelJson;
+                    var cellData = luckysheet.transToCellData(eJson[0].data);
+                    eJson[0].celldata = cellData;
                     initExcel(res.body.excelJson);
                 }
             });
@@ -161,7 +168,7 @@
             } else {
                 flag = true
             }
-            if (isAdmin){
+            if (isAdmin) {
                 adminFlag = true;
             }
             try {
@@ -169,15 +176,19 @@
                     container: 'luckysheet',
                     data: data,
                     showsheetbar: false, // 底部sheet显示/隐藏
+                    showsheetbarConfig: {
+                        add: false, //新增sheet
+                        menu: false, //sheet管理菜单
+                        sheet: false //sheet页显示
+                    },
                     showstatisticBar: false, // 底部计数
                     showtoolbar: false,
                     showinfobar: true, // 顶部信息 文件名称 按钮
                     allowUpdate: false, // 是否允许操作表格后的后台更新 在线文档websocket时为true
                     allowEdit: flag, // 是否允许前台编辑
-                    column: 12,
                     title: excelInfo.name, // 文件名称
-                    row: 10,
                     lang: 'zh',
+                    enableAddRow: adminFlag,
                     showstatisticBar: false, // 底部计数
                     showstatisticBarConfig: {
                         count: false, // 计数栏
@@ -189,7 +200,7 @@
                         copy: false, // 复制
                         copyAs: false, // 复制为
                         paste: false, // 粘贴
-                        insertRow: true, // 插入行
+                        insertRow: adminFlag, // 插入行
                         insertColumn: adminFlag, // 插入列
                         deleteRow: adminFlag, // 删除选中行
                         deleteColumn: adminFlag, // 删除选中列
@@ -213,11 +224,12 @@
                     },
                     hook: {
                         cellMousedown: function (a, b, c) {
-                            if (b.c == luckysheet.getSheet().data[b.r].length - 1) {
-                                return false
-                            }
+                            // if (b.c == luckysheet.getSheet().data[b.r].length - 1) {
+                            //     return false
+                            // }
                         },//绑定鼠标事件
                         cellUpdateBefore: function (r, c) {
+                            console.log('执行事件');
                             // c坐标 r行坐标
                             // if(lockFlag == 'updata'){
                             // 	return true
@@ -227,25 +239,25 @@
                             // 	return false
                             // }
                             //      }
-                            var editConStart = excelInfo.editConStart;
-                            var editConEnd = excelInfo.editConEnd;
-                            //console.log(r + '---' + c)
-                            if ($.trim(editConStart) != '' && $.trim(editConEnd) != '' && isAdmin == false) {
-                                editConStart = editConStart - 1;
-                                editConEnd = editConEnd - 1;
-                                // console.log(editConStart + '---' + editConEnd);
-                                // console.log(c < editConStart);
-                                // console.log(c > editConEnd);
-                                // console.log(c == 3);
-                                if (c < editConStart || c > editConEnd || c == 2) {
-                                    window.top.$vm.$message({
-                                        message: '您无权修改当前列',
-                                        type: 'info'
-                                    });
-                                    return false;
-                                }
-                            }
-                            if (r == 0) {
+                            // var editConStart = excelInfo.editConStart;
+                            // var editConEnd = excelInfo.editConEnd;
+                            // //console.log(r + '---' + c)
+                            // if ($.trim(editConStart) != '' && $.trim(editConEnd) != '' && isAdmin == false) {
+                            //     editConStart = editConStart - 1;
+                            //     editConEnd = editConEnd - 1;
+                            //     // console.log(editConStart + '---' + editConEnd);
+                            //     // console.log(c < editConStart);
+                            //     // console.log(c > editConEnd);
+                            //     // console.log(c == 3);
+                            //     if (c < editConStart || c > editConEnd || c == 2) {
+                            //         window.top.$vm.$message({
+                            //             message: '您无权修改当前列',
+                            //             type: 'info'
+                            //         });
+                            //         return false;
+                            //     }
+                            // }
+                            if (r == 0 && isAdmin == false) {
                                 window.top.$vm.$message({
                                     message: '您无权修改当前行',
                                     type: 'info'
@@ -253,6 +265,48 @@
                                 return false;
                             }
                         },
+                        cellMousedownBefore: function (a, p, s) {
+                            if (flag == false) {
+                                window.top.$vm.$message({
+                                    message: '查看模式无法编辑',
+                                    type: 'info'
+                                });
+                                return false;
+                            } else {
+                                //r行,c列
+                                var r = p.r;
+                                var c = p.c;
+                                // var editConStart = excelInfo.editConStart;
+                                // var editConEnd = excelInfo.editConEnd;
+                                // //console.log(r + '---' + c)
+                                // if ($.trim(editConStart) != '' && $.trim(editConEnd) != '' && isAdmin == false) {
+                                //     editConStart = editConStart - 1;
+                                //     editConEnd = editConEnd - 1;
+                                //     // console.log(editConStart + '---' + editConEnd);
+                                //     // console.log(c < editConStart);
+                                //     // console.log(c > editConEnd);
+                                //     // console.log(c == 3);
+                                //     if (c < editConStart || c > editConEnd || c == 2) {
+                                //         window.top.$vm.$message({
+                                //             message: '您无权修改当前列',
+                                //             type: 'info'
+                                //         });
+                                //         return false;
+                                //     }
+                                // }
+                                if (r == 0 && isAdmin == false) {
+                                    window.top.$vm.$message({
+                                        message: '您无权修改当前行',
+                                        type: 'info'
+                                    });
+                                    return false;
+                                }
+                            }
+                        },
+                        rangePasteBefore: function (range, data) {
+                            //禁止选区粘贴
+                            return false;
+                        },
                     },
                 })
             } catch (err) {
@@ -285,9 +339,16 @@
                 var urlsave = '/market/cKeyChannelCoopExcel/saveExcel';
                 var editFrom = $("#editFrom").val();
                 var editTo = $("#editTo").val();
-                if (editTo < editFrom){
+                // if (editTo < editFrom) {
+                //     window.top.$vm.$message({
+                //         message: '可编辑列的起始列不能大于结束列',
+                //         type: 'error'
+                //     });
+                //     return;
+                // }
+                if (isAdmin && ($.trim(editFrom) == '' || $.trim(editTo) == '')) {
                     window.top.$vm.$message({
-                        message: '可编辑列的起始列不能大于结束列',
+                        message: '可编辑列不可为空',
                         type: 'error'
                     });
                     return;
@@ -295,22 +356,23 @@
                 util.ajaxJson("正在加载中", ctx + urlsave, {
                     data: data,
                     id: excelId,
-                    editConStart:editFrom,
-                    editConEnd:editTo
+                    editConStart: editFrom,
+                    editConEnd: editTo
                 }, function (data) {
                     if (data.result == 1) {
                         window.top.$vm.$message({
                             message: data.desc,
                             type: 'error'
                         })
+                    } else {
+                        console.log(data);
+                        getData()
                     }
-                    console.log(data);
-                    getData()
                 });
             })
             // 导出
             $('#exports').click(function () {
-                exportExcel(luckysheet.getluckysheetfile(), 'excel')
+                exportExcel(luckysheet.getluckysheetfile(), excelInfo.name)
             })
             // 导入
             $("#imports").change(function (evt) {
@@ -336,6 +398,7 @@
                 LuckyExcel.transformExcelToLucky(
                     files[0],
                     function (exportJson, luckysheetfile) {
+                        console.log(exportJson);
                         if (exportJson.sheets == null || exportJson.sheets.length == 0) {
                             window.top.$vm.$message({
                                 message: '无法读取excel文件的内容,当前不支持xls文件',
@@ -346,7 +409,9 @@
                         // 销毁原来的excel
                         window.luckysheet.destroy();
                         // 重新加载
-                        initExcel([exportJson.sheets[0]])
+                        var a = exportJson.sheets[0];
+                        a.name = '';
+                        initExcel([a])
                         // 绑定按钮事件
                         initHandel()
                     }

+ 15 - 4
src/pages/main/keyChannelCoop/appendix.vue

@@ -48,7 +48,7 @@
                             </el-table-column>
                             <el-table-column prop="townName" label="区县">
                             </el-table-column>
-                            <el-table-column prop="opName" label="上报人">
+                            <el-table-column prop="uploadUserName" label="上报人">
                             </el-table-column>
                             <el-table-column prop="opTime" label="创建时间">
                             </el-table-column>
@@ -221,7 +221,7 @@ export default {
             uploadstatus: false,
             fileInfo: {
                 limit: 50,
-                url: '/sysmgr/noticeatt/upload',
+                url: '/market/cKeyChannelCoopAppendix/upload',
                 fileList: []
             },
             datalist: {
@@ -258,7 +258,7 @@ export default {
             this.tableData = [];
             let _this = this;
             this.$http({
-                url: "/market/keyChannelCoopAppendix/queryPage",
+                url: "/market/cKeyChannelCoopAppendix/queryPage",
                 method: "post",
                 headers: {
                     "Content-Type": "application/json",
@@ -396,6 +396,8 @@ export default {
             var adv = this.advInfo;
             this.appendixInfoList.cityName = adv.cityName;
             this.appendixInfoList.uploadUserName = adv.userName;
+            this.attList = [];
+            this.fileInfo.fileList = [];
             this.appendixInfoAddStatus = true;
         },
         appendixInfoEdit(v, n) {
@@ -454,7 +456,15 @@ export default {
             _this.appendixInfoList.opName = _this.userInfo.loginName;
             _this.appendixInfoList.opTime = _this.$formatDate(new Date(), 'YYYY-MM-DD HH:mm:ss');
             if (v === 1) {
-                this.submitAppendixInfo("/market/cKeyChannelCoopAppendix/addAppendixInfo");
+                //判断是否上传了附件
+                if (_this.attList.length > 0) {
+                    this.submitAppendixInfo("/market/cKeyChannelCoopAppendix/addAppendixInfo");
+                } else {
+                    _this.$message({
+                        message: '请上传附件',
+                        type: 'error'
+                    });
+                }
             }
         },
         submitAppendixInfo(u) {
@@ -485,6 +495,7 @@ export default {
                             _this.fileInfo.fileList = [];
                             _this.attList = [];
                             _this.appendixInfoAddStatus = false;
+                            _this.getAppendixInfoList(1, this.appendixInfoListPageSize)
                         }
                     });
                 }

+ 7 - 2
src/pages/main/keyChannelCoop/onlineExcel.vue

@@ -124,7 +124,7 @@ export default {
             this.tableData = [];
             let _this = this;
             this.$http({
-                url: "/market/keyChannelCoopExcel/queryPage",
+                url: "/market/cKeyChannelCoopExcel/queryPage",
                 method: "post",
                 headers: {
                     "Content-Type": "application/json",
@@ -199,10 +199,16 @@ export default {
                                 message: '成功',
                                 type: 'success'
                             });
+                            var id = res.data.desc;
+                            var row = {
+                                id:id
+                            };
                             _this.infolist = {};
                             console.log(_this.infolist);
                             _this.dialogStatus = false;
                             _this.getList({}, _this.pageSize);
+                            //跳转到编辑
+                            _this.jumpinfop('/onlineExcelInfo',2,'在线表格处理',row)
                         }
 
                     });
@@ -263,7 +269,6 @@ export default {
             this.infolist.opName = this.userInfo.loginName;
         },
         jumpinfop(p,v,n,row){
-            console.log(row);
             this.$router.push({
                 path: p,
                 query:{

+ 1 - 1
src/pages/main/keyChannelCoop/onlineExcelInfo.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="container" id="container">
-        <iframe height="100%" width="100%" src="/static/views/kccExcel.html" frameborder="0"></iframe>
+        <iframe height="100%" width="100%" src="../static/views/kccExcel.html" frameborder="0"></iframe>
     </div>
 </template>
 <style scoped>